From b453d173ae52049657d54cb7f27aacf5cd81b5ab Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sun, 4 Nov 2007 16:23:48 -0600 Subject: [PATCH] Standardizing information shown in sidebar when patron-related pages are displayed (making sure address, phone, email variables are available to all templates). Adding tabs to account-related pages as means of section navigation. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- circ/circulation.pl | 3 +- .../prog/en/css/staff-global.css | 33 ++++++++++++++- .../prog/en/includes/circ-menu.inc | 5 ++- .../prog/en/modules/members/boraccount.tmpl | 25 ++++++------ .../prog/en/modules/members/mancredit.tmpl | 14 ++++++- .../prog/en/modules/members/maninvoice.tmpl | 15 ++++++- .../prog/en/modules/members/member.tmpl | 16 ++++---- .../prog/en/modules/members/moremember.tmpl | 2 +- .../prog/en/modules/members/pay.tmpl | 13 +++++- .../prog/en/modules/members/readingrec.tmpl | 40 ++++++------------- members/boraccount.pl | 13 +++++- members/mancredit.pl | 10 +++++ members/maninvoice.pl | 10 +++++ members/member-flags.pl | 16 +++++++- members/member-password.pl | 13 +++++- members/member.pl | 10 +++-- members/pay.pl | 11 +++++ members/readingrec.pl | 10 +++++ 18 files changed, 194 insertions(+), 65 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 5c8e0d19ac..a066774f2c 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -616,7 +616,8 @@ $template->param( expiry => $borrower->{'dateexpiry'}, #format_date($borrower->{'dateexpiry'}), categorycode => $borrower->{'categorycode'}, - streetaddress => $borrower->{'address'}, + address => $borrower->{'address'}, + address2 => $borrower->{'address2'}, email => $borrower->{'email'}, emailpro => $borrower->{'emailpro'}, borrowernotes => $borrower->{'borrowernotes'}, 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 f69e7e61c2..760731db4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -205,10 +205,18 @@ th { font-weight : bold; } -td.highlight { +tr.highlight td, td.highlight { background-color : #F3F3F3; } +tr.onissue td { + background-color: #FFFFCC; +} + +tr.highlight.onissue td { + background-color: #FFFFE1; +} + caption { font-size : 153.9%; font-weight : bold; @@ -913,4 +921,25 @@ div.first fieldset { div.confirm input:hover { background-color : #ffc; - } \ No newline at end of file + } + + div.results { + padding : .7em 0; + } + + #section-nav ul { + margin : .5em 0 .5em 2px; + padding : 0; + } + + #section-nav ul li { + display : inline; + list-style-type : none; + } + + #section-nav ul li a { + background-color : #d2e9f5; + border : 1px solid #69C; + padding : 2px 3px; + text-decoration : none; + } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 236ac3f1eb..79f69274c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -1,11 +1,12 @@
    -
  • - , +
  • + No address stored for patron.
    • +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl index 043fa1b649..05037ccf9d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl @@ -14,18 +14,18 @@
    - - - + + + +
    + +
    -

    Account for

    - @@ -51,12 +51,13 @@
    Date
    +
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl index 4a8ef084ab..2bb4884b97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl @@ -15,6 +15,17 @@
    + + +
    + +
    +
    " /> @@ -34,12 +45,13 @@ " name="borrowernumber" />
    +
    - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl index ce80da8e3f..eff645d2ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl @@ -14,7 +14,19 @@
- + + + +
+ +
+ + ERROR an invalid itemnumber was entered, please hit back and try again @@ -41,6 +53,7 @@
" />
+
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 140571d091..aef944b456 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl @@ -9,15 +9,15 @@ -
+
-
+
-
+
Browse by last name: A B @@ -45,9 +45,11 @@ X Y Z -
+
+

Results for Search:

+
patrons found.
@@ -58,6 +60,7 @@ + @@ -70,14 +73,13 @@ - + +
OD/Issues Fines Notes 
">, - - ">,


() ">Edit
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index 3fa169cc4e..a61a519f7f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -9,7 +9,7 @@ -
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl index edb5f9dc78..ee686adaf2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl @@ -16,6 +16,16 @@
+ +
+ +
+
" /> @@ -66,12 +76,13 @@

has no outstanding fines.

+
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl index fef2b4bb5a..59a9f07a8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl @@ -15,19 +15,12 @@
- - - - - -

Reading Record for

+

Reading Record

+ + - + - + - + - + - + - +
Showing All Items | + &limit=full">Show Last 50 Items Only Showing Last 50 Items | + &limit=full">Show All Items
&order=title&limit=">Title @@ -42,35 +35,27 @@
- - "> - - - - - - @@ -81,13 +66,12 @@
-
" method="get">" />
- +
diff --git a/members/boraccount.pl b/members/boraccount.pl index 350b537e14..006d6b70ea 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -90,7 +90,18 @@ $template->param( firstname => $data->{'firstname'}, surname => $data->{'surname'}, borrowernumber => $borrowernumber, - total => sprintf("%.2f",$total), + cardnumber => $data->{'cardnumber'}, + categorycode => $data->{'categorycode'}, + category_type => $data->{'category_type'}, + category_description => $data->{'description'}, + address => $data->{'address'}, + address2 => $data->{'address2'}, + city => $data->{'city'}, + zipcode => $data->{'zipcode'}, + phone => $data->{'phone'}, + email => $data->{'email'}, + branchcode => $data->{'branchcode'}, + total => sprintf("%.2f",$total), totalcredit => $totalcredit, accounts => \@accountrows ); diff --git a/members/mancredit.pl b/members/mancredit.pl index 4f2fe508f3..2f809d35f9 100755 --- a/members/mancredit.pl +++ b/members/mancredit.pl @@ -57,6 +57,16 @@ if ($add){ borrowernumber => $borrowernumber, firstname => $data->{'firstname'}, surname => $data->{'surname'}, + cardnumber => $data->{'cardnumber'}, + categorycode => $data->{'categorycode'}, + category_type => $data->{'category_type'}, + category_description => $data->{'description'}, + address => $data->{'address'}, + address2 => $data->{'address2'}, + city => $data->{'city'}, + zipcode => $data->{'zipcode'}, + phone => $data->{'phone'}, + email => $data->{'email'}, ); print $input->header( -type => 'utf-8', diff --git a/members/maninvoice.pl b/members/maninvoice.pl index 4652095e47..faa38a8e3f 100755 --- a/members/maninvoice.pl +++ b/members/maninvoice.pl @@ -77,6 +77,16 @@ if ($add){ borrowernumber => $borrowernumber, firstname => $data->{'firstname'}, surname => $data->{'surname'}, + cardnumber => $data->{'cardnumber'}, + categorycode => $data->{'categorycode'}, + category_type => $data->{'category_type'}, + category_description => $data->{'description'}, + address => $data->{'address'}, + address2 => $data->{'address2'}, + city => $data->{'city'}, + zipcode => $data->{'zipcode'}, + phone => $data->{'phone'}, + email => $data->{'email'}, ); print $input->header( -type => 'utf-8', diff --git a/members/member-flags.pl b/members/member-flags.pl index 8ba5ff4d19..a7c6011cab 100755 --- a/members/member-flags.pl +++ b/members/member-flags.pl @@ -71,8 +71,20 @@ if ($input->param('newflags')) { } $template->param(borrowernumber => $member, - surname => $bor->{'surname'}, - firstname => $bor->{'firstname'}, + borrowernumber => $bor->{'borrowernumber'}, + cardnumber => $bor->{'cardnumber'}, + surname => $bor->{'surname'}, + firstname => $bor->{'firstname'}, + categorycode => $bor->{'categorycode'}, + category_type => $bor->{'category_type'}, + category_description => $bor->{'description'}, + address => $bor->{'address'}, + address2 => $bor->{'address2'}, + city => $bor->{'city'}, + zipcode => $bor->{'zipcode'}, + phone => $bor->{'phone'}, + email => $bor->{'email'}, + branchcode => $bor->{'branchcode'}, loop => \@loop, ); diff --git a/members/member-password.pl b/members/member-password.pl index d600c07b5f..315d07c675 100755 --- a/members/member-password.pl +++ b/members/member-password.pl @@ -71,12 +71,21 @@ if ( $newpassword ) { surname => $bor->{'surname'}, firstname => $bor->{'firstname'}, borrowernumber => $bor->{'borrowernumber'}, + cardnumber => $bor->{'cardnumber'}, + categorycode => $bor->{'categorycode'}, + category_type => $bor->{'category_type'}, + category_description => $bor->{'description'}, + address => $bor->{'address'}, + address2 => $bor->{'address2'}, + city => $bor->{'city'}, + zipcode => $bor->{'zipcode'}, + phone => $bor->{'phone'}, + email => $bor->{'email'}, + branchcode => $bor->{'branchcode'}, userid => $bor->{'userid'}, defaultnewpassword => $defaultnewpassword ); } -$template->param( member => $member, - output_html_with_http_headers $input, $cookie, $template->output; diff --git a/members/member.pl b/members/member.pl index 0e0b5b5796..fe330623a0 100755 --- a/members/member.pl +++ b/members/member.pl @@ -79,13 +79,13 @@ else my @resultsdata; -my $background = 0; +my $toggle = 0; for (my $i=0; $i < $count; $i++){ #find out stats my ($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowernumber'}); my %row = ( - background => $background, + toggle => $toggle, count => $i+1, borrowernumber => $results->[$i]{'borrowernumber'}, cardnumber => $results->[$i]{'cardnumber'}, @@ -94,8 +94,10 @@ for (my $i=0; $i < $count; $i++){ categorycode => $results->[$i]{'categorycode'}, category_type => $results->[$i]{'category_type'}, category_description => $results->[$i]{'description'}, - streetaddress => $results->[$i]{'streetaddress'}, + address => $results->[$i]{'address'}, + address2 => $results->[$i]{'address2'}, city => $results->[$i]{'city'}, + zipcode => $results->[$i]{'zipcode'}, branchcode => $results->[$i]{'branchcode'}, overdues => $od, issues => $issue, @@ -105,7 +107,7 @@ for (my $i=0; $i < $count; $i++){ sort1 => $results->[$i]{'sort1'}, sort2 => $results->[$i]{'sort2'}, ); - if ( $background ) { $background = 0; } else {$background = 1; } + if ( $toggle ) { $toggle = 0; } else {$toggle = 1; } push(@resultsdata, \%row); } diff --git a/members/pay.pl b/members/pay.pl index feb09e14e2..eb29032f11 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -133,6 +133,17 @@ if ( $check == 0 ) { firstname => $data->{'firstname'}, surname => $data->{'surname'}, borrowernumber => $borrowernumber, + cardnumber => $data->{'cardnumber'}, + categorycode => $data->{'categorycode'}, + category_type => $data->{'category_type'}, + category_description => $data->{'description'}, + address => $data->{'address'}, + address2 => $data->{'address2'}, + city => $data->{'city'}, + zipcode => $data->{'zipcode'}, + phone => $data->{'phone'}, + email => $data->{'email'}, + branchcode => $data->{'branchcode'}, total => sprintf( "%.2f", $total ) ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/members/readingrec.pl b/members/readingrec.pl index 5e3067b696..dcecbf0e75 100755 --- a/members/readingrec.pl +++ b/members/readingrec.pl @@ -85,6 +85,16 @@ $template->param( limit => $limit, firstname => $data->{'firstname'}, cardnumber => $data->{'cardnumber'}, + categorycode => $data->{'categorycode'}, + category_type => $data->{'category_type'}, + category_description => $data->{'description'}, + address => $data->{'address'}, + address2 => $data->{'address2'}, + city => $data->{'city'}, + zipcode => $data->{'zipcode'}, + phone => $data->{'phone'}, + email => $data->{'email'}, + branchcode => $data->{'branchcode'}, showfulllink => ($count > 50), loop_reading => \@loop_reading); output_html_with_http_headers $input, $cookie, $template->output; -- 2.20.1