From f4f840da2cde33431ad78026ccaefb089e86bc72 Mon Sep 17 00:00:00 2001
From: Ryan Higgins <rch@liblime.com>
Date: Tue, 22 Apr 2008 17:46:22 -0500
Subject: [PATCH] Small template cleanup: display library name and cat
 description instead of codes

in circ-menu include.  Also, change 'Default' on main login page to 'My Library'.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 circ/circulation.pl                                         | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc      | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl           | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl | 2 +-
 members/boraccount.pl                                       | 6 ++++--
 members/moremember.pl                                       | 1 +
 members/readingrec.pl                                       | 5 ++++-
 tools/viewlog.pl                                            | 3 +++
 8 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 9540a6e160..390370d0aa 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -652,6 +652,7 @@ $template->param(
     borrower                    => $borrower,
     borrowernumber              => $borrowernumber,
     branch                      => $branch,
+    branchname                  => GetBranchName($branch),
     printer                     => $printer,
     printername                 => $printer,
     firstname                   => $borrower->{'firstname'},
@@ -659,6 +660,7 @@ $template->param(
 	dateexpiry => format_date($newexpiry),
     expiry                      => format_date($borrower->{'dateexpiry'}),
     categorycode      => $borrower->{'categorycode'},
+    categoryname      => $borrowercategory->{description},
     address     => $borrower->{'address'},
     address2     => $borrower->{'address2'},
     email      => $borrower->{'email'},
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 3f6934798e..b8b6238c9a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -47,8 +47,8 @@
             <li> <span class="problem">No email stored.</span>    </li>
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
-    <li>Category: <!-- TMPL_VAR name="categorycode" --></li>
-    <li>Home Library: <!-- TMPL_IF NAME="branchcode" --><!-- TMPL_VAR NAME="branchcode" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></li>
+    <li>Category: <!-- TMPL_VAR NAME="categoryname" --> (<!-- TMPL_VAR NAME="categorycode" -->) 
+    <li>Home Library: <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></li>
 </ul></div>
 <div id="menu">
 <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
index 99fd20aab9..3e56cab020 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
@@ -51,7 +51,7 @@
 <!-- TMPL_IF NAME="IndependantBranches" --><!-- TMPL_ELSE -->
 <p><label for="branch">Library:</label>
     <select name="branch" id="branch" class="input" tabindex="3">
-    <option value="">Default</option>
+    <option value="">My Library</option>
     <!-- TMPL_LOOP NAME="branchloop" -->
     <option value="<!-- TMPL_VAR NAME='branchcode' -->"><!-- TMPL_VAR NAME='branchname' --></option>
     <!-- /TMPL_LOOP -->
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 c94d2a578e..a0d3b33ea8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -57,7 +57,7 @@
     <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=cardnumber">Card</a></th>
     <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=surname">Name</a></th>
     <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=borrowers.categorycode">Cat</a></th>
-    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=branchcode">Branch</a></th>
+    <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=branchcode">Library</a></th>
     <th>Expires on</th>
     <th>OD/Issues</th>
     <th>Fines</th>
diff --git a/members/boraccount.pl b/members/boraccount.pl
index fa133d4c2d..6617e846e0 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -28,7 +28,7 @@ use C4::Output;
 use C4::Dates qw/format_date/;
 use CGI;
 use C4::Members;
-
+use C4::Branch;
 
 my $input=new CGI;
 
@@ -101,7 +101,8 @@ $template->param(
     cardnumber          => $data->{'cardnumber'},
     categorycode        => $data->{'categorycode'},
     category_type       => $data->{'category_type'},
-    category_description => $data->{'description'},
+ #   category_description => $data->{'description'},
+    categoryname		 => $data->{'description'},
     address             => $data->{'address'},
     address2            => $data->{'address2'},
     city                => $data->{'city'},
@@ -109,6 +110,7 @@ $template->param(
     phone               => $data->{'phone'},
     email               => $data->{'email'},
     branchcode          => $data->{'branchcode'},
+	branchname			=> GetBranchName($data->{'branchcode'}),
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
     accounts            => \@accountrows );
diff --git a/members/moremember.pl b/members/moremember.pl
index de5a6a53b7..22a56efe38 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -340,6 +340,7 @@ $template->param(
   DHTMLcalendar_dateformat=>C4::Dates->DHTMLcalendar(), 
     roaddetails      => $roaddetails,
     borrowernumber   => $borrowernumber,
+    categoryname	=> $borrowercategory->{description},
     reregistration   => $reregistration,
     branch	     => $branch,	
     totalprice       => sprintf( "%.2f", $totalprice ),
diff --git a/members/readingrec.pl b/members/readingrec.pl
index e47b5f65c7..5d737d1419 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -25,6 +25,7 @@ use C4::Auth;
 use C4::Output;
 use CGI;
 use C4::Members;
+use C4::Branch;
 
 use C4::Dates qw/format_date/;
 my $input=new CGI;
@@ -98,7 +99,8 @@ $template->param(
 						cardnumber => $data->{'cardnumber'},
 					    categorycode => $data->{'categorycode'},
 					    category_type => $data->{'category_type'},
-					    category_description => $data->{'description'},
+					   # category_description => $data->{'description'},
+					    categoryname	=> $data->{'description'},
 					    address => $data->{'address'},
 						address2 => $data->{'address2'},
 					    city => $data->{'city'},
@@ -106,6 +108,7 @@ $template->param(
 						phone => $data->{'phone'},
 						email => $data->{'email'},
 			   			branchcode => $data->{'branchcode'},
+			   			branchname => GetBranchName($data->{'branchcode'}),
 						showfulllink => ($count > 50),					
 						loop_reading => \@loop_reading);
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 737e73e7f4..f9c5952a85 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -27,6 +27,7 @@ use C4::Dates;
 use C4::Output;
 use C4::Log;
 use C4::Items;
+use C4::Branch;
 use Data::Dumper;
 
 use vars qw($debug);
@@ -83,6 +84,7 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
                         firstname       => $data->{'firstname'},
                         cardnumber      => $data->{'cardnumber'},
                         categorycode    => $data->{'categorycode'},
+                        categoryname	=> $data->{'description'},
                         address         => $data->{'address'},
                         address2        => $data->{'address2'},
                         city            => $data->{'city'},
@@ -90,6 +92,7 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
                         phonepro        => $data->{'phonepro'},
                         email           => $data->{'email'},
                         branchcode      => $data->{'branchcode'},
+                        branchname		=> GetBranchName($data->{'branchcode'}),
     );
 }
 
-- 
2.11.0