koha-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha circ/branchoverdues.pl koha-tmpl/intranet-...

From: Joshua Ferraro
Subject: [Koha-cvs] koha circ/branchoverdues.pl koha-tmpl/intranet-...
Date: Sat, 10 Mar 2007 06:22:52 +0000 
CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Joshua Ferraro <kados>  07/03/10 06:22:52

Modified files:
        circ           : branchoverdues.pl 
        koha-tmpl/intranet-tmpl/prog/en/admin: categorie.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/circ: branchoverdues.tmpl 
                                              circulation.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/includes: menus.inc 

Log message:
        fix spelling department
        improve English grammar in template

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchoverdues.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&r1=1.9&r2=1.10

Patches:
Index: circ/branchoverdues.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchoverdues.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- circ/branchoverdues.pl      9 Mar 2007 15:37:12 -0000       1.2
+++ circ/branchoverdues.pl      10 Mar 2007 06:22:52 -0000      1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: branchoverdues.pl,v 1.2 2007/03/09 15:37:12 tipaul Exp $
+# $Id: branchoverdues.pl,v 1.3 2007/03/10 06:22:52 kados Exp $
 #
 # This file is part of Koha.
 #
@@ -32,7 +32,7 @@
 =head1 branchoverdues.pl
 
  this module is a new interface, allow to the librarian to check all items on 
overdues (based on the acountlines type 'FU' )
- this interface is filtered by branches (automaticly), and by departement 
(optional) ....
+ this interface is filtered by branches (automaticly), and by department 
(optional) ....
  all informations are stocked in the notifys BDD
 
  FIXME for this time, we have only four methods to notify :
@@ -80,7 +80,7 @@
 my $method         = $input->param('method');
 my $overduelevel   = $input->param('overduelevel');
 my $notifyId       = $input->param('notifyId');
