From bd1c7ac1baf1f2ae51d80e655f2d3777f7a83f25 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 28 Sep 2011 09:58:04 -0400 Subject: [PATCH] [SIGNED-OFF] Fix for Bug 4223 - Too much serials info - design work needed This patch reimplements the changes suggested in the original patch. It puts each main section of the display into its own tab. Signed-off-by: Nicole C. Engard --- .../prog/en/modules/serials/subscription-detail.tt | 152 +++++++++++--------- 1 files changed, 84 insertions(+), 68 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index bba6a2e..f3ab9a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -1,9 +1,8 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › Details for Subscription #[% subscriptionid %] [% INCLUDE 'doc-head-close.inc' %] - @@ -75,34 +76,54 @@ function popup(subscriptionid) { [% END %] - -
-

Subscription information

-
    +
    + + +
    +
    +
    +
    +
    1. Subscription ID: [% subscriptionid %]
    2. Librarian identity: [% librarian %]
    3. -
    4. Vendor: [% aqbooksellername %] 
    5. -
    6. Biblio: ([% bibnum %]) [% bibliotitle %]
    7. -[% IF ( branchcode ) %]
    8. Library: [% branchcode %] 
    9. [% END %] +
    10. Vendor: [% aqbooksellername %]
    11. +
    12. Biblio: [% bibliotitle %] ([% bibnum %])
    13. +[% IF ( branchcode ) %]
    14. Library: [% branchcode %]
    15. [% END %] [% IF ( serialsadditems ) %] -
    16. Serial receipt creates an item record.
    17. +
    18. Items: Serial receipt creates an item record.
    19. [% ELSE %] -
    20. Serial receipt does not create an item record.
    21. +
    22. Items: Serial receipt does not create an item record.
    23. [% END %] -
    24. Grace period: [% graceperiod %] 
    25. - [% IF ( location ) %]
    26. Location: [% location %] 
    27. [% END %] - [% IF ( callnumber ) %]
    28. Call Number: [% callnumber %] 
    29. [% END %] - [% IF ( staffdisplaycount ) %]
    30. Number of issues to display to staff: [% staffdisplaycount %] 
    31. [% END %] - [% IF ( opacdisplaycount ) %]
    32. Number of issues to display to the public: [% opacdisplaycount %] 
    33. [% END %] - [% IF ( letter ) %]
    34. Patron alert with: [% letter %] 
    35. [% END %] - [% IF ( hasRouting ) %]
    36. Routing: yes
    37. [% END %] -
+
  • Grace period: [% graceperiod %]
  • + +
    +
    +
    +
      + [% IF ( location ) %]
    1. Location: [% location %]
    2. [% END %] + [% IF ( callnumber ) %]
    3. Call Number: [% callnumber %]
    4. [% END %] + [% IF ( staffdisplaycount ) %]
    5. Number of issues to display to staff:[% staffdisplaycount %]
    6. [% END %] + [% IF ( opacdisplaycount ) %]
    7. Number of issues to display to the public:[% opacdisplaycount %]
    8. [% END %] + [% IF ( letter ) %]
    9. Patron alert with: [% letter %]
    10. [% END %] + [% IF ( hasRouting ) %]
    11. Routing: yes
    12. [% END %] +
    +
    +
    + +
    -

    Planning

    -

    [% startdate %] -

    -

    +

    +
    +
      +
    1. Beginning date: [% startdate %] +
    2. +
    3. Frequency (*): [% IF ( periodicity16 ) %] Without regularity [% END %] @@ -151,14 +172,16 @@ function popup(subscriptionid) { [% IF ( periodicity11 ) %] 1/2 years [% END %] - Manual history : +
    4. +
    5. + Manual history: [% IF ( manualhistory ) %] - + Disabled [% ELSE %] - + Enabled [% END %] -

      -

      +

    6. +
    7. Number pattern: [% IF ( numberpattern1 ) %] Number only [% END %] @@ -183,9 +206,9 @@ function popup(subscriptionid) { [% IF ( numberpattern7 ) %] None of the above [% END %] -

      - - + +
    8. Starting with:

      + [% IF ( lastvalue2 ) %] [% END %] - + [% IF ( whenmorethan2 ) %] [% END %] -
      Starting with: [% lastvalue1 %]  @@ -198,7 +221,7 @@ function popup(subscriptionid) {

      Rollover:

      Rollover: [% whenmorethan1 %]  @@ -211,16 +234,19 @@ function popup(subscriptionid) {
      +
    9. [% IF ( irregular_issues ) %] -

      [% irregular_issues %] issues -

      +
    10. Irregularity: [% irregular_issues %] issues +
    11. [% END %] -

      [% firstacquidate %] -

      - [% IF ( numberlength ) %]

      [% numberlength %]

      [% END %] - [% IF ( weeklength ) %]

      [% weeklength %]

      [% END %] - [% IF ( monthlength ) %]

      [% monthlength %]

      [% END %] +
    12. First arrival: [% firstacquidate %] +
    13. + [% IF ( numberlength ) %]
    14. Number of issues: [% numberlength %]
    15. [% END %] + [% IF ( weeklength ) %]
    16. Number of weeks: [% weeklength %]
    17. [% END %] + [% IF ( monthlength ) %]
    18. Number of months: [% monthlength %]
    19. [% END %] +
    +
    +
    -

    Serial issues

    @@ -331,31 +356,22 @@ function popup(subscriptionid) {
    Issue number
    -

    Subscription summary

    - - - - - - - - - - - - - - - - - - - - - -
    [% startdate %]
    [% enddate %]
    [% histstartdate %]
    [% histenddate %]
    [% recievedlist %]
    [% missinglist %]
    [% internalnotes %]
    [% notes %]
    +
    +
    +
      +
    1. Start date: [% startdate %]
    2. +
    3. End date: [% enddate %]
    4. +
    5. History start date: [% histstartdate %]
    6. +
    7. History end date: [% histenddate %]
    8. +
    9. Received issues:[% recievedlist %]
    10. +
    11. Missing issues:[% missinglist %]
    12. +
    13. Nonpublic note:[% internalnotes %]
    14. +
    15. Public note:[% notes %]
    16. +
    +
    +
    +
    - -- 1.7.2.3