From a26b677f62fa00d48eed3c68f96d2c9a48594cca Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 24 Oct 2007 13:11:46 -0500 Subject: [PATCH] Restructuring branchtransfers.tmpl to use two-column layout for input and messages; removing unused js block from member.tmpl; Styling news listing to reflect expiration status Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 11 ++- .../prog/en/modules/circ/branchtransfers.tmpl | 88 ++++++++++--------- .../prog/en/modules/members/member.tmpl | 4 - .../prog/en/modules/tools/koha-news.tmpl | 14 +-- tools/koha-news.pl | 2 +- 5 files changed, 63 insertions(+), 56 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index d9fd7324ae..0bbc5c0420 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -722,7 +722,7 @@ fieldset.rows .inputnote { visibility:visible; /* you propably don't need to change this one */ display:block; } -#addbiblio a, #addchild a { +#addbiblio a, #addchild a, #newentry a { padding-left : 34px; background-image: url("/intranet-tmpl/prog/img/toolbar-new.gif"); background-position : center left; @@ -810,4 +810,13 @@ tr.highlight td { #circ_circulation_issue div.hint { color : #666666; margin: .2em 0; +} + +tr.expired td { + color : #999999; +} + +span.expired { + color : #990000; + font-style : italic; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl index c7297db402..89174e7640 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl @@ -8,15 +8,13 @@ -
+
-
-
-

Reserve Found

+

Reserve Found

@@ -87,11 +85,43 @@ -
+
- -

Messages

+
+
+
+
+ Transfer +
    +
  1. + + + + +
  2. +
  3. + + +
  4. +
+
+ " /> + + " value="" /> + " value="" /> + " value="" /> + +
+ + +

Messages

    @@ -116,38 +146,12 @@ and has been returned. -
-
- - - - - - - - - - -
Transfer
Destination library: - -
Enter barcode
- " /> - - " value="" /> - " value="" /> - " value="" /> - - -
- +
+
+ - +
+
@@ -167,13 +171,11 @@
Transfered Items
Bar Code
+
+ + -
-
-
- -
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl index 65459a940f..af8397565d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl @@ -87,10 +87,6 @@ No results found -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl index 5209283930..a23e3f6e16 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl @@ -97,20 +97,20 @@ Edit News ItemAdd News Item   - + + + + + " /> - + (expired) - - - - - + ">Edit diff --git a/tools/koha-news.pl b/tools/koha-news.pl index e81a808122..f979fb781f 100755 --- a/tools/koha-news.pl +++ b/tools/koha-news.pl @@ -105,7 +105,7 @@ else { #$new->{'expirationdate'}=format_date_in_iso($new->{'expirationdate'}); my @date = split (/-/,$new->{'expirationdate'}); if ($date[0]*$date[1]*$date[2]>0 && Date_to_Days( @date ) < Date_to_Days(&Today) ){ - $new->{'hasexpirated'} = 1; + $new->{'expired'} = 1; } } -- 2.39.5