-my $departement = $input->param('departement');
+my $department = $input->param('department');
 
 # now create the line in bdd (notifys)
 if ( $input->param('action') eq 'add' ) {
@@ -100,28 +100,28 @@
 my @todayoverduesloop;
 my $counter = 0;
 
-my @getoverdues = GetOverduesForBranch( $default, $departement );
+my @getoverdues = GetOverduesForBranch( $default, $department );
 
-# filter by departement
-if ($departement) {
-    my ( $departementlib, $departementValue ) = 
GetDepartementLib($departement);
+# filter by department
+if ($department) {
+    my ( $departmentlib, $departmentValue ) = GetDepartementLib($department);
     $template->param(
-        departement      => $departementlib,
-        departementValue => $departementValue,
+        department      => $departmentlib,
+        departmentValue => $departmentValue,
     );
 }
 else {
 
-    # initiate the selector of departements .....
-    my @getdepartements = GetDepartements();
-    my @departementsloop;
-    foreach my $dpt (@getdepartements) {
-        my %departement;
-        $departement{'authorised_value'} = $dpt->{'authorised_value'};
-        $departement{'lib'}              = $dpt->{'lib'};
-        push( @departementsloop, \%departement );
+    # initiate the selector of departments .....
+    my @getdepartments = GetDepartements();
+    my @departmentsloop;
+    foreach my $dpt (@getdepartments) {
+        my %department;
+        $department{'authorised_value'} = $dpt->{'authorised_value'};
+        $department{'lib'}              = $dpt->{'lib'};
+        push( @departmentsloop, \%department );
     }
-    $template->param( departementsloop => address@hidden, );
+    $template->param( departmentsloop => address@hidden, );
 }
 
 # now display infos

Index: koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl        9 Mar 2007 
14:47:38 -0000       1.4
+++ koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl        10 Mar 2007 
06:22:52 -0000      1.5
@@ -91,8 +91,8 @@
        <tr><th>Category code</th><td><input type="text" name="categorycode" 
size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
        <!-- /TMPL_IF -->
        <tr><th>Description</th><td>&nbsp; <input type="text" 
name="description" size="40" maxlength="80" value="<!-- TMPL_VAR 
NAME=description -->" /></td></tr>
-       <tr><th>Enrolment period</th><td>&nbsp; <input type="text" 
name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR 
NAME=enrolmentperiod -->" /> months</td></tr>
-       <tr><th>Age Required</th><td>&nbsp; <input type="text" 
name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" 
size="3" maxlength="3" /> years</td></tr>
+       <tr><th>Enrollment period</th><td>&nbsp; <input type="text" 
name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR 
NAME=enrolmentperiod -->" /> months</td></tr>
+       <tr><th>Age required</th><td>&nbsp; <input type="text" 
name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" 
size="3" maxlength="3" /> years</td></tr>
        <tr><th>Upperage limit</th><td>&nbsp; <input type="text" 
name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR 
NAME=upperagelimit -->" /> years</td></tr>
        <tr><th>Enrollment fee</th><td>$ <input type="text" name="enrolmentfee" 
size="6" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
        <tr><th>Overdue notice required</th><td>&nbsp; <select 
name="overduenoticerequired" id="overduenoticerequired">

Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl    9 Mar 2007 
15:37:51 -0000       1.2
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl    10 Mar 2007 
06:22:52 -0000      1.3
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced 
Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue: Advanced 
Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
@@ -7,7 +7,7 @@
 <!-- TMPL_IF NAME="expanded_options" -->
 <h1>Advanced Search</h1>
 <!-- TMPL_ELSE -->
-<h1>Search the Library Catalog</h1>
+<h1>Search the Library Catalogue</h1>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="if_expanded_options_actually_worked" -->
@@ -38,7 +38,7 @@
 <!-- /REMOTE DATABASES -->
 <!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
-<h3>Search the Library Catalog</h3>
+<h3>Search the Library Catalogue</h3>
 <!-- /TMPL_IF -->
 
 <!-- BOOLEAN SEARCH OPTIONS -->

Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl    9 Mar 2007 
15:41:07 -0000       1.2
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl    10 Mar 2007 
06:22:52 -0000      1.3
@@ -6,30 +6,30 @@
 <h1>Circulation: Branch Overdues</h1>
 
 <div id="mainbloc">
-<!-- selector of departement -->
-<fieldset id="branch_odues_select_departement">
-<!-- TMPL_IF NAME="departement" -->
-<legend>departement selected</legend>
+<!-- selector of department -->
+<fieldset id="branch_odues_select_department">
+<!-- TMPL_IF NAME="department" -->
+<legend>department selected</legend>
 <form name="changedepartment" action="branchoverdues.pl">
     <ul>
         <li>
-            You are working actually on the overdues for the departement : 
<b><!-- TMPL_VAR NAME="departement" --></b>
-    <input type="submit" name="changedepartement" class="button" value="change 
departement">
+            You are working actually on the overdues for the department : 
<b><!-- TMPL_VAR NAME="department" --></b>
+    <input type="submit" name="changedepartment" class="button" value="change 
department">
         </li>
     </ul>
 </form>
 <!-- TMPL_ELSE -->
-<legend>Select your departement</legend>
+<legend>Select your department</legend>
 <ul>
     <li>
-        <form name="selectdepartement" action="branchoverdues.pl" 
method="post">
-        <select id="departement" name="departement">
-            <option value="">All departements</option>
-            <!-- TMPL_LOOP NAME="departementsloop" -->
+        <form name="selectdepartment" action="branchoverdues.pl" method="post">
+        <select id="department" name="department">
+            <option value="">All departments</option>
+            <!-- TMPL_LOOP NAME="departmentsloop" -->
                 <option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- 
TMPL_VAR NAME="lib" --></option>
             <!-- /TMPL_LOOP -->
         </select>
-        <input type="submit" name="departement" class="button" value="change 
departement">
+        <input type="submit" name="department" class="button" value="change 
department">
         </form>
     </li>
 </ul>
@@ -37,7 +37,7 @@
 </fieldset>
 
     <fieldset id="branch_odues_global_odues">
-    <legend>Overdues of your library</legend>
+    <legend>Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></legend>
     <form name="sendnotify" action="branchoverdues.pl" method="post">
     <!-- TMPL_IF name="overduesloop" -->
         <table>
@@ -87,24 +87,24 @@
                     <td align="center">
                     <!-- TMPL_IF NAME="overdue1" -->
                         <!-- TMPL_IF NAME="borroweremail" -->
-                            <a 
href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=mail&departement=<!-- TMPL_VAR NAME="departementValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR 
NAME="notify_id" -->">mail</a>
+                            <a 
href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=mail&department=<!-- TMPL_VAR NAME="departmentValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR 
NAME="notify_id" -->">mail</a>
                         <!-- TMPL_ELSE -->
                             mail
                         <!-- /TMPL_IF -->
                             &nbsp;|&nbsp;
-                            <a 
href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=phone&departement=<!-- TMPL_VAR NAME="departementValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR 
NAME="notify_id" -->
+                            <a 
href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=phone&department=<!-- TMPL_VAR NAME="departmentValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR 
NAME="notify_id" -->
                             ">phone</a>
                             &nbsp;|&nbsp;
-                            <a 
href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=letter&departement=<!-- TMPL_VAR NAME="departementValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
+                            <a 
href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=letter&department=<!-- TMPL_VAR NAME="departmentValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
                             &notifyId=<!-- TMPL_VAR NAME="notify_id" 
-->">letter</a>
                     <!-- /TMPL_IF -->
                     
                     <!-- TMPL_IF NAME="overdue2" -->
-                        <a 
href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=letter&departement=<!-- TMPL_VAR NAME="departementValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR 
NAME="notify_id" -->">letter</a>
+                        <a 
href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=letter&department=<!-- TMPL_VAR NAME="departmentValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR 
NAME="notify_id" -->">letter</a>
                     <!-- /TMPL_IF -->
                     
                     <!-- TMPL_IF NAME="overdue3" -->
-                    <a href="branchoverdues.pl?action=add&borrowernumber=<!-- 
TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=lost&departement=<!-- TMPL_VAR NAME="departementValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
+                    <a href="branchoverdues.pl?action=add&borrowernumber=<!-- 
TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=lost&department=<!-- TMPL_VAR NAME="departmentValue" 
-->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
                     &notifyId=<!-- TMPL_VAR NAME="notify_id" -->">Considered 
lost</a>
                     <!-- /TMPL_IF -->
                     
@@ -169,7 +169,7 @@
                     </td>
                 
                     <td>
-                    <a 
href="branchoverdues.pl?action=remove&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=phone&departement=<!-- TMPL_VAR NAME="departementValue" 
-->&notify_date=<!-- TMPL_VAR NAME="notify_date" -->">cancel notification</a>
+                    <a 
href="branchoverdues.pl?action=remove&borrowernumber=<!-- TMPL_VAR 
NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" 
-->&method=phone&department=<!-- TMPL_VAR NAME="departmentValue" 
-->&notify_date=<!-- TMPL_VAR NAME="notify_date" -->">cancel notification</a>
                     </td>
                 </tr>
             <!-- /TMPL_LOOP -->

Index: koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl       9 Mar 2007 
23:49:09 -0000       1.10
+++ koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl       10 Mar 2007 
06:22:52 -0000      1.11
@@ -112,7 +112,7 @@
     <legend>Search for a borrower</legend>
 
     <p>
-    <label for="findborrower">Enter borrower card number or partial last name: 
</label>
+    <label for="findborrower">Enter borrower card number or partial name: 
</label>
     <input id="findborrower" name="findborrower" type="text" size="40"/>
     </p>
 

Index: koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc  9 Mar 2007 23:36:24 
-0000       1.9
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc  10 Mar 2007 06:22:52 
-0000      1.10
@@ -64,9 +64,9 @@
     </ul>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_parameters" -->
-    <a href="/cgi-bin/koha/admin/admin-home.pl">Koha Administration</a>
+    <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
         <ul>
-            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System 
Preferences</a></li>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System 
preferences</a></li>
         </ul>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_tools" -->
@@ -76,7 +76,7 @@
     <!-- TMPL_IF NAME="loggedinusername" -->
     <ul>
     <li>
-        <b> Login Information</b> :
+        <b> Login information</b> :
     </li>
     </ul>
     <ul>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]