[Koha-cvs] koha catalogue/search.pl circ/currenttransfers.... [rel_3_0]
paul poulain
paul at koha-fr.org
Thu Mar 8 18:26:52 CET 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 07/03/08 17:26:51
Modified files:
catalogue : search.pl
circ : currenttransfers.pl
koha-tmpl/intranet-tmpl/prog/en/acqui: booksellers.tmpl
koha-tmpl/intranet-tmpl/prog/en/admin: aqbookfund.tmpl
authtypes.tmpl
marctagstructure.tmpl
roadtype.tmpl
koha-tmpl/intranet-tmpl/prog/en/bookshelves: shelves.tmpl
koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl
issuehistory.tmpl
koha-tmpl/intranet-tmpl/prog/en/circ: branchtransfers.tmpl
waitingreservestransfers.tmpl
koha-tmpl/intranet-tmpl/prog/en/includes: menu-tools.inc
koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl
memberentryC.tmpl
memberentryI.tmpl
memberentryP.tmpl
moremember.tmpl
koha-tmpl/intranet-tmpl/prog/en/reports: acquisitions_stats.tmpl
bor_issues_top.tmpl
borrowers_out.tmpl
borrowers_stats.tmpl
catalogue_out.tmpl
catalogue_stats.tmpl
cat_issues_top.tmpl
issues_avg_stats.tmpl
issues_by_borrower_category.tmpl
issues_stats.tmpl
koha-tmpl/intranet-tmpl/prog/en/serials: serials-collection.tmpl
serials-home.tmpl
subscription-add.tmpl
subscription-detail.tmpl
koha-tmpl/intranet-tmpl/prog/en/tools: cleanborrowers.tmpl
koha-news.tmpl
Log message:
this commit, even if huge, should be harmless. it contains :
- some visual improvements (repeated titles removed, 3 colors/classes in members detail like in biblio detail, some buttons moved, tools module menu completed...)
- a hardcoded string in search.pl has been moved to the template to be translatable (and/or/not + Scan indexes)
- some _() have been added in javascript to get the strings in translation tool
- some strings have been splitted when they mean 2 different concepts that needs different words in a language other than english, even if in english there is only one (like "issues", used for issuing books & serial issues. "serial" added where needed for example)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.17&r2=1.1.2.18
http://cvs.savannah.gnu.org/viewcvs/koha/circ/currenttransfers.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.10&r2=1.3.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.15&r2=1.1.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.14&r2=1.1.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.5&r2=1.4.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.5&r2=1.3.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.11.2.12&r2=1.11.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.17&r2=1.9.2.18
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.15&r2=1.6.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.15&r2=1.7.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.29&r2=1.12.2.30
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.10&r2=1.1.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.5&r2=1.5.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.10&r2=1.3.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.12&r2=1.3.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.5&r2=1.1.2.6
Patches:
Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -b -r1.1.2.17 -r1.1.2.18
--- catalogue/search.pl 20 Feb 2007 06:35:57 -0000 1.1.2.17
+++ catalogue/search.pl 8 Mar 2007 17:26:50 -0000 1.1.2.18
@@ -2,7 +2,7 @@
# Script to perform searching
# For documentation try 'perldoc /path/to/search'
#
-# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.17 2007/02/20 06:35:57 kados Exp $
+# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.18 2007/03/08 17:26:50 tipaul Exp $
#
# Copyright 2006 LibLime
#
@@ -279,21 +279,19 @@
if ($i==0) {
push @search_boxes_array,
{indexes => $this_index,
- search_boxes_label => "<span class='labels'>Search for:</span>",
- scan_index => "<input type='checkbox' name='scan' id='scan' value='1'/><label for='scan'>Scan Indexes</label>",
+ search_boxes_label => 1,
+ scan_index => 1,
};
}
elsif ($i==$search_boxes_count) {
push @search_boxes_array,
{indexes => $indexes,
- left_content => " <select name='op'><option value='and' selected='selected'>and</option><option value='or'>or</option><option value='not'>not</option></select>",
- add_field => "1"};
+ add_field => "1",};
}
else {
push @search_boxes_array,
- {indexes => $indexes,
- left_content => " <select name='op'><option value='and' selected='selected'>and</option><option value='or'>or</option><option value='not'>not</option></select>",};
+ {indexes => $indexes,};
}
}
$template->param(uc(C4::Context->preference("marcflavour")) => 1,
Index: circ/currenttransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/currenttransfers.pl,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -b -r1.3.2.10 -r1.3.2.11
--- circ/currenttransfers.pl 18 Dec 2006 17:50:14 -0000 1.3.2.10
+++ circ/currenttransfers.pl 8 Mar 2007 17:26:50 -0000 1.3.2.11
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: currenttransfers.pl,v 1.3.2.10 2006/12/18 17:50:14 alaurin Exp $
+# $Id: currenttransfers.pl,v 1.3.2.11 2007/03/08 17:26:50 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -135,7 +135,7 @@
$template->param(
branchesloop => \@branchesloop,
- show_date => $todaysdate
+ show_date => format_date($todaysdate),
);
output_html_with_http_headers $input, $cookie, $template->output;
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl 25 Jan 2007 17:38:40 -0000 1.1.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl 8 Mar 2007 17:26:50 -0000 1.1.2.5
@@ -7,7 +7,7 @@
<table>
<tr>
<th>Order</th>
- <th>Receive</th>
+ <th>Order receive</th>
<th>Company</th>
<th> </th>
</tr>
Index: koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl 17 Oct 2006 16:18:14 -0000 1.2.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl 8 Mar 2007 17:26:51 -0000 1.2.2.2
@@ -204,7 +204,6 @@
<p>
<input type="button" value="Submit" onclick="Check(this.form); return false;" />
- <input type="reset" value="Reset" />
</p>
</form>
<!-- /TMPL_IF --> <!-- add_form -->
Index: koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl 23 Jan 2007 16:15:07 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.2
@@ -112,7 +112,7 @@
<tr>
<th>Code</th>
<th>Description</th>
- <th>summary</th>
+ <th>Summary</th>
<th>Tag reported</th>
<th> </th>
<th>Edit</th>
Index: koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/Attic/marctagstructure.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl 1 Nov 2006 20:15:01 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.2
@@ -147,7 +147,7 @@
<th>Lib</th>
<th>Repeatable</th>
<th>Mandatory</th>
- <th>Authorized<br />value</th>
+ <th>Auth value</th>
<th>Subfields</th>
<th>Edit</th>
<th>Delete</th>
Index: koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl 23 May 2006 11:44:23 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.1
@@ -5,9 +5,9 @@
<!-- TMPL_IF NAME="add_form" -->
<!-- TMPL_IF NAME="id_city" -->
- <h1>Modifier un type de voie</h1>
+ <h1>Modify road type</h1>
<!-- TMPL_ELSE -->
- <h1>Ajouter un type de voie</h1>
+ <h1>Add road type</h1>
<!-- /TMPL_IF -->
<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
Index: koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -b -r1.1.2.15 -r1.1.2.16
--- koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl 5 Feb 2007 15:57:37 -0000 1.1.2.15
+++ koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.16
@@ -127,8 +127,8 @@
<option value="2">Public</option>
</select></td></tr></table>
<ul>
- <li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li>
- <li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
+ <li>A <b>private</b> virtual shelf is managed by you and can be seen only by you.</li>
+ <li> A <b>public</b> virtual shelf can be seen by everybody, but managed only by you.</li>
</ul>
<p><input type="submit" value="Add New Shelf"></p>
</form>
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/advsearch.tmpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -b -r1.1.2.14 -r1.1.2.15
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl 5 Feb 2007 15:40:07 -0000 1.1.2.14
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.15
@@ -47,7 +47,13 @@
<!-- TMPL_LOOP NAME="search_boxes_loop" -->
<!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE --><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR NAME="left_content" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="expanded_options" -->
+ <select name='op'>
+ <option value='and' selected='selected'>and</option>
+ <option value='or'>or</option>
+ <option value='not'>not</option>
+ </select>
+ <!-- /TMPL_IF -->
<select name="idx">
<option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
<option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
@@ -76,7 +82,7 @@
</select>
<input type="text" size="30" name="q" title="Enter search terms" value=""/>
<!-- TMPL_IF NAME="expanded_options" -->
- <!-- TMPL_IF NAME="scan_index" --><!-- TMPL_VAR NAME="scan_index" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="scan_index" --><input type='checkbox' name='scan' id='scan' value='1'/><label for='scan'>Scan Indexes</label><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="add_field" --><a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a><!-- /TMPL_IF -->
<!-- /TMPL_IF -->
</p>
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/issuehistory.tmpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl 11 Jan 2007 17:09:46 -0000 1.1.2.6
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.7
@@ -3,7 +3,7 @@
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
- <h1>Issue hitory for <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) </h1>
+ <h1>Issue history for <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) </h1>
<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -b -r1.4.2.5 -r1.4.2.6
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl 17 Nov 2006 14:57:22 -0000 1.4.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl 8 Mar 2007 17:26:51 -0000 1.4.2.6
@@ -116,7 +116,7 @@
<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
<!-- /TMPL_LOOP -->
- <input type="submit" value="Transfer" />
+ <input type="submit" value="Do transfer" />
</form>
<!-- TMPL_IF Name="transferred" -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl 17 Nov 2006 14:57:22 -0000 1.2.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl 8 Mar 2007 17:26:51 -0000 1.2.2.3
@@ -8,8 +8,6 @@
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-<h1>Circulation: Transfers To do</h1>
-
<div id="mainbloc">
<h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
<div id="resultlist">
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -b -r1.3.2.5 -r1.3.2.6
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc 11 Jan 2007 13:43:59 -0000 1.3.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc 8 Mar 2007 17:26:51 -0000 1.3.2.6
@@ -2,9 +2,15 @@
<a href="/cgi-bin/koha/tools/tools-home.pl">Home</a>
<a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a>
<a href="/cgi-bin/koha/tools/koha-news.pl">News</a>
+ <a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a>
+ <a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean borrowers</a>
+ <a href="/cgi-bin/koha/tools/itemslost.pl">Items lost</a>
<a href="/cgi-bin/koha/tools/export.pl">Export</a>
+ <a href="/cgi-bin/koha/tools/import.pl">Import</a>
+ <a href="/cgi-bin/koha/tools/letter.pl">Letters</a>
<a href="/cgi-bin/koha/tools/breeding.pl">Reservoir</a>
<a href="/cgi-bin/koha/tools/barcodes.pl">Barcodes</a>
+ <a href="/cgi-bin/koha/tools/overduerules.pl">overdue rules</a>
<a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a>
</div>
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.11.2.12
retrieving revision 1.11.2.13
diff -u -b -r1.11.2.12 -r1.11.2.13
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 29 Jan 2007 16:35:13 -0000 1.11.2.12
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 8 Mar 2007 17:26:51 -0000 1.11.2.13
@@ -124,7 +124,7 @@
<!-- TMPL_ELSE -->
<label>
<!-- /TMPL_IF-->
- Title</label>
+ Civility</label>
<!-- TMPL_VAR NAME="borrotitlepopup" -->
</p>
@@ -578,7 +578,7 @@
</p>
<!--this zones are not necessary in modif mode -->
<!-- TMPL_UNLESS NAME="opadd" -->
- <h1>Warning</h1>
+ <h2>Warning</h2>
<!-- TMPL_LOOP NAME="flagloop" -->
<p>
<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.9.2.17
retrieving revision 1.9.2.18
diff -u -b -r1.9.2.17 -r1.9.2.18
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 29 Jan 2007 16:35:13 -0000 1.9.2.17
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 8 Mar 2007 17:26:51 -0000 1.9.2.18
@@ -3,7 +3,9 @@
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-
+<script language="javascript" type="text/javascript">
+ function _(s) { return s } // dummy function for gettext
+</script>
<!-- TMPL_IF NAME="add" -->
<h1>
Add children member (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
@@ -124,7 +126,7 @@
<!-- TMPL_ELSE -->
<label>
<!-- /TMPL_IF-->
- Title</label>
+ Civility</label>
<!-- TMPL_VAR NAME="borrotitlepopup" -->
</p>
<p>
@@ -235,7 +237,7 @@
</p>
</fieldset>
<div>
- <input type="button" name="next_step" value="Next Step" onclick="if(document.form.guarantorinfo.value){check_form_borrowers(1)} else{alert('You must defined a guarantor');};">
+ <input type="button" name="next_step" value="Next Step" onclick="if(document.form.guarantorinfo.value){check_form_borrowers(1)} else{alert(_('You must define a guarantor'));};">
</div>
</form>
<!-- ************************ STEP_1 *********************** -->
@@ -412,7 +414,7 @@
</p>
</fieldset>
<fieldset>
- <legend>Guarantor contact</legend>
+ <legend>Contact</legend>
<h2>Guarantor</h2>
<p>
<!-- TMPL_IF NAME="mandatoryphone" -->
@@ -627,7 +629,7 @@
</p>
<!--this zones are not necessary in modif mode -->
<!-- TMPL_UNLESS NAME="opadd" -->
- <h1>Warning</h1>
+ <h2>Warning</h2>
<!-- TMPL_LOOP NAME="flagloop" -->
<p>
<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl,v
retrieving revision 1.6.2.15
retrieving revision 1.6.2.16
diff -u -b -r1.6.2.15 -r1.6.2.16
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl 29 Jan 2007 16:35:13 -0000 1.6.2.15
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl 8 Mar 2007 17:26:51 -0000 1.6.2.16
@@ -438,7 +438,7 @@
</p>
<!--this zones are not necessary in modif mode -->
<!-- TMPL_UNLESS NAME="opadd" -->
- <h1>Warning</h1>
+ <h2>Warning</h2>
<!-- TMPL_LOOP NAME="flagloop" -->
<p>
<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.7.2.15
retrieving revision 1.7.2.16
diff -u -b -r1.7.2.15 -r1.7.2.16
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 5 Feb 2007 15:34:36 -0000 1.7.2.15
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 8 Mar 2007 17:26:51 -0000 1.7.2.16
@@ -123,7 +123,7 @@
<!-- TMPL_ELSE -->
<label>
<!-- /TMPL_IF-->
- Title</label>
+ Civility</label>
<!-- TMPL_VAR NAME="borrotitlepopup" -->
</p>
<p>
@@ -629,7 +629,7 @@
</p>
<!--this zones are not necessary in modif mode -->
<!-- TMPL_UNLESS NAME="opadd" -->
- <h1>Warning</h1>
+ <h2>Warning</h2>
<!-- TMPL_LOOP NAME="flagloop" -->
<p>
<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.12.2.29
retrieving revision 1.12.2.30
diff -u -b -r1.12.2.29 -r1.12.2.30
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 5 Feb 2007 15:34:36 -0000 1.12.2.29
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 8 Mar 2007 17:26:51 -0000 1.12.2.30
@@ -20,12 +20,12 @@
<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
</form>
<div id="action">
+ <div class="edit">
<!-- TMPL_IF name="adultborrower" -->
<a href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=C">
Add child
</a>
<!-- /TMPL_IF -->
-
<!-- TMPL_IF NAME="category_type" -->
<!--TMPL_IF NAME="guarantor"-->
<a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
@@ -55,6 +55,8 @@
<a href="javascript:confirm_deletion();">
Delete
</a>
+ </div>
+ <div class="view">
<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
Account
</a>
@@ -67,9 +69,12 @@
<a href="javascript:confirm_reregistration();" onclick="javascript:document.form.value='y'" class="gest_borro_op">
Renew
</a>
+ </div>
+ <div class="others">
<!-- TMPL_IF NAME="CAN_user_parameters"-->
<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&module=MEMBERS&action=MODIFY&object=<!-- TMPL_VAR NAME="borrowernumber"-->">Modification Log</a>
<!-- /TMPL_IF -->
+ </div>
</div>
<br />
<!-- TMPL_IF NAME="flagged" -->
@@ -91,7 +96,7 @@
<fieldset>
<legend>Borrower Information</legend>
- <!-- TMPL_UNLESS NAME="I" --> <p><label>Title:</label><!-- TMPL_VAR NAME="title" --> </p>
+ <!-- TMPL_UNLESS NAME="I" --> <p><label>Civility:</label><!-- TMPL_VAR NAME="title" --> </p>
<p><label>First Name:</label><!-- TMPL_VAR NAME="firstname" --></p><!-- /TMPL_UNLESS -->
<p>
<!-- TMPL_IF NAME="I" --><label>Organisation Name: </label><!-- TMPL_ELSE --><label>Last Name: </label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" -->
@@ -250,13 +255,18 @@
<!-- TMPL_IF name="norenew" -->
<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Reserved</a>
<!-- TMPL_ELSE -->
+ <!-- TMPL_IF NAME="red" -->
<input type="checkbox"
name="items[]"
value="<!-- TMPL_VAR NAME="itemnumber" -->"
- <!-- TMPL_IF NAME="red" -->
checked="checked"
- <!-- /TMPL_IF -->
/>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox"
+ name="items[]"
+ value="<!-- TMPL_VAR NAME="itemnumber" -->"
+ />
+ <!-- /TMPL_IF -->
<input type="checkbox"
name="all_items[]"
value="<!-- TMPL_VAR NAME="itemnumber" -->"
Index: koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl 2 Oct 2006 15:38:43 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.3
@@ -11,7 +11,7 @@
<!-- TMPL_IF NAME="do_it" -->
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Acquisitions statistics </h1>
+ <h1>Acquisitions statistics </h1>
<!-- TMPL_IF NAME="loopfilter" -->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -55,7 +55,7 @@
</table>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
- <h1>Koha : Acquisitions statistics </h1>
+ <h1>Acquisitions statistics</h1>
<form method="post">
<table>
<thead>
@@ -220,7 +220,7 @@
<td> </td>
</tr>
<tr class="hilighted">
- <td>Book Seller</td>
+ <td>Supplier</td>
<td><input type="radio" name="Line" value="aqbooksellers.name" /></td>
<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
<td ><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
Index: koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.3
@@ -16,7 +16,7 @@
}
</script>
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Top <!-- TMPL_VAR NAME="limit"--> List borrowers for Issues </h1>
+ <h1>Top <!-- TMPL_VAR NAME="limit"--> List borrowers for Issues</h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -57,7 +57,7 @@
</table>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
- <h1>Koha : Top List borrowers for Issues </h1>
+ <h1>Top List borrowers for Issues</h1>
<form method="post">
<table>
Index: koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl 30 Oct 2006 10:04:21 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.3
@@ -11,7 +11,7 @@
<!-- TMPL_IF NAME="do_it" -->
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Borrowers with No Issues </h1>
+ <h1>Borrowers with No Issues</h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -40,7 +40,7 @@
</table>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
- <h1>Koha : Borrowers with no Issues </h1>
+ <h1>Borrowers with no Issues</h1>
<form method="post">
<table>
Index: koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl 10 Nov 2006 09:07:40 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.3
@@ -11,7 +11,7 @@
<!-- TMPL_IF NAME="do_it" -->
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Borrowers statistics </h1>
+ <h1>Borrowers statistics</h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
Index: koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl 26 Sep 2006 13:15:42 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.2
@@ -11,7 +11,7 @@
<!-- TMPL_IF NAME="do_it" -->
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Items with no Issues </h1>
+ <h1>Items with no Issues</h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -40,7 +40,7 @@
</table>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
- <h1>Koha : Items with no Issues </h1>
+ <h1>Items with no Issues</h1>
<form method="post">
<table>
Index: koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl 26 Sep 2006 13:15:42 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.2
@@ -11,7 +11,7 @@
<!-- TMPL_IF NAME="do_it" -->
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Catalogue statistics </h1>
+ <h1>Catalogue statistics</h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -55,7 +55,7 @@
</table>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
- <h1>Koha : Catalogue statistics</h1>
+ <h1>Catalogue statistics</h1>
<form method="post">
<table>
<thead>
Index: koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl 27 Feb 2007 14:17:12 -0000 1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.4
@@ -17,7 +17,7 @@
}
</script>
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Issues </h1>
+ <h1>Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Issues </h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -58,7 +58,7 @@
</table>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
- <h1>Koha : Top List On Catalogue Issues </h1>
+ <h1>Top List On Catalogue Issues</h1>
<form method="post">
<table>
Index: koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl 12 Dec 2006 08:23:10 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.3
@@ -11,7 +11,7 @@
<!-- TMPL_IF NAME="do_it" -->
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Issues Average Period statistics </h1>
+ <h1>Issues Average Period statistics </h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
Index: koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl 26 Sep 2006 13:15:42 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.2
@@ -10,7 +10,7 @@
<!-- TMPL_IF NAME="do_it" -->
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Issues by borrower category <!--TMPL_IF NAME="borrower_category" --> for category = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF --></h1>
+ <h1>Issues by borrower category <!--TMPL_IF NAME="borrower_category" --> for category = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF --></h1>
<table>
<tr>
<th> </th>
Index: koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl 26 Sep 2006 13:15:42 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.2
@@ -11,7 +11,7 @@
<!-- TMPL_IF NAME="do_it" -->
<!-- TMPL_LOOP NAME="mainloop" -->
- <h1>Koha : Issues statistics </h1>
+ <h1>Issues statistics </h1>
<!-- TMPL_IF NAME="loopfilter"-->
<p>Filtered on</p>
<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -55,7 +55,7 @@
</table>
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
- <h1>Koha : Issues statistics </h1>
+ <h1>Issues statistics </h1>
<form method="post">
<table>
<thead>
Index: koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/Attic/serials-collection.tmpl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl 26 Jan 2007 20:48:36 -0000 1.1.2.10
+++ koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.11
@@ -241,7 +241,7 @@
<!--TMPL_ELSE -->
<div name="yeardata" id="<!-- TMPL_VAR NAME="year" -->" class="content_hidden">
<!--/TMPL_IF -->
-<p><input type="submit" value="Edit serials" class="button bull"></p>
+<p><input type="submit" value="Edit serials"></p>
<table width="400px">
<tr>
<!--TMPL_UNLESS Name="onesubscription"-->
@@ -301,7 +301,7 @@
</tr>
<!-- /TMPL_LOOP -->
</table>
- <p><input type="submit" value="Edit serials" class="button bull"></p>
+ <p><input type="submit" value="Edit serials"></p>
</div>
<!--/TMPL_LOOP -->
<input type="hidden" name="subscriptionid" value="<!--TMPL_VAR Name="subscriptionidlist"-->">
Index: koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -b -r1.5.2.5 -r1.5.2.6
--- koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl 11 Jan 2007 15:30:52 -0000 1.5.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl 8 Mar 2007 17:26:51 -0000 1.5.2.6
@@ -3,9 +3,9 @@
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
-<h1>Serials</h1>
+<h1>Serials subscription</h1>
<div id="serials_home">
- <h2>Serials subscriptions</h2>
+ <h2>Search existing subscription</h2>
<!-- TMPL_IF NAME="routing" -->
<h3>Search for Serial Routing List</h3>
<!-- /TMPL_IF -->
@@ -103,7 +103,7 @@
<!-- TMPL_ELSE -->
<td>
<!-- /TMPL_IF -->
- <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&serstatus=1">Receive</a>
+ <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&serstatus=1">Serial receive</a>
</td>
</tr>
<!-- /TMPL_LOOP -->
@@ -112,7 +112,12 @@
<!-- TMPL_IF NAME="routing" -->
<!-- TMPL_ELSE -->
- <a href="/cgi-bin/koha/serials/subscription-add.pl" class="button serial">Add subscription</a>
+ <h2>Add a new subscription</h2>
+ <div id="action">
+ <a href="/cgi-bin/koha/serials/subscription-add.pl" class="button serial">
+ Add subscription
+ </a>
+ </div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -b -r1.3.2.10 -r1.3.2.11
--- koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl 26 Jan 2007 20:48:36 -0000 1.3.2.10
+++ koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl 8 Mar 2007 17:26:51 -0000 1.3.2.11
@@ -16,9 +16,11 @@
<script type="text/javascript" language="javascript">
<!--
+ function _(s) { return s } // dummy function for gettext
+
// the english words used in display purposes
-var text = new Array('Number','Volume','Issue','Month','Week','Starting with:','Rollover at:','Choose Hemisphere:','Northern','Southern',
-'Autumn','Winter','Spring','Summer','Fall','Season','Year');
+var text = new Array(_('Number'),_('Volume'),_('Issue'),_('Month'),_('Week'),_('Starting with:'),_('Rollover at:'),_('Choose Hemisphere:'),_('Northern'),_('Southern'),
+_('Autumn'),_('Winter'),_('Spring'),_('Summer'),_('Fall'),_('Season'),_('Year'));
var is_season = 0;
var is_hemisphere = 1;
@@ -42,7 +44,7 @@
document.f.lastvalue1.value=1;
document.f.lastvalue2.value=1;
document.f.lastvalue3.value=1;
- document.f.numberingmethod.value='Vol {X}, No {Y}, Issue {Z}';
+ document.f.numberingmethod.value=_('Vol {X}, No {Y}, Issue {Z}');
moreoptions(text[1],text[0],text[2]);
display_table(0); // toggle info box on (1) or off (0)
break;
@@ -62,7 +64,7 @@
document.f.lastvalue1.value=1;
document.f.lastvalue2.value=1;
document.f.lastvalue3.value='';
- document.f.numberingmethod.value='Vol {X}, No {Y}';
+ document.f.numberingmethod.value=_('Vol {X}, No {Y}');
moreoptions(text[1],text[0]);
display_table(0);
break;
@@ -82,7 +84,7 @@
document.f.lastvalue1.value=1;
document.f.lastvalue2.value=1;
document.f.lastvalue3.value='';
- document.f.numberingmethod.value='Vol {X}, Issue {Y}';
+ document.f.numberingmethod.value=_('Vol {X}, Issue {Y}');
moreoptions(text[1],text[2]);
display_table(0);
break;
@@ -102,7 +104,7 @@
document.f.lastvalue1.value=1;
document.f.lastvalue2.value=1;
document.f.lastvalue3.value='';
- document.f.numberingmethod.value='No {X}, Issue {Y}';
+ document.f.numberingmethod.value=_('No {X}, Issue {Y}');
moreoptions(text[0],text[2]);
display_table(0);
break;
@@ -125,7 +127,7 @@
document.f.lastvalue2.value='1';
document.f.lastvalue3.value='';
document.f.periodicity.value='8';
- document.f.numberingmethod.value='{Y} {X}';
+ document.f.numberingmethod.value=_('{Y} {X}');
moreoptions_seasons(text[15],sYear);
display_table(0);
is_season = 1;
@@ -218,8 +220,8 @@
var errortext='';
if(periodicity == 1){
document.getElementById("irregularity").innerHTML = '';
- var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
- errortext ="Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
+ var daynames = new Array(_('Monday'),_('Tuesday'),_('Wednesday'),_('Thursday'),_('Friday'),_('Saturday'),_('Sunday'));
+ errortext =_("Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>");
for(var j=0;j<daynames.length;j++){
errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" ";
}
@@ -258,14 +260,14 @@
textbox +="<\/tr>\n";
if(y){
textbox +="<tr><td>"+text[6]+"<\/td>";
- textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
+ textbox +="<td><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"<\/a><\/td>\n";
textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
if(z){
textbox +="<td><input type='text' name='whenmorethantemp3' size='4' onkeyup='moreoptionsupdate(\"whenmorethan3\",1)'><\/td>\n";
}
textbox +="<\/tr>";
} else {
- textbox +="<tr> <td> issues expected</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br/><a href='javascript:irregularity_check()'>Irregularity?</a></td></tr>";
+ textbox +="<tr> <td>"+_('issues expected')+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br/><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"</a></td></tr>";
}
textbox +="<\/table>\n";
}
@@ -328,7 +330,7 @@
}
textbox +="<\/select><\/td><\/tr>\n";
textbox +="<tr><td>"+text[6]+"<\/td>";
- textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
+ textbox +="<td><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"<\/a><\/td>\n";
textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
textbox +="<\/tr><\/table>\n";
}
@@ -348,7 +350,7 @@
var error='';
var toobig;
var expected;
- var errortext = "<b>Warning irregularity detected<\/b><br \/>";
+ var errortext = _("<b>Warning irregularity detected<\/b><br \/>");
switch(periodicity){
case "1":
if(rollover < 365) expected =365;
@@ -425,14 +427,14 @@
}
if(expected){
if(expected == 365){
- var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
- errortext +="Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
+ var daynames = new Array(_('Monday'),_('Tuesday'),_('Wednesday'),_('Thursday'),_('Friday'),_('Saturday'),_('Sunday'));
+ errortext += _("Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>");
for(var j=0;j<daynames.length;j++){
errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" ";
}
error=errortext;
} else {
- errortext +=expected+" issues expected "+rollover+" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>";
+ errortext +=expected+_(" issues expected ")+rollover+_(" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>");
var count=0;
for(var i=rollover;i<expected;i++){
errortext +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
@@ -444,11 +446,11 @@
}
}
if(toobig){
- errortext +=expectedover+" issues expected "+rollover+" were entered.<br \/> You seem to have indicated more issues per year than expected.";
+ errortext +=expectedover+_(" issues expected ")+rollover+_(" were entered.<br \/> You seem to have indicated more issues per year than expected.");
error=errortext;
}
if(error.length ==0){
- error='No irregularities noticed';
+ error=_('No irregularities noticed');
}
display_example(expected);
document.getElementById("irregularity").innerHTML = error;
@@ -460,8 +462,8 @@
<!-- TMPL_IF NAME="weekarrayjs" -->
var weeks = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->);
<!-- /TMPL_IF -->
- var months = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
- var seasons = new Array('Autumn','Winter','Spring','Summer','Fall');
+ var months = new Array(_('January'),_('February'),_('March'),_('April'),_('May'),_('June'),_('July'),_('August'),_('September'),_('October'),_('November'),_('December'));
+ var seasons = new Array(_('Autumn'),_('Winter'),_('Spring'),_('Summer'),_('Fall'));
var errortext='';
if(periodicity == 1) {
expected = 366;
@@ -545,7 +547,7 @@
var whenmorethan3 = parseInt(document.f.whenmorethan3.value);
var setto2 = parseInt(document.f.setto2.value);
var setto3 = parseInt(document.f.setto3.value);
- var displaytext = 'Based on the information<br \/>entered the Numbering Pattern<br \/>will look like this<br \/>\n';
+ var displaytext = _('Based on the information<br \/>entered the Numbering Pattern<br \/>will look like this<br \/>\n');
if(startfrom3>0){
var count=startfrom3-1;
var count2=startfrom2;
@@ -633,7 +635,7 @@
var unicode=e.charCode? e.charCode : e.keyCode
if (unicode!=8 && unicode !=46 && unicode!=9 && unicode !=13){ // if key isn't backspace or delete
if (unicode<48||unicode>57) { // if not a number
- alert("Needs to be entered in digit form -eg 10");
+ alert(_("Needs to be entered in digit form -eg 10"));
return false // disable key press
}
}
@@ -1039,13 +1041,13 @@
document.f.submit();
} else {
if(f.numbering_pattern.value == ''){
- alert("need to choose a numbering pattern");
+ alert(_("need to choose a numbering pattern"));
} else {
- alert("need to check for irregularity by clicking 'Irregularity?'");
+ alert(_("need to check for irregularity by clicking 'Irregularity?'"));
}
}
} else {
- alert('field marked with * are mandatory');
+ alert(_('field marked with * are mandatory'));
}
return false;
}
Index: koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl,v
retrieving revision 1.3.2.12
retrieving revision 1.3.2.13
diff -u -b -r1.3.2.12 -r1.3.2.13
--- koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl 26 Jan 2007 20:48:37 -0000 1.3.2.12
+++ koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl 8 Mar 2007 17:26:51 -0000 1.3.2.13
@@ -333,7 +333,7 @@
</table>
</fieldset>
<fieldset>
- <legend>Issues</legend>
+ <legend>Serial issues</legend>
<table cellpadding="0" cellspacing="0">
<tr>
<th>Issue number</th>
Index: koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/Attic/cleanborrowers.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl 27 Nov 2006 14:53:55 -0000 1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.4
@@ -103,9 +103,9 @@
<b>
<!-- TMPL_IF NAME="do_delete" -->
<!-- TMPL_IF NAME="trash" -->
- <!-- TMPL_VAR NAME="TotalDel" --> borrrowers has been successfuly moved to trash.
+ <!-- TMPL_VAR NAME="TotalDel" --> borrowers have been successfuly moved to trash.
<!-- TMPL_ELSE -->
- <!-- TMPL_VAR NAME="TotalDel" --> borrrowers has been successfuly deleted.
+ <!-- TMPL_VAR NAME="TotalDel" --> borrowers have been successfuly deleted.
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="do_anonym" -->
Index: koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl 10 Jan 2007 14:19:22 -0000 1.1.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl 8 Mar 2007 17:26:51 -0000 1.1.2.6
@@ -51,7 +51,7 @@
</script>
</p>
<p>
- <label for="number">Number</label>
+ <label for="number">Appear in position </label>
<!-- TMPL_IF NAME="number"-->
<input id="number" size="3" name="number" type="text" checked="1" />
<!-- TMPL_ELSE -->
More information about the Koha-cvs
mailing list