From 1a90d0db7d71a97d05d085e6c8c857d0570dfa94 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 3 Jan 2008 16:21:23 -0600 Subject: [PATCH] Lots of reformatting of reports forms. Improvements to breadcrumbs. XHTML-compliance corrections. Fix to itemslost.pl for Bug 1733 (just a typo). Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 7 + .../prog/en/includes/calendar.inc | 2 + .../prog/en/includes/reports-menu.inc | 8 +- .../modules/reports/acquisitions_stats.tmpl | 58 +++--- .../en/modules/reports/bor_issues_top.tmpl | 174 ++++++++---------- .../en/modules/reports/borrowers_out.tmpl | 100 +++++----- .../en/modules/reports/borrowers_stats.tmpl | 45 +++-- .../en/modules/reports/cat_issues_top.tmpl | 163 ++++++---------- .../en/modules/reports/catalogue_out.tmpl | 70 +++---- .../en/modules/reports/catalogue_stats.tmpl | 30 +-- .../en/modules/reports/issues_avg_stats.tmpl | 31 ++-- .../reports/issues_by_borrower_category.tmpl | 13 +- .../prog/en/modules/reports/issues_stats.tmpl | 60 +++--- .../prog/en/modules/reports/itemslost.tmpl | 78 ++++---- .../prog/en/modules/reports/itemtypes.tmpl | 13 +- reports/itemslost.pl | 8 +- 16 files changed, 401 insertions(+), 459 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 0d96de2b64..a288f56062 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -677,6 +677,13 @@ fieldset.rows fieldset.action { padding : 1em; } +fieldset.rows label.inline { + display : inline; + float : none; + margin-left : 1em; + width : auto; +} + fieldset.rows .inputnote { float : left; margin : .5em 0 0 10em; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index 78fa5f1b1f..18fe1e41ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -3,6 +3,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc index 21b43f83f1..0869b4a82b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc @@ -9,8 +9,8 @@
Top Lists
Inactive
@@ -22,8 +22,8 @@
Other
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl index 07a93ae59a..e77201e53e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl @@ -1,5 +1,5 @@ -Koha › Reports › Acquisitions Statistics +Koha › Reports <!-- TMPL_IF NAME="do_it" -->› Acquisitions Statistics › Results<!-- TMPL_ELSE -->› Acquisitions Statistics<!-- /TMPL_IF --> @@ -7,7 +7,7 @@ - +
@@ -61,8 +61,9 @@ -

Acquisitions statistics

+
+ Acquisitions statistics @@ -79,7 +80,8 @@ @@ -155,7 +160,8 @@ @@ -254,25 +263,26 @@ -
From /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> - To /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
From /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> - + //]]> + To /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> - + //]]> +
- +
+
-

Cell value

- Count items - Amount +
Cell value +
    2. +
- -

Output

- - - into an application - - - - -

+

+ Output +
    2. +
  2. +
+
+ +
+ " /> -

+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl index 7df9d58830..15f1bd83f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl @@ -7,7 +7,7 @@ - +
@@ -48,15 +48,15 @@ function Dopop(link) { - + - + "> - + @@ -65,50 +65,10 @@ function Dopop(link) { -

Patrons who checked out the most items

+

Patrons with the most Checkouts

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Limit to By Filters
- - - -  
 Issue date +
+
  1. /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> - + /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> -
 Returns + +
  • /lib/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" alt="Show Calendar" /> - + /lib/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" alt="Show Calendar" border="0" /> -
    •  
     
     
     
     
     
    + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • + + + -

    Output

    - - - into an application - - +
    +
      +
      2. +
      3. +
    +
    + +
    + Output +
      2. +
    2. +
    +
    -

    +

    + " /> -

    + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl index 082dc089d8..7a2d569256 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl @@ -48,19 +48,28 @@

    Patrons with no Checkouts

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Limit to By Filters
    - + +
  • + /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> +
    • + + + +
    + Limits +
      +
    1. -
    		- +
  • -
    		•  
     
      - /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> -
    - - -

    Output

    - - - into an application - - - - -

    - - " /> -

    -
    + + + + +
    + Output +
      2. +
    2. +
    +
    + +
    + + " /> + +
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl index 16d70d7764..b9f3086346 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl @@ -1,5 +1,5 @@ -Koha › Reports › Patrons statistics +Koha › Reports <!-- TMPL_IF NAME="do_it" -->› Patrons statistics › Results<!-- TMPL_ELSE -->› Patrons statistics<!-- /TMPL_IF --> @@ -7,7 +7,7 @@ - +
    @@ -61,8 +61,9 @@ -

    Patrons statistics

    +
    +
    Patrons statistics @@ -146,8 +147,9 @@ @@ -221,21 +226,21 @@ -
    /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> - /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> -
    - - -

    Output

    - - - into an application - - +
    - -

    - +

    + Output +
      2. +
    2. +
    +
    + +
    + " /> -

    + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl index f2a237facb..cb85f20a15 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl @@ -24,8 +24,6 @@ function Dopop(link) { - -

    Top Most-Circulated Items

    @@ -36,21 +34,19 @@ function Dopop(link) { - - - + - + - + @@ -63,55 +59,16 @@ function Dopop(link) { - +
    Rank/Biblioitemnumbers
      Item Count of Checkouts
    -

    Top List On Catalogue Checkouts

    +

    Most-Circulated Items

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Limit to By Filters
    - - - -  
     Issue date +
    +
      +
    1. /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> - + /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> -
     Returns + +
  • /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" /> - + /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" /> -
    •  
     
     
     
     
     
    - - -

    Output

    - - - into an application - - + +
    • +
    • +
    • +
    • +
    • +
    • + + +
    + Limits +
      2. +
    +
    -

    - +

    + Output +
      2. +
    2. +
    +
    + +
    + " /> -

    + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl index f3a9de9100..58ed8fccc5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl @@ -48,18 +48,17 @@

    Items with no checkouts

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    Limit to By Filters
    - +
    • + + + +
    + Limits +
      +
    1. -
    		- +
  • -
    		•  
     
     
    - + + + -

    Output

    - - - into an application - - - -

    +

    + Output +
      2. +
    2. +
    +
    + +
    + " /> -

    + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl index 772f7765be..8e6d11ebf1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl @@ -1,12 +1,12 @@ -Koha › Reports › Catalogue statistics +Koha › Reports <!-- TMPL_IF NAME="do_it" -->› Catalogue statistics › Results<!-- TMPL_ELSE -->› Catalogue statistics<!-- /TMPL_IF --> - +
    @@ -60,8 +60,10 @@ -

    Catalogue statistics

    +
    +
    + Catalogue statistics @@ -175,19 +177,21 @@ -
    - +
    -

    Output

    - - - into an application - - +
    + Output +
      2. +
    2. +
    +
    -

    +

    + " /> -

    + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl index daf8c3c31a..e3678e8776 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl @@ -7,7 +7,7 @@ - +
    @@ -59,8 +59,10 @@ -

    Average checkout period statistics

    +
    +
    + Average checkout period statistics @@ -267,21 +269,22 @@ -
    - +
    -

    Output

    - - - into an application - - - -

    - +

    + Output +
      2. +
    2. +
    +
    + +
    + " /> -

    + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl index 414e5d19b4..b635fcc13c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl @@ -7,7 +7,7 @@ - +
    @@ -52,13 +52,14 @@ -

    Checkouts by patron category

    -

    (or don't if you want to see global status)

    -

    - +
    + Checkouts by patron category +
    1. Leave empty for all categories
      2. +
    +
    " /> - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl index f31a06125b..6c2484e4eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl @@ -1,5 +1,5 @@ -Koha › Reports › Checkout statistics +Koha › Reports <!-- TMPL_IF NAME="do_it" -->› Checkout statistics › Results <!-- TMPL_ELSE -->› Checkout statistics<!-- /TMPL_IF --> @@ -7,7 +7,7 @@ - +
    @@ -63,9 +63,10 @@ -

    Checkout statistics

    +
    - +
    + Checkout statistics
    @@ -81,8 +82,9 @@ @@ -225,22 +230,25 @@ -
    Title /lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" /> - + //]]> + /lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" /> - + //]]> +
    -

    Cell value

    -

    Count checkouts

    -

    Circulation rate

    -

    Output

    - - - into an application - - - -

    - - " /> -

    -
    +
    + +
    Cell value
      2. +
    + +
    + Output +
      2. +
    2. +
    +
    + +
    + + " /> + +
    +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl index ff44959016..b907e8f585 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl @@ -6,7 +6,7 @@ - +
    @@ -16,6 +16,8 @@

    Lost Items

    + +
    lost items found @@ -24,18 +26,7 @@
    -
    - - - - - +
    @@ -44,31 +35,6 @@ - - - - - - - - - @@ -84,7 +50,43 @@
    Barcode Date last seenItemtype Holdingbranch Location
    + + + + +
    1. +
      2. + +
      3. +
      4. +
    +
    +
    + +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl index ab4e702a86..10d8060eee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl @@ -6,7 +6,7 @@ - +
    @@ -34,12 +34,13 @@ -

    View catalogue group by item types

    -
    - Select a branch (or don't if you want the report for all branches) - + + +
    View catalogue group by item types
    1. + Select none to see all branches
    +
    " /> - +
    diff --git a/reports/itemslost.pl b/reports/itemslost.pl index 0d87d9e73f..33fbfef4e2 100755 --- a/reports/itemslost.pl +++ b/reports/itemslost.pl @@ -38,14 +38,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => { reportss => 1 }, + flagsrequired => { reports => 1 }, debug => 1, } ); my $params = $query->Vars; +my $get_items = $params->{'get_items'}; -if ( $params->{'get_items'} ) { +if ( $get_items ) { my $orderbyfilter = $params->{'orderbyfilter'} || undef; my $branchfilter = $params->{'branchfilter'} || undef; my $barcodefilter = $params->{'barcodefilter'} || undef; @@ -59,7 +60,8 @@ if ( $params->{'get_items'} ) { my $items = GetLostItems( \%where, $orderbyfilter ); $template->param( total => scalar @$items, - itemsloop => $items + itemsloop => $items, + get_items => $get_items ); } -- 2.20.1