From 074ba5ab0253b83085e4c9a05b0568d1cdd9400e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 10 Jul 2013 09:51:26 -0400 Subject: [PATCH] [PASSED QA] Bug 10566 - Improve OPAC course reserves pages This patch makes various improvements to the OPAC course reserve pages: - Descriptive page titles for both pages. - More compact display of course information on course detail page (a list instead of a table, consistent with other displays of similar information in Koha). - Correct capitalization. - Added label and fieldset to course reserve search form. - Added breadcrumb navigatio nto course reserve detail page as a path back to course reserves main page. To test, apply the patch and confirm that the changes haven't broken anything and are an improvement. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Passes all tests and improves the display. Tested with only 1 course, 2 courses, courses with and without items selected. --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 50 +++++++++++ .../prog/en/modules/opac-course-details.tt | 95 +++++++++++--------- .../prog/en/modules/opac-course-reserves.tt | 14 +-- 3 files changed, 113 insertions(+), 46 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index e627cec..f8313c0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -165,6 +165,56 @@ fieldset.action p { margin-bottom : 1em; } +div.rows+div.rows { + margin-top : .6em; +} + +div.rows { + float : left; + clear : left; + margin: 0 0 0 0; + padding: 0; + width: 100%; +} + + +div.rows span.label { + float: left; + font-weight : bold; + width: 9em; + margin-right: 1em; + text-align: left; +} + +div.rows ol { + padding: .5em 1em 0 0; + list-style-type: none; +} + +div.rows ol li li { + border-bottom: 0; +} + +div.rows li { + border-bottom : 1px solid #EEE; + float : left; + clear : left; + padding-bottom: .2em; + padding-top: .1em; + list-style-type: none; + width: 100%; +} + +div.rows ul li:first-child { + float: none; + clear: none; + margin-left: 0; +} + +div.rows ul li { + margin-left : 9em; +} + form { display : inline; margin : 0; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt index 523ba04..4d0e121 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt @@ -4,7 +4,7 @@ [% USE ItemTypes %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Course reserves for [% course.course_name %] [% INCLUDE 'doc-head-close.inc' %] @@ -14,49 +14,64 @@
+

Course reserves ⇢ Course reserves for [% course.course_name %]

+
+
    + [% IF ( course.term ) %]
  1. Term: [% AuthorisedValues.GetByCode( 'TERM', course.term ) %]
    2. [% END %] +
  2. Department: [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]
    3. + [% IF ( course.course_number ) %]
  3. Course number: [% course.course_number %]
    4. [% END %] + [% IF ( course.section ) %]
  4. Section: [% course.section %]
    5. [% END %] + [% IF ( course.instructors ) %] +
  5. Instructors: +
      + [% FOREACH i IN course.instructors %] +
    • [% i.firstname %] [% i.surname %]
      • + [% END %] +
    +
    6. + [% END %] + [% IF ( course.public_note ) %]
  6. Notes: [% course.public_note %]
    7. [% END %] +
+
- - - - - - - - -
Course Name[% course.course_name %]
Term[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]
Department[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]
Course Number[% course.course_number %]
Section[% course.section %]
Instructors[% FOREACH i IN course.instructors %]
[% i.firstname %] [% i.surname %]
[% END %]
Notes[% course.public_note %]
- - - - - - - - - - - - - - - - [% FOREACH cr IN course_reserves %] + [% IF ( course_reserves ) %] +
TitleItem typeLocationCollectionCall numberCopyStatus - Date due - Notes
+ - - - - - - - - - + + + + + + + - [% END %] - -
[% cr.item.title %][% ItemTypes.GetDescription( cr.item.itype ) %][% Branches.GetName( cr.item.holdingbranch ) %]
[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]		[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %][% cr.item.itemcallnumber %][% cr.item.copynumber %][% INCLUDE 'item-status.inc' item = cr.item %][% cr.issue.date_due | $KohaDates %][% cr.public_note %]TitleItem typeLocationCollectionCall numberCopyStatus + Date due + Notes
+ + + [% FOREACH cr IN course_reserves %] + + [% cr.item.title %] + [% ItemTypes.GetDescription( cr.item.itype ) %] + [% Branches.GetName( cr.item.holdingbranch ) %]
[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %] + [% cr.item.itemcallnumber %] + [% cr.item.copynumber %] + [% INCLUDE 'item-status.inc' item = cr.item %] + [% cr.issue.date_due | $KohaDates %] + [% cr.public_note %] + + [% END %] + + + [% ELSE %] +
+
+

No reserves have been selected for this course.

+
+ [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt index 7476e69..d00748e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt @@ -2,7 +2,7 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Courses [% INCLUDE 'doc-head-close.inc' %] @@ -16,14 +16,16 @@
+

Courses

-
- - + +
+ + +
-
+
-

Courses

-- 1.7.9.5