From 49ae98551856f1b18010e20d619e9ef6f518c78a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 19 Jan 2010 15:46:47 -0500 Subject: [PATCH] Fixes for Bug 3376, Serials Display in OPAC - Formatting links to different subscription views as tabs like the links to MARC view, ISBD, etc. - Styling display of brief subscription view for better clarity - Moving filter form on full subscription view to sidebar - jQuery-fying some full subscription view scripts - Adding branch name to output of full subscription information - Styling year links for visibility and clarity (I'm not styling them as standard tabs because they wouldn't wrap well with many many years' worth of subscriptions) --- C4/Serials.pm | 2 + koha-tmpl/opac-tmpl/prog/en/css/opac.css | 4 +- .../en/modules/opac-full-serial-issues.tmpl | 139 +++++++++--------- .../prog/en/modules/opac-serial-issues.tmpl | 23 +-- 4 files changed, 87 insertions(+), 81 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index 03d2e5ef29..0b70099926 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -24,6 +24,7 @@ use POSIX qw(strftime); use C4::Suggestions; use C4::Koha; use C4::Biblio; +use C4::Branch; use C4::Items; use C4::Search; use C4::Letters; @@ -460,6 +461,7 @@ sub PrepareSerialsData { ? format_date( $subs->{'publisheddate'} ) : "XXX" ); + $subs->{'branchname'} = GetBranchName( $subs->{'branchcode'} ); $subs->{'planneddate'} = format_date( $subs->{'planneddate'} ); $subs->{ "status" . $subs->{'status'} } = 1; $subs->{"checked"} = $subs->{'status'} =~ /1|3|4|7/; diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 088f5ea1b4..eb02f101cf 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1777,7 +1777,7 @@ span.view { margin-top : .5em; } -a#MARCview, span#MARCview, a#MARCviewPop, a#ISBDview, span#ISBDview, a#Normalview, span#Normalview { +a#MARCview, span#MARCview, a#MARCviewPop, a#ISBDview, span#ISBDview, a#Normalview, a#Briefhistory, span#Normalview, a#Fullhistory, span#Fullhistory, span#Briefhistory { background-position : 5px 3px; background-repeat : no-repeat; font-size : 87%; @@ -1803,7 +1803,7 @@ a#Normalview, span#Normalview { padding-left : 15px; } -a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview { +a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview, a#Fullhistory, a#Briefhistory { background-color : #F3F3F3; border-left : 1px solid #E8E8E8; } diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl index 5102a3c1e4..88dc969b33 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl @@ -1,16 +1,32 @@ -Koha Online Catalog › Serials +Koha Online Catalog › Subscription information for - + -
+
-
-

Subscription information for

- " class="button catalogue">Back to biblio +

Subscription information for

+ + -
+ -
-
- - Filters : - - - - - - - - - -
-
-
" class="tabsub" style="display:block">
" class="tabsub" style="display:none"> - +
" style="display:block">
" style="display:none"> +
- - - - - - + + + + + + @@ -174,7 +183,7 @@ function clearFilters(keeplibrary) { - @@ -198,34 +207,26 @@ function clearFilters(keeplibrary) {
Date - Library - Notes - Date received - Number - Status - DateLibraryNotesDate receivedNumberStatus Subscription
+
- -
- +
- +
+
+

Refine your search

+
+
  1. +
  2. +
  3. +
+
+
+
+
+ +
-
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl index 1a71cf9057..6c2f44b008 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl @@ -10,13 +10,16 @@
-

Issues for a subscription

- " class="button">Normal View - " class="button">Full History - +

Issues for a subscription

+
-

Subscription information for

+
" style="border-bottom:1px solid #EEE;"> +

Subscription information for

The current subscription began on and is issued every day @@ -83,21 +86,21 @@

The subscription expired on

-

+

-

Available Issues

+
Available Issues

-

Unavailable Issues

+
Unavailable Issues

-

Issues summary

+
Issues summary

@@ -113,7 +116,7 @@ - +
-- 2.39.5