From dpavlin at rot13.org  Sun Apr  1 00:29:59 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Sun,  1 Apr 2012 00:29:59 +0200
Subject: [Koha-patches] [PATCH] Bug 7863 - opac-addbybiblionumber.pl plack
	scoping
Message-ID: <1333232999-17579-1-git-send-email-dpavlin@rot13.org>

Test scenario:

1. issue search query
2. select 1 result
3. add to: new list, list-1, private
4. select 2 results
5. add to (exiting) list-1
4. select 3 results
6. add to: new list, list-2, public
7. using lists drop-down, view and delete list-1 and list-2
---
 opac/opac-addbybiblionumber.pl |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index bea130d..b1a460e 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -31,18 +31,18 @@ use C4::VirtualShelves qw/:DEFAULT GetAllShelves/;
 use C4::Output;
 use C4::Auth;
 
-my $query        	= new CGI;
-my @biblionumber 	= $query->param('biblionumber');
-my $selectedshelf 	= $query->param('selectedshelf');
-my $newshelf 		= $query->param('newshelf');
-my $shelfnumber  	= $query->param('shelfnumber');
-my $newvirtualshelf	= $query->param('newvirtualshelf');
-my $category     	= $query->param('category');
-my $authorized          = 1;
-my $errcode		= 0;
-my @biblios;
+our $query        	= new CGI;
+our @biblionumber 	= $query->param('biblionumber');
+our $selectedshelf 	= $query->param('selectedshelf');
+our $newshelf 		= $query->param('newshelf');
+our $shelfnumber  	= $query->param('shelfnumber');
+our $newvirtualshelf	= $query->param('newvirtualshelf');
+our $category     	= $query->param('category');
+our $authorized          = 1;
+our $errcode		= 0;
+our @biblios;
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
         template_name   => "opac-addbybiblionumber.tmpl",
         query           => $query,
-- 
1.7.2.5


From tajoli at cilea.it  Sun Apr  1 11:28:57 2012
From: tajoli at cilea.it (Zeno Tajoli)
Date: Sun, 01 Apr 2012 11:28:57 +0200
Subject: [Koha-patches] [BUG 7861] Update of Italian sql files for 3.8
Message-ID: <4F781FD9.4020302@cilea.it>

This only on update of Italian SQL files.
A lien around my changes is longer of 998 chars
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Update-of-italian-sql-files-for-3.8.patch
Type: text/x-patch
Size: 59744 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20120401/2badac5d/attachment-0001.bin>

From srdjan at catalyst.net.nz  Mon Apr  2 03:00:26 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon,  2 Apr 2012 13:00:26 +1200
Subject: [Koha-patches] [PATCH] bug_7420: Added overduefinescap to
	issuingrules
In-Reply-To: <bug 7420>
References: <bug 7420>
Message-ID: <1333328426-29205-1-git-send-email-srdjan@catalyst.net.nz>

Replaced existing MaxFine syspref logic with overduefinescap.
Repurposed MaxFine to be the overall overdue limit for all items
overdue. Implemented new MaxFine logic in UpdateFine().
---
 C4/Overdues.pm                                     |   48 +++++++++++++++-----
 C4/Search.pm                                       |    2 +-
 admin/smart-rules.pl                               |    9 ++--
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/sysprefs.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl             |   15 ++++++
 .../prog/en/modules/admin/preferences/patrons.pref |    3 +-
 .../prog/en/modules/admin/smart-rules.tt           |    3 +
 8 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/C4/Overdues.pm b/C4/Overdues.pm
index 7676a87..25bb3c9 100644
--- a/C4/Overdues.pm
+++ b/C4/Overdues.pm
@@ -241,8 +241,8 @@ C<$amount> is the fine owed by the patron (see above).
 C<$chargename> is the chargename field from the applicable record in
 the categoryitem table, whatever that is.
 
-C<$daycount> is the number of days between start and end dates, Calendar adjusted (where needed), 
-minus any applicable grace period.
+C<$unitcount> is the number of chargeable units (days between start and end dates, Calendar adjusted where needed, 
+minus any applicable grace period, or hours)
 
 FIXME - What is chargename supposed to be ?
 
@@ -281,10 +281,9 @@ sub CalcFine {
     } else {
         # a zero (or null)  chargeperiod means no charge.
     }
-    if(C4::Context->preference('maxFine') && ( $amount > C4::Context->preference('maxFine'))) {
-        $amount = C4::Context->preference('maxFine');
-    }
-    return ($amount, $data->{chargename}, $days_minus_grace);
+    $amount = $data->{overduefinescap} if $data->{overduefinescap} && $amount > $data->{overduefinescap};
+    $debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $data->{'chargename'}, $days_minus_grace, $chargeable_units);
+    return ($amount, $data->{'chargename'}, $days_minus_grace, $chargeable_units);
     # FIXME: chargename is NEVER populated anywhere.
 }
 
@@ -492,14 +491,39 @@ sub UpdateFine {
 	#   "REF" is Cash Refund
     my $sth = $dbh->prepare(
         "SELECT * FROM accountlines
-		WHERE itemnumber=?
-		AND   borrowernumber=?
-		AND   accounttype IN ('FU','O','F','M')
-		AND   description like ? "
+		WHERE borrowernumber=?
+		AND   accounttype IN ('FU','O','F','M')"
     );
-    $sth->execute( $itemnum, $borrowernumber, "%$due%" );
+    $sth->execute( $borrowernumber );
+    my $data;
+    my $total_amount_other = 0.00;
+    my $due_qr = qr/$due/;
+    # Cycle through the fines and
+    # - find line that relates to the requested $itemnum
+    # - accumulate fines for other items
+    # so we can update $itemnum fine taking in account fine caps
+    while (my $rec = $sth->fetchrow_hashref) {
+        if ($rec->{itemnumber} == $itemnum && $rec->{description} =~ /$due_qr/) {
+            if ($data) {
+                warn "Not a unique accountlines record for item $itemnum borrower $borrowernumber";
+            } else {
+                $data = $rec;
+                next;
+            }
+        }
+        $total_amount_other += $rec->{'amount'};
+    }
+    if (my $maxfine = C4::Context->preference('MaxFine')) {
+        if ($total_amount_other + $amount > $maxfine) {
+            my $new_amount = $maxfine - $total_amount_other;
+            warn "Reducing fine for item $itemnum borrower $borrowernumber from $amount to $new_amount - MaxFine reached";
+            return if $new_amount <= 0.00;
+
+            $amount = $new_amount;
+        }
+    }
 
-    if ( my $data = $sth->fetchrow_hashref ) {
+    if ( $data ) {
 
 		# we're updating an existing fine.  Only modify if amount changed
         # Note that in the current implementation, you cannot pay against an accruing fine
diff --git a/C4/Search.pm b/C4/Search.pm
index 56468b5..5aaa1f4 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -26,7 +26,7 @@ use C4::Search::PazPar2;
 use XML::Simple;
 use C4::Dates qw(format_date);
 use C4::Members qw(GetHideLostItemsPreference);
-use C4::XSLT;
+# use C4::XSLT;
 use C4::Branch;
 use C4::Reserves;    # CheckReserves
 use C4::Debug;
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 0b8012f..264b333 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -101,8 +101,8 @@ elsif ($op eq 'delete-branch-item') {
 # save the values entered
 elsif ($op eq 'add') {
     my $sth_search = $dbh->prepare('SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?');
-    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
-    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
+    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
+    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, overduefinescap=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
     
     my $br = $branch; # branch
     my $bor  = $input->param('categorycode'); # borrower category
@@ -122,14 +122,15 @@ elsif ($op eq 'add') {
     $hardduedate = format_date_in_iso($hardduedate);
     my $hardduedatecompare = $input->param('hardduedatecompare');
     my $rentaldiscount = $input->param('rentaldiscount');
+    my $overduefinescap = $input->param('overduefinescap') || undef;
     $debug and warn "Adding $br, $bor, $cat, $fine, $maxissueqty";
 
     $sth_search->execute($br,$bor,$cat);
     my $res = $sth_search->fetchrow_hashref();
     if ($res->{total}) {
-        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount, $br,$bor,$cat);
+        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount,$overduefinescap, $br,$bor,$cat);
     } else {
-        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount);
+        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$overduefinescap);
     }
 } 
 elsif ($op eq "set-branch-defaults") {
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index fda0bac..ed57922 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -995,6 +995,7 @@ CREATE TABLE `issuingrules` (
   `renewalsallowed` smallint(6) NOT NULL default "0",
   `reservesallowed` smallint(6) NOT NULL default "0",
   `branchcode` varchar(10) NOT NULL default '',
+  overduefinescap decimal default NULL,
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
   KEY `itemtype` (`itemtype`)
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 34ac684..1250e45 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -62,7 +62,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 -- this is selected by the web installer now
 -- INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MARCOrgCode','OSt','Define MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html','','free');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine',9999,'Maximum fine a patron can have for a single late return','','Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine',NULL,'Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxItemsInSearchResults',20,'Specify the maximum number of items to display for each result on a page of results',NULL,'free');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index c297677..904365b 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5139,6 +5139,21 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+
+$DBversion = '3.07.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE issuingrules ADD overduefinescap decimal DEFAULT NULL");
+    my $maxfine = C4::Context->preference('MaxFine');
+    if ($maxfine && $maxfine < 900) { # an arbitrary value that tells us it's not "some huge value"
+      $dbh->do("UPDATE issuingrules SET overduefinescap=?",undef,$maxfine);
+      $dbh->do("UPDATE systempreferences SET value = NULL WHERE variable = 'MaxFine'");
+    }
+    $dbh->do("UPDATE systempreferences SET explanation = 'Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.' WHERE variable = 'MaxFine'");
+    print "Upgrade to $DBversion done (Bug 7420 add overduefinescap to circulation matrix)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index 3d88883..a438435 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -73,10 +73,11 @@ Patrons:
                no: "Don't allow"
          - "staff to access a patron's checkout history (it is stored regardless)."
      -
-         - The late fine for a specific checkout will only go up to
+         - The late fine for all checkouts will only go up to
          - pref: MaxFine
            class: currency
          - '[% local_currency %].'
+         - Empty value means no limit. Single item caps are specified in the circulation rules matrix.
      -
          - pref: memberofinstitution
            choices:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 7b01ac7..3c693a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -78,6 +78,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                 <th>Fine amount</th>
                 <th>Fine charging interval</th>
                 <th>Fine grace period (day)</th>
+                <th>Overdue Fines Cap ($)</th>
                 <th>Suspension in days (day)</th>
                 <th>Renewals allowed (count)</th>
                 <th>Holds allowed (count)</th>
@@ -122,6 +123,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
 							<td>[% rule.fine %]</td>
 							<td>[% rule.chargeperiod %]</td>
 							<td>[% rule.firstremind %]</td>
+							<td>[% rule.overduefinescap FILTER format("%.2f") %]</td>
 							<td>[% rule.finedays %]</td>
 							<td>[% rule.renewalsallowed %]</td>
 							<td>[% rule.reservesallowed %]</td>
@@ -182,6 +184,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                     <td><input name="fine" size="4" /></td>
                     <td><input name="chargeperiod" size="2" /></td>
                     <td><input name="firstremind" size="2" /> </td>
+                    <td><input name="overduefinescap" size="6" /> </td>
                     <td><input name="finedays" size="3" /> </td>
                     <td><input name="renewalsallowed" size="2" /></td>
                     <td><input name="reservesallowed" size="2" /></td>
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Mon Apr  2 03:28:25 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon,  2 Apr 2012 13:28:25 +1200
Subject: [Koha-patches] [PATCH] bug_7420: Added overduefinescap to
	issuingrules
In-Reply-To: <bug 7420>
References: <bug 7420>
Message-ID: <1333330105-30461-1-git-send-email-srdjan@catalyst.net.nz>

Replaced existing MaxFine syspref logic with overduefinescap.
Repurposed MaxFine to be the overall overdue limit for all items
overdue. Implemented new MaxFine logic in UpdateFine().
---
 C4/Overdues.pm                                     |   48 +++++++++++++++-----
 admin/smart-rules.pl                               |    9 ++--
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/sysprefs.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl             |   15 ++++++
 .../prog/en/modules/admin/preferences/patrons.pref |    3 +-
 .../prog/en/modules/admin/smart-rules.tt           |    3 +
 8 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/C4/Overdues.pm b/C4/Overdues.pm
index 7676a87..25bb3c9 100644
--- a/C4/Overdues.pm
+++ b/C4/Overdues.pm
@@ -241,8 +241,8 @@ C<$amount> is the fine owed by the patron (see above).
 C<$chargename> is the chargename field from the applicable record in
 the categoryitem table, whatever that is.
 
-C<$daycount> is the number of days between start and end dates, Calendar adjusted (where needed), 
-minus any applicable grace period.
+C<$unitcount> is the number of chargeable units (days between start and end dates, Calendar adjusted where needed, 
+minus any applicable grace period, or hours)
 
 FIXME - What is chargename supposed to be ?
 
@@ -281,10 +281,9 @@ sub CalcFine {
     } else {
         # a zero (or null)  chargeperiod means no charge.
     }
-    if(C4::Context->preference('maxFine') && ( $amount > C4::Context->preference('maxFine'))) {
-        $amount = C4::Context->preference('maxFine');
-    }
-    return ($amount, $data->{chargename}, $days_minus_grace);
+    $amount = $data->{overduefinescap} if $data->{overduefinescap} && $amount > $data->{overduefinescap};
+    $debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $data->{'chargename'}, $days_minus_grace, $chargeable_units);
+    return ($amount, $data->{'chargename'}, $days_minus_grace, $chargeable_units);
     # FIXME: chargename is NEVER populated anywhere.
 }
 
@@ -492,14 +491,39 @@ sub UpdateFine {
 	#   "REF" is Cash Refund
     my $sth = $dbh->prepare(
         "SELECT * FROM accountlines
-		WHERE itemnumber=?
-		AND   borrowernumber=?
-		AND   accounttype IN ('FU','O','F','M')
-		AND   description like ? "
+		WHERE borrowernumber=?
+		AND   accounttype IN ('FU','O','F','M')"
     );
-    $sth->execute( $itemnum, $borrowernumber, "%$due%" );
+    $sth->execute( $borrowernumber );
+    my $data;
+    my $total_amount_other = 0.00;
+    my $due_qr = qr/$due/;
+    # Cycle through the fines and
+    # - find line that relates to the requested $itemnum
+    # - accumulate fines for other items
+    # so we can update $itemnum fine taking in account fine caps
+    while (my $rec = $sth->fetchrow_hashref) {
+        if ($rec->{itemnumber} == $itemnum && $rec->{description} =~ /$due_qr/) {
+            if ($data) {
+                warn "Not a unique accountlines record for item $itemnum borrower $borrowernumber";
+            } else {
+                $data = $rec;
+                next;
+            }
+        }
+        $total_amount_other += $rec->{'amount'};
+    }
+    if (my $maxfine = C4::Context->preference('MaxFine')) {
+        if ($total_amount_other + $amount > $maxfine) {
+            my $new_amount = $maxfine - $total_amount_other;
+            warn "Reducing fine for item $itemnum borrower $borrowernumber from $amount to $new_amount - MaxFine reached";
+            return if $new_amount <= 0.00;
+
+            $amount = $new_amount;
+        }
+    }
 
-    if ( my $data = $sth->fetchrow_hashref ) {
+    if ( $data ) {
 
 		# we're updating an existing fine.  Only modify if amount changed
         # Note that in the current implementation, you cannot pay against an accruing fine
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 0b8012f..264b333 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -101,8 +101,8 @@ elsif ($op eq 'delete-branch-item') {
 # save the values entered
 elsif ($op eq 'add') {
     my $sth_search = $dbh->prepare('SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?');
-    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
-    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
+    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
+    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, overduefinescap=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
     
     my $br = $branch; # branch
     my $bor  = $input->param('categorycode'); # borrower category
@@ -122,14 +122,15 @@ elsif ($op eq 'add') {
     $hardduedate = format_date_in_iso($hardduedate);
     my $hardduedatecompare = $input->param('hardduedatecompare');
     my $rentaldiscount = $input->param('rentaldiscount');
+    my $overduefinescap = $input->param('overduefinescap') || undef;
     $debug and warn "Adding $br, $bor, $cat, $fine, $maxissueqty";
 
     $sth_search->execute($br,$bor,$cat);
     my $res = $sth_search->fetchrow_hashref();
     if ($res->{total}) {
-        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount, $br,$bor,$cat);
+        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount,$overduefinescap, $br,$bor,$cat);
     } else {
-        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount);
+        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$overduefinescap);
     }
 } 
 elsif ($op eq "set-branch-defaults") {
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index fda0bac..ed57922 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -995,6 +995,7 @@ CREATE TABLE `issuingrules` (
   `renewalsallowed` smallint(6) NOT NULL default "0",
   `reservesallowed` smallint(6) NOT NULL default "0",
   `branchcode` varchar(10) NOT NULL default '',
+  overduefinescap decimal default NULL,
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
   KEY `itemtype` (`itemtype`)
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 34ac684..1250e45 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -62,7 +62,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 -- this is selected by the web installer now
 -- INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MARCOrgCode','OSt','Define MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html','','free');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine',9999,'Maximum fine a patron can have for a single late return','','Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MaxFine',NULL,'Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding',5,'maximum amount withstanding to be able make holds','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves',50,'Define maximum number of holds a patron can place','','Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxItemsInSearchResults',20,'Specify the maximum number of items to display for each result on a page of results',NULL,'free');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index c297677..904365b 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5139,6 +5139,21 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+
+$DBversion = '3.07.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE issuingrules ADD overduefinescap decimal DEFAULT NULL");
+    my $maxfine = C4::Context->preference('MaxFine');
+    if ($maxfine && $maxfine < 900) { # an arbitrary value that tells us it's not "some huge value"
+      $dbh->do("UPDATE issuingrules SET overduefinescap=?",undef,$maxfine);
+      $dbh->do("UPDATE systempreferences SET value = NULL WHERE variable = 'MaxFine'");
+    }
+    $dbh->do("UPDATE systempreferences SET explanation = 'Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.' WHERE variable = 'MaxFine'");
+    print "Upgrade to $DBversion done (Bug 7420 add overduefinescap to circulation matrix)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index 3d88883..a438435 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -73,10 +73,11 @@ Patrons:
                no: "Don't allow"
          - "staff to access a patron's checkout history (it is stored regardless)."
      -
-         - The late fine for a specific checkout will only go up to
+         - The late fine for all checkouts will only go up to
          - pref: MaxFine
            class: currency
          - '[% local_currency %].'
+         - Empty value means no limit. Single item caps are specified in the circulation rules matrix.
      -
          - pref: memberofinstitution
            choices:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 7b01ac7..3c693a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -78,6 +78,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                 <th>Fine amount</th>
                 <th>Fine charging interval</th>
                 <th>Fine grace period (day)</th>
+                <th>Overdue Fines Cap ($)</th>
                 <th>Suspension in days (day)</th>
                 <th>Renewals allowed (count)</th>
                 <th>Holds allowed (count)</th>
@@ -122,6 +123,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
 							<td>[% rule.fine %]</td>
 							<td>[% rule.chargeperiod %]</td>
 							<td>[% rule.firstremind %]</td>
+							<td>[% rule.overduefinescap FILTER format("%.2f") %]</td>
 							<td>[% rule.finedays %]</td>
 							<td>[% rule.renewalsallowed %]</td>
 							<td>[% rule.reservesallowed %]</td>
@@ -182,6 +184,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                     <td><input name="fine" size="4" /></td>
                     <td><input name="chargeperiod" size="2" /></td>
                     <td><input name="firstremind" size="2" /> </td>
+                    <td><input name="overduefinescap" size="6" /> </td>
                     <td><input name="finedays" size="3" /> </td>
                     <td><input name="renewalsallowed" size="2" /></td>
                     <td><input name="reservesallowed" size="2" /></td>
-- 
1.7.5.4


From adrien.saurat at biblibre.com  Mon Apr  2 10:45:42 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Mon,  2 Apr 2012 10:45:42 +0200
Subject: [Koha-patches] [PATCH] Bug 7866: z39.50 search list ordered by rank
Message-ID: <1333356342-4259-1-git-send-email-adrien.saurat@biblibre.com>

In the z39.50 cataloging search page, the servers
are now sorted by rank and name.
---
 cataloguing/z3950_search.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl
index 10320e2..6e6b417 100755
--- a/cataloguing/z3950_search.pl
+++ b/cataloguing/z3950_search.pl
@@ -82,7 +82,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
 $template->param( frameworkcode => $frameworkcode, );
 
 if ( $op ne "do_search" ) {
-    my $sth = $dbh->prepare("select id,host,name,checked from z3950servers  order by host");
+    my $sth = $dbh->prepare("SELECT id,host,name,checked FROM z3950servers ORDER BY rank, name");
     $sth->execute();
     my $serverloop = $sth->fetchall_arrayref( {} );
     $template->param(
@@ -168,7 +168,7 @@ for my $i (1..$nterms-1) {
 warn "query ".$query  if $DEBUG;
 
     foreach my $servid (@id) {
-        my $sth = $dbh->prepare("select * from z3950servers where id=?");
+        my $sth = $dbh->prepare("SELECT * FROM z3950servers WHERE id=? ORDER BY rank, name");
         $sth->execute($servid);
         while ( $server = $sth->fetchrow_hashref ) {
             warn "serverinfo ".join(':',%$server) if $DEBUG;
-- 
1.7.4.1


From adrien.saurat at biblibre.com  Mon Apr  2 12:31:04 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Mon,  2 Apr 2012 12:31:04 +0200
Subject: [Koha-patches] [PATCH] Bug 7868: cleans logs when doing a Search on
	the intranet
Message-ID: <1333362664-5637-1-git-send-email-adrien.saurat@biblibre.com>

---
 .../prog/en/modules/catalogue/results.tt           |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index bed9a84..5001fab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -70,8 +70,10 @@ $(".addtocart").show();
         param1 += "<\/optgroup>";[% END %]
         [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public Lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %]
         param1 += "<\/optgroup>";[% END %]
-        [% IF ( addbarshelvesloop.size>9 || addpubshelvesloop.size>9 ) %]
-            param1 += "<option value=\"morelists\">[ "+_("More Lists")+" ]<\/option>";
+        [% IF addbarshelvesloop %]
+            [% IF ( addbarshelvesloop.size>9 || addpubshelvesloop.size>9 ) %]
+                param1 += "<option value=\"morelists\">[ "+_("More Lists")+" ]<\/option>";
+            [% END %]
         [% END %]
         param1 +="<option value=\"newlist\">"+_("[ New List ]")+"<\/option>"
         [% END %]
-- 
1.7.4.1


From magnus at enger.priv.no  Mon Apr  2 15:42:33 2012
From: magnus at enger.priv.no (Magnus Enger)
Date: Mon,  2 Apr 2012 15:42:33 +0200
Subject: [Koha-patches] [PATCH] Bug 7445 - Clicking on a tag gives "Language
	... does not exist"
Message-ID: <1333374153-2767-1-git-send-email-magnus@enger.priv.no>

To test:
- Syspref QueryStemming = Try
- Install Norwegian bokm?l:
  cd misc/translator/
  perl translate install nb-NO
- Go to Home ? Administration ? System Preferences > I18N/L10N
  and enable "Norsk bokm?l(nb-NO)" for opaclanguages as well as
  setting opaclanguagesdisplay = Allow
- Make sure you have selected "Norsk bokm?l" as the active language
  in the OPAC
- Find a record that has a tag (which does not contain any digits)
- Click on the tag and see that you get the error in the title of
  this bug
- Apply the patch
- Click on the tag again and the error should be gone
---
 C4/Search.pm |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 56468b5..33a1d16 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -733,6 +733,13 @@ sub _build_stemmed_operand {
 
 # FIXME: the locale should be set based on the user's language and/or search choice
     #warn "$lang";
+    # Make sure we only use the first two letters from the language code
+    $lang = lc(substr($lang, 0, 2));
+    # The language codes for the two variants of Norwegian will now be "nb" and "nn",
+    # none of which Lingua::Stem::Snowball can use, so we need to "translate" them
+    if ($lang eq 'nb' || $lang eq 'nn') {
+      $lang = 'no';
+    }
     my $stemmer = Lingua::Stem::Snowball->new( lang => $lang,
                                                encoding => "UTF-8" );
 
-- 
1.7.2.5


From dpavlin at rot13.org  Mon Apr  2 16:05:56 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Mon,  2 Apr 2012 16:05:56 +0200
Subject: [Koha-patches] [PATCH] Bug 7872 - C4::Items::GetItemsInfo
	marc_subfield_structure
Message-ID: <1333375556-23869-1-git-send-email-dpavlin@rot13.org>

SQL queries fetch all results and use first row. Adding frameworkcode
to SQL queries will help returning just one (correct) row,
improve performance and allow caching of values in future.
---
 C4/Items.pm |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 0b2f99b..de808e5 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1250,10 +1250,11 @@ sub GetItemsInfo {
             'SELECT authorised_value
             FROM   marc_subfield_structure
             WHERE  kohafield="items.notforloan"
+            AND frameworkcode = ?
         '
         );
 
-        $sthnflstatus->execute;
+        $sthnflstatus->execute( $data->{frameworkcode} );
         my ($authorised_valuecode) = $sthnflstatus->fetchrow;
         if ($authorised_valuecode) {
             $sthnflstatus = $dbh->prepare(
@@ -1272,10 +1273,11 @@ sub GetItemsInfo {
             'SELECT authorised_value
             FROM   marc_subfield_structure
             WHERE  kohafield="items.restricted"
+            AND frameworkcode = ?
         '
         );
 
-        $restrictedstatus->execute;
+        $restrictedstatus->execute( $data->{frameworkcode} );
         ($authorised_valuecode) = $restrictedstatus->fetchrow;
         if ($authorised_valuecode) {
             $restrictedstatus = $dbh->prepare(
@@ -1297,9 +1299,10 @@ sub GetItemsInfo {
             'SELECT authorised_value
              FROM   marc_subfield_structure
              WHERE  kohafield="items.stack"
+             AND frameworkcode = ?
         '
         );
-        $stackstatus->execute;
+        $stackstatus->execute( $data->{frameworkcode} );
 
         ($authorised_valuecode) = $stackstatus->fetchrow;
         if ($authorised_valuecode) {
-- 
1.7.2.5


From colin.campbell at ptfs-europe.com  Mon Apr  2 16:50:30 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon,  2 Apr 2012 15:50:30 +0100
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_=5BBug_7874=5D_Stop_unnecess?=
	=?utf-8?q?ary_warnings_in_get=5Flanguage?=
Message-ID: <1333378230-14430-1-git-send-email-colin.campbell@ptfs-europe.com>

Refactor code to be more idiomatic and clarify its intention
 was testing undef against languages causing log warn
 was creating and assigning to unnecessary variables
 calling accept_language with an undef is an
 expensive way to get undef returned to the caller
 test we are asking it a meabingful question
 use any rather than first ( we dont care about firstness it
 should be unique anyway but it obscures the meaning of the test )
 split takes a pattern not a string
---
 C4/Templates.pm |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/C4/Templates.pm b/C4/Templates.pm
index 0741040..d6e3ce4 100644
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 use CGI;
-use List::Util qw/first/;
+use List::MoreUtils qw/any/;
 
 # Copyright 2009 Chris Cormack and The Koha Dev Team
 #
@@ -313,9 +313,9 @@ sub getlanguage {
     my ($query, $interface) = @_;
 
     # Select a language based on cookie, syspref available languages & browser
-    my $is_intranet = $interface eq 'intranet';
-    my @languages = split(",", C4::Context->preference(
-        $is_intranet ? 'language' : 'opaclanguages'));
+    my $preference_to_check =
+      $interface eq 'intranet' ? 'language' : 'opaclanguages';
+    my @languages = split /,/, C4::Context->preference($preference_to_check);
 
     my $lang;
 
@@ -326,20 +326,18 @@ sub getlanguage {
     }
 
     #?HTTP_ACCEPT_LANGUAGE
-    unless ($lang) {
-        my $http_accept_language = $ENV{ HTTP_ACCEPT_LANGUAGE };
-        $lang = accept_language( $http_accept_language,
-            getTranslatedLanguages($interface,'prog') );
+    if ( !$lang && $ENV{HTTP_ACCEPT_LANGUAGE} ) {
+        $lang = accept_language( $ENV{HTTP_ACCEPT_LANGUAGE},
+            getTranslatedLanguages( $interface, 'prog' ) );
     }
 
     # Ignore a lang not selected in sysprefs
-    $lang = undef  unless first { $_ eq $lang } @languages;
+    if ( $lang && any { $_ eq $lang } @languages ) {
+        return $lang;
+    }
 
     # Fall back to English if necessary
-    $lang = 'en' unless $lang;
-
-    return $lang;
+    return 'en';
 }
 
 1;
-
-- 
1.7.7.6


From oleonard at myacpl.org  Mon Apr  2 20:03:58 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon,  2 Apr 2012 14:03:58 -0400
Subject: [Koha-patches] [PATCH] Bug 7858 - Missing packages from
	install_misc/ubuntu.packages
Message-ID: <1333389838-5332-1-git-send-email-oleonard@myacpl.org>

- Adding missing dependencies to install_misc/ubuntu.packages
- Removing items from CPAN instructions which are installed
  as packages
---
 INSTALL.ubuntu               |    4 +---
 install_misc/ubuntu.packages |   12 ++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/INSTALL.ubuntu b/INSTALL.ubuntu
index 2bedddc..b9f6d1b 100644
--- a/INSTALL.ubuntu
+++ b/INSTALL.ubuntu
@@ -90,9 +90,7 @@ sources
 
 Run the following command:
 
-    $ sudo cpan MARC::Crosswalk::DublinCore GD GD::Barcode::UPCE Email::Date \
-                HTML::Scrubber Algorithm::CheckDigits::M43_001 Biblio::EndnoteStyle \
-                Locale::Currency::Format
+    $ sudo cpan GD GD::Barcode::UPCE Algorithm::CheckDigits::M43_001
 
 Note: you may need to run CPAN initialization if you've not run cpan
 before:
diff --git a/install_misc/ubuntu.packages b/install_misc/ubuntu.packages
index f211769..61fbebf 100644
--- a/install_misc/ubuntu.packages
+++ b/install_misc/ubuntu.packages
@@ -51,6 +51,8 @@ libxslt1-dev				install
 libalgorithm-checkdigits-perl		install
 libauthen-cas-client-perl		install
 libbiblio-endnotestyle-perl		install
+libbusiness-isbn-perl			install
+libcgi-session-driver-memcached-perl			install
 libcgi-session-perl			install
 libcgi-session-serialize-yaml-perl	install
 libclass-factory-util-perl		install
@@ -58,6 +60,7 @@ libdata-ical-perl			install
 libdate-calc-perl			install
 libdate-manip-perl			install
 libdatetime-perl			install
+libdatetime-format-dateparse-perl			install
 libdatetime-format-ical-perl            install
 libdatetime-format-mail-perl		install
 libdatetime-format-strptime-perl	install
@@ -70,12 +73,15 @@ libdbi-perl				install
 libemail-date-perl			install
 libgd-barcode-perl			install
 libgraphics-magick-perl			install
+libgravatar-url-perl			install
 libhtml-scrubber-perl			install
 libhtml-template-pro-perl		install
+libhttp-oai-perl			install
 liblingua-ispell-perl			install
 liblingua-stem-perl			install
 liblingua-stem-snowball-perl		install
 liblist-moreutils-perl			install
+liblocale-currency-format-perl			install
 liblocale-gettext-perl			install
 liblocale-po-perl			install
 libmail-sendmail-perl			install
@@ -83,10 +89,15 @@ libmarc-charset-perl			install
 libmarc-crosswalk-dublincore-perl	install
 libmarc-record-perl			install
 libmarc-xml-perl			install
+libmemoize-memcached-perl			install
 libmime-lite-perl			install
+libmodern-perl			install
 libmodule-install-perl			install
 libnet-ldap-perl			install
 libnet-server-perl			install
+libpdf-api2-simple-perl			install
+libreadonly-perl			install
+libreadonly-xs-perl			install
 libnet-z3950-zoom-perl			install
 libnumber-format-perl			install
 libpdf-api2-perl			install
@@ -98,6 +109,7 @@ libschedule-at-perl			install
 libsms-send-perl			install
 libtemplate-perl			install
 libtext-charwidth-perl			install
+libtext-csv-encoded-perl			install
 libtext-csv-perl			install
 libtext-iconv-perl			install
 libtext-wrapi18n-perl			install
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Mon Apr  2 22:02:51 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon,  2 Apr 2012 22:02:51 +0200
Subject: [Koha-patches] [PATCH] Bug 1662: Is there a difference between Full
	and Simplified for Serials History
Message-ID: <1333396971-7451-1-git-send-email-Katrin.Fischer.83@web.de>

Changes description of system preference SubscriptionHistory:

When showing the subscription information for a bibliographic record,
preselect [brief history|full history] view of the serial issues.

To test:
1) Verify new description shows in system preference editor (tab serials)
2) Verify description is correct (OPAC > Subscription tab > more details)
---
 .../prog/en/modules/admin/preferences/serials.pref |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref
index 8b23135..db727b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref
@@ -41,12 +41,12 @@ Serials:
           class: integer
         - previous issues of a serial on the OPAC.
     -
-        - When showing the subscription information for a biblio, show
+        - When showing the subscription information for a bibliographic record, preselect
         - pref: SubscriptionHistory
           choices:
-              simplified: a summary
-              full: a full list
-        - of the serial issues.
+              simplified: brief history
+              full: full history
+        - view of serial issues.
     -
         - List of fields which must not be rewritten when a subscription is duplicated (Separated by pipe |)
         - pref: SubscriptionDuplicateDroppedInput
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Mon Apr  2 22:03:21 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon,  2 Apr 2012 22:03:21 +0200
Subject: [Koha-patches]
	=?y?q?=5BPATCH=5D=20Bug=202399=3A=20All=20status=20fields=20in=20the=20item=20edit=20interface=20offer=20two=20blank/null=20entries=20per=20dropdown=20instead=20of=20one?=
Message-ID: <1333397001-7523-1-git-send-email-Katrin.Fischer.83@web.de>

Removes the '0' values without description from the sample date for
authorised values.

To test:
1) Verify that SQL files load correctly
- truncate authorised_values; /* empty authorised values table */
- load sample data using one of the SQL files
2) Check cataloging interface - all status fields should only show 1 empty line
---
 installer/data/mysql/de-DE/optional/auth_val.sql   |    7 +------
 installer/data/mysql/en/optional/auth_val.sql      |    5 -----
 installer/data/mysql/es-ES/optional/auth_val.sql   |    5 -----
 .../data/mysql/nb-NO/2-Valgfritt/auth_val.sql      |    5 -----
 installer/data/mysql/pl-PL/optional/auth_val.sql   |    5 -----
 .../authorised_values_[DAMAGED].sql                |    1 -
 .../authorised_values/authorised_values_[LOST].sql |   12 +++++-------
 .../authorised_values_[NOT_LOAN].sql               |    1 -
 .../authorised_values_[RESTRICTED].sql             |    1 -
 .../authorised_values_[WITHDRAWN].sql              |    1 -
 .../authorised_values_[DAMAGED].sql                |    1 -
 .../authorised_values/authorised_values_[LOST].sql |   12 +++++-------
 .../authorised_values_[NOT_LOAN].sql               |    1 -
 .../authorised_values_[RESTRICTED].sql             |    1 -
 .../authorised_values_[WITHDRAWN].sql              |    1 -
 15 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/installer/data/mysql/de-DE/optional/auth_val.sql b/installer/data/mysql/de-DE/optional/auth_val.sql
index c60d78f..5832f61 100644
--- a/installer/data/mysql/de-DE/optional/auth_val.sql
+++ b/installer/data/mysql/de-DE/optional/auth_val.sql
@@ -1,18 +1,16 @@
 -- Reasons for acceptance or rejection of suggestions in acquisitions
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','BSELL','Bestseller');
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','SCD','Vorhandenes Exemplar besch??digt');
-INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','LCL','Biblitoheksexemplar vermisst');
+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','LCL','Bibliotheksexemplar vermisst');
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','??ber Fernleihe bestellbar');
 
 -- availability statuses
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
 INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Lange ??berf??llig (Verloren)');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Verloren');
 INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Verloren und Buchersatz bezahlt');
 INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Vermisst');
 
 -- damaged status of an item
-INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Besch??digt');
 
 -- location qualification for an item, departments are linked by default to items.location
@@ -33,17 +31,14 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Sachliteratur');
 
 -- withdrawn status of an item, linked to items.wthdrawn
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Ausgeschieden');
 
 -- loanability status of an item, linked to items.notforloan
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','Bestellt');
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Nicht entleihbar');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Mitarbeiterbibliothek');
 
 -- restricted status of an item, linked to items.restricted
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Eingeschr??nkt zug??nglich');
 
 -- manual invoice types
diff --git a/installer/data/mysql/en/optional/auth_val.sql b/installer/data/mysql/en/optional/auth_val.sql
index 4c81325..e1c7917 100644
--- a/installer/data/mysql/en/optional/auth_val.sql
+++ b/installer/data/mysql/en/optional/auth_val.sql
@@ -5,14 +5,12 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Available via ILL');
 
 -- availability statuses
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
 INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Long Overdue (Lost)');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Lost');
 INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Lost and Paid For');
 INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Missing');
 
 -- damaged status of an item
-INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Damaged');
 
 -- location qualification for an item, departments are linked by default to items.location
@@ -33,17 +31,14 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non Fiction');
 
 -- withdrawn status of an item, linked to items.wthdrawn
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Withdrawn');
 
 -- loanability status of an item, linked to items.notforloan
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','Ordered');
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Not For Loan');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Staff Collection');
 
 -- restricted status of an item, linked to items.restricted
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Restricted Access');
 
 -- manual invoice types
diff --git a/installer/data/mysql/es-ES/optional/auth_val.sql b/installer/data/mysql/es-ES/optional/auth_val.sql
index 4c81325..e1c7917 100644
--- a/installer/data/mysql/es-ES/optional/auth_val.sql
+++ b/installer/data/mysql/es-ES/optional/auth_val.sql
@@ -5,14 +5,12 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Available via ILL');
 
 -- availability statuses
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
 INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Long Overdue (Lost)');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Lost');
 INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Lost and Paid For');
 INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Missing');
 
 -- damaged status of an item
-INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Damaged');
 
 -- location qualification for an item, departments are linked by default to items.location
@@ -33,17 +31,14 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non Fiction');
 
 -- withdrawn status of an item, linked to items.wthdrawn
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Withdrawn');
 
 -- loanability status of an item, linked to items.notforloan
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','Ordered');
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Not For Loan');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Staff Collection');
 
 -- restricted status of an item, linked to items.restricted
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Restricted Access');
 
 -- manual invoice types
diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql b/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
index 1944426..3deeae2 100644
--- a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
+++ b/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
@@ -26,14 +26,12 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Tilgjengelig via fjernl??n');
 
 -- availability statuses
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
 INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Regnes som tapt');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Tapt');
 INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Tapt og erstattet');
 INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Savnet');
 
 -- damaged status of an item
-INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Skadet');
 
 -- location qualification for an item, departments are linked by default to items.location
@@ -54,17 +52,14 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Faglitteratur');
 
 -- withdrawn status of an item, linked to items.wthdrawn
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Trukket tilbake');
 
 -- loanability status of an item, linked to items.notforloan
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','I bestilling');
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Ikke til utl??n');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Kun til internt bruk');
 
 -- restricted status of an item, linked to items.restricted
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Begrenset tilgang');
 
 -- manual invoice types
diff --git a/installer/data/mysql/pl-PL/optional/auth_val.sql b/installer/data/mysql/pl-PL/optional/auth_val.sql
index 11328e1..0bc10c9 100644
--- a/installer/data/mysql/pl-PL/optional/auth_val.sql
+++ b/installer/data/mysql/pl-PL/optional/auth_val.sql
@@ -5,14 +5,12 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Available via ILL');
 
 -- availability statuses
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
 INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Long Overdue (Lost)');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Lost');
 INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Lost and Paid For');
 INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Missing');
 
 -- damaged status of an item
-INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Damaged');
 
 -- location qualification for an item, departments are linked by default to items.location
@@ -31,15 +29,12 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non Fiction');
 
 -- withdrawn status of an item, linked to items.wthdrawn
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Withdrawn');
 
 -- loanability status of an item, linked to items.notforloan
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','Ordered');
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Not For Loan');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Staff Collection');
 
 -- restricted status of an item, linked to items.restricted
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Restricted Access');
diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql
index 8bccb69..2b2ca36 100644
--- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql
+++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql
@@ -1,6 +1,5 @@
 DELETE FROM authorised_values WHERE category='DAMAGED';
 
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES 
-('DAMAGED','0',''),
 ('DAMAGED','1','????????????????????');
 
diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql
index 17aff3b..0334fdc 100644
--- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql
+++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql
@@ -1,14 +1,12 @@
 DELETE FROM authorised_values WHERE category='LOST';
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','0','');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','2','???????????????????? ?????????????????? (????????????????)');
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','2','???????????????????? ?????????????????? (????????????????)');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','1','????????????????');
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','1','????????????????');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','3','???????????????? ?? ?????????????????? ???? ??????????????????');
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','3','???????????????? ?? ?????????????????? ???? ??????????????????');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','5','?????????????????????? ?????? ?????????????? ???? ????????????????????????????');
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','5','?????????????????????? ?????? ?????????????? ???? ????????????????????????????');
-
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 5,'LOST','4','?????????????????????? ?????? ????????????????????????????');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','4','?????????????????????? ?????? ????????????????????????????');
 
diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].sql
index 138cba7..4aafe8a 100644
--- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].sql
+++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].sql
@@ -1,7 +1,6 @@
 DELETE FROM authorised_values WHERE category='NOT_LOAN';
 
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES 
-('NOT_LOAN','0', ' ?????? ??????????'),
 ('NOT_LOAN','-1','????????????????'),
 ('NOT_LOAN','1', '???? ?????? ??????????'),
 ('NOT_LOAN','2', '???????????????? ?????????????????? ????????????????????'),
diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql
index e96bcef..4878a30 100644
--- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql
+++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql
@@ -1,7 +1,6 @@
 DELETE FROM authorised_values WHERE category='RESTRICTED';
 
 INSERT INTO `authorised_values` (`category`, `authorised_value`, `lib`) VALUES 
-('RESTRICTED','0',''),
 ('RESTRICTED','1','???????????????????????? ????????????');
 
 
diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql
index e442303..b602b81 100644
--- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql
+++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql
@@ -1,7 +1,6 @@
 DELETE FROM authorised_values WHERE category='WITHDRAWN';
 
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES 
-('WITHDRAWN','0',''),
 ('WITHDRAWN','1','????????????');
 
 
diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[DAMAGED].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[DAMAGED].sql
index 6720945..3280209 100644
--- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[DAMAGED].sql
+++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[DAMAGED].sql
@@ -1,5 +1,4 @@
 DELETE FROM authorised_values WHERE category='DAMAGED';
 
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES 
-('DAMAGED','0',''),
 ('DAMAGED','1','????????????????????');
diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[LOST].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[LOST].sql
index 849613b..3819a1b 100644
--- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[LOST].sql
+++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[LOST].sql
@@ -1,13 +1,11 @@
 DELETE FROM authorised_values WHERE category='LOST';
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','0','');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','2','?????????????? ???????????????????????? (????????????????)');
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','2','?????????????? ???????????????????????? (????????????????)');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','1','????????????????');
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','1','????????????????');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','3','???????????????? ?? ?????????????????? ???? ??????????????????');
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','3','???????????????? ?? ?????????????????? ???? ??????????????????');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','5','???????????????? ?????? ???????????? ???? ????????????????????????');
 
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','5','???????????????? ?????? ???????????? ???? ????????????????????????');
-
-INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 5,'LOST','4','???????????????? ?????? ????????????????????????????');
+INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','4','???????????????? ?????? ????????????????????????????');
diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[NOT_LOAN].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[NOT_LOAN].sql
index b8544ff..2e5b88c 100644
--- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[NOT_LOAN].sql
+++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[NOT_LOAN].sql
@@ -1,7 +1,6 @@
 DELETE FROM authorised_values WHERE category='NOT_LOAN';
 
 INSERT INTO authorised_values (category, authorised_value, lib) VALUES 
-('NOT_LOAN','0', ' ?????? ??????????????????????'),
 ('NOT_LOAN','-1','??????????????????'),
 ('NOT_LOAN','1', '???? ?????? ??????????????????????'),
 ('NOT_LOAN','2', '???????????????? ???????????????????? ????????????????????'),
diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[RESTRICTED].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[RESTRICTED].sql
index a1079f1..c51d2c0 100644
--- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[RESTRICTED].sql
+++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[RESTRICTED].sql
@@ -1,5 +1,4 @@
 DELETE FROM authorised_values WHERE category='RESTRICTED';
 
 INSERT INTO `authorised_values` (`category`, `authorised_value`, `lib`) VALUES 
-('RESTRICTED','0',''),
 ('RESTRICTED','1','?????????????????? ????????????');
diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[WITHDRAWN].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[WITHDRAWN].sql
index e5d4662..77d0e32 100644
--- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[WITHDRAWN].sql
+++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[WITHDRAWN].sql
@@ -1,5 +1,4 @@
 DELETE FROM authorised_values WHERE category='WITHDRAWN';
 
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES 
-('WITHDRAWN','0',''),
 ('WITHDRAWN','1','????????????????');
-- 
1.7.5.4


From marc at msys.ch  Mon Apr  2 22:06:20 2012
From: marc at msys.ch (Marc Balmer)
Date: Mon, 02 Apr 2012 22:06:20 +0200
Subject: [Koha-patches] [PATCH] Bug 2399: All status fields in the item
 edit interface offer two blank/null entries per dropdown instead of one
In-Reply-To: <1333397001-7523-1-git-send-email-Katrin.Fischer.83@web.de>
References: <1333397001-7523-1-git-send-email-Katrin.Fischer.83@web.de>
Message-ID: <4F7A06BC.5070305@msys.ch>

Am 02.04.12 22:03, schrieb Katrin Fischer:
> Removes the '0' values without description from the sample date for
> authorised values.

In this patch, you add new MySQLisms.  Please remove them and re-submit
thepatch.  Backquotes for columns names are not acceptable and very easy
to avoid.

Thanks,
Marc

> 
> To test:
> 1) Verify that SQL files load correctly
> - truncate authorised_values; /* empty authorised values table */
> - load sample data using one of the SQL files
> 2) Check cataloging interface - all status fields should only show 1 empty line
> ---
>  installer/data/mysql/de-DE/optional/auth_val.sql   |    7 +------
>  installer/data/mysql/en/optional/auth_val.sql      |    5 -----
>  installer/data/mysql/es-ES/optional/auth_val.sql   |    5 -----
>  .../data/mysql/nb-NO/2-Valgfritt/auth_val.sql      |    5 -----
>  installer/data/mysql/pl-PL/optional/auth_val.sql   |    5 -----
>  .../authorised_values_[DAMAGED].sql                |    1 -
>  .../authorised_values/authorised_values_[LOST].sql |   12 +++++-------
>  .../authorised_values_[NOT_LOAN].sql               |    1 -
>  .../authorised_values_[RESTRICTED].sql             |    1 -
>  .../authorised_values_[WITHDRAWN].sql              |    1 -
>  .../authorised_values_[DAMAGED].sql                |    1 -
>  .../authorised_values/authorised_values_[LOST].sql |   12 +++++-------
>  .../authorised_values_[NOT_LOAN].sql               |    1 -
>  .../authorised_values_[RESTRICTED].sql             |    1 -
>  .../authorised_values_[WITHDRAWN].sql              |    1 -
>  15 files changed, 11 insertions(+), 48 deletions(-)
> 
> diff --git a/installer/data/mysql/de-DE/optional/auth_val.sql b/installer/data/mysql/de-DE/optional/auth_val.sql
> index c60d78f..5832f61 100644
> --- a/installer/data/mysql/de-DE/optional/auth_val.sql
> +++ b/installer/data/mysql/de-DE/optional/auth_val.sql
> @@ -1,18 +1,16 @@
>  -- Reasons for acceptance or rejection of suggestions in acquisitions
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','BSELL','Bestseller');
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','SCD','Vorhandenes Exemplar besch?digt');
> -INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','LCL','Biblitoheksexemplar vermisst');
> +INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','LCL','Bibliotheksexemplar vermisst');
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','?ber Fernleihe bestellbar');
>  
>  -- availability statuses
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Lange ?berf?llig (Verloren)');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Verloren');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Verloren und Buchersatz bezahlt');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Vermisst');
>  
>  -- damaged status of an item
> -INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Besch?digt');
>  
>  -- location qualification for an item, departments are linked by default to items.location
> @@ -33,17 +31,14 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Sachliteratur');
>  
>  -- withdrawn status of an item, linked to items.wthdrawn
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Ausgeschieden');
>  
>  -- loanability status of an item, linked to items.notforloan
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','Bestellt');
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Nicht entleihbar');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Mitarbeiterbibliothek');
>  
>  -- restricted status of an item, linked to items.restricted
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Eingeschr?nkt zug?nglich');
>  
>  -- manual invoice types
> diff --git a/installer/data/mysql/en/optional/auth_val.sql b/installer/data/mysql/en/optional/auth_val.sql
> index 4c81325..e1c7917 100644
> --- a/installer/data/mysql/en/optional/auth_val.sql
> +++ b/installer/data/mysql/en/optional/auth_val.sql
> @@ -5,14 +5,12 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Available via ILL');
>  
>  -- availability statuses
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Long Overdue (Lost)');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Lost');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Lost and Paid For');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Missing');
>  
>  -- damaged status of an item
> -INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Damaged');
>  
>  -- location qualification for an item, departments are linked by default to items.location
> @@ -33,17 +31,14 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non Fiction');
>  
>  -- withdrawn status of an item, linked to items.wthdrawn
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Withdrawn');
>  
>  -- loanability status of an item, linked to items.notforloan
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','Ordered');
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Not For Loan');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Staff Collection');
>  
>  -- restricted status of an item, linked to items.restricted
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Restricted Access');
>  
>  -- manual invoice types
> diff --git a/installer/data/mysql/es-ES/optional/auth_val.sql b/installer/data/mysql/es-ES/optional/auth_val.sql
> index 4c81325..e1c7917 100644
> --- a/installer/data/mysql/es-ES/optional/auth_val.sql
> +++ b/installer/data/mysql/es-ES/optional/auth_val.sql
> @@ -5,14 +5,12 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Available via ILL');
>  
>  -- availability statuses
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Long Overdue (Lost)');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Lost');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Lost and Paid For');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Missing');
>  
>  -- damaged status of an item
> -INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Damaged');
>  
>  -- location qualification for an item, departments are linked by default to items.location
> @@ -33,17 +31,14 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non Fiction');
>  
>  -- withdrawn status of an item, linked to items.wthdrawn
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Withdrawn');
>  
>  -- loanability status of an item, linked to items.notforloan
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','Ordered');
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Not For Loan');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Staff Collection');
>  
>  -- restricted status of an item, linked to items.restricted
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Restricted Access');
>  
>  -- manual invoice types
> diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql b/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
> index 1944426..3deeae2 100644
> --- a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
> +++ b/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
> @@ -26,14 +26,12 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Tilgjengelig via fjernl?n');
>  
>  -- availability statuses
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Regnes som tapt');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Tapt');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Tapt og erstattet');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Savnet');
>  
>  -- damaged status of an item
> -INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Skadet');
>  
>  -- location qualification for an item, departments are linked by default to items.location
> @@ -54,17 +52,14 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Faglitteratur');
>  
>  -- withdrawn status of an item, linked to items.wthdrawn
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Trukket tilbake');
>  
>  -- loanability status of an item, linked to items.notforloan
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','I bestilling');
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Ikke til utl?n');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Kun til internt bruk');
>  
>  -- restricted status of an item, linked to items.restricted
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Begrenset tilgang');
>  
>  -- manual invoice types
> diff --git a/installer/data/mysql/pl-PL/optional/auth_val.sql b/installer/data/mysql/pl-PL/optional/auth_val.sql
> index 11328e1..0bc10c9 100644
> --- a/installer/data/mysql/pl-PL/optional/auth_val.sql
> +++ b/installer/data/mysql/pl-PL/optional/auth_val.sql
> @@ -5,14 +5,12 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('SUGGEST','AVILL','Available via ILL');
>  
>  -- availability statuses
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','0','');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('LOST','2','Long Overdue (Lost)');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOST','1','Lost');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib ) VALUES ('LOST','3','Lost and Paid For');
>  INSERT INTO `authorised_values`  (category, authorised_value, lib )VALUES ('LOST','4','Missing');
>  
>  -- damaged status of an item
> -INSERT INTO `authorised_values`  (category, authorised_value, lib) VALUES ('DAMAGED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('DAMAGED','1','Damaged');
>  
>  -- location qualification for an item, departments are linked by default to items.location
> @@ -31,15 +29,12 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non Fiction');
>  
>  -- withdrawn status of an item, linked to items.wthdrawn
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Withdrawn');
>  
>  -- loanability status of an item, linked to items.notforloan
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','-1','Ordered');
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','1','Not For Loan');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('NOT_LOAN','2','Staff Collection');
>  
>  -- restricted status of an item, linked to items.restricted
> -INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','0','');
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('RESTRICTED','1','Restricted Access');
> diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql
> index 8bccb69..2b2ca36 100644
> --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql
> +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].sql
> @@ -1,6 +1,5 @@
>  DELETE FROM authorised_values WHERE category='DAMAGED';
>  
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES 
> -('DAMAGED','0',''),
>  ('DAMAGED','1','??????????');
>  
> diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql
> index 17aff3b..0334fdc 100644
> --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql
> +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].sql
> @@ -1,14 +1,12 @@
>  DELETE FROM authorised_values WHERE category='LOST';
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','0','');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','2','?????????? ????????? (????????)');
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','2','?????????? ????????? (????????)');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','1','????????');
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','1','????????');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','3','???????? ? ????????? ?? ?????????');
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','3','???????? ? ????????? ?? ?????????');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','5','??????????? ??? ??????? ?? ??????????????');
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','5','??????????? ??? ??????? ?? ??????????????');
> -
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 5,'LOST','4','??????????? ??? ??????????????');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','4','??????????? ??? ??????????????');
>  
> diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].sql
> index 138cba7..4aafe8a 100644
> --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].sql
> +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].sql
> @@ -1,7 +1,6 @@
>  DELETE FROM authorised_values WHERE category='NOT_LOAN';
>  
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES 
> -('NOT_LOAN','0', ' ??? ?????'),
>  ('NOT_LOAN','-1','????????'),
>  ('NOT_LOAN','1', '?? ??? ?????'),
>  ('NOT_LOAN','2', '???????? ????????? ??????????'),
> diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql
> index e96bcef..4878a30 100644
> --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql
> +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].sql
> @@ -1,7 +1,6 @@
>  DELETE FROM authorised_values WHERE category='RESTRICTED';
>  
>  INSERT INTO `authorised_values` (`category`, `authorised_value`, `lib`) VALUES 
> -('RESTRICTED','0',''),
>  ('RESTRICTED','1','???????????? ??????');
>  
>  
> diff --git a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql
> index e442303..b602b81 100644
> --- a/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql
> +++ b/installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].sql
> @@ -1,7 +1,6 @@
>  DELETE FROM authorised_values WHERE category='WITHDRAWN';
>  
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES 
> -('WITHDRAWN','0',''),
>  ('WITHDRAWN','1','??????');
>  
>  
> diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[DAMAGED].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[DAMAGED].sql
> index 6720945..3280209 100644
> --- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[DAMAGED].sql
> +++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[DAMAGED].sql
> @@ -1,5 +1,4 @@
>  DELETE FROM authorised_values WHERE category='DAMAGED';
>  
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES 
> -('DAMAGED','0',''),
>  ('DAMAGED','1','??????????');
> diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[LOST].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[LOST].sql
> index 849613b..3819a1b 100644
> --- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[LOST].sql
> +++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[LOST].sql
> @@ -1,13 +1,11 @@
>  DELETE FROM authorised_values WHERE category='LOST';
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','0','');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 0,'LOST','2','??????? ???????????? (????????)');
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','2','??????? ???????????? (????????)');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 1,'LOST','1','????????');
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','1','????????');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 2,'LOST','3','???????? ? ????????? ?? ?????????');
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','3','???????? ? ????????? ?? ?????????');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 3,'LOST','5','???????? ??? ?????? ?? ????????????');
>  
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','5','???????? ??? ?????? ?? ????????????');
> -
> -INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 5,'LOST','4','???????? ??? ??????????????');
> +INSERT INTO `authorised_values` (`id`, `category`, `authorised_value`, `lib`) VALUES (LAST_INSERT_ID( ) + 4,'LOST','4','???????? ??? ??????????????');
> diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[NOT_LOAN].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[NOT_LOAN].sql
> index b8544ff..2e5b88c 100644
> --- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[NOT_LOAN].sql
> +++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[NOT_LOAN].sql
> @@ -1,7 +1,6 @@
>  DELETE FROM authorised_values WHERE category='NOT_LOAN';
>  
>  INSERT INTO authorised_values (category, authorised_value, lib) VALUES 
> -('NOT_LOAN','0', ' ??? ???????????'),
>  ('NOT_LOAN','-1','?????????'),
>  ('NOT_LOAN','1', '?? ??? ???????????'),
>  ('NOT_LOAN','2', '???????? ?????????? ??????????'),
> diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[RESTRICTED].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[RESTRICTED].sql
> index a1079f1..c51d2c0 100644
> --- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[RESTRICTED].sql
> +++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[RESTRICTED].sql
> @@ -1,5 +1,4 @@
>  DELETE FROM authorised_values WHERE category='RESTRICTED';
>  
>  INSERT INTO `authorised_values` (`category`, `authorised_value`, `lib`) VALUES 
> -('RESTRICTED','0',''),
>  ('RESTRICTED','1','????????? ??????');
> diff --git a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[WITHDRAWN].sql b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[WITHDRAWN].sql
> index e5d4662..77d0e32 100644
> --- a/installer/data/mysql/uk-UA/authorised_values/authorised_values_[WITHDRAWN].sql
> +++ b/installer/data/mysql/uk-UA/authorised_values/authorised_values_[WITHDRAWN].sql
> @@ -1,5 +1,4 @@
>  DELETE FROM authorised_values WHERE category='WITHDRAWN';
>  
>  INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES 
> -('WITHDRAWN','0',''),
>  ('WITHDRAWN','1','????????');
> 
> 
> 
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/


From srdjan at catalyst.net.nz  Tue Apr  3 05:42:52 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue,  3 Apr 2012 15:42:52 +1200
Subject: [Koha-patches] [PATCH] bug_3966: Update items on receive
In-Reply-To: <bug 3966>
References: <bug 3966>
Message-ID: <1333424572-19264-1-git-send-email-srdjan@catalyst.net.nz>

Use sane interface for items as when creating order.
Changed AddItem() and ModItem() interface so now they return item
record.
AddItemFromMarc() looks for itemnumber, and calls ModItem() if one is
found.
---
 C4/Acquisition.pm                                  |   51 ++-----
 C4/Biblio.pm                                       |    2 -
 C4/ImportBatch.pm                                  |    4 +-
 C4/Items.pm                                        |   25 ++--
 acqui/addorder.pl                                  |    5 +-
 acqui/addorderiso2709.pl                           |    4 +-
 acqui/finishreceive.pl                             |  115 +++++++++-----
 acqui/orderreceive.pl                              |   60 ++++----
 cataloguing/additem.pl                             |    8 +-
 .../prog/en/modules/acqui/orderreceive.tt          |  157 ++++++++++----------
 .../prog/en/modules/services/itemrecorddisplay.tt  |    3 +-
 t/db_dependent/lib/KohaTest.pm                     |   16 +--
 .../lib/KohaTest/Acquisition/GetParcel.pm          |   17 +--
 .../lib/KohaTest/Acquisition/GetParcels.pm         |   18 +--
 t/db_dependent/lib/KohaTest/Biblio/ModBiblio.pm    |    6 +-
 15 files changed, 246 insertions(+), 245 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 4fd5cc2..cd64368 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -1118,16 +1118,14 @@ sub GetCancelledOrders {
 
 =head3 ModReceiveOrder
 
-  &ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user,
-    $unitprice, $booksellerinvoicenumber, $biblioitemnumber,
-    $freight, $bookfund, $rrp);
+  &ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $receiveditems);
 
 Updates an order, to reflect the fact that it was received, at least
-in part. All arguments not mentioned below update the fields with the
-same name in the aqorders table of the Koha database.
+in part.
 
 If a partial order is received, splits the order into two.  The received
-portion must have a booksellerinvoicenumber.
+portion must have a booksellerinvoicenumber. If $receiveditems are supplied,
+the rest of the items will be moved to the new order.
 
 Updates the order with bibilionumber C<$biblionumber> and ordernumber
 C<$ordernumber>.
@@ -1136,13 +1134,9 @@ C<$ordernumber>.
 
 
 sub ModReceiveOrder {
-    my (
-        $biblionumber,    $ordernumber,  $quantrec, $user, $cost,
-        $invoiceno, $freight, $rrp, $budget_id, $datereceived
-    )
-    = @_;
+    my ( $biblionumber, $ordernumber,  $quantrec, $receiveditems ) = @_;
     my $dbh = C4::Context->dbh;
-    $datereceived = C4::Dates->output('iso') unless $datereceived;
+
     my $suggestionid = GetSuggestionFromBiblionumber( $dbh, $biblionumber );
     if ($suggestionid) {
         ModSuggestion( {suggestionid=>$suggestionid,
@@ -1160,36 +1154,23 @@ sub ModReceiveOrder {
     $sth->finish();
 
     if ( $order->{quantity} > $quantrec ) {
-        $sth=$dbh->prepare("
-            UPDATE aqorders
-            SET quantityreceived=?
-                , datereceived=?
-                , booksellerinvoicenumber=?
-                , unitprice=?
-                , freight=?
-                , rrp=?
-                , quantity=?
-            WHERE biblionumber=? AND ordernumber=?");
-
-        $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$quantrec,$biblionumber,$ordernumber);
-        $sth->finish;
-
         # create a new order for the remaining items, and set its bookfund.
         foreach my $orderkey ( "linenumber", "allocation" ) {
             delete($order->{'$orderkey'});
         }
         $order->{'quantity'} -= $quantrec;
         $order->{'quantityreceived'} = 0;
-        my $newOrder = NewOrder($order);
-} else {
-        $sth=$dbh->prepare("update aqorders
-                            set quantityreceived=?,datereceived=?,booksellerinvoicenumber=?,
-                                unitprice=?,freight=?,rrp=?
-                            where biblionumber=? and ordernumber=?");
-        $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$biblionumber,$ordernumber);
-        $sth->finish;
+        my (undef, $newOrder) = NewOrder($order);
+
+        if ($receiveditems && @$receiveditems) {
+            my $sql = "
+                UPDATE aqorders_items
+                SET ordernumber = ?
+                WHERE ordernumber = ?
+                AND itemnumber NOT IN (".join(",", map "?", @$receiveditems).")";
+            $dbh->do($sql, undef, $newOrder, $ordernumber, @$receiveditems);
+        }
     }
-    return $datereceived;
 }
 #------------------------------------------------------------#
 
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 56cd94e..8ba2807 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -2603,8 +2603,6 @@ sub TransformMarcToKohaOneField {
 }
 
 
-#"
-
 #
 # true ModZebra commented until indexdata fixes zebraDB crashes (it seems they occur on multiple updates
 # at the same time
diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm
index 63cc60b..cc054ad 100644
--- a/C4/ImportBatch.pm
+++ b/C4/ImportBatch.pm
@@ -547,10 +547,10 @@ sub BatchCommitItems {
             $updsth->execute();
             $num_items_errored++;
         } else {
-            my ($item_biblionumber, $biblioitemnumber, $itemnumber) = AddItemFromMarc($item_marc, $biblionumber);
+            my $item = AddItemFromMarc($item_marc, $biblionumber);
             my $updsth = $dbh->prepare("UPDATE import_items SET status = ?, itemnumber = ? WHERE import_items_id = ?");
             $updsth->bind_param(1, 'imported');
-            $updsth->bind_param(2, $itemnumber);
+            $updsth->bind_param(2, $item->{itemnumber});
             $updsth->bind_param(3, $row->{'import_items_id'});
             $updsth->execute();
             $updsth->finish();
diff --git a/C4/Items.pm b/C4/Items.pm
index 0b2f99b..0f01492 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -195,11 +195,11 @@ sub CartToShelf {
 
 =head2 AddItemFromMarc
 
-  my ($biblionumber, $biblioitemnumber, $itemnumber) 
-      = AddItemFromMarc($source_item_marc, $biblionumber);
+  my $item = AddItemFromMarc($source_item_marc, $biblionumber);
 
 Given a MARC::Record object containing an embedded item
-record and a biblionumber, create a new item record.
+record and a biblionumber, create a new item record or update
+existing one.
 
 =cut
 
@@ -215,13 +215,15 @@ sub AddItemFromMarc {
 	$localitemmarc->append_fields($source_item_marc->field($itemtag));
     my $item = &TransformMarcToKoha( $dbh, $localitemmarc, $frameworkcode ,'items');
     my $unlinked_item_subfields = _get_unlinked_item_subfields($localitemmarc, $frameworkcode);
+    if (my $itemnumber = $item->{itemnumber}) {
+        return ModItem($item, $biblionumber, $itemnumber, $dbh, $frameworkcode, $unlinked_item_subfields);
+    }
     return AddItem($item, $biblionumber, $dbh, $frameworkcode, $unlinked_item_subfields);
 }
 
 =head2 AddItem
 
-  my ($biblionumber, $biblioitemnumber, $itemnumber) 
-      = AddItem($item, $biblionumber[, $dbh, $frameworkcode, $unlinked_item_subfields]);
+  my $item = AddItem($item, $biblionumber[, $dbh, $frameworkcode, $unlinked_item_subfields]);
 
 Given a hash containing item column names as keys,
 create a new Koha item record.
@@ -273,7 +275,7 @@ sub AddItem {
    
     logaction("CATALOGUING", "ADD", $itemnumber, "item") if C4::Context->preference("CataloguingLog");
     
-    return ($item->{biblionumber}, $item->{biblioitemnumber}, $itemnumber);
+    return $item;
 }
 
 =head2 AddItemBatchFromMarc
@@ -455,6 +457,7 @@ sub ModItemFromMarc {
         $item->{$item_field} = $default_values_for_mod_from_marc{$item_field} unless (exists $item->{$item_field});
     }
     my $unlinked_item_subfields = _get_unlinked_item_subfields( $localitemmarc, $frameworkcode );
+    $itemnumber ||= $item->{itemnumber};
 
     ModItem($item, $biblionumber, $itemnumber, $dbh, $frameworkcode, $unlinked_item_subfields); 
     return $item;
@@ -462,7 +465,7 @@ sub ModItemFromMarc {
 
 =head2 ModItem
 
-  ModItem({ column => $newvalue }, $biblionumber, $itemnumber);
+  my $item = ModItem({ column => $newvalue }, $biblionumber, $itemnumber);
 
 Change one or more columns in an item record and update
 the MARC representation of the item.
@@ -525,6 +528,8 @@ sub ModItem {
     ModZebra( $biblionumber, "specialUpdate", "biblioserver", undef, undef );
 
     logaction("CATALOGUING", "MODIFY", $itemnumber, Dumper($item)) if C4::Context->preference("CataloguingLog");
+
+    return $item;
 }
 
 =head2 ModItemTransfer
@@ -2540,7 +2545,7 @@ sub _find_value {
 
 =head2 PrepareItemrecordDisplay
 
-  PrepareItemrecordDisplay($itemrecord,$bibnum,$itemumber,$frameworkcode);
+  PrepareItemrecordDisplay(bibnum,$itemumber,$itemrecord,$$frameworkcode);
 
 Returns a hash with all the fields for Display a given item data in a template
 
@@ -2718,14 +2723,14 @@ sub PrepareItemrecordDisplay {
                             my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, undef );
                             my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, undef );
                             $subfield_data{random}     = int(rand(1000000));    # why do we need 2 different randoms?
-                            $subfield_data{marc_value} = qq[<input tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="255"
+                            $subfield_data{marc_value} = qq[<input tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="255" value="$defaultvalue"
                                 onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
                                  onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
                                 <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
                                 $javascript];
                         } else {
                             warn "Plugin Failed: $plugin";
-                            $subfield_data{marc_value} = qq(<input tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="255" />); # supply default input form
+                            $subfield_data{marc_value} = qq(<input tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="255" value="$defaultvalue" />); # supply default input form
                         }
                 }
                 elsif ( $tag eq '' ) {       # it's an hidden field
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 279084b..e977c23 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -262,9 +262,8 @@ if ( $orderinfo->{quantity} ne '0' ) {
                                     $itemhash{$item}->{'indicator'},
                                     'ITEM');
             my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
-            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$$orderinfo{biblionumber});
-            NewOrderItem($itemnumber, $$orderinfo{ordernumber});
-
+            my $item = AddItemFromMarc($record,$$orderinfo{biblionumber});
+            NewOrderItem($item->{itemnumber}, $$orderinfo{ordernumber});
         }
     }
 
diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index 8d9c0e3..ef17469 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -259,8 +259,8 @@ if ($op eq ""){
             my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values, \@ind_tag, \@indicator );
             my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' );
             for (my $qtyloop=1;$qtyloop <=$quantity;$qtyloop++) {
-                my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
-                NewOrderItem( $itemnumber, $ordernumber );
+                my $item = AddItemFromMarc( $record, $biblionumber );
+                NewOrderItem( $item->{itemnumber}, $ordernumber );
             }
         } else {
             SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index d09a40a..651903b 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -26,10 +26,10 @@ use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
+use C4::Dates;
 use C4::Acquisition;
 use C4::Biblio;
 use C4::Items;
-use C4::Search;
 use List::MoreUtils qw/any/;
 
 my $input=new CGI;
@@ -46,57 +46,89 @@ my $quantityrec=$input->param('quantityrec');
 my $quantity=$input->param('quantity');
 my $unitprice=$input->param('cost');
 my $invoiceno=$input->param('invoice');
-my $datereceived=$input->param('datereceived');
+my $datereceived=$input->param('datereceived') || C4::Dates->output('iso');
 my $replacement=$input->param('rrp');
 my $gst=$input->param('gst');
 my $freight=$input->param('freight');
 my $booksellerid = $input->param('booksellerid');
 my $cnt=0;
-my $error_url_str;
+my $error_url_str = '';
 my $ecost = $input->param('ecost');
 my $note = $input->param("note");
 
+my $order = GetOrder($ordernumber);
+$order->{booksellerinvoicenumber} = $invoiceno;
+$order->{datereceived} = $datereceived;
+$order->{freight} = $freight;
+$order->{quantity} = $quantity;
+$order->{quantityreceived} = $quantityrec;
+$order->{notes} = $note;
+$order->{rrp} = $replacement;
+$order->{ecost} = $ecost;
+$order->{unitprice} = $unitprice;
+ModOrder($order);
+
 #need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
-if ($quantityrec > $origquantityrec ) {
-    # now, add items if applicable
-    if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
-
-        my @tags         = $input->param('tag');
-        my @subfields    = $input->param('subfield');
-        my @field_values = $input->param('field_value');
-        my @serials      = $input->param('serial');
-        my @itemid       = $input->param('itemid');
-        my @ind_tag      = $input->param('ind_tag');
-        my @indicator    = $input->param('indicator');
-        #Rebuilding ALL the data for items into a hash
-        # parting them on $itemid.
-        my %itemhash;
-        my $countdistinct;
-        my $range=scalar(@itemid);
-        for (my $i=0; $i<$range; $i++){
-            unless ($itemhash{$itemid[$i]}){
-            $countdistinct++;
-            }
-            push @{$itemhash{$itemid[$i]}->{'tags'}},$tags[$i];
-            push @{$itemhash{$itemid[$i]}->{'subfields'}},$subfields[$i];
-            push @{$itemhash{$itemid[$i]}->{'field_values'}},$field_values[$i];
-            push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
-            push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
-        }
-        foreach my $item (keys %itemhash){
-            my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
-                                          $itemhash{$item}->{'subfields'},
-                                          $itemhash{$item}->{'field_values'},
-                                          $itemhash{$item}->{'ind_tag'},
-                                          $itemhash{$item}->{'indicator'},'ITEM');
-            my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
-            my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
-            NewOrderItem($itemnumber, $ordernumber);
-        }
+
+# now, add or update items if applicable
+my @tags         = $input->param('tag');
+my @subfields    = $input->param('subfield');
+my @field_values = $input->param('field_value');
+my @serials      = $input->param('serial');
+my @itemid       = $input->param('itemid');
+my @ind_tag      = $input->param('ind_tag');
+my @indicator    = $input->param('indicator');
+my @itemnumber   = $input->param('itemnumber');
+#Rebuilding ALL the data for items into a hash
+# parting them on $itemid.
+# XXX this is all too flakey. HTML spec says explicitly that input order is arbitrary, yet we
+# depend on the order for multiple items. This whole thing should be rewritten.
+my %itemhash;
+my $countdistinct = 0;
+my $range=scalar(@itemid);
+for (my $i=0; $i<$range; $i++){
+    unless ($itemhash{$itemid[$i]}){
+        $itemhash{$itemid[$i]}->{'itemnumber'} = $itemnumber[$countdistinct];
+        $countdistinct++;
+    }
+    push @{$itemhash{$itemid[$i]}->{'tags'}},$tags[$i];
+    push @{$itemhash{$itemid[$i]}->{'subfields'}},$subfields[$i];
+    push @{$itemhash{$itemid[$i]}->{'field_values'}},$field_values[$i];
+    push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
+    push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
+}
+my $error;
+my %itemnumbers = map { $_ => 1 } GetItemnumbersFromOrder($ordernumber);
+my @received;
+foreach my $id (keys %itemhash){
+    my $itemnumber = $itemhash{$id}->{'itemnumber'};
+    my $xml = TransformHtmlToXml( $itemhash{$id}->{'tags'},
+                                  $itemhash{$id}->{'subfields'},
+                                  $itemhash{$id}->{'field_values'},
+                                  $itemhash{$id}->{'ind_tag'},
+                                  $itemhash{$id}->{'indicator'},'ITEM');
+    my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
+    my $item;
+    if ($itemnumber) {
+        $item = ModItemFromMarc($record,$biblionumber, $itemnumber);
+    } else {
+        $item = AddItemFromMarc($record,$biblionumber);
+    }
+    if ($item) {
+        $itemnumber = $item->{itemnumber};
+        push @received, $itemnumber;
+        NewOrderItem($itemnumber, $ordernumber) unless $itemnumbers{$itemnumber};
+    } else {
+        $error++;
     }
-    
+}
+
+if ($error) {
+    $error_url_str = "&error=Datbase+write+error";
+}
+else {
     # save the quantity received.
-    $datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
+    ModReceiveOrder($biblionumber,$ordernumber, $quantityrec, \@received);
 }
 
 update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber );
@@ -116,3 +148,4 @@ sub update_item {
         replacementpricedate => $datereceived,
     }, $biblionumber, $itemnumber );
 }
+
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 2b59698..46783e0d 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -87,21 +87,13 @@ my $search       = $input->param('receive');
 my $invoice      = $input->param('invoice');
 my $freight      = $input->param('freight');
 my $datereceived = $input->param('datereceived');
-
-
 $datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
 
 my $bookseller = GetBookSellerFromId($booksellerid);
 my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
 my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
 my $results = SearchOrder($ordernumber,$search);
-
-
 my $count   = scalar @$results;
-my $order 	= GetOrder($ordernumber);
-
-
-my $date = @$results[0]->{'entrydate'};
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -116,7 +108,14 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 # prepare the form for receiving
 if ( $count == 1 ) {
-    if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
+    my $order 	= GetOrder($results->[0]->{ordernumber});
+    my $biblionumber = $order->{biblionumber};
+
+    my @itemnumbers = GetItemnumbersFromOrder($ordernumber);
+    $template->param(items => \@itemnumbers);
+
+    my $AcqCreateItem = C4::Context->preference('AcqCreateItem');
+    if ($AcqCreateItem eq 'receiving' || $AcqCreateItem eq 'ordering') {
         # Check if ACQ framework exists
         my $marc = GetMarcStructure(1, 'ACQ');
         unless($marc) {
@@ -127,12 +126,9 @@ if ( $count == 1 ) {
             UniqueItemFields => C4::Context->preference('UniqueItemFields'),
         );
     }
-
-    if ( @$results[0]->{'quantityreceived'} == 0 ) {
-        @$results[0]->{'quantityreceived'} = '';
-    }
-    if ( @$results[0]->{'unitprice'} == 0 ) {
-        @$results[0]->{'unitprice'} = '';
+        
+    if ( $order->{'unitprice'} == 0 ) {
+        $order->{'unitprice'} = '';
     }
 
     my $suggestion   = GetSuggestionInfoFromBiblionumber(@$results[0]->{'biblionumber'});
@@ -144,26 +140,26 @@ if ( $count == 1 ) {
 
     $template->param(
         count                 => 1,
-        biblionumber          => @$results[0]->{'biblionumber'},
-        ordernumber           => @$results[0]->{'ordernumber'},
-        biblioitemnumber      => @$results[0]->{'biblioitemnumber'},
-        booksellerid            => @$results[0]->{'booksellerid'},
+        biblionumber          => $biblionumber,
+        ordernumber           => $order->{'ordernumber'},
+        biblioitemnumber      => $order->{'biblioitemnumber'},
+        booksellerid          => $booksellerid,
         freight               => $freight,
         gst                   => $gst,
         name                  => $bookseller->{'name'},
-        date                  => format_date($date),
-        title                 => @$results[0]->{'title'},
-        author                => @$results[0]->{'author'},
-        copyrightdate         => @$results[0]->{'copyrightdate'},
-        isbn                  => @$results[0]->{'isbn'},
-        seriestitle           => @$results[0]->{'seriestitle'},
-        bookfund              => $budget->{budget_name},
-        quantity              => @$results[0]->{'quantity'},
-        quantityreceivedplus1 => @$results[0]->{'quantityreceived'} + 1,
-        quantityreceived      => @$results[0]->{'quantityreceived'},
-        rrp                   => @$results[0]->{'rrp'},
-        ecost                 => @$results[0]->{'ecost'},
-        unitprice             => @$results[0]->{'unitprice'},
+        date                  => format_date($order->{'entrydate'}),
+        title                 => $order->{'title'},
+        author                => $order->{'author'},
+        copyrightdate         => $order->{'copyrightdate'},
+        isbn                  => $order->{'isbn'},
+        seriestitle           => $order->{'seriestitle'},
+        bookfund              => $order->{'bookfundid'},
+        quantity              => $order->{'quantity'},
+        quantityreceived      => scalar(@itemnumbers),
+        origquantityrec       => $order->{'quantityreceived'},
+        rrp                   => $order->{'rrp'},
+        ecost                 => $order->{'ecost'},
+        unitprice             => $order->{'unitprice'},
         memberfirstname       => $member->{firstname} || "",
         membersurname         => $member->{surname} || "",
         invoice               => $invoice,
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 9c8120e..c6a9b3f 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -347,8 +347,8 @@ if ($op eq "additem") {
 	push @errors,"barcode_not_unique" if($exist_itemnumber);
 	# if barcode exists, don't create, but report The problem.
     unless ($exist_itemnumber) {
-	    my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber);
-        set_item_default_location($oldbibitemnum);
+	    my $item = AddItemFromMarc($record,$biblionumber);
+        set_item_default_location($item->{biblioitemnumber});
     }
 	$nextop = "additem";
 	if ($exist_itemnumber) {
@@ -415,8 +415,8 @@ if ($op eq "additem") {
 
 		# Adding the item
         if (!$exist_itemnumber) {
-            my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber);
-            set_item_default_location($oldbibitemnum);
+	        my $item = AddItemFromMarc($record,$biblionumber);
+            set_item_default_location($item->{biblioitemnumber});
 
             # We count the item only if it was really added
             # That way, all items are added, even if there was some already existing barcodes
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index bb706ec..b8cfca5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -6,7 +6,6 @@
 <script type="text/javascript">
 //<![CDATA[
     function Check(form) {
-        [% IF (AcqCreateItemReceiving) %]
             // Remove last itemblock if it is not in items_list
             var lastitemblock = $("#outeritemblock > div:last");
             var tobedeleted = true;
@@ -27,7 +26,6 @@
                 }
                 return false;
             };
-        [% END %]
 
         return true;
     }
@@ -86,48 +84,81 @@
         </fieldset>
     [% END %]
 
-    [% IF (AcqCreateItemReceiving) %]
-        <div id="items_list" style="display:none">
-            <p><b>Items list</b></p>
-            <div style="width:100%;overflow:auto;">
-                <table>
-                    <thead>
-                        <tr>
-                            <th>&nbsp;</th>
-                            <th>&nbsp;</th>
-                            <th>Barcode</th>
-                            <th>Home branch</th>
-                            <th>Holding branch</th>
-                            <th>Not for loan</th>
-                            <th>Restricted</th>
-                            <th>Location</th>
-                            <th>Call number</th>
-                            <th>Copy number</th>
-                            <th>Stock number</th>
-                            <th>Collection code</th>
-                            <th>Item type</th>
-                            <th>Materials</th>
-                            <th>Notes</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    </tbody>
-                </table>
-            </div>
+    <div id="items_list" style="display:none">
+        <p><b>Items list</b></p>
+        <div style="width:100%;overflow:auto;">
+            <table>
+                <thead>
+                    <tr>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                        <th>Barcode</th>
+                        <th>Home branch</th>
+                        <th>Holding branch</th>
+                        <th>Not for loan</th>
+                        <th>Restricted</th>
+                        <th>Location</th>
+                        <th>Call number</th>
+                        <th>Copy number</th>
+                        <th>Stock number</th>
+                        <th>Collection code</th>
+                        <th>Item type</th>
+                        <th>Materials</th>
+                        <th>Notes</th>
+                    </tr>
+                </thead>
+                <tbody>
+                </tbody>
+            </table>
         </div>
+    </div>
+
+    <fieldset class="rows" id="itemfieldset">
+        <legend>Item</legend>
+        [% IF ( NoACQframework ) %]
+            <p class="required">
+                No ACQ framework, using default. You should create a
+                framework with code ACQ, the items framework would be
+                used
+            </p>
+        [% END %]
+        <div id="outeritemblock">
+        [% IF ( items ) %]
+            [% itemid = 1 %]
+            [% FOREACH itemnumber IN items %]
+            <div id="itemblock[% itemid %]" style="display:none"></div>
+            <script type="text/javascript">
+                $(document).ready(function() {
+                    var unique_item_fields = 'barcode';
+                    $.ajax({
+                        url: "/cgi-bin/koha/services/itemrecorddisplay.pl",
+                        dataType: 'html',
+                        data: {
+                            frameworkcode: 'ACQ',
+                            biblionumber: [% biblionumber %],
+                            itemnumber: [% itemnumber %]
+                        },
+                        success: function(data, textStatus, jqXHR) {
+                            /* Create the item block */
+                            var buttonPlus = '<a name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')">Update</a>';
+                            var buttonClear = '<a name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)">' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear') + '</a>';
+
+                            $("#itemblock[% itemid %]").append(data).append(buttonPlus).append(buttonClear);
+                            $("#itemblock[% itemid %]").find("input[name='itemid']").each(function(){
+                                $(this).val([% itemid %]);
+                            });
+                        }
+                    });
+
+                    addItemInList("itemblock[% itemid %]", unique_item_fields);
+                });
+            </script>
+            [% itemid = itemid + 1 %]
+            [% END %] <!-- /items -->
+        [% END %] <!-- if items -->
+        </div>
+    </fieldset>
 
-        <fieldset class="rows" id="itemfieldset">
-            <legend>Item</legend>
-            [% IF ( NoACQframework ) %]
-                <p class="required">
-                    No ACQ framework, using default. You should create a
-                    framework with code ACQ, the items framework would be
-                    used
-                </p>
-            [% END %]
-            <div id="outeritemblock"></div>
-        </fieldset>
-    [% END %][%# IF (AcqCreateItemReceiving) %]
     <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
     <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
     <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
@@ -139,42 +170,16 @@
 	<div class="yui-u">
     <fieldset class="rows">
     <legend>Accounting details</legend>
-       <ol>
-       <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li>
-       <li><label for="bookfund">Budget: </label><span> [% bookfund %] </span></li>
-       <li><label for="creator">Created by: </label><span> [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]</span></li>
-       <li><label for="quantityto">Quantity to receive: </label><span class="label">
-           [% IF ( edit ) %]
-               <input type="text" id="quantity_to_receive" name="quantity" value="[% quantity %]" />
-           [% ELSE %]
-               <input type="text" readonly="readonly" id="quantity_to_receive" name="quantity" value="[% quantity %]" />
-           [% END %]
+    <ol>
+        <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li>
+        <li><label for="bookfund">Budget: </label><span> [% bookfund %] </span></li>
+        <li><label for="creator">Created by: </label><span> [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]</span></li>
+        <li><label for="quantity">Quantity to receive: </label><span class="label">
+            <input type="text" readonly="readonly" name="quantity" value="[% quantity %]" />
            </span></li>
         <li><label for="quantity">Quantity received: </label>
-          [% IF (AcqCreateItemReceiving) %]
-            <input readonly="readonly" type="text" size="20" name="quantityrec" id="quantity" value="0" />
-          [% ELSE %]
-            [% IF ( quantityreceived ) %]
-                [% IF ( edit ) %]
-                    <input type="text" size="20" name="quantityrec" id="quantity" value="[% quantityreceived %]" />
-                    <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="[% quantityreceived %]" />
-                [% ELSE %]
-                [% IF ( items ) %]
-                    <input READONLY type="text" size="20" name="quantityrec" id="quantity" value="[% quantityreceivedplus1 %]" />
-                [% ELSE %]
-                    <input type="text" size="20" name="quantityrec" id="quantity" value="[% quantityreceivedplus1 %]" />
-                [% END %]
-                <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="[% quantityreceived %]" />
-                [% END %]
-            [% ELSE %]
-                [% IF ( items ) %]
-                    <input READONLY type="text" id="quantity" size="20" name="quantityrec" value="1" />
-                [% ELSE %]
-                    <input type="text" size="20" id="quantity" name="quantityrec" value="1" />
-                [% END %]
-                <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="0" />
-            [% END %]
-          [% END %][%# IF (AcqCreateItemReceiving) %]
+            <input readonly="readonly" type="text" size="20" name="quantityrec" id="quantity" value="[% quantityreceived || 0 %]" />
+            <input id="origquantityrec" type="hidden" name="origquantityrec" value="[% origquantityrec %]" />
 		</li>
         <li><label for="rrp">Replacement cost: </label><input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /></li>
         <li><label for="ecost">Budgeted cost: </label><input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" /></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
index 6790b3d..1b92907 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt
@@ -13,7 +13,7 @@
             [% END %]
         </label>
         [% iteminfo.marc_value %]
-        <input type="hidden" name="itemid" value="1" />
+        <input type="hidden" name="itemid" />
         <input type="hidden" name="kohafield" value="[% iteminfo.kohafield %]" />
         <input type="hidden" name="tag" value="[% iteminfo.tag %]" />
         <input type="hidden" name="subfield" value="[% iteminfo.subfield %]" />
@@ -22,3 +22,4 @@
     </li>
   [% END %]
 </ol>
+<input type="hidden" name="itemnumber" value="[% itemnumber %]" />
diff --git a/t/db_dependent/lib/KohaTest.pm b/t/db_dependent/lib/KohaTest.pm
index d8cf495..c632740 100644
--- a/t/db_dependent/lib/KohaTest.pm
+++ b/t/db_dependent/lib/KohaTest.pm
@@ -572,16 +572,12 @@ sub add_biblios {
         ok( $biblionumber, "the biblionumber is $biblionumber" );
         ok( $biblioitemnumber, "the biblioitemnumber is $biblioitemnumber" );
         if ( $param{'add_items'} ) {
-            # my @iteminfo = AddItem( {}, $biblionumber );
-            my @iteminfo = AddItemFromMarc( $marcrecord, $biblionumber );
-            is( $iteminfo[0], $biblionumber,     "biblionumber is $biblionumber" );
-            is( $iteminfo[1], $biblioitemnumber, "biblioitemnumber is $biblioitemnumber" );
-            ok( $iteminfo[2], "itemnumber is $iteminfo[2]" );
-        push @{ $self->{'items'} },
-          { biblionumber     => $iteminfo[0],
-            biblioitemnumber => $iteminfo[1],
-            itemnumber       => $iteminfo[2],
-          };
+            # my $item = AddItem( {}, $biblionumber );
+            my $item = AddItemFromMarc( $marcrecord, $biblionumber );
+            is( $item->{biblionumber},     "biblionumber is $biblionumber" );
+            is( $item->{biblioitemnumber}, "biblioitemnumber is $biblioitemnumber" );
+            ok( $item->{itemnumber}, "itemnumber is $item->{itemnumber}" );
+            push @{ $self->{'items'} }, $item;
         }
         push @{$self->{'biblios'}}, $biblionumber;
     }
diff --git a/t/db_dependent/lib/KohaTest/Acquisition/GetParcel.pm b/t/db_dependent/lib/KohaTest/Acquisition/GetParcel.pm
index c26e5f2..b42ea9c 100644
--- a/t/db_dependent/lib/KohaTest/Acquisition/GetParcel.pm
+++ b/t/db_dependent/lib/KohaTest/Acquisition/GetParcel.pm
@@ -43,18 +43,11 @@ sub one_parcel : Test( 17 ) {
     
     ok( $basketno, "my basket number is $basketno" );
     ok( $ordernumber,   "my order number is $ordernumber" );
-    my $datereceived = ModReceiveOrder( $self->{'biblios'}[0],             # biblionumber
-                                        $ordernumber,       # $ordernumber,
-                                        undef,         # $quantrec,
-                                        undef,         # $user,
-                                        undef,         # $cost,
-                                        $invoice,         # $invoiceno,
-                                        undef,         # $freight,
-                                        undef,         # $rrp,
-                                        $self->{'bookfundid'},         # $bookfund,
-                                        $today,         # $datereceived
-                                   );
-    is( $datereceived, $today, "the parcel was received on $datereceived" );
+    ModReceiveOrder( $self->{'biblios'}[0],             # biblionumber
+                     $ordernumber,       # $ordernumber,
+                     1,         # $quantrec,
+                   );
+    pass( "the parcel was received" );
 
     my @parcel = GetParcel( $self->{'booksellerid'}, $invoice, $today );
     is( scalar @parcel, 1, 'we found one (1) parcel.' )
diff --git a/t/db_dependent/lib/KohaTest/Acquisition/GetParcels.pm b/t/db_dependent/lib/KohaTest/Acquisition/GetParcels.pm
index fd3ad0f..b14095f 100644
--- a/t/db_dependent/lib/KohaTest/Acquisition/GetParcels.pm
+++ b/t/db_dependent/lib/KohaTest/Acquisition/GetParcels.pm
@@ -271,18 +271,12 @@ sub create_order {
 
     my ( $basketno, $ordernumber ) = $self->create_new_basket( %param );
 
-    my $datereceived = ModReceiveOrder( $self->{'biblios'}[0],             # biblionumber
-                                        $ordernumber,       # $ordernumber,
-                                        undef,         # $quantrec,
-                                        undef,         # $user,
-                                        undef,         # $cost,
-                                        $param{'invoice'},         # $invoiceno,
-                                        undef,         # $freight,
-                                        undef,         # $rrp,
-                                        $self->{'bookfundid'},         # $bookfund,
-                                        $param{'date'},         # $datereceived
-                                   );
-    is( $datereceived, $param{'date'}, "the parcel was received on $datereceived" );
+    ModReceiveOrder( $self->{'biblios'}[0],             # biblionumber
+                     $ordernumber,       # $ordernumber,
+                     1,         # $quantrec,
+                   );
+    # XXX Needs proper tests for partial receiving
+    pass( "the parcel was received" );
 
 }
 
diff --git a/t/db_dependent/lib/KohaTest/Biblio/ModBiblio.pm b/t/db_dependent/lib/KohaTest/Biblio/ModBiblio.pm
index 5b29ea8..8a83268 100644
--- a/t/db_dependent/lib/KohaTest/Biblio/ModBiblio.pm
+++ b/t/db_dependent/lib/KohaTest/Biblio/ModBiblio.pm
@@ -31,10 +31,10 @@ sub add_bib_to_modify : Test( startup => 3 ) {
     $self->{'bib_to_modify'} = $bibnum;
 
     # add an item
-    my ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL' } , $bibnum);
+    my $item = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL' } , $bibnum);
 
-    cmp_ok($item_bibnum, '==', $bibnum, "new item is linked to correct biblionumber"); 
-    cmp_ok($item_bibitemnum, '==', $bibitemnum, "new item is linked to correct biblioitemnumber"); 
+    cmp_ok($item->{biblionumber}, '==', $bibnum, "new item is linked to correct biblionumber"); 
+    cmp_ok($item->{biblioitemnumber}, '==', $bibitemnum, "new item is linked to correct biblioitemnumber"); 
 
     $self->reindex_marc(); 
 
-- 
1.7.5.4


From srdjan at catalyst.net.nz  Tue Apr  3 06:36:33 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue, 03 Apr 2012 14:36:33 +1000
Subject: [Koha-patches] [PATCH] bug_7398: Replaced
 OPACDisplayRequestPriority syspref with OPACShowHoldQueueDetails
In-Reply-To: <4F755558.7010201@msys.ch>
References: <bug 7398>
	<1333065850-20320-1-git-send-email-srdjan@catalyst.net.nz>
	<4F755558.7010201@msys.ch>
Message-ID: <4F7A7E51.3010802@catalyst.net.nz>


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Marc,

> This patch is wrong. It contains MySQLisms (backquotes). Please change
the code to not introduce MySQLisms, thus supporting the efforts to make
Koha run on PostgreSQL, too.
That is correct.  However that line contained MySQLisms before, I did
not introduced them. If the policy is to remove backticks from the code
we change I'm happy to resubmit the patch.


Srdjan

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk96flEACgkQX6p/D9UE7dw8agCggqf3KiBKRlzoV1Y9wSsRJrKQ
IRkAn3I+PsEUxVZZyJJXBAEwNOfmTInt
=ZjYF
-----END PGP SIGNATURE-----


From marc at msys.ch  Tue Apr  3 08:26:54 2012
From: marc at msys.ch (Marc Balmer)
Date: Tue, 03 Apr 2012 08:26:54 +0200
Subject: [Koha-patches] [PATCH] bug_7398: Replaced
 OPACDisplayRequestPriority syspref with OPACShowHoldQueueDetails
In-Reply-To: <4F7A7E51.3010802@catalyst.net.nz>
References: <bug 7398>
	<1333065850-20320-1-git-send-email-srdjan@catalyst.net.nz>
	<4F755558.7010201@msys.ch> <4F7A7E51.3010802@catalyst.net.nz>
Message-ID: <4F7A982E.1040001@msys.ch>

Am 03.04.2012 06:36, schrieb Srdjan:
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi Marc,
>
>> This patch is wrong. It contains MySQLisms (backquotes). Please change
> the code to not introduce MySQLisms, thus supporting the efforts to make
> Koha run on PostgreSQL, too.
> That is correct.  However that line contained MySQLisms before, I did
> not introduced them. If the policy is to remove backticks from the code
> we change I'm happy to resubmit the patch.

I think it would make greats sense to remove MySQLisms while touching 
code.  Especially when editing "random" files.  What do others think? 
Now sysprefs.sql is different, because it uses backquotes everywhere.  I 
will change that particular file in the not so distant future.

- Marc

>
>
> Srdjan
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAk96flEACgkQX6p/D9UE7dw8agCggqf3KiBKRlzoV1Y9wSsRJrKQ
> IRkAn3I+PsEUxVZZyJJXBAEwNOfmTInt
> =ZjYF
> -----END PGP SIGNATURE-----
>


From adrien.saurat at biblibre.com  Tue Apr  3 09:57:43 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Tue,  3 Apr 2012 09:57:43 +0200
Subject: [Koha-patches] [PATCH] Bug 7871: prevents crash when suggestion
	linked to erased budget
Message-ID: <1333439863-3442-1-git-send-email-adrien.saurat@biblibre.com>

---
 suggestion/suggestion.pl |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 7f197d8..f7c50b5 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -205,7 +205,10 @@ if ($op=~/else/) {
 
         my $suggestions = &SearchSuggestion($suggestion_ref);
         foreach my $suggestion (@$suggestions) {
-            $suggestion->{budget_name} = GetBudget( $suggestion->{budgetid} )->{budget_name} if $suggestion->{budgetid};
+            if ($suggestion->{budgetid}){
+                my $bud = GetBudget( $suggestion->{budgetid} );
+                $suggestion->{budget_name} = $bud->{budget_name} if $bud;
+            }
             foreach my $date qw(suggesteddate manageddate accepteddate) {
                 if ($suggestion->{$date} and $suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ) {
                     $suggestion->{$date} = format_date( $suggestion->{$date} );
-- 
1.7.4.1


From oleonard at myacpl.org  Tue Apr  3 15:07:02 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 09:07:02 -0400
Subject: [Koha-patches] [PATCH] Bug 2733 - Can't print patron account
Message-ID: <1333458422-10375-1-git-send-email-oleonard@myacpl.org>

Changing "print page" link to "print summary." I hope this will
alleviate the suggstion that the option prints the current page.

- Changed "Quick slip" to "Print quick slip" to make it consistent
  with the other options in the menu

- Corrected the case of other text strings as required by
  Bug 2780.
---
 .../prog/en/includes/circ-toolbar.inc              |   24 ++++++++++----------
 .../prog/en/includes/members-toolbar.inc           |   20 ++++++++--------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index efad86e..85905fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -61,17 +61,17 @@ function export_barcodes() {
 	function yuiToolbar() {
 	    var printmenu = [
             [% IF ( CAN_user_borrowers ) %]
-	        { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} },
+	        { text: _("Print summary"), onclick: {fn: function(){printx_window("page")}} },
             [% END %]
-	        { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} },
-	        { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} }
+	        { text: _("Print slip"), onclick: {fn: function(){printx_window("slip")}} },
+	        { text: _("Print quick slip"), onclick: {fn: function(){printx_window("qslip")}} }
 	    ];
 	
 		var moremenu = [
-			{ text: _("Renew Patron"),  onclick: { fn: confirm_reregistration } },
-			{ text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS CAN_user_permissions %], disabled: true[% END %]},
+			{ text: _("Renew patron"),  onclick: { fn: confirm_reregistration } },
+			{ text: _("Set permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS CAN_user_permissions %], disabled: true[% END %]},
             { text: _("Delete"), [% UNLESS CAN_user_borrowers %]disabled: true, [% END %] onclick: { fn: confirm_deletion } },
-            { text: _("Update Child to Adult Patron") , onclick: { fn: update_child }[% UNLESS is_child %], disabled: true[% END %]},
+            { text: _("Update child to adult patron") , onclick: { fn: update_child }[% UNLESS is_child %], disabled: true[% END %]},
             { text: _("Export today's checked in barcodes"), onclick: { fn: export_barcodes }}
         ];
 
@@ -126,20 +126,20 @@ function export_barcodes() {
 	[% END %]
 	[% IF ( CAN_user_borrowers ) %]
         [% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-        [% IF ( CAN_user_staffaccess ) %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li>[% END %]
+        [% IF ( CAN_user_staffaccess ) %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change password</a></li>[% END %]
     [% END %]
     <li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
-	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print Page</a></li>
-	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print Slip</a></li>
+	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print summary</a></li>
+	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
 	<li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
-	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew Account</a></li>
+	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>
     [% IF ( CAN_user_permissions ) %]
         [% IF ( StaffMember ) %]
             [% IF ( CAN_user_staffaccess ) %]
-                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set Permissions</a></li>
+                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
             [% END %]
           [% ELSE %]
-                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set Permissions</a></li>
+                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
         [% END %]
     [% END %]
     [% IF ( StaffMember ) %][% UNLESS ( CAN_user_staffaccess ) %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index bad8502..29d9d85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -52,16 +52,16 @@ function update_child() {
 	}
 	function yuiToolbar() {
 	    var printmenu = [
-	        { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} },
-	        { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} },
-	        { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} }
+	        { text: _("Print summary"), onclick: {fn: function(){printx_window("page")}} },
+	        { text: _("Print slip"), onclick: {fn: function(){printx_window("slip")}} },
+	        { text: _("Print quick slip"), onclick: {fn: function(){printx_window("qslip")}} }
 	    ];
 
 		var moremenu = [
-			{ text: _("Renew Patron"),  onclick: { fn: confirm_reregistration } },
-			{ text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS ( CAN_user_permissions ) %], disabled: true[% END %]},
+			{ text: _("Renew patron"),  onclick: { fn: confirm_reregistration } },
+			{ text: _("Set permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS ( CAN_user_permissions ) %], disabled: true[% END %]},
 			{ text: _("Delete"), onclick: { fn: confirm_deletion}[% UNLESS ( CANDELETEUSER ) %], disabled: true[% END %] },
-			{ text: _("Update Child to Adult Patron") , onclick: { fn: update_child }[% UNLESS ( is_child ) %], disabled: true[% END %]}
+			{ text: _("Update child to adult patron") , onclick: { fn: update_child }[% UNLESS ( is_child ) %], disabled: true[% END %]}
 		];
 
 	    new YAHOO.widget.Button({
@@ -115,10 +115,10 @@ function update_child() {
             [% END %]
         [% END %]
 	[% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-	[% IF CAN_user_staffaccess %]<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li> [% END %]
+	[% IF CAN_user_staffaccess %]<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change password</a></li> [% END %]
 	<li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
-    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print Page</a></li>
-	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print Slip</a></li>
+    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print summary</a></li>
+	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
 	<li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
-	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew Account</a></li>[% IF ( CAN_user_permissions ) %]<li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set Permissions</a></li>[% END %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
+	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>[% IF ( CAN_user_permissions ) %]<li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>[% END %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
 </ul></div>
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 15:21:49 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 09:21:49 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
Message-ID: <1333459309-12736-1-git-send-email-oleonard@myacpl.org>

Corrections to Acquisitions include files. Patch
also includes some corrections to unescaped ampersands.
---
 .../en/includes/acquisitions-add-to-basket.inc     |    4 ++--
 .../prog/en/includes/acquisitions-menu.inc         |    2 +-
 .../prog/en/includes/acquisitions-search.inc       |    8 ++++----
 .../prog/en/includes/acquisitions-toolbar.inc      |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
index 6082637..c36698d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc
@@ -1,12 +1,12 @@
 <fieldset id="acqui_basket_add">
-    <legend>Add Order To Basket</legend>
+    <legend>Add order to basket</legend>
     [% IF has_budgets %]
     <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
         <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
         <input type="hidden" name="basketno" value="[% basketno %]" />
         <ul><li><label for="q">From an existing record: </label><input id="q" type="text"  size="25" name="q" />
         <input type="submit" class="submit" value="Search" /></li>
-        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From a Suggestion</a></li>
+        <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From a suggestion</a></li>
         <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From a new (empty) record</a></li>
         <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">From an external source</a></li>
         <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]"> From a staged file</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index a0f094c..66701d8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -2,7 +2,7 @@
 	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
 	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
     [% IF ( CAN_user_acquisition_budget_manage ) %]
-	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets &amp; Funds</a></li>
+	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets &amp; funds</a></li>
     [% END %]
     [% IF ( CAN_user_parameters ) %]
      <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index 6c928ef..7951a92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -14,16 +14,16 @@
 		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="[% title %]" /> <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name|html %]" />
         <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" onclick="$('#filters').toggle();$('.filteraction').hide();">[-]</a></span>
         <span class="filteraction" id="filteraction_on"> <a href="#" onclick="$('#filters').show();$('.filteraction').toggle();">[+]</a></span>
-	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced Search</a>
+	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>
     <p id="filters" style="display:none">
       <label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
-      <label for="booksellerinvoicenumber">Invoice No.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
+      <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
     </p>
 	</form>
 	</div>	
 			<ul id="tabtriggers">
-			<li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Vendor Search</a></li>
-			<li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders Search</a></li>
+			<li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Vendor search</a></li>
+			<li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders search</a></li>
 			</ul>	
 </div>
 <!-- End Acquisitions Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
index d8e2c1e..11d7b39 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
@@ -50,14 +50,14 @@
                 [% UNLESS ( basketcount OR subscriptioncount ) %]
                     <li><a id="deletesupplier" href="javascript:confirm_deletion()">Delete</a></li>
                 [% END %]
-                <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">New Contract</a></li>
+                <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">New contract</a></li>
                 <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>
                 [% UNLESS ( basketcount ) %]
-                    <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&op=add_form">New Basket</a></li>
+                    <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid %]&amp;op=add_form">New basket</a></li>
                 [% END %]
             [% END %]
         [% ELSE %]
-            <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Vendor</a></li>
+            <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New vendor</a></li>
         [% END %]
     </ul>
 </div>
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 15:26:04 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 09:26:04 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
Message-ID: <1333459564-12954-1-git-send-email-oleonard@myacpl.org>

Corrections to Authorities-related includes.
---
 .../prog/en/includes/auth-finder-search.inc        |    4 ++--
 .../prog/en/includes/authorities-search.inc        |    6 +++---
 .../prog/en/includes/authorities-toolbar.inc       |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index f412de3..f3752b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -130,8 +130,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         <label for="orderby">Sort by </label>
         <select name="orderby" id="orderby">
             <option value="">No order</option>
-            <option value="HeadingAsc" selected="selected">Heading Ascendant</option>
-            <option value="HeadingDsc">Heading Descendant</option>
+            <option value="HeadingAsc" selected="selected">Heading ascendant</option>
+            <option value="HeadingDsc">Heading descendant</option>
         </select>
         </li></ol></fieldset>
             <fieldset class="action"> <input type="submit" value="Start search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
index 3f41b3a..0814922 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -93,9 +93,9 @@
     </form>
     </div>
     <ul>
-        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#authority_search">Search Authorities</a></li>
-        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#main_heading">Search Main Heading</a></li>
-        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#all_headings">Search All Headings</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#authority_search">Search authorities</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#main_heading">Search main heading</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#all_headings">Search all headings</a></li>
     </ul>
 </div>
 <!-- End Authorities Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
index 214bc20..e1fb303 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc
@@ -21,7 +21,7 @@
 
 	    new YAHOO.widget.Button({
 	        type: "menu",
-	        label: _("New Authority"),
+	        label: _("New authority"),
 	        name: "newmenubutton",
 	        menu: newmenu,
 	        container: "newmenuc"
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 15:33:37 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 09:33:37 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(catalog)
Message-ID: <1333460017-13253-1-git-send-email-oleonard@myacpl.org>

Correcting catalog-related includes.
---
 .../intranet-tmpl/prog/en/includes/cat-search.inc  |    6 +-
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |   44 ++++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 379cc56..444c1ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -89,9 +89,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	[% END %]
 	
 			<ul>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-selected"><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-selected"><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Catalogue Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index be2f74f..d954b0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -82,19 +82,19 @@ function confirm_items_deletion() {
 		//	Menu for new record, new item, new subscription
 		var newmenu = [
 			[% IF CAN_user_editcatalogue_edit_catalogue %]
-            {text: _("New Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" },
+            {text: _("New record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" },
             [% END %]
 			[% IF ( CAN_user_editcatalogue_edit_items ) %]
-            {text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]#additema" },
+            {text: _("New item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]#additema" },
             [% END %]
             [% IF ( CAN_user_serials_create_subscription ) %]
-                {text: _("New Subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber %]"},
+                {text: _("New subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber %]"},
             [% END %]
             [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %]
-                {text: _("Analyze Items"), url: "/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&analyze=1" },
+                {text: _("Analyze items"), url: "/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&analyze=1" },
             [% END %]
             [% IF CAN_user_editcatalogue_edit_catalogue %]
-                {text: _("New Child Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber %]" },
+                {text: _("New child record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber %]" },
             [% END %]
 		];
 		if(newmenu.length){
@@ -108,15 +108,15 @@ function confirm_items_deletion() {
 			 });
 		 }
 	    var editmenu = [
-	        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=&amp;op=" },[% END %]
-	        [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]" },[% END %]
-	        [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Attach Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]" },[% END %]
-            [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Link to Host Item"), url: "/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]" },[% END %][% END %]
-            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]{ text: _("Upload Image"), url: "/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&filetype=image" },[% END %][% END %]
-	        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=&amp;op=duplicate" },[% END %]
-			[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Replace Record via Z39.50"), onclick: {fn: PopupZ3950 } },[% END %]
-			[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Delete Record"), onclick: {fn: confirm_deletion }[% IF ( count ) %],id:'disabled'[% END %] },[% END %]
-	        [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Delete all Items"), onclick: {fn: confirm_items_deletion }[% UNLESS ( count ) %],id:'disabled'[% END %] }[% END %]
+	        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Edit record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=&amp;op=" },[% END %]
+	        [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Edit items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]" },[% END %]
+	        [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Attach item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]" },[% END %]
+            [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Link to host item"), url: "/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]" },[% END %][% END %]
+            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]{ text: _("Upload image"), url: "/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber %]&filetype=image" },[% END %][% END %]
+	        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Edit as new (duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=&amp;op=duplicate" },[% END %]
+			[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Replace record via Z39.50"), onclick: {fn: PopupZ3950 } },[% END %]
+			[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: _("Delete record"), onclick: {fn: confirm_deletion }[% IF ( count ) %],id:'disabled'[% END %] },[% END %]
+	        [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Delete all items"), onclick: {fn: confirm_items_deletion }[% UNLESS ( count ) %],id:'disabled'[% END %] }[% END %]
 	    ];
 		if(editmenu.length){
 			new YAHOO.widget.Button({
@@ -210,23 +210,23 @@ function confirm_items_deletion() {
 <ul class="toolbar" id="cattoolbar">
 
 	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
-	<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New Record</a></li>
+	<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>
 	[% END %]
 	[% IF ( CAN_user_editcatalogue_edit_items ) %]
-	<li><a id="newitem" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">New Item</a></li>
+	<li><a id="newitem" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">New item</a></li>
 	[% END %]
 	[% IF ( CAN_user_serials_create_subscription ) %]
-	<li><a id="newsub" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber %]">New Subscription</a></li>
+	<li><a id="newsub" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber %]">New subscription</a></li>
 	[% END %]
 
 	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
-	<li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=[% current_framework %]&amp;op=">Edit Record</a></li>
+	<li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=[% current_framework %]&amp;op=">Edit record</a></li>
 	[% END %]
 	[% IF ( CAN_user_editcatalogue_edit_items ) %]
-	<li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">Edit Items</a></li>
+	<li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">Edit items</a></li>
 	[% END %]
 	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
-	<li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=[% current_framework %]&amp;op=duplicate">Duplicate Record</a></li>
+	<li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=[% current_framework %]&amp;op=duplicate">Duplicate record</a></li>
 	[% END %]
 	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
 	<li><a id="deletebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=[% biblionumber %]">Delete</a></li>
@@ -235,9 +235,9 @@ function confirm_items_deletion() {
 	<li><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=[% biblionumber %]">Add to shelf</a></li>
 	<li><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=[% biblionumber %]">Print</a></li>
 	[% IF ( CAN_user_reserveforothers ) %]
-	[% UNLESS ( norequests ) %]<li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>[% END %]
+	[% UNLESS ( norequests ) %]<li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">Place hold</a></li>[% END %]
 	[% END %]
-	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 Search" onclick="PopupZ3950(); return false;" /></li>[% END %]
+	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 search" onclick="PopupZ3950(); return false;" /></li>[% END %]
     </ul>
 </form>
 </div>
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 15:37:36 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 09:37:36 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Budgets)
Message-ID: <1333460256-13447-1-git-send-email-oleonard@myacpl.org>

Correcting Budgets-related includes.
---
 .../prog/en/includes/budgetperiods-admin.inc       |    2 +-
 .../prog/en/includes/budgets-admin-search.inc      |    8 ++++----
 .../prog/en/includes/budgets-admin-toolbar.inc     |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
index 9ffa053..ed8a03c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
@@ -19,7 +19,7 @@
                 ]
             new YAHOO.widget.Button({
                 type: "menu",
-                label: _("Root Budgets"),
+                label: _("Root budgets"),
                 name: "periods_button",
                 menu: periods_menu,
                 container: "periods_menuc"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
index 050699b..2514aa4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
@@ -46,7 +46,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
  </script>  [% END %][% END %]
 <div id="header_search">
 	<div id="budgets_search" class="residentsearch">
-	<p class="tip">Search Budgets:</p>
+	<p class="tip">Search budgets:</p>
 
 	<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
 
@@ -107,9 +107,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 		</form>
 	</div>[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/aqbudgets.pl#budgets_search">Search Budgets</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/aqbudgets.pl#budgets_search">Search budgets</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Suggestions Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
index 9b816ce..3d9c1ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
@@ -42,7 +42,7 @@
 
                var planning_menu = [
 
-                        { text: _("Plan by Months"),
+                        { text: _("Plan by months"),
                             url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=MONTHS"
                             [% UNLESS ( CAN_user_acquisition_planning_manage ) %],  id:'disabled' [% END %]
                         },
@@ -52,7 +52,7 @@
                             [% UNLESS ( CAN_user_acquisition_planning_manage ) %],  id:'disabled' [% END %]
                         },
 
-                        { text: _("Plan by Item Types"),
+                        { text: _("Plan by item types"),
                             url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=ITEMTYPES"
                             [% UNLESS ( CAN_user_acquisition_planning_manage ) %],  id:'disabled' [% END %]
                         },
@@ -103,7 +103,7 @@
 	//]]>
 </script>
 	<ul class="toolbar">
-        [% UNLESS ( budget_period_id ) %]<li><a id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New Budget</a></li>[% END %]
+        [% UNLESS ( budget_period_id ) %]<li><a id="newrootbudget" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li>[% END %]
 		[% UNLESS ( period_button_only ) %]<li id="budgets_menuc"><a id="budgets_menu" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li>[% END %]
         <li id="periods_menuc"><a id="periods_menu" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">Budgets</a></li>
 		[% UNLESS ( period_button_only ) %]<li id="planning_menuc"><a id="planning_menu" href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]">Budget planning</a></li>
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 16:16:03 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 10:16:03 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Circulation)
Message-ID: <1333462563-14285-1-git-send-email-oleonard@myacpl.org>

Correcting Circulation-related includes
---
 .../prog/en/includes/checkin-search.inc            |    4 +-
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    6 ++--
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |    6 ++--
 .../intranet-tmpl/prog/en/includes/circ-search.inc |    6 ++--
 .../prog/en/includes/circ-toolbar.inc              |   24 ++++++++++----------
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index 04c43a3..0ee0558 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -12,8 +12,8 @@
 </div>
 [% END %]
 <ul>
-    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
 </div>
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 472db64..fb9a85d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -62,15 +62,15 @@
 </ul></div>
 <div id="menu">
 <ul>
-	[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check Out</a></li>
+	[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
 	[% IF ( CAN_user_borrowers ) %]
 	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
 	[% END %]
 	 [% IF ( CAN_user_updatecharges ) %]
 	[% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
 	[% END %]
-	[% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation History</a></li>[% END %]
-	[% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrowernumber %]&amp;src=circ">Modification Log</a></li>[% END %]
+	[% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>[% END %]
+	[% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrowernumber %]&amp;src=circ">Modification log</a></li>[% END %]
     [% IF ( EnhancedMessagingPreferences ) %]
     [% END %]	
 	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
index 84400bd..8102d73 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -65,15 +65,15 @@ in the global namespace %]
 </ul></div>
 <div id="menu">
 <ul>
-	[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber %]">Check Out</a></li>
+	[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber %]">Check out</a></li>
 	[% IF ( CAN_user_borrowers ) %]
 	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]">Details</a></li>
 	[% END %]
 	 [% IF ( CAN_user_updatecharges ) %]
 	[% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Fines</a></li>
 	[% END %]
-	[% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrower.borrowernumber %]">Circulation History</a></li>[% END %]
-	[% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrower.borrowernumber %]&amp;src=circ">Modification Log</a></li>[% END %]
+	[% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrower.borrowernumber %]">Circulation history</a></li>[% END %]
+	[% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrower.borrowernumber %]&amp;src=circ">Modification log</a></li>[% END %]
     [% IF ( EnhancedMessagingPreferences ) %]
     [% END %]
     [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrower.borrowernumber %]">Notices</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 089b06d..dc99b90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -21,9 +21,9 @@
 </div>[% END %]
 
 <ul>
-    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index efad86e..77c1820 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -61,17 +61,17 @@ function export_barcodes() {
 	function yuiToolbar() {
 	    var printmenu = [
             [% IF ( CAN_user_borrowers ) %]
-	        { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} },
+	        { text: _("Print page"), onclick: {fn: function(){printx_window("page")}} },
             [% END %]
-	        { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} },
-	        { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} }
+	        { text: _("Print slip"), onclick: {fn: function(){printx_window("slip")}} },
+	        { text: _("Quick slip"), onclick: {fn: function(){printx_window("qslip")}} }
 	    ];
 	
 		var moremenu = [
-			{ text: _("Renew Patron"),  onclick: { fn: confirm_reregistration } },
-			{ text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS CAN_user_permissions %], disabled: true[% END %]},
+			{ text: _("Renew patron"),  onclick: { fn: confirm_reregistration } },
+			{ text: _("Set permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS CAN_user_permissions %], disabled: true[% END %]},
             { text: _("Delete"), [% UNLESS CAN_user_borrowers %]disabled: true, [% END %] onclick: { fn: confirm_deletion } },
-            { text: _("Update Child to Adult Patron") , onclick: { fn: update_child }[% UNLESS is_child %], disabled: true[% END %]},
+            { text: _("Update child to adult patron") , onclick: { fn: update_child }[% UNLESS is_child %], disabled: true[% END %]},
             { text: _("Export today's checked in barcodes"), onclick: { fn: export_barcodes }}
         ];
 
@@ -126,20 +126,20 @@ function export_barcodes() {
 	[% END %]
 	[% IF ( CAN_user_borrowers ) %]
         [% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-        [% IF ( CAN_user_staffaccess ) %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li>[% END %]
+        [% IF ( CAN_user_staffaccess ) %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change password</a></li>[% END %]
     [% END %]
     <li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
-	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print Page</a></li>
-	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print Slip</a></li>
+	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print page</a></li>
+	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
 	<li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
-	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew Account</a></li>
+	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>
     [% IF ( CAN_user_permissions ) %]
         [% IF ( StaffMember ) %]
             [% IF ( CAN_user_staffaccess ) %]
-                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set Permissions</a></li>
+                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
             [% END %]
           [% ELSE %]
-                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set Permissions</a></li>
+                <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
         [% END %]
     [% END %]
     [% IF ( StaffMember ) %][% UNLESS ( CAN_user_staffaccess ) %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>[% END %]
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 16:25:44 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 10:25:44 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Labels)
Message-ID: <1333463145-14625-1-git-send-email-oleonard@myacpl.org>

Correcting Labels-related includes
---
 .../prog/en/includes/labels-batches-toolbar.inc    |   28 ++++++++++----------
 .../intranet-tmpl/prog/en/includes/labels-menu.inc |   10 +++---
 .../prog/en/includes/labels-new-toolbar.inc        |    8 +++---
 .../prog/en/includes/labels-toolbar.inc            |   16 +++++-----
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc
index 1ef23ed..8786a8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc
@@ -79,10 +79,10 @@
                         alert(_("Please select at least one label to export."));
                         return;     // no batch selected
                     }
-                    return GB_showCenter('Export Labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800);
+                    return GB_showCenter('Export labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800);
                 }
                 else if (mode == 'batch') {
-                    return GB_showCenter('Export Labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]", 700, 800);
+                    return GB_showCenter('Export labels', "/cgi-bin/koha/labels/label-print.pl?batch_id=[% batch_id %]", 700, 800);
                 }
                 else {
                     // some pass-thru error trapping just in case...
@@ -121,7 +121,7 @@
                 id: "additems", 
                 type: "link", 
                 href: "#",
-                label: _("Add Item(s)"), 
+                label: _("Add item(s)"),
                 container: "additemsc",
                 onclick: {fn:function(){Add()}}
             });
@@ -130,7 +130,7 @@
                 id: "removeitems", 
                 type: "link", 
                 href: "#",
-                label: _("Remove Item(s)"), 
+                label: _("Remove item(s)"),
                 container: "removeitemsc",
                 onclick: {fn:function(){Remove()}}
             });
@@ -139,7 +139,7 @@
                 id: "deletebatch", 
                 type: "link", 
                 href: "#",
-                label: _("Delete Batch"), 
+                label: _("Delete batch"),
                 container: "deletebatchc",
                 onclick: {fn:function(){DeleteConfirm()}}
             });
@@ -148,7 +148,7 @@
                 id: "deduplicate", 
                 type: "link", 
                 href: "#",
-                label: _("Remove Duplicates"), 
+                label: _("Remove duplicates"),
                 container: "deduplicatec",
                 onclick: {fn:function(){DeDuplicate()}}
             });
@@ -157,7 +157,7 @@
                 id: "exportitems", 
                 type: "link", 
                 href: "#",
-                label: _("Export Item(s)"), 
+                label: _("Export item(s)"),
                 container: "exportitemsc",
                 onclick: {fn:function(){Xport('label')}}
             });
@@ -166,7 +166,7 @@
                 id: "exportbatch", 
                 type: "link", 
                 href: "#",
-                label: _("Export Batch"), 
+                label: _("Export batch"),
                 container: "exportbatchc",
                 onclick: {fn:function(){Xport('batch')}}
             });
@@ -175,11 +175,11 @@
         //]]>
     </script>
     <ul class="toolbar">
-        <li id="additemsc"><a id="additems" href="#">Add Item(s)</a></li>[% IF ( table_loop ) %]
-        <li id="removeitemsc"><a id="removeitems" href="#">Remove Item(s)</a></li>
-        <li id="deletebatchc"><a id="deletebatch" href="#">Delete Batch</a></li>
-        <li id="deduplicatec"><a id="deduplicate" href="#">Remove Duplicates</a></li>
-        <li id="exportitemsc"><a id="exportitems" href="#">Export Item(s)</a></li>
-        <li id="exportbatchc"><a id="exportbatch" href="#">Export Batch</a></li>[% END %]
+        <li id="additemsc"><a id="additems" href="#">Add item(s)</a></li>[% IF ( table_loop ) %]
+        <li id="removeitemsc"><a id="removeitems" href="#">Remove item(s)</a></li>
+        <li id="deletebatchc"><a id="deletebatch" href="#">Delete batch</a></li>
+        <li id="deduplicatec"><a id="deduplicate" href="#">Remove duplicates</a></li>
+        <li id="exportitemsc"><a id="exportitems" href="#">Export item(s)</a></li>
+        <li id="exportbatchc"><a id="exportbatch" href="#">Export batch</a></li>[% END %]
     </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
index 0eb1643..b68fcae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
@@ -1,8 +1,8 @@
 <div id="navmenu"><ul id="navmenulist">
-	<li><a href="/cgi-bin/koha/labels/label-home.pl">Labels Home</a></li>
-	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Manage Layouts</a></li>
-	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Manage Templates</a></li>
-	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Manage Profiles</a></li>
-	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Manage Batches</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-home.pl">Labels home</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Manage layouts</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Manage templates</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Manage profiles</a></li>
+	<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Manage batches</a></li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc
index 35553df..2f75b27 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc
@@ -15,9 +15,9 @@
 </script>
 <div id="toolbar">
     <ul class="toolbar">
-        <li><a id="newlabel" href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">New Layout</a></li>
-        <li><a id="newtemplate" href="/cgi-bin/koha/labels/label-edit-template.pl?op=new">New Template</a></li>
-        <li><a id="newprofile" href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">New Profile</a></li>
-        <li><a id="newbatch" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">New Batch</a></li>
+        <li><a id="newlabel" href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">New layout</a></li>
+        <li><a id="newtemplate" href="/cgi-bin/koha/labels/label-edit-template.pl?op=new">New template</a></li>
+        <li><a id="newprofile" href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">New profile</a></li>
+        <li><a id="newbatch" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">New batch</a></li>
     </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
index 28003f9..4de8007 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
@@ -12,23 +12,23 @@
     // YUI Toolbar Functions
     function yuiToolbar() {
         var layouts = [
-                {text: _("Manage Layouts"), url: "/cgi-bin/koha/labels/label-manage.pl?label_element=layout" },
-                {text: _("New Layout"), url: "/cgi-bin/koha/labels/label-edit-layout.pl?op=new" }
+                {text: _("Manage layouts"), url: "/cgi-bin/koha/labels/label-manage.pl?label_element=layout" },
+                {text: _("New layout"), url: "/cgi-bin/koha/labels/label-edit-layout.pl?op=new" }
         ];
 
         var templates = [
-                {text: _("Manage Templates"), url: "/cgi-bin/koha/labels/label-manage.pl?label_element=template" },
-                {text: _("New Template"), url: "/cgi-bin/koha/labels/label-edit-template.pl?op=new" }
+                {text: _("Manage templates"), url: "/cgi-bin/koha/labels/label-manage.pl?label_element=template" },
+                {text: _("New template"), url: "/cgi-bin/koha/labels/label-edit-template.pl?op=new" }
         ];
 
         var profiles = [
-                {text: _("Manage Profiles"), url: "/cgi-bin/koha/labels/label-manage.pl?label_element=profile" },
-                {text: _("New Profile"), url: "/cgi-bin/koha/labels/label-edit-profile.pl?op=new" }
+                {text: _("Manage profiles"), url: "/cgi-bin/koha/labels/label-manage.pl?label_element=profile" },
+                {text: _("New profile"), url: "/cgi-bin/koha/labels/label-edit-profile.pl?op=new" }
         ];
 
         var batches = [
-                {text: _("Manage Batches"), url: "/cgi-bin/koha/labels/label-manage.pl?label_element=batch" },
-                {text: _("New Batch"), url: "/cgi-bin/koha/labels/label-edit-batch.pl?op=new" }
+                {text: _("Manage batches"), url: "/cgi-bin/koha/labels/label-manage.pl?label_element=batch" },
+                {text: _("New batch"), url: "/cgi-bin/koha/labels/label-edit-batch.pl?op=new" }
         ];
 
         new YAHOO.widget.Button({
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 16:30:19 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 10:30:19 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Patron cards)
Message-ID: <1333463419-14817-1-git-send-email-oleonard@myacpl.org>

Correcting Patron card creator-related includes
---
 .../en/includes/patroncards-batches-toolbar.inc    |   28 ++++++++++----------
 .../prog/en/includes/patroncards-menu.inc          |   12 ++++----
 .../prog/en/includes/patroncards-toolbar.inc       |   16 +++++-----
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-batches-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-batches-toolbar.inc
index db49c6c..226210c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-batches-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-batches-toolbar.inc
@@ -73,10 +73,10 @@
                         alert(_("Please select at least one card to export."));
                         return;     // no batch selected
                     }
-                    return GB_showCenter('Export Labels', "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800);
+                    return GB_showCenter('Export labels', "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]&" + getstr, 700, 800);
                 }
                 else if (mode == 'batch') {
-                    return GB_showCenter('Export Labels', "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]", 700, 800);
+                    return GB_showCenter('Export labels', "/cgi-bin/koha/patroncards/print.pl?batch_id=[% batch_id %]", 700, 800);
                 }
                 else {
                     // some pass-thru error trapping just in case...
@@ -115,7 +115,7 @@
                 id: "additems",
                 type: "link",
                 href: "#",
-                label: _("Add Item(s)"),
+                label: _("Add item(s)"),
                 container: "additemsc",
                 onclick: {fn:function(){Add()}}
             });
@@ -124,7 +124,7 @@
                 id: "removeitems",
                 type: "link",
                 href: "#",
-                label: _("Remove Item(s)"),
+                label: _("Remove item(s)"),
                 container: "removeitemsc",
                 onclick: {fn:function(){Remove()}}
             });
@@ -133,7 +133,7 @@
                 id: "deletebatch",
                 type: "link",
                 href: "#",
-                label: _("Delete Batch"),
+                label: _("Delete batch"),
                 container: "deletebatchc",
                 onclick: {fn:function(){DeleteConfirm()}}
             });
@@ -142,7 +142,7 @@
                 id: "deduplicate",
                 type: "link",
                 href: "#",
-                label: _("Remove Duplicates"),
+                label: _("Remove duplicates"),
                 container: "deduplicatec",
                 onclick: {fn:function(){DeDuplicate()}}
             });
@@ -151,7 +151,7 @@
                 id: "exportitems",
                 type: "link",
                 href: "#",
-                label: _("Export Item(s)"),
+                label: _("Export item(s)"),
                 container: "exportitemsc",
                 onclick: {fn:function(){Xport('label')}}
             });
@@ -160,7 +160,7 @@
                 id: "exportbatch",
                 type: "link",
                 href: "#",
-                label: _("Export Batch"),
+                label: _("Export batch"),
                 container: "exportbatchc",
                 onclick: {fn:function(){Xport('batch')}}
             });
@@ -169,11 +169,11 @@
         //]]>
     </script>
     <ul class="toolbar">
-        <li id="additemsc"><a id="additems" href="#">Add Item(s)</a></li>[% IF ( table_loop ) %]
-        <li id="removeitemsc"><a id="removeitems" href="#">Remove Item(s)</a></li>
-        <li id="deletebatchc"><a id="deletebatch" href="#">Delete Batch</a></li>
-        <li id="deduplicatec"><a id="deduplicate" href="#">Remove Duplicates</a></li>
-        <li id="exportitemsc"><a id="exportitems" href="#">Export Item(s)</a></li>
-        <li id="exportbatchc"><a id="exportbatch" href="#">Export Batch</a></li>[% END %]
+        <li id="additemsc"><a id="additems" href="#">Add item(s)</a></li>[% IF ( table_loop ) %]
+        <li id="removeitemsc"><a id="removeitems" href="#">Remove item(s)</a></li>
+        <li id="deletebatchc"><a id="deletebatch" href="#">Delete batch</a></li>
+        <li id="deduplicatec"><a id="deduplicate" href="#">Remove duplicates</a></li>
+        <li id="exportitemsc"><a id="exportitems" href="#">Export item(s)</a></li>
+        <li id="exportbatchc"><a id="exportbatch" href="#">Export batch</a></li>[% END %]
     </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-menu.inc
index b912f3c..7055997 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-menu.inc
@@ -1,9 +1,9 @@
 <div id="navmenu"><ul id="navmenulist">
-	<li><a href="/cgi-bin/koha/patroncards/home.pl">Patron Card Creator Home</a></li>
-	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Manage Layouts</a></li>
-	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Manage Templates</a></li>
-	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Manage Profiles</a></li>
-	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Manage Batches</a></li>
-	<li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Manage Images</a></li>
+	<li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator home</a></li>
+	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Manage layouts</a></li>
+	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Manage templates</a></li>
+	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Manage profiles</a></li>
+	<li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Manage batches</a></li>
+	<li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Manage images</a></li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
index 65ee1ea..92b01f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc
@@ -12,23 +12,23 @@
     // YUI Toolbar Functions
     function yuiToolbar() {
         var layouts = [
-                {text: _("Manage Layouts"), url: "/cgi-bin/koha/patroncards/manage.pl?card_element=layout" },
-                {text: _("New Layout"), url: "/cgi-bin/koha/patroncards/edit-layout.pl?op=new" }
+                {text: _("Manage layouts"), url: "/cgi-bin/koha/patroncards/manage.pl?card_element=layout" },
+                {text: _("New layout"), url: "/cgi-bin/koha/patroncards/edit-layout.pl?op=new" }
         ];
 
         var templates = [
-                {text: _("Manage Templates"), url: "/cgi-bin/koha/patroncards/manage.pl?card_element=template" },
-                {text: _("New Template"), url: "/cgi-bin/koha/patroncards/edit-template.pl?op=new" }
+                {text: _("Manage templates"), url: "/cgi-bin/koha/patroncards/manage.pl?card_element=template" },
+                {text: _("New template"), url: "/cgi-bin/koha/patroncards/edit-template.pl?op=new" }
         ];
 
         var profiles = [
-                {text: _("Manage Profiles"), url: "/cgi-bin/koha/patroncards/manage.pl?card_element=profile" },
-                {text: _("New Profile"), url: "/cgi-bin/koha/patroncards/edit-profile.pl?op=new" }
+                {text: _("Manage profiles"), url: "/cgi-bin/koha/patroncards/manage.pl?card_element=profile" },
+                {text: _("New profile"), url: "/cgi-bin/koha/patroncards/edit-profile.pl?op=new" }
         ];
 
         var batches = [
-                {text: _("Manage Batches"), url: "/cgi-bin/koha/patroncards/manage.pl?card_element=batch" },
-                {text: _("New Batch"), url: "/cgi-bin/koha/patroncards/edit-batch.pl?op=new" }
+                {text: _("Manage batches"), url: "/cgi-bin/koha/patroncards/manage.pl?card_element=batch" },
+                {text: _("New batch"), url: "/cgi-bin/koha/patroncards/edit-batch.pl?op=new" }
         ];
 
         new YAHOO.widget.Button({
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 17:00:20 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 11:00:20 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Patrons)
Message-ID: <1333465220-17310-1-git-send-email-oleonard@myacpl.org>

Correcting Patron-related includes
---
 .../prog/en/includes/members-menu.inc              |    6 +++---
 .../prog/en/includes/members-toolbar.inc           |   20 ++++++++++----------
 .../prog/en/includes/messaging-preference-form.inc |   12 ++++++------
 .../prog/en/includes/patron-search.inc             |    8 ++++----
 .../prog/en/includes/patron-toolbar.inc            |   14 +++++++-------
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
index cadd1cb..63e9aea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
@@ -1,12 +1,12 @@
 [% IF ( borrowernumber ) %]
 <div id="menu">
-<ul>	[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check Out</a></li>
+<ul>	[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
 	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
 	[% IF ( CAN_user_updatecharges ) %]
 	[% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
 	[% END %]
-	[% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation History</a></li>[% END %]
-	[% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=[% borrowernumber %]">Modification Log</a></li>[% END %]
+	[% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>[% END %]
+	[% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=[% borrowernumber %]">Modification log</a></li>[% END %]
     [% IF ( EnhancedMessagingPreferences ) %]
     [% END %]
 	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index bad8502..659fb14 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -52,16 +52,16 @@ function update_child() {
 	}
 	function yuiToolbar() {
 	    var printmenu = [
-	        { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} },
-	        { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} },
-	        { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} }
+	        { text: _("Print page"), onclick: {fn: function(){printx_window("page")}} },
+	        { text: _("Print slip"), onclick: {fn: function(){printx_window("slip")}} },
+	        { text: _("Quick slip"), onclick: {fn: function(){printx_window("qslip")}} }
 	    ];
 
 		var moremenu = [
-			{ text: _("Renew Patron"),  onclick: { fn: confirm_reregistration } },
-			{ text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS ( CAN_user_permissions ) %], disabled: true[% END %]},
+			{ text: _("Renew patron"),  onclick: { fn: confirm_reregistration } },
+			{ text: _("Set permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS ( CAN_user_permissions ) %], disabled: true[% END %]},
 			{ text: _("Delete"), onclick: { fn: confirm_deletion}[% UNLESS ( CANDELETEUSER ) %], disabled: true[% END %] },
-			{ text: _("Update Child to Adult Patron") , onclick: { fn: update_child }[% UNLESS ( is_child ) %], disabled: true[% END %]}
+			{ text: _("Update child to adult patron") , onclick: { fn: update_child }[% UNLESS ( is_child ) %], disabled: true[% END %]}
 		];
 
 	    new YAHOO.widget.Button({
@@ -115,10 +115,10 @@ function update_child() {
             [% END %]
         [% END %]
 	[% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-	[% IF CAN_user_staffaccess %]<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li> [% END %]
+	[% IF CAN_user_staffaccess %]<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change password</a></li> [% END %]
 	<li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
-    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print Page</a></li>
-	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print Slip</a></li>
+    <li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print page</a></li>
+	<li><a id="printslip" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=slip">Print slip</a></li>
 	<li id="searchtoholdc"><a id="searchtohold" href="#">Search to hold</a></li>
-	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew Account</a></li>[% IF ( CAN_user_permissions ) %]<li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set Permissions</a></li>[% END %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
+	<li id="moremenuc"><a id="renewpatron" href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[% borrowernumber %]">Renew account</a></li>[% IF ( CAN_user_permissions ) %]<li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>[% END %]<li><a id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>
 </ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index 577f19a..2ff131b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -27,12 +27,12 @@
     </tr>
     [% FOREACH messaging_preference IN messaging_preferences %]
     <tr>
-      <td>[% IF ( messaging_preference.Item_Due ) %]Item Due
-          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance Notice
-          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming Events
-          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold Filled
-          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item Check-in
-          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item Checkout
+      <td>[% IF ( messaging_preference.Item_Due ) %]Item due
+          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
+          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming events
+          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
+          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
+          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
           [% ELSE %]Unknown [% END %]</td>
       [% IF ( messaging_preference.takes_days ) %]
       <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 17a212f..595d3a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -125,10 +125,10 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     </div>
     [% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Search Patrons</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Search patrons</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>
 </div>
 <script type="text/javascript">//<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
index 36bb08f..3973ab1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
@@ -28,9 +28,9 @@
 { text: "[% categorie.description %]",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=[% categorie.categorycode %]" },
 [% END %]
 [% ELSE %]
-			{ text: _("Adult Patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A" },
-			{ text: _("Child Patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C" },
-			{ text: _("Professional Patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P" },
+			{ text: _("Adult patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A" },
+			{ text: _("Child patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C" },
+			{ text: _("Professional patron"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P" },
 			{ text: _("Organization"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I" },
 			{ text: _("Staff"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=S" },
 			{ text: _("Statistical"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=X" },
@@ -53,13 +53,13 @@
 	<li id="newmenuc">
 		<form action="/cgi-bin/koha/members/memberentry.pl" method="get">
 			<input type="hidden" name="op" value="add" />
-			<label for="newcategorycode">New Patron: </label><select name="categorycode" id="newcategorycode">
+			<label for="newcategorycode">New patron: </label><select name="categorycode" id="newcategorycode">
 			[% IF ( AddPatronLists_categorycode ) %]
 				[% FOREACH categorie IN categories %]<option value="[% categorie.categorycode %]">[% categorie.description %]</option>[% END %]
 			[% ELSE %]
-				<option value="A">Adult Patron</option>
-				<option value="C">Child Patron</option>
-				<option value="P">Professional Patron</option>
+				<option value="A">Adult patron</option>
+				<option value="C">Child patron</option>
+				<option value="P">Professional patron</option>
 				<option value="I">Organization</option>
 				<option value="S">Staff</option>
 				<option value="X">Statistical</option>
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 17:07:04 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 11:07:04 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Serials)
Message-ID: <1333465624-17543-1-git-send-email-oleonard@myacpl.org>

Correcting Serials-related includes
---
 .../prog/en/includes/serials-search.inc            |    8 ++++----
 .../prog/en/includes/serials-toolbar.inc           |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index 6787969..1584f3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -2,7 +2,7 @@
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Serials Resident Search Box -->
 <div id="header_search">
 	<div id="subscription_search" class="residentsearch">
-	<p class="tip">Search Subscriptions:</p>
+	<p class="tip">Search subscriptions:</p>
  <form action="/cgi-bin/koha/serials/serials-home.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter %]" /><input type="submit" value="Search" class="submit" />
 </form>
 	</div>
@@ -17,9 +17,9 @@
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/serials/serials-home.pl#subscription_search">Search Subscriptions</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/serials/serials-home.pl#subscription_search">Search subscriptions</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Serials Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
index 231e37e..0dddd59 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
@@ -18,13 +18,13 @@
     [% IF ( subscriptionid ) %]
 	    var editmenu = [
 	        [% IF ( CAN_user_serials_edit_subscription ) %]
-		    { text: _("Edit Subscription"),  [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]" },
+		    { text: _("Edit subscription"),  [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]" },
 		[% END %]
 	        [% IF ( CAN_user_serials_create_subscription ) %]
-		    { text: _("Edit as New (Duplicate)"), [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]" },
+		    { text: _("Edit as new (duplicate)"), [% IF ( cannotedit ) %]disabled: true, [% END %] url: "/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]" },
 		[% END %]
 	        [% IF ( CAN_user_serials_delete_subscription ) %]
-			{ text: _("Delete Subscription"), [% IF ( cannotedit ) %]disabled: true, [% END %] onclick: {fn: confirm_deletion }}
+			{ text: _("Delete subscription"), [% IF ( cannotedit ) %]disabled: true, [% END %] onclick: {fn: confirm_deletion }}
 		[% END %]
 	    ];
 	 [% END %]
@@ -58,9 +58,9 @@ onclick: {fn:function(){popup([% subscriptionid %])}}
 <ul class="toolbar">
     [% IF ( CAN_user_serials_create_subscription ) %]
 	[% IF ( biblionumber_for_new_subscription ) %]
-		<li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]">New Subscription</a></li>
+		<li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]">New subscription</a></li>
 	[% ELSE %]
-		<li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New Subscription</a></li>
+		<li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New subscription</a></li>
 	[% END %]
     [% END %]
 
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 17:10:32 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 11:10:32 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Cataloging)
Message-ID: <1333465833-17742-1-git-send-email-oleonard@myacpl.org>

Correcting Cataloging-related includes
---
 .../prog/en/includes/additem-menu.inc              |    6 +++---
 .../prog/en/includes/cataloging-search.inc         |    4 ++--
 .../prog/en/includes/cataloging-toolbar.inc        |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additem-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additem-menu.inc
index b947f0a..069dc10 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additem-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additem-menu.inc
@@ -1,6 +1,6 @@
 <ul id="navigation">
-	<li>    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">Edit Bibliographic Record</a></li>
+	<li>    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]">Edit bibliographic record</a></li>
 	<li>    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">Normal view</a></li>
-	<li>    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber %]">View MARC in Catalog</a></li>
-	<li>    <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber %]">View ISBD in Catalog</a></li>
+	<li>    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblionumber %]">View MARC in catalog</a></li>
+	<li>    <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblionumber %]">View ISBD in catalog</a></li>
 </ul>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index d865b3f..041249b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -13,8 +13,8 @@
 </div>
     [% INCLUDE 'patron-search-box.inc' %]
 			<ul>
-			<li><a href="/cgi-bin/koha/catalogue/search.pl#addbooks_search">Cataloging Search</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/catalogue/search.pl#addbooks_search">Cataloging search</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Cataloging Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
index 2808735..526a151 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
@@ -24,7 +24,7 @@
 
 	    new YAHOO.widget.Button({
 	        type: "menu",
-	        label: _("New Record"),
+	        label: _("New record"),
 	        name: "newmenubutton",
 	        menu: newmenu,
 	        container: "newmenuc"
@@ -51,7 +51,7 @@
         new YAHOO.widget.Button({
                 id: "z3950search",
                 type: "button",
-                label: _("Z39.50 Search"),
+                label: _("Z39.50 search"),
                 container: "newmenuc",
                 onclick: {fn:function(){PopupZ3950()}}
         });
@@ -61,7 +61,7 @@
 	
   <div id="newmenuc">
 		<form name="f" action="addbiblio.pl" method="post">
-		<label for="frameworkcode">New Record with framework:</label>
+		<label for="frameworkcode">New record with framework:</label>
 			<select name="frameworkcode" id="frameworkcode">
 				<option value="">Default</option>
 				[% FOREACH frameworkcodeloo IN frameworkcodeloop %]
@@ -72,7 +72,7 @@
 			</select>
 			<input type="submit" value="Add Record Without Search" />
 		</form>
-        <a id="z3950search" onclick="PopupZ3950(); return false;">Z39.50 Search</a>
+        <a id="z3950search" onclick="PopupZ3950(); return false;">Z39.50 search</a>
 
   </div>
 </div>
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 17:24:27 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 11:24:27 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Administration)
Message-ID: <1333466667-18167-1-git-send-email-oleonard@myacpl.org>

Correcting System administration-related includes
---
 .../intranet-tmpl/prog/en/includes/admin-menu.inc  |   14 +++++++-------
 .../prog/en/includes/budgetperiods-admin.inc       |    2 +-
 .../prog/en/includes/cities-admin-search.inc       |    8 ++++----
 .../prog/en/includes/contracts-admin-search.inc    |    6 +++---
 .../prog/en/includes/currencies-admin-search.inc   |    8 ++++----
 .../prog/en/includes/patrons-admin-search.inc      |    8 ++++----
 .../prog/en/includes/prefs-admin-search.inc        |    6 +++---
 .../intranet-tmpl/prog/en/includes/prefs-menu.inc  |   12 ++++++------
 .../prog/en/includes/printers-admin-search.inc     |    8 ++++----
 .../prog/en/includes/roadtype-admin-search.inc     |    8 ++++----
 .../prog/en/includes/stopwords-admin-search.inc    |    6 +++---
 .../prog/en/includes/sysprefs-admin-search.inc     |    6 +++---
 .../prog/en/includes/z3950-admin-search.inc        |    8 ++++----
 13 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index 5107d01..9535d2c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -11,9 +11,9 @@
 </script>
 <div id="navmenu">
 <div id="navmenulist">
-<h5>System Preferences</h5>
+<h5>System preferences</h5>
 <ul>
-	<li><a href="/cgi-bin/koha/admin/preferences.pl">System Preferences</a></li>
+	<li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li>
 </ul>
 
 <h5>Basic parameters</h5>
@@ -36,14 +36,14 @@
 
 <h5>Catalog</h5>
 <ul>
-	<li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Bibliographic framework</a></li>
+	<li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></li>
 	<li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li>
 	<li><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></li>
-	<li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></li>
+	<li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC bibliographic framework test</a></li>
     <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li>
     <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></li>
     <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>
-    <li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI Sets configuration</a></li>
+    <li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></li>
 </ul>
 
 <h5>Acquisition parameters</h5>
@@ -58,9 +58,9 @@
 <h5>Additional parameters</h5>
 
 <ul>
-	[% IF ( NoZebra ) %]<li><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a></li>[% END %]
+	[% IF ( NoZebra ) %]<li><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></li>[% END %]
 	<!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
-	<li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Client Targets</a></li>
+	<li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></li>
 </ul>
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
index 9ffa053..ed8a03c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc
@@ -19,7 +19,7 @@
                 ]
             new YAHOO.widget.Button({
                 type: "menu",
-                label: _("Root Budgets"),
+                label: _("Root budgets"),
                 name: "periods_button",
                 menu: periods_menu,
                 container: "periods_menuc"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index 05b1d40..b0004cd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -46,7 +46,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 </script>[% END %][% END %]
 <div id="header_search">
 	<div id="city_search" class="residentsearch">
-	<p class="tip">City Search:</p>
+	<p class="tip">City search:</p>
 	<form action="[% script_name %]" method="post">
 		<input type="text" name="city_name" value="[% searchfield %]" size="40" />
 		<input type="submit" name="submit" value="OK" class="submit" />
@@ -83,9 +83,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 		</form>
 	</div>[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/cities.pl#city_search">Search Cities</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/cities.pl#city_search">Search cities</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Cities Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
index b93d4ef..ab4c423 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -83,9 +83,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 		</form>
 	</div>[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/aqcontact.pl#contract_description_search">Search Contracts</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/aqcontact.pl#contract_description_search">Search contracts</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Patrons Admin Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index 653e233..f8aa415 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -2,7 +2,7 @@
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Currencies Resident Search Box -->
 <div id="header_search">
 	<div id="currency_search" class="residentsearch">
-	<p class="tip">Currencies Search:</p>
+	<p class="tip">Currencies search:</p>
         <form action="[% script_name %]" method="post">
                 <input type="text" name="description" size="40" value="[% searchfield %]" />
                 <input type="submit" class="submit" name="search" value="Search" />
@@ -18,9 +18,9 @@
 		</form>
 	</div>[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/currency.pl#currency_search">Search Currencies</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/currency.pl#currency_search">Search currencies</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Currencies Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 49c0017..3d73d6b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -2,7 +2,7 @@
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Patrons Admin Resident Search Box -->
 <div id="header_search">
 	<div id="patron_category_search" class="residentsearch">
-	<p class="tip">Search by Patron Category Name:</p>
+	<p class="tip">Search by patron category name:</p>
 	<form action="[% script_name %]" method="post">
 		<input type="text" name="description" size="40" value="[% searchfield %]" />
 		<input type="submit" class="submit" name="search" value="Search" />
@@ -18,9 +18,9 @@
 		</form>
 	</div>[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/categorie.pl#patron_category_search">Search Patron Categories</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/categorie.pl#patron_category_search">Search patron categories</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Patrons Admin Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
index 3fb81e8..2ff372b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
@@ -20,9 +20,9 @@
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/roadtype.pl#syspref_search">Search System Preferences</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/roadtype.pl#syspref_search">Search system preferences</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>
 </div>
 <!-- End Stopwords Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
index 258c0b4..3ecaefc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
@@ -6,15 +6,15 @@
 [% IF ( cataloguing ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Cataloging</a></li>
 [% IF ( circulation ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
 [% IF ( creators ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
-[% IF ( enhanced_content ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced_content">Enhanced Content</a></li>
-[% IF ( i18n_l10n ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n">I18N/L10N</a></li>
-[% IF ( local_use ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
-[% IF ( logs ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
+[% IF ( enhanced_content ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Enhanced content settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced_content">Enhanced content</a></li>
+[% IF ( i18n_l10n ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Internationalization and localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n">I18N/L10N</a></li>
+[% IF ( local_use ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/systempreferences.pl">Local use</a></li>
+[% IF ( logs ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Transaction logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
 [% IF ( opac ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
 [% IF ( patrons ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
 [% IF ( searching ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
 [% IF ( serials ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
-[% IF ( staff_client ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">Staff Client</a></li>
-[% IF ( web_services ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web_services">Web Services</a></li>
+[% IF ( staff_client ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Staff client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">Staff client</a></li>
+[% IF ( web_services ) %]<li class="active">[% ELSE %]<li>[% END %]<a title="Web services" href="/cgi-bin/koha/admin/preferences.pl?tab=web_services">Web services</a></li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
index 160c3cc..c62ebf4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -2,7 +2,7 @@
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Printers Resident Search Box -->
 <div id="header_search">
 	<div id="printer_search" class="residentsearch">
-	<p class="tip">Printer Search:</p>
+	<p class="tip">Printer search:</p>
 <form action="[% script_name %]" method="post">
                 <input type="text" size="40" name="description" value="[% searchfield %]" />
                 <input type="submit" name="submit" value="Search" />
@@ -19,9 +19,9 @@
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/printers.pl#printer_search">Search Printers</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/printers.pl#printer_search">Search printers</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Printers Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index 2766321..9ef1310 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -46,7 +46,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 </script>[% END %][% END %]
 <div id="header_search">
 	<div id="roadtype_search" class="residentsearch">
-	<p class="tip">Road Type Search:</p>
+	<p class="tip">Road type search:</p>
 		<form action="[% script_name %]" method="post">
 		<input type="text" name="road_type" value="[% searchfield %]" size="40" />
 		<input type="submit" name="submit" value="OK" class="submit" />
@@ -85,9 +85,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/roadtype.pl#roadtype_search">Search Road Types</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/roadtype.pl#roadtype_search">Search road types</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Roads Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
index 2dda814..5266338 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -19,9 +19,9 @@
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/roadtype.pl#stopword_search">Search Stop Words</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/roadtype.pl#stopword_search">Search stop words</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Stopwords Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
index a66eecc..e04d99e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
@@ -20,9 +20,9 @@
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/roadtype.pl#syspref_search">Search System Preferences</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/roadtype.pl#syspref_search">Search system preferences</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Stopwords Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index 44d709e..70a46af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -46,7 +46,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 </script>[% END %][% END %]
 <div id="header_search">
 	<div id="z3950_search" class="residentsearch">
-	<p class="tip">Z39.50 Server Search:</p>
+	<p class="tip">Z39.50 server search:</p>
 	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
                 <input type="text" name="searchfield" size="40" value="[% searchfield %]" />
                 <input type="submit" class="submit" name="search" value="Search" />
@@ -85,9 +85,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/z3950servers.pl#z3950_search">Search z390.50 Servers</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/z3950servers.pl#z3950_search">Search Z390.50 servers</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Members Resident Search Box -->
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 17:32:24 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 11:32:24 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Reports)
Message-ID: <1333467144-18399-1-git-send-email-oleonard@myacpl.org>

Correcting Reports-related includes
---
 .../prog/en/includes/dictionary-toolbar.inc        |    2 +-
 .../prog/en/includes/guided-reports-view.inc       |   12 ++++++------
 .../prog/en/includes/reports-menu.inc              |   12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc
index f630ff2..12ceac9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc
@@ -17,5 +17,5 @@
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition">New Definition</a></li>
+	<li><a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition">New definition</a></li>
 </ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
index aa03be8..639553f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
@@ -1,13 +1,13 @@
-<h5>Run Reports</h5>
+<h5>Run reports</h5>
 <ul>
 	[% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a></li>[% END %]
 </ul>
-<h5>Reports Dictionary</h5>
+<h5>Reports dictionary</h5>
 <ul>
-<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View Dictionary</a></li>
+<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
 </ul>
-<h5>Useful Resources</h5>
+<h5>Useful resources</h5>
 <ul>
-<li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha Report Library</a></li>
-<li><a href="http://schema.koha-community.org/" target="blank">Koha Database Schema</a></li>
+<li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li>
+<li><a href="http://schema.koha-community.org/" target="blank">Koha database schema</a></li>
 </ul>
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 8b2df92..c7a5b5a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
@@ -1,6 +1,6 @@
-<h5>Guided Reports</h5>
+<h5>Guided reports</h5>
 	<ul>
-		<li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided Reports</a></li>
+		<li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li>
 	</ul>
 
 <h5>Statistics wizards</h5>
@@ -14,10 +14,10 @@
 	</ul>
 
 
-	<h5>Top Lists</h5>
+	<h5>Top lists</h5>
 	<ul>
 		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
-		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-Circulated Items</a></li>
+		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li>
 	</ul>
 	
 	<h5>Inactive</h5>
@@ -29,7 +29,7 @@
 
 	<h5>Other</h5>
 	<ul>
-		<li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost Items</a></li>
-		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by Item Type</a></li>
+		<li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost items</a></li>
+		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by item type</a></li>
 		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
 	</ul>
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 17:36:59 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 11:36:59 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Tools)
Message-ID: <1333467419-18624-1-git-send-email-oleonard@myacpl.org>

Correcting Tools-related includes
---
 .../prog/en/includes/letters-search.inc            |    8 ++++----
 .../intranet-tmpl/prog/en/includes/tools-menu.inc  |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index 28ecbda..e98ff5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -2,7 +2,7 @@
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Notices Resident Search Box -->
 <div id="header_search">
 	<div id="notices_search" class="residentsearch">
-	<p class="tip">Search Existing Notices:</p>
+	<p class="tip">Search existing notices:</p>
 <form action="/cgi-bin/koha/tools/letter.pl" method="post">
 		<input type="text" name="searchfield" size="40" value="" />
                 <input type="submit" class="submit" name="search" value="Search" />
@@ -18,9 +18,9 @@
 		</form>
 	</div>[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/admin/currency.pl#notices_search">Search Notices</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/admin/currency.pl#notices_search">Search notices</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Notices Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index 53360b0..663633e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -12,7 +12,7 @@
 <div id="navmenu">
 <div id="navmenulist">
 <ul>
-	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools Home</a></li>
+	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li>
 </ul>
 <h5>Patrons and circulation</h5>
 <ul>
@@ -23,7 +23,7 @@
 	<li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
     [% END %]
     [% IF ( CAN_user_tools_edit_notices ) %]
-	<li><a href="/cgi-bin/koha/tools/letter.pl">Notices & Slips</a></li>
+	<li><a href="/cgi-bin/koha/tools/letter.pl">Notices &amp; slips</a></li>
     [% END %]
     [% IF ( CAN_user_tools_edit_notice_status_triggers ) %]
 	<li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li>
@@ -71,10 +71,10 @@
 	<li><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Staged MARC management</a></li>
     [% END %]
     [% IF ( CAN_user_tools_upload_local_cover_images ) %]
-	<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload Local Cover Image</a></li>
+	<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a></li>
     [% END %]
 </ul>
-<h5>Additional Tools</h5>
+<h5>Additional tools</h5>
 <ul>
     [% IF ( CAN_user_tools_edit_calendar ) %]
 	<li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li>
-- 
1.7.5.4


From wizzyrea at gmail.com  Tue Apr  3 17:52:33 2012
From: wizzyrea at gmail.com (Liz Rea)
Date: Tue,  3 Apr 2012 10:52:33 -0500
Subject: [Koha-patches] [PATCH] Bug 7888 - Permission for "change password"
	button in circ toolbar should be "borrowers" instead of
	"staffaccess"
Message-ID: <1333468353-23119-1-git-send-email-wizzyrea@gmail.com>

Patch changes permisison for "change password" button in circ-toolbar.inc from staffaccess to borrowers.

To test:
- With a staff user with borrowers permission, verify the change password button is shown for a normal patron.
- With a staff user without borrowers permission, verify the change password button does not appear.
---
 .../prog/en/includes/circ-toolbar.inc              |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index efad86e..83c01b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -100,7 +100,7 @@ function export_barcodes() {
 	    [% IF ( adultborrower ) %]new YAHOO.widget.Button("addchild");[% END %]
 	    new YAHOO.widget.Button("editpatron");
 	    new YAHOO.widget.Button("addnote");
-        [% IF CAN_user_staffaccess %] new YAHOO.widget.Button("changepassword");  [% END %]
+        [% IF CAN_user_borrowers %] new YAHOO.widget.Button("changepassword");  [% END %]
 	    new YAHOO.widget.Button("duplicate");
 	    new YAHOO.widget.Button("printslip");
 		new YAHOO.widget.Button("printpage");
@@ -126,7 +126,7 @@ function export_barcodes() {
 	[% END %]
 	[% IF ( CAN_user_borrowers ) %]
         [% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-        [% IF ( CAN_user_staffaccess ) %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li>[% END %]
+        [% IF ( CAN_user_borrowers ) %] <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Change Password</a></li>[% END %]
     [% END %]
     <li><a id="duplicate" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
 	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]&amp;print=page">Print Page</a></li>
-- 
1.7.2.5


From oleonard at myacpl.org  Tue Apr  3 17:50:44 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 11:50:44 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(miscellaneous)
Message-ID: <1333468244-18962-1-git-send-email-oleonard@myacpl.org>

Correcting all remaining includes
---
 .../intranet-tmpl/prog/en/includes/facets.inc      |    2 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    4 +-
 .../intranet-tmpl/prog/en/includes/hold-menu.inc   |    4 +-
 .../intranet-tmpl/prog/en/includes/mainmenu.inc    |    2 +-
 .../intranet-tmpl/prog/en/includes/resort_form.inc |   30 +++++++++---------
 .../prog/en/includes/search_indexes.inc            |   32 ++++++++++----------
 .../prog/en/includes/suggestions-add-search.inc    |    8 ++--
 7 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
index a72b586..e74bced 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -18,7 +18,7 @@
 [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
 <ul>
         [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]&amp;limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value %]">[% facet.facet_label_value %]</a> [% IF ( displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %]
-        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show More</a></li>
+        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show more</a></li>
 [% END %]
 </ul></li>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 5da4991..539c466 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -71,9 +71,9 @@
                 [% loggedinusername %]
             </span>
             [% IF ( intranetbookbag ) %]
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log Out</a>) |
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log out</a>) |
             [% ELSE %]
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log Out</a>) |
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log out</a>) |
             [% END %]
         [% ELSE %]
             You are not logged in |
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
index 29af164..ffb78e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
@@ -29,7 +29,7 @@
 <div class="patronviews">
 <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
 	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
-	[% IF ( intranetreadinghistory ) %]<li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Reading Record</a></li>[% END %]
-	[% IF ( CAN_user_parameters ) %]<li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=[% borrowernumber %]">Modification Log</a></li>[% END %]</ul>
+	[% IF ( intranetreadinghistory ) %]<li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Reading record</a></li>[% END %]
+	[% IF ( CAN_user_parameters ) %]<li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=[% borrowernumber %]">Modification log</a></li>[% END %]</ul>
 </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
index beb5d48..46a412d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
@@ -45,7 +45,7 @@
                 [% END %]
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a><ul>
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
     [% END %]
     [% IF ( CAN_user_serials ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
index 0cfd9c9..a101c5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
@@ -3,14 +3,14 @@
 <optgroup label="Popularity">
 	
 	[% IF ( sort_by == "popularity_dsc" ) %]
-<option value="popularity_dsc" selected="selected">Popularity (Most to Least)</option>
+<option value="popularity_dsc" selected="selected">Popularity (most to least)</option>
 [% ELSE %]
-	<option value="popularity_dsc">Popularity (Most to Least)</option>
+	<option value="popularity_dsc">Popularity (most to least)</option>
  [% END %]
 [% IF ( sort_by == "popularity_asc" ) %]
-<option value="popularity_asc" selected="selected">Popularity (Least to Most)</option>
+<option value="popularity_asc" selected="selected">Popularity (least to most)</option>
 [% ELSE %]
-	<option value="popularity_asc">Popularity (Least to Most)</option>
+	<option value="popularity_asc">Popularity (least to most)</option>
  [% END %]
 
 </optgroup>
@@ -35,40 +35,40 @@
 	[% IF ( sort_by == "call_number_asc" ) %]
 <option value="call_number_asc" selected="selected">Call Number (0-9 to A-Z)</option>
 [% ELSE %]
-	<option value="call_number_asc">Call Number (0-9 to A-Z)</option>
+	<option value="call_number_asc">Call number (0-9 to A-Z)</option>
 [% END %]
 
 [% IF ( sort_by == "call_number_dsc" ) %]
-<option value="call_number_dsc" selected="selected">Call Number (Z-A to 9-0)</option>
+<option value="call_number_dsc" selected="selected">Call number (Z-A to 9-0)</option>
 [% ELSE %]
-	<option value="call_number_dsc">Call Number (Z-A to 9-0)</option>
+	<option value="call_number_dsc">Call number (Z-A to 9-0)</option>
 [% END %]
 
 </optgroup>
 
 <optgroup label="Dates">
 	[% IF ( sort_by == "pubdate_dsc" ) %]
-<option value="pubdate_dsc" selected="selected" >Publication/Copyright Date: Newest to Oldest</option>
+<option value="pubdate_dsc" selected="selected" >Publication/Copyright date: newest to oldest</option>
 	[% ELSE %]
-<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option>
+<option value="pubdate_dsc">Publication/Copyright date: newest to oldest</option>
 [% END %]
 
 [% IF ( sort_by == "pubdate_asc" ) %]
-<option value="pubdate_asc" selected="selected" >Publication/Copyright Date: Oldest to Newest</option>
+<option value="pubdate_asc" selected="selected" >Publication/Copyright date: oldest to newest</option>
 [% ELSE %]
-<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option>
+<option value="pubdate_asc">Publication/Copyright date: oldest to newest</option>
 [% END %]
 
 [% IF ( sort_by == "acqdate_dsc" ) %]
-<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option>
+<option value="acqdate_dsc" selected="selected">Acquisition date: newest to oldest</option>
 [% ELSE %]
-<option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option>
+<option value="acqdate_dsc">Acquisition date: newest to oldest</option>
  [% END %]
 
  [% IF ( sort_by == "acqdate_asc" ) %]
-<option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option>
+<option value="acqdate_asc" selected="selected">Acquisition date: oldest to newest</option>
 [% ELSE %]
-<option value="acqdate_asc">Acquisition Date: Oldest to Newest</option>
+<option value="acqdate_asc">Acquisition date: oldest to newest</option>
  [% END %]
 </optgroup>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
index 83bbda2..2413216 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
@@ -1,29 +1,29 @@
 <select class="advsearch" name="idx">
     <option value="kw">Keyword</option>
     <option value="au">Author</option>
-    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as Phrase</option>
-    <option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
-    <option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
-    <option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name as Phrase</option>
-    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name as Phrase</option>
-    <option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
-    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name as Phrase</option>
+    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as phrase</option>
+    <option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
+    <option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
+    <option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name as phrase</option>
+    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name as phrase</option>
+    <option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
+    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name as phrase</option>
     <option value="ti">Title</option>
-    <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as Phrase</option>
-    <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
+    <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as phrase</option>
+    <option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series title</option>
     <option value="su">Subject</option>
-    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option>
+    <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as phrase</option>
     <option value="bc">Barcode</option>
-    <option value="location">Shelving Location</option>
-    <option value="sn">Standard Number</option>
+    <option value="location">Shelving location</option>
+    <option value="sn">Standard number</option>
     <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
     <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
-    <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
+    <option value="callnum">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
     <option value="ln,rtrn">Language</option>
     <option value="nt">Notes/Comments</option>
     <option value="curriculum">Curriculum</option>
     <option value="pb">Publisher</option>
-    <option value="pl">Publisher Location</option>
-    <option value="yr">Publication Date (yyyy)</option>
-    <option value="acqdate">Acquisition Date (yyyy-mm-dd)</option>
+    <option value="pl">Publisher location</option>
+    <option value="yr">Publication date (yyyy)</option>
+    <option value="acqdate">Acquisition date (yyyy-mm-dd)</option>
 </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index 204e5e0..550fd8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -46,7 +46,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
  </script>  [% END %][% END %]
 <div id="header_search">
 	<div id="suggestions_search" class="residentsearch">
-	<p class="tip">Suggestions Search:</p>
+	<p class="tip">Suggestions search:</p>
 	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
     <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
 	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="[% title %]" />
@@ -88,9 +88,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	</div>
 	[% END %]
 			<ul>
-			<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]#suggestions_search">Search Suggestions</a></li>
-			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>[% END %]
+			<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]#suggestions_search">Search suggestions</a></li>
+			[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+			[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
 </div>
 <!-- End Suggestions Resident Search Box -->
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr  3 20:26:07 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  3 Apr 2012 14:26:07 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_2780_-_Capitalize_string?=
	=?utf-8?q?s_consistently_=28Acquisitions_pages=29?=
Message-ID: <1333477567-19925-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization on strings in Acquisitions templates
---
 .../prog/en/modules/acqui/acqui-home.tt            |    8 +++---
 .../prog/en/modules/acqui/addorderiso2709.tt       |    6 ++--
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    6 ++--
 .../prog/en/modules/acqui/basketgroup.tt           |   22 ++++++++++----------
 .../prog/en/modules/acqui/booksellers.tt           |    2 +-
 .../prog/en/modules/acqui/histsearch.tt            |   10 ++++----
 .../prog/en/modules/acqui/lateorders.tt            |    2 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |    6 ++--
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |    4 +-
 .../prog/en/modules/acqui/orderreceive.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   20 +++++++++---------
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |   12 +++++-----
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |    8 +++---
 .../prog/en/modules/acqui/supplier.tt              |   12 +++++-----
 .../prog/en/modules/acqui/z3950_search.tt          |   10 ++++----
 15 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 9acc451..f0e2942 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -122,8 +122,8 @@ $(document).ready(function() {
                 <td align="center">[% loop_budge.budget_owner %]</td>
                 <td align="center">[% loop_budge.budget_branchname %]</td>
                 <td align="right" >[% loop_budge.budget_amount %]</td>
-                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
-                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
+                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
+                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
                 <td align="right" >[% loop_budge.budget_avail %]</td>
             </tr>
             [% ELSE %]
@@ -136,8 +136,8 @@ $(document).ready(function() {
                 <td align="center">[% loop_budge.budget_owner %]</td>
                 <td align="center">[% loop_budge.budget_branchname %]</td>
                 <td align="right" >[% loop_budge.budget_amount %]</td>
-                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
-                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
+                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
+                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
                 <td align="right" >[% loop_budge.budget_avail %]</td>
             [% END %]
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 80f88f9..3fdd631 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -1,10 +1,10 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Acquisitions &rsaquo; Order Staged MARC Records
+<title>Koha &rsaquo; Acquisitions &rsaquo; Order staged MARC records
 [% IF ( batch_details ) %]
  &rsaquo; Batch [% import_batch_id %]
 [% ELSE %]
- &rsaquo; Batch List
+ &rsaquo; Batch list
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -146,7 +146,7 @@
                 </fieldset>
                 [% END %] <!-- items -->
                 <fieldset class="rows">
-                    <legend>Accounting Details</legend>
+                    <legend>Accounting details</legend>
                     <ol>
                         <li>
                             <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 401e484..76a9d38 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -236,7 +236,7 @@
                 <tfoot>
                 [% IF ( GST ) %]
                 <tr>
-                    <th scope="row">Total Tax Exc.</th>
+                    <th scope="row">Total tax exc.</th>
                     <td>[% total_rrp_gste %]</td>
                     <td>&nbsp;</td>
                     <td>[% qty_total %]</td>
@@ -257,7 +257,7 @@
                     <td>[% gist_est %]</td>
                 </tr>
                 <tr>
-                    <th scope="row">Total Tax Inc. ([% currency %])</th>
+                    <th scope="row">Total tax inc. ([% currency %])</th>
                     <td>[% total_rrp_gsti %]</td>
                     <td>&nbsp;</td>
                     <td>[% qty_total %]</td>
@@ -288,7 +288,7 @@
                                 [% IF ( books_loo.suggestionid ) %]
                                     <br/>
                                     Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %],?[% books_loo.firstnamesuggestedby %] [% END %]
-                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&op=show">suggestion #[% books_loo.suggestionid %]</a>)
+                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&amp;op=show">suggestion #[% books_loo.suggestionid %]</a>)
                                 [% END %]
                                 [% IF ( books_loo.notes ) %]
                                     <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index f19b299..93d6362 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Basket Grouping for [% booksellername |html %]</title>
+<title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 [% IF ( grouping ) %]
@@ -137,15 +137,15 @@ function yuiToolbar() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; Basket Grouping</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; Basket grouping</div>
 
 <div id="doc" class="yui-t7">
             
         <div class="yui-b"> 
         	<div id="toolbar">
-				<a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New Basket Group</a>
+				<a href="?op=add&amp;booksellerid=[% booksellerid %]" name="newbasketgroup" id="newbasketgroup">New basket group</a>
 			</div>
-			<h1>Basket Grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+			<h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
 		</div>
 [% IF ( grouping ) %]
 	<div id="bd"> 
@@ -156,7 +156,7 @@ function yuiToolbar() {
 	            <div id="groups">
 	            <fieldset class="brief">
 	            <div class="workarea_alt" >
-	            <h3>Ungrouped Baskets</h3>
+	            <h3>Ungrouped baskets</h3>
 	            <ul id="ungrouped" class="draglist_alt">
 	            [% IF ( baskets ) %]
 	                [% FOREACH basket IN baskets %]
@@ -185,16 +185,16 @@ function yuiToolbar() {
 		    	<form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
 					<fieldset id="various" class="brief">
 					<ol>
-						<li><label for="basketgroupname">Basket Group Name:</label>
+						<li><label for="basketgroupname">Basket group name:</label>
 							<input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li>
-						<li><label for="billingplace">Billing Place:</label>
+						<li><label for="billingplace">Billing place:</label>
 							<select name="billingplace" id="billingplace" style="width:13em;">
 								[% FOREACH billingplaceloo IN billingplaceloop %]
 	                                [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
 	                                [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
 								[% END %]
 												</select></li>
-						<li><label for="deliveryplace">Delivery Place:</label>
+						<li><label for="deliveryplace">Delivery place:</label>
 							<select name="deliveryplace" id="deliveryplace" style="width:13em;">
 								<option value="">--</option>
 								[% FOREACH deliveryplaceloo IN deliveryplaceloop %]
@@ -203,7 +203,7 @@ function yuiToolbar() {
 								[% END %]
 												</select></li>
                         <li><p>or</p></li>
-                        <li><label for="freedeliveryplace">Delivery Place:</label>
+                        <li><label for="freedeliveryplace">Delivery place:</label>
                             <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea></li>
 						<li><label for="deliverycomment">Delivery comment:</label>
 							<textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
@@ -253,7 +253,7 @@ function yuiToolbar() {
 		<table>
 			<thead>
 				<tr>
-					<th>Basket Group</th><th colspan="3">Action</th>
+					<th>Basket group</th><th colspan="3">Action</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -285,7 +285,7 @@ function yuiToolbar() {
 		<table>
 			<thead>
 				<tr>
-					<th>Basket Group</th><th colspan="3">Action</th>
+					<th>Basket group</th><th colspan="3">Action</th>
 				</tr>
 			</thead>
 			<tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 798c2e7..4077b5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -38,7 +38,7 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Search for Vendor <em>[% supplier %]</em> </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Search for vendor <em>[% supplier %]</em> </div>
 
 <div id="doc3" class="yui-t2">
    
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index 1d6c242..ce6ef23 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -1,6 +1,6 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( suggestions_loop ) %]Orders search &rsaquo; Search Results[% ELSE %]Order search[% END %]</title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( suggestions_loop ) %]Orders search &rsaquo; Search results[% ELSE %]Order search[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 </head>
@@ -8,7 +8,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( suggestions_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> &rsaquo; Search Results[% ELSE %]Order search[% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( suggestions_loop ) %]<a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> &rsaquo; Search results[% ELSE %]Order search[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -25,7 +25,7 @@
 		<li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
 		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
 		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
-		<li><label for="booksellerinvoicenumber ">Bookseller Invoice No: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
+		<li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
 		<li><label for="from">From: </label> 
 			<input type="text" size="10" id="from" name="from" value="[% from_placed_on %]" />
 			<img src="[% themelang %]/lib/calendar/cal.gif" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
@@ -60,13 +60,13 @@
     <input type="hidden" name="do_search" value="1" />
 	<fieldset class="action"><input type="submit" value="Search" /></fieldset>
 	</form>[% END %]
-	[% IF ( suggestions_loop ) %]<h1>Search Results</h1>
+	[% IF ( suggestions_loop ) %]<h1>Search results</h1>
 	<div id="acqui_histsearch">
 		<table>
 			<tr>
 				<th>Basket</th>
 				<th>Basket group</th>
-				<th>Invoice Number</th>
+				<th>Invoice number</th>
 				<th>Summary</th>
 				<th>Vendor</th>
 				<th>Placed on</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 33473f6..3fb7e6d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -59,7 +59,7 @@ $(document).ready(function() {
 	[% END %]
     <table id="late_orders">
         <tr>
-            <th>Order Date</th>
+            <th>Order date</th>
             <th>Vendor</th>
             <th>Information</th>
             <th>Total cost</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
index 5e1ee9a..6342d33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Acquisitions &rsaquo; Search Existing Records</title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; Search existing records</title>
 [% INCLUDE 'greybox.inc' %]
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
@@ -7,7 +7,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Search Existing Records</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?=[% basketno %]">Basket [% basketno %]</a> &rsaquo; Search existing records</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -15,7 +15,7 @@
 	<div id="yui-main">
 	<div class="yui-b">
 	
-<h1>Search Existing Records</h1>
+<h1>Search existing records</h1>
 
 
 [% IF ( total ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
index 379d042..3ff156e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
@@ -25,9 +25,9 @@
 	<th> Order </th>
 	<th> Vendor </th>
 	<th> Itemtype </th>
-	<th> Left on Order </th>
+	<th> Left on order </th>
 	<th> Estimated cost per unit </th>
-	<th> Date Ordered </th>
+	<th> Date ordered </th>
 	<th> Subtotal </th>
     </tr>
     </thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index bb706ec..97a7223 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -61,7 +61,7 @@
     <div class="error" style="display:none"></div>
 
     <fieldset class="rows">
-    <legend>Catalog Details</legend>
+    <legend>Catalog details</legend>
     <ol><li><span class="label">Title: </span><span class="title">[% title |html %]</span></li>
     <li> <span class="label">Author: </span>
         [% author %]</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 4ddfc7d..7856b2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; [% IF ( date ) %]
-            Receipt Summary for [% name %] [% IF ( invoice ) %]Invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive Orders from [% name %][% END %]</title>
+            Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'greybox.inc' %]
 <script type="text/javascript" src="[% yuipath %]/json/json-min.js"></script>
@@ -158,7 +158,7 @@
 [% INCLUDE 'acquisitions-search.inc' %]
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  [% IF ( datereceived ) %]
-            Receipt Summary for <i>[% name %]</i> [% IF ( invoice ) %]<i>[ [% invoice %] ]</i>[% END %] on <i>[% formatteddatereceived %]</i>
+            Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %]<i>[ [% invoice %] ]</i>[% END %] on <i>[% formatteddatereceived %]</i>
         [% ELSE %]
             Receive orders from [% name %]
         [% END %]</div>
@@ -180,7 +180,7 @@
 	[% END %]
     <h1>
         [% IF ( datereceived ) %]
-            Receipt Summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% formatteddatereceived %]</i>
+            Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% formatteddatereceived %]</i>
         [% ELSE %]
             Receive orders from [% name %]
         [% END %]
@@ -202,15 +202,15 @@
 	<!-- TODO: Add date picker, change rcv date. -->
 </div>
 <div id="acqui_receive_search">
-    <h3>Pending Orders</h3>
+    <h3>Pending orders</h3>
 
  [% IF ( loop_orders ) %]<table id="pendingt">
     <thead>
         <tr>
             <th>Basket</th>
-            <th>Order Line</th>
+            <th>Order line</th>
             <th>Summary</th>
-    	    <th>View Record</th>
+    	    <th>View record</th>
             <th>Quantity</th>
             <th>Unit cost</th>
             <th>Order cost</th>
@@ -307,7 +307,7 @@
 	</div>
 </div>
 <div id="acqui_receive_receivelist">
-    <h3>Already Received</h3>
+    <h3>Already received</h3>
 
    [% IF ( loop_received ) %]
    <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
@@ -315,9 +315,9 @@
         <thead>
 	    <tr>
 		<th>Basket</th>
-		<th>Order Line</th>
+		<th>Order line</th>
 		<th>Summary</th>
-		<th>View Record</th>
+		<th>View record</th>
 		<th>Quantity</th>  
 		<th>Est cost</th>
 		<th>Actual cost</th>
@@ -420,7 +420,7 @@
 		</li>
 
 		<li>
-		    <label for="orderfilter">Order Line :</label>
+		    <label for="orderfilter">Order line :</label>
 		    <input type="text" name="orderfilter" id="orderfilter" />
 		</li>
 	    </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
index 712c472..740d0bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
@@ -25,9 +25,9 @@
 <table class="small">
         <tr>
             <th>Line</th>
-            <th>Date Received</th>
-            <th>Invoice Number</th>
-            <th>Item Count</th>
+            <th>Date received</th>
+            <th>Invoice number</th>
+            <th>Item count</th>
             <th>Biblio count</th>
             <th>Items expected</th>
         </tr>
@@ -85,7 +85,7 @@
     <fieldset class="rows">
     <legend>Receive a new shipment</legend>
        <ol> <li>
-            <label for="invoice">Vendor Invoice </label>
+            <label for="invoice">Vendor invoice </label>
             <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
             <input type="hidden" name="op" value="new" />
 			<input type="text" size="20" id="invoice" name="invoice" />
@@ -131,8 +131,8 @@
                 <label for="dateto">To:</label><input type="text" size="9" id="dateto" name="dateto" value="[% dateto %]" /></li>
             <li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
                 <option value="aqorders.booksellerinvoicenumber">Invoice number</option>
-                <option value="datereceived"> Date Received</option>
-                <option value="datereceived desc"> Date Received reverse</option>
+                <option value="datereceived"> Date received</option>
+                <option value="datereceived desc"> Date received reverse</option>
                 <option value="aqorders.booksellerinvoicenumber desc"> Invoice number reverse</option>
                 </select><br />
                 <label for="resultsperpage">Results per page :</label><select name="resultsperpage" id="resultsperpage">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 622604b..4531717 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -28,10 +28,10 @@
 	<th> Invoice </th>
 	<th> Itemtype </th>
 	<th> Received </th>
-	<th> Unit Price </th>
-	<th> Freight per Item </th>
-	<th> Date Ordered </th>
-	<th> Date Received </th>
+	<th> Unit price </th>
+	<th> Freight per item </th>
+	<th> Date ordered </th>
+	<th> Date received </th>
 	<th> Subtotal </th>
     </tr>
     </thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 6ace8da..1c7408e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -151,9 +151,9 @@ if (f.company.value == "") {
         <div class="yui-g">
             <div id="supplier-company-details" class="yui-u first">
                 <h2>Vendor details</h2>
-                <p><span class="label">Company Name: </span>[% name %]</p>
-                <p><span class="label">Postal Address: </span>[% postal %]</p>
-                <p><span class="label">Physical Address: </span>[% address1 %][% address2 %][% address3 %][% address4 %]</p>
+                <p><span class="label">Company name: </span>[% name %]</p>
+                <p><span class="label">Postal address: </span>[% postal %]</p>
+                <p><span class="label">Physical address: </span>[% address1 %][% address2 %][% address3 %][% address4 %]</p>
                 <p><span class="label">Phone: </span>[% phone %]</p>
                 <p><span class="label">Fax: </span>[% fax %]</p>
                 [% IF ( url ) %]
@@ -188,11 +188,11 @@ if (f.company.value == "") {
                     [% END %]</p>
             <p><strong>List prices are: </strong>[% listprice %]</p>
             <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p>
-            [% IF ( GST ) %]<p><strong>Tax Number Registered: </strong>
+            [% IF ( GST ) %]<p><strong>Tax number registered: </strong>
                     [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p>
-            <p><strong>List Item Price Includes Tax: </strong>
+            <p><strong>List item price includes tax: </strong>
                     [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
-            <p><strong>Invoice Item Price Includes Tax: </strong>
+            <p><strong>Invoice item price includes tax: </strong>
                     [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
             <p><strong>Discount: </strong>
                 [% discount %] %</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index 176922d..dba6f8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -76,14 +76,14 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 	    <fieldset class="rows">
 		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="[% title |html %]" /></li>
 		 <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn %]" /></li>
-		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li>
-         <li><label for="controlnumber">Control No.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
+		 <li><label for="lccall">LC call number: </label> <input type="text" id="lccall" name="lccall" value="" /></li>
+         <li><label for="controlnumber">Control no.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
 </ol>
 		</fieldset>
 	    </div>
     <div class="yui-u">
 	<fieldset class="rows">		 <ol><li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /><!--  <label for="Keyword">Keyword</label> <input type="text" name="keyword" value="" /> --></li>
-		 <li> <label for="subject">Subject Heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
+		 <li> <label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
 		 <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li></ol></fieldset>
 	     <fieldset class="rows" >
                  <ol>
@@ -108,7 +108,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 	    </div>
 </div>
 <div class="yui-g">
-<h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select All</a></span><span class="clearall"><a id="CheckNone" href="#">Clear All</a></span></span></h2>
+<h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select all</a></span><span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></span></h2>
 
     [% FOREACH serverloo IN serverloop %]
         <p>
@@ -143,7 +143,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         [% IF ( breeding_loo.breedingid ) %]
 
         [% IF ( breeding_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
-            <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview Card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&amp;breedingid=[% breeding_loo.breedingid %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
+            <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode %]&amp;breedingid=[% breeding_loo.breedingid %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
             <td>[% breeding_loo.title |html %]</td>
             <td>[% breeding_loo.author %]</td>
             <td>[% breeding_loo.isbn %]</td>
-- 
1.7.5.4


From magnus at enger.priv.no  Wed Apr  4 08:54:13 2012
From: magnus at enger.priv.no (Magnus Enger)
Date: Wed,  4 Apr 2012 08:54:13 +0200
Subject: [Koha-patches] [PATCH] Bug 7885 - Change filename of TransferLog
	suggested by packages to fit with logrotate
Message-ID: <1333522453-1644-1-git-send-email-magnus@enger.priv.no>

The apache accesslogs suggested by the default config files are called
*_log, which results in them not getting picked up by logrotate, which
looks for *.log. This patch changes the suggested filenames to *.log.

To test:
Not much to test here, just apply the patch and check that all
occurences of TransferLog and CustomLog are now on the form *.log

All the lines where these occur are commented out, so this will
not actually change any behaviour.
---
 debian/templates/apache-site.conf.in |    4 ++--
 etc/koha-httpd.conf                  |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in
index e9dbf93..42bdbcd 100644
--- a/debian/templates/apache-site.conf.in
+++ b/debian/templates/apache-site.conf.in
@@ -11,7 +11,7 @@
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
-#  TransferLog /var/log/koha/__KOHASITE__/opac-access_log
+#  TransferLog /var/log/koha/__KOHASITE__/opac-access.log
 #  RewriteLog  /var/log/koha/__KOHASITE__/opac-rewrite.log
 </VirtualHost>
 
@@ -26,6 +26,6 @@
    AssignUserID __UNIXUSER__ __UNIXGROUP__
 
    ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
-#  TransferLog /var/log/koha/__KOHASITE__/intranet-access_log
+#  TransferLog /var/log/koha/__KOHASITE__/intranet-access.log
 #  RewriteLog  /var/log/koha/__KOHASITE__/intranet-rewrite.log
 </VirtualHost>
diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index 2b986ac..dc82d08 100644
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -13,8 +13,8 @@
    ScriptAlias /opac-search.pl "__OPAC_CGI_DIR__/opac/opac-search.pl"
    ScriptAlias /search "__OPAC_CGI_DIR__/opac/opac-search.pl"
    ErrorLog __LOG_DIR__/koha-opac-error_log
-#  CustomLog __LOG_DIR__/koha-opac-access_log combined
-#  TransferLog __LOG_DIR__/koha-opac-access_log
+#  CustomLog __LOG_DIR__/koha-opac-access.log combined
+#  TransferLog __LOG_DIR__/koha-opac-access.log
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
    SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
@@ -106,7 +106,7 @@
    ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
    ScriptAlias /search "__INTRANET_CGI_DIR__/search.pl"
    ErrorLog __LOG_DIR__/koha-error_log
-#  TransferLog __LOG_DIR__/koha-access_log
+#  TransferLog __LOG_DIR__/koha-access.log
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
    SetEnv PERL5LIB "__PERL_MODULE_DIR__"
    SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
-- 
1.7.2.5


From robin at catalyst.net.nz  Wed Apr  4 13:12:56 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Wed,  4 Apr 2012 23:12:56 +1200
Subject: [Koha-patches] [PATCH] Bug 7893 - add package dependencies
Message-ID: <1333537977-19763-1-git-send-email-robin@catalyst.net.nz>

This adds some dependencies to the control file that are required.
---
 debian/control |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/debian/control b/debian/control
index 877f3af..322d921 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,12 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libdata-ical-perl,
  libdate-calc-perl,
  libdate-manip-perl,
+ libdatetime-event-ical-perl,
+ libdatetime-format-dateparse-perl,
  libdatetime-format-ical-perl,
  libdatetime-perl,
+ libdatetime-set-perl,
+ libdatetime-timezone-perl,
  libdbd-mysql-perl,
  libdbd-sqlite2-perl,
  libdbi-perl,
@@ -56,6 +60,8 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libpdf-reuse-perl,
  libpdf-table-perl,
  libpoe-perl,
+ libreadonly-perl,
+ libreadonly-xs-perl,
  libscalar-list-utils-perl,
  libschedule-at-perl,
  libsms-send-perl,
-- 
1.7.5.4


From oleonard at myacpl.org  Wed Apr  4 15:14:07 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  4 Apr 2012 09:14:07 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Admin pages)
Message-ID: <1333545247-24048-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Administration templates.
---
 .../prog/en/modules/admin/admin-home.tt            |   12 +++---
 .../prog/en/modules/admin/aqbudget_owner_search.tt |    4 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt       |   16 ++++----
 .../prog/en/modules/admin/aqbudgets.tt             |   18 ++++----
 .../prog/en/modules/admin/aqcontract.tt            |   12 +++---
 .../en/modules/admin/auth_subfields_structure.tt   |    8 ++--
 .../prog/en/modules/admin/auth_tag_structure.tt    |   32 +++++++-------
 .../prog/en/modules/admin/authorised_values.tt     |   22 +++++-----
 .../prog/en/modules/admin/authtypes.tt             |   16 ++++----
 .../prog/en/modules/admin/biblio_framework.tt      |   32 +++++++-------
 .../en/modules/admin/branch_transfer_limits.tt     |   10 ++--
 .../prog/en/modules/admin/branches.tt              |   38 +++++++++---------
 .../prog/en/modules/admin/categorie.tt             |   42 ++++++++++----------
 .../prog/en/modules/admin/checkmarc.tt             |    6 +-
 .../intranet-tmpl/prog/en/modules/admin/cities.tt  |    6 +-
 .../prog/en/modules/admin/classsources.tt          |   18 ++++----
 .../prog/en/modules/admin/clone-rules.tt           |    2 +-
 .../prog/en/modules/admin/currency.tt              |   28 +++++++-------
 .../prog/en/modules/admin/fieldmapping.tt          |   10 ++--
 .../en/modules/admin/item_circulation_alerts.tt    |    8 ++--
 .../prog/en/modules/admin/itemtypes.tt             |   40 +++++++++---------
 .../prog/en/modules/admin/koha2marclinks.tt        |   10 ++--
 .../en/modules/admin/marc_subfields_structure.tt   |   24 ++++++------
 .../prog/en/modules/admin/marctagstructure.tt      |   22 +++++-----
 .../prog/en/modules/admin/matching-rules.tt        |   12 +++---
 .../prog/en/modules/admin/oai_set_mappings.tt      |    4 +-
 .../prog/en/modules/admin/oai_sets.tt              |   10 ++--
 .../prog/en/modules/admin/patron-attr-types.tt     |    8 ++--
 .../prog/en/modules/admin/preferences.tt           |    4 +-
 .../prog/en/modules/admin/printers.tt              |   24 ++++++------
 .../prog/en/modules/admin/roadtype.tt              |   14 +++---
 .../prog/en/modules/admin/smart-rules.tt           |    4 +-
 .../prog/en/modules/admin/stopwords.tt             |   14 +++---
 .../prog/en/modules/admin/systempreferences.tt     |   22 +++++-----
 .../prog/en/modules/admin/z3950servers.tt          |   38 +++++++++---------
 35 files changed, 295 insertions(+), 295 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 6b339f8..e90f584 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main" class="sysprefs">
-	<div class="yui-g"><h1>Koha Administration</h1></div>
+	<div class="yui-g"><h1>Koha administration</h1></div>
 	<div class="yui-g">
 
 <div class="yui-u first">
@@ -51,16 +51,16 @@
 	<dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
 	<dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
 	<dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
-	<dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library Transfer Limits</a></dt>
+	<dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
 	<dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
-	<dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item Circulation Alerts</a></dt>
+	<dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
 	<dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
 </dl>
 </div>
 <div class="yui-u">
 <h3>Catalog</h3>
 <dl>
-	<dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Bibliographic framework</a></dt>
+	<dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></dt>
 	<dd>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</dd>
 	<dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></dt>
 	<dd>Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records. Note that the mapping can be defined through MARC Bibliographic Framework. This tool is just a shortcut to speed up linkage.</dd>
@@ -74,7 +74,7 @@
     <dd>Define classification sources (i.e., call number schemes) used by your collection.  Also define filing rules used for sorting call numbers.</dd>
     <dt><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></dt>
     <dd>Manage rules for automatically matching MARC records during record imports.</dd>
-    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI Sets Configuration</a></dt>
+    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></dt>
     <dd>Manage OAI Sets</dd>
 </dl>
 
@@ -97,7 +97,7 @@
 	<dd>Words ignored during search.</dd>[% END %]
 	<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
 	<dd>Printers (UNIX paths).</dd> -->
-	<dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Client Targets</a></dt>
+	<dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></dt>
 	<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
 </dl>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
index 84da262..79ebcd8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Budget Owner Search</title>
+<title>Koha &rsaquo; Budget owner search</title>
 [% INCLUDE 'doc-head-close.inc' %]
     <style type="text/css">
     #custom-doc { width:44.46em;*width:43.39em;min-width:578px; margin:auto; text-align:left; }
@@ -26,7 +26,7 @@ function returnOwner(ownerId, ownerName){
 	<div class="yui-g">
 
 
-<h3>Search for Budget Owner</h3>
+<h3>Search for budget owner</h3>
 	<form action="/cgi-bin/koha/admin/aqbudget_owner_search.pl" method="post">
 		<fieldset>
 		<input type="text" name="member" id="member" value="[% member %]" class="focus" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index f3c52d5..05db034 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -94,7 +94,7 @@
             Delete budget '[% budget_period_description %]'?
     [% END %]
     [% IF ( delete_confirmed ) %]&rsaquo;
-        Data Deleted
+        Data deleted
     [% END %]
 </title>
 
@@ -269,14 +269,14 @@
     <li>
         <!-- ACTIVE -->
         <!-- ############################## -->
-        <label for="budget_period_active">Make Budget Active</label>
+        <label for="budget_period_active">Make budget active</label>
         [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
     </li>
 
     <li>
         <!-- LOCK  -->
         <!-- ############################## -->
-        <label for="budget_period_locked">Lock Budget</label>
+        <label for="budget_period_locked">Lock budget</label>
         [% IF ( budget_period_locked ) %]<input type="checkbox" checked="checked" id="budget_period_locked" name="budget_period_locked" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_locked" name="budget_period_locked" value="1"/> [% END %]
     </li>
     </ol>
@@ -285,7 +285,7 @@
     <fieldset class="action">
         <!-- "save changes" button -->
         <!-- ###################################### -->
-        <input type="button" value="Save Changes"  onclick="Check(this.form)"    />
+        <input type="button" value="Save changes"  onclick="Check(this.form)"    />
         <!--             <input type="submit" value="Save Changes"  />  -->
         <!--            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a> -->
     </fieldset>
@@ -334,9 +334,9 @@
     <table id="periodsh">
     <thead>
 	    <tr>
-	        <th>Budget Name</th>
-	        <th>Start Date</th>
-	        <th>End Date</th>
+	        <th>Budget name</th>
+	        <th>Start date</th>
+	        <th>End date</th>
 	        <th>Active</th>
 	        <th>Locked</th>
 	        <th>Total</th>
@@ -359,7 +359,7 @@
 	        <td>
 	            <a href="[% period_loo.script_name %]?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id |html %]">Edit</a>
 	            <a href="[% period_loo.script_name %]?op=delete_confirm&amp;budget_period_id=[% period_loo.budget_period_id %]">Delete</a>
-	           	<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Add Fund</a>
+	           	<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% period_loo.budget_period_id %]">Add fund</a>
 	        </td>
 	        </tr>
 	    [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index cae2306..bf778c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF ( add_form ) %] &rsaquo; [% IF ( budget_id ) %]Modify Fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add Fund [% END %][% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF ( add_form ) %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 
@@ -225,12 +225,12 @@
             </ul>
         [% END %]</td>
     [% IF ( budge.budget_lock ) %]
-        <td> <span style="color: gray;" > Edit Delete </span> </td>
+        <td> <span style="color: gray;"> Edit Delete </span> </td>
     [% ELSE %]
         <td>
             <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]" >Edit</a>
             <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&amp;budget_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Delete</a>
-            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Add Child Fund</a>
+            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Add child fund</a>
         </td>
     [% END %]
     </tr>
@@ -260,19 +260,19 @@
     <ol>
     [% IF ( budget_parent_id ) %]
     <li>
-        <span class="label">Fund Parent: </span>
+        <span class="label">Fund parent: </span>
         [% budget_parent_name %]
         [% budget_parent_id %] - [% budget_parent_name %]
         <input type="hidden" name="budget_parent_id" value="[% budget_parent_id %]" />
     </li>
     [% END %]
     <li>
-    <label class="required"  for="budget_code">Fund Code: </label>
+    <label class="required"  for="budget_code">Fund code: </label>
     <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
     </li>
 
     <li>
-    <label class="required" for="budget_name">Fund Name: </label>
+    <label class="required" for="budget_name">Fund name: </label>
     <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
     </li>
 
@@ -377,10 +377,10 @@
 [% END %] <!-- add_form -->
 
 [% IF ( delete_confirm ) %]
-<div class="dialog alert"> <h3>Delete Fund [% budget_name %]?</h3>
+<div class="dialog alert"> <h3>Delete fund [% budget_name %]?</h3>
 <table>
     <tr>
-    <th scope="row">Fund Amount:</th>
+    <th scope="row">Fund amount:</th>
     <td>[% budget_amount %]</td>
     </tr>
 </table>
@@ -393,7 +393,7 @@
 </form>
 
 <form action="[% action %]" method="get">
-    <input type="submit" class="deny" value="No, Do Not Delete" />
+    <input type="submit" class="deny" value="No, do not delete" />
 </form>
 </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index 9eb9088..20f06cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -6,8 +6,8 @@
 [% END %]
 [% IF ( else ) %]Contracts of [% booksellername %][% END %]
 [% IF ( add_validate ) %]Data recorded[% END %]
-[% IF ( delete_confirm ) %]Confirm Deletion of Contract '[% contractnumber %]'[% END %]
-[% IF ( delete_confirmed ) %]Contract Deleted[% END %]</title>
+[% IF ( delete_confirm ) %]Confirm deletion of contract '[% contractnumber %]'[% END %]
+[% IF ( delete_confirmed ) %]Contract deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
@@ -75,7 +75,7 @@ function Check(ff) {
     [% END %]
     [% IF ( delete_confirm ) %]
         <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
-        &rsaquo; Confirm Deletion of Contract [% contractnumber %]
+        &rsaquo; Confirm deletion of contract [% contractnumber %]
     [% END %]
     [% IF ( delete_confirmed ) %]
         <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a> &rsaquo; Contract Deleted
@@ -154,7 +154,7 @@ function Check(ff) {
             [% IF ( delete_confirm ) %]
                 <form action="[% script_name %]" method="post">
                     <fieldset>
-                        <legend>Confirm Deletion of Contract [% contractnumber %]</legend>
+                        <legend>Confirm deletion of contract [% contractnumber %]</legend>
                         <table>
                             <tr><th scope="row">Contract number:</th><td>[% contractnumber %]</td></tr>
                             <tr><th scope="row">Contract name:</th><td>[% contractname %]</td></tr>
@@ -174,7 +174,7 @@ function Check(ff) {
                 </form>
             [% END %]
             [% IF ( delete_confirmed ) %]
-                <h3>Contract Deleted</h3>
+                <h3>Contract deleted</h3>
                 <form action="[% script_name %]" method="post">
                     <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                     <input type="submit" value="OK" />
@@ -195,7 +195,7 @@ function Check(ff) {
                         //]]>
                     </script>
                     <ul class="toolbar">
-                        <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">New Contract</a></li>
+                        <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid %]">New contract</a></li>
                     </ul>
                 </div>
                 <h2>Contract(s) of [% booksellername %]</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index e7ea422..bd325ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -29,7 +29,7 @@ function displayMoreConstraint(numlayer){
   [% IF ( else ) %]Authority MARC subfield structure
   [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield %]&amp;tagsubfield=[% tagsubfield %]&amp;authtypecode=[% authtypecode %]">Authority MARC subfield structure</a> &rsaquo;
   [% END %]
-  [% IF ( delete_confirm ) %]Confirm Deletion of Subfield [% tagsubfield %]?[% END %]
+  [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield %]?[% END %]
   [% IF ( delete_confirmed ) %]Data deleted[% END %]
   [% IF ( add_form ) %]
   [% IF ( use_heading_flags_p ) %]
@@ -53,7 +53,7 @@ function displayMoreConstraint(numlayer){
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="tagfield" value="[% tagfield %]" />
         <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
-        <fieldset class="action"><input type="submit" class="submit" value="Save Changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield %]&amp;authtypecode=[% authtypecode %]">Cancel</a></fieldset>
+        <fieldset class="action"><input type="submit" class="submit" value="Save changes" /> <a class="cancel" href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield %]&amp;authtypecode=[% authtypecode %]">Cancel</a></fieldset>
         <div id="subfieldtabs" class="toptabs numbered">
             <ul>
                 [% FOREACH loo IN loop %]
@@ -95,7 +95,7 @@ function displayMoreConstraint(numlayer){
                         </ol>
                     </fieldset>
                 </li>
-                <li><label for="isurl[% loo.row %]">Is a url:</label>[% loo.isurl %] (if checked, it means that the subfield is a url and can be clicked)</li>
+                <li><label for="isurl[% loo.row %]">Is a URL:</label>[% loo.isurl %] (if checked, it means that the subfield is a URL and can be clicked)</li>
                 <li>
                     <fieldset><legend>Help input</legend>	
                         <ol>
@@ -114,7 +114,7 @@ function displayMoreConstraint(numlayer){
 
 [% IF ( delete_confirm ) %]
 
-	<div class="dialog alert"><h3>Delete Subfield <span class="ex">'[% tagsubfield %]'?</span></h3>
+	<div class="dialog alert"><h3>Delete subfield <span class="ex">'[% tagsubfield %]'?</span></h3>
     <form action="[% delete_link %]" method="post"><input type="hidden" name="op" value="delete_confirmed" />
     <table><tr><th scope="row">Subfield:</th> <td>[% tagsubfield %]</td></tr>
     <tr><th scope="row">Description:</th> <td>[% liblibrarian %]</td></tr></table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
index 9347adc..7380c6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
-    [% IF ( heading_modify_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default Framework[% END %] &rsaquo; Modify tag[% END %]
-    [% IF ( heading_add_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default Framework[% END %] &rsaquo; New tag[% END %]
-    [% ELSE %]&rsaquo; [% action %][% END %][% END %][% IF ( delete_confirm ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default Framework[% END %] &rsaquo; Confirm Deletion[% END %][% IF ( delete_confirmed ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default Framework[% END %] &rsaquo; Data Deleted[% END %]</title>
+    [% IF ( heading_modify_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Modify tag[% END %]
+    [% IF ( heading_add_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; New tag[% END %]
+    [% ELSE %]&rsaquo; [% action %][% END %][% END %][% IF ( delete_confirm ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Confirm deletion[% END %][% IF ( delete_confirmed ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Data deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -70,18 +70,18 @@ return false;
 [% INCLUDE 'cat-search.inc' %]
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
-    [% IF ( heading_modify_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a>[% END %] &rsaquo; Modify tag[% END %]
-    [% IF ( heading_add_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a>[% END %] &rsaquo; New tag[% END %]
-    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; [% action %]
+    [% IF ( heading_modify_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; Modify tag[% END %]
+    [% IF ( heading_add_tag_p ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>[% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; New tag[% END %]
+    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; [% action %]
     [% END %]
     [% ELSE %]
-    [% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo;
-    [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] Framework</a>
-    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a>[% END %] &rsaquo; Confirm Deletion
+    [% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo;
+    [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]">[% authtypecode %] framework</a>
+    [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>[% END %] &rsaquo; Confirm deletion
     [% ELSE %]
-    [% IF ( delete_confirmed ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; Data Deleted
-    [% ELSE %]Authority MARC Framework: [% IF ( authtypecode ) %][% authtypecode %] Framework
-    [% ELSE %]Default Framework[% END %]
+    [% IF ( delete_confirmed ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC framework</a> &rsaquo; Data deleted
+    [% ELSE %]Authority MARC framework: [% IF ( authtypecode ) %][% authtypecode %] framework
+    [% ELSE %]Default framework[% END %]
     [% END %]
     [% END %]
     [% END %]
@@ -135,7 +135,7 @@ return false;
 
 [% IF ( delete_confirm ) %]
 		<div class="dialog alert">
-		<h3>Confirm Deletion</h3>
+		<h3>Confirm deletion</h3>
 		<form action="[% script_name %]" method="post">
 		<table>
 			<tr><th scope="row">Tag: </th><td>[% searchfield %] [% liblibrarian %]</td></tr>
@@ -143,8 +143,8 @@ return false;
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="authtypecode" value="[% authtypecode %]" />
         <input type="hidden" name="searchfield" value="[% searchfield %]" />
-		<input type="submit" value="Yes, Delete" class="approve"></form>
-		<form action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, Do Not Delete" /></form>
+		<input type="submit" value="Yes, delete" class="approve"></form>
+		<form action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, do not delete" /></form>
 		</div>
 [% END %]
 
@@ -189,7 +189,7 @@ return false;
 	}	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&amp;authtypecode=[% authtypecode %]">New Tag</a></li>
+	<li><a id="newtag" href="/cgi-bin/koha/admin/auth_tag_structure.pl?op=add_form&amp;authtypecode=[% authtypecode %]">New tag</a></li>
 </ul></div>
 
 <h2>Select an authority framework</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index 0c806ce..6de89c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Authorized Values [% IF ( add_form ) %] &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
+<title>Koha &rsaquo; Administration &rsaquo; Authorized values [% IF ( add_form ) %] &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
 	   [% IF ( action_add_value ) %] &rsaquo;  New authorized value[% END %]
 	   [% IF ( action_add_category ) %] &rsaquo; New category[% END %][% END %]
-[% IF ( delete_confirm ) %] &rsaquo; Confirm Deletion[% END %]
+[% IF ( delete_confirm ) %] &rsaquo; Confirm deletion[% END %]
 [% IF ( else ) %]Authorized values[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
@@ -32,10 +32,10 @@
 <body id="admin_authorised_values" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized Values</a> &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a> &rsaquo; [% IF ( action_modify ) %]Modify authorized value[% END %]
 	   [% IF ( action_add_value ) %]New authorized value[% END %]
 	   [% IF ( action_add_category ) %]New category[% END %][% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized Values</a> &rsaquo; Confirm Deletion[% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a> &rsaquo; Confirm deletion[% END %]
 [% IF ( else ) %]Authorized values[% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -79,7 +79,7 @@
         </li>
 		</ol>
 		<div id="icons" class="toptabs">
-		<h5 style="margin-left:10px;">Choose an Icon:</h5>
+		<h5 style="margin-left:10px;">Choose an icon:</h5>
 			<ul>
 					<li><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category %]#none">None</a></li>
 				  [% FOREACH imageset IN imagesets %]
@@ -122,7 +122,7 @@
 
 [% IF ( delete_confirm ) %]
 	<div class="dialog alert">
-<h3>Confirm Deletion</h3>
+<h3>Confirm deletion</h3>
 <table>
 	<tr>
 		<th>Category</th>
@@ -140,8 +140,8 @@
 	<form action="[% script_name %]" method="post">
 		<input type="hidden" name="op" value="delete_confirmed" />
 		<input type="hidden" name="id" value="[% id %]" />
-		<input type="hidden" name="searchfield" value="[% searchfield %]" /><fieldset class="action"><input type="submit" value="Yes, Delete" class="approve" /></form>
-<form action="[% script_name %]" method="get"><input type="hidden" name="searchfield" value="[% searchfield %]" /><input type="submit" value="No, Do Not Delete" class="deny" /></form>
+		<input type="hidden" name="searchfield" value="[% searchfield %]" /><fieldset class="action"><input type="submit" value="Yes, delete" class="approve" /></form>
+<form action="[% script_name %]" method="get"><input type="hidden" name="searchfield" value="[% searchfield %]" /><input type="submit" value="No, do not delete" class="deny" /></form>
 </div>
 [% END %]
 
@@ -171,8 +171,8 @@
 	//]]>
 	</script>
 	<ul class="toolbar">
-	 <li><a id="addauth" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category %]">New Authorized value for [% category %]</a></li>
-    <li><a id="addcat" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form">New Category</a></li>
+	 <li><a id="addauth" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&amp;category=[% category %]">New authorized value for [% category %]</a></li>
+    <li><a id="addcat" href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form">New category</a></li>
 </ul></div>
 
 <h1>Authorized values</h1>
@@ -182,7 +182,7 @@
 <div class="dialog alert">Could not add value &quot;[% duplicate_value %]&quot; for category &quot;[% duplicate_category %]&quot; &mdash; value already present.
 </div>
 [% END %]
-<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label>[% tab_list %] <input type="submit" value="Submit" /></form>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show category: </label>[% tab_list %] <input type="submit" value="Submit" /></form>
 [% IF ( category == 'Bsort1' ) %]
     <p>An authorized value attached to patrons, that can be used for stats purposes</p>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
index ef11e9a..2b3f64e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Authority Types
+<title>Koha &rsaquo; Administration &rsaquo; Authority types
 [% IF ( add_form ) %]
 &rsaquo; [% IF ( authtypecode ) %]Modify authority type[% ELSE %]New authority type[% END %]
 [% ELSIF ( delete_confirm ) %]
-&rsaquo; Confirm Deletion of Authority Type
+&rsaquo; Confirm deletion of authority type
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -55,11 +55,11 @@ $(document).ready(function() {
 <div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-&rsaquo; <a href="[% script_name %]">Authority Types</a>
+&rsaquo; <a href="[% script_name %]">Authority types</a>
 [% IF ( add_form ) %]
-&rsaquo; [% IF ( authtypecode ) %]Modify[% ELSE %]New[% END %] Authority Type
+&rsaquo; [% IF ( authtypecode ) %]Modify[% ELSE %]New[% END %] Authority type
 [% ELSIF ( delete_confirm ) %]
-&rsaquo; Confirm Deletion of Authority Type
+&rsaquo; Confirm deletion of authority type
 [% END %]
 </div>
 
@@ -110,7 +110,7 @@ $(document).ready(function() {
 [% END %]
 
 [% IF ( delete_confirm ) %]
-		<div class="dialog alert"><h3>Confirm Deletion of authority structure definition for <span class="ex">'[% authtypetext %]' ([% authtypecode %])</span></h3>
+		<div class="dialog alert"><h3>Confirm deletion of authority structure definition for <span class="ex">'[% authtypetext %]' ([% authtypecode %])</span></h3>
 	[% IF ( total ) %]
 		<p>This record is used <strong>[% total %]</strong> times</p>
 	[% END %]		
@@ -126,10 +126,10 @@ $(document).ready(function() {
 
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="authtype" href="[% script_name %]?op=add_form">New Authority Type</a></li>
+	<li><a id="authtype" href="[% script_name %]?op=add_form">New authority type</a></li>
 </ul></div>
 
-<h1>Authority Types</h1>
+<h1>Authority types</h1>
 <p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
index 234d2d5..bfbbd22 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; MARC Frameworks
+<title>Koha &rsaquo; Administration &rsaquo; MARC frameworks
 [% IF ( add_form ) %]
 &rsaquo; [% IF ( frameworkcode ) %]Modify framework text[% ELSE %]Add framework[% END %]
 [% ELSIF ( delete_confirm ) %]
-&rsaquo; Delete Framework for [% frameworktext %] ([% frameworkcode %])?
+&rsaquo; Delete framework for [% frameworktext %] ([% frameworkcode %])?
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -129,11 +129,11 @@ $(document).ready(function() {
 <div id="breadcrumbs">
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
 [% IF ( add_form ) %]
 &rsaquo; [% IF ( frameworkcode ) %]Modify framework text[% ELSE %]Add framework[% END %]
 [% ELSIF ( delete_confirm ) %]
-&rsaquo; Delete Framework for [% frameworktext %] ([% frameworkcode %])?
+&rsaquo; Delete framework for [% frameworktext %] ([% frameworkcode %])?
 [% END %]
 </div>
 
@@ -144,7 +144,7 @@ $(document).ready(function() {
 	
 [% IF ( else ) %]<div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form">New Framework</a></li>
+	<li><a id="newframework" href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form">New framework</a></li>
 </ul></div>[% END %]
 
 [% IF ( add_form ) %]
@@ -154,11 +154,11 @@ $(document).ready(function() {
     <fieldset class="rows">
     <ol>
 	[% IF ( frameworkcode ) %]
-        <li><span class="label">Framework Code</span><input type="hidden" id="frameworkcode" name="frameworkcode" value="[% frameworkcode %]" />[% frameworkcode %]
+        <li><span class="label">Framework code</span><input type="hidden" id="frameworkcode" name="frameworkcode" value="[% frameworkcode %]" />[% frameworkcode %]
             <input type="hidden" name="modif" value="1" />
         </li>
 	[% ELSE %]
-        <li><label for="frameworkcode">Framework Code</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></li>
+        <li><label for="frameworkcode">Framework code</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></li>
 	[% END %]
         <li><label for="description">Description</label>
         <input type="text" name="frameworktext" id="description" size="40" maxlength="80" value="[% frameworktext |html %]" /></li></ol></fieldset>
@@ -172,14 +172,14 @@ $(document).ready(function() {
     [% IF ( total ) %]
        <p><strong>This framework is used [% total %] times</strong>.</p>
     [% END %]
-    <form class="inline" action="[% script_name %]" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /><input type="submit" class="approve" value="Yes, Delete this Framework!" />
+    <form class="inline" action="[% script_name %]" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" /><input type="submit" class="approve" value="Yes, delete this framework!" />
     </form>
-    <form class="inline" action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, Do not Delete!" /></form>
+    <form class="inline" action="[% script_name %]" method="get"><input type="submit" class="deny" value="No, do not delete!" /></form>
 </div>
 [% END %]
 
 [% IF ( else ) %]
-<h1>MARC Frameworks</h1>
+<h1>MARC frameworks</h1>
 <p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
 <table>
     <tr>
@@ -203,9 +203,9 @@ $(document).ready(function() {
                     <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
                     <ul>
                         <li class="li_close_import_export"><span class="import_export_close" title="Close popup">Close</span></li>
-                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="csv" id="type_export_[% frameworkcode %]" checked="checked" /><label for="type_export_[% frameworkcode %]" title="Export to CSV Spreadsheet">Export to CSV Spreadsheet</label></li>
-                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="excel" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]" title="Export to Excel as xml format, compatible with OpenOffice/LibreOffice as well">Export to Excel with xml format</label></li>
-                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="ods" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]">Export to OpenDocument Spreadsheet format</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="csv" id="type_export_[% frameworkcode %]" checked="checked" /><label for="type_export_[% frameworkcode %]" title="Export to CSV spreadsheet">Export to CSV spreadsheet</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="excel" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]" title="Export to Excel as XML format, compatible with OpenOffice/LibreOffice as well">Export to Excel with XML format</label></li>
+                        <li><input type="radio" name="type_export_[% frameworkcode %]" value="ods" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]">Export to OpenDocument spreadsheet format</label></li>
                         <li><input type="radio" name="type_export_[% frameworkcode %]" value="sql" id="type_export_[% frameworkcode %]" /><label for="type_export_[% frameworkcode %]" title="Export to SQL">Export to SQL</label></li>
                         <li><input type="submit" class="export_ok" href="#" value="Export" title="Export to a spreadsheet" /></li>
                     </ul>
@@ -245,9 +245,9 @@ $(document).ready(function() {
                         <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
                         <ul>
                             <li class="li_close_import_export"><span class="import_export_close" title="Close popup">Close</span></li>
-                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="type_export_[% loo.frameworkcode %]" checked="checked" /><label for="type_export_[% loo.frameworkcode %]" title="Export to CSV Spreadsheet">Export to CSV Spreadsheet</label></li>
-                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]" title="Export to Excel as xml format, compatible with OpenOffice/LibreOffice as well">Export to Excel as xml format</label></li>
-                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]">Export to OpenDocument Spreadsheet format</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="type_export_[% loo.frameworkcode %]" checked="checked" /><label for="type_export_[% loo.frameworkcode %]" title="Export to CSV spreadsheet">Export to CSV spreadsheet</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]" title="Export to Excel as XML format, compatible with OpenOffice/LibreOffice as well">Export to Excel as XML format</label></li>
+                            <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]">Export to OpenDocument spreadsheet format</label></li>
                             <li><input type="radio" name="type_export_[% loo.frameworkcode %]" value="sql" id="type_export_[% loo.frameworkcode %]" /><label for="type_export_[% loo.frameworkcode %]" title="Export to SQL">Export to SQL</label></li>
                             <li><input type="submit" class="export_ok" href="#" value="Export" title="Export to a spreadsheet" /></li>
                         </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index 1fd7816..b3b5c08 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Library Checkin and Transfer Policy</title>
+<title>Koha &rsaquo; Administration &rsaquo; Library checkin and transfer policy</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -63,7 +63,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Set Library Checkin and Transfer Policy</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Set library checkin and transfer policy</div>
 
 <div id="doc3" class="yui-t1">
 
@@ -71,7 +71,7 @@
      <div id="yui-main">
     <div class="yui-b">
 
-<h1>Library [% branchcode %] - [% branchname %] Checkin and Transfer Policy</h1>
+<h1>Library [% branchcode %] - [% branchname %] Checkin and transfer policy</h1>
     <form method="get" action="/cgi-bin/koha/admin/branch_transfer_limits.pl" id="selectlibrary">
         <label for="branchselect">Select a library :</label>
             <select name="branchcode" id="branchselect">
@@ -87,7 +87,7 @@
     </form>
 
 <p class="help">Check the boxes for the libraries you accept to checkin items from.</p>
-<fieldset>For <strong>all</strong> [% limit_phrase %]s: <a id="CheckAll" href="#">Check All</a> | <a id="UncheckAll" href="#">Uncheck All</a></fieldset>
+<fieldset>For <strong>all</strong> [% limit_phrase %]s: <a id="CheckAll" href="#">Check all</a> | <a id="UncheckAll" href="#">Uncheck all</a></fieldset>
 
 
   <div id="transferlimit_tabs" class="toptabs">
@@ -100,7 +100,7 @@
 	[% FOREACH codes_loo IN codes_loop %]
 	<div id="[% codes_loo.code %]set">
 		<h4>Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]</h4>
-	<p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#">Check All</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#">Uncheck All</a></p>
+	<p><a id="CheckAll[% codes_loo.code %]table" class="checkall" href="#">Check all</a> | <a id="UncheckAll[% codes_loo.code %]table" class="uncheckall" href="#">Uncheck all</a></p>
 	
 	<div id="pager[% codes_loo.code %]table">
 	[% INCLUDE 'table-pager.inc' perpage='20' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 583a7a0..b270be3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Libraries and Groups
+<title>Koha &rsaquo; Administration &rsaquo; Libraries and groups
 [% IF ( editcategory ) %]
-    &rsaquo;[% IF ( categorycode ) %]Edit Group [% categorycode %][% ELSE %]New Group[% END %]
+    &rsaquo;[% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]New Group[% END %]
 [% ELSIF ( delete_category ) %]
-    &rsaquo; Confirm Deletion of Group [% categorycode %]
+    &rsaquo; Confirm deletion of group [% categorycode %]
 [% ELSIF ( add ) %]
     &rsaquo;[% IF ( heading_branches_add_branch_p ) %]New library[% ELSE %]Modify library [% branchcode %][% END %]
 [% ELSIF ( delete_confirm ) %]
@@ -40,11 +40,11 @@ tinyMCE.init({
 <div id="breadcrumbs">
     <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-&rsaquo; <a href="/cgi-bin/koha/admin/branches.pl">Libraries and Groups</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a>
 [% IF ( editcategory ) %]
-&rsaquo; [% IF ( categorycode ) %]Edit Group [% categorycode %][% ELSE %]New Group[% END %]
+&rsaquo; [% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]New group[% END %]
 [% ELSIF ( delete_category ) %]
-&rsaquo; Confirm Deletion of Group [% categorycode %]
+&rsaquo; Confirm deletion of group [% categorycode %]
 [% ELSIF ( add ) %]
 &rsaquo; [% IF ( heading_branches_add_branch_p ) %]New library[% ELSE %]Modify library [% branchcode %][% END %]
 [% ELSIF ( delete_confirm ) %]
@@ -82,8 +82,8 @@ tinyMCE.init({
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add">New Library</a></li>
-	<li><a id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory">New Group</a></li>
+	<li><a id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add">New library</a></li>
+	<li><a id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory">New group</a></li>
 </ul></div>
 [% END %]
 
@@ -130,18 +130,18 @@ tinyMCE.init({
 </fieldset>[% END %]
 	<fieldset class="rows">
 	<ol>
-        <li><label for="branchaddress1">Address Line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="[% branchaddress1 |html %]" /></li>
-        <li><label for="branchaddress2">Address Line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="[% branchaddress2 |html %]" /></li>
-        <li><label for="branchaddress3">Address Line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="[% branchaddress3 |html %]" /></li>
+        <li><label for="branchaddress1">Address line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="[% branchaddress1 |html %]" /></li>
+        <li><label for="branchaddress2">Address line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="[% branchaddress2 |html %]" /></li>
+        <li><label for="branchaddress3">Address line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="[% branchaddress3 |html %]" /></li>
         <li><label for="branchcity">City</label><input type="text" name="branchcity" id="branchcity" value="[% branchcity |html %]" /></li>
         <li><label for="branchstate">State</label><input type="text" name="branchstate" id="branchstate" value="[% branchstate |html %]" /></li>
-        <li><label for="branchzip">Zip/Postal Code</label><input type="text" name="branchzip" id="branchzip" value="[% branchzip |html %]" /></li>
+        <li><label for="branchzip">Zip/Postal code</label><input type="text" name="branchzip" id="branchzip" value="[% branchzip |html %]" /></li>
         <li><label for="branchcountry">Country</label><input type="text" name="branchcountry" id="branchcountry" value="[% branchcountry |html %]" /></li>
         <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="[% branchphone |html %]" /></li>
         <li><label for="branchfax">Fax</label><input type="text" name="branchfax" id="branchfax" value="[% branchfax |html %]" /></li>
         <li><label for="branchemail">Email</label><input type="text" name="branchemail" id="branchemail" value="[% branchemail |html %]" /></li>
-        <li><label for="branchurl">url</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" /></li>
-        <li><label for="opac_info">OPAC Info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
+        <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" /></li>
+        <li><label for="opac_info">OPAC info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
         <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
 		<!--
         <li><label for="branchprinter">Library Printer</label>
@@ -268,7 +268,7 @@ tinyMCE.init({
     
    [% IF ( branchcategories ) %]
    [% FOREACH branchcategorie IN branchcategories %]
-    <h3>Group(s):  [% IF ( branchcategorie.properties ) %]Properties[% ELSE %][% IF ( branchcategorie.searchdomain ) %]Search Domain[% END %][% END %]</h3>
+    <h3>Group(s):  [% IF ( branchcategorie.properties ) %]Properties[% ELSE %][% IF ( branchcategorie.searchdomain ) %]Search domain[% END %][% END %]</h3>
 	<table>
     <tr>
         <th>Name</th>
@@ -287,16 +287,16 @@ tinyMCE.init({
         <td><a href="[% catloo.action %]?op=delete_category&amp;categorycode=[% catloo.categorycode |url %]">Delete</a>
         </td>
         </tr>
-    [% END %][% ELSE %]<tr><td colspan="5">No [% IF ( branchcategorie.properties ) %]Properties[% ELSIF ( branchcategorie.searchdomain ) %]Search Domain[% END %] Defined</td></tr>[% END %]
+    [% END %][% ELSE %]<tr><td colspan="5">No [% IF ( branchcategorie.properties ) %]Properties[% ELSIF ( branchcategorie.searchdomain ) %]Search domain[% END %] Defined</td></tr>[% END %]
     </table>
     [% END %]
     [% ELSE %]
-        <p>No Groups defined.</p>
+        <p>No groups defined.</p>
     [% END %] <!-- NAME="branchcategories" -->
 [% END %]
 
 [% IF ( editcategory ) %]
-    <h3>[% IF ( categorycode ) %]Edit Group [% categorycode %][% ELSE %]Add Group[% END %]</h3>
+    <h3>[% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]Add group[% END %]</h3>
     <form action="[% action %]" name="Aform" method="post">
     <input type="hidden" name="op" value="addcategory_validate" />
 	[% IF ( categorycode ) %]
@@ -325,7 +325,7 @@ tinyMCE.init({
             <input type="text" name="codedescription" id="codedescription" size="70" value="[% codedescription |html %]" />
         </li>
 		<li>
-		<label for="categorytype">Category Type: </label>
+		<label for="categorytype">Category type: </label>
             <select id="categorytype" name="categorytype">
             [% FOREACH categorytyp IN categorytype %]
                 [% IF ( categorytyp.selected ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
index d2c353e..5b9de6d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Patron Categories &rsaquo; [% IF ( add_form ) %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
+<title>Koha &rsaquo; Administration &rsaquo; Patron categories &rsaquo; [% IF ( add_form ) %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
 [% IF ( add_validate ) %]Data recorded[% END %]
-[% IF ( delete_confirm ) %][% IF ( totalgtzero ) %]Cannot Delete: Category [% categorycode |html %] in Use[% ELSE %]Confirm Deletion of Category '[% categorycode |html %]'[% END %][% END %]
-[% IF ( delete_confirmed ) %]Category Deleted[% END %]</title>
+[% IF ( delete_confirm ) %][% IF ( totalgtzero ) %]Cannot delete: category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
+[% IF ( delete_confirmed ) %]Category deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -93,11 +93,11 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'patrons-admin-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; Data recorded[% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; [% IF ( totalgtzero ) %]Cannot Delete: Category [% categorycode |html %] in Use[% ELSE %]Confirm Deletion of Category '[% categorycode |html %]'[% END %][% END %]
-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a> &rsaquo; Category Deleted[% END %]
-[% IF ( else ) %]Patron Categories[% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; [% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
+[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; Data recorded[% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; [% IF ( totalgtzero ) %]Cannot delete: Category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/categorie.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
+[% IF ( else ) %]Patron categories[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -171,7 +171,7 @@
 					</select></li>
 	<li><label for="reservefee">Hold fee: </label><input type="text" name="reservefee" id="reservefee" size="6" value="[% reservefee %]" /></li>
 	<li><label for="category_type">Category type: </label> <select name="category_type" id="category_type">
-						[% IF ( type_n ) %]<option value="" selected="selected">Select a Category type</option>[% ELSE %]<option value="">Select a Category type</option>[% END %]
+						[% IF ( type_n ) %]<option value="" selected="selected">Select a category type</option>[% ELSE %]<option value="">Select a category type</option>[% END %]
 					[% IF ( type_A ) %]<option value="A" selected="selected">Adult</option>[% ELSE %]<option value="A">Adult</option>[% END %]
 					[% IF ( type_C ) %]<option value="C" selected="selected">Child</option>[% ELSE %]<option value="C">Child</option>[% END %]
 					[% IF ( type_S ) %]<option value="S" selected="selected">Staff</option>[% ELSE %]<option value="S">Staff</option>[% END %]
@@ -207,7 +207,7 @@
 	<fieldset><legend>    	
 	[% IF ( totalgtzero ) %]
 	Category [% categorycode |html %] is in use.  Deletion not possible![% ELSE %]
-Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
+Confirm deletion of category [% categorycode |html %][% END %]</legend>
 
 [% IF ( totalgtzero ) %]<div class="dialog alert"><strong>This category is used [% total %] times</strong>. Deletion not possible</div>[% END %]
 	<table>
@@ -233,12 +233,12 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
 <input type="submit" value="OK" /></form>
 		[% ELSE %]
 			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="categorycode" value="[% categorycode |html %]" /> <input type="submit" value="Delete this Category" /> <a class="cancel" href="/cgi-bin/koha/admin/categorie.pl">Cancel</a> 
+			<input type="hidden" name="categorycode" value="[% categorycode |html %]" /> <input type="submit" value="Delete this category" /> <a class="cancel" href="/cgi-bin/koha/admin/categorie.pl">Cancel</a> 
 		[% END %]</fieldset></fieldset></form>
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-<h3>Category Deleted</h3>
+<h3>Category deleted</h3>
 
         <form action="[% script_name %]" method="post">
         <input type="submit" value="OK" />
@@ -266,10 +266,10 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form">New Category</a></li>
+	<li><a id="newcategory" href="/cgi-bin/koha/admin/categorie.pl?op=add_form">New category</a></li>
 </ul></div>
 
-<h2>Patron Category Administration</h2>
+<h2>Patron category administration</h2>
 [% IF ( searchfield ) %]
 		You Searched for [% searchfield %]</span>
 	[% END %]
@@ -287,7 +287,7 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
 			<th scope="col">Upper age limit</th>
 			<th scope="col">Enrollment fee</th>
 			<th scope="col">Overdue</th>
-			<th scope="col">Lost Items</th>
+			<th scope="col">Lost items</th>
  			<th scope="col">Hold fee</th>
             [% IF ( EnhancedMessagingPreferences ) %]
             <th scope="col">Messaging</th>
@@ -328,12 +328,12 @@ Confirm Deletion of Category [% categorycode |html %][% END %]</legend>
                               [% FOREACH prefs IN loo.messaging_prefs %]
 	                                [% FOREACH transport IN prefs.transports %]
                                          [% IF ( transport.transport ) %]
-			                                [% IF ( prefs.Item_Due ) %]Item Due
-			                                [% ELSIF ( prefs.Advance_Notice ) %]Advance Notice
-			                                [% ELSIF ( prefs.Upcoming_Events ) %]Upcoming Events
-			                                [% ELSIF ( prefs.Hold_Filled ) %]Hold Filled
-			                                [% ELSIF ( prefs.Item_Check_in ) %]Item Check-in
-			                                [% ELSIF ( prefs.Item_Checkout ) %]Item Checkout
+			                                [% IF ( prefs.Item_Due ) %]Item due
+			                                [% ELSIF ( prefs.Advance_Notice ) %]Advance notice
+			                                [% ELSIF ( prefs.Upcoming_Events ) %]Upcoming events
+			                                [% ELSIF ( prefs.Hold_Filled ) %]Hold filled
+			                                [% ELSIF ( prefs.Item_Check_in ) %]Item check-in
+			                                [% ELSIF ( prefs.Item_Checkout ) %]Item checkout
 			                                [% ELSE %]Unknown
 			                                [% END %]:
 				                            <strong>[% transport.transport %]</strong><br />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
index 63851bf..5777eb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; MARC Check
+<title>Koha &rsaquo; Administration &rsaquo; MARC check
 [% IF ( total ) %] :[% total %] errors found[% ELSE %] : Configuration OK![% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
@@ -7,7 +7,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; MARC Check
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; MARC check
 [% IF ( total ) %]: [% total %] errors found[% ELSE %] : Configuration OK![% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -16,7 +16,7 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
-<h1>MARC Bibliographic Framework Test</h1>
+<h1>MARC bibliographic framework test</h1>
 <table>
     <tr>
         <th>Test</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index bd45d57..af0861e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Cities &rsaquo; [% IF ( cityid ) %] Modify City[% ELSE %] New City[% END %][% ELSE %][% IF ( delete_confirm ) %]Cities &rsaquo; Confirm Deletion of City[% ELSE %] Cities[% END %][% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Cities &rsaquo; [% IF ( cityid ) %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF ( delete_confirm ) %]Cities &rsaquo; Confirm deletion of city[% ELSE %] Cities[% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -36,7 +36,7 @@
     [% IF ( add_form ) %]
     &rsaquo; [% IF ( cityid ) %]Modify[% ELSE %]New[% END %] City
     [% ELSIF ( delete_confirm ) %]
-    &rsaquo; Confirm Deletion of City
+    &rsaquo; Confirm deletion of city
     [% END %]
 </div>
 
@@ -120,7 +120,7 @@
 
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="newcity" href="[% script_name %]?op=add_form">New City</a></li>
+	<li><a id="newcity" href="[% script_name %]?op=add_form">New city</a></li>
 </ul></div>
 
 	<h2>Cities</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
index 4dafc16..3719498 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Classification Sources
+<title>Koha &rsaquo; Administration &rsaquo; Classification sources
 [% IF ( class_source_form ) %]
 &rsaquo; 
     [% IF ( edit_class_source ) %]Modify classification source[% ELSE %]Add classification source[% END %]
@@ -80,7 +80,7 @@ $(document).ready(function() {
 <div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-&rsaquo; <a href="/cgi-bin/koha/admin/classsources.pl">Classification Sources</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a>
 [% IF ( class_source_form ) %]
 &rsaquo; [% IF ( edit_class_source ) %]Modify classification source[% ELSE %]Add classification source[% END %]
 [% END %]
@@ -129,7 +129,7 @@ $(document).ready(function() {
            [% IF ( used ) %]<input type="checkbox" id="used" name="used" value="used" checked="checked" />[% ELSE %]
 		  <input type="checkbox" id="used" name="used" value="used" />[% END %]
        </li>
-       <li><label for="sort_rule">Filing Rule: </label>
+       <li><label for="sort_rule">Filing rule: </label>
            <select id="sort_rule" name="sort_rule">
            [% FOREACH rules_dropdow IN rules_dropdown %]
              [% IF ( rules_dropdow.selected ) %]
@@ -173,7 +173,7 @@ $(document).ready(function() {
            <input type="text" id="description" name="description" size="50" maxlength="250" 
                   value="[% description |html %]" />
        </li>
-       <li><label for="sort_routine">Filing Routine: </label>
+       <li><label for="sort_routine">Filing routine: </label>
            <select id="sort_routine" name="sort_routine">
            [% FOREACH routines_dropdow IN routines_dropdown %]
              [% IF ( routines_dropdow.selected ) %]
@@ -234,11 +234,11 @@ $(document).ready(function() {
 
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="newsource" href="[% script_name %]?op=add_source">New Classification Source</a></li>
-	<li><a id="newrule" href="[% script_name %]?op=add_sort_rule">New Filing Rules</a></li>
+	<li><a id="newsource" href="[% script_name %]?op=add_source">New classification source</a></li>
+	<li><a id="newrule" href="[% script_name %]?op=add_sort_rule">New filing rules</a></li>
 </ul></div>
 
-<h2>Classification Sources</h2>
+<h2>Classification sources</h2>
 [% IF ( added_source ) %]
 <div class="dialog message">Added classification source [% added_source %]</div>
 [% END %]
@@ -276,7 +276,7 @@ $(document).ready(function() {
 
 <div class="pages">[% pagination_bar %]</div>
 
-<h2>Classification Filing Rules</h2>
+<h2>Classification filing rules</h2>
 [% IF ( added_rule ) %]
 <div class="dialog message">Added filing rule [% added_rule %]</div>
 [% END %]
@@ -290,7 +290,7 @@ $(document).ready(function() {
   <tr>
     <th>Code</th>
     <th>Description</th>
-    <th>Sorting Routine</th>
+    <th>Sorting routine</th>
     <th>Actions</th>
   </tr>
   [% FOREACH class_sort_rule IN class_sort_rules %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
index dfe65fb..a94ef51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
@@ -26,7 +26,7 @@
 	[% ELSE %]
 	    <div class="dialog message"><p>The rules have been cloned.</p></div>
 	[% END %]
-	<a href="/cgi-bin/koha/admin/smart-rules.pl">Return to Issuing rules</a>
+	<a href="/cgi-bin/koha/admin/smart-rules.pl">Return to issuing rules</a>
     [% ELSE %]
 
 	<p class="help">Use carefully ! If the destination library already has issuing rules, they will be deleted without warning !</p> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index bc187ab..d2d0597 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange Rates &rsaquo;
-[% IF ( add_form ) %][% IF ( searchfield ) %]Modify Currency '[% searchfield %]'[% ELSE %]New Currency[% END %][% END %]
-[% IF ( delete_confirm ) %]Confirm Deletion of Currency '[% searchfield %]'[% END %]
-[% IF ( delete_confirmed ) %]Currency Deleted[% END %]
+<title>Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange rates &rsaquo;
+[% IF ( add_form ) %][% IF ( searchfield ) %]Modify currency '[% searchfield %]'[% ELSE %]New currency[% END %][% END %]
+[% IF ( delete_confirm ) %]Confirm deletion of currency '[% searchfield %]'[% END %]
+[% IF ( delete_confirmed ) %]Currency deleted[% END %]
 [% IF ( else ) %]Currencies[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
@@ -56,9 +56,9 @@
 
 
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange Rates</a> &rsaquo; [% IF ( add_form ) %][% IF ( searchfield ) %]Modify Currency '[% searchfield %]'[% ELSE %]New Currency[% END %][% END %]
-[% IF ( delete_confirm ) %]Confirm Deletion of Currency '<span class="ex">[% searchfield %]</span>'[% END %]
-[% IF ( delete_confirmed ) %]Currency Deleted[% END %]
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;  <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange rates</a> &rsaquo; [% IF ( add_form ) %][% IF ( searchfield ) %]Modify currency '[% searchfield %]'[% ELSE %]New currency[% END %][% END %]
+[% IF ( delete_confirm ) %]Confirm deletion of currency '<span class="ex">[% searchfield %]</span>'[% END %]
+[% IF ( delete_confirmed ) %]Currency deleted[% END %]
 [% IF ( else ) %]Currencies[% END %]
 </div>
 
@@ -71,7 +71,7 @@
 [% IF ( else ) %]
 <div id="toolbar">
     <ul class="toolbar">
-    <li><a id="newcurrency" href="[% script_name %]?op=add_form">New Currency</a></li>
+    <li><a id="newcurrency" href="[% script_name %]?op=add_form">New currency</a></li>
 </ul></div>
 [% END %]
 
@@ -105,7 +105,7 @@
         </li>
 
         <li>
-            <span class="label">Last Updated: </span>[% timestamp %]
+            <span class="label">Last updated: </span>[% timestamp %]
         </li>
         <li>
             <label for="active">Active: </label>
@@ -130,7 +130,7 @@
 [% IF ( delete_confirm ) %]
     [% IF ( totalgtzero ) %]
     <div class="dialog message">
-        <h3>Cannot Delete Currency <span class="ex">'[% searchfield %]'</span></h3>
+        <h3>Cannot delete currency <span class="ex">'[% searchfield %]'</span></h3>
         <p>This currency is used [% total %] times. Deletion not possible</p>
         <form action="[% script_name %]" method="post">
             <input type="submit" value="OK" class="approve" />
@@ -138,7 +138,7 @@
     </div>
     [% ELSE %]
     <div class="dialog alert">
-        <h3>Confirm Deletion of Currency <span class="ex">'[% searchfield %]'</span></h3>
+        <h3>Confirm deletion of currency <span class="ex">'[% searchfield %]'</span></h3>
         <table>
             <tr><th>Currency</th>
                 <td>[% searchfield %]</td>
@@ -160,7 +160,7 @@
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-<div class="dialog message"><h3>Currency Deleted</h3>
+<div class="dialog message"><h3>Currency deleted</h3>
 <form action="[% script_name %]" method="post">
     <input type="submit" class="approve" value="OK" />
 </form></div>
@@ -168,7 +168,7 @@
 
 [% IF ( else ) %]
 
-<h2>Currencies and Exchange Rates</h2>
+<h2>Currencies and exchange rates</h2>
 
 [% IF ( loop ) %][% UNLESS ( activecurrency ) %]<div class="dialog alert"><h3>No active currency is defined</h3><p>Please edit one currency and mark it as active.</p></div>[% END %][% END %]
 
@@ -182,7 +182,7 @@
             <th>Currency</th>
             <th>Rate</th>
             <th>Symbol</th>
-            <th>Last Updated</th>
+            <th>Last updated</th>
             <th>Active</th>
             <th colspan="2">Actions&nbsp;</th>
         </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
index 7355bf0..2a06f5e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Keyword to MARC Mapping</title>
+<title>Koha &rsaquo; Administration &rsaquo; Keyword to MARC mapping</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
 <script type="text/javascript">
@@ -19,11 +19,11 @@ $(document).ready(function() {
 <body id="admin_fieldmapping" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Keyword to MARC Mapping</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Keyword to MARC mapping</div>
 <div id="doc3" class="yui-t2">
 	<div id="yui-main">
 		<div class="yui-b">
-			<h2>Keyword to MARC Mapping</h2>
+			<h2>Keyword to MARC mapping</h2>
 			[% UNLESS ( fields ) %]
 			<div class="dialog message"><p>There are no mappings for the [% IF ( frameworktext ) %]<em>[% frameworktext %]</em>[% ELSE %]default[% END %] framework. </p></div>
 			[% END %]
@@ -62,8 +62,8 @@ $(document).ready(function() {
 								<caption>Mappings for the [% IF ( frameworktext ) %]<em>[% frameworktext %]</em>[% ELSE %]default[% END %] framework</caption>
 									<tr>
 										<th>Field</th>
-										<th>MARC Field</th>
-										<th>MARC Subfield</th>
+										<th>MARC field</th>
+										<th>MARC subfield</th>
 										<th>&nbsp;</th>
 									</tr>
 									[% FOREACH field IN fields %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
index a652bc4..83650c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Item Circulation Alerts</title>
+<title>Koha &rsaquo; Administration &rsaquo; Item circulation alerts</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
 table.grid thead th {
@@ -88,7 +88,7 @@ $(function(){
 <body id="admin_item_circulation_alerts" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Item Circulation Alerts </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Item circulation alerts </div>
 
 <div id="doc3" class="yui-t1">
 
@@ -99,7 +99,7 @@ $(function(){
 
 <div class="yui-g">
 <div class="yui-u first">
-<h1>Item Circulation Alerts</h1>
+<h1>Item circulation alerts</h1>
 <h2>Select a library:</h2>
 <form id="branch_selector" method="get" action="/cgi-bin/koha/admin/item_circulation_alerts.pl">
 <select id="branch" name="branch">
@@ -141,7 +141,7 @@ $(function(){
 </div>
 </div>
 
-<h2>Circulation Alerts for [% branch_name %]</h2>
+<h2>Circulation alerts for [% branch_name %]</h2>
 <p>Click on the grid to toggle the settings.</p>
 
 <div id="alerttabs" class="toptabs">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 8407d09..e926e7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -1,20 +1,20 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Item Types [% IF ( add_form ) %]&rsaquo; 
+<title>Koha &rsaquo; Administration &rsaquo; Item types [% IF ( add_form ) %]&rsaquo; 
   [% IF ( itemtype ) %]
-Modify Item Type '[% itemtype %]'
+Modify item type '[% itemtype %]'
   [% ELSE %]
-Add Item Type
+Add item type
   [% END %]
 [% END %]
 [% IF ( delete_confirm ) %]&rsaquo; 
   [% IF ( total ) %]
-Cannot Delete Item Type '[% itemtype %]'
+Cannot delete item type '[% itemtype %]'
   [% ELSE %]
-Delete Item Type '[% itemtype %]'?
+Delete item type '[% itemtype %]'?
   [% END %]
 [% END %]
 [% IF ( delete_confirmed ) %]&rsaquo; 
-Data Deleted
+Data deleted
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -101,23 +101,23 @@ function Check(f) {
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %]
   [% IF ( itemtype ) %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Modify Item Type '[% itemtype %]'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Modify item type '[% itemtype %]'
   [% ELSE %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Add Item Type
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Add item type
   [% END %]
 [% END %]
 [% IF ( delete_confirm ) %]
   [% IF ( total ) %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Cannot Delete Item Type '[% itemtype %]'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Cannot delete item type '[% itemtype %]'
   [% ELSE %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Delete Item Type '[% itemtype %]'?
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo; Delete item type '[% itemtype %]'?
   [% END %]
 [% END %]
 [% IF ( delete_confirmed ) %]
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo;Data Deleted
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> &rsaquo;Data deleted
 [% END %]
 [% IF ( else ) %]
-Item Types Administration
+Item types administration
 [% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -145,14 +145,14 @@ Item Types Administration
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form">New Item Type</a></li>
+	<li><a id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form">New item type</a></li>
 </ul></div>[% ELSE %]&nbsp;[% END %]
 
 [% IF ( add_form ) %]
   [% IF ( itemtype ) %]
-      <h3>Modify Item Type</h3>
+      <h3>Modify item type</h3>
   [% ELSE %]
-      <h3>Add Item Type</h3>
+      <h3>Add item type</h3>
   [% END %]
 <form action="[% script_name %]" name="Aform" method="post">
   <input type="hidden" name="op" value="add_validate" />
@@ -176,13 +176,13 @@ Item Types Administration
 	 <li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=noItemTypeImages">noItemTypeImages system preference</a></li></ol>
 	 [% ELSE %]</ol>
 		<div id="icons" class="toptabs">
-		<h5 style="margin-left:10px;">Choose an Icon:</h5>
+		<h5 style="margin-left:10px;">Choose an icon:</h5>
 			<ul>
 					<li><a href="/cgi-bin/koha/admin/itemtypes.pl#none">None</a></li>
 				  [% FOREACH imageset IN imagesets %]
             [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/itemtypes.pl#[% imageset.imagesetname %]">[% imageset.imagesetname %]</a></li>
 				  [% END %]
-				  [% IF ( remote_image ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/itemtypes.pl#remote">Remote Image</a></li>
+				  [% IF ( remote_image ) %]<li class="ui-tabs-selected">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/admin/itemtypes.pl#remote">Remote image</a></li>
 			</ul>
 		</div>
   <div id="none"><ul>
@@ -257,10 +257,10 @@ Item Types Administration
 
 [% IF ( delete_confirm ) %]
 [% IF ( total ) %]<div class="dialog message">
-<h3>Cannot Delete Item Type</h3>
+<h3>Cannot delete item type</h3>
 <p><strong>This record is used [% total %] times</strong>. Deletion is not possible.</p>
 [% ELSE %]<div class="dialog alert">
-<h3>Delete Item Type '[% itemtype %]'?</h3>
+<h3>Delete item type '[% itemtype %]'?</h3>
 [% END %]
 <table>
 		<tr>
@@ -284,7 +284,7 @@ Item Types Administration
 [% END %]
 
 [% IF ( else ) %]
-<h2>Item Types Administration</h2>
+<h2>Item types administration</h2>
 [% IF ( loop ) %]<div id="pagertable_item_type">
 [% INCLUDE 'table-pager.inc' perpage='10' %]
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
index 287a581..aa40731 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo;
-[% IF ( add_form ) %] Koha to MARC Mapping &rsaquo; Connect [% tablename %].[% kohafield %] to a MARC subfield[% END %]
-[% IF ( else ) %]Koha to MARC Mapping [% tagfield %][% END %]</title>
+[% IF ( add_form ) %] Koha to MARC mapping &rsaquo; Connect [% tablename %].[% kohafield %] to a MARC subfield[% END %]
+[% IF ( else ) %]Koha to MARC mapping [% tagfield %][% END %]</title>
 
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
@@ -10,7 +10,7 @@
 [% INCLUDE 'cat-search.inc' %]
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC Mapping</a> &rsaquo; Connect [% tablename %].[% kohafield %] to a MARC subfield[% END %]
-[% IF ( else ) %]Koha to MARC Mapping[% tagfield %][% END %]</div>
+[% IF ( else ) %]Koha to MARC mapping[% tagfield %][% END %]</div>
 [% IF ( add_form ) %]
 <div id="doc" class="yui-t7">
 
@@ -142,13 +142,13 @@
 
 [% IF ( else ) %]
 
-<h1>Koha to MARC Mapping [% tagfield %]</h1>
+<h1>Koha to MARC mapping [% tagfield %]</h1>
 <form action="[% script_name %]" method="post">
 <p>[% tablename %] <input type="submit" value="OK" /></p>
 </form>
 <table>
 <tr>
-    <th>Koha Field</th>
+    <th>Koha field</th>
     <th>Tag</th>
     <th>Subfield</th>
     <th>Lib</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index 71c83b9..fe58d30 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo;[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC Subfield Structure &rsaquo; Edit MARC subfields constraints[% END %][% ELSE %] MARC Subfield Structure &rsaquo; [% action %][% END %][% END %]
-[% IF ( delete_confirm ) %] MARC Subfield Structure &rsaquo; Confirm Deletion of Subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC Subfield Structure &rsaquo; Subfield Deleted[% END %][% IF ( else ) %]MARC Subfield Structure[% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo;[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure &rsaquo; Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure &rsaquo; [% action %][% END %][% END %]
+[% IF ( delete_confirm ) %] MARC subfield structure &rsaquo; Confirm deletion of subfield [% tagsubfield %][% END %][% IF ( delete_confirmed ) %] MARC subfield structure &rsaquo; Subfield deleted[% END %][% IF ( else ) %]MARC subfield structure[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -38,19 +38,19 @@ $(document).ready(function() {
 [% INCLUDE 'cat-search.inc' %]
 
 <div id="breadcrumbs">
-  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&amp;searchfield=[% tagfield %]">[% frameworkcode %] Framework Structure</a> &rsaquo;
+  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&amp;searchfield=[% tagfield %]">[% frameworkcode %] framework structure</a> &rsaquo;
   [% IF ( add_form ) %]
   [% IF ( use_heading_flags_p ) %]
-  [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield Structure</a> &rsaquo; Edit subfields constraints
+  [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield structure</a> &rsaquo; Edit subfields constraints
   [% END %]
-  [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield Structure</a> &rsaquo; [% action %]
+  [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield structure</a> &rsaquo; [% action %]
   [% END %]
   [% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield Structure</a> &rsaquo; Confirm Deletion of Subfield [% tagsubfield %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield structure</a> &rsaquo; Confirm deletion of subfield [% tagsubfield %]
 [% END %]
-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] Subfield Structure</a> &rsaquo; Subfield Deleted
+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&amp;frameworkcode=[% frameworkcode %]">Tag [% tagfield %] subfield structure</a> &rsaquo; Subfield deleted
 [% END %]
-[% IF ( else ) %]Tag [% tagfield %] Subfield Structure[% END %]
+[% IF ( else ) %]Tag [% tagfield %] Subfield structure[% END %]
 </div>
 
 <div id="doc" class="yui-t7">
@@ -62,7 +62,7 @@ $(document).ready(function() {
 [% IF ( add_form ) %]
     <h1>
         [% IF ( use_heading_flags_p ) %]
-            [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield %] Subfield Constraints[% END %]
+            [% IF ( heading_edit_subfields_p ) %]Tag [% tagfield %] Subfield constraints[% END %]
         [% ELSE %]
             [% action %]
         [% END %]
@@ -71,7 +71,7 @@ $(document).ready(function() {
     <input type="hidden" name="op" value="add_validate" />
 	<input type="hidden" name="tagfield" value="[% tagfield %]" />
     <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
-    <input type="submit" value="Save Changes" />
+    <input type="submit" value="Save changes" />
     
     <div id="subfieldtabs" class="toptabs numbered">
    <ul>
@@ -113,7 +113,7 @@ $(document).ready(function() {
 				<li><label for="maxlength[% loo.row %]">Max length:</label><input type="text" id="maxlength[% loo.row %]" name="maxlength" value="[% loo.maxlength %]" size="4" /> (see online help)</li>
                 <li><label for="hidden[% loo.row %]">hidden</label><input type="text" id="hidden[% loo.row %]" name="hidden" value="[% loo.hidden %]" size="2" /> (see online help)</li>
                 <li><label for="isurl[% loo.row %]">Is a url:</label>[% loo.isurl %] (if checked, it means that the subfield is a url and can be clicked)</li>
-                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
+                <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., title or local-number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
                 <li><label for="kohafield[% loo.row %]">Koha link:</label>[% loo.kohafield %]</li>
 			</ol>
 	</fieldset>
@@ -134,7 +134,7 @@ $(document).ready(function() {
 
 [% IF ( delete_confirm ) %]
 
-<h3>Confirm Deletion of Subfield [% tagsubfield %]?</h3>
+<h3>Confirm deletion of subfield [% tagsubfield %]?</h3>
     <p>Subfield: [% tagsubfield %]</p>
     <p>Description: [% liblibrarian %]</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index ec0a583..f79a0f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo;
-[% IF ( add_form ) %]MARC Frameworks &rsaquo; [% action %] [% searchfield %][% END %]
-[% IF ( delete_confirm ) %]MARC Frameworks &rsaquo; Confirm Deletion of Tag '[% searchfield %]'[% END %]
-[% IF ( delete_confirmed ) %]MARC Frameworks &rsaquo;  Data Deleted[% END %]
-[% IF ( else ) %]MARC Frameworks[% END %]</title>
+[% IF ( add_form ) %]MARC frameworks &rsaquo; [% action %] [% searchfield %][% END %]
+[% IF ( delete_confirm ) %]MARC frameworks &rsaquo; Confirm deletion of tag '[% searchfield %]'[% END %]
+[% IF ( delete_confirmed ) %]MARC frameworks &rsaquo;  Data deleted[% END %]
+[% IF ( else ) %]MARC frameworks[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
@@ -44,7 +44,7 @@ $(document).ready(function() {
 <div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
 [% IF ( add_form ) %]
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>
 &rsaquo; [% action %] [% searchfield %]
@@ -52,10 +52,10 @@ $(document).ready(function() {
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]Default MARC framework[% END %]</a>
 [% ELSIF ( delete_confirm ) %]
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>
-&rsaquo; Confirm Deletion of Tag '[% searchfield %]'
+&rsaquo; Confirm deletion of tag '[% searchfield %]'
 [% ELSIF ( delete_confirmed ) %]
 &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]">[% frameworktext %] ([% frameworkcode %])</a>
-&rsaquo; Data Deleted
+&rsaquo; Data deleted
 [% END %]
 </div>
 
@@ -67,7 +67,7 @@ $(document).ready(function() {
 [% IF ( else ) %]
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% frameworkcode %]">New Tag</a></li>
+	<li><a id="addtag" href="/cgi-bin/koha/admin/marctagstructure.pl?op=add_form&amp;frameworkcode=[% frameworkcode %]">New tag</a></li>
 </ul></div>[% END %]
 
 <h1>MARC Framework for [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]default MARC framework[% END %]</h1>
@@ -96,7 +96,7 @@ $(document).ready(function() {
 
 [% IF ( delete_confirm ) %]
 
-<div class="dialog alert"><h3>Confirm Deletion of Tag <span class="ex">'[% searchfield %]'</span>?</h3>
+<div class="dialog alert"><h3>Confirm deletion of tag <span class="ex">'[% searchfield %]'</span>?</h3>
     <p>Tag: [% searchfield %]</p>
     <p>Description: [% liblibrarian %]</p>
     <form action="[% script_name %]" method="post">
@@ -109,7 +109,7 @@ $(document).ready(function() {
 
 [% IF ( delete_confirmed ) %]
 
-    <div class="dialog message"><h3>Tag Deleted</h3>
+    <div class="dialog message"><h3>Tag deleted</h3>
     <form action="[% script_name %]" method="post"><input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
     <input type="submit" value="OK" class="approve" />
     </form></div>
@@ -149,7 +149,7 @@ $(document).ready(function() {
             [% END %]
         </select>
     <input type="submit" value="Search" />
-<p>        <label for="select_display">Display only used Tags/Subfields</label>
+<p>        <label for="select_display">Display only used tags/subfields</label>
         [% IF ( select_display ) %]
             <input type="checkbox" name="select_display" id="select_display" value="True" checked="checked"  onchange="this.form.submit();" />
         [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index 4e31d4f..86349e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Record Matching Rules
+<title>Koha &rsaquo; Administration &rsaquo; Record matching rules
 [% IF ( matching_rule_form ) %]
   [% IF ( edit_matching_rule ) %]
     &rsaquo; Modify record matching rule
@@ -172,7 +172,7 @@ function CheckRuleForm(f) {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( display_list ) %]Record Matching Rules[% ELSE %]<a href="/cgi-bin/koha/admin/matching-rules.pl">Record Matching Rules</a>[% END %]
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( display_list ) %]Record matching rules[% ELSE %]<a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a>[% END %]
 [% IF ( matching_rule_form ) %]
   [% IF ( edit_matching_rule ) %]
     &rsaquo; Modify record matching rule
@@ -232,7 +232,7 @@ function CheckRuleForm(f) {
   [% FOREACH matchpoint IN matchpoints %]
   <div id="mp_[% matchpoint.mp_num %]" class="matchgroup">
   <fieldset class="rows">
-    <legend>Match Point [% matchpoint.mp_num %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
+    <legend>Match point [% matchpoint.mp_num %] | <a href="#" class="button" onclick="InsertMatchpoint('mp_[% matchpoint.mp_num %]', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
     <ol>
       <li>
         <label for="mp_[% matchpoint.mp_num %]_search_index">Search index: </label>
@@ -302,7 +302,7 @@ function CheckRuleForm(f) {
   [% ELSE %]
   <div id="mp_1" class="matchgroup">
   <fieldset class="rows">
-    <legend>Match Point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
+    <legend>Match point 1 | <a href="#" class="button" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;">Add match point</a> | <a href="#" class="button" onclick="DeleteMatchpoint(this); return false;">Remove this match point</a></legend>
     <ol>
       <li>
         <label for="mp_1_search_index">Search index: </label>
@@ -546,10 +546,10 @@ function CheckRuleForm(f) {
 	}	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newrule" href="[% script_name %]?op=add_matching_rule">New Record Matching Rule</a></li>
+	<li><a id="newrule" href="[% script_name %]?op=add_matching_rule">New record matching rule</a></li>
 </ul></div>
 
-<h2>Record Matching Rules</h2>
+<h2>Record matching rules</h2>
 [% IF ( added_matching_rule ) %]
 <div class="dialog message">Added record matching rule &quot;[% added_matching_rule %]&quot;</div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
index 2d438e0..1724c06 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Admin &rsaquo; OAI Set Mappings</title>
+<title>Koha &rsaquo; Admin &rsaquo; OAI set mappings</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -29,7 +29,7 @@ function returnToSetsPage() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id %]">OAI Set Mappings</a></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id %]">OAI set mappings</a></div>
 
 <div id="doc3" class="yui-t2">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
index bb53fb8..21a0c4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Admin &rsaquo; OAI Sets</title>
+<title>Koha &rsaquo; Admin &rsaquo; OAI sets</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -28,14 +28,14 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; OAI Sets</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Admin</a> &rsaquo; OAI sets</div>
 
 <div id="doc3" class="yui-t2">
 
 <div id="bd">
   <div id="yui-main">
     <div class="yui-b">
-      <h1>OAI Sets Configuration</h1>
+      <h1>OAI sets configuration</h1>
 
         [% IF op_new %]
             <h2>Add a new set</h2>
@@ -116,9 +116,9 @@ $(document).ready(function() {
                                 [% END %]
                             </td>
                             <td>
-                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id %]">Modify</a>
+                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&amp;id=[% set.id %]">Modify</a>
                                 |
-                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id %]">Delete</a>
+                                <a href="/cgi-bin/koha/admin/oai_sets.pl?op=del&amp;id=[% set.id %]">Delete</a>
                                 |
                                 <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id %]">Define mappings</a>
                             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index 54bd8f2..fcbe3e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Patron Attribute Types
+<title>Koha &rsaquo; Administration &rsaquo; Patron attribute types
 [% IF ( attribute_type_form ) %]
   [% IF ( edit_attribute_type ) %]
     &rsaquo; Modify patron attribute type
@@ -48,7 +48,7 @@ function CheckAttributeTypeForm(f) {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( display_list ) %]Patron Attribute Types[% ELSE %]<a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron Attribute Types</a>[% END %]
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( display_list ) %]Patron attribute types[% ELSE %]<a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a>[% END %]
 [% IF ( attribute_type_form ) %]
   [% IF ( edit_attribute_type ) %]
     &rsaquo; Modify patron attribute type
@@ -255,10 +255,10 @@ function CheckAttributeTypeForm(f) {
 	}	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newrule" href="[% script_name %]?op=add_attribute_type">New Patron Attribute Type</a></li>
+	<li><a id="newrule" href="[% script_name %]?op=add_attribute_type">New patron attribute type</a></li>
 </ul></div>
 
-<h2>Patron Attribute Types</h2>
+<h2>Patron attribute types</h2>
 [% IF ( added_attribute_type ) %]
 <div class="dialog message">Added patron attribute type &quot;[% added_attribute_type %]&quot;</div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
index 7fd77be..875b863 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; System Preferences</title>
+<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/preferences.css" />
@@ -26,7 +26,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'prefs-admin-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; System Preferences</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; System preferences</div>
 
 <div id="doc3" class="yui-t2">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
index 486fc48..a5f019a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo;
 [% IF ( add_form ) %][% IF ( searchfield ) %] Printers &rsaquo; Modify printer '[% searchfield %]'[% ELSE %] Printers &rsaquo; New printer[% END %][% END %]
-[% IF ( add_validate ) %] Printers &rsaquo; Printer Added[% END %]
-[% IF ( delete_confirm ) %] Printers &rsaquo; Confirm Deletion of Printer '[% searchfield %]'[% END %]
-[% IF ( delete_confirmed ) %] Printers &rsaquo; Printer Deleted[% END %]
+[% IF ( add_validate ) %] Printers &rsaquo; Printer added[% END %]
+[% IF ( delete_confirm ) %] Printers &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
+[% IF ( delete_confirmed ) %] Printers &rsaquo; Printer deleted[% END %]
 [% IF ( else ) %]Printers[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF ( add_form ) %]<script type="text/javascript">
@@ -68,9 +68,9 @@
 [% INCLUDE 'printers-admin-search.inc' %]
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %][% IF ( searchfield ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Modify printer '[% searchfield %]'[% ELSE %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; New printer[% END %][% END %]
-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Added[% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm Deletion of Printer '[% searchfield %]'[% END %]
-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer Deleted[% END %]
+[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer added[% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Confirm deletion of printer '[% searchfield %]'[% END %]
+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/printers.pl">Printers</a> &rsaquo; Printer deleted[% END %]
 [% IF ( else ) %]Printers[% END %]</div>
 
 <div id="doc3" class="yui-t2">
@@ -96,12 +96,12 @@
 	<fieldset class="rows">
 <ol>	[% IF ( searchfield ) %]
 		<li>
-			<span class="label">Printer Name: </span>
+			<span class="label">Printer name: </span>
 				<input type="hidden" name="printername" id="" value="[% searchfield %]" />[% searchfield %]
 		</li>
 	[% ELSE %]
 		<li>
-			<label for="printername">Printer Name: </label>
+			<label for="printername">Printer name: </label>
 				<input type="text" name="printername" id="printername" size="50" maxlength="50" />
 		</li>
 	[% END %]
@@ -120,14 +120,14 @@
 [% END %]
 
 [% IF ( add_validate ) %]
-<h3>Printer Added</h3>
+<h3>Printer added</h3>
 <form action="[% script_name %]" method="post">
        <fieldset class="action"> <input type="submit" value="OK" /></fieldset>
 </form>
 [% END %]
 
 [% IF ( delete_confirm ) %]
-<h3>Confirm Deletion of Printer <em>[% searchfield %]</em></h3>
+<h3>Confirm deletion of printer <em>[% searchfield %]</em></h3>
 <ul>
 		<li>
 			<strong>Printer: </strong>
@@ -152,7 +152,7 @@
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-<h3>Printer Deleted</h3>
+<h3>Printer deleted</h3>
 <form action="[% script_name %]" method="post">
 		<fieldset class="action"><input type="submit" value="OK" /></fieldset>
 </form>
@@ -170,7 +170,7 @@
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form">New Printer</a></li>
+	<li><a id="newprinter" href="/cgi-bin/koha/admin/printers.pl?op=add_form">New printer</a></li>
 </ul></div>
 
 <h2>Printers</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt
index bdd3bc1..82c92b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Road Types &rsaquo; [% IF ( roadtypeid ) %] Modify Road Type[% ELSE %] New Road Type[% END %][% ELSE %][% IF ( delete_confirm ) %]Road Types &rsaquo; Confirm Deletion of Road Type[% ELSE %] Road Type[% END %][% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Road types &rsaquo; [% IF ( roadtypeid ) %] Modify road type[% ELSE %] New road type[% END %][% ELSE %][% IF ( delete_confirm ) %]Road types &rsaquo; Confirm deletion of road type[% ELSE %] Road type[% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -53,7 +53,7 @@
 <body id="admin_roadtype" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'roadtype-admin-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road Types</a> &rsaquo; [% IF ( roadtypeid ) %] Modify Road Type[% ELSE %] New Road Type[% END %][% ELSE %][% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road Types</a> &rsaquo; Confirm Deletion of Road Type[% ELSE %] Road Type[% END %][% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a> &rsaquo; [% IF ( roadtypeid ) %] Modify road type[% ELSE %] New road type[% END %][% ELSE %][% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a> &rsaquo; Confirm deletion of road type[% ELSE %] Road type[% END %][% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -91,9 +91,9 @@
 [% END %]
 
 [% IF ( delete_confirm ) %]
-	<div class="dialog alert"><h3>Delete Road Type "[% road_type %]?"</h3>
+	<div class="dialog alert"><h3>Delete road type "[% road_type %]?"</h3>
 <table>	<tr>
-		<th>Road type id : </th>
+		<th>Road type id: </th>
 			<td>[% roadtypeid %]</td>
 		</tr>
 	<tr>	<th>Road type: </th>
@@ -102,8 +102,8 @@
 
 	</tr></table><form action="[% script_name %]" method="post">
 			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="roadtypeid" value="[% roadtypeid %]" /><input type="submit" class="approve" value="Yes, Delete" /></form> <form action="[% script_name %]" method="post">
-			<input type="submit" class="deny" value="No, Do Not Delete" /></form></div>
+			<input type="hidden" name="roadtypeid" value="[% roadtypeid %]" /><input type="submit" class="approve" value="Yes, delete" /></form> <form action="[% script_name %]" method="post">
+			<input type="submit" class="deny" value="No, do not delete" /></form></div>
 [% END %]
 
 [% IF ( else ) %]
@@ -127,7 +127,7 @@
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="addroad" href="/cgi-bin/koha/admin/roadtype.pl?op=add_form">New Road Type</a></li>
+	<li><a id="addroad" href="/cgi-bin/koha/admin/roadtype.pl?op=add_form">New road type</a></li>
 </ul></div>
 
 	<h2>Road type</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 7b01ac7..635051f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Circulation and Fine Rules</title>
+<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
 <script type="text/javascript">
@@ -23,7 +23,7 @@ $(document).ready(function() {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Circulation and Fine Rules</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Circulation and fine rules</div>
 
 <div id="doc3" class="yui-t1">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
index 272d1a0..3469436 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; System Administration &rsaquo; Stop words
+<title>Koha &rsaquo; System administration &rsaquo; Stop words
 [% IF ( add_form ) %]&rsaquo; [% IF ( searchfield ) %]Modify[% ELSE %]New[% END %] stop word
 [% ELSIF ( add_validate ) %]&rsaquo; Data recorded
 [% ELSIF ( delete_confirm ) %]&rsaquo; Delete stop word '[% searchfield %]' ?
@@ -34,13 +34,13 @@
 <div id="breadcrumbs">
 <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-&rsaquo; <a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a>
+&rsaquo; <a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a>
 [% IF ( add_form ) %]
-    &rsaquo; [% IF ( searchfield ) %]Modify[% ELSE %]New[% END %] Stop Word
+    &rsaquo; [% IF ( searchfield ) %]Modify[% ELSE %]New[% END %] Stop word
 [% ELSIF ( add_validate ) %]
     &rsaquo; Data recorded
 [% ELSIF ( delete_confirm ) %]
-    &rsaquo; Delete Stop Word '[% searchfield %]' ?
+    &rsaquo; Delete stop word '[% searchfield %]' ?
 [% ELSIF ( delete_confirmed ) %]
     &rsaquo; Data deleted
 [% END %]
@@ -88,7 +88,7 @@
 
 [% IF ( delete_confirm ) %]
     <div class="dialog alert">
-	<h3>Delete Stop Word <span class="ex">'[% searchfield %]'</span></h3>
+	<h3>Delete stop word <span class="ex">'[% searchfield %]'</span></h3>
 	<form action="[% script_name %]" method="post">
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="searchfield" value="[% searchfield %]" />
@@ -110,10 +110,10 @@
 
 <div id="toolbar">
 	<ul class="toolbar">
-	<li><a id="newstopword" href="/cgi-bin/koha/admin/stopwords.pl?op=add_form">New Stop Word</a></li>
+	<li><a id="newstopword" href="/cgi-bin/koha/admin/stopwords.pl?op=add_form">New stop word</a></li>
 </ul></div>
 
-    <h1>Stop Words</h1>
+    <h1>Stop words</h1>
     <p class="message">NOTE : if you change something in this table, ask your administrator to run misc/batchRebuildBiblioTables.pl script.</p>
 
     [% IF ( searchfield ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
index 9e0a976..d9d0a5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System Preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System Preferences &rsaquo; Data Added[% END %]
-[% IF ( delete_confirm ) %] System Preferences &rsaquo; [% searchfield %] &rsaquo; Confirm Deletion of Parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System Preferences &rsaquo; Parameter Deleted[% END %][% IF ( else ) %]System Preferences[% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %]
+[% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield %] &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -77,8 +77,8 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'sysprefs-admin-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; Data Added[% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&amp;searchfield=[% searchfield %]">[% searchfield %]</a> &rsaquo; Confirm Deletion of Parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; Parameter Deleted[% END %][% IF ( else ) %]System Preferences[% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; Data added[% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a> &rsaquo; <a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&amp;searchfield=[% searchfield %]">[% searchfield %]</a> &rsaquo; Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a> &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -199,7 +199,7 @@
         <div class="hint"> (<span class="variabletype" id="Choice">Choice</span>, <span class="variabletype" id="YesNo">YesNo</span>, <span class="variabletype" id="Integer">Integer</span>, <span class="variabletype" id="Textarea">Textarea</span>, <span class="variabletype" id="Float">Float</span>, <span class="variabletype" id="Themes">Themes</span>, <span class="variabletype" id="Languages">Languages</span>, <span class="variabletype" id="Upload">Upload</span> or <span class="variabletype" id="ClassSources">ClassSources</span>)</div>
         <input type="text" name="preftype" id="preftype" value="[% preftype %]" size="40" maxlength="40" /></li>
         <li><label for="prefoptions">Variable options:</label>
-        <div class="hint">(a choice list for Choice (separated by |) or cols|rows for Texarea)</div>
+        <div class="hint">(a choice list for choice (separated by |) or cols|rows for texarea)</div>
         <input type="text" name="prefoptions" id="prefoptions" value="[% prefoptions %]" size="60" maxlength="80" /></li>
         </ol>
         </fieldset>
@@ -216,9 +216,9 @@
     
     [% IF ( delete_confirm ) %]
     <table>
-        <caption>Confirm Deletion of [% searchfield %]?</caption>
+        <caption>Confirm deletion of [% searchfield %]?</caption>
         <tr>
-            <th>Variable Name:</th>
+            <th>Variable name:</th>
             <td>[% searchfield %]</td>
         </tr>
         <tr><th>Value: </th><td>
@@ -228,8 +228,8 @@
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="searchfield" value="[% searchfield %]" />
         <input type="hidden" name="Tvalue" value="[% Tvalue %]" />
-        <input type="submit"  value="Yes, Delete" /></form> 
-        <form class="inline" action="[% script_name %]" method="post"><input type="submit" value="No, Do not Delete" /></form>
+        <input type="submit"  value="Yes, delete" /></form>
+        <form class="inline" action="[% script_name %]" method="post"><input type="submit" value="No, do not delete" /></form>
     [% END %]
     
     [% IF ( delete_confirmed ) %]
@@ -259,7 +259,7 @@
     }   //]]>
     </script>
     <ul class="toolbar">
-        <li><a id="newstopword" href="[% script_name %]?op=add_form">New Preference</a></li>
+        <li><a id="newstopword" href="[% script_name %]?op=add_form">New preference</a></li>
     </ul></div>
     
     <h1>System preferences admin</h1>
@@ -294,7 +294,7 @@
                 <input type="file" name="value" value="[% loo.value |html %]" />
                 [% END %]
                 [% IF ( loo.type_textarea ) %]
-                <a class="expand-textarea" style="display: none" href="#">Click to Edit</a>
+                <a class="expand-textarea" style="display: none" href="#">Click to edit</a>
                 <textarea name="value" rows="[% loo.rows %]" cols="[% loo.cols %]">[% loo.value |html %]</textarea>
                 [% END %]
                 [% IF ( loo.type_choice ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index 9a4950b..4f24151 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( else ) %]Z39.50 Servers[% END %]
-[% IF ( add_form ) %] Z39.50 Servers &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 Server [% searchfield %][% ELSE %]New Z39.50 Server[% END %][% END %]
-[% IF ( delete_confirm ) %]Z39.50 Servers &rsaquo; Confirm Deletion[% END %]
-[% IF ( add_validate ) %]Z39.50 Servers &rsaquo; Z39.50 Server Added[% END %]
-[% IF ( delete_confirmed ) %]Z39.50 Servers &rsaquo; Z39.50 Server Deleted[% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; [% IF ( else ) %]Z39.50 servers[% END %]
+[% IF ( add_form ) %] Z39.50 servers &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 server [% searchfield %][% ELSE %]New Z39.50 server[% END %][% END %]
+[% IF ( delete_confirm ) %]Z39.50 servers &rsaquo; Confirm deletion[% END %]
+[% IF ( add_validate ) %]Z39.50 servers &rsaquo; Z39.50 server added[% END %]
+[% IF ( delete_confirmed ) %]Z39.50 servers &rsaquo; Z39.50 server deleted[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
 [% IF ( add_form ) %]
@@ -69,11 +69,11 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'z3950-admin-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( else ) %]Z39.50 Servers[% END %]
-[% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 Server [% searchfield %][% ELSE %]New Z39.50 Server[% END %][% END %]
-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Confirm Deletion[% END %]
-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Z39.50 Server Added[% END %]
-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Z39.50 Server Deleted[% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( else ) %]Z39.50 servers[% END %]
+[% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 server [% searchfield %][% ELSE %]New Z39.50 server[% END %][% END %]
+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Confirm deletion[% END %]
+[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server added[% END %]
+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server deleted[% END %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -86,15 +86,15 @@
         <form action="[% script_name %]" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 [% IF ( searchfield ) %]
-                <h1>Modify Z39.50 Server</h1>
+                <h1>Modify Z39.50 server</h1>
         [% ELSE %]
-                <h1>New Z39.50 Server</h1>
+                <h1>New Z39.50 server</h1>
         [% END %]                
         <fieldset class="rows">
         <ol>[% IF ( searchfield ) %]
-                <li><span class="label">Z39.50 Server: </span>        <input type="hidden" name="searchfield" value="[% searchfield %]" />[% searchfield %]</li>
+                <li><span class="label">Z39.50 server: </span>        <input type="hidden" name="searchfield" value="[% searchfield %]" />[% searchfield %]</li>
         [% ELSE %]
-                <li><label for="searchfield">Z39.50 Server: </label>        <input type="text" name="searchfield" id="searchfield" size="65" maxlength="100" onblur="toUC(this)" /></li>
+                <li><label for="searchfield">Z39.50 server: </label>        <input type="text" name="searchfield" id="searchfield" size="65" maxlength="100" onblur="toUC(this)" /></li>
         [% END %]
 
 		<li><label for="host">Hostname: </label>	<input type="text" name="host" id="host" size="30" value="[% host %]" />
@@ -241,7 +241,7 @@
 [% END %]
 
 [% IF ( add_validate ) %]
-<h3>Z39.50 Server Added</h3>
+<h3>Z39.50 server added</h3>
 <form action="[% script_name %]" method="post">
         <input type="submit" value="OK" />
         </form>
@@ -249,7 +249,7 @@
 
 [% IF ( delete_confirm ) %]
 	[% reqsel %]
-<h3>Confirm Deletion of Server [% searchfield %]</h3>	
+<h3>Confirm deletion of server [% searchfield %]</h3>
         <ul>
                 <li><strong>Target: </strong>        [% searchfield %]</li>
                 <li><strong>Hostname: </strong>[% host %]</li>
@@ -269,7 +269,7 @@
 [% END %]
 
 [% IF ( delete_confirmed ) %]
-<h3>Z39.50 Server Deleted</h3>
+<h3>Z39.50 server deleted</h3>
 <form action="[% script_name %]" method="post">
                 <input type="submit" value="OK" />
 </form>
@@ -296,10 +296,10 @@
 	}	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newserver" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form">New Z39.50 Server</a></li>
+	<li><a id="newserver" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form">New Z39.50 server</a></li>
 </ul></div>
 
-<h3>Z39.50 Servers Administration</h3>
+<h3>Z39.50 servers administration</h3>
 
         [% IF ( searchfield ) %]
                 You searched for [% searchfield %]
-- 
1.7.5.4


From oleonard at myacpl.org  Wed Apr  4 16:06:56 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  4 Apr 2012 10:06:56 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Authorities pages)
Message-ID: <1333548416-26176-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Authorities templates
---
 .../prog/en/modules/authorities/auth_finder.tt     |    2 +-
 .../prog/en/modules/authorities/authorities.tt     |    2 +-
 .../authorities/blinddetail-biblio-search.tt       |    2 +-
 .../prog/en/modules/authorities/detail.tt          |    4 ++--
 .../modules/authorities/searchresultlist-auth.tt   |    4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
index f0140d9..b67da76 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Cataloging Authority Plugin</title>
+<title>Koha &rsaquo; Cataloging authority plugin</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
 #custom-doc { width:51.46em;*width:50.17em;min-width:675px; margin:auto; text-align:left; } 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index b670b4a..d720b35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -574,7 +574,7 @@ function searchauthority() {
 
 [% IF ( duplicateauthid ) %]
         <div class="problem">
-                <p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=[% duplicateauthid %]&amp;popup=1', 'Duplicate Authority')" class="button">[% duplicateauthvalue %]</a></p>
+                <p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=[% duplicateauthid %]&amp;popup=1', 'Duplicate authority')" class="button">[% duplicateauthvalue %]</a></p>
                 <p>You must either :</p>
                 <ul>
                         <p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onclick="Check(this.form)" accesskey="w" class="button" /> again)</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
index 88c16ec..56ed94f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<Title>Koha -- Authority details</title>
+<title>Koha &rsaquo; Authority details</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
index 41384c5..6b36351 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
@@ -3,7 +3,7 @@
     [% IF ( unknownauthid ) %]
       Unknown authority record
     [% ELSE %]
-      Details for Authority #[% authid %] ([% authtypetext %])
+      Details for authority #[% authid %] ([% authtypetext %])
     [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -72,7 +72,7 @@ function searchauthority() {
     [% IF ( unknownauthid ) %]
       Unknown authority record
     [% ELSE %]
-      Details for Authority #[% authid %] ([% authtypetext %])
+      Details for authority #[% authid %] ([% authtypetext %])
     [% END %]
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
index 6c67de7..c143995 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Cataloging Authority Plugin</title>
+<title>Koha &rsaquo; Cataloging authority plugin</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
 #custom-doc { width:51.46em;*width:50.17em;min-width:675px; margin:auto; text-align:left; } 
@@ -52,7 +52,7 @@ function jumpfull(page)
                 <tr>
                     <th>Summary</th>
                     <th>Used</th>
-                    <th>Get It!</th>
+                    <th>Get it!</th>
                     <th>Other action</th>
                 </tr>
                 <tr>
-- 
1.7.5.4


From oleonard at myacpl.org  Wed Apr  4 16:23:18 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  4 Apr 2012 10:23:18 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Staff client cart)
Message-ID: <1333549398-26639-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in the staff client's cart templates
---
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |   24 ++++++++++----------
 .../prog/en/modules/basket/downloadcart.tt         |    2 +-
 .../prog/en/modules/basket/sendbasket.tt           |    2 +-
 .../prog/en/modules/basket/sendbasketform.tt       |    6 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
index 6041e25..b575fe9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your Cart</title>
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog &rsaquo; Your cart</title>
     [% IF ( print_basket ) %]
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -77,13 +77,13 @@ function placeHold () {
 <div id="doc" class="yui-t7">
 <div class="container">
 [% UNLESS ( print_basket ) %]
-<h1>Your Cart</h1>
+<h1>Your cart</h1>
 
 <div id="toolbar">
 <ul class="toolbar">
 	<li>
 	    <span id="addchild" class="yui-button yui-link-button"><span class="first-child">
-		[% IF ( verbose ) %]<a href="basket.pl" class="brief" onclick="showLess(); return false;">Brief Display</a>[% ELSE %]<a href="basket.pl" class="detail" onclick="showMore(); return false;">More Details</a>[% END %]
+        [% IF ( verbose ) %]<a href="basket.pl" class="brief" onclick="showLess(); return false;">Brief display</a>[% ELSE %]<a href="basket.pl" class="detail" onclick="showMore(); return false;">More details</a>[% END %]
 	    </span></span>
 	</li>
 	<li>
@@ -103,12 +103,12 @@ function placeHold () {
 	</li>
 	<li>
 	    <span id="delete" class="yui-button yui-link-button"><span class="first-child">
-		<a class="empty" href="basket.pl" onclick="delBasket('popup'); return false;">Empty and Close</a>
+        <a class="empty" href="basket.pl" onclick="delBasket('popup'); return false;">Empty and close</a>
 	    </span></span>
 	</li>
 	<li>
 	    <span id="hide" class="yui-button yui-link-button"><span class="first-child">
-		<a class="hide close" href="basket.pl">Hide Window</a>
+        <a class="hide close" href="basket.pl">Hide window</a>
 	    </span></span>
 	</li>
 </ul>
@@ -116,7 +116,7 @@ function placeHold () {
         [% END %]
 
 [% IF ( verbose ) %]
-	[% UNLESS ( print_basket ) %]<p style="padding: 7px 0; border-top : 1px solid #E8E8E8;"><a id="CheckAll" href="#">Select All</a> <a id="CheckNone" href="#">Clear All</a> | <b>Selected items :</b>
+    [% UNLESS ( print_basket ) %]<p style="padding: 7px 0; border-top : 1px solid #E8E8E8;"><a id="CheckAll" href="#">Select all</a> <a id="CheckNone" href="#">Clear all</a> | <b>Selected items :</b>
 
     <a href="#" onclick="delSelRecords(); return false;">Remove</a>
 
@@ -125,7 +125,7 @@ function placeHold () {
 [% END %]
 
 [% IF ( CAN_user_reserveforothers ) %]
-     | <a href="#" onclick="placeHold(); return false;">Place Hold</a>
+     | <a href="#" onclick="placeHold(); return false;">Place hold</a>
 [% END %]
 
 </p>[% END %]
@@ -253,7 +253,7 @@ function placeHold () {
 
         [% IF ( BIBLIO_RESULT.MARCurlS ) %]
         <tr>
-            <th scope="row">url(s)</th>
+            <th scope="row">URL(s)</th>
             <td>
 	   [% FOREACH MARCurl IN BIBLIO_RESULT.MARCurlS %]
 		<p>[% IF ( MARCurl.part ) %][% MARCurl.part %]
@@ -283,8 +283,8 @@ function placeHold () {
 [% UNLESS ( print_basket ) %]
 <p style="border-top : 1px solid #E8E8E8;">
 	<form action="/cgi-bin/koha/basket/basket.pl" method="get" name="bookbag_form" id="bookbag_form">
-    <a id="CheckAll" href="#">Select All</a>
-    <a id="CheckNone" href="#">Clear All</a>
+    <a id="CheckAll" href="#">Select all</a>
+    <a id="CheckNone" href="#">Clear all</a>
     | <b>Selected items :</b>
 <a href="#" onclick="delSelRecords(); return false;">Remove</a>
 
@@ -293,7 +293,7 @@ function placeHold () {
 [% END %]
 
 [% IF ( CAN_user_reserveforothers ) %]
-     | <a href="#" onclick="placeHold(); return false;">Place Hold</a>
+     | <a href="#" onclick="placeHold(); return false;">Place hold</a>
 [% END %]
 
 
@@ -303,7 +303,7 @@ function placeHold () {
 	<thead><tr>
 	    [% UNLESS ( print_basket ) %]<th>&nbsp;</th>[% END %]
 	    <th>Title</th>
-	    <th>Item Type</th>
+        <th>Item type</th>
 	    <th>Location</th>
         </tr></thead>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt
index a58699c..a343bd8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tt
@@ -12,7 +12,7 @@
 	<ol><li>
 	<label for="format">Format:</label>
         <select name="format" id="format">
-	    <option value="">-- Choose Format --</option>
+        <option value="">-- Choose format --</option>
 	    <option value="iso2709">iso2709</option>
 	    <option value="ris">RIS</option>
 	    <option value="bibtex">BibTex</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
index 15ef0a3..ca8f06d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
@@ -1,5 +1,5 @@
 <SUBJECT>
-Your Cart
+Your cart
 <END_SUBJECT>
 
 <HEADER>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
index 69f01d6..9bb433e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
@@ -1,12 +1,12 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Sending Your Cart</title>
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog &rsaquo;  Sending your cart</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body style="padding: 1em;" id="cart_sendbasketform" class="cart">
 <div class="container">[% IF ( email_add ) %]
 
 	[% IF ( SENT ) %]
-		<h3>Message Sent</h3>
+        <h3>Message sent</h3>
 	    <p>The cart was sent to: [% email_add %]</p>
 		<p><a class="focus close" href="#">Close window</a></p>
 	[% END %]
@@ -21,7 +21,7 @@
 <fieldset class="rows"> 
 <legend>Sending your cart</legend>
 <ol>   <li>
-        <label for="email_add">Email Address:</label>
+        <label for="email_add">Email address:</label>
         <input type="text" id="email_add" name="email_add" size="43" class="focus" />
     </li>
     <li>
-- 
1.7.5.4


From oleonard at myacpl.org  Wed Apr  4 17:03:06 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  4 Apr 2012 11:03:06 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_2780_-_Capitalize_string?=
	=?utf-8?q?s_consistently_=28Catalog_pages=29?=
Message-ID: <1333551786-27741-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in the staff client catalog pages
---
 .../prog/en/modules/catalogue/ISBDdetail.tt        |    4 +-
 .../prog/en/modules/catalogue/MARCdetail.tt        |    4 +-
 .../prog/en/modules/catalogue/advsearch.tt         |   32 +++++++++---------
 .../prog/en/modules/catalogue/detail.tt            |   32 +++++++++---------
 .../prog/en/modules/catalogue/detailprint.tt       |   12 +++---
 .../prog/en/modules/catalogue/issuehistory.tt      |    4 +-
 .../prog/en/modules/catalogue/labeledMARCdetail.tt |    6 ++--
 .../prog/en/modules/catalogue/moredetail.tt        |    2 +-
 .../prog/en/modules/catalogue/results.tt           |   36 ++++++++++----------
 .../prog/en/modules/catalogue/showmarc.tt          |    2 +-
 .../prog/en/modules/catalogue/subject.tt           |    6 ++--
 11 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
index 33550ac..9169f93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
@@ -3,7 +3,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    ISBD Details for [% title %]
+    ISBD details for [% title %]
   [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -17,7 +17,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    ISBD Details for <i>[% biblionumber %]</i>
+    ISBD details for <i>[% biblionumber %]</i>
   [% END %]
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
index f9389f2..62ae572 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
@@ -3,7 +3,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    MARC Details for [% bibliotitle %]
+    MARC details for [% bibliotitle %]
   [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -51,7 +51,7 @@ function Changefwk(FwkList) {
 
 [% END %]
 
-    <p><b>With Framework : <select name="Frameworks" id="Frameworks" onchange="Changefwk(this);">
+    <p><b>With framework : <select name="Frameworks" id="Frameworks" onchange="Changefwk(this);">
                             <option value="">Default</option>
                             [% FOREACH frameworkcodeloo IN frameworkcodeloop %]
                             [% IF ( frameworkcodeloo.selected ) %]<option value="[% frameworkcodeloo.value %]" selected="selected">[% frameworkcodeloo.frameworktext %]</option>[% ELSE %]<option value="[% frameworkcodeloo.value %]">[% frameworkcodeloo.frameworktext %]</option>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index 82ba631..2ea2737 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; Advanced Search</title>
+<title>Koha &rsaquo; Catalog &rsaquo; Advanced search</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/JavaScript" language="JavaScript">
 	/**
@@ -22,14 +22,14 @@
 <body id="catalog_advsearch" class="catalog">
 
 [% INCLUDE 'header.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Advanced Search</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Advanced search</div>
 
 <div id="doc" class="yui-t7">
    <div id="bd">
 	
 <form action="search.pl" method="get">
 <div id="advanced-search">
-<h1>Advanced Search</h1>
+<h1>Advanced search</h1>
 
 [% IF ( outer_servers_loop ) %]
 <!-- DATABASES -->
@@ -56,7 +56,7 @@
 
 <!-- BOOLEAN SEARCH OPTIONS -->
     <fieldset id="searchterms">
-    <legend>Search For </legend>
+    <legend>Search for </legend>
     [% FOREACH search_box IN search_boxes_loop %]
         [% IF ( search_boxes_label ) %]<div style="text-indent: 4.5em;">[% ELSE %]<div>[% END %]
 			[% IF ( expanded_options ) %]
@@ -75,7 +75,7 @@
                     <a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a>
 				[% END %]
               [% IF ( search_box.scan_index ) %]
-                <label for="scan">Scan Indexes</label> <input type="checkbox" name="scan" id="scan" value="1" />
+                <label for="scan">Scan indexes</label> <input type="checkbox" name="scan" id="scan" value="1" />
               [% END %]
             [% END %]
 		</div>
@@ -86,7 +86,7 @@
 <!-- SEARCH BUTTONS -->
             <fieldset class="action" id="submit1"><input class="submit" type="submit" accesskey="s" value="Search" />
             [% IF ( expanded_options ) %]
-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer Options]</a>
+            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer options]</a>
             [% ELSE %]
             <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
             [% END %]
@@ -101,10 +101,10 @@
       [% FOREACH advsearchloo IN advancedsearchesloop %]
         <li id="advsearch-tab-[% advsearchloo.advanced_search_type %]">
            <a href="/cgi-bin/koha/opac-search.pl#advsearch-[% advsearchloo.advanced_search_type %]">
-           [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item Type
+           [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
            [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
-           [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving Location
-           [% ELSE %]Something Else
+           [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
+           [% ELSE %]Something else
            [% END %]
            </a>
         </li>
@@ -138,7 +138,7 @@
 <!-- LANGUAGE LIMIT -->
 		<p><label for="language-limit">Language: </label>                                        
 		<select name="limit" id="language-limit">
-		<option value="">No Limit</option>
+        <option value="">No limit</option>
 		[% FOREACH search_languages_loo IN search_languages_loop %]
 		[% IF ( search_languages_loo.selected ) %]
 		<option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]" selected="selected">[% search_languages_loo.language_description %]</option>
@@ -194,13 +194,13 @@
             <option value="l-format:ss" >Cassette recording</option>
             <option value="l-format:vf" >VHS tape / Videocassette</option>
             <option value="l-format:vd" >DVD video / Videodisc</option>
-            <option value="l-format:co" >CD Software</option>
+            <option value="l-format:co" >CD software</option>
             <option value="l-format:cr" >Website</option>
         </select>
         
         <select name="limit" class="subtype">
             <option value="" >Additional content types</option>
-            <option value="ctype:a" >Abstracts/summaries</option>
+            <option value="ctype:a" >Abstracts / Summaries</option>
             <option value="ctype:b" >Bibliographies</option>
             <option value="ctype:c" >Catalogs</option>
             <option value="ctype:d" >Dictionaries</option>
@@ -235,8 +235,8 @@
 </fieldset>
 
 <fieldset id="select-libs">
-        <p><label for="branchloop">Individual Libraries:</label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
-        <option value="">All Libraries</option>
+        <p><label for="branchloop">Individual libraries:</label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
+        <option value="">All libraries</option>
         [% FOREACH branchloo IN branchloop %]
         [% IF ( branchloo.selected ) %]
         <option value="branch:[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
@@ -248,7 +248,7 @@
     <!-- <input type="hidden" name="limit" value="branch: MAIN" /> -->
         [% IF ( searchdomainloop ) %]
     <p>OR</p> <!-- should addjs to grey out group pulldown if a library is selected. -->
-        <p><label for="categoryloop">Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
+        <p><label for="categoryloop">Groups of libraries</label><select name="multibranchlimit" id="categoryloop">
         <option value=""> -- none -- </option>
         [% FOREACH searchdomainloo IN searchdomainloop %]
         <option value="[% searchdomainloo.categorycode %]">[% searchdomainloo.categoryname %]</option>
@@ -272,7 +272,7 @@
 <!-- SEARCH BUTTONS -->
             <fieldset class="action" id="submit2"><input class="submit" type="submit" accesskey="s" value="Search" />
             [% IF ( expanded_options ) %]
-            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer Options]</a>
+            <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer options]</a>
             [% ELSE %]
             <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=1">[More options]</a>
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 46de77e..c92a891 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -129,7 +129,7 @@ function verify_images() {
             [% IF ( author ) %]<p>By <a href="/cgi-bin/koha/catalogue/search.pl?q=au:[% author |url %]">[% author %]</a></p>[% END %]
         <ul>
         [% IF ( MARCAUTHORS ) %]
-            <li><strong>Additional Authors:</strong><ul>
+            <li><strong>Additional authors:</strong><ul>
             [% FOREACH MARCAUTHOR IN MARCAUTHORS %]
                 <li>[% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %]<a title="?[% MARCAUTHOR_SUBFIELDS_LOO.code %] [% MARCAUTHOR_SUBFIELDS_LOO.value |url %]" href="/cgi-bin/koha/catalogue/search.pl?q=[% FOREACH link_loo IN MARCAUTHOR_SUBFIELDS_LOO.link_loop %][% link_loo.operator |url %][% link_loo.limit %]:[% link_loo.link |url %][% END %]">[% MARCAUTHOR_SUBFIELDS_LOO.value %]</a>[% END %]</li>
                 [% END %]
@@ -157,7 +157,7 @@ function verify_images() {
         </li>
 [% IF ( MARCURLS ) %]<li>
     
-	<strong>Online Resources:</strong>
+    <strong>Online resources:</strong>
     <ul>    [% FOREACH MARCurl IN MARCURLS %]
 		<li>[% IF ( MARCurl.part ) %][% MARCurl.part %]
 			<br />[% END %] 
@@ -169,7 +169,7 @@ function verify_images() {
     [% END %]
     
     [% IF ( OpacUrl ) %]
-    	<li><strong>OPAC View:</strong>
+        <li><strong>OPAC view:</strong>
     	<a href="http://[% OpacUrl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]" target="_blank">Open in new window</a>
 		</li>
 	[% END %]
@@ -259,7 +259,7 @@ function verify_images() {
 <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#description">Descriptions</a></li>
 [% IF ( subscriptionsnumber ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#subscriptions">Subscriptions</a></li>[% END %]
 [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#editions">Editions</a></li>[% END %][% END %]
-[% IF ( AmazonSimilarItems ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#related">Related Titles</a></li>[% END %]
+[% IF ( AmazonSimilarItems ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#related">Related titles</a></li>[% END %]
 [% IF ( LocalCoverImages ) %][% IF ( localimages || CAN_user_tools_upload_local_cover_images ) %]<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]#images">Images</a></li>[% END %][% END %]
  </ul>
 
@@ -269,20 +269,20 @@ function verify_images() {
         <table>
             <tr>
                 [% IF ( item_level_itypes ) %]<th>Item type</th>[% END %]
-                <th>Current Location</th>
+                <th>Current location</th>
                 <th>Home Library</th>
                 [% IF ( itemdata_ccode ) %]<th>Collection</th>[% END %]
-                <th>Call Number</th>
+                <th>Call number</th>
                 <th>Status</th>
                 <th>Last seen</th>
                 <th>Barcode</th>
-                [% IF ( volinfo ) %]<th>Publication Details</th>[% END %]
+                [% IF ( volinfo ) %]<th>Publication details</th>[% END %]
                 [% IF ( itemdata_uri ) %]<th>url</th>[% END %]
-                [% IF ( itemdata_copynumber ) %]<th>Copy No.</th>[% END %]
-                [% IF materials %]<th>Materials Specified</th>[% END %]
+                [% IF ( itemdata_copynumber ) %]<th>Copy no.</th>[% END %]
+                [% IF materials %]<th>Materials specified</th>[% END %]
                 [% IF ( itemdata_itemnotes ) %]<th>Public notes</th>[% END %]
-		[% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine Label</th>[% END %]
-		[% IF ( hostrecords ) %]<th>Host Records</th>[% END %]
+        [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]
+        [% IF ( hostrecords ) %]<th>Host records</th>[% END %]
 		[% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]
             </tr>
             [% FOREACH itemloo IN itemloop %]
@@ -406,7 +406,7 @@ function verify_images() {
 		[% END %]
                 [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
 		[% IF ( SpineLabelShowPrintOnBibDetails ) %]
-			<td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print Label</a></td>
+            <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print label</a></td>
 		[% END %]
                 [% IF ( hostrecords ) %]
                       <td>[% IF ( itemloo.hostbiblionumber) %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemloo.hostbiblionumber %]" >[% itemloo.hosttitle %]</a>[% END %]</td>
@@ -417,7 +417,7 @@ function verify_images() {
 			[% END %]</td>
 		[% END %]
                 [% IF ( analyze ) %]
-                        <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% itemloo.biblionumber %]&amp;hostitemnumber=[% itemloo.itemnumber %]">Create Analytics</a></td>
+                        <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% itemloo.biblionumber %]&amp;hostitemnumber=[% itemloo.itemnumber %]">Create analytics</a></td>
                 [% END %]
 
                 </tr>
@@ -500,7 +500,7 @@ function verify_images() {
                                 [% ELSE %]
                                     [% IF ( latestserial.status4 ) %]Missing
                                     [% ELSE %]
-                                        [% IF ( latestserial.status5 ) %]Not Issued
+                                        [% IF ( latestserial.status5 ) %]Not issued
                                         [% END %]
                                     [% END %]
                                 [% END %]
@@ -511,7 +511,7 @@ function verify_images() {
             [% END %]
             </table>
             [% END %]
-			<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]">Subscription Details</a>
+            <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]">Subscription details</a>
     [% END %]
 </div>
 </div>
@@ -571,7 +571,7 @@ function verify_images() {
 <form method="get" action="/cgi-bin/koha/catalogue/export.pl">
 <table>  <tr>
       <th>Save Record</th>   </tr>
-  <tr>     <td> Select Download Format:    <select name="format">
+    <tr><td> Select download format:    <select name="format">
         <option value="mods">MODS (XML)</option>
         <option value="dc">Dublin Core (XML)</option>
         <option value="marcxml">MARCXML</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tt
index ae4f91c..3f4312a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tt
@@ -11,28 +11,28 @@
 [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
 	<table class="list">
 	<caption>[% BIBLIO_RESULT.title |html %] [% BIBLIO_RESULT.subtitle %]</caption>
-	<tr><th>Biblio Record Number: </th><td> [% BIBLIO_RESULT.biblionumber %]	</td></tr>
+    <tr><th>Biblio record number: </th><td> [% BIBLIO_RESULT.biblionumber %]	</td></tr>
 [% IF ( BIBLIO_RESULT.author ) %]<tr><th>Author: </th><td>[% BIBLIO_RESULT.author %]</td></tr>[% END %]
-[% IF ( BIBLIO_RESULT.additional ) %]<tr><th>Additional Author: </th><td>[% BIBLIO_RESULT.additional %]</td></tr>[% END %]
+[% IF ( BIBLIO_RESULT.additional ) %]<tr><th>Additional author: </th><td>[% BIBLIO_RESULT.additional %]</td></tr>[% END %]
 [% IF ( BIBLIO_RESULT.publishercode ) %]<tr><th>Publisher: </th><td>[% BIBLIO_RESULT.publishercode %]</td></tr>[% END %]
-<tr><th>Publication Details: </th><td>			[% IF ( BIBLIO_RESULT.publicationyear ) %][% BIBLIO_RESULT.publicationyear %][% END %]
+<tr><th>Publication details: </th><td>			[% IF ( BIBLIO_RESULT.publicationyear ) %][% BIBLIO_RESULT.publicationyear %][% END %]
 			[% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %]
 			[% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %]</td></tr>
 			[% IF ( BIBLIO_RESULT.collection ) %]<tr><th>Collection:</th><td> [% BIBLIO_RESULT.seriestitle %]</td></tr>[% END %]
 			[% IF ( BIBLIO_RESULT.subject ) %]<tr><th>Subject: </th><td>[% BIBLIO_RESULT.subject %]</td></tr>[% END %]
-			[% IF ( BIBLIO_RESULT.copyrightdate ) %]<tr><th>Copyright Date: </th><td> [% BIBLIO_RESULT.copyrightdate %]</td></tr>[% END %]
+            [% IF ( BIBLIO_RESULT.copyrightdate ) %]<tr><th>Copyright date: </th><td> [% BIBLIO_RESULT.copyrightdate %]</td></tr>[% END %]
 			[% IF ( BIBLIO_RESULT.notes ) %]<tr><th>Notes: </th><td>[% BIBLIO_RESULT.notes %]</td></tr>[% END %]
 			[% IF ( BIBLIO_RESULT.unititle ) %]<tr><th>Unititle: </th><td>[% BIBLIO_RESULT.unititle %]</td></tr>[% END %]
 			[% IF ( BIBLIO_RESULT.dewey ) %]<tr><th>Dewey: </th><td>[% BIBLIO_RESULT.dewey %]</td></tr>[% END %]
 			[% IF ( BIBLIO_RESULT.classification ) %]<tr><th>Classification: </th><td> [% BIBLIO_RESULT.classification %]</td></tr>[% END %]
 			[% IF ( BIBLIO_RESULT.lccn ) %]<tr><th>LCCN: </th><td>[% BIBLIO_RESULT.lccn %]</td></tr>[% END %]
-			[% IF ( BIBLIO_RESULT.url ) %]<tr><th>url: </th><td><a href="[% BIBLIO_RESULT.url %]">[% BIBLIO_RESULT.url %]</a></td></tr>[% END %]
+            [% IF ( BIBLIO_RESULT.url ) %]<tr><th>URL: </th><td><a href="[% BIBLIO_RESULT.url %]">[% BIBLIO_RESULT.url %]</a></td></tr>[% END %]
 			[% IF ( BIBLIO_RESULT.ISBN ) %]<tr><th>ISBN: </th><td>[% BIBLIO_RESULT.ISBN %]</td></tr>[% END %]
 	</table>
 [% END %]
 
 <table>
-	<tr><th>Item Type</th><th>Call Number</th><th>Location</th><th>Date Due</th><th>Last Seen</th><th>Barcode</th></tr>
+    <tr><th>Item type</th><th>Call number</th><th>Location</th><th>Date due</th><th>Last seen</th><th>Barcode</th></tr>
 	[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
 		<tr>
 			<td>[% ITEM_RESULT.description %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
index 14d823c..bb963a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; Checkout History for [% title |html %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo; Checkout history for [% title |html %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="catalog_issuehistory" class="catalog">
@@ -7,7 +7,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Checkout History for <i>[% title |html %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Checkout history for <i>[% title |html %]</i></div>
 
 <div id="doc3" class="yui-t2">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
index 30b8405..5a59f61 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
@@ -4,7 +4,7 @@
   [% IF ( unknownbiblionumber ) %]
     Unknown record
   [% ELSE %]
-    Labeled MARC Details for [% bibliotitle %]
+    Labeled MARC details for [% bibliotitle %]
   [% END %]
 </title>
 
@@ -31,7 +31,7 @@
 		[% IF ( unknownbiblionumber ) %]
 		  Unknown record
 		[% ELSE %]
-		  MARC Details for <i>[% bibliotitle %]</i>
+            MARC details for <i>[% bibliotitle %]</i>
 		[% END %]
 	</div>
 
@@ -50,7 +50,7 @@
 					[% UNLESS ( popup ) %]
 						<h1>Labeled MARC biblio : [% biblionumber %]  ( [% bibliotitle %] )</h1>
 					[% END %]
-					<p><b>With Framework :[% framework %]</b></p>
+                    <p><b>With framework :[% framework %]</b></p>
 					<!-- div id="bibliotabs" class="toptabs numbered" -->
 					<div>
 						<table class="labeledmarc-table">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 5b9547f..dce6872 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -8,7 +8,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Item Details for <i>[% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield|html %][% END %]</i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Item details for <i>[% title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield|html %][% END %]</i></div>
 
 <div id="doc3" class="yui-t2">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 0316719..5af106a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
+<title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -65,20 +65,20 @@ $(".addtocart").show();
         var param1 = "<label for=\"addto\">"+_("Add to:")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
         [% IF ( intranetbookbag ) %]     param1 += "<option value=\"addtocart\">"+_("Cart")+"<\/option>"; [% END %]
         [% IF ( virtualshelves ) %][% IF ( addbarshelves ) %]
-        param1 += "<optgroup label=\""+_("Your Lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
+        param1 += "<optgroup label=\""+_("Your lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
         param1 += "<option id=\"s[% addbarshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addbarshelvesloo.shelfname |html %]<\/option>";[% END %]
         param1 += "<\/optgroup>";[% END %]
-        [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public Lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %]
+        [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %]
         param1 += "<\/optgroup>";[% END %]
         [% IF ( ( addbarshelvesloop && addbarshelvesloop.size>9 ) || (addpubshelvesloop && addpubshelvesloop.size>9 )) %]
-            param1 += "<option value=\"morelists\">[ "+_("More Lists")+" ]<\/option>";
+            param1 += "<option value=\"morelists\">[ "+_("More lists")+" ]<\/option>";
         [% END %]
-        param1 +="<option value=\"newlist\">"+_("[ New List ]")+"<\/option>"
+        param1 +="<option value=\"newlist\">"+_("[ New list ]")+"<\/option>"
         [% END %]
         param1 += "<\/select> <input id=\"cartsubmit\" type=\"submit\" class=\"submit\" value=\""+_("Save")+"\" />";
  $('#sortsubmit').hide();
-        $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear All")+"<\/a>");
-        $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select All")+"<\/a>");
+        $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>");
+        $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>");
         $("span.addto").html(param1);
         $("#addto").change(function(){
                 cartList();
@@ -283,9 +283,9 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                 [% total %] result(s) found [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc |html %]'</span>[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s): <span style="font-weight: bold;">'[% limit_desc %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %].<br />&nbsp;
             </h3>
             <div id="selection_ops" class="cartlist" style="display:none">
-                <a href="#" onclick="selectAll(); return false;">Select All</a>
+                <a href="#" onclick="selectAll(); return false;">Select all</a>
                 |
-                <a href="#" onclick="clearAll(); return false;">Clear All</a>
+                <a href="#" onclick="clearAll(); return false;">Clear all</a>
                 |
                 <a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a>
                 <a href="#" class="highlight_toggle" id="highlight_toggle_on">Highlight</a>
@@ -328,7 +328,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
     <!-- Search Results Table -->
     [% IF ( total ) %]
         [% IF ( scan ) %]
-            <h1>Scan Index:</h1>
+            <h1>Scan index:</h1>
             <form action="/cgi-bin/koha/catalogue/search.pl" method="get">
             <table>
                 <tr>
@@ -340,19 +340,19 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                     <td>
                         <label for="scan-index">Indexed in:</label>
                         <select name="idx" id="scan-index">
-                            <option value="">Any Word</option>
-                            [% IF ( ms_anycommaphr) %]<option selected="selected" value="any,phr">Any Phrase</option>
-                            [% ELSE %]<option value="any,phr">Any Phrase</option>[% END %]
+                            <option value="">Any word</option>
+                            [% IF ( ms_anycommaphr) %]<option selected="selected" value="any,phr">Any phrase</option>
+                            [% ELSE %]<option value="any,phr">Any phrase</option>[% END %]
                             [% IF ( ms_ti ) %]<option selected="selected" value="ti">Title</option>
                             [% ELSE %]<option value="ti">Title</option>[% END %]
-                            [% IF ( ms_ticommaphr ) %]<option selected="selected" value="ti,phr">Title Phrase</option>
-                            [% ELSE %]<option value="ti,phr">Title Phrase</option>[% END %]
+                            [% IF ( ms_ticommaphr ) %]<option selected="selected" value="ti,phr">Title phrase</option>
+                            [% ELSE %]<option value="ti,phr">Title phrase</option>[% END %]
                             [% IF ( ms_aucommaphr ) %]<option selected="selected" value="au,phr">Author</option>
                             [% ELSE %]<option value"au,phr">Author</option>[% END %]
                             [% IF ( ms_su ) %]<option selected="selected" value="su">Subject</option>
                             [% ELSE %]<option value="su">Subject</option>[% END %]
-                            [% IF ( ms_sucommaphr ) %]<option selected="selected" value="su,phr">Subject Phrase</option>
-                            [% ELSE %]<option value="su,phr">Subject Phrase</option>[% END %]
+                            [% IF ( ms_sucommaphr ) %]<option selected="selected" value="su,phr">Subject phrase</option>
+                            [% ELSE %]<option value="su,phr">Subject phrase</option>[% END %]
                             [% IF ( ms_se ) %]<option selected="selected" value="se">Series</option>
                             [% ELSE %]<option value="su">Series</option>[% END %]
                             [% IF ( ms_pb ) %]<option selected="selected" value="pb">Publisher</option>
@@ -414,7 +414,7 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                         [% IF ( facets_loo.expandable ) %]
                             <li class="showmore">
                                 <a href="/cgi-bin/koha/catalogue/search.pl?q=[% facets_loo.searchdesc %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">
-                                    Show More
+                                    Show more
                                 </a>
                             </li>
                         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt
index a295b29..05467e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showmarc.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha -- Cataloging: MARC Import</title>
+<title>Koha &rsaquo; Cataloging &rsaquo; MARC import</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="catalog_showmarc" class="catalog">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt
index 0bf84e5..a6b23ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Catalog &rsaquo; Subject Search Results</title>
+<title>Koha &rsaquo; Catalog &rsaquo; Subject search results</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="catalog_subject" class="catalog">
@@ -7,7 +7,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Subject Search Results</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Subject search results</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -33,7 +33,7 @@
 	</tr>
 [% END %]
 </table>
-<p><a  class="button" href="search.pl?[% FOREACH FORMINPUT IN FORMINPUTS %][% FORMINPUT.line |url %]&amp;[% END %]startfrom=[% prevstartfrom %]">Previous Records</a> <a class="button" href="search.pl?[% FOREACH FORMINPUT IN FORMINPUTS %][% FORMINPUT.line %]&amp;[% END %]startfrom=[% nextstartfrom %]">Next Records</a></p>
+<p><a  class="button" href="search.pl?[% FOREACH FORMINPUT IN FORMINPUTS %][% FORMINPUT.line |url %]&amp;[% END %]startfrom=[% prevstartfrom %]">Previous records</a> <a class="button" href="search.pl?[% FOREACH FORMINPUT IN FORMINPUTS %][% FORMINPUT.line %]&amp;[% END %]startfrom=[% nextstartfrom %]">Next records</a></p>
 
 </div>
 
-- 
1.7.5.4


From oleonard at myacpl.org  Wed Apr  4 18:51:39 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  4 Apr 2012 12:51:39 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_2780_-_Capitalize_string?=
	=?utf-8?q?s_consistently_=28Cataloging_plugins=29?=
Message-ID: <1333558299-29731-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Cataloging plugins. Also
correcting some instances of invalid HTML.
---
 .../cataloguing/value_builder/labs_theses.tt       |    6 +-
 .../en/modules/cataloguing/value_builder/macles.tt |    2 +-
 .../cataloguing/value_builder/marc21_field_006.tt  |    2 +-
 .../cataloguing/value_builder/marc21_field_007.tt  |   42 +++---
 .../value_builder/marc21_field_008_authorities.tt  |   16 +-
 .../cataloguing/value_builder/marc21_field_CF.xsd  |    2 +-
 .../cataloguing/value_builder/unimarc_field_100.tt |   30 ++--
 .../cataloguing/value_builder/unimarc_field_105.tt |    4 +-
 .../cataloguing/value_builder/unimarc_field_106.tt |    6 +-
 .../cataloguing/value_builder/unimarc_field_110.tt |   24 ++--
 .../value_builder/unimarc_field_115a.tt            |    4 +-
 .../value_builder/unimarc_field_115b.tt            |    4 +-
 .../cataloguing/value_builder/unimarc_field_116.tt |   18 ++--
 .../cataloguing/value_builder/unimarc_field_117.tt |    6 +-
 .../cataloguing/value_builder/unimarc_field_120.tt |   55 +++-----
 .../value_builder/unimarc_field_121a.tt            |    4 +-
 .../value_builder/unimarc_field_121b.tt            |    8 +-
 .../cataloguing/value_builder/unimarc_field_122.tt |    4 +-
 .../value_builder/unimarc_field_123a.tt            |    6 +-
 .../value_builder/unimarc_field_123d.tt            |    4 +-
 .../value_builder/unimarc_field_123e.tt            |    4 +-
 .../value_builder/unimarc_field_123f.tt            |    4 +-
 .../value_builder/unimarc_field_123g.tt            |    4 +-
 .../value_builder/unimarc_field_124a.tt            |    6 +-
 .../value_builder/unimarc_field_124b.tt            |    6 +-
 .../value_builder/unimarc_field_124c.tt            |    6 +-
 .../value_builder/unimarc_field_124d.tt            |    6 +-
 .../value_builder/unimarc_field_124e.tt            |    6 +-
 .../value_builder/unimarc_field_124f.tt            |    6 +-
 .../value_builder/unimarc_field_124g.tt            |   14 +-
 .../value_builder/unimarc_field_125a.tt            |    8 +-
 .../value_builder/unimarc_field_125b.tt            |    6 +-
 .../value_builder/unimarc_field_126a.tt            |    4 +-
 .../value_builder/unimarc_field_126b.tt            |    4 +-
 .../cataloguing/value_builder/unimarc_field_127.tt |    4 +-
 .../value_builder/unimarc_field_128a.tt            |    6 +-
 .../value_builder/unimarc_field_128b.tt            |    4 +-
 .../value_builder/unimarc_field_128c.tt            |    4 +-
 .../cataloguing/value_builder/unimarc_field_130.tt |    6 +-
 .../value_builder/unimarc_field_135a.tt            |    4 +-
 .../cataloguing/value_builder/unimarc_field_140.tt |   30 ++--
 .../cataloguing/value_builder/unimarc_field_141.tt |  142 ++++++++++----------
 .../value_builder/unimarc_field_210c.tt            |    6 +-
 .../value_builder/unimarc_field_210c_bis.tt        |    2 +-
 .../value_builder/unimarc_field_225a.tt            |    4 +-
 .../cataloguing/value_builder/unimarc_field_4XX.tt |   12 +-
 .../value_builder/unimarc_field_686a.tt            |    8 +-
 .../value_builder/unimarc_field_700-4.tt           |    4 +-
 .../cataloguing/value_builder/unimarc_leader.tt    |    4 +-
 49 files changed, 277 insertions(+), 294 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tt
index 14609cc..2162747 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>KOHA:_Labs Thesis Selection plugin</title>
+<title>Koha &rsaquo; Labs thesis selection plugin</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -31,7 +31,7 @@ a.catalogue:hover {
 
 <body id="cat_labs_theses" class="cat" style="padding:1em;">
 <div id="mainbloc">
-	<h1>Laboratory Search</h1>
+    <h1>Laboratory search</h1>
 	
 	<form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl">
 		<div class="bloc25">
@@ -51,7 +51,7 @@ a.catalogue:hover {
 
 [% IF ( resultlist ) %]
 	<div class="bloc25">
-	<h2>Laboratory Search results</h2>
+    <h2>Laboratory search results</h2>
 		<div id="resultnumber">
 			<p class="resultcount">
 			[% IF ( total ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt
index 0afed38..9b7de75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt
@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Gestion_des_index_MACLES</title>
+<title>Gestion des index MACLES</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
index 798e7da..2824577 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt
@@ -48,7 +48,7 @@
 <input type="hidden" id="result" name="result" value="[% result %]" />
 <table id="table_material_types">
     <tr id="tr_material_types">
-        <td><label for="material_type" title="Select a type of material to specify the variable values">Type of Material</label></td>
+        <td><label for="material_type" title="Select a type of material to specify the variable values">Type of material</label></td>
         <td>
             <select name="material_type" id="material_type" title="Select a type of material to specify the variable values" onchange="changeTypeofMaterial(this.form)">
                 <option value="">Select a type of material</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
index 8762b2e..6237788 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
@@ -6,7 +6,7 @@
 <h3>007 Physical description fixed field--General information</h3>
 <form id="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_007.pl" />
-<p><label for="MatTypeList">Material Type: </label>
+<p><label for="MatTypeList">Material type: </label>
       <select name="MatTypeList" id="MatTypeList" onchange="RedrawChoices(this.options[selectedIndex].value);">
         [% IF ( f0a ) %]
 	  <option value="a" selected="selected">Map</option>
@@ -14,9 +14,9 @@
 	  <option value="a">Map</option>
         [% END %]
         [% IF ( f0c ) %]
-          <option value="c" selected="selected">Electronic Resource</option>
+          <option value="c" selected="selected">Electronic resource</option>
         [% ELSE %]
-          <option value="c">Electronic Resource</option>
+          <option value="c">Electronic resource</option>
         [% END %]
         [% IF ( f0d ) %]
           <option value="d" selected="selected">Globe</option>
@@ -24,14 +24,14 @@
           <option value="d">Globe</option>
         [% END %]
         [% IF ( f0f ) %]
-          <option value="f" selected="selected">Tactile Material</option>
+          <option value="f" selected="selected">Tactile material</option>
         [% ELSE %]
-          <option value="f">Tactile Material</option>
+          <option value="f">Tactile material</option>
         [% END %]
         [% IF ( f0g ) %]
-          <option value="g" selected="selected">Projected Graphic</option>
+          <option value="g" selected="selected">Projected graphic</option>
         [% ELSE %]
-          <option value="g">Projected Graphic</option>
+          <option value="g">Projected graphic</option>
         [% END %]
         [% IF ( f0h ) %]
           <option value="h" selected="selected">Microform</option>
@@ -39,14 +39,14 @@
           <option value="h">Microform</option>
         [% END %]
         [% IF ( f0k ) %]
-          <option value="k" selected="selected">Nonprojected Graphic</option>
+          <option value="k" selected="selected">Nonprojected graphic</option>
         [% ELSE %]
-          <option value="k">Nonprojected Graphic</option>
+          <option value="k">Nonprojected graphic</option>
         [% END %]
         [% IF ( f0m ) %]
-          <option value="m" selected="selected">Motion Picture</option>
+          <option value="m" selected="selected">Motion picture</option>
         [% ELSE %]
-          <option value="m">Motion Picture</option>
+          <option value="m">Motion picture</option>
         [% END %]
         [% IF ( f0o ) %]
           <option value="o" selected="selected">Kit</option>
@@ -54,19 +54,19 @@
           <option value="o">Kit</option>
         [% END %]
         [% IF ( f0q ) %]
-          <option value="q" selected="selected">Notated Music</option>
+          <option value="q" selected="selected">Notated music</option>
         [% ELSE %]
-          <option value="q">Notated Music</option>
+          <option value="q">Notated music</option>
         [% END %]
         [% IF ( f0r ) %]
-          <option value="r" selected="selected">Remote-sensing Image</option>
+          <option value="r" selected="selected">Remote-sensing image</option>
         [% ELSE %]
-          <option value="r">Remote-sensing Image</option>
+          <option value="r">Remote-sensing image</option>
         [% END %]
         [% IF ( f0s ) %]
-          <option value="s" selected="selected">Sound Recording</option>
+          <option value="s" selected="selected">Sound recording</option>
         [% ELSE %]
-          <option value="s">Sound Recording</option>
+          <option value="s">Sound recording</option>
         [% END %]
         [% IF ( f0t ) %]
           <option value="t" selected="selected">Text</option>
@@ -295,7 +295,7 @@ function RedrawChoices(typ){
                           </tr> \
  	                  <tr> \
                            <td><label for="f4">' +
-                               _("04 Physical Medium") +
+                               _("04 Physical medium") +
                            '</label></td> \
                            <td> \
                             <select name="f4" id="f4" size="1"> \
@@ -457,7 +457,7 @@ function RedrawChoices(typ){
                           </tr> \
  	                  <tr> \
                            <td><label for="f5">' +
-                               _("05 Type of Reproduction") +
+                               _("05 Type of reproduction") +
                            '</label></td> \
                            <td> \
                             <select name="f5" id="f5" size="1"> \
@@ -644,7 +644,7 @@ function RedrawChoices(typ){
                                _("00 Category of material") +
                            '</td> \
                            <td>' +
-                               _("c- Electronic Resource") +
+                               _("c- Electronic resource") +
                            '</td> \
 	                  </tr> \
 	                  <tr> \
@@ -1688,7 +1688,7 @@ function RedrawChoices(typ){
                                _("00 Category of material") +
                            '</td> \
                            <td>' +
-                               _("f- Tactile Material") +
+                               _("f- Tactile material") +
                            '</td> \
                           </tr> \
  	                  <tr> \
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tt
index e3c9447..8700457 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tt
@@ -218,7 +218,7 @@
         <td>
             <select name="f11" id="f11" size="1">
             [% IF ( f11a ) %]
-                <option value="a" selected="selected">a- Library of Congress Subject Headings</option>
+                <option value="a" selected="selected">a- Library of Congress subject headings</option>
             [% ELSE %]
                 <option value="a">a- Library of Congress Subject Headings</option>
             [% END %]
@@ -228,9 +228,9 @@
                 <option value="b">b- LC subject headings for children's literature</option>
             [% END %]
             [% IF ( f11c ) %]
-                <option value="c" selected="selected">c- Medical Subject Headings</option>
+                <option value="c" selected="selected">c- Medical subject headings</option>
             [% ELSE %]
-                <option value="c">c- Medical Subject Headings</option>
+                <option value="c">c- Medical subject headings</option>
             [% END %]
             [% IF ( f11d ) %]
                 <option value="d" selected="selected">d- National Agricultural Library subject authority file</option>
@@ -238,9 +238,9 @@
                 <option value="d">d- National Agricultural Library subject authority file</option>
             [% END %]
             [% IF ( f11k ) %]
-                <option value="k" selected="selected">k- Canadian Subject Headings</option>
+                <option value="k" selected="selected">k- Canadian subject headings</option>
             [% ELSE %]
-                <option value="k">k- Canadian Subject Headings</option>
+                <option value="k">k- Canadian subject headings</option>
             [% END %]
             [% IF ( f11n ) %]
                 <option value="n" selected="selected">n- Not applicable</option>
@@ -248,12 +248,12 @@
                 <option value="n">n- Not applicable</option>
             [% END %]
             [% IF ( f11r ) %]
-                <option value="r" selected="selected">r- Art and Architecture Thesaurus</option>
+                <option value="r" selected="selected">r- Art and architecture thesaurus</option>
             [% ELSE %]
-                <option value="r">r- Art and Architecture Thesaurus</option>
+                <option value="r">r- Art and architecture thesaurus</option>
             [% END %]
             [% IF ( f11s ) %]
-                <option value="s" selected="selected">s- Sears List of Subject Headings</option>
+                <option value="s" selected="selected">s- Sears list of subject headings</option>
             [% ELSE %]
                 <option value="s">s- Sears List of Subject Headings</option>
             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_CF.xsd b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_CF.xsd
index 7b0b27b..1048eb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_CF.xsd
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_CF.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <xs:schema xmlns="http://koha-community.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://koha-community.org" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
   <xs:annotation>
-    <xs:documentation>Control Field Plugin Type of Materials schema</xs:documentation>
+    <xs:documentation>Control field plugin type of materials schema</xs:documentation>
   </xs:annotation>
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
index 878d7bb..34f0de6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 100 builder</title>
+<title>UNIMARC field 100 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_100" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 100 builder</h3>
+<h3>UNIMARC field 100 builder</h3>
 <form name="f_pop" action="">
 <table>
     <tr>
@@ -11,7 +11,7 @@
         <td><input type="text" name="f1" id="f1" maxlength="8" size="9" value="[% f1 %]" /></td>
     </tr>
     <tr>
-        <td><label for="f2">Type of Publication Date: Publication Dates 1 and 2</label></td>
+        <td><label for="f2">Type of publication date: Publication dates 1 and 2</label></td>
         <td>
             <select name="f2" id="f2" size="1">
             [% IF ( f2space ) %]
@@ -91,7 +91,7 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td><label for="f3">Publication Date 1</label></td>
+        <td><label for="f3">Publication date 1</label></td>
         <td><input type="text" name="f3" id="f3" maxlength="4" size="5" value="[% f3 %]" /></td>
     </tr>
     <tr>
@@ -99,7 +99,7 @@ year</option>
     <td><input type="text" name="f4" id="f4" maxlength="4" size="5" value="[% f4 %]" /></td>
     </tr>
     <tr>
-        <td><label for="f5">Target Audience Code</label></td>
+        <td><label for="f5">Target audience code</label></td>
         <td>
             <select name="f5" id="f5" size="1">
             [% IF ( f5pipe ) %]
@@ -159,7 +159,7 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td><label for="f6">Target Audience Code 2</label></td>
+        <td><label for="f6">Target audience code 2</label></td>
         <td>
             <select name="f6" id="f6" size="1">
             
@@ -219,7 +219,7 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td><label for="f7">Target Audience Code 3</label></td>
+        <td><label for="f7">Target audience code 3</label></td>
         <td>
             <select name="f7" id="f7" size="1">
             [% IF ( f7pipe ) %]
@@ -279,7 +279,7 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td><label for="f8">Government Publication</label></td>
+        <td><label for="f8">Government publication</label></td>
         <td>
             <select name="f8" id="f8" size="1">
             
@@ -361,7 +361,7 @@ level)</option>
     </tr>
 
     <tr>
-        <td><label for="f9">Modified Record Code</label></td>
+        <td><label for="f9">Modified record code</label></td>
         <td>
             <select name="f9" id="f9" size="1">
             
@@ -381,12 +381,12 @@ level)</option>
 
 
     <tr>
-    <td><label for="f10">Language of Cataloguing (Mandatory)</label></td>
+    <td><label for="f10">Language of cataloguing (mandatory)</label></td>
     <td><input type="text" name="f10" id="f10" maxlength="3" size="4" value="[% f10 %]" /></td>
     </tr>
 
     <tr>
-        <td><label for="f11">Transliteration Code</label></td>
+        <td><label for="f11">Transliteration code</label></td>
         <td>
             <select name="f11" id="f11" size="1">
             
@@ -415,7 +415,7 @@ level)</option>
         </td>
     </tr>
     <tr>
-    <td><label for="f12">Character Sets (Mandatory) 1</label></td>
+    <td><label for="f12">Character sets (mandatory) 1</label></td>
         <td>
             <select name="f12" id="f12" size="1">
             
@@ -490,7 +490,7 @@ languages and obsolete typography)
 
     </tr>
     <tr>
-    <td><label for="f13">Character Sets (Mandatory) 2</label></td>
+    <td><label for="f13">Character Sets (mandatory) 2</label></td>
         <td>
             <select name="f13" id="f13" size="1">
             
@@ -568,14 +568,14 @@ languages and obsolete typography)</option>
     </tr>
 
     <tr>
-        <td><label for="f14">Additional Character Sets</label></td>
+        <td><label for="f14">Additional character sets</label></td>
         <td>
             <input type="text" name="f14" id="f14" maxlength="4" size="5" value="[% f14 %]" />
         </td>
     </tr>
 
     <tr>
-    <td><label for="f15">Script of Title</label></td>
+    <td><label for="f15">Script of title</label></td>
     <td>
     <select name="f15" id="f15" size="1">
             [% IF ( f15dblspace ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
index 2806de1..d6b163c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 105 builder</title>
+<title>UNIMARC field 105 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_105" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 105 builder</h3>
+<h3>UNIMARC field 105 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tt
index b62b0ad..889d389 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 106 builder</title>
+<title>UNIMARC field 106 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_106" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 106 builder</h3>
+<h3>UNIMARC field 106 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Form of item: Coded Data: Medium Designator (Not repeatable)</label></td>
+        <td><label for="f1">Form of item: Coded data: Medium designator (not repeatable)</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
             
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
index c729cd4..67682ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 110 builder</title>
+<title>UNIMARC field 110 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_110" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 110 builder</h3>
+<h3>UNIMARC field 110 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
@@ -208,7 +208,7 @@
 				<option value="a" selected="selected">bibliography</option>
 			[% ELSE %]
 				<option value="a">bibliography</option>
-	
+
 			[% END %]
 
 			[% IF ( f4b ) %]
@@ -444,7 +444,7 @@
                         [% ELSE %]
                             <option value="|">|- Filling character</option>
                         [% END %]
-            
+
 			[% IF ( f8a ) %]
 				<option value="a" selected="selected">each issue contains an index to its own contents - loose</option>
 			[% ELSE %]
@@ -499,7 +499,7 @@
 			[% ELSE %]
 				<option value="h">published separately free - sent automatically</option>
 			[% END %]
-				
+
 
 			[% IF ( f8i ) %]
 				<option value="i" selected="selected">published separately - free upon request</option>
@@ -513,49 +513,49 @@
 			[% ELSE %]
 				<option value="j">   published separately - bound from publisher free - sent automatically</option>
 			[% END %]
-				
+
 
 			[% IF ( f8k ) %]
 				<option value="k" selected="selected">    published separately-bound from publisher - free upon request</option>
 			[% ELSE %]
 				<option value="k">    published separately-bound from publisher - free upon request</option>
 			[% END %]
-				
+
 
 			[% IF ( f8l ) %]
 				<option value="l" selected="selected">   published separately-bound from publisher - purchase uponrequest</option>
 			[% ELSE %]
 				<option value="l">   published separately-bound from publisher - purchase uponrequest</option>
 			[% END %]
-				
+
 
 			[% IF ( f8m ) %]
 				<option value="m" selected="selected">    this continuing resource is a supplement or subseries indexed in its parent continuing resource</option>
 			[% ELSE %]
 				<option value="m">    this continuing resource is a supplement or subseries indexed in its parent continuing resource</option>
 			[% END %]
-				
+
 
 			[% IF ( f8u ) %]
 				<option value="u" selected="selected">unknown at time of record creation</option>
 			[% ELSE %]
 				<option value="u">unknown at time of record creation</option>
 			[% END %]
-				
+
 
 			[% IF ( f8x ) %]
 				<option value="x" selected="selected">not applicable</option>
 			[% ELSE %]
 				<option value="x">not applicable</option>
 			[% END %]
-				
+
 
 			[% IF ( f8y ) %]
 				<option value="y" selected="selected">index is not available</option>
 			[% ELSE %]
 				<option value="y">index is not available</option>
 			[% END %]
-				
+
 
 			[% IF ( f8z ) %]
 				<option value="z" selected="selected">other</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
index 5d96588..f59d96a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 115a builder</title>
+<title>UNIMARC field 115a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_115a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 115a builder</h3>
+<h3>UNIMARC field 115a builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tt
index a05004f..64698d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 115b builder</title>
+<title>UNIMARC field 115b builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_115b" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 115b builder</h3>
+<h3>UNIMARC field 115b builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
index fcee6ea..0adcf6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 116 builder</title>
+<title>UNIMARC field 116 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_116" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 116 builder</h3>
+<h3>UNIMARC field 116 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
@@ -284,7 +284,7 @@
 	</tr>
 
 	<tr>
-		<td><label for="f5">Techniques (Drawings, Paintings) 1</label></td>
+        <td><label for="f5">Techniques (drawings, paintings) 1</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
 			[% IF ( f5dblpipe ) %]
@@ -481,7 +481,7 @@
 		</td>
         </tr>
 	<tr>
-		<td><label for="f6">Techniques (Drawings, Paintings) 2</label></td>
+        <td><label for="f6">Techniques (drawings, paintings) 2</label></td>
 		<td>
 			<select name="f6" id="f6" size="1">
 			[% IF ( f6dblpipe ) %]
@@ -682,7 +682,7 @@
 		</td>
         </tr>
 	<tr>
-		<td><label for="f7">Techniques (Drawings, Paintings) 3</label></td>
+        <td><label for="f7">Techniques (drawings, paintings) 3</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
 			[% IF ( f7dblpipe ) %]
@@ -886,7 +886,7 @@
         </tr>
 
 	<tr>
-		<td><label for="f8">Technique (Prints) 1</label></td>
+        <td><label for="f8">Technique (prints) 1</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
 			[% IF ( f8dblpipe ) %]
@@ -1079,7 +1079,7 @@
 
         </tr>
 	<tr>
-		<td><label for="f9">Technique (Prints) 2</label></td>
+        <td><label for="f9">Technique (prints) 2</label></td>
 		<td>
 			<select name="f9" id="f9" size="1">
 			[% IF ( f9dblpipe ) %]
@@ -1275,7 +1275,7 @@
 		</td>
         </tr>
 	<tr>
-		<td><label for="f10">Technique (Prints) 3</label></td>
+        <td><label for="f10">Technique (prints) 3</label></td>
 		<td>
 			<select name="f10" id="f10" size="1">
 			[% IF ( f10dblpipe ) %]
@@ -1469,7 +1469,7 @@
         </tr>
 
 	<tr>
-		<td><label for="f11">Functional Designation</label></td>
+        <td><label for="f11">Functional designation</label></td>
 		<td>
 			<select name="f11" id="f11" size="1">
 			[% IF ( f11dblpipe ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
index 71e4adb..6f32924 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 117 builder</title>
+<title>UNIMARC field 117 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_117" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 117 builder</h3>
+<h3>UNIMARC field 117 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Specific Material Designation</label></td>
+        <td><label for="f1">Specific material designation</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1dblpipe ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
index 48a46df..cf9eca3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 120 builder</title>
+<title>UNIMARC field 120 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_120" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 120 builder</h3>
+<h3>UNIMARC field 120 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
@@ -137,8 +137,7 @@
 				<option value="x">not applicable</option>
 			[% END %]
 			[% IF ( f4z ) %]
-				<option value="z"
-				SELECTED>other methods of relief representation</option>
+                <option value="z" selected="selected">other methods of relief representation</option>
 			[% ELSE %]
 				<option value="z">other methods of relief representation</option>
 			[% END %]
@@ -214,8 +213,7 @@
 				<option value="x">not applicable</option>
 			[% END %]
 			[% IF ( f5z ) %]
-				<option value="z"
-				SELECTED>other methods of relief representation</option>
+                <option value="z" selected="selected">other methods of relief representation</option>
 			[% ELSE %]
 				<option value="z">other methods of relief representation</option>
 			[% END %]
@@ -293,8 +291,7 @@
 				<option value="x">not applicable</option>
 			[% END %]
 			[% IF ( f6z ) %]
-				<option value="z"
-				SELECTED>other methods of relief representation</option>
+                <option value="z" selected="selected">other methods of relief representation</option>
 			[% ELSE %]
 				<option value="z">other methods of relief representation</option>
 			[% END %]
@@ -371,8 +368,7 @@
 				<option value="x">not applicable</option>
 			[% END %]
 			[% IF ( f7z ) %]
-				<option value="z"
-				SELECTED>other methods of relief representation</option>
+                <option value="z" selected="selected">other methods of relief representation</option>
 			[% ELSE %]
 				<option value="z">other methods of relief representation</option>
 			[% END %]
@@ -434,8 +430,7 @@
 				<option value="ba">Gall</option>
 			[% END %]
 			[% IF ( f8bb ) %]
-				<option value="bb"
-				SELECTED>Goode's homolographic</option>
+                <option value="bb" selected="selected">Goode's homolographic</option>
 			[% ELSE %]
 				<option value="bb">Goode's homolographic</option>
 			[% END %]
@@ -445,8 +440,7 @@
 				<option value="ca">Albers equal area</option>
 			[% END %]
 			[% IF ( f8cb ) %]
-				<option value="cb"
-				SELECTED>Bonne</option>
+                <option value="cb" selected="selected">Bonne</option>
 			[% ELSE %]
 				<option value="cb">Bonne</option>
 			[% END %]
@@ -476,8 +470,7 @@
 			[% END %]
 
 			[% IF ( f8cg ) %]
-				<option value="cg"
-				SELECTED>projection of the International Map of the World</option>
+                <option value="cg" selected="selected">projection of the International Map of the World</option>
 			[% ELSE %]
 				<option value="cg">projection of the International Map of the World</option>
 			[% END %]
@@ -583,15 +576,13 @@
 			[% END %]
 
 			[% IF ( f8bu ) %]
-				<option value="bu"
-				SELECTED>cylindrical, specific type unknown</option>
+                <option value="bu" selected="selected">cylindrical, specific type unknown</option>
 			[% ELSE %]
 				<option value="bu">cylindrical, specific type unknown</option>
 			[% END %]
 
 			[% IF ( f8bz ) %]
-				<option value="bz"
-				SELECTED>cylindrical, other known specific type</option>
+                <option value="bz" selected="selected">cylindrical, other known specific type</option>
 			[% ELSE %]
 				<option value="bz">cylindrical, other known specific type</option>
 			[% END %]
@@ -668,8 +659,7 @@
 			[% END %]
 
 			[% IF ( f9aa ) %]
-				<option value="aa"
-				SELECTED>Greenwich, United Kingdom</option>
+                <option value="aa" selected="selected">Greenwich, United Kingdom</option>
 			[% ELSE %]
 				<option value="aa">Greenwich, United Kingdom</option>
 			[% END %]
@@ -729,8 +719,7 @@
 				<option value="al">Copenhagen, Denmark</option>
 			[% END %]
 			[% IF ( f9am ) %]
-				<option value="am"
-				SELECTED>Cordoba, Argentina</option>
+                <option value="am" selected="selected">Cordoba, Argentina</option>
 			[% ELSE %]
 				<option value="am">Cordoba, Argentina</option>
 			[% END %]
@@ -753,8 +742,7 @@
 			[% END %]
 
 			[% IF ( f9aq ) %]
-				<option value="aq"
-				SELECTED>Julianehaab, Greenland</option>
+                <option value="aq" selected="selected">Julianehaab, Greenland</option>
 			[% ELSE %]
 				<option value="aq">Julianehaab, Greenland</option>
 			[% END %]
@@ -823,8 +811,7 @@
 			[% END %]
 
 			[% IF ( f9bi ) %]
-				<option value="bi"
-				SELECTED>Philadelphia, USA</option>
+                <option value="bi" selected="selected">Philadelphia, USA</option>
 			[% ELSE %]
 				<option value="bi">Philadelphia, USA</option>
 			[% END %]
@@ -908,8 +895,7 @@
 			[% END %]
 
 			[% IF ( f10aa ) %]
-				<option value="aa"
-				SELECTED>Greenwich, United Kingdom</option>
+                <option value="aa" selected="selected">Greenwich, United Kingdom</option>
 			[% ELSE %]
 				<option value="aa">Greenwich, United Kingdom</option>
 			[% END %]
@@ -969,8 +955,7 @@
 				<option value="al">Copenhagen, Denmark</option>
 			[% END %]
 			[% IF ( f10am ) %]
-				<option value="am"
-				SELECTED>Cordoba, Argentina</option>
+                <option value="am" selected="selected">Cordoba, Argentina</option>
 			[% ELSE %]
 				<option value="am">Cordoba, Argentina</option>
 			[% END %]
@@ -993,8 +978,7 @@
 			[% END %]
 			
 			[% IF ( f10aq ) %]
-				<option value="aq"
-				SELECTED>Julianehaab, Greenland</option>
+                <option value="aq" selected="selected">Julianehaab, Greenland</option>
 			[% ELSE %]
 				<option value="aq">Julianehaab, Greenland</option>
 			[% END %]
@@ -1063,8 +1047,7 @@
 			[% END %]
 
 			[% IF ( f10bi ) %]
-				<option value="bi"
-				SELECTED>Philadelphia, USA</option>
+                <option value="bi" selected="selected">Philadelphia, USA</option>
 			[% ELSE %]
 				<option value="bi">Philadelphia, USA</option>
 			[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
index 31384f4..d92de06 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 121a builder</title>
+<title>UNIMARC field 121a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_121a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 121a builder</h3>
+<h3>UNIMARC field 121a builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tt
index e822179..19a579c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 121b builder</title>
+<title>UNIMARC field 121b builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_121b" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 121b builder</h3>
+<h3>UNIMARC field 121b builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Altitude of Sensor</label></td>
+        <td><label for="f1">Altitude of sensor</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1a ) %]
@@ -27,7 +27,7 @@
 			[% END %]
 			</select>
 		</td></tr><tr>
-		<td><label for="f2">Attitude of sensor</label></td>
+        <td><label for="f2">Attitude of sensor</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
                         
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tt
index d99013d..298f3be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 122 builder</title>
+<title>UNIMARC field 122 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_122" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 122 builder</h3>
+<h3>UNIMARC field 122 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
index a762aea..10c8408 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 123a builder</title>
+<title>UNIMARC field 123a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_123a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 123a builder</h3>
+<h3>UNIMARC field 123a builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Type of Scale:</label></td>
+        <td><label for="f1">Type of scale:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1a ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tt
index e596ca9..90cdd6a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 123d builder</title>
+<title>UNIMARC field 123d builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_123d" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 123d builder</h3>
+<h3>UNIMARC field 123d builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tt
index dd3f675..7fc52dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 123e builder</title>
+<title>UNIMARC field 123e builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_123e" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 123e builder</h3>
+<h3>UNIMARC field 123e builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tt
index aa0594d..8a87afa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 123f builder</title>
+<title>UNIMARC field 123f builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_123f" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 123f builder</h3>
+<h3>UNIMARC field 123f builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tt
index 11023fb..0eb1cf9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 123g builder</title>
+<title>UNIMARC field 123g builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_123g" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 123g builder</h3>
+<h3>UNIMARC field 123g builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tt
index 873a43e..de3aefa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 124a builder</title>
+<title>UNIMARC field 124a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_124a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 124a builder</h3>
+<h3>UNIMARC field 124a builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Character of Image:</label></td>
+        <td><label for="f1">Character of image:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1a ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tt
index 1b05672..647ef96 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 124b builder</title>
+<title>UNIMARC field 124b builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_124b" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 124b builder</h3>
+<h3>UNIMARC field 124b builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Form of Cartographic Item:</label></td>
+        <td><label for="f1">Form of cartographic item:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
             
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tt
index 07effa2..6d99bca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 124c builder</title>
+<title>UNIMARC field 124c builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_124c" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 124c builder</h3>
+<h3>UNIMARC field 124c builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">  Presentation Technique for Photographic or Non-Photographic Image:</label></td>
+        <td><label for="f1">  Presentation technique for photographic or non-photographic image:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tt
index 094f8cc..b003354 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 124d builder</title>
+<title>UNIMARC field 124d builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_124d" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 124d builder</h3>
+<h3>UNIMARC field 124d builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Position of Platform for Photographic or Remote Sensing Image:</label></td>
+        <td><label for="f1">Position of platform for photographic or remote sensing image:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1a ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tt
index 7af2bb8..72a39ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 124e builder</title>
+<title>UNIMARC field 124e builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_124e" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 124e builder</h3>
+<h3>UNIMARC field 124e builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Category of Satellite for Remote Sensing Image:</label></td>
+        <td><label for="f1">Category of satellite for remote sensing image:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tt
index 5ed6a48..dd9051e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 124f builder</title>
+<title>UNIMARC field 124f builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_124f" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 124f builder</h3>
+<h3>UNIMARC field 124f builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Name of Satellite for Remote Sensing Image:</label></td>
+        <td><label for="f1">Name of satellite for remote sensing image:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1aa ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tt
index 053f645..40add6a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 124g builder</title>
+<title>UNIMARC field 124g builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_124g" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 124g builder</h3>
+<h3>UNIMARC field 124g builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Recording Technique for Remote Sensing Image:</label></td>
+        <td><label for="f1">Recording technique for remote sensing image:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 
@@ -47,14 +47,14 @@
 				<option value="dv">combination of various thermal infrared scanning</option>
 			[% END %]
 			[% IF ( f1ga ) %]
-				<option value="ga" selected="selected">Sidelooking Airbone Radar</option>
+                <option value="ga" selected="selected">Sidelooking airbone radar</option>
 			[% ELSE %]
-				<option value="ga">Sidelooking Airbone Radar</option>
+                <option value="ga">Sidelooking airbone radar</option>
 			[% END %]
 			[% IF ( f1gb ) %]
-				<option value="gb" selected="selected">Synthetic Aperture Radar</option>
+                <option value="gb" selected="selected">Synthetic aperture radar</option>
 			[% ELSE %]
-				<option value="gb">Synthetic Aperture Radar</option>
+                <option value="gb">Synthetic aperture radar</option>
 			[% END %]
 			[% IF ( f1gc ) %]
 				<option value="gc" selected="selected">passive microwave mapping</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt
index 871b0a8..444da8d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 125a builder</title>
+<title>UNIMARC field 125a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_125a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 125a builder</h3>
+<h3>UNIMARC field 125a builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Type of Score:</label></td>
+        <td><label for="f1">Type of score:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1a ) %]
@@ -93,7 +93,7 @@
 			</select>
 		</td></tr>
 	<tr>
-		<td><label for="f2">Parts Indicator:</label></td>
+        <td><label for="f2">Parts indicator:</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
index ec867c7..6bfa70a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 125b builder</title>
+<title>UNIMARC field 125b builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="unimarc_field_125b" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 125b builder</h3>
+<h3>UNIMARC field 125b builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Literary Text Indicator:</label></td>
+        <td><label for="f1">Literary text indicator:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1space ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
index 159eed8..0e03751 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 126a builder</title>
+<title>UNIMARC field 126a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_126a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 126a builder</h3>
+<h3>UNIMARC field 126a builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt
index de252b0..278007eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 126b builder</title>
+<title>UNIMARC field 126b builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_126b" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 126b builder</h3>
+<h3>UNIMARC field 126b builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt
index b3cf23f..8f2f629 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 127 builder</title>
+<title>UNIMARC field 127 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_127" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 127 builder</h3>
+<h3>UNIMARC field 127 builder</h3>
 <form name="f_pop" action="">
 <table>
 <tr><th colspan="9">(Complete with 0 on the left)</th></tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tt
index 0634d72..88d7f8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 128a builder</title>
+<title>UNIMARC field 128a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_128a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 128a builder</h3>
+<h3>UNIMARC field 128a builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Form of Musical Work:</label></td>
+        <td><label for="f1">Form of musical work:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1ai ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
index 44f85b6..4b43d1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 128b builder</title>
+<title>UNIMARC field 128b builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_128b" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 128b builder</h3>
+<h3>UNIMARC field 128b builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tt
index 869f0c8..f399dd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 128c builder</title>
+<title>UNIMARC field 128c builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_128c" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 128c builder</h3>
+<h3>UNIMARC field 128c builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
index 2f1a816..6b07582 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 130 builder</title>
+<title>UNIMARC field 130 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_130" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 130 builder</h3>
+<h3>UNIMARC field 130 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Specific Material Designation:</label></td>
+        <td><label for="f1">Specific material designation:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
 			[% IF ( f1a ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
index 0a33091..4483cf3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 135a builder</title>
+<title>UNIMARC field 135a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_135a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 135a builder</h3>
+<h3>UNIMARC field 135a builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
index 3868621..585f1a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 140 builder</title>
+<title>UNIMARC field 140 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_140" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 140 builder</h3>
+<h3>UNIMARC field 140 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
@@ -390,7 +390,7 @@
 			</select>
 		</td></tr>
 	<tr>
-		<td><label for="f5">Illustration - Full Page Plates 1:</label></td>
+        <td><label for="f5">Illustration - Full page plates 1:</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
             
@@ -461,7 +461,7 @@
 			[% END %]
 			</select>
 		</td>
-		<td><label for="f6">Illustration - Full Page Plates 2:</label></td>
+        <td><label for="f6">Illustration - Full page plates 2:</label></td>
 		<td>
 			<select name="f6" id="f6" size="1">
             
@@ -533,7 +533,7 @@
 			</select>
 		</td></tr>
 		<tr>
-		<td><label for="f7">Illustration - Full Page Plates 3:</label></td>
+        <td><label for="f7">Illustration - Full page plates 3:</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
             
@@ -604,7 +604,7 @@
 			[% END %]
 			</select>
 		</td>
-		<td><label for="f8">Illustration - Full Page Plates 4:</label></td>
+        <td><label for="f8">Illustration - Full page plates 4:</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
             
@@ -728,7 +728,7 @@
 		</td><td>&nbsp;</td>
 		</tr>
 		<tr>
-		<td><label for="f10">Form of Contents 1:</label></td>
+        <td><label for="f10">Form of contents 1:</label></td>
 		<td>
 			<select name="f10" id="f10" size="1">
             
@@ -884,7 +884,7 @@
 			[% END %]
 			</select>
 		</td>
-		<td><label for="f11">Form of Contents 2:</label></td>
+        <td><label for="f11">Form of contents 2:</label></td>
 		<td>
 			<select name="f11" id="f11" size="1">
             
@@ -1042,7 +1042,7 @@
 			</td>
 			</tr>
 			<tr>
-			<td><label for="f12">Form of Contents 3:</label></td>
+            <td><label for="f12">Form of contents 3:</label></td>
 			<td>
 			<select name="f12" id="f12" size="1">
             
@@ -1198,7 +1198,7 @@
 			[% END %]
 			</select>
 		</td>
-		<td><label for="f13">Form of Contents 4:</label></td>
+        <td><label for="f13">Form of contents 4:</label></td>
 		<td>
 			<select name="f13" id="f13" size="1">
             
@@ -1566,7 +1566,7 @@
 		</td>
 </tr>
 	<tr>
-		<td><label for="f16">Support Material - Book:</label></td>
+        <td><label for="f16">Support material - Book:</label></td>
 		<td>
 			<select name="f16" id="f16" size="1">
 
@@ -1607,7 +1607,7 @@
 			[% END %]
 	</select>
 		</td>
-		<td><label for="f17">Support Material - Plates:</label></td>
+        <td><label for="f17">Support material - Plates:</label></td>
 		<td>
 			<select name="f17" id="f17" size="1">
 
@@ -1667,7 +1667,7 @@
 			[% END %]
 	</select>
 		</td>
-		<td><label for="f19">Printer's Device:</label></td>
+        <td><label for="f19">Printer's device:</label></td>
 		<td>
 			<select name="f19" id="f19" size="1">
 
@@ -1685,7 +1685,7 @@
 		</td>
 </tr>
 	<tr>
-		<td><label for="f20">Publisher's Device:</label></td>
+        <td><label for="f20">Publisher's device:</label></td>
 		<td>
 			<select name="f20" id="f20" size="1">
 
@@ -1701,7 +1701,7 @@
 			[% END %]
 	</select>
 		</td>
-		<td><label for="f21">Ornamental Device:</label></td>
+        <td><label for="f21">Ornamental device:</label></td>
 		<td>
 			<select name="f21" id="f21" size="1">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tt
index bcf62d4..a7ffe28 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tt
@@ -1,361 +1,361 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 141 builder</title>
+<title>UNIMARC field 141 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_141" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 141 builder</h3>
+<h3>UNIMARC field 141 builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-		<td><label for="f1">Binding Material 1:</label></td>
+        <td><label for="f1">Binding material 1:</label></td>
 		<td>
 			<select name="f1" id="f1" size="1">
             
 			[% IF ( f1 ) %]
-				<option value=" " SELECTED>non required value</option>
+                <option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
 			[% END %]
 			[% IF ( f1a ) %]
-				<option value="a" SELECTED>parchment, vellum</option>
+                <option value="a" selected="selected">parchment, vellum</option>
 			[% ELSE %]
 				<option value="a">parchment, vellum</option>
 			[% END %]
 			[% IF ( f1b ) %]
-				<option value="b" SELECTED>leather</option>
+                <option value="b" selected="selected">leather</option>
 			[% ELSE %]
 				<option value="b">leather</option>
 			[% END %]
 			[% IF ( f1c ) %]
-				<option value="c" SELECTED>wood</option>
+                <option value="c" selected="selected">wood</option>
 			[% ELSE %]
 				<option value="c">wood</option>
 			[% END %]
 			[% IF ( f1d ) %]
-				<option value="d" SELECTED>cloth</option>
+                <option value="d" selected="selected">cloth</option>
 			[% ELSE %]
 				<option value="d">cloth</option>
 			[% END %]
 			[% IF ( f1e ) %]
-				<option value="e" SELECTED>synthetics</option>
+                <option value="e" selected="selected">synthetics</option>
 			[% ELSE %]
 				<option value="e">synthetics</option>
 			[% END %]
 			[% IF ( f1f ) %]
-				<option value="f" SELECTED>cardboard</option>
+                <option value="f" selected="selected">cardboard</option>
 			[% ELSE %]
 				<option value="f">cardboard</option>
 			[% END %]
 			[% IF ( f1g ) %]
-				<option value="g" SELECTED>paper</option>
+                <option value="g" selected="selected">paper</option>
 			[% ELSE %]
 				<option value="g">paper</option>
 			[% END %]
 			[% IF ( f1h ) %]
-				<option value="h" SELECTED>unbound</option>
+                <option value="h" selected="selected">unbound</option>
 			[% ELSE %]
 				<option value="h">unbound</option>
 			[% END %]
 			[% IF ( f1z ) %]
-				<option value="z" SELECTED>other</option>
+                <option value="z" selected="selected">other</option>
 			[% ELSE %]
 				<option value="z">other</option>
 			[% END %]
 	</select>
 		</td></tr>	<tr>
-		<td><label for="f2">Binding Material 2:</label></td>
+        <td><label for="f2">Binding material 2:</label></td>
 		<td>
 			<select name="f2" id="f2" size="1">
             
 			[% IF ( f2 ) %]
-				<option value=" " SELECTED>non required value</option>
+                <option value=" " selected="selected">non required value</option>
 			[% ELSE %]
 				<option value=" ">non required value</option>
 			[% END %]
 			[% IF ( f2a ) %]
-				<option value="a" SELECTED>parchment, vellum</option>
+                <option value="a" selected="selected">parchment, vellum</option>
 			[% ELSE %]
 				<option value="a">parchment, vellum</option>
 			[% END %]
 			[% IF ( f2b ) %]
-				<option value="b" SELECTED>leather</option>
+                <option value="b" selected="selected">leather</option>
 			[% ELSE %]
 				<option value="b">leather</option>
 			[% END %]
 			[% IF ( f2c ) %]
-				<option value="c" SELECTED>wood</option>
+                <option value="c" selected="selected">wood</option>
 			[% ELSE %]
 				<option value="c">wood</option>
 			[% END %]
 			[% IF ( f2d ) %]
-				<option value="d" SELECTED>cloth</option>
+                <option value="d" selected="selected">cloth</option>
 			[% ELSE %]
 				<option value="d">cloth</option>
 			[% END %]
 			[% IF ( f2e ) %]
-				<option value="e" SELECTED>synthetics</option>
+                <option value="e" selected="selected">synthetics</option>
 			[% ELSE %]
 				<option value="e">synthetics</option>
 			[% END %]
 			[% IF ( f2f ) %]
-				<option value="f" SELECTED>cardboard</option>
+                <option value="f" selected="selected">cardboard</option>
 			[% ELSE %]
 				<option value="f">cardboard</option>
 			[% END %]
 			[% IF ( f2g ) %]
-				<option value="g" SELECTED>paper</option>
+                <option value="g" selected="selected">paper</option>
 			[% ELSE %]
 				<option value="g">paper</option>
 			[% END %]
 			[% IF ( f2h ) %]
-				<option value="h" SELECTED>unbound</option>
+                <option value="h" selected="selected">unbound</option>
 			[% ELSE %]
 				<option value="h">unbound</option>
 			[% END %]
 			[% IF ( f2z ) %]
-				<option value="z" SELECTED>other</option>
+                <option value="z" selected="selected">other</option>
 			[% ELSE %]
 				<option value="z">other</option>
 			[% END %]
 	</select>
 		</td></tr>
                 <tr>
-		<td><label for="f3">Binding Material 3:</label></td>
+        <td><label for="f3">Binding material 3:</label></td>
 		<td>
 			<select name="f3" id="f3" size="1">
                         [% IF ( f3 ) %]
-                                <option value=" " SELECTED>non required value</option>
+                                <option value=" " selected="selected">non required value</option>
                         [% ELSE %]
                                 <option value=" ">non required value</option>
                         [% END %]
 			[% IF ( f3a ) %]
-				<option value="a" SELECTED>parchment, vellum</option>
+                <option value="a" selected="selected">parchment, vellum</option>
 			[% ELSE %]
 				<option value="a">parchment, vellum</option>
 			[% END %]
 			[% IF ( f3b ) %]
-				<option value="b" SELECTED>leather</option>
+                <option value="b" selected="selected">leather</option>
 			[% ELSE %]
 				<option value="b">leather</option>
 			[% END %]
 			[% IF ( f3c ) %]
-				<option value="c" SELECTED>wood</option>
+                <option value="c" selected="selected">wood</option>
 			[% ELSE %]
 				<option value="c">wood</option>
 			[% END %]
 			[% IF ( f3d ) %]
-				<option value="d" SELECTED>cloth</option>
+                <option value="d" selected="selected">cloth</option>
 			[% ELSE %]
 				<option value="d">cloth</option>
 			[% END %]
 			[% IF ( f3e ) %]
-				<option value="e" SELECTED>synthetics</option>
+                <option value="e" selected="selected">synthetics</option>
 			[% ELSE %]
 				<option value="e">synthetics</option>
 			[% END %]
 			[% IF ( f3f ) %]
-				<option value="f" SELECTED>cardboard</option>
+                <option value="f" selected="selected">cardboard</option>
 			[% ELSE %]
 				<option value="f">cardboard</option>
 			[% END %]
 			[% IF ( f3g ) %]
-				<option value="g" SELECTED>paper</option>
+                <option value="g" selected="selected">paper</option>
 			[% ELSE %]
 				<option value="g">paper</option>
 			[% END %]
 			[% IF ( f3h ) %]
-				<option value="h" SELECTED>unbound</option>
+                <option value="h" selected="selected">unbound</option>
 			[% ELSE %]
 				<option value="h">unbound</option>
 			[% END %]
 			[% IF ( f3z ) %]
-				<option value="z" SELECTED>other</option>
+                <option value="z" selected="selected">other</option>
 			[% ELSE %]
 				<option value="z">other</option>
 			[% END %]
 	</select>
 		</td></tr>
 		<tr>
-		<td><label for="f4">Types of Binding:</label></td>
+        <td><label for="f4">Types of binding:</label></td>
 		<td>
 			<select name="f4" id="f4" size="1">
 
 			[% IF ( f4a ) %]
-				<option value="a" SELECTED>original, i.e. primary</option>
+                <option value="a" selected="selected">original, i.e. primary</option>
 			[% ELSE %]
 				<option value="a">original, i.e. primary</option>
 			[% END %]
 			[% IF ( f4b ) %]
-				<option value="b" SELECTED>rebound</option>
+                <option value="b" selected="selected">rebound</option>
 			[% ELSE %]
 				<option value="b">rebound</option>
 			[% END %]
 			[% IF ( f4c ) %]
-				<option value="c" SELECTED>modern</option>
+                <option value="c" selected="selected">modern</option>
 			[% ELSE %]
 				<option value="c">modern</option>
 			[% END %]
 			[% IF ( f4d ) %]
-				<option value="d" SELECTED>restored, facsimile</option>
+                <option value="d" selected="selected">restored, facsimile</option>
 			[% ELSE %]
 				<option value="d">restored, facsimile</option>
 			[% END %]
 			[% IF ( f4e ) %]
-				<option value="e" SELECTED>restored, imitation</option>
+                <option value="e" selected="selected">restored, imitation</option>
 			[% ELSE %]
 				<option value="e">restored, imitation</option>
 			[% END %]
 			[% IF ( f4f ) %]
-				<option value="f" SELECTED>work bound with another</option>
+                <option value="f" selected="selected">work bound with another</option>
 			[% ELSE %]
 				<option value="f">work bound with another</option>
 			[% END %]
 			[% IF ( f4h ) %]
-				<option value="h" SELECTED>unbound</option>
+                <option value="h" selected="selected">unbound</option>
 			[% ELSE %]
 				<option value="h">unbound</option>
 			[% END %]
 			[% IF ( f4z ) %]
-				<option value="z" SELECTED>other</option>
+                <option value="z" selected="selected">other</option>
 			[% ELSE %]
 				<option value="z">other</option>
 			[% END %]
 			</select>
 		</td></tr>	<tr>
-		<td><label for="f5">Bound with':</label></td>
+        <td><label for="f5">Bound with:</label></td>
 		<td>
 			<select name="f5" id="f5" size="1">
 
 			[% IF ( f50 ) %]
-				<option value="0" SELECTED>single item</option>
+                <option value="0" selected="selected">single item</option>
 			[% ELSE %]
 				<option value="0">single item</option>
 			[% END %]
 			[% IF ( f51 ) %]
-				<option value="1" SELECTED>bound with one or more others</option>
+                <option value="1" selected="selected">bound with one or more others</option>
 			[% ELSE %]
 				<option value="1">bound with one or more others</option>
 			[% END %]
 			</select>
 		</td></tr><tr>
-	<td><label for="f6">State of Preservation - Binding:</label></td>
+    <td><label for="f6">State of preservation - Binding:</label></td>
 		<td>
 			<select name="f6" id="f6" size="1">
 
 			[% IF ( f6a ) %]
-				<option value="a" SELECTED>excellent</option>
+                <option value="a" selected="selected">excellent</option>
 			[% ELSE %]
 				<option value="a">excellent</option>
 			[% END %]
 			[% IF ( f6b ) %]
-				<option value="b" SELECTED>good</option>
+                <option value="b" selected="selected">good</option>
 			[% ELSE %]
 				<option value="b">good</option>
 			[% END %]
 			[% IF ( f6c ) %]
-				<option value="c" SELECTED>worn</option>
+                <option value="c" selected="selected">worn</option>
 			[% ELSE %]
 				<option value="c">worn</option>
 			[% END %]
 			[% IF ( f6d ) %]
-				<option value="d" SELECTED>damaged</option>
+                <option value="d" selected="selected">damaged</option>
 			[% ELSE %]
 				<option value="d">damaged</option>
 			[% END %]
 			[% IF ( f6e ) %]
-				<option value="e" SELECTED>broken back</option>
+                <option value="e" selected="selected">broken back</option>
 			[% ELSE %]
 				<option value="e">broken back</option>
 			[% END %]
 			[% IF ( f6f ) %]
-				<option value="f" SELECTED>missing</option>
+                <option value="f" selected="selected">missing</option>
 			[% ELSE %]
 				<option value="f">missing</option>
 			[% END %]
 			[% IF ( f6z ) %]
-				<option value="z" SELECTED>other</option>
+                <option value="z" selected="selected">other</option>
 			[% ELSE %]
 				<option value="z">other</option>
 			[% END %]
 			</select>
 </td></tr><tr>
-	<td><label for="f7">State of Preservation - Body of the Book 1 :</label></td>
+    <td><label for="f7">State of preservation - Body of the book 1 :</label></td>
 		<td>
 			<select name="f7" id="f7" size="1">
 
 			[% IF ( f7a ) %]
-				<option value="a" SELECTED>excellent</option>
+                <option value="a" selected="selected">excellent</option>
 			[% ELSE %]
 				<option value="a">excellent</option>
 			[% END %]
 			[% IF ( f7b ) %]
-				<option value="b" SELECTED>good</option>
+                <option value="b" selected="selected">good</option>
 			[% ELSE %]
 				<option value="b">good</option>
 			[% END %]
 			[% IF ( f7c ) %]
-				<option value="c" SELECTED>worn</option>
+                <option value="c" selected="selected">worn</option>
 			[% ELSE %]
 				<option value="c">worn</option>
 			[% END %]
 			[% IF ( f7d ) %]
-				<option value="d" SELECTED>damaged</option>
+                <option value="d" selected="selected">damaged</option>
 			[% ELSE %]
 				<option value="d">damaged</option>
 			[% END %]
 			[% IF ( f7e ) %]
-				<option value="e" SELECTED>incomplete</option>
+                <option value="e" selected="selected">incomplete</option>
 			[% ELSE %]
 				<option value="e">incomplete</option>
 			[% END %]
 			[% IF ( f7g ) %]
-				<option value="g" SELECTED>restored</option>
+                <option value="g" selected="selected">restored</option>
 			[% ELSE %]
 				<option value="g">restored</option>
 			[% END %]
 			[% IF ( f7z ) %]
-				<option value="z" SELECTED>other</option>
+                <option value="z" selected="selected">other</option>
 			[% ELSE %]
 				<option value="z">other</option>
 			[% END %]
 			</select>
 </td></tr><tr>
-	<td><label for="f8">State of Preservation - Body of the Book 2 :</label></td>
+    <td><label for="f8">State of preservation - Body of the book 2 :</label></td>
 		<td>
 			<select name="f8" id="f8" size="1">
 
 			[% IF ( f8a ) %]
-				<option value="a" SELECTED>excellent</option>
+                <option value="a" selected="selected">excellent</option>
 			[% ELSE %]
 				<option value="a">excellent</option>
 			[% END %]
 			[% IF ( f8b ) %]
-				<option value="b" SELECTED>good</option>
+                <option value="b" selected="selected">good</option>
 			[% ELSE %]
 				<option value="b">good</option>
 			[% END %]
 			[% IF ( f8c ) %]
-				<option value="c" SELECTED>worn</option>
+                <option value="c" selected="selected">worn</option>
 			[% ELSE %]
 				<option value="c">worn</option>
 			[% END %]
 			[% IF ( f8d ) %]
-				<option value="d" SELECTED>damaged</option>
+                <option value="d" selected="selected">damaged</option>
 			[% ELSE %]
 				<option value="d">damaged</option>
 			[% END %]
 			[% IF ( f8e ) %]
-				<option value="e" SELECTED>incomplete</option>
+                <option value="e" selected="selected">incomplete</option>
 			[% ELSE %]
 				<option value="e">incomplete</option>
 			[% END %]
 			[% IF ( f8g ) %]
-				<option value="g" SELECTED>restored</option>
+                <option value="g" selected="selected">restored</option>
 			[% ELSE %]
 				<option value="g">restored</option>
 			[% END %]
 			[% IF ( f8z ) %]
-				<option value="z" SELECTED>other</option>
+                <option value="z" selected="selected">other</option>
 			[% ELSE %]
 				<option value="z">other</option>
 			[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
index a5fd3d4..5306146 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 210c builder</title>
+<title>UNIMARC field 210c builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_210c" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 210c builder</h3>
+<h3>UNIMARC field 210c builder</h3>
     <h4>Search for authority type: EDITORS</h4>
         <form name="f" method="post" action="plugin_launcher.pl">
         <fieldset class="rows">
@@ -55,7 +55,7 @@
                 <tr>
                     <th>Summary</th>
                     <th>Used</th>
-                    <th>Get It!</th>
+                    <th>Get it!</th>
                 </tr>
                 [% FOREACH resul IN result %]
                     <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt
index 5ef3a1f..1eedf4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt
@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>UNIMARC_Field 225a builder</title>
+    <title>UNIMARC field 225a builder</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
     <script type="text/javascript" src="[% yuipath %]/datasource/datasource.js"></script> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt
index 3ab2393..0e234b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-    <title>UNIMARC Field 225a builder</title>
+    <title>UNIMARC field 225a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_225a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 225a builder</h3>
+<h3>UNIMARC field 225a builder</h3>
     <div id="mainbloc">
         <form name="f_pop" onsubmit="report()" action="">
             <h2 class="authority">Collection</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
index df79c94..821a2f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
@@ -79,7 +79,7 @@
 
 </head>
 <body id="cat_unimarc_field_4XX" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 4XX builder</h3>
+<h3>UNIMARC field 4XX builder</h3>
 [% ELSE %]
 		<script type="text/javascript">
 //<![CDATA[			
@@ -103,10 +103,10 @@
 
 </head>
 <body style="padding:1em;">
-<h3>UNIMARC Field 4XX builder</h3>
+<h3>UNIMARC field 4XX builder</h3>
 	[% IF ( Search ) %]
 		<div id="UNIMARC_Field_4XX_search">
-		<h2> Search On  </h2>
+        <h2> Search on  </h2>
 		<form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl">
 	
 			<p>
@@ -118,7 +118,7 @@
 				<input type="text" name="search" id="searchbox" size="35" /><br />
 				<label for="itypeloop">Item type:</label>
 				<select name="itype" id="itypeloop">
-				<option value="">All Item Types</option>
+                <option value="">All item types</option>
 				[% FOREACH itypeloo IN itypeloop %]
 				[% IF ( itypeloo.selected ) %]
 				<option value="[% itypeloo.itemtype %]" selected="selected">[% itypeloo.description %]</option>
@@ -157,7 +157,7 @@
 			<table>
 				<tr>
 					<th>Summary</th>
-					<th>Item Count</th>
+                    <th>Item count</th>
 					<th>Location</th>
 					<th>&nbsp;</th>
 				</tr>
@@ -190,7 +190,7 @@
                       [% IF ( resul.biblionumber ) %]
 						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index %]&amp;biblionumber=[% resul.biblionumber %]&amp;type=intranet&amp;op=fillinput')">Choose</a>
                       [% ELSE %]
-						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index %]&amp;type=intranet&amp;op=fillinput')">Clear Field</a>
+                        <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=[% index %]&amp;type=intranet&amp;op=fillinput')">Clear field</a>
                       [% END %]
 					</td>
 				</tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt
index 3151789..4c59985 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tt
@@ -1,12 +1,12 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 686a builder</title>
+<title>UNIMARC field 686a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
 #custom-doc { width:51.46em;*width:50.17em;min-width:675px; margin:auto; text-align:left; }
 </style>
 </head>
 <body id="cat_unimarc_field_686a" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 686a builder</h3>
+<h3>UNIMARC field 686a builder</h3>
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
 	<div id="yui-main">
@@ -63,8 +63,8 @@
                     <label for="orderby">Sort by </label>
                     <select name="orderby" id="orderby">
                         <option value="NoOrder">No order</option>
-                        <option value="HeadingAsc" selected="selected">Heading Ascendant</option>
-                        <option value="HeadingDsc">Heading Descendant</option>
+                        <option value="HeadingAsc" selected="selected">Heading ascendant</option>
+                        <option value="HeadingDsc">Heading descendant</option>
                     </select>
                 </li></ol></fieldset>
             <fieldset class="action"> <input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt
index d977be1..e51ffda 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Field 700-4 builder</title>
+<title>UNIMARC field 700-4 builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_field_700-4" class="cat" style="padding:1em;">
-<h3>UNIMARC Field 700-4 builder</h3>
+<h3>UNIMARC field 700-4 builder</h3>
 <p>S?lectionnez la valeur pour le champ 700 $4. Elle sera automatiquement report?e dans la zone 700 $8 qui suit.</p>
 <form name="f_pop" onsubmit="report()" action="">
 <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
index 0890b33..3720e96 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>UNIMARC Leader builder</title>
+<title>UNIMARC leader builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="cat_unimarc_leader" class="cat" style="padding:1em;">
-<h3>UNIMARC Leader builder</h3>
+<h3>UNIMARC leader builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
-- 
1.7.5.4


From oleonard at myacpl.org  Wed Apr  4 20:25:41 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  4 Apr 2012 14:25:41 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Cataloging pages)
Message-ID: <1333563941-30991-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Cataloging templates
---
 .../prog/en/modules/cataloguing/addbiblio.tt       |   10 +++++-----
 .../prog/en/modules/cataloguing/addbooks.tt        |    6 +++---
 .../prog/en/modules/cataloguing/additem.tt         |    8 ++++----
 .../prog/en/modules/cataloguing/linkitem.tt        |    2 +-
 .../prog/en/modules/cataloguing/z3950_search.tt    |   14 +++++++-------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 839926e..b61e543 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Cataloging &rsaquo; [% IF ( biblionumber ) %]Editing [% title |html %] (Record Number [% biblionumber %])[% ELSE %]Add MARC Record[% END %]</title>
+<title>Koha &rsaquo; Cataloging &rsaquo; [% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/yui/plugins/bubbling-min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
@@ -657,7 +657,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 //]]>
 </script>
 [% INCLUDE 'header.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; [% IF ( biblionumber ) %]Editing <em>[% title |html %]</em> (Record Number [% biblionumber %])[% ELSE %]Add MARC Record[% END %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; [% IF ( biblionumber ) %]Editing <em>[% title |html %]</em> (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</div>
 
 <div id="doc" class="yui-t7">
 
@@ -665,7 +665,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
         <div id="yui-main">
         <div class="yui-g">
 
-<h1>[% IF ( biblionumber ) %]Editing <em>[% title |html %]</em> (Record Number [% biblionumber %])</h1>[% ELSE %]Add MARC Record</h1>[% END %]
+<h1>[% IF ( biblionumber ) %]Editing <em>[% title |html %]</em> (Record number [% biblionumber %])</h1>[% ELSE %]Add MARC record</h1>[% END %]
 [% IF marcflavour != 'NORMARC' %]
 <div><input type="checkbox" name="marcDocsSelect" id="marcDocsSelect" checked="true" /> Show MARC tag documentation links<br/></div>
 [% END %]
@@ -674,7 +674,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
     <!-- show duplicate warning on tab 0 only -->
         [% IF ( duplicatebiblionumber ) %]
                     <div class="dialog alert">
-                        <h4>Duplicate Record suspected</h4>
+                        <h4>Duplicate record suspected</h4>
                         <p>Is this a duplicate of <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% duplicatebiblionumber %]" onclick="openWindow('../MARCdetail.pl?biblionumber=[% duplicatebiblionumber %]&amp;popup=1', 'Duplicate biblio'; return false;)">[% duplicatetitle %]</a>?</p>
                         [% IF ( CAN_user_editcatalogue_edit_items ) %]<form action="/cgi-bin/koha/cataloguing/additem.pl" method="get">
                                                     <input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
@@ -684,7 +684,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
                                                     <input type="submit" value="Yes: View existing items" />
                                                 </form>[% END %]
                         <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get">
-                        [% IF ( CAN_user_editcatalogue_edit_items ) %]<input type="button" class="save" onclick="confirmnotdup('items'); return false;" value="No: Save as New Record" />[% ELSE %]<input type="button" class="save" onclick="confirmnotdup('view'); return false;" value="No: Save as New Record" />[% END %]
+                        [% IF ( CAN_user_editcatalogue_edit_items ) %]<input type="button" class="save" onclick="confirmnotdup('items'); return false;" value="No: Save as new record" />[% ELSE %]<input type="button" class="save" onclick="confirmnotdup('view'); return false;" value="No: Save as new record" />[% END %]
                         </form>
                     </div>
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index 8feec5f..03c31ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -99,7 +99,7 @@
 				<td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% resultsloo.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a>
                 </td>
                 [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber %]">Edit biblio</a></td>[% END %]
-                [% IF ( CAN_user_editcatalogue_edit_items ) %]<td><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber %]">Add/Edit Items</a></td>[% END %]
+                [% IF ( CAN_user_editcatalogue_edit_items ) %]<td><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber %]">Add/Edit items</a></td>[% END %]
             </tr>
     [% END %]
     </table>
@@ -123,8 +123,8 @@
                 <th>ISBN</th>
                 <th>Date</th>
                 <th>Edition</th>
-                <th>coming from</th>
-                <th>preview</th>
+                <th>Coming from</th>
+                <th>Preview</th>
                 <th>&nbsp;</th>
             </tr>
             [% FOREACH breeding_loo IN breeding_loop %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 26313f9..eabf5a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -198,10 +198,10 @@ $(document).ready(function() {
             </tr>
                 [% FOREACH item_loo IN item_loop %]
                 <tr id="row[% item_loo.itemnumber %]">
-                    [% IF ( item_loo.nomod ) %] <td colspan="2">&nbsp;</td>[% ELSE %][% IF ( item_loo.hostitemflag ) %]<td><a href="additem.pl?op=edititem&amp;biblionumber=[% item_loo.hostbiblionumber %]&amp;itemnumber=[% item_loo.itemnumber %]#edititem">Edit in Host</a></td>
+                    [% IF ( item_loo.nomod ) %] <td colspan="2">&nbsp;</td>[% ELSE %][% IF ( item_loo.hostitemflag ) %]<td><a href="additem.pl?op=edititem&amp;biblionumber=[% item_loo.hostbiblionumber %]&amp;itemnumber=[% item_loo.itemnumber %]#edititem">Edit in host</a></td>
 <td><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&amp;biblionumber=[% biblionumber %]&amp;hostitemnumber=[% item_loo.itemnumber %]">Delink</a></td>
 [% ELSE %]<td><a href="additem.pl?op=edititem&amp;biblionumber=[% biblionumber %]&amp;itemnumber=[% item_loo.itemnumber %]#edititem">Edit</a></td>
-                    <td>[% IF ( item_loo.countanalytics ) %]<a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&amp;q=% item_loo.itemnumber %]">view analytics</a>[% ELSE %]<a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=[% biblionumber %]&amp;itemnumber=[% item_loo.itemnumber %]" onclick="confirm_deletion([% biblionumber %],[% item_loo.itemnumber %]); return false;">Delete</a>[% END %]</td>[% END %][% END %]
+                    <td>[% IF ( item_loo.countanalytics ) %]<a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&amp;q=% item_loo.itemnumber %]">View analytics</a>[% ELSE %]<a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=[% biblionumber %]&amp;itemnumber=[% item_loo.itemnumber %]" onclick="confirm_deletion([% biblionumber %],[% item_loo.itemnumber %]); return false;">Delete</a>[% END %]</td>[% END %][% END %]
                 [% FOREACH item_valu IN item_loo.item_value %]
                     <td>[% item_valu.field |html %]</td>
                 [% END %]
@@ -221,9 +221,9 @@ $(document).ready(function() {
     <input type="hidden" name="op" value="[% op %]" />
     <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
     [% IF ( opisadd ) %]
-        <h2 id="additema">Add Item</h2>
+        <h2 id="additema">Add item</h2>
     [% ELSE %]
-        <h2 id="edititem">Edit Item #[% itemnumber %]</h2>
+        <h2 id="edititem">Edit item #[% itemnumber %]</h2>
     [% END %]
 	<fieldset class="rows">
 	<ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
index e422d7c..26d78b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Link to host item</title>
+<title>Koha &rsaquo; Cataloging &rsquo; Link to host item</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="catalog_linkitem" class="catalog">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 3a981e6..3db24d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Z39.50 Search Results</title>
+<title>Koha &rsaquo; Z39.50 search results</title>
 [% INCLUDE 'greybox.inc' %]
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
@@ -85,7 +85,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 [% END %]
       <div id="bd">
 	  [% IF ( opsearch ) %]
-<h2>Z39.50 Search Points</h2>
+<h2>Z39.50 search points</h2>
     <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
     <input type="hidden" name="op" id="op" value="do_search" />
 	<div class="yui-g">
@@ -93,14 +93,14 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 	    <fieldset class="rows"> 
 		 <ol><li><label for="title">Title: </label> <input type="text" id="title"  name="title" value="[% title %]" /></li>
 		 <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="[% isbn %]" /></li>
-		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li>
-		 <li><label for="controlnumber">Control No.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
+        <li><label for="lccall">LC call number: </label> <input type="text" id="lccall" name="lccall" value="" /></li>
+        <li><label for="controlnumber">Control no.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
 		 <li><label for="srchany">Raw (any): </label> <input type="text" id="srchany" name="srchany" value="" /></li></ol>
   		</fieldset>
 	    </div>
     <div class="yui-u">
 	<fieldset class="rows">		 <ol><li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author %]" /><!--  <label for="Keyword">Keyword</label> <input type="text" name="keyword" value="" /> --></li>
- 		 <li> <label for="subject">Subject Heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
+        <li> <label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
   		 <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li>
 		 <li><label for="stdid">Standard ID: </label> <input type="text" id="stdid" name="stdid" value="" /></li></ol>
     </fieldset>
@@ -109,7 +109,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 	    </div>
 </div>
 <div class="yui-g">
-<h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select All</a></span><span class="clearall"><a id="CheckNone" href="#">Clear All</a></span></span></h2>
+<h2>Search targets <span style="display: inline; font-size: 70%; padding-left: 1em;"><span class="checkall"><a id="CheckAll" href="#">Select all</a></span><span class="clearall"><a id="CheckNone" href="#">Clear all</a></span></span></h2>
 
     [% FOREACH serverloo IN serverloop %]
         <p> 
@@ -146,7 +146,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         [% IF ( breeding_loo.breedingid ) %]
 
 	    <tr id="row[% breeding_loo.breedingid %]">
-	        <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview Card</a> <a href="#" onclick="Import([% breeding_loo.breedingid %],[% breeding_loo.biblionumber %]); return false">Import</a><a href="#" onclick="closemenu();return false;" title="Close this menu"> X </a></div> </td>
+            <td>[% breeding_loo.server %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid %]" rel="gb_page_center[600,500]">Preview card</a> <a href="#" onclick="Import([% breeding_loo.breedingid %],[% breeding_loo.biblionumber %]); return false">Import</a><a href="#" onclick="closemenu();return false;" title="Close this menu"> X </a></div> </td>
             <td>[% breeding_loo.title |html %]</td>
             <td>[% breeding_loo.author %]</td>
             <td>[% breeding_loo.date %]</td>
-- 
1.7.5.4


From oleonard at myacpl.org  Wed Apr  4 20:59:23 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  4 Apr 2012 14:59:23 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Circulation)
Message-ID: <1333565963-31744-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Circulation templates
---
 .../intranet-tmpl/prog/en/modules/circ/billing.tt  |    6 +-
 .../prog/en/modules/circ/bookcount.tt              |    8 ++--
 .../prog/en/modules/circ/branchtransfers.tt        |    4 +-
 .../prog/en/modules/circ/circulation-home.tt       |   12 ++--
 .../prog/en/modules/circ/circulation.tt            |   54 ++++++++++----------
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |   23 ++++----
 .../prog/en/modules/circ/pendingreserves.tt        |    2 +-
 .../prog/en/modules/circ/reserveratios.tt          |   18 +++---
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   38 +++++++-------
 .../prog/en/modules/circ/selectbranchprinter.tt    |    8 ++--
 .../prog/en/modules/circ/transfer-slip.tt          |    2 +-
 .../prog/en/modules/circ/transferstoreceive.tt     |    2 +-
 .../prog/en/modules/circ/view_holdsqueue.tt        |   10 ++--
 .../prog/en/modules/circ/waitingreserves.tt        |    4 +-
 14 files changed, 95 insertions(+), 96 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tt
index f1f1d82..04742b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tt
@@ -34,7 +34,7 @@
         <th>Patron
         <a href="/cgi-bin/koha/circ/billing.pl?order=patron&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
-        <th>Fee Item
+        <th>Fee item
         <a href="/cgi-bin/koha/circ/billing.pl?order=fee&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
         <th>Description
@@ -46,7 +46,7 @@
         <th>Date
         <a href="/cgi-bin/koha/circ/billing.pl?order=date&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
-        <th>Total Amount
+        <th>Total amount
         <a href="/cgi-bin/koha/circ/billing.pl?order=total&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
     </tr>
@@ -87,7 +87,7 @@
 <form action="/cgi-bin/koha/circ/billing.pl" method="post" >
 <fieldset class="brief">
 <ol><li><label for="ratio">
-    Currency Cutoff:
+    Currency cutoff:
 </label>
 <input type="text" size="5" id="ratio" name="ratio" value="[% ratio %]" /></li>
 <li><label for="from">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
index bd1764b..b53cffb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Circulation &rsaquo; Circulation Statistics for [% title |html %]</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Circulation statistics for [% title |html %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 $(document).ready(function(){
@@ -12,7 +12,7 @@ $(document).ready(function(){
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'circ-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Circulation Statistics for [% title |html %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Circulation statistics for [% title |html %]</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -24,7 +24,7 @@ $(document).ready(function(){
 [% title |html %] [% IF ( author ) %] by [% author |html %][% END %]</h2>
 <h3>Barcode [% barcode %]</h3>
 <table>
-		<tr><th>Home Library</th><th>Current Library</th><th>Date arrived<br />at current library </th><th>Number of checkouts<br />since last transfer</th></tr>
+        <tr><th>Home library</th><th>Current library</th><th>Date arrived<br />at current library </th><th>Number of checkouts<br />since last transfer</th></tr>
 		
 		<tr><td>[% homebranch %]</td>
             <td>[% holdingbranch %]</td>
@@ -36,7 +36,7 @@ $(document).ready(function(){
     <tr>
         <th>Library</th>
         <th>No. of times checked out</th>
-        <th>Last Seen</th>
+        <th>Last seen</th>
     </tr>
     [% FOREACH branchloo IN branchloop %]
     [% IF ( branchloo.selected ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
index a8fc073..1d47060 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
@@ -12,7 +12,7 @@
    <div id="bd">
 
 [% IF ( found ) %]
-   <div class="yui-g"> <h3>Reserve Found</h3>
+   <div class="yui-g"> <h3>Reserve found</h3>
     <table>
         <caption>
             [% IF ( reserved ) %]
@@ -162,7 +162,7 @@
     [% IF ( trsfitemloop ) %]
         <div class="yui-g">
 		<table>
-            <caption>Transferred Items</caption>
+            <caption>Transferred items</caption>
             <tr>
                 <th>Title</th>
                 <th>Author</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
index bdd735d..de7d7d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
@@ -17,8 +17,8 @@
 
 <div class="yui-u first">	
 	<ul>
-		<li><a href="/cgi-bin/koha/circ/circulation.pl">Check Out</a></li>
-		<li><a href="/cgi-bin/koha/circ/returns.pl">Check In</a></li>
+        <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
+        <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
 		<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
 	[% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependantBranches ) %][% ELSE %]<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>[% END %][% END %]
 	[% IF ( fast_cataloging ) %]
@@ -33,7 +33,7 @@
 	
 <h5>Circulation Reports</h5>
 <ul>
-    <li>    <a href="/cgi-bin/koha/circ/view_holdsqueue.pl" title="holds queue">Holds Queue</a></li>
+    <li>    <a href="/cgi-bin/koha/circ/view_holdsqueue.pl" title="holds queue">Holds queue</a></li>
 	<li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="holds to retrieve off the shelf">Holds to pull</a></li>
 	<li>    <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="holds waiting for patron pickup">Holds awaiting pickup</a></li>
 	<li>    <a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
@@ -50,10 +50,10 @@
 
 
 	<div class="yui-u">
-		<h5>Offline Circulation</h5>
+        <h5>Offline circulation</h5>
 		<ul>
-			<li><a href="/cgi-bin/koha/offline_circ/process_koc.pl">Offline Circulation File (.koc) Uploader</a></li>
-			<li><a href="/cgi-bin/koha/offline_circ/list.pl">Offline Circulation</a> (Firefox module: https://addons.mozilla.org/fr/firefox/addon/koct/)</li>
+            <li><a href="/cgi-bin/koha/offline_circ/process_koc.pl">Offline circulation file (.koc) uploader</a></li>
+            <li><a href="/cgi-bin/koha/offline_circ/list.pl">Offline circulation</a> (Firefox module: https://addons.mozilla.org/fr/firefox/addon/koct/)</li>
 		</ul>
 	</div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 57c16ee..e48a621 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -196,7 +196,7 @@ function refocus(calendar) {
     <li>
             <label for="message_type">Add a message for:</label>
           <select name="message_type" id="message_type">
-            <option value="L">Other Librarians</option>
+            <option value="L">Other librarians</option>
             <option value="B">[% firstname %]</option>
         </select>
     </li>
@@ -204,7 +204,7 @@ function refocus(calendar) {
         <li>
                 <label for="type">Predefined notes: </label>
                 <select name="type" id="type" onchange="this.form.borrower_message.value=this.options[this.selectedIndex].value;">
-                    <option value="">Select Note</option>
+                    <option value="">Select note</option>
                     [% FOREACH canned_bor_notes_loo IN canned_bor_notes_loop %]
                     <option value="[% canned_bor_notes_loo.lib %]">[% canned_bor_notes_loo.lib %]</option>
                     [% END %]
@@ -237,7 +237,7 @@ function refocus(calendar) {
 <div class="yui-g">
 
 <div id="circ_needsconfirmation" class="dialog alert">
-<h3>Please Confirm Checkout</h3>
+<h3>Please confirm checkout</h3>
 
 <ul>
 [% IF ( DEBT ) %]
@@ -303,7 +303,7 @@ function refocus(calendar) {
     [% IF ( INVALID_DATE ) %]
     <p>
     <input type="text" size="10" id="duedatespec" name="duedatespec" value="[% duedatespec %]" />
-    <label for="duedatespec">Due Date</label>
+    <label for="duedatespec">Due date</label>
     </p>
     [% ELSE %]
     <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
@@ -342,7 +342,7 @@ function refocus(calendar) {
 <!-- RESULT OF ISSUING REQUEST -->
         <ul>
         [% IF ( STATS ) %]
-            <li>Local Use Recorded</li>
+            <li>Local use recorded</li>
         [% END %]
 
         [% IF ( INVALID_DATE ) %]
@@ -353,7 +353,7 @@ function refocus(calendar) {
             <li>The barcode was not found [% barcode %]</li>
 	    [% IF ( fast_cataloging ) %]
 	        [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
-                    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&barcode=[% barcode %]&borrowernumber=[% borrowernumber %]&branch=[% branch %]&duedatespec=[% duedatespec %]&stickyduedate=[% stickyduedate %]">Fast cataloging</a>
+                    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode %]&amp;borrowernumber=[% borrowernumber %]&amp;branch=[% branch %]&amp;duedatespec=[% duedatespec %]&amp;stickyduedate=[% stickyduedate %]">Fast cataloging</a>
 		[% END %]
 	    [% END %]
         [% END %]
@@ -411,7 +411,7 @@ function refocus(calendar) {
     [% END %] <!-- /impossible -->
 
 [% IF ( issued ) %]
-<p>Item Checked out</p>
+<p>Item checked out</p>
 [% END %]
 
 [% IF ( message ) %]
@@ -475,10 +475,10 @@ No patron matched <span class="ex">[% message %]</span>
     <input type="submit" value="Check Out" />
 
     [% IF ( SpecifyDueDate ) %]<div class="date-select">
-        <div class="hint">Specify Due Date [% INCLUDE 'date-format.inc' %]: </div>
+        <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
 		[% IF ( duedatespec ) %]<input type="text" size="10" id="duedatespec" name="duedatespec" value="[% duedatespec %]" />[% ELSE %]<input type="text" size="10" id="duedatespec" name="duedatespec" value="" />
 [% END %]
-		<img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar"  border="0" id="CalendarDueDate" style="cursor: pointer;" />
+        <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar"  border="0" id="CalendarDueDate" style="cursor: pointer;" />
              <script language="JavaScript" type="text/javascript">
 			 //<![CDATA[
                    function validate1(date) {
@@ -507,7 +507,7 @@ No patron matched <span class="ex">[% message %]</span>
 				//]]>
                  </script>
 
-          <label for="stickyduedate"> Remember for Session:</label>
+          <label for="stickyduedate"> Remember for session:</label>
 [% IF ( stickyduedate ) %]
 <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" checked="checked" />
 [% ELSE %]
@@ -672,7 +672,7 @@ No patron matched <span class="ex">[% message %]</span>
             <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
     [% END %]</li>
 [% IF ( displayrelissues ) %]
-<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives' Checkouts</a></li>
+<li><a href="/cgi-bin/koha/circ/circulation.pl#relissues">Relatives' checkouts</a></li>
 [% END %]
 <li>[% IF ( countreserv ) %]
             <a href="/cgi-bin/koha/circ/circulation.pl#reserves">[% countreserv %] Hold(s)</a>
@@ -694,7 +694,7 @@ No patron matched <span class="ex">[% message %]</span>
     <thead><tr>
         <th scope="col">Due date</th>
         <th scope="col">Title</th>
-        <th scope="col">Item Type</th>
+        <th scope="col">Item type</th>
         <th scope="col">Checked out on</th>
         <th scope="col">Checked out from</th>
         <th scope="col">Call no</th>
@@ -725,7 +725,7 @@ No patron matched <span class="ex">[% message %]</span>
             <td>[% todayissue.charge %]</td>
             <td>[% todayissue.replacementprice %]</td>
       [% IF ( todayissue.renew_failed ) %]
-            <td class="problem">Renewal Failed</td>
+            <td class="problem">Renewal failed</td>
       [% ELSE %]
         <td><span style="padding: 0 1em;">[% IF ( todayissue.renewals ) %][% todayissue.renewals %][% ELSE %]0[% END %]</span>
         [% IF ( todayissue.can_renew ) %]
@@ -747,10 +747,10 @@ No patron matched <span class="ex">[% message %]</span>
                 <span class="renewals-disabled">
             [% END %]
 		[% IF ( todayissue.renew_error_on_reserve ) %]
-			<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On Hold</a>
+            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On hold</a>
 		[% END %]
                 [% IF ( todayissue.renew_error_too_many ) %]
-			Not Renewable
+            Not renewable
                 [% END %]
             [% IF ( todayissue.can_confirm ) %]
                 </span>
@@ -759,10 +759,10 @@ No patron matched <span class="ex">[% message %]</span>
         </td>
         [% END %]
   [% IF ( todayissue.return_failed ) %]
-            <td class="problem">Checkin Failed</td>
+            <td class="problem">Checkin failed</td>
       [% ELSE %]
             [% IF ( todayissue.renew_error_on_reserve ) %]
-               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On Hold</a>
+               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% todayissue.biblionumber %]">On hold</a>
                 <input type="checkbox" name="all_barcodes[]" value="[% todayissue.barcode %]" checked="checked" style="display: none;" />
                 </td>
             [% ELSE %]
@@ -800,7 +800,7 @@ No patron matched <span class="ex">[% message %]</span>
         <td>[% previssue.charge %]</td>
         <td>[% previssue.replacementprice %]</td>
       [% IF ( previssue.renew_failed ) %]
-            <td class="problem">Renewal Failed</td>
+            <td class="problem">Renewal failed</td>
       [% ELSE %]
         <td><span style="padding: 0 1em;">[% IF ( previssue.renewals ) %][% previssue.renewals %][% ELSE %]0[% END %]</span>
         [% IF ( previssue.can_renew ) %]
@@ -822,10 +822,10 @@ No patron matched <span class="ex">[% message %]</span>
                 <span class="renewals-disabled">
             [% END %]
 		[% IF ( previssue.renew_error_on_reserve ) %]
-			<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On Hold</a>
+            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
 		[% END %]
                 [% IF ( previssue.renew_error_too_many ) %]
-			Not Renewable
+            Not renewable
                 [% END %]
             [% IF ( previssue.can_confirm ) %]
                 </span>
@@ -834,10 +834,10 @@ No patron matched <span class="ex">[% message %]</span>
         </td>
         [% END %]
 		  [% IF ( previssue.return_failed ) %]
-            <td class="problem">Checkin Failed</td>
+            <td class="problem">Checkin failed</td>
         [% ELSE %]
             [% IF ( previssue.renew_error_on_reserve ) %]
-               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On Hold</a>
+               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
                 <input type="checkbox" name="all_barcodes[]" value="[% previssue.barcode %]" checked="checked" style="display: none;" />
                 </td>
             [% ELSE %]
@@ -855,7 +855,7 @@ No patron matched <span class="ex">[% message %]</span>
     <fieldset class="action">
         [% IF ( CAN_user_circulate_override_renewals ) %]
         [% IF ( AllowRenewalLimitOverride ) %]
-        <label for="override_limit">Override Renewal Limit:</label>
+        <label for="override_limit">Override renewal limit:</label>
         <input type="checkbox" name="override_limit" id="override_limit" value="1" />
         [% END %]
         [% END %]
@@ -878,7 +878,7 @@ No patron matched <span class="ex">[% message %]</span>
     <tr>
         <th scope="col">Due date</th>
         <th scope="col">Title</th>
-        <th scope="col">Item Type</th>
+        <th scope="col">Item type</th>
         <th scope="col">Checked out on</th>
         <th scope="col">Checked out from</th>
         <th scope="col">Call no</th>
@@ -946,7 +946,7 @@ No patron matched <span class="ex">[% message %]</span>
         <thead><tr>
             <th>Hold date</th>
             <th>Title</th>
-            <th>Call Number</th>
+            <th>Call number</th>
             <th>Barcode</th>
             <th>Priority</th>
             <th>Delete?</th>
@@ -993,7 +993,7 @@ No patron matched <span class="ex">[% message %]</span>
             [% IF AutoResumeSuspendedHolds %]
             <label for="suspend_until">until</label>
             <input type="text" size="10" id="suspend_until" name="suspend_until"/>
-            <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar"  border="0" id="CalendarSuspendUntil" style="cursor: pointer;" />
+            <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar"  border="0" id="CalendarSuspendUntil" style="cursor: pointer;" />
             <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
 
              <script language="JavaScript" type="text/javascript">
@@ -1032,7 +1032,7 @@ No patron matched <span class="ex">[% message %]</span>
             <input type="hidden" name="from" value="circ" />
             <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
             <input type="hidden" name="suspend" value="0" />
-            <input type="submit" value="Resume All Suspended All Requests" />
+            <input type="submit" value="Resume all suspended all requests" />
 	</form>
     </fieldset>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index c230e76..4440d49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Circulation &rsaquo; Items Overdue as of [% todaysdate %]</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Items overdue as of [% todaysdate %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
@@ -89,14 +89,13 @@
 
 [% IF ( noreport ) %]
 
-<h2>Overdue Report</h2>
+<h2>Overdue report</h2>
 
 <p>Please choose one or more filters to proceed.</p>
 
 [% ELSE %]
 
-<h2>[% nnoverdue %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %]
-	 Overdue as of [% todaysdate %][% IF ( isfiltered ) %] (filtered)[% END %]</h2>
+<h2>[% nnoverdue %] [% IF ( noverdue_is_plural ) %]items[% ELSE %]item[% END %] overdue as of [% todaysdate %][% IF ( isfiltered ) %] (filtered)[% END %]</h2>
 
 <p>
     [% IF ( isfiltered ) %]
@@ -109,7 +108,7 @@
 <div class="searchresults">
 <table id="overduest">
 <thead><tr>
-    <th>Due Date</th>
+    <th>Due date</th>
     <th>Patron</th>
     <th>Library</th>
     <th>Title</th>
@@ -140,12 +139,12 @@
 <div class="yui-b">
 <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
   <fieldset class="brief">
-<h4>Filter On:</h4>
+<h4>Filter on:</h4>
 	<fieldset><legend>Date due:</legend>
 	<ol>
     <li><label for="dateduefrom">From:</label>
 	<input type="text" id="dateduefrom" name="dateduefrom" size="10" value="[% dateduefrom %]" />
-	<img src="[% themelang %]/lib/calendar/cal.gif" id="dateduefrom_button" alt="Show Calendar" />
+    <img src="[% themelang %]/lib/calendar/cal.gif" id="dateduefrom_button" alt="Show calendar" />
 	<script language="JavaScript" type="text/javascript">
 	    Calendar.setup(
 	    {
@@ -159,7 +158,7 @@
 	<li>
 	<label for="datedueto">To:</label>
 	<input type="text" id="datedueto" name="datedueto" size="10" value="[% datedueto %]" />
-	<img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show Calendar" />
+    <img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show calendar" />
 	<script language="JavaScript" type="text/javascript">
 	    Calendar.setup(
 	    {
@@ -186,8 +185,8 @@
             [% ELSE %]<option value="gonenoaddress">Address in question</option>[% END %]
             [% IF ( borflag_debarred ) %]<option value="debarred" selected="selected">Restricted</option>
             [% ELSE %]<option value="debarred">Restricted</option>[% END %]
-            [% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost Card</option>
-            [% ELSE %]<option value="lost">Lost Card</option>[% END %]
+            [% IF ( borflag_lost ) %]<option value="lost" selected="selected">Lost card</option>
+            [% ELSE %]<option value="lost">Lost card</option>[% END %]
         </select>
     </li>
 	[% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %]
@@ -244,11 +243,11 @@
     [% ELSE %]
     <option value="[% ORDER_LOO.ordervalue %]">
     [% END %]
-    [% IF ( ORDER_LOO.order_date_due ) %]Due Date
+    [% IF ( ORDER_LOO.order_date_due ) %]Due date
     [% ELSIF ( ORDER_LOO.order_borrower ) %]Patron
     [% ELSIF ( ORDER_LOO.order_barcode ) %]Barcode
     [% ELSIF ( ORDER_LOO.order_title ) %]Title
-    [% ELSIF ( ORDER_LOO.order_date_due_desc ) %]Due Date desc
+    [% ELSIF ( ORDER_LOO.order_date_due_desc ) %]Due date desc
     [% ELSIF ( ORDER_LOO.order_borrower_desc ) %]Patron desc
     [% ELSIF ( ORDER_LOO.order_barcode_desc ) %]Barcode desc
     [% ELSIF ( ORDER_LOO.order_title_desc ) %]Title desc
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 426f06d..c79a231 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -144,7 +144,7 @@ $(document).ready(function() {
 
 <form action="/cgi-bin/koha/circ/pendingreserves.pl" method="post" >
 <fieldset class="brief">
-<h4>Refine Results</h4>
+<h4>Refine results</h4>
 <ol>
 <li>
 <label for="from">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
index da6292d..ddecef5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Circulation &rsaquo; Hold Ratios</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Hold ratios</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/calendar/calendar-system.css" />
@@ -44,14 +44,14 @@ $.tablesorter.addParser({
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'circ-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Hold Ratios</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Hold ratios</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-<h1>Hold Ratios to Calculate Items Needed</h1>
+<h1>Hold ratios to calculate items needed</h1>
    <h3>Calculated on [% todaysdate %]. From [% from %]
 	to [% to %]</h3>
 <p>These items have a hold ratio &ge; [% ratio %].</p>
@@ -66,11 +66,11 @@ $.tablesorter.addParser({
         <th>Items
         <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=[% ratio %]&amp;order=itemcount&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
-        <th>Hold Ratio</th>
+        <th>Hold ratio</th>
         <th>Title
         <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=[% ratio %]&amp;order=biblio&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
-        <th>Holding Libraries
+        <th>Holding libraries
         <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=[% ratio %]&amp;order=branch&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
         <th>Location
@@ -79,10 +79,10 @@ $.tablesorter.addParser({
         <th>Itype
         <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=[% ratio %]&amp;order=itype&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
-        <th>Call Numbers
+        <th>Call numbers
         <a href="/cgi-bin/koha/circ/reserveratios.pl?ratio=[% ratio %]&amp;order=callnumber&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
         </th>
-        <th>Items Needed
+        <th>Items needed
         </th>
     </tr></thead>
     
@@ -109,9 +109,9 @@ $.tablesorter.addParser({
 <div class="yui-b">
 <form action="/cgi-bin/koha/circ/reserveratios.pl" method="post" >
 <fieldset class="brief">
-<h4>Refine Results:</h4>
+<h4>Refine results:</h4>
 <ol><li><label for="ratio">
-    Hold Ratio:
+    Hold ratio:
 </label>
 <input type="text" size="5" id="ratio" name="ratio" value="[% ratio %]" /></li>
 <li><label for="from">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index c51fed1..ddf3144 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -1,6 +1,6 @@
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Circulation &rsaquo; Check In [% title |html %]</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -46,7 +46,7 @@ function Dopop(link) {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'checkin-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check In</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
 
 <div id="doc" class="yui-t7">
 
@@ -87,7 +87,7 @@ function Dopop(link) {
 </div>
 [% END %]
 <!-- case of a mistake in transfer loop -->
-[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print Slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel Transfer</a></h3>
+[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></h3>
 [% IF ( wborcnum ) %]<h5>Hold for:</h5>
         <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
             [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
@@ -103,7 +103,7 @@ function Dopop(link) {
             <input type="hidden" name="WT-waitingAt" value="[% TransferWaitingAt %]" />
             <input type="hidden" name="WT-From" value="[% wtransfertFrom %]" />
         <input type="submit" class="approve" value="Confirm" />
-			<input type="submit" value="Print Slip and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
+            <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
     </form>
     [% END %]</div>
 [% END %]
@@ -119,7 +119,7 @@ function Dopop(link) {
 [% END %]
 
 <div id="hold-found1" class="dialog message">
-        <h3>Hold Found (item is already waiting):  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
+        <h3>Hold found (item is already waiting):  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
         [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
         <h4>Hold for:</h4>
 			<ul>
@@ -139,7 +139,7 @@ function Dopop(link) {
         <form method="post" action="returns.pl" class="confirm">
             <input type="submit" class="approve" value="Confirm" />
 
-			<input type="submit" value="Print and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
+            <input type="submit" value="Print and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
             [% FOREACH inputloo IN inputloop %]
                 <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
                 <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
@@ -181,7 +181,7 @@ function Dopop(link) {
 
         <form method="post" action="returns.pl" class="confirm">
             <input type="submit" class="approve" value="Confirm" />
-			<input type="submit" value="Print Slip and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
+            <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
             [% FOREACH inputloo IN inputloop %]
                 <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
                 <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
@@ -198,7 +198,7 @@ function Dopop(link) {
     [% IF ( transfer ) %]
     <!-- transfer: item with no reservation, must be returned to its home library -->
 	<div id="return1" class="dialog message">
-            <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% homebranchname %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print Slip</a> )</h3>
+            <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% homebranchname %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> )</h3>
         </div>
         [% IF ( soundon ) %]
         <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
@@ -211,7 +211,7 @@ function Dopop(link) {
         <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
         [% END %]
 	<div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% homebranchname %]</h3>
-	Transfer Now?<br />
+    Transfer now?<br />
     <form method="post" action="returns.pl" name="mainform" id="mainform">
     [% IF itemnumber %]
         <input type="submit" name="dotransfer" value="Yes, Print slip" class="print" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;" />
@@ -236,7 +236,7 @@ function Dopop(link) {
         [% IF ( soundon ) %]
         <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
         [% END %]
-        <h3>Item Consigned:</h3>
+        <h3>Item consigned:</h3>
         <table>
         <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a></caption>
         <tr>
@@ -266,7 +266,7 @@ function Dopop(link) {
         [% END %]
 
 	<div id="hold-found2" class="dialog message">
-	  <h3>Hold Found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
+      <h3>Hold found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
         [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
         <h5>Hold for:</h5>
 		<ul>
@@ -288,11 +288,11 @@ function Dopop(link) {
         [% END %]
         <form method="post" action="returns.pl" class="confirm">
             [% IF ( transfertodo ) %]
-                <input type="submit" class="approve" value="Confirm hold and Transfer" />
-                <input type="submit" value="Print slip, Transfer, and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
+                <input type="submit" class="approve" value="Confirm hold and transfer" />
+                <input type="submit" value="Print slip, transfer, and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?transfer=1&amp;borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
             [% ELSE %]
                 <input type="submit" class="approve" value="Confirm hold" />
-                <input type="submit" value="Print Slip and Confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
+                <input type="submit" value="Print slip and confirm" class="print" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip'); this.form.submit();" />
             [% END %]
                 <input type="submit" class="deny" value="Ignore" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;" />
             [% FOREACH inputloo IN inputloop %]
@@ -314,7 +314,7 @@ function Dopop(link) {
     <div class="dialog alert">
         [% FOREACH errmsgloo IN errmsgloop %]
                     [% IF ( errmsgloo.badbarcode ) %]
-                        <p class="problem">No Item with barcode: [% errmsgloo.msg %]</p>
+                        <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
                     [% END %]
                     [% IF ( errmsgloo.ispermanent ) %]
                         <p class="problem">Please return to  [% errmsgloo.msg %]</p>
@@ -323,7 +323,7 @@ function Dopop(link) {
                         <p class="problem">Not checked out.</p>
                     [% END %]
                     [% IF ( errmsgloo.localuse) %]
-                        <p class="problem">Local Use recorded</p>
+                        <p class="problem">Local use recorded</p>
                     [% END %]
                     [% IF ( errmsgloo.waslost ) %]
                         <p class="problem">Item was lost, now found.</p>
@@ -407,7 +407,7 @@ function Dopop(link) {
 
 [% IF ( returned ) %]
 <div class="yui-g">    <table>
-        <tr><th>Item Information</th><th>Patron Information</th></tr>
+        <tr><th>Item information</th><th>Patron information</th></tr>
         <tr>
             <td>[% title |html %]</td>
             <td>
@@ -424,9 +424,9 @@ function Dopop(link) {
     </table>
 [% END %]
 [% IF ( riloop ) %]
-    <h2>Checked-In items</h2>
+    <h2>Checked-in items</h2>
     <table>
-	<tr><th>Due Date</th><th>Title</th>	<th>Author</th>	<th>Barcode</th><th>Shelving Location</th><th>Call Number</th><th>Type</th>	<th>Patron</th><th>Note</th></tr>
+    <tr><th>Due date</th><th>Title</th>	<th>Author</th>	<th>Barcode</th><th>Shelving Location</th><th>Call number</th><th>Type</th>	<th>Patron</th><th>Note</th></tr>
 
         [% FOREACH riloo IN riloop %]
             <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
index 2f842bc..acad21c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Circulation &rsaquo; Set Library</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
     .noshow {display: none;}
@@ -12,7 +12,7 @@
 <div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
-&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set Library</a>
+&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
 </div>
 
 <div id="doc" class="yui-t7">
@@ -22,7 +22,7 @@
 
 [% IF ( updated ) %]
 
-<h2>Update Succeeded</h2>
+<h2>Update succeeded</h2>
 Updated:<ul>
     [% FOREACH update IN updated %]
     [% IF ( update.updated_branch ) %]
@@ -47,7 +47,7 @@ Updated:<ul>
 
 <form method="post" action="selectbranchprinter.pl">
 <fieldset class="rows">
-	<legend>Set Library</legend>
+    <legend>Set library</legend>
     <ol>
     [% IF ( singleBranchMode ) %]
         <li>SingleBranchMode is ON.</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt
index d448186..e363032 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha -- Circulation: Transfers</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Transfers</title>
 [% INCLUDE 'doc-head-close-receipt.inc' %]
 <script language="javascript">
 function printandclose()
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
index 1b9bac6..dec516d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
@@ -80,7 +80,7 @@ $(document).ready(function() {
                     </td>
                     <td>[% reser.homebranch %]</td>
                     <td>[% reser.itemcallnumber %]</td>
-                    <td><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber %]&amp;canceltransfer=1&amp;dest=ttr">Cancel Transfer</a></td>
+                    <td><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber %]&amp;canceltransfer=1&amp;dest=ttr">Cancel transfer</a></td>
                 </tr>
             [% END %]</tbody>
             </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 09a8ac0..d8d8536 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Circulation &rsaquo; Holds Queue</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Holds queue</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css"> p { margin-top: 0; }</style>
 </head>
@@ -19,7 +19,7 @@ $(document).ready(function() {
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
-&rsaquo; <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds Queue</a>
+&rsaquo; <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a>
 [% IF ( run_report ) %] &rsaquo; Results[% END %]
 </div>
 
@@ -45,12 +45,12 @@ $(document).ready(function() {
 	<tr>
         <th class="hq-title">Title</th>
         <th class="hq-collection">Collection</th>
-        <th class="hq-callnumber">Call Number</th>
-        <th class="hq-copynumber">Copy Number</th>
+        <th class="hq-callnumber">Call number</th>
+        <th class="hq-copynumber">Copy number</th>
         <th class="hq-enumchron">Enumeration</th>
         <th class="hq-barcode">Barcode</th>
         <th class="hq-patron">Patron</th>
-        <th class="hq-sendto">Send To</th>
+        <th class="hq-sendto">Send to</th>
         <th class="hq-date">Date</th>
         <th class="hq-notes">Notes</th>
     </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index d4b88a4..f4b4d4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -80,7 +80,7 @@ $.tablesorter.addParser({
                     <th>Title</th>
                     <th>Patron</th>
                     <th>Location</th>
-                    <th>Copy Number</th>
+                    <th>Copy number</th>
                     <th>Enumeration</th>
                     <th>Action</th>
                </tr></thead>
@@ -140,7 +140,7 @@ $.tablesorter.addParser({
                     <th>Title</th>
                     <th>Patron</th>
                     <th>Location</th>
-                    <th>Copy Number</th>
+                    <th>Copy number</th>
                     <th>Enumeration</th>
                     <th>Action</th>
                </tr></thead>
-- 
1.7.5.4


From oleonard at myacpl.org  Wed Apr  4 21:23:29 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  4 Apr 2012 15:23:29 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(OPAC includes)
Message-ID: <1333567409-359-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in OPAC includes
---
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |   50 ++++++++++----------
 .../prog/en/includes/opac-detail-sidebar.inc       |    8 ++--
 .../opac-tmpl/prog/en/includes/opac-facets.inc     |    2 +-
 .../opac-tmpl/prog/en/includes/resort_form.inc     |   32 ++++++------
 .../prog/en/includes/subtypes_unimarc.inc          |    6 +-
 5 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index c3a6c95..822cb6e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -2,7 +2,7 @@
   [% IF ( opacuserlogin ) %]
 	<ul>
 [% UNLESS ( loggedinusername ) %]
-               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to Your Account</a></li>[% END %]
+               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>[% END %]
             [% IF ( loggedinusername ) %]
                 <li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></span></li>
 
@@ -37,9 +37,9 @@
 
 	<select name="idx" id="masthead_search" class="left">
 	[% IF ( ms_kw ) %]
-        <option selected="selected" value="">Library Catalog</option>
+        <option selected="selected" value="">Library catalog</option>
 		[% ELSE %]
-        <option value="">Library Catalog</option>
+        <option value="">Library catalog</option>
 		[% END %]
 		[% IF ( ms_ti ) %]
         <option selected="selected" value="ti">Title</option>
@@ -67,9 +67,9 @@
         <option value="se">Series</option>
 		[% END %]
 		[% IF ( ms_callnum ) %]
-        <option selected="selected" value="callnum">Call Number</option>
+        <option selected="selected" value="callnum">Call number</option>
 		[% ELSE %]
-        <option value="callnum">Call Number</option>
+        <option value="callnum">Call number</option>
 		[% END %]</select>
 [% IF ( ms_value ) %]
         <input type="text" id = "transl1" name="q" value="[% ms_value |html %]" class="left" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
@@ -78,7 +78,7 @@
 [% END %]
    [% IF ( OpacAddMastheadLibraryPulldown ) %]
       <select name="limit" id="select_library" class="left">
-         <option value="">All Libraries</option>
+         <option value="">All libraries</option>
          [% FOREACH BranchesLoo IN BranchesLoop %]
             [% IF ( BranchesLoo.selected ) %]<option selected="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
             [% ELSE %]<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>[% END %]
@@ -109,16 +109,16 @@
 [% END %]
 
 <div id="moresearches">
-<a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a>
-[% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by Hierarchy</a>[% END %]
+<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
+[% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
 [% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a>[% END %]
-[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent Comments</a>[% END %]
-[% IF ( TagsEnabled ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags.pl">Tag Cloud</a>[% END %]
-[% IF ( OpacCloud ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject Cloud</a>[% END %]
-[% IF ( OpacTopissue ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-topissues.pl">Most Popular</a>[% END %]
+[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
+[% IF ( TagsEnabled ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags.pl">Tag cloud</a>[% END %]
+[% IF ( OpacCloud ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject cloud</a>[% END %]
+[% IF ( OpacTopissue ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-topissues.pl">Most popular</a>[% END %]
 [% IF ( suggestion ) %]
-  [% IF ( AnonSuggestions ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-suggestions.pl">Purchase Suggestions</a>
-  [% ELSIF ( OPACViewOthersSuggestions ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-suggestions.pl">Purchase Suggestions</a>
+  [% IF ( AnonSuggestions ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-suggestions.pl">Purchase suggestions</a>
+  [% ELSIF ( OPACViewOthersSuggestions ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-suggestions.pl">Purchase suggestions</a>
   [% END %]
 [% END %]
 </div>
@@ -132,34 +132,34 @@
 [% IF ( virtualshelves ) %]
 <div id="listsmenu" class="yuimenu" style="display: none">
     <div class="bd">
-	<h4>Public Lists</h4>
+    <h4>Public lists</h4>
 		[% IF ( pubshelves ) %]
 			<ul class="first-of-type">
 			[% FOREACH pubshelvesloo IN pubshelvesloop %]
 			<li class="yuimenuitem"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% pubshelvesloo.shelfnumber %]&amp;sortfield=[% pubshelvesloo.sortfield %]">[% pubshelvesloo.shelfname |html %]</a></li>
 			[% END %]
 			<li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves">[View All]</a></li>
-			</ul>   
+        </ul>
 		[% ELSE %]
-			No Public Lists
+        No public lists
 		[% END %]
   [% IF ( opacuserlogin ) %]
-	<h4>Your Lists</h4>
+    <h4>Your lists</h4>
 	[% IF ( loggedinusername ) %]
 		[% IF ( barshelves ) %]
 			<ul class="first-of-type">
 			[% FOREACH barshelvesloo IN barshelvesloop %]
 			<li class="yuimenuitem"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% barshelvesloo.shelfnumber %]&amp;sortfield=[% barshelvesloo.sortfield %]">[% barshelvesloo.shelfname |html %]</a></li>
 			[% END %]
-			<li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[View All]</a></li>
-			</ul>   
+        <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[View all]</a></li>
+        </ul>
 		[% ELSE %]
 			<ul class="first-of-type">
-			<li>No Private Lists</li>
-			<li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[New List]</a></li></ul>
+        <li>No private lists</li>
+        <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[New list]</a></li></ul>
 		[% END %]
 	[% ELSE %]
-		<ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Create Your Own Lists</a></li></ul>
+        <ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to create your own lists</a></li></ul>
 	[% END %]
   [% END %]
 	  </div>
@@ -172,10 +172,10 @@
 [% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>Your search returned [% total |html %] results.</strong> [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %]
 <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
 [% ELSE %]
-<strong>No Results Found!</strong>
+<strong>No results found!</strong>
 <p>
     [% IF ( searchdesc ) %]
-    No results found for that in [% LibraryName %] Catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
+    No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
     [% ELSE %]
     You did not specify any search criteria.
     [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
index d615be6..85d44d7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc
@@ -3,10 +3,10 @@
         [% IF ( opacuserlogin ) %]
             [% IF ( RequestOnOpac ) %]
                 [% IF ( AllowOnShelfHolds ) %]
-                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
+                    <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
                 [% ELSE %]
                     [% IF ( ItemsIssued ) %]
-                        <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
+                        <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
                     [% END %]
                 [% END %]
             [% END %]
@@ -16,7 +16,7 @@
     [% IF ( virtualshelves ) %]
         [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %]
             <li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% biblionumber %]" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=[% biblionumber %]'); return false;">
-                Save to Your Lists
+                Save to your lists
             </a></li>
         [% END %][% END %]
     [% END %]
@@ -44,7 +44,7 @@
 [% IF ( export_options.size ) %]
     <div id="export" class="detailtagcell">
         <form method="get" action="/cgi-bin/koha/opac-export.pl">
-        <label for="format">Save Record:</label>
+        <label for="format">Save record:</label>
         <select name="format" id="format">
         [% FOREACH option IN export_options %]
             [% SWITCH option %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
index ccb37b0..b3c1bc3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -19,7 +19,7 @@
 [% END %]
 <ul>
         [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]&amp;limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a> [% IF ( displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %]
-        <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show More</a></li>
+        <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show more</a></li>
 [% END %]
 </ul></li>
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
index bf1954e..45215f3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
@@ -1,12 +1,12 @@
 <option value="relevance">Relevance</option>
 <optgroup label="Popularity">
 [% IF ( sort_by == "popularity_dsc" ) %]
-<option value="popularity_dsc" selected="selected">Popularity (Most to Least)</option>[% ELSE %]
-<option value="popularity_dsc">Popularity (Most to Least)</option>
+<option value="popularity_dsc" selected="selected">Popularity (most to least)</option>[% ELSE %]
+<option value="popularity_dsc">Popularity (most to least)</option>
 [% END %]
 [% IF ( sort_by == "popularity_asc" ) %]
-<option value="popularity_asc" selected="selected">Popularity (Least to Most)</option>[% ELSE %]
-<option value="popularity_asc">Popularity (Least to Most)</option>
+<option value="popularity_asc" selected="selected">Popularity (least to most)</option>[% ELSE %]
+<option value="popularity_asc">Popularity (least to most)</option>
 [% END %]
 </optgroup>
 <optgroup label="Author">
@@ -23,36 +23,36 @@
 </optgroup>
 <optgroup label="Call Number">
 [% IF ( sort_by == "call_number_asc" ) %]
-<option value="call_number_asc" selected="selected">Call Number (0-9 to A-Z)</option>
+<option value="call_number_asc" selected="selected">Call number (0-9 to A-Z)</option>
 [% ELSE %]
-<option value="call_number_asc">Call Number (0-9 to A-Z)</option>
+<option value="call_number_asc">Call number (0-9 to A-Z)</option>
 [% END %]
 [% IF ( sort_by == "call_number_dsc" ) %]
-<option value="call_number_dsc" selected="selected">Call Number (Z-A to 9-0)</option>
+<option value="call_number_dsc" selected="selected">Call number (Z-A to 9-0)</option>
 [% ELSE %]
-<option value="call_number_dsc">Call Number (Z-A to 9-0)</option>
+<option value="call_number_dsc">Call number (Z-A to 9-0)</option>
 [% END %]
 </optgroup>
 <optgroup label="Dates">
 [% IF ( sort_by == "pubdate_dsc" ) %]
-<option value="pubdate_dsc" selected="selected">Publication/Copyright Date: Newest to Oldest</option>
+<option value="pubdate_dsc" selected="selected">Publication/Copyright date: Newest to oldest</option>
 [% ELSE %]
-<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option>
+<option value="pubdate_dsc">Publication/Copyright date: Newest to oldest</option>
 [% END %]
 [% IF ( sort_by == "pubdate_asc" ) %]
-<option value="pubdate_asc" selected="selected">Publication/Copyright Date: Oldest to Newest</option>
+<option value="pubdate_asc" selected="selected">Publication/Copyright date: Oldest to newest</option>
 [% ELSE %]
-<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option>
+<option value="pubdate_asc">Publication/Copyright date: Oldest to newest</option>
 [% END %]
 [% IF ( sort_by == "acqdate_dsc" ) %]
-<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option>
+<option value="acqdate_dsc" selected="selected">Acquisition date: Newest to oldest</option>
 [% ELSE %]
-<option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option>
+<option value="acqdate_dsc">Acquisition date: Newest to oldest</option>
 [% END %]
 [% IF ( sort_by == "acqdate_asc" ) %]
-<option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option>
+<option value="acqdate_asc" selected="selected">Acquisition date: Oldest to newest</option>
 [% ELSE %]
-<option value="acqdate_asc">Acquisition Date: Oldest to Newest</option>
+<option value="acqdate_asc">Acquisition date: Oldest to newest</option>
 [% END %]
 </optgroup>
 <optgroup label="Title">
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc
index 413f423..2a68959 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/subtypes_unimarc.inc
@@ -1,5 +1,5 @@
     <fieldset>
-    <legend>Coded Fields</legend>
+    <legend>Coded fields</legend>
     <p>
     <label>Audience</label>
     <select name="limit" class="subtype">
@@ -106,7 +106,7 @@
     </select>
         </p>
         <p>
-    <label>Video Types</label>
+    <label>Video types</label>
     <select name="limit" class="subtype">
             <option value="">Any</option>
       <option value="Video-mt:a">motion picture</option>
@@ -118,7 +118,7 @@
     <fieldset>
     <legend>Serials</legend><p>
     <p>
-    <label>Serial Type</label>
+    <label>Serial type</label>
     <select name="limit" class="subtype">
            <option value="">Any type</option>
            <option value="Type-Of-Serial:a">Periodical</option>
-- 
1.7.5.4


From dpavlin at rot13.org  Wed Apr  4 23:46:34 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Wed,  4 Apr 2012 23:46:34 +0200
Subject: [Koha-patches] [PATCH] Bug 7847 - OPAC search dies with plack
Message-ID: <1333575994-8632-1-git-send-email-dpavlin@rot13.org>

This bug was uncovered by @mglavica during HackFest in Marseille
It also showed it's ugly head during my plack presentation there.

Following chang removes circural dependecy introduced by commit
b65efdaacaf77fb53fee479da7f2e990ba0adeed which is part of Bug 6027
---
 C4/Items.pm |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 0b2f99b..4790091 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -26,7 +26,6 @@ use C4::Context;
 use C4::Koha;
 use C4::Biblio;
 use C4::Dates qw/format_date format_date_in_iso/;
-use C4::Search qw/SimpleSearch/;
 use MARC::Record;
 use C4::ClassSource;
 use C4::Log;
-- 
1.7.2.5


From dpavlin at rot13.org  Thu Apr  5 00:32:36 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Thu,  5 Apr 2012 00:32:36 +0200
Subject: [Koha-patches] [PATCH] Bug 7844 - plack intranet tooling for
	developers
Message-ID: <1333578756-11731-1-git-send-email-dpavlin@rot13.org>

koha.psgi example and plackup.sh script to run any Koha site
intranet or opac interface under plack with optional multi-process
Starman server

  plackup.sh site-name [intranet]

site-name is used to find config /etc/koha/sites/site-name/koha-conf.xml

All configuration is specified in koha.psgi, which you are welcomed to edit
and tune according to your development needs.

When you are happy with it, rename it to site name and save it for safe-keeping.

Test scenario:
1. install plack and dependencies, using ./cpanm-install.pl

2. start ./plackup.sh sitename

3. open intranet page http://localhost:5001/cgi-bin/koha/mainpage.pl
   and verify that it works

4. start ./plackup.sh sitename i[ntranet]

5. open OPAC http://localhost:5000/cgi-bin/koha/opac-main.pl
   and verify that it works

6. next step is to take a look into koha.psgi and enable additional
   debug modules, save file and reload page (plackup will reload
   code automatically)

This message is included as README.plack because it's useful as
quickstart guide when trying code from distribution or checkout
---
 misc/plack/README.plack |   31 ++++++++++++++++++
 misc/plack/koha.psgi    |   82 +++++++++++++++++++++++++++++++++++++++++++++++
 misc/plack/plackup.sh   |   53 ++++++++++++++++++++++++++++++
 3 files changed, 166 insertions(+), 0 deletions(-)
 create mode 100644 misc/plack/README.plack
 create mode 100644 misc/plack/koha.psgi
 create mode 100755 misc/plack/plackup.sh

diff --git a/misc/plack/README.plack b/misc/plack/README.plack
new file mode 100644
index 0000000..0561a7e
--- /dev/null
+++ b/misc/plack/README.plack
@@ -0,0 +1,31 @@
+Bug 7844 - plack intranet tooling for developers
+
+koha.psgi example and plackup.sh script to run any Koha site
+intranet or opac interface under plack with optional multi-process
+Starman server
+
+  plackup.sh site-name [intranet]
+
+site-name is used to find config /etc/koha/sites/site-name/koha-conf.xml
+
+All configuration is specified in koha.psgi, which you are welcomed to edit
+and tune according to your development needs.
+
+When you are happy with it, rename it to site name and save it for safe-keeping.
+
+Test scenario:
+1. install plack and dependencies, using ./cpanm-install.pl
+
+2. start ./plackup.sh sitename
+
+3. open intranet page http://localhost:5001/cgi-bin/koha/mainpage.pl
+   and verify that it works
+
+4. start ./plackup.sh sitename i[ntranet]
+
+5. open OPAC http://localhost:5000/cgi-bin/koha/opac-main.pl
+   and verify that it works
+
+6. next step is to take a look into koha.psgi and enable additional
+   debug modules, save file and reload page (plackup will reload
+   code automatically)
diff --git a/misc/plack/koha.psgi b/misc/plack/koha.psgi
new file mode 100644
index 0000000..3473f49
--- /dev/null
+++ b/misc/plack/koha.psgi
@@ -0,0 +1,82 @@
+#!/usr/bin/perl
+use Plack::Builder;
+use Plack::App::CGIBin;
+use lib qw( ./lib );
+use Plack::Middleware::Debug;
+use Plack::App::Directory;
+
+BEGIN {
+
+# override configuration from startup script below:
+# (requires --reload option)
+
+$ENV{PLACK_DEBUG} = 1; # toggle debugging
+
+# memcache change requires restart
+$ENV{MEMCACHED_SERVERS} = "localhost:11211";
+#$ENV{MEMCACHED_DEBUG} = 0;
+
+#$ENV{PLACK_MINIFY} = 1;
+
+$ENV{PROFILE_PER_PAGE} = 1; # reset persistant and profile counters after each page, like CGI
+#$ENV{INTRANET} = 1; # usually passed from script
+
+} # BEGIN
+
+use C4::Context;
+use C4::Languages;
+use C4::Members;
+use C4::Dates;
+use C4::Boolean;
+use C4::Letters;
+use C4::Koha;
+use C4::XSLT;
+use C4::Branch;
+use C4::Category;
+=for preload
+use C4::Tags; # FIXME
+=cut
+
+use Devel::Size 0.77; # 0.71 doesn't work for Koha
+my $watch_capture_regex = '(C4|Koha)';
+
+sub watch_for_size {
+	my @watch =
+	map { s/^.*$watch_capture_regex/$1/; s/\//::/g; s/\.pm$//; $_ } # fix paths
+	grep { /$watch_capture_regex/ }
+	keys %INC
+	;
+	warn "# watch_for_size ",join(' ', at watch);
+	return @watch;
+};
+
+my $CGI_ROOT = $ENV{INTRANET} ? $ENV{INTRANETDIR} : $ENV{OPACDIR};
+warn "# using Koha ", $ENV{INTRANET} ? 'intranet' : 'OPAC', " CGI from $CGI_ROOT\n";
+my $app=Plack::App::CGIBin->new(root => $CGI_ROOT);
+
+builder {
+
+	enable_if { $ENV{PLACK_DEBUG} } 'Debug',  panels => [
+ 		qw(Koha Persistant),
+		qw(Environment Response Timer Memory),
+		# optional plugins (uncomment to enable) are sorted according to performance implact
+#		[ 'Devel::Size', for => \&watch_for_size ], # https://github.com/dpavlin/p5-plack-devel-debug-devel-size
+#		[ 'DBIProfile', profile => 2 ],
+#		[ 'DBITrace', level => 1 ], # a LOT of fine-graded SQL trace
+#		[ 'Profiler::NYTProf', exclude => [qw(.*\.css .*\.png .*\.ico .*\.js .*\.gif)] ],
+	];
+
+	enable_if { $ENV{PLACK_DEBUG} } 'StackTrace';
+
+	enable_if { $ENV{INTRANETDIR} } "Plack::Middleware::Static",
+		path => qr{^/(intranet|opac)-tmpl/},
+		root => "$ENV{INTRANETDIR}/koha-tmpl/";
+
+	enable_if { $ENV{PLACK_MINIFIER} } "Plack::Middleware::Static::Minifier",
+		path => qr{^/(intranet|opac)-tmpl/},
+		root => "$ENV{INTRANETDIR}/koha-tmpl/";
+
+	mount "/cgi-bin/koha" => $app;
+
+};
+
diff --git a/misc/plack/plackup.sh b/misc/plack/plackup.sh
new file mode 100755
index 0000000..51573c5
--- /dev/null
+++ b/misc/plack/plackup.sh
@@ -0,0 +1,53 @@
+#!/bin/sh -xe
+
+# This is plack startup script for Koha
+
+# ./plackup.sh [site] [intranet]
+
+site=$1
+test ! -z "$site" && shift || site=srvgit # default
+
+export KOHA_CONF=/etc/koha/sites/$site/koha-conf.xml
+export LOGDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/logdir' $KOHA_CONF )"
+export INTRANETDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/intranetdir' $KOHA_CONF )"
+export OPACDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/opacdir' $KOHA_CONF | sed 's,/cgi-bin/opac,,' )"
+
+dir=`dirname $0`
+
+# enable memcache - it's safe even on installation which don't have it
+# since Koha has check on C4::Context
+#export MEMCACHED_SERVERS=localhost:11211
+# pass site name as namespace to perl code
+export MEMCACHED_NAMESPACE=$site
+#export MEMCACHED_DEBUG=1
+
+if [ ! -e "$INTRANETDIR/C4" ] ; then
+	echo "intranetdir in $KOHA_CONF doesn't point to Koha git checkout"
+	exit 1
+fi
+
+if [ -z "$1" ] ; then # type anything after site name for intranet!
+	INTRANET=0
+	PORT=5000
+else
+	INTRANET=1
+	PORT=5001
+	shift # pass rest of arguments to plackup
+fi
+export INTRANET # pass to plack
+
+# uncomment to enable logging
+#opt="$opt --access-log $LOGDIR/opac-access.log --error-log $LOGDIR/opac-error.log"
+
+# --max-requests 50 decreased from 1000 to keep memory usage sane
+# --workers 4       number of cores on machine
+#test "$INTRANET" != 1 && \ # don't use Starman for intranet
+opt="$opt --server Starman -M FindBin --max-requests 50 --workers 4"
+
+# -E deployment     turn off access log on STDOUT
+opt="-E deployment"
+
+# comment out reload in production!
+opt="$opt --reload -R $INTRANETDIR/C4 -R $INTRANETDIR/Koha"
+
+sudo -E -u $site-koha plackup --port $PORT -I $INTRANETDIR $opt $* $dir/koha.psgi
-- 
1.7.2.5


From dpavlin at rot13.org  Thu Apr  5 01:17:46 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Thu,  5 Apr 2012 01:17:46 +0200
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow SQL
	performance
Message-ID: <1333581466-14967-1-git-send-email-dpavlin@rot13.org>

ShelfBrowser uses two SQL queries with syntax

WHERE ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?)
AND homebranch = ? AND location = ? AND ccode = ?

homebranch already has index, and adding indexes on ccode and location
improves performance by 30% for each query since MySQL is able to use
index_merge intersect(items_ccode,homebranch,items_location)
---
 installer/data/mysql/updatedatabase.pl |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 503c8ee..f546136 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5146,6 +5146,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("CREATE INDEX items_location ON items(location)");
+    $dbh->do("CREATE INDEX items_ccode ON items(ccode)");
+    print "Upgrade to $DBversion done (items_location and items_ccode indexes added for ShelfBrowser)";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
-- 
1.7.2.5


From marc at msys.ch  Thu Apr  5 08:47:24 2012
From: marc at msys.ch (Marc Balmer)
Date: Thu, 05 Apr 2012 08:47:24 +0200
Subject: [Koha-patches] Update patch for 7802
Message-ID: <4F7D3FFC.3020703@msys.ch>

Updated patch for Bug 7802 after recent changes:

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7802

From marc at msys.ch  Thu Apr  5 08:59:29 2012
From: marc at msys.ch (Marc Balmer)
Date: Thu, 05 Apr 2012 08:59:29 +0200
Subject: [Koha-patches] Patch for Bug 7787
Message-ID: <4F7D42D1.9090200@msys.ch>

Patch for Bug 7787, make the SIP server more robust.

- Marc

From cnighswonger at foundations.edu  Thu Apr  5 15:40:11 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu,  5 Apr 2012 09:40:11 -0400
Subject: [Koha-patches] [PATCH] Bug 7902 - Adding Function to Check for
	Existence of Tables
Message-ID: <1333633211-22477-1-git-send-email-cnighswonger@foundations.edu>

This patch adds a function TableExists which checks for the existence
of a given table and returns 1 or 0 accordingly. This allows us to
check for the existence of a given table when doing operations on
tables which may not exist in a given database which, in turn, will
reduce the number of red errors which show up after an upgrade.

An example of its use is included in this patch.
---
 installer/data/mysql/updatedatabase.pl |   45 ++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 503c8ee..0b1c16e 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4893,19 +4893,21 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
 
 $DBversion = "3.07.00.025";
 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
-    $dbh->do( q|DROP TABLE bibliocoverimage;| );
-    $dbh->do(
-        q|CREATE TABLE biblioimages (
-          imagenumber int(11) NOT NULL AUTO_INCREMENT,
-          biblionumber int(11) NOT NULL,
-          mimetype varchar(15) NOT NULL,
-          imagefile mediumblob NOT NULL,
-          thumbnail mediumblob NOT NULL,
-          PRIMARY KEY (imagenumber),
-          CONSTRAINT bibliocoverimage_fk1 FOREIGN KEY (biblionumber) REFERENCES biblio (biblionumber) ON DELETE CASCADE ON UPDATE CASCADE
-          ) ENGINE=InnoDB DEFAULT CHARSET=utf8;|
-    );
-    print "Upgrade to $DBversion done (Correct table name for local cover images [please disregard the following error messages: \"Unknown table 'bibliocoverimage'...\" and \"Table 'biblioimages' already exists...\"])\n";
+    if (TableExists('bibliocoverimage')) {
+        $dbh->do( q|DROP TABLE bibliocoverimage;| );
+        $dbh->do(
+            q|CREATE TABLE biblioimages (
+              imagenumber int(11) NOT NULL AUTO_INCREMENT,
+              biblionumber int(11) NOT NULL,
+              mimetype varchar(15) NOT NULL,
+              imagefile mediumblob NOT NULL,
+              thumbnail mediumblob NOT NULL,
+              PRIMARY KEY (imagenumber),
+              CONSTRAINT bibliocoverimage_fk1 FOREIGN KEY (biblionumber) REFERENCES biblio (biblionumber) ON DELETE CASCADE ON UPDATE CASCADE
+              ) ENGINE=InnoDB DEFAULT CHARSET=utf8;|
+        );
+    }
+    print "Upgrade to $DBversion done (Correct table name for local cover images if needed. )\n";
     SetVersion($DBversion);
 }
 
@@ -5135,7 +5137,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
         $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTDetailsDisplay\" WHERE variable='OPACXSLTDetailsDisplay'");
         $dbh->do("UPDATE systempreferences SET type='Free', value=\"$valueOPACXSLTResultsDisplay\" WHERE variable='OPACXSLTResultsDisplay'");
     }
-    print "XSLT systempreference takes a path to file rather than YesNo\n";
+    print "Upgrade to $DBversion done (XSLT systempreference takes a path to file rather than YesNo)\n";
     SetVersion($DBversion);
 }
 
@@ -5148,6 +5150,21 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
 
 =head1 FUNCTIONS
 
+=head2 TableExists($table)
+
+=cut
+
+sub TableExists {
+    my $table = shift;
+    eval {
+                local $dbh->{PrintError} = 0;
+                local $dbh->{RaiseError} = 1;
+                $dbh->do(qq{SELECT * FROM $table WHERE 1 = 0 });
+            };
+    return 1 unless $@;
+    return 0;
+}
+
 =head2 DropAllForeignKeys($table)
 
 Drop all foreign keys of the table $table
-- 
1.7.0.4


From dpavlin at rot13.org  Thu Apr  5 15:48:23 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Thu,  5 Apr 2012 15:48:23 +0200
Subject: [Koha-patches] [PATCH] Bug 7872 - C4::Items::GetItemsInfo should
	use C4::Koha instead of SQL queries directly
Message-ID: <1333633703-7626-1-git-send-email-dpavlin@rot13.org>

This simplifies code, and has nice side-effect that memoize of
C4::Koha functions will be more effective.
---
 C4/Items.pm |   68 ++++++----------------------------------------------------
 1 files changed, 7 insertions(+), 61 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 0b2f99b..d7cc645 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1246,73 +1246,19 @@ sub GetItemsInfo {
         $data->{'datedue'}        = $datedue;
 
         # get notforloan complete status if applicable
-        my $sthnflstatus = $dbh->prepare(
-            'SELECT authorised_value
-            FROM   marc_subfield_structure
-            WHERE  kohafield="items.notforloan"
-        '
-        );
-
-        $sthnflstatus->execute;
-        my ($authorised_valuecode) = $sthnflstatus->fetchrow;
-        if ($authorised_valuecode) {
-            $sthnflstatus = $dbh->prepare(
-                "SELECT lib FROM authorised_values
-                 WHERE  category=?
-                 AND authorised_value=?"
-            );
-            $sthnflstatus->execute( $authorised_valuecode,
-                $data->{itemnotforloan} );
-            my ($lib) = $sthnflstatus->fetchrow;
-            $data->{notforloanvalue} = $lib;
+        if ( my $category = C4::Koha::GetAuthValCode( 'items.notforloan', $data->{frameworkcode} ) ) {
+            $data->{notforloanvalue} = C4::Koha::GetAuthorisedValueByCode( $category, $data->{itemnotforloan} );
         }
 
         # get restricted status and description if applicable
-        my $restrictedstatus = $dbh->prepare(
-            'SELECT authorised_value
-            FROM   marc_subfield_structure
-            WHERE  kohafield="items.restricted"
-        '
-        );
-
-        $restrictedstatus->execute;
-        ($authorised_valuecode) = $restrictedstatus->fetchrow;
-        if ($authorised_valuecode) {
-            $restrictedstatus = $dbh->prepare(
-                "SELECT lib,lib_opac FROM authorised_values
-                 WHERE  category=?
-                 AND authorised_value=?"
-            );
-            $restrictedstatus->execute( $authorised_valuecode,
-                $data->{restricted} );
-
-            if ( my $rstdata = $restrictedstatus->fetchrow_hashref ) {
-                $data->{restricted} = $rstdata->{'lib'};
-                $data->{restrictedopac} = $rstdata->{'lib_opac'};
-            }
+        if ( my $category = C4::Koha::GetAuthValCode( 'items.restricted', $data->{frameworkcode} ) ) {
+            $data->{restricted}     = C4::Koha::GetKohaAuthorisedValueLib( $category, $data->{restricted} );
+            $data->{restrictedopac} = C4::Koha::GetKohaAuthorisedValueLib( $category, $data->{restricted}, 'opac' );
         }
 
         # my stack procedures
-        my $stackstatus = $dbh->prepare(
-            'SELECT authorised_value
-             FROM   marc_subfield_structure
-             WHERE  kohafield="items.stack"
-        '
-        );
-        $stackstatus->execute;
-
-        ($authorised_valuecode) = $stackstatus->fetchrow;
-        if ($authorised_valuecode) {
-            $stackstatus = $dbh->prepare(
-                "SELECT lib
-                 FROM   authorised_values
-                 WHERE  category=?
-                 AND    authorised_value=?
-            "
-            );
-            $stackstatus->execute( $authorised_valuecode, $data->{stack} );
-            my ($lib) = $stackstatus->fetchrow;
-            $data->{stack} = $lib;
+        if ( my $category = C4::Koha::GetAuthValCode( 'items.stack', $data->{frameworkcode} ) ) {
+            $data->{stack}          = C4::Koha::GetKohaAuthorisedValueLib( $category, $data->{stack} );
         }
         # Find the last 3 people who borrowed this item.
         my $sth2 = $dbh->prepare("SELECT * FROM old_issues,borrowers
-- 
1.7.2.5


From cnighswonger at foundations.edu  Thu Apr  5 15:54:13 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu,  5 Apr 2012 09:54:13 -0400
Subject: [Koha-patches] [PATCH] Bug 6701 - login timeout is in seconds
Message-ID: <1333634053-23189-1-git-send-email-cnighswonger@foundations.edu>

From: Dobrica Pavlinusic <dpavlin at rot13.org>

I checked in C4/Auth and we are using perl time() for comparison with this value.

I also added description of specifying timeout in days which is available in code.

Robin Sheat suggested to document just lowercase d for days option, to reduce
confusion although uppercase D works as days specifier as well.

Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 .../prog/en/modules/admin/preferences/admin.pref   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index 52a9de1..08eb954 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -52,7 +52,7 @@ Administration:
             - Automatically log out users after
             - pref: timeout
               class: integer
-            - milliseconds of inactivity.
+            - seconds of inactivity. Adding d will specify it in days, e.g. 1d is timeout of one day.
         -
             - pref: AutoLocation
               default: 0
-- 
1.7.0.4


From adrien.saurat at biblibre.com  Thu Apr  5 16:44:10 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Thu,  5 Apr 2012 16:44:10 +0200
Subject: [Koha-patches] [PATCH] Bug 7905: display serial notes on several
	lines
Message-ID: <1333637050-7662-1-git-send-email-adrien.saurat@biblibre.com>

---
 .../prog/en/modules/serials/subscription-detail.tt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 1c34482..6fefaba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -372,10 +372,10 @@ $(document).ready(function() {
             <li><span class="label">History end date:</span> [% histenddate %]</li>
             <li><span class="label">Received issues:</span>[% recievedlist %]</li>
             <li><span class="label">Missing issues:</span>[% missinglist %]</li>
-            <li><span class="label">Nonpublic note:</span>[% internalnotes %]</li>
-            <li><span class="label">Public note:</span>[% notes %]</li>
-            <li><span class="label">History staff note</span>[% librariannote %]</li>
-            <li><span class="label">History OPAC note</span>[% opacnote %]</li>
+            <li><span class="label">Nonpublic note:</span>[% internalnotes FILTER html_line_break %]</li>
+            <li><span class="label">Public note:</span>[% notes FILTER html_line_break %]</li>
+            <li><span class="label">History staff note</span>[% librariannote FILTER html_line_break %]</li>
+            <li><span class="label">History OPAC note</span>[% opacnote FILTER html_line_break %]</li>
         </ol>
     </div>
     </div>
-- 
1.7.4.1


From oleonard at myacpl.org  Thu Apr  5 17:06:13 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  5 Apr 2012 11:06:13 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_2780_-_Capitalize_string?=
	=?utf-8?q?s_consistently_=28OPAC_pages=29?=
Message-ID: <1333638373-5557-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in OPAC templates
---
 koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt       |   42 ++++++------
 koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt   |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt |    6 +-
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt   |    4 +-
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt   |    8 +-
 .../opac-tmpl/prog/en/modules/opac-account.tt      |   12 ++--
 .../prog/en/modules/opac-addbybiblionumber.tt      |   10 ++--
 .../opac-tmpl/prog/en/modules/opac-advsearch.tt    |   66 +++++++++---------
 .../prog/en/modules/opac-alert-subscribe.tt        |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |   10 ++--
 .../prog/en/modules/opac-authorities-home.tt       |    8 +-
 .../prog/en/modules/opac-authoritiesdetail.tt      |    2 +-
 .../en/modules/opac-authoritiessearchresultlist.tt |   12 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt |   18 +++---
 .../opac-tmpl/prog/en/modules/opac-browser.tt      |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   60 ++++++++--------
 .../opac-tmpl/prog/en/modules/opac-downloadcart.tt |    4 +-
 .../prog/en/modules/opac-downloadshelf.tt          |    4 +-
 .../prog/en/modules/opac-full-serial-issues.tt     |    4 +-
 .../opac-tmpl/prog/en/modules/opac-imageviewer.tt  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt   |    4 +-
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |   18 +++---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt |   18 +++---
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    2 +-
 .../prog/en/modules/opac-readingrecord.tt          |   14 ++--
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |   26 ++++----
 .../prog/en/modules/opac-results-grouped.tt        |   26 ++++----
 .../opac-tmpl/prog/en/modules/opac-results.tt      |   52 +++++++-------
 koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt |    6 +-
 .../prog/en/modules/opac-search-history.tt         |    2 +-
 .../opac-tmpl/prog/en/modules/opac-sendbasket.tt   |    6 +-
 .../prog/en/modules/opac-sendbasketform.tt         |    8 +-
 .../opac-tmpl/prog/en/modules/opac-sendshelf.tt    |    8 +-
 .../prog/en/modules/opac-sendshelfform.tt          |    6 +-
 .../prog/en/modules/opac-serial-issues.tt          |   10 ++--
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |   48 +++++++-------
 .../opac-tmpl/prog/en/modules/opac-showmarc.tt     |    2 +-
 .../prog/en/modules/opac-showreviews-rss.tt        |    4 +-
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |    4 +-
 .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |   16 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt   |    4 +-
 .../opac-tmpl/prog/en/modules/opac-tags_subject.tt |    2 +-
 .../opac-tmpl/prog/en/modules/opac-topissues.tt    |    6 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |   34 +++++-----
 .../opac-tmpl/prog/en/modules/opac-userdetails.tt  |   28 ++++----
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |   70 ++++++++++----------
 koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt    |   12 ++--
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |   22 +++---
 54 files changed, 381 insertions(+), 381 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt
index a24550f..a7ff04b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="error400">
@@ -9,7 +9,7 @@
 <div id="yui-main">
 <div class="yui-b">
 <div class="yui-g">
-            <h3>An Error has Occurred</h3>
+            <h3>An error has occurred</h3>
             <h4>Error 400</h4>
             <ul>
                 <li>This error means that the Koha is pointed an invalid link.</li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt
index 8d474a8..59b9042 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="error401">
@@ -9,7 +9,7 @@
 <div id="yui-main">
 <div class="yui-b">
 <div class="yui-g">
-            <h3>An Error has Occurred</h3>
+            <h3>An error has occurred</h3>
             <h4>Error 401</h4>
             <ul>
                 <li>This error means that the you are trying to access a link that you're not authorized to see.</li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt
index 1741a69..8cd222e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="error402">
@@ -9,7 +9,7 @@
 <div id="yui-main">
 <div class="yui-b">
 <div class="yui-g">
-            <h3>An Error has Occurred</h3>
+            <h3>An error has occurred</h3>
             <h4>Error 402</h4>
             <ul>
                 <li>This error means that the Koha is pointed an invalid link.</li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt
index 38e83dd..8bb7d7d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="error403">
@@ -9,7 +9,7 @@
 <div id="yui-main">
 <div class="yui-b">
 <div class="yui-g">
-            <h3>An Error has Occurred</h3>
+            <h3>An error has occurred</h3>
             <h4>Error 403</h4>
             <ul>
                 <li>This error means that you are forbidden for some reason to see this page.</li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt
index 68301ca..5f48381 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="error404">
@@ -9,7 +9,7 @@
 <div id="yui-main">
 <div class="yui-b">
 <div class="yui-g">
-            <h3>An Error has Occurred</h3>
+            <h3>An error has occurred</h3>
             <h4>Error 404</h4>
             <ul>
                 <li>This error means that the link was broken and that the page doesn't exist.</li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt
index 72243e5..7354bf5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="error500">
@@ -9,7 +9,7 @@
 <div id="yui-main">
 <div class="yui-b">
 <div class="yui-g">
-            <h3>An Error has Occurred</h3>
+            <h3>An error has occurred</h3>
             <h4>Error 500</h4>
             <ul>
                 <li>An error occurred while try to process your request.</li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt
index 219dc41..9311599 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] &rsaquo; ILS-DI
+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] &rsaquo; ILS-DI
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body>
@@ -36,11 +36,11 @@
                     <dt><strong>return_fmt</strong> (Optional)</dt>
                     <dd>requests a particular format or set of formats in reporting availability</dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=GetAvailability&amp;id=1+2+99999&amp;id_type=item">
                     ilsdi.pl?service=GetAvailability&amp;id=1+2+99999&amp;id_type=item
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;dlf:collection
   xmlns:dlf="http://diglib.org/ilsdi/1.1"
@@ -113,7 +113,7 @@
                 <a href="ilsdi.pl?service=GetRecords&amp;id=1+2+99999">
                     ilsdi.pl?service=GetRecords&amp;id=1+2+99999
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;GetRecords&gt;
   &lt;record&gt;
@@ -313,11 +313,11 @@
                         </ul>
                     </dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=GetAuthorityRecords&amp;id=1+2+99999">
                     ilsdi.pl?service=GetAuthorityRecords&amp;id=1+2+99999
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;xml version="1.0" encoding="UTF-8"&gt;;
 &lt;GetAuthorityRecords&gt;
   &lt;record&gt;
@@ -371,11 +371,11 @@
                         </ul>
                     </dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=LookupPatron&amp;id=815&amp;id_type=cardnumber">
                     ilsdi.pl?service=LookupPatron&amp;id=815&amp;id_type=cardnumber
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;LookupPatron&gt;
   &lt;id&gt;419&lt;/id&gt;
@@ -392,7 +392,7 @@
                     <dt><strong>password</strong> (Required)</dt>
                     <dd>user's password</dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=AuthenticatePatron&amp;username=john9&amp;password=soul">
                     ilsdi.pl?service=AuthenticatePatron&amp;username=john9&amp;password=soul
                 </a>
@@ -422,11 +422,11 @@
                     <dt><strong>show_loans</strong> (Optional, default 0)</dt>
                     <dd>whether or not to return loan information in the response</dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=GetPatronInfo&amp;patron_id=1&amp;show_contact=0&amp;show_loans=1">
                     ilsdi.pl?service=GetPatronInfo&amp;patron_id=1&amp;show_contact=0&amp;show_loans=1
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;GetPatronInfo&gt;
   &lt;category_type&gt;A&lt;/category_type&gt;
@@ -541,7 +541,7 @@
                     <dt><strong>patron_id</strong> (Required)</dt>
                     <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=GetPatronStatus&amp;patron_id=1">
                     ilsdi.pl?service=GetPatronStatus&amp;patron_id=1
                 </a>
@@ -564,11 +564,11 @@
                     <dt><strong>item_id</strong> (Required)</dt>
                     <dd>system item identifier</dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=GetServices&amp;patron_id=1&amp;item_id=1">
                     ilsdi.pl?service=GetServices&amp;patron_id=1&amp;item_id=1
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;GetServices&gt;
   &lt;AvailableFor&gt;title level hold&lt;/AvailableFor&gt;
@@ -588,11 +588,11 @@
                     <dt><strong>desired_due_date</strong> (Required)</dt>
                     <dd>the date the patron would like the item returned by</dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=RenewLoan&amp;patron_id=1&amp;item_id=1">
                     ilsdi.pl?service=RenewLoan&amp;patron_id=1&amp;item_id=1
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;RenewLoan&gt;
   &lt;success&gt;0&lt;/success&gt;
@@ -623,7 +623,7 @@
                 <a href="ilsdi.pl?service=HoldTitle&amp;patron_id=1&amp;bib_id=1&amp;request_location=127.0.0.1">
                     ilsdi.pl?service=HoldTitle&amp;patron_id=1&amp;bib_id=1&amp;request_location=127.0.0.1
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;HoldTitle&gt;
   &lt;title&gt;(les) gal?res de l'Orf?vre&lt;/title&gt;
@@ -654,7 +654,7 @@
                 <a href="ilsdi.pl?service=HoldItem&amp;patron_id=1&amp;bib_id=1&amp;item_id=1">
                     ilsdi.pl?service=HoldItem&amp;patron_id=1&amp;bib_id=1&amp;item_id=1
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;HoldTitle&gt;
   &lt;title&gt;(les) gal?res de l'Orf?vre&lt;/title&gt;
@@ -673,11 +673,11 @@
                     <dt><strong>item_id</strong> (Required)</dt>
                     <dd>system item identifier</dd>
                 </dl>
-                <h4>Example Call</h4>
+                <h4>Example call</h4>
                 <a href="ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1">
                     ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1
                 </a>
-                <h4>Example Response</h4>
+                <h4>Example response</h4>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;CancelHold&gt;
   &lt;message&gt;Canceled&lt;/message&gt;
@@ -685,7 +685,7 @@
 
 [% ELSE %]
 
-                <h2>Level 1: Basic Discovery Interfaces</h2>
+                <h2>Level 1: Basic discovery interfaces</h2>
                 <ul>
                     <li>HarvestBibliographicRecords <em>(Use OAI-PMH instead)</em></li>
                     <li>HarvestExpandedRecords <em>(Use OAI-PMH instead)</em></li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt
index 342dbfa..61ef820 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body>
@@ -10,7 +10,7 @@
 <div id="kohaerrorcontainer" class="container">
 <div id="kohaerror">
 <div class="dialog message">
-<h3>An Error has Occurred</h3>
+<h3>An error has occurred</h3>
 [% IF ( noadminemail ) %]
 <p>An error occurred when sending your message to the administrator. Please visit the library to update your personal details. </p>
 <p><a href="/cgi-bin/koha/opac-user.pl">Return to your summary.</a></p>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt
index 4414ab5..b979c1b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
 #opac-maintenance-message {
@@ -20,8 +20,8 @@ width:50%;
   [% END %]
    <div id="bd">
 <div id="opac-maintenance-message">
-<h2>System Maintenance</h2>
-<p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress %]">Site Administrator</a></p>
+<h2>System maintenance</h2>
+<p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress %]">site administrator</a></p>
 </div>
 </div>
 [% INCLUDE 'opac-bottom.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
index 97b64ad..35f1895 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; ISBD View
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; ISBD view
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
@@ -37,7 +37,7 @@
     <div id="catalogue_detail_biblio">
 	
      <div id="views">
-	 <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal View</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC View</a></span> <span class="view"><span id="ISBDview">ISBD View</span></span></div>
+     <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal view</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC view</a></span> <span class="view"><span id="ISBDview">ISBD view</span></span></div>
 
     <div id="isbdcontents">[% ISBD %]</div>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
index f3d2c91..810bba8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  MARC Details for Record No. [% biblionumber %]
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  MARC details for record no. [% biblionumber %]
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
@@ -67,10 +67,10 @@ $(document).ready(function(){
     <div id="catalogue_detail_biblio">
 
     <div id="views">
-    <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal View</a></span>
+    <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal view</a></span>
 
-<span class="view"><span id="MARCview">MARC View</span></span>
-[% IF ( ISBD ) %]<span class="view"><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD View</a></span>[% END %]
+<span class="view"><span id="MARCview">MARC view</span></span>
+[% IF ( ISBD ) %]<span class="view"><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD view</a></span>[% END %]
 </div>
     <h1 class="title">[% bibliotitle %] (Record no. [% biblionumber %])</h1>
     [% IF ( OPACXSLTDetailsDisplay ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
index 9549ea2..581b948 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
@@ -1,6 +1,6 @@
 [% USE KohaDates %]
 
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your fines and charges
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your fines and charges
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-account">
@@ -13,7 +13,7 @@
 		<div id="useraccount" class="container">
 <!--CONTENT-->
     [% FOREACH BORROWER_INF IN BORROWER_INFO %]
-        <h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Fines and Charges</h3>
+        <h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Fines and charges</h3>
     [% END %]
 
     [% IF ( ACCOUNT_LINES ) %]
@@ -22,14 +22,14 @@
                 <tr>
                     <th>Date</th>
                     <th>Description</th>
-                    <th>Fine Amount</th>
-                    <th>Amount Outstanding</th>
+                    <th>Fine amount</th>
+                    <th>Amount outstanding</th>
                 </tr>
             </thead>
 
             <tfoot>
             <tr>
-                <th class="sum" colspan="3">Total Due</th>
+                <th class="sum" colspan="3">Total due</th>
                 <td class="sum">[% total %]</td>
             </tr>
             </tfoot>
@@ -48,7 +48,7 @@
 
         </table>
     [% ELSE %]
-        <h4>You have no Fines or Charges</h4>
+        <h4>You have no fines or charges</h4>
     [% END %]
 </div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
index e9370c8..a1e1f9b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Add to Your List
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Add to your list
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
    #custom-doc { width:34.62em;*width:33.78em;min-width:450px; margin:auto; margin-top: .4em;text-align:left; }
@@ -24,8 +24,8 @@
 		</ul>
 		[% IF ( existingshelves ) %]
 			<form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="post">
-    		<fieldset class="rows"><legend>Select a List</legend>
-			<ol><li>    <label for="shelfnumber">Add to list:</label> <select name="shelfnumber" id="shelfnumber">
+            <fieldset class="rows"><legend>Select a list</legend>
+            <ol><li>    <label for="shelfnumber">Add to list:</label> <select name="shelfnumber" id="shelfnumber">
 				[% IF ( privatevirtualshelves ) %]<optgroup label="Private Lists">
 					[% FOREACH privatevirtualshelve IN privatevirtualshelves %]
 					<option value="[% privatevirtualshelve.shelfnumber %]">[% privatevirtualshelve.shelfname %]</option>
@@ -54,10 +54,10 @@
 		[% END %]
 	[% END %]
 	[% UNLESS ( singleshelf ) %]<form name="f2" method="post" action="/cgi-bin/koha/opac-addbybiblionumber.pl">
-		<fieldset class="rows">    <legend>Add to a New List:</legend>
+        <fieldset class="rows">    <legend>Add to a new list:</legend>
 		<ol><li>
 		<label for="newvirtualshelf">
-		List Name:
+        List name:
 		</label>
 		<input type="text" name="newvirtualshelf" id="newvirtualshelf" size="40" />
 		</li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
index d4e92b4..4698324 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %]
-    Catalog &rsaquo; Advanced Search
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %]
+    catalog &rsaquo; Advanced search
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" language="javascript">//<![CDATA[
             $(document).ready(function() {
@@ -68,36 +68,36 @@
             <option value="kw">Keyword</option>
             <option value="su,wrdl">Subject</option>
 [% IF ( search_boxes_loo.expanded_options ) %]
-            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject Phrase</option>
+            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject phrase</option>
 [% END %]
             <option value="ti">Title</option>
 [% IF ( expanded_options ) %]
-            <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase</option>
-            <option value="se,wrdl">Series Title</option>
-            <option value="callnum">Call Number</option>
-            <option value="location">Shelving Location</option>
+            <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title phrase</option>
+            <option value="se,wrdl">Series title</option>
+            <option value="callnum">Call number</option>
+            <option value="location">Shelving location</option>
 [% END %]
             <option value="au,wrdl">Author</option>
             
 [% IF ( expanded_options ) %]
-            <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>
-            <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
-            <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
-            <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name Phrase</option>
-            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
-            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
+            <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author phrase</option>
+            <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
+            <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
+            <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name phrase</option>
+            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
+            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name phrase</option>
 [% END %]
 [% IF ( expanded_options ) %]
             <option value="nt">Notes/Comments</option>
             <option value="curriculum">Curriculum</option>
 [% END %]
             <option value="pb,wrdl">Publisher</option>
-            <option value="pl,wrdl">Publisher Location</option>
+            <option value="pl,wrdl">Publisher location</option>
 [% IF ( expanded_options ) %]
-            <option value="sn">Standard Number</option>
+            <option value="sn">Standard number</option>
             <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
             <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
-            <option value="lcn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
+            <option value="lcn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
 [% ELSE %]
             <option value="nb">ISBN</option>
 [% END %]
@@ -117,18 +117,18 @@
 
     <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
     [% IF ( expanded_options ) %]
-        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer Options]</a>
+        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer options]</a>
     [% ELSE %]
         <a href="/cgi-bin/koha/opac-search.pl?expanded_options=1">[More options]</a>
     [% END %]
-    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New Search]</a>
+    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New search]</a>
 
 <!-- /SEARCH BUTTONS --></div></div>
 <div class="yui-g">
 <div id="pubrange" class="container">
 <fieldset>
 <!-- PUB RANGE OPTION -->
-<legend>Publication Date Range:</legend>
+<legend>Publication date range:</legend>
 <span>For example:  1999-2001.  You could also use "-1987" for everything published before 1987 or "2008-" for everything published after 2008.</span>
 <input type="text" size="30" name="limit-yr" title="Enter search terms" value="" />
 </fieldset>
@@ -141,10 +141,10 @@
       [% FOREACH advsearchloo IN advancedsearchesloop %]
         <li id="advsearch-tab-[% advsearchloo.advanced_search_type %]">
            <a href="/cgi-bin/koha/opac-search.pl#advsearch-[% advsearchloo.advanced_search_type %]">
-           [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item Type
+           [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
            [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
-           [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving Location
-           [% ELSE %]Something Else
+           [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
+           [% ELSE %]Something else
            [% END %]
            </a>
         </li>
@@ -172,7 +172,7 @@
     <!-- LANGUAGE LIMIT -->
                 <p><label for="language-limit">Language: </label>                                        
                 <select id="language-limit" name="limit">
-                <option value="">No Limit</option>
+                <option value="">No limit</option>
                 [% FOREACH search_languages_loo IN search_languages_loop %]
                     [% IF ( search_languages_loo.selected ) %]
                         <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]" selected="selected">[% search_languages_loo.language_description %]</option>
@@ -189,17 +189,17 @@
         <!-- SUBTYPE LIMITS -->
             <div id="subtypes" class="container"><fieldset>
             <legend>Subtype limits</legend><select name="limit" class="subtype">
-                <option value="" selected="selected" class="menuheader">Any Audience</option>
+                <option value="" selected="selected" class="menuheader">Any audience</option>
                     <option value="aud:a">Easy</option>
                     <option value="aud:c">Juvenile</option>
-                    <option value="aud:d">Young Adult</option>
+                    <option value="aud:d">Young adult</option>
                     <option value="aud:e">Adult</option>
                 </select>
             
             <select name="limit" class="subtype">
-                <option value="" selected="selected" class="menuheader">Any Content</option>
+                <option value="" selected="selected" class="menuheader">Any content</option>
                     <option value="fic:1">Fiction</option>
-                    <option value="fic:0">Non Fiction</option>
+                    <option value="fic:0">Non fiction</option>
                     <option value="bio:b">Biography</option>
                     <option value="mus:j">Musical recording</option>
                     <option value="mus:i">Non-musical recording</option>
@@ -207,7 +207,7 @@
     
             
             <select name="limit" class="subtype">
-                <option value="" selected="selected" class="menuheader">Any Format</option>
+                <option value="" selected="selected" class="menuheader">Any format</option>
                     <option value="l-format:ta">Regular print</option>
                     <option value="l-format:tb">Large print</option>
                     <option value="l-format:fk">Braille</option>
@@ -216,12 +216,12 @@
                     <option value="l-format:ss">Cassette recording</option>
                     <option value="l-format:vf">VHS tape / Videocassette</option>
                     <option value="l-format:vd">DVD video / Videodisc</option>
-                    <option value="l-format:co">CD Software</option>
+                    <option value="l-format:co">CD software</option>
                     <option value="l-format:cr">Website</option>
                 </select>
             
             <select name="limit" class="subtype">
-                <option value="">Additional Content Types for Books/Printed Materials</option>
+                <option value="">Additional content types for books/printed materials</option>
                     <option value="ctype:a">Abstracts/summaries</option>
                     <option value="ctype:b">Bibliographies</option>
                     <option value="ctype:c">Catalogs</option>
@@ -274,7 +274,7 @@
         </select>
         [% IF ( searchdomainloop ) %]
             <p>OR</p> <!-- should addjs to grey out group pulldown if a library is selected. -->
-                <label for="categoryloop">Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
+                <label for="categoryloop">Groups of libraries</label><select name="multibranchlimit" id="categoryloop">
                 <option value=""> -- none -- </option>
                 [% FOREACH searchdomainloo IN searchdomainloop %]
                 <option value="[% searchdomainloo.categorycode %]">[% searchdomainloo.categoryname %]</option>
@@ -300,11 +300,11 @@
 
     <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
     [% IF ( expanded_options ) %]
-        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer Options]</a>
+        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer options]</a>
     [% ELSE %]
         <a href="/cgi-bin/koha/opac-search.pl?expanded_options=1">[More options]</a>
     [% END %]
-    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New Search]</a>
+    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New search]</a>
 
 <!-- /SEARCH BUTTONS --></div></div>
 </form>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
index 4281a46..07d91a2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Serials
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Serials
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-alert-subscribe">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
index febe4d2..6a1bb48 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
@@ -1,8 +1,8 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] 
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] 
 [% IF ( opacuserlogin ) %]
- Catalog &rsaquo;  Log in to Your Account
+ catalog &rsaquo;  Log in to your account
 [% ELSE %]
- Catalog &rsaquo; Catalog Login Disabled
+ catalog &rsaquo; Catalog login disabled
 [% END %]
 [% INCLUDE 'doc-head-close.inc' %]
 
@@ -46,7 +46,7 @@
 [% END %]
 
 [% IF ( casAuthentication ) %]
-<h4>Cas Login</h4>
+<h4>Cas login</h4>
 
 [% IF ( invalidCasLogin ) %]
 <!-- This is what is displayed if cas login has failed -->
@@ -67,7 +67,7 @@ please choose against which one you would like to authenticate: </p>
 [% END %]
 </ul>
 
-<h4>Local Login</h4>
+<h4>Local login</h4>
 <p>If you do not have a CAS account, but a local account, you can still log in : </p>
 
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
index 080fa58..04d5a8c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Browse by author or subject
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Browse by author or subject
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-authorities">
@@ -15,7 +15,7 @@
 <fieldset class="rows">
             <legend>Browse by author or subject</legend>
 <ol>
- <li><label for="authtypecode">Search: : </label> <select name="authtypecode" id="authtypecode">
+ <li><label for="authtypecode">Search: </label> <select name="authtypecode" id="authtypecode">
                 [% FOREACH authtypesloo IN authtypesloop %]
                 [% IF ( authtypesloo.selected ) %]<option value="[% authtypesloo.value %]" selected="selected">[% authtypesloo.authtypetext %]</option>
                 [% ELSE %]<option value="[% authtypesloo.value %]"> [% authtypesloo.authtypetext %]</option>
@@ -34,8 +34,8 @@
             </li>
             <li><label for="orderby">Order by: </label><select name="orderby" id="orderby">
                 <option value="">None</option>
-                    <option value="HeadingAsc" selected="selected">Heading Ascendant</option>
-                    <option value="HeadingDsc">Heading Descendant</option>
+                    <option value="HeadingAsc" selected="selected">Heading ascendant</option>
+                    <option value="HeadingDsc">Heading descendant</option>
                 </select>
             </li></ol>
 			</fieldset>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tt
index 048de5b..287f6d1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Entry
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Entry
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF ( displayhierarchy ) %]
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/hierarchy.css">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
index 6638826..5fdfb27 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; [% IF ( total ) %]Authority Search Result[% ELSE %]No results found[% END %]
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; [% IF ( total ) %]Authority search result[% ELSE %]No results found[% END %]
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-authoritiesresultlist">
@@ -39,12 +39,12 @@
 <div class="searchresults">
 		<table>
 			<tr>
-				<th>Authorized Headings</th>
-				<th>Type of Heading</th>
+                <th>Authorized headings</th>
+                <th>Type of heading</th>
 				[% UNLESS ( isEDITORS ) %]
-					<th>Biblio records</th>
+                    <th>Biblio records</th>
 				[% END %]
-				<th>Full Heading</th>				
+                <th>Full heading</th>
 			</tr>
 			[% FOREACH resul IN result %]
             [% UNLESS ( loop.odd ) %]
@@ -63,7 +63,7 @@
 						</td>
 					[% END %]
 						<td>
-							<a href="opac-authoritiesdetail.pl?authid=[% resul.authid %]">View Full Heading</a>
+                            <a href="opac-authoritiesdetail.pl?authid=[% resul.authid %]">View full heading</a>
 						</td>
 				</tr>
 			[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
index 437cbd2..c4d40ed 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your Cart
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your cart
     [% IF ( print_basket ) %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
@@ -140,12 +140,12 @@ function enableCheckboxActions(){
 [% UNLESS ( print_basket ) %]
 <div id="toolbar">
 <ul>
-	<li>[% IF ( verbose ) %]<a href="opac-basket.pl" class="brief" onclick="showLess(); return false;">Brief Display</a>[% ELSE %]<a href="opac-basket.pl" class="detail" onclick="showMore(); return false;">More Details</a>[% END %]</li>
+    <li>[% IF ( verbose ) %]<a href="opac-basket.pl" class="brief" onclick="showLess(); return false;">Brief display</a>[% ELSE %]<a href="opac-basket.pl" class="detail" onclick="showMore(); return false;">More details</a>[% END %]</li>
 	[% IF ( opacuserlogin ) %]<li><a class="send" href="opac-basket.pl" onclick="sendBasket(); return false;">Send</a></li>[% END %]
 	<li><a class="download" href="opac-basket.pl" onclick="downloadBasket(); return false;">Download</a></li>
 	<li><a class="print" href="opac-basket.pl" onclick="printBasket(); return false;">Print</a></li>
-	<li><a class="empty" href="opac-basket.pl" onclick="delBasket(); return false;">Empty and Close</a></li>
-	<li><a class="hide close" href="opac-basket.pl">Hide Window</a></li>
+    <li><a class="empty" href="opac-basket.pl" onclick="delBasket(); return false;">Empty and close</a></li>
+    <li><a class="hide close" href="opac-basket.pl">Hide window</a></li>
 </ul>
 </div>
         [% END %]
@@ -164,7 +164,7 @@ function enableCheckboxActions(){
 [% END %]
 </span>
      <span id="tagsel_form" style="display:none">
-       <label for="tagsel_new" style="display:inline">New&nbsp;Tag:</label>
+       <label for="tagsel_new" style="display:inline">New&nbsp;tag:</label>
        <input name="tagsel_new" id="tagsel_new" maxlength="100" style="display:inline"/>
        <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button"
            type="submit" value="Add" style="display:inline" />
@@ -296,7 +296,7 @@ function enableCheckboxActions(){
 
         [% IF ( BIBLIO_RESULT.MARCurlS ) %]
         <tr>
-            <th scope="row">url(s)</th>
+            <th scope="row">URL(s)</th>
             <td>
 	   [% FOREACH MARCurl IN BIBLIO_RESULT.MARCurlS %]
 		<p>[% IF ( MARCurl.part ) %][% MARCurl.part %]
@@ -326,8 +326,8 @@ function enableCheckboxActions(){
 [% UNLESS ( print_basket ) %]
 <form action="/cgi-bin/koha/opac-basket.pl" method="get" name="bookbag_form" id="bookbag_form" class="checkboxed">
 <div id="selections-toolbar">
-    <a id="CheckAll" href="#">Select All</a>
-    <a id="CheckNone" href="#">Clear All</a>
+    <a id="CheckAll" href="#">Select all</a>
+    <a id="CheckNone" href="#">Clear all</a>
     <span class="sep">|</span> <span class="links"><span id="selections">Select titles to: </span>
         <a href="#" class="deleteshelf disabled" onclick="delSelRecords(); return false;">Remove</a>
     [% IF ( opacuserlogin ) %]
@@ -340,7 +340,7 @@ function enableCheckboxActions(){
     [% END %]
     </span>
          [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]<span id="tagsel_form" style="display:none">
-           <label for="tagsel_new" style="display:inline">New&nbsp;Tag:</label>
+           <label for="tagsel_new" style="display:inline">New&nbsp;tag:</label>
            <input name="tagsel_new" id="tagsel_new" maxlength="100"  style="display:inline"/>
            <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add"  style="display:inline"/>
            <a href="#" id="tagsel_cancel" onclick="tagCanceled(); return false;" style="display:inline">Cancel</a>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
index ab0fad2..dff5743 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  ISBD
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  ISBD
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-browser">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index a5be324..ea1d719 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -1,6 +1,6 @@
 [% USE KohaDates %]
 
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %]
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %]
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tools.min.js"></script>
@@ -245,7 +245,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
     <div id="bookcover">
     [% IF ( OPACLocalCoverImages ) %]<div style="block" title="[% biblionumber |url %]" class="[% biblionumber %]" id="local-thumbnail-preview"></div>[% END %]
-    [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover Image" /></a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover Image" /></a>[% END %][% END %][% END %]
+    [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>[% END %][% END %][% END %]
 
     [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( content_identifier_exists ) %][% IF ( using_https ) %]
     <img src="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/[% SyndeticsCoverImageSize %].GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% normalized_upc %]&amp;oclc=[% normalized_oclc %]" alt="" class="thumbnail" />
@@ -265,7 +265,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <span class="Z3988" title="[% ocoins %]"></span>
     [% END %]
 
-    <div id="views"><span class="view"><span id="Normalview">Normal View</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC View</a></span> [% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD View</a></span>[% END %]
+    <div id="views"><span class="view"><span id="Normalview">Normal view</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC view</a></span> [% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD view</a></span>[% END %]
     </div>
     [% IF ( OPACXSLTDetailsDisplay ) %]
         [% XSLTBloc %]
@@ -367,7 +367,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     </span>[% END %]
 
     [% IF ( MARCURLS ) %]
-    <div class="results_summary"><span class="label">Online Resources:</span>
+    <div class="results_summary"><span class="label">Online resources:</span>
     <ul>    [% FOREACH MARCurl IN MARCURLS %]
         <li>[% IF ( MARCurl.part ) %][% MARCurl.part %]
             <br />[% END %] 
@@ -452,7 +452,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
         [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsSeries ) %][% IF ( SyndeticsSERIES1Exists ) %]
         <span class="results_summary">
-        <span class="label">Series Information:</span>
+        <span class="label">Series information:</span>
 
         [% IF ( using_https ) %]<a target="_blank" href="https://secure.syndetics.com/ffseries.aspx?isbn=[% normalized_isbn %]&amp;type=series&amp;num=1&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]">Click to open in new window</a>
         [% ELSE %]
@@ -462,7 +462,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         [% END %][% END %]
         [% IF ( SyndeticsAVPROFILEExists ) %]
         <span class="results_summary">
-        <span class="label">Audiovisual Profile:</span>
+        <span class="label">Audiovisual profile:</span>
         [% IF ( using_https ) %]<a target="_blank" href="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/avprofile.html&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]&amp;type=xw10">Click to open in new window</a>
         [% ELSE %]
         <a target="_blank" href="http://www.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/avprofile.html&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]&amp;type=xw10">Click to open in new window</a>
@@ -471,7 +471,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         [% END %]
         [% IF ( SyndeticsFICTIONExists ) %]
         <span class="results_summary">
-        <span class="label">Fiction Notes:</span>
+        <span class="label">Fiction notes:</span>
         [% IF ( using_https ) %]<a target="_blank" href="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/fiction.html&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]&amp;type=xw10">Click to open in new window</a>
         [% ELSE %]
         <a target="_blank" href="http://www.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/fiction.html&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]&amp;type=xw10">Click to open in new window</a>
@@ -490,7 +490,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
     [% IF ( BakerTaylorContentURL ) %]
         <span class="results_summary">
-        <span class="label">Enhanced Content: </span> 
+        <span class="label">Enhanced content: </span> 
               [% IF ( OPACurlOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL |html %]" target="_blank">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL |html %]">Content Cafe</a>[% END %]
         </span>
     [% END %]
@@ -520,7 +520,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% IF ( defaulttab == 'holdings' ) %]<li id="tab_holdings" class="ui-tabs-selected">[% ELSE %]<li id="tab_holdings">[% END %]
     <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#holdings">Holdings ( [% count %] )</a>
 </li>
-<li id="tab_descriptions"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#descriptions">Title Notes</a></li>
+<li id="tab_descriptions"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#descriptions">Title notes</a></li>
 [% IF ( SYNDETICS_TOC ) %]
     <li id="tab_toc"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#toc">TOC</a></li>
 [% END %]
@@ -541,13 +541,13 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         </li>
     [% END %][% END %]
     [% IF ( SyndeticsAuthorNotes ) %][% IF ( SYNDETICS_ANOTES ) %]
-        <li id="tab_anotes"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#anotes">About the Author</a></li>
+        <li id="tab_anotes"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#anotes">About the author</a></li>
     [% END %][% END %]
 [% END %]
 [% IF ( LibraryThingForLibrariesID ) %] 
 [% IF ( LibraryThingForLibrariesTabbedView ) %]
-    <li id="tab_LFTLSimilarItems"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#LFTLSimilarItems">Similar Items</a></li>
-    <li id="tab_LTFLTagBrowse"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#LTFLTagBrowse">Tag Browser</a></li>
+    <li id="tab_LFTLSimilarItems"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#LFTLSimilarItems">Similar items</a></li>
+    <li id="tab_LTFLTagBrowse"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#LTFLTagBrowse">Tag browser</a></li>
 [% END %]
 [% END %]
 [% IF ( subscriptionsnumber ) %]
@@ -574,7 +574,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% END %][% END %]
 
 [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonReviews ) %]
-    <li id="tab_amazonreviews"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#amazonreviews">Amazon Reviews</a></li>
+    <li id="tab_amazonreviews"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#amazonreviews">Amazon reviews</a></li>
 [% END %][% END %]
 [% IF ( Babeltheque ) %]
     <li id="tab_babeltheque"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#babeltheque">Babelth?que</a></li>
@@ -582,7 +582,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
 [% IF ( serialcollection ) %]
     [% IF ( defaulttab == 'serialcollection' ) %]<li id="tab_serialcollection" class="ui-tabs-selected">[% ELSE %]<li id="tab_serialcollection">[% END %]
-        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#serialcollection">Serial Collection</a>
+        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#serialcollection">Serial collection</a>
     </li>
 [% END %]
 
@@ -622,13 +622,13 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             [% IF ( item_level_itypes ) %]<th id="item_itemtype">Item type</th>[% END %]
             <th id="item_location">Location</th>
             [% IF ( itemdata_ccode ) %]<th id="item_ccode">Collection</th>[% END %]
-            <th id="item_callnumber">Call Number</th>
-            [% IF ( itemdata_enumchron ) %]<th id="item_enumchron">Vol Info</th>[% END %]
+            <th id="item_callnumber">Call number</th>
+            [% IF ( itemdata_enumchron ) %]<th id="item_enumchron">Vol info</th>[% END %]
             [% IF ( itemdata_uri ) %]<th id="item_url">url</th>[% END %]
             [% IF ( itemdata_copynumber ) %]<th id="item_copy">Copy</th>[% END %]
             <th id="item_status">Status</th>
             [% IF ( itemdata_itemnotes ) %]<th id="item_notes">Notes</th>[% END %]
-            <th id="item_datedue">Date Due</th>
+            <th id="item_datedue">Date due</th>
         </tr></thead>
 	    <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
 	    <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
@@ -646,7 +646,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
     </td>
 		[% IF ( itemdata_ccode ) %]<td>[% ITEM_RESULT.ccode %]</td>[% END %]
-		<td>[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse Shelf</a>)[% END %][% END %]</td>
+        <td>[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse shelf</a>)[% END %][% END %]</td>
 		[% IF ( itemdata_enumchron ) %]<td>[% ITEM_RESULT.enumchron %]</td>[% END %]
 		[% IF ( itemdata_uri ) %]<td><a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a></td>[% END %]
 		[% IF ( itemdata_copynumber ) %]<td>[% ITEM_RESULT.copynumber %]</td>[% END %]
@@ -669,7 +669,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
 [% IF ( OpenOPACShelfBrowser ) %]
 <div id="shelfbrowser">
-<h5 style="text-align: center;">[% IF ( starting_homebranch ) %]Browsing [% starting_homebranch %] Shelves[% END %][% IF ( starting_location ) %], Shelving Location: [% starting_location %][% END %][% IF ( starting_ccode ) %], Collection Code: [% starting_ccode %][% END %] <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Close Shelf Browser</a></h5>
+<h5 style="text-align: center;">[% IF ( starting_homebranch ) %]Browsing [% starting_homebranch %] Shelves[% END %][% IF ( starting_location ) %], Shelving location: [% starting_location %][% END %][% IF ( starting_ccode ) %], Collection code: [% starting_ccode %][% END %] <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Close shelf browser</a></h5>
 
         
         <table><tr>
@@ -742,7 +742,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% IF ( SyndeticsEnabled ) %]
 [% IF ( SyndeticsSummary ) %]
 [% IF ( SYNDETICS_SUMMARY ) %]
-    <h4>Enhanced Descriptions from Syndetics:</h4>
+    <h4>Enhanced descriptions from Syndetics:</h4>
     <p>[% SYNDETICS_SUMMARY %]</p>
 [% END %]
 [% END %]
@@ -768,7 +768,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% IF ( SyndeticsTOC ) %][% IF ( SYNDETICS_TOC ) %]
 <div id="toc">
 <div class="content_set">
-<h3>Table of Contents provided by Syndetics</h3>
+<h3>Table of contents provided by Syndetics</h3>
 <ul>
 [% FOREACH SYNDETICS_TO IN SYNDETICS_TOC %]
     [% IF ( SYNDETICS_TO.p ) %]
@@ -812,7 +812,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% IF ( SyndeticsAuthorNotes ) %][% IF ( SYNDETICS_ANOTES ) %]
 <div id="anotes">
 <div class="content_set">
-<h3>Author Notes provided by Syndetics</h3>
+<h3>Author notes provided by Syndetics</h3>
 [% FOREACH SYNDETICS_ANOTE IN SYNDETICS_ANOTES %]
     [% IF ( SYNDETICS_ANOTE.content ) %]
         [% SYNDETICS_ANOTE.content %]
@@ -863,7 +863,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
                     [% ELSE %]
                     [% IF ( latestserial.status4 ) %]Missing
                     [% ELSE %]
-                    [% IF ( latestserial.status5 ) %]Not Issued
+                    [% IF ( latestserial.status5 ) %]Not issued
                     [% END %]
                     [% END %]
                     [% END %]
@@ -917,7 +917,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             <img class="avatar" src="[% review.avatarurl %]" height="80" width="80" alt="" />
                 [% END %]
             <h5>
-                Your Comment
+                Your comment
             </h5>
             <small>[% review.datereviewed | $KohaDates %]</small>
         <p>
@@ -973,7 +973,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% IF ( OPACFRBRizeEditions ) %][% IF ( XISBNS ) %]
 <div id="editions">
 
-<h4>Other Editions of this Work</h4>
+<h4>Other editions of this work</h4>
 <table>
 [% FOREACH XISBN IN XISBNS %]
 <tr>
@@ -1022,7 +1022,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <!-- Amazon Reviews -->
 <div id="amazonreviews">
         [% IF ( amazon_average_rating ) %]
-            <div class="clearfix"><h3 style="float: left;">Average Rating (from Amazon[% AmazonTld %]): </h3><span class="starMT" style="float: left;"><span class="starFull" style="float: left; width:[% amazon_average_rating / 2 %]px"></span></span> [% IF ( normalized_isbn ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&amp;asin=[% normalized_isbn %]&amp;store=books" target="_blank">Add your own review</a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&amp;asin=[% normalized_isbn %]&amp;store=books">Add your own review</a>[% END %][% END %]</div>
+            <div class="clearfix"><h3 style="float: left;">Average rating (from Amazon[% AmazonTld %]): </h3><span class="starMT" style="float: left;"><span class="starFull" style="float: left; width:[% amazon_average_rating / 2 %]px"></span></span> [% IF ( normalized_isbn ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&amp;asin=[% normalized_isbn %]&amp;store=books" target="_blank">Add your own review</a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&amp;asin=[% normalized_isbn %]&amp;store=books">Add your own review</a>[% END %][% END %]</div>
 
         [% FOREACH AMAZON_CUSTOMER_REVIEW IN AMAZON_CUSTOMER_REVIEWS %]
             <div class="content_set">
@@ -1118,12 +1118,12 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% IF ( SocialNetworks ) %]
     <div class="social_networks">
         <span>Share</span>
-        <a href="http://www.facebook.com/sharer.php?u=[% current_url |url %]&t=[% title |url %]" title="Share on Facebook"><img alt="Share on Facebook" src="/opac-tmpl/prog/images/socnet/facebook16.png" /></a>
+        <a href="http://www.facebook.com/sharer.php?u=[% current_url |url %]&amp;t=[% title |url %]" title="Share on Facebook"><img alt="Share on Facebook" src="/opac-tmpl/prog/images/socnet/facebook16.png" /></a>
         <a href="http://twitter.com/share" title="Share on Twitter"><img alt="Share on Twitter" src="/opac-tmpl/prog/images/socnet/twitter16.png" /></a>
-        <a href="http://www.linkedin.com/shareArticle?mini=true&url=[% current_url |url %]&title=[% title |url %]" title="Share on LinkedIn"><img alt="Share on LinkedIn" src="/opac-tmpl/prog/images/socnet/linkedin16.png" /></a>
-        <a href="http://www.delicious.com/save?url=[% current_url |url %]&title=[% title |url %]" title="Share on Delicious"><img alt="Share on Delicious" src="/opac-tmpl/prog/images/socnet/delicious16.gif" /></a>
+        <a href="http://www.linkedin.com/shareArticle?mini=true&amp;url=[% current_url |url %]&amp;title=[% title |url %]" title="Share on LinkedIn"><img alt="Share on LinkedIn" src="/opac-tmpl/prog/images/socnet/linkedin16.png" /></a>
+        <a href="http://www.delicious.com/save?url=[% current_url |url %]&amp;title=[% title |url %]" title="Share on Delicious"><img alt="Share on Delicious" src="/opac-tmpl/prog/images/socnet/delicious16.gif" /></a>
         <g:plusone size="small"></g:plusone>
-        <a href="mailto:ADRESSE?subject=TO READ : [% title %]>&body=[% title %]> [% current_url |url %]" title="Share by email"><img alt="Share by email" src="/opac-tmpl/prog/images/socnet/mailto16.png" /></a>
+        <a href="mailto:ADRESSE?subject=TO READ : [% title %]>&amp;body=[% title %]> [% current_url |url %]" title="Share by email"><img alt="Share by email" src="/opac-tmpl/prog/images/socnet/mailto16.png" /></a>
     </div>
 [% END %]
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
index 8d22c4d..6b1e365 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Download cart[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Download cart[% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-downloadcart" style="padding:1em;">
 <div id="userdownloadcart" class="container">[% IF ( format ) %]
@@ -8,7 +8,7 @@
 	<fieldset class="rows">
 	<ol><li><label for="format">Download cart:</label>
         <select name="format" id="format">
-	    <option value="">-- Choose Format --</option>
+        <option value="">-- Choose format --</option>
 	    <option value="iso2709">iso2709</option>
 	    <option value="ris">RIS</option>
 	    <option value="bibtex">BibTex</option>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
index fedcf5d..e3c9a21 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Download list[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Download list[% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">//<![CDATA[
 	$(document).ready(function(){
 		$(".close").html(_("Close this window"));
@@ -16,7 +16,7 @@
 	<fieldset class="rows">
 		<ol><li><label for="format">Download list:</label>
 	        <select name="format" id="format">
-		    <option value="">-- Choose Format --</option>
+            <option value="">-- Choose format --</option>
 		    <option value="iso2709">iso2709</option>
 		    <option value="ris">RIS</option>
 		    <option value="bibtex">BibTex</option>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
index 2f956e8..42800ad 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Subscription information for [% bibliotitle %]
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Subscription information for [% bibliotitle %]
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" language="javascript">
@@ -204,7 +204,7 @@ function showlayer(numlayer){
 			[% IF ( serial.status2 ) %]Arrived[% END %]
 			[% IF ( serial.status3 ) %]Late[% END %]
 			[% IF ( serial.status4 ) %]Missing[% END %]
-			[% IF ( serial.status5 ) %]Not Available[% END %]
+            [% IF ( serial.status5 ) %]Not available[% END %]
 			[% IF ( serial.status7 ) %]Claimed[% END %]
 		    </td>
 		    <td class="subscriptionidfilterclass">    [% serial.subscriptionid %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
index f2d10bc..6472f62 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Images for: [% biblio.title |html %]
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Images for: [% biblio.title |html %]
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
index 7068a87..d2d68c5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-main">
@@ -47,7 +47,7 @@
 	<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
     <input type="hidden" name="koha_login_context" value="opac" />
 	<fieldset class="brief">
-		<legend>Log in to Your Account:</legend>
+        <legend>Log in to your account:</legend>
 		<ol>
 		<li><label for="userid">Login:</label><input type="text" id="userid" size="10" name="userid" /></li>
 		<li><label for="password">Password:</label><input type="password" id="password" size="10" name="password" /></li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
index 6ecce38..6d6b8cb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your messaging settings
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your messaging settings
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">//<![CDATA[
 	$(document).ready(function(){
@@ -25,7 +25,7 @@
 	<div class="yui-b"><div class="yui-g" id="usermessaging">
 
 [% FOREACH BORROWER_INF IN BORROWER_INFO %]
-<h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Messaging Settings</h3>
+<h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your messaging settings</h3>
 [% END %]
 
 <form action="/cgi-bin/koha/opac-messaging.pl" method="get" name="opacmessaging">
@@ -33,18 +33,18 @@
 
 <fieldset class="rows">
   [% IF ( settings_updated ) %]
-  <div class="dialog message"><h3>Settings Updated</h3></div>
+  <div class="dialog message"><h3>Settings updated</h3></div>
   [% END %]
   <table style="margin-right:1em;">
     <tr><th>&nbsp;</th><th>Days in advance</th>[% IF ( SMSSendDriver ) %]<th>SMS</th>[% END %]<th>Email</th><th>Digests only?</th><!-- <th>RSS</th> --><th>Do not notify</th></tr>
     [% FOREACH messaging_preference IN messaging_preferences %]
     <tr>
-      <td>[% IF ( messaging_preference.Item_Due ) %]Item Due
-          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance Notice
-          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming Events
-          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold Filled
-          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item Check-in
-          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item Checkout
+      <td>[% IF ( messaging_preference.Item_Due ) %]Item due
+          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
+          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming events
+          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
+          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
+          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
           [% ELSE %]Unknown [% END %]</td>
       [% IF ( messaging_preference.takes_days ) %]
       <td><select name="[% messaging_preference.message_attribute_id %]-DAYS">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
index 22ed097..3be0ef8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Change your password
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Change your password
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-passwd">
@@ -9,7 +9,7 @@
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
 	<div id="userpasswd" class="container">
-	<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]l../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Change your Password </h3>
+    <h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]l../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Change your password </h3>
 
     [% IF ( Error_messages ) %]
 <div class="dialog error">        <h3>There was a problem with your submission</h3>
@@ -21,7 +21,7 @@
             Your new password must be at least [% minpasslen %] characters long
             [% END %]
             [% IF ( WrongPass ) %]
-            Your current password was entered incorrectly.  If this problem persists, please ask a librarian to re-set your password for you.	
+            Your current password was entered incorrectly.  If this problem persists, please ask a librarian to re-set your password for you.
             [% END %]
         </p></div>
     [% END %]
@@ -30,10 +30,10 @@
         [% IF ( OpacPasswordChange ) %]
         <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="post"><fieldset class="brief">
 			[% UNLESS ( ShortPass ) %]<div class="hint">Your password must be at least [% minpasslen %] characters long.</div>[% END %]
-          <ol>  <li><label for="Oldkey">Current Password:</label> <input type="password" id="Oldkey" size="25"  name="Oldkey" /></li>
-            <li><label for="Newkey">New Password:</label> <input type="password" id="Newkey"  size="25"  name="Newkey" /></li>
-            <li><label for="Confirm">Re-Type New Password:</label> <input type="password"  id="Confirm" size="25" name="Confirm" /></li></ol></fieldset>
-            <fieldset class="action"><input type="submit" value="Submit Changes" class="submit" /> <a href="/cgi-bin/koha/opac-user.pl" class="cancel">Cancel</a></fieldset>
+          <ol>  <li><label for="Oldkey">Current password:</label> <input type="password" id="Oldkey" size="25"  name="Oldkey" /></li>
+            <li><label for="Newkey">New password:</label> <input type="password" id="Newkey"  size="25"  name="Newkey" /></li>
+            <li><label for="Confirm">Re-type new password:</label> <input type="password"  id="Confirm" size="25" name="Confirm" /></li></ol></fieldset>
+            <fieldset class="action"><input type="submit" value="Submit changes" class="submit" /> <a href="/cgi-bin/koha/opac-user.pl" class="cancel">Cancel</a></fieldset>
     </form>
         [% ELSE %]
             <div class="dialog alert">You can't change your password.</div>
@@ -41,11 +41,11 @@
     [% END %]
     
     [% IF ( password_updated ) %]
-        <div class="dialog message"><h1>Password Updated</h1>
+        <div class="dialog message"><h1>Password updated</h1>
         Your password has been changed</div>
         <form action="/cgi-bin/koha/opac-user.pl" method="post">
             <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-            <p><input type="submit" class="icon back" value="Return to Your Record" /></p>
+            <p><input type="submit" class="icon back" value="Return to your record" /></p>
         </form>
     [% END %]
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
index de3d9fd..adbc8f0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your privacy management
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your privacy management
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-privacy">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
index 5941369..5f3f39c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
@@ -1,6 +1,6 @@
 [% USE KohaDates %]
 
-[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo; Your checkout history
+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo; Your checkout history
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a  { padding:0.6em 1em; }</style>
 <script type="text/javascript">
@@ -24,7 +24,7 @@ $(document).ready(function(){
 	<div class="yui-b"><div class="yui-g">
 <div id="userreadingrecord" class="container">
 <!--CONTENT-->
-<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Checkout History</h3>
+<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Checkout history</h3>
 
 [% UNLESS ( count ) %]
 You have never borrowed anything from this library.
@@ -45,19 +45,19 @@ You have never borrowed anything from this library.
 
 [% IF ( showfulllink ) %]
 [% IF ( limit ) %]
-<li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=full[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show All Items</a></li><li class="ui-tabs-selected"><a href="#readingrec">Showing Last 50 Items</a></li>
+<li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=full[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show all items</a></li><li class="ui-tabs-selected"><a href="#readingrec">Showing last 50 items</a></li>
 [% ELSE %]
-<li class="ui-tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing All Items</a></li><li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=50[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show Last 50 Items Only</a></li>
+<li class="ui-tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing all items</a></li><li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=50[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show last 50 items only</a></li>
 [% END %]
 [% ELSE %]
-<li class="ui-tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing All Items</a></li>
+<li class="ui-tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing all items</a></li>
 [% END %]
 </ul>
 <div class="ui-tabs-panel"><table id="readingrec">
 <tr>
 <th colspan="2">Title</th>
-<th>Item Type</th>
-<th>Call No.</th>
+<th>Item type</th>
+<th>Call no.</th>
 <th>Date</th>
 </tr>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index 7597a4a..a78bc68 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo;  Placing a hold
+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo;  Placing a hold
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript">
@@ -240,21 +240,21 @@
                   <th>Hold</th>
                   <th>Title</th>
                   [% UNLESS ( item_level_itypes ) %]
-                    <th>Item Type</th>
+                    <th>Item type</th>
                   [% END %]
                   [% IF ( showpriority ) %]
                   <th>Priority</th>
                   [% END %]
 		  [% IF ( reserve_in_future ) %]
-		  <th>Hold Starts on Date</th>
+        <th>Hold starts on date</th>
 		  [% END %]
-		  <th>Hold Not Needed After</th>
+        <th>Hold not needed after</th>
                   [% IF ( OPACItemHolds ) %]
-                    <th id="place_on_hdr" style="display:none">Place On</th>
+                    <th id="place_on_hdr" style="display:none">Place on</th>
                   [% END %]
                   [% UNLESS ( singleBranchMode ) %]
 		    [% IF ( choose_branch ) %]
-                        <th>Pickup Location</th>
+                        <th>Pickup location</th>
 		    [% END %]
                   [% END %]
                 </tr>[% ELSE %]<tr><th colspan="5">Title</th></tr>[% END %]
@@ -347,7 +347,7 @@
               //]]>
               </script>
       <p style="margin:.3em 2em;">
-      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('reserve_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
+      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('reserve_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
                 </td>[% END %]
 
 		    [% END %]
@@ -380,7 +380,7 @@
       //]]>
         </script>
       <p style="margin:.3em 2em;">
-      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
+      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
     </td>[% END %]
 
                     [% IF ( bibitemloo.holdable ) %]
@@ -469,16 +469,16 @@
                           <tr>
                             <th>Copy</th>
                             [% IF ( item_level_itypes ) %]
-                              <th>Item Type</th>
+                              <th>Item type</th>
                             [% END %]
                             <th>Barcode</th>
                             [% UNLESS ( singleBranchMode ) %]
-                              <th>Home Library</th>
-                              <th>Last Location</th>
+                              <th>Home library</th>
+                              <th>Last location</th>
                             [% END %]
-                            <th>Call Number</th>
+                            <th>Call number</th>
                             [% IF ( bibitemloo.itemdata_enumchron ) %]
-                              <th>Vol Info</th>
+                              <th>Vol info</th>
                             [% END %]
                             <th>Information</th>
                           </tr>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
index 9e1b855..99c31bd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
 [% IF ( searchdesc ) %]
-	Results of Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
+    Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
 [% ELSE %]
     You did not specify any search criteria.
 [% END %]
@@ -19,9 +19,9 @@ $(document).ready(function(){
     $('#sort_by').change(function() {
         $('#bookbag_form').submit();
     });
-	$("span.clearall").html("<a id=\"CheckNone\" href=\"#\">Clear All</a>");
-	$("span.checkall").html("<a id=\"CheckAll\" href=\"#\">Select All</a>");
-	$("span.addto").html("<label for=\"addto\">Add to: </label><select name=\"addto\" id=\"addto\"><option value=\"\"></option>[% IF ( opacbookbag ) %]<option value=\"addtocart\">Cart</option>[% END %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %]<optgroup label=\"Lists:\">[% IF ( barshelves ) %][% FOREACH barshelvesloo IN barshelvesloop %][% IF ( category == 1 ) %]<option id=\"s[% barshelvesloo.shelfnumber %]\" value=\"addtolist\">[% barshelvesloo.shelfname %]</option>[% END %][% END %][% END %]<option value=\"newlist\">[ New List ]</option></optgroup>[% ELSE %]<option value=\"newlist\">List</option>[% END %][% END %]</select> <input type=\"submit\" class=\"submit\" value=\"Save\" />");
+    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">Clear all</a>");
+    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">Select all</a>");
+    $("span.addto").html("<label for=\"addto\">Add to: </label><select name=\"addto\" id=\"addto\"><option value=\"\"></option>[% IF ( opacbookbag ) %]<option value=\"addtocart\">Cart</option>[% END %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %]<optgroup label=\"Lists:\">[% IF ( barshelves ) %][% FOREACH barshelvesloo IN barshelvesloop %][% IF ( category == 1 ) %]<option id=\"s[% barshelvesloo.shelfnumber %]\" value=\"addtolist\">[% barshelvesloo.shelfname %]</option>[% END %][% END %][% END %]<option value=\"newlist\">[ New list ]</option></optgroup>[% ELSE %]<option value=\"newlist\">List</option>[% END %][% END %]</select> <input type=\"submit\" class=\"submit\" value=\"Save\" />");
 	$("#addto").change(function(){
 		cartList();
 	});
@@ -108,25 +108,25 @@ function highlightOn() {
 <!-- Search Results Table -->
 [% IF ( total ) %]
 [% IF ( scan ) %]
-    <h1>Scan Index:</h1>
+    <h1>Scan index:</h1>
     <form action="/cgi-bin/koha/opac-search.pl" method="get">
         <table>
             <tr>
                 <td>
-                    Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="" />
+                    Scan index for: <input type="text" name="q" id="scan-index" size="35" value="" />
                 </td>
             </tr>
             <tr>
                 <td>
                     <label for="scan-index">Indexed in:</label>
                     <select name="idx" id="scan-index">
-                        <option value="">Any Word</option>
-                        <option value="kw,phr:">Any Phrase</option>
+                        <option value="">Any word</option>
+                        <option value="kw,phr:">Any phrase</option>
                         <option value="ti:">Title</option>
-                        <option value="ti,phr:">Title Phrase</option>
+                        <option value="ti,phr:">Title phrase</option>
                         <option value="au,phr:">Author</option>
                         <option value="su:">Subject</option>
-                        <option value="su,phr:">Subject Phrase</option>
+                        <option value="su,phr:">Subject phrase</option>
                         <option value="se:">Series</option>
                         <option value="pb:">Publisher</option>
                         <option value="nt:">Notes</option>
@@ -261,10 +261,10 @@ function highlightOn() {
 					[% UNLESS ( GROUP_RESULT.norequests ) %]
 						[% IF ( opacuserlogin ) %]
 							[% IF ( AllowOnShelfHolds ) %]
-								<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
+                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
 							[% ELSE %]
 								[% IF ( GROUP_RESULT.itemsissued ) %]
-									<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
+                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
 								[% END %]
 							[% END %]
 						[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 4bfab52..d811d86 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
 [% IF ( searchdesc ) %]
-    Results of Search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
+    Results of search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
 [% ELSE %]
     You did not specify any search criteria.
 [% END %]
@@ -103,29 +103,29 @@ $(document).ready(function(){
     var param1 = "<label for=\"addto\">"+_("Add to: ")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
     [% IF ( opacbookbag ) %]    param1 += "<option value=\"addtocart\">"+_("Cart")+"<\/option>";
     [% END %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %][% IF ( addbarshelves ) %]
-    param1 += "<optgroup label=\""+_("Your Lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
+    param1 += "<optgroup label=\""+_("Your lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
     param1 += "<option id=\"s[% addbarshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addbarshelvesloo.shelfname |html %]<\/option>";[% END %]
     param1 += "<\/optgroup>";[% END %]
-    [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public Lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %];
+    [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %];
     param1 += "<\/optgroup>";[% END %]
     [% IF (( addbarshelvesloop && addbarshelvesloop.size>9) || (addpubshelvesloop && addpubshelvesloop.size>9 )) %]
-        param1 += "<option value=\"morelists\">[ "+_("More Lists")+" ]<\/option>";
+        param1 += "<option value=\"morelists\">[ "+_("More lists")+" ]<\/option>";
     [% END %]
-    param1 += "<option value=\"newlist\">[ "+_("New List")+" ]<\/option>";
+    param1 += "<option value=\"newlist\">[ "+_("New list")+" ]<\/option>";
     [% END %]
     [% END %]
     param1 += "<\/select> <input type=\"submit\" class=\"submit\" value=\""+_("Save")+"\" />";
     [% ELSE %]
-        var param1 = "<a id=\"addto\" class=\"addtocart\" href=\"#\">Add to Cart<\/a>";
+        var param1 = "<a id=\"addto\" class=\"addtocart\" href=\"#\">Add to cart<\/a>";
     [% END %]
 [% ELSE %]
         var param1 = "<label for=\"addto\">"+_("Add to list: ")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
 [% IF ( virtualshelves ) %][% IF ( loggedinusername ) %][% IF ( addbarshelves ) %]
-    param1 += "<optgroup label=\""+_("Your Lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
+    param1 += "<optgroup label=\""+_("Your lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
     param1 += "<option id=\"s[% addbarshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addbarshelvesloo.shelfname |html %]<\/option>";[% END %]
     param1 += "<\/optgroup>";[% END %]
-    [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public Lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %][% END %]
-    param1 +="<\/optgroup><option value=\"newlist\">[ "+_("New List")+" ]<\/option>"
+    [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %][% END %]
+    param1 +="<\/optgroup><option value=\"newlist\">[ "+_("New list")+" ]<\/option>"
     [% END %]
     [% END %]
     param1 += "<\/select> <input type=\"submit\" class=\"submit\" value=\""+_("Save")+"\" />";
@@ -135,8 +135,8 @@ $(document).ready(function(){
     $('#sort_by').change(function() {
         $('#bookbag_form').submit();
     });
-    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear All")+"<\/a>");
-    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select All")+"<\/a>");
+    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>");
+    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>");
 [% IF ( opacbookbag ) %]$("span.addto").html(param1);[% ELSE %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %]$("span.addto").html(param1);[% END %][% END %][% END %]
 [% IF ( opacbookbag ) %]
     [% IF ( virtualshelves ) %]
@@ -166,12 +166,12 @@ $(document).ready(function(){
         } else if($("#addto").find("option:selected").attr("value") == "newlist"){
             [% IF ( loggedinusername ) %]if (vShelfAdd()) {
             Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd());
-            }[% ELSE %] alert(_('You must be logged in to create or add to Lists')); [% END %]
+            }[% ELSE %] alert(_('You must be logged in to create or add to lists')); [% END %]
             return false;
         } else if($("#addto").find("option:selected").attr("value") == "morelists"){
             [% IF ( loggedinusername ) %]if (vShelfAdd()) {
             Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?' + vShelfAdd());
-            }[% ELSE %] alert(_('You must be logged in to create or add to Lists')); [% END %]
+            }[% ELSE %] alert(_('You must be logged in to create or add to lists')); [% END %]
             return false;
         }
         if($("#addto").find("option:selected").attr("value") == "addtocart" || $("#addto").attr("class") == "addtocart"){
@@ -190,7 +190,7 @@ $(document).ready(function(){
 [% IF ( RequestOnOpac ) %]
   [% IF ( opacuserlogin ) %]
   [% IF ( DisplayMultiPlaceHold ) %]
-    $("#placehold").html("<input class=\"submit\" type=\"submit\" value=\""+_("Place Hold")+"\"/>");
+    $("#placehold").html("<input class=\"submit\" type=\"submit\" value=\""+_("Place hold")+"\"/>");
     $("#placehold").find("input:submit").click(function(){
         holdMultiple();
         return false;
@@ -268,25 +268,25 @@ $(document).ready(function(){
 <!-- Search Results Table -->
 [% IF ( total ) %]
 [% IF ( scan ) %]
-    <h1>Scan Index:</h1>
+    <h1>Scan index:</h1>
     <form action="/cgi-bin/koha/opac-search.pl" method="get">
         <table>
             <tr>
                 <td>
-                    Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="" />
+                    Scan index for: <input type="text" name="q" id="scan-index" size="35" value="" />
                 </td>
             </tr>
             <tr>
                 <td>
                     <label for="scan-index">Indexed in:</label>
                     <select name="idx" id="scan-index">
-                        <option value="">Any Word</option>
-                        <option value="kw,phr:">Any Phrase</option>
+                        <option value="">Any word</option>
+                        <option value="kw,phr:">Any phrase</option>
                         <option value="ti:">Title</option>
-                        <option value="ti,phr:">Title Phrase</option>
+                        <option value="ti,phr:">Title phrase</option>
                         <option value="au,phr:">Author</option>
                         <option value="su:">Subject</option>
-                        <option value="su,phr:">Subject Phrase</option>
+                        <option value="su,phr:">Subject phrase</option>
                         <option value="se:">Series</option>
                         <option value="pb:">Publisher</option>
                         <option value="nt:">Notes</option>
@@ -358,7 +358,7 @@ $(document).ready(function(){
                             <span id="tagsel_span"></span>
                           [% IF ( loggedinusername ) %]
                             <span id="tagsel_form" style="display:none">
-                              <label for="tagsel_new">New Tag:</label>
+                              <label for="tagsel_new">New tag:</label>
                               <input name="tagsel_new" id="tagsel_new" maxlength="100" />
                               <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add" />
                               <a href="#" id="tagsel_cancel">Cancel</a>
@@ -531,10 +531,10 @@ $(document).ready(function(){
                     [% UNLESS ( SEARCH_RESULT.norequests ) %]
                         [% IF ( opacuserlogin ) %]
                             [% IF ( AllowOnShelfHolds ) %]
-                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
+                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
                             [% ELSE %]
                                 [% IF ( SEARCH_RESULT.itemsissued ) %]
-                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
+                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
                                 [% END %]
                             [% END %]
                         [% END %]
@@ -546,9 +546,9 @@ $(document).ready(function(){
                 [% END %][% END %][% END %]
                 [% IF ( opacbookbag ) %]
                     [% IF ( SEARCH_RESULT.incart ) %]
-                        <a class="addtocart cart[% SEARCH_RESULT.biblionumber %]" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">In your Cart</a> <a class="cartRemove cartR[% SEARCH_RESULT.biblionumber %]" href="#" onclick="delSingleRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">(remove)</a>
+                        <a class="addtocart cart[% SEARCH_RESULT.biblionumber %]" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">In your cart</a> <a class="cartRemove cartR[% SEARCH_RESULT.biblionumber %]" href="#" onclick="delSingleRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">(remove)</a>
                     [% ELSE %]
-                        <a class="addtocart cart[% SEARCH_RESULT.biblionumber %]" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">Add to Cart</a> <a style="display:none;" class="cartRemove cartR[% SEARCH_RESULT.biblionumber %]" href="#" onclick="delSingleRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">(remove)</a>
+                        <a class="addtocart cart[% SEARCH_RESULT.biblionumber %]" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">Add to cart</a> <a style="display:none;" class="cartRemove cartR[% SEARCH_RESULT.biblionumber %]" href="#" onclick="delSingleRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">(remove)</a>
                     [% END %]
                 [% END %]
                 </span>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
index 57d098e..d140285 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo; Comments on [% title %]
+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo; Comments on [% title %]
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css">
   #custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; }
@@ -9,7 +9,7 @@
 	 	var inject_old = function(comment) {
 			[% IF ( reviewid ) %]
 			[% IF ( cgi_debug ) %]alert(_('injecting OLD comment: ')+comment);[% END %]
-			parent.opener.$('#c[% reviewid %] p').prev("small").prev("h5").html("Your Edited Comment (preview, pending approval)");
+            parent.opener.$('#c[% reviewid %] p').prev("small").prev("h5").html("Your edited comment (preview, pending approval)");
 			parent.opener.$('#c[% reviewid %] p').html(comment);
 			parent.opener.$('#c[% reviewid %] p').append("<a href=\"#comment\" onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber | uri %]&amp;reviewid=[% reviewid | uri%]\');\">Edit<\/a>");
 			[% END %]
@@ -19,7 +19,7 @@
 			[% IF ( cgi_debug ) %]alert(_("injecting NEW comment: ") +comment);[% END %]
 			parent.opener.$('#newcomment').attr("class","yours");
 			parent.opener.$('#newcomment').html(
-				"<h5>Your Comment (preview, pending approval)<\/h5>" +
+                "<h5>Your comment (preview, pending approval)<\/h5>" +
 				"<p>"+comment+"<\/p>" +
 				"<a href=\"#comment\" onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber |uri%]\');\">Edit<\/a><\/p>"
 			);
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
index 26b421a..3bfa668 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your search history
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your search history
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/JavaScript" language="JavaScript">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
index 32d00f0..7f64f17 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
@@ -1,5 +1,5 @@
 <SUBJECT>
-Your Cart
+Your cart
 <END_SUBJECT>
 
 <HEADER>
@@ -8,7 +8,7 @@ Hi,
 [% firstname %] [% surname %] sent you a cart from our online catalog.
 
 Please note that the attached file is a MARC bibliographic records file
-which can be imported into a Personal Bibliographic Software like EndNote,
+which can be imported into personal bibliographic software like EndNote,
 Reference Manager or ProCite.
 <END_HEADER>
 
@@ -30,7 +30,7 @@ Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
 Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
 Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
 LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
-url : [% BIBLIO_RESULT.url %][% END %]
+URL : [% BIBLIO_RESULT.url %][% END %]
 In the online catalog:
 [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %]
 Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt
index 4090f03..927fc7a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt
@@ -1,12 +1,12 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Sending Your Cart
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Sending your cart
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body style="padding: 1em;" id="sendbasket">
 <div id="usersendbasket" class="container">[% IF ( email_add ) %]
 
 	[% IF ( SENT ) %]
-		<h3>Message Sent</h3>
-	    <p>The cart was sent to: [% email_add %]</p>
+        <h3>Message sent</h3>
+        <p>The cart was sent to: [% email_add %]</p>
 		<p><a class="focus close" href="#">Close window</a></p>
 	[% END %]
 	[% IF ( error ) %]
@@ -20,7 +20,7 @@
 <fieldset class="rows"> 
 <legend>Sending your cart</legend>
 <ol>   <li>
-        <label for="email_add">Email Address:</label>
+        <label for="email_add">Email address:</label>
         <input type="text" id="email_add" name="email_add" size="43" class="focus" />
     </li>
     <li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
index f9f7c31..c43affb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
@@ -1,5 +1,5 @@
 <SUBJECT>
-Your List : [% shelfname %]
+Your list : [% shelfname %]
 <END_SUBJECT>
 
 <HEADER>
@@ -8,7 +8,7 @@ Hi,
 [% firstname %] [% surname %], sent you from our online catalog, the virtual shelf called :  [% shelfname %].
 
 Please note that the attached file is a MARC bibliographic records file
-which can be imported into a Personal Bibliographic Software like EndNote,
+which can be imported into personal bibliographic software like EndNote,
 Reference Manager or ProCite.
 <END_HEADER>
 
@@ -34,10 +34,10 @@ Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
 Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
 Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
 LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
-url : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
+URL: [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
 In the online catalog:
     http://[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
-Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
+Items: [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
     [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
 
 ---------------------------------------------
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt
index 81ce32d..f64eb08 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Sending Your List
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Sending your list
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript">//<![CDATA[
 	$(document).ready(function(){
@@ -11,7 +11,7 @@
 <div id="usersendshelfform" class="container">[% IF ( email ) %]
 
     [% IF ( SENT ) %]
-        <h3>Message Sent</h3>
+        <h3>Message sent</h3>
         <p>The list was sent to: [% email %]</p>
         <p><a class="focus close" href="/cgi-bin/koha/opac-shelves.pl">Back to lists</a></p>
     [% END %]
@@ -31,7 +31,7 @@
         <fieldset class="rows">
         <legend>Sending your list</legend>
         <ol>   <li>
-                <label for="email">Email Address:</label>
+                <label for="email">Email address:</label>
                 <input type="text" id="email" name="email" size="43" class="focus" />
             </li>
             <li>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
index 78bc22e..790aa48 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Serials
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Serials
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-serial-issues">
@@ -12,9 +12,9 @@
 <div id="userserialissues" class="container">
 <h2>Issues for a subscription</h2>
 <div id="views">
-	<span class="view"><a id="Normalview" href="opac-detail.pl?biblionumber=[% biblionumber | html %]" class="button">Normal View</a></span>
+    <span class="view"><a id="Normalview" href="opac-detail.pl?biblionumber=[% biblionumber | html %]" class="button">Normal view</a></span>
 		<span class="view"><span id="Briefhistory">Brief history</span></span>
-	<span class="view"><a id="Fullhistory" href="opac-serial-issues.pl?selectview=full&amp;biblionumber=[% biblionumber | html%]" class="button">Full History</a></span>
+    <span class="view"><a id="Fullhistory" href="opac-serial-issues.pl?selectview=full&amp;biblionumber=[% biblionumber | html%]" class="button">Full history</a></span>
 </div>
 <form method="post" name="f">
 [% FOREACH subscription_LOO IN subscription_LOOP %]
@@ -91,13 +91,13 @@
 		</p>
     <h4>[% subscription_LOO.branchname %] [% subscription_LOO.notes %]</h4>
   [% IF ( subscription_LOO.recievedlist ) %]
-    <h5>Available Issues</h5>
+    <h5>Available issues</h5>
     <p>
       [% subscription_LOO.recievedlist %]
     </p>
   [% END %]
   [% IF ( subscription_LOO.missinglist ) %]
-    <h5>Unavailable Issues</h5>
+    <h5>Unavailable issues</h5>
     <p>
       [% subscription_LOO.missinglist %]
     </p>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
index a1d865d..b6a2954 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;   [% IF ( viewshelf ) %]Contents of [% shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;   [% IF ( viewshelf ) %]Contents of [% shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript">
@@ -154,7 +154,7 @@ $(function() {
 		var alertString2;
 
 	    if(f.addshelf.value.length ==0){
-			_alertString += _("- You must enter a List Name") + "\n";
+        _alertString += _("- You must enter a list name") + "\n";
 		}
 
 		if (_alertString.length==0) {
@@ -181,7 +181,7 @@ $(function() {
               [% FOREACH paramsloo IN paramsloop %]
                 <div class="yui-ge">
                   <div class="yui-u first">
-                    [% IF ( paramsloo.already ) %]<div class="dialog alert">A List named <b>[% paramsloo.already %]</b> already exists!</div>[% END %]
+                    [% IF ( paramsloo.already ) %]<div class="dialog alert">A list named <b>[% paramsloo.already %]</b> already exists!</div>[% END %]
                     [% IF ( paramsloo.status ) %]<div class="dialog alert">[% paramsloo.string %]</div>[% END %]
                     [% IF ( paramsloo.nobarcode ) %]<div class="dialog alert">ERROR: No barcode given.</div>[% END %]
                     [% IF ( paramsloo.noshelfnumber ) %]<div class="dialog alert">ERROR: No shelfnumber given.</div>[% END %]
@@ -231,20 +231,20 @@ $(function() {
               [% IF ( itemsloop ) %]
                   <div id="toolbar" class="list-actions">
 
-                      <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfid=[% shelfnumber %]" class="download" onclick="open(CGIBIN+'opac-downloadshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false;">Download List</a>
+                      <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfid=[% shelfnumber %]" class="download" onclick="open(CGIBIN+'opac-downloadshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false;">Download list</a>
 
-[% IF ( opacuserlogin ) %]<span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber %]" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send List</a></span>[% END %]
+[% IF ( opacuserlogin ) %]<span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber %]" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span>[% END %]
 
-<a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print List</a>
+<a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print list</a>
 
                 [% IF ( manageshelf ) %] <span class="sep">|</span> <form method="get" action="opac-shelves.pl"><input type="hidden" name="op" value="modif" />
                 <input type="hidden" name="display" value="viewshelf" />
-                <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" /> <input type="submit" class="editshelf" value="Edit List" /></form>
+                <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" /> <input type="submit" class="editshelf" value="Edit list" /></form>
 
                       <form method="post" action="opac-shelves.pl">
                         <input type="hidden" value="1" name="shelves"/>
                          <input type="hidden" value="1" name="DEL-[% shelfnumber %]"/>
-                         [% IF ( showprivateshelves ) %]<input type="hidden" name="display" value="privateshelves"/>[% END %]<input type="submit" class="deleteshelf" value="Delete List" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/>
+                         [% IF ( showprivateshelves ) %]<input type="hidden" name="display" value="privateshelves"/>[% END %]<input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/>
                       </form> [% END %]
 
 
@@ -259,7 +259,7 @@ $(function() {
                                         [% IF ( TagsEnabled ) %]
                                           <span id="addtags"></span>
                                           <span id="tagsel_form" style="display:none">
-                                          <label for="tagsel_new" style="display:inline">New&nbsp;Tag:</label>
+                                          <label for="tagsel_new" style="display:inline">New&nbsp;tag:</label>
                                           <input name="tagsel_new" id="tagsel_new" maxlength="100" style="display:inline"/>
                                           <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add" style="display:inline" />
                                           <a href="#" id="tagsel_cancel" onclick="tagCanceled(); return false;" style="display:inline">Cancel</a>
@@ -355,10 +355,10 @@ $(function() {
           [% UNLESS ( itemsloo.norequests ) %]
             [% IF ( opacuserlogin ) %]
               [% IF ( AllowOnShelfHolds ) %]
-                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
+                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
               [% ELSE %]
                 [% IF ( itemsloo.itemsissued ) %]
-                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
+                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
                 [% END %]
               [% END %]
             [% END %]
@@ -371,7 +371,7 @@ $(function() {
               [% IF ( itemsloo.incart ) %]
                   <a class="addtocart cart[% itemsloo.biblionumber %]" href="#" onclick="addRecord('[% itemsloo.biblionumber %]'); return false;">In your cart</a> <a class="cartRemove cartR[% itemsloo.biblionumber %]" href="#" onclick="delSingleRecord('[% itemsloo.biblionumber %]'); return false;">(remove)</a>
               [% ELSE %]
-                  <a class="addtocart cart[% itemsloo.biblionumber %]" href="#" onclick="addRecord('[% itemsloo.biblionumber %]'); return false;">Add to Cart</a> <a style="display:none;" class="cartRemove cartR[% itemsloo.biblionumber %]" href="#" onclick="delSingleRecord('[% itemsloo.biblionumber %]'); return false;">(remove)</a>
+                  <a class="addtocart cart[% itemsloo.biblionumber %]" href="#" onclick="addRecord('[% itemsloo.biblionumber %]'); return false;">Add to cart</a> <a style="display:none;" class="cartRemove cartR[% itemsloo.biblionumber %]" href="#" onclick="delSingleRecord('[% itemsloo.biblionumber %]'); return false;">(remove)</a>
               [% END %]
           [% END %]
         </span>
@@ -398,7 +398,7 @@ $(function() {
                   </div>
                   [% IF ( pagination_bar ) %]<div class="pages">[% pagination_bar %]</div>[% END %]
                 [% ELSE %]
-                  <div class="dialog message">This List is empty.  [% IF ( opacuserlogin ) %]You can add to your lists from the results of any <a href="opac-main.pl">search</a>![% END %]</div>
+                  <div class="dialog message">This list is empty.  [% IF ( opacuserlogin ) %]You can add to your lists from the results of any <a href="opac-main.pl">search</a>![% END %]</div>
               [% END %]<!-- /itemsloop -->
             [% END %]<!-- /viewshelf -->
 
@@ -407,14 +407,14 @@ $(function() {
                 <form method="post" action="opac-shelves.pl">
                 <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
                 <input type="hidden" name="modifyshelfcontents" value="1" />
-                <input type="hidden" name="viewshelf" value="[% shelfnumber %]" /><input type="submit" value="Remove Selected Items" class="icon delete"/>
+                <input type="hidden" name="viewshelf" value="[% shelfnumber %]" /><input type="submit" value="Remove selected items" class="icon delete"/>
                 </form>
             [% ELSIF ( !itemsloop && manageshelf ) %]
                 <form method="post" action="opac-shelves.pl">
                   <input type="hidden" name="DEL-[% shelfnumber %]" value="1" />
                   <input type="hidden" name="shelves" value="1" />
 		  <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
-                  <input type="submit" class="icon delete" value="Delete this List" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
+                  <input type="submit" class="icon delete" value="Delete this list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
                 </form>
             [% END %]
 
@@ -427,7 +427,7 @@ $(function() {
                   <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
                   <fieldset class="rows">
                     <ol>
-                      <li><label for="shelfname">List Name: </label><input type="text" id="shelfname" name="shelfname" size="60" value="[% shelfname |html %]" /></li>
+                      <li><label for="shelfname">List name: </label><input type="text" id="shelfname" name="shelfname" size="60" value="[% shelfname |html %]" /></li>
                       <li>
                         <label for="sortfield" >Sort this list by: </label>
                         <select name="sortfield" id="sortfield">
@@ -478,12 +478,12 @@ $(function() {
                   [% END %]
         
                   [% IF ( loggedinusername ) %]
-                    <div id="toolbar"><a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a></div>
+                    <div id="toolbar"><a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New list</a></div>
                   [% IF ( showprivateshelves ) %]
                     [% IF ( shelveslooppriv ) %]
                       <table>
                         <tr>
-                          <th>List Name</th>
+                          <th>List name</th>
                           <th>Contents</th>
                           <th>Type</th>
                           <th>&nbsp;</th>
@@ -531,7 +531,7 @@ $(function() {
                     [% END %]<!-- /shelveslooppriv -->
                   [% END %]<!-- /showprivateshelves -->
                   [% ELSE %]<!-- /loggedinusername -->
-                      [% IF ( opacuserlogin ) %]<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>[% END %]
+                      [% IF ( opacuserlogin ) %]<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new lists.</div>[% END %]
                   [% END %]<!-- /loggedinusername -->
 
                   
@@ -543,14 +543,14 @@ $(function() {
                     <div id="publicshelves" class="tab-container" style="display:none;">
                   [% END %]
                   [% IF ( loggedinusername ) %]
-                 <div id="toolbar"> <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a></div>
+                 <div id="toolbar"> <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New list</a></div>
                   [% ELSE %]
-                  [% IF ( opacuserlogin ) %]<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>[% END %]
+                  [% IF ( opacuserlogin ) %]<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new lists.</div>[% END %]
                   [% END %]
                   [% IF ( shelvesloop ) %]
                       <table>
                         <tr>
-                          <th>List Name</th>
+                          <th>List name</th>
                           <th>Contents</th>
                           <th>Type</th><th>&nbsp;</th>
                         </tr>
@@ -604,11 +604,11 @@ $(function() {
               <div id="addshelf">
                 <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
                   <fieldset class="rows">
-                    <legend>Create a New List</legend>
+                    <legend>Create a new list</legend>
                     <input type="hidden" name="shelves" value="1" />
                     <ol>
                       <li>
-                        <label class="required" for="addshelf">List Name:</label>
+                        <label class="required" for="addshelf">List name:</label>
                         [% IF ( already ) %]
                           <input id="addshelf" type="text" name="addshelf" value="[% already %]" size="60" />
                         [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt
index 5053684..2a30906 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %]MARC View[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'doc-head-open.inc' %]MARC view[% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-showmarc">
 <div id="main">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt
index 7e9cc24..54cc959 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt
@@ -3,9 +3,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
-     <title><![CDATA[[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog Recent Comments]]></title>
+     <title><![CDATA[[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog Recent Comments]]></title>
      <link>[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl&amp;format=rss2</link>
-     <description><![CDATA[ The most recent comments from [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog. Comments can be made by logged in users and are moderated by library staff.]]></description>
+     <description><![CDATA[ The most recent comments from [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog. Comments can be made by logged in users and are moderated by library staff.]]></description>
      <atom:link href="[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl&amp;format=rss2" rel="self" type="application/rss+xml" />
      <lastBuildDate>[% timestamp %]</lastBuildDate>
 	 [% FOREACH review IN reviews %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
index c132d15..9fcc532 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
@@ -1,8 +1,8 @@
 [% USE KohaDates %]
 
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Recent Comments
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Recent comments
 [% INCLUDE 'doc-head-close.inc' %]
-<link rel="alternate" type="application/rss+xml" title="[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog Recent Comments" href="[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl?format=rss" />
+<link rel="alternate" type="application/rss+xml" title="[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog recent comments" href="[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl?format=rss" />
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
index 7897f0e..32e4173 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  
 [% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
 [% IF ( op_else ) %]Purchase Suggestions[% END %]
 [% INCLUDE 'doc-head-close.inc' %]
@@ -83,9 +83,9 @@ $.tablesorter.addParser({
     <li><label for="copyrightdate">Copyright Date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></li>
     <li><label for="isbn">Standard Number (ISBN, ISSN or Other):</label><input type="text" id="isbn" name="isbn" size="50" maxlength="80" /></li>
     <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></li>
-    <li><label for="collectiontitle">Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" /></li>
-    <li><label for="place">Publication Place:</label><input type="text" id="place" name="place" size="50" maxlength="80" /></li>
-    <li><label for="itemtype">Item Type:</label><select name="itemtype" id="itemtype">
+    <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" /></li>
+    <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" /></li>
+    <li><label for="itemtype">Item type:</label><select name="itemtype" id="itemtype">
             <option value="">Default</option>
         [% FOREACH itemtypeloo IN itemtypeloop %]
 			[% IF ( itemtypeloo.selected ) %]<option value="[% itemtypeloo.itemtype %]" selected="selected"> [% ELSE %]<option value="[% itemtypeloo.itemtype %]"> [% END %] [% itemtypeloo.description %]</option>
@@ -115,7 +115,7 @@ $.tablesorter.addParser({
 [% END %]
 
 [% IF ( op_else ) %]
-    <h1>[% UNLESS ( OPACViewOthersSuggestions ) %][% IF ( loggedinusername ) %]My [% END %][% END %]Purchase Suggestions</h1>
+    <h1>[% UNLESS ( OPACViewOthersSuggestions ) %][% IF ( loggedinusername ) %]My [% END %][% END %]Purchase suggestions</h1>
 
     [% IF ( deleted ) %]<div class="dialog message">The selected suggestions have been deleted.</div>[% END %]
     [% IF ( submitted ) %]<div class="dialog message">Your suggestion has been submitted.</div>[% END %]
@@ -148,15 +148,15 @@ $.tablesorter.addParser({
             </form>[% END %]
         <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
             <input type="hidden" name="op" value="delete_confirm" />
-			<div><span class="checkall"><a href="#" id="CheckAll">Select All</a></span>
-		<span class="clearall"><a href="#" id="CheckNone">Clear All</a></span> | [% IF ( loggedinusername ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% ELSE %][% IF ( AnonSuggestions ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% END %][% END %]
+            <div><span class="checkall"><a href="#" id="CheckAll">Select all</a></span>
+        <span class="clearall"><a href="#" id="CheckNone">Clear all</a></span> | [% IF ( loggedinusername ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% ELSE %][% IF ( AnonSuggestions ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% END %][% END %]
 </div>
 			<table id="suggestt" class="checkboxed">
 			<thead><tr>
             [% IF ( loggedinusername ) %]<th>&nbsp;</th>[% END %]
             <th>Summary</th>
             <th>Note</th>
-            [% IF ( OPACViewOthersSuggestions ) %]<th>Suggested For</th>[% END %]
+            [% IF ( OPACViewOthersSuggestions ) %]<th>Suggested for</th>[% END %]
             <th>Managed by</th>
             <th>Status</th>
         </tr></thead>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
index c1ec044..ccdd4b5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
@@ -1,6 +1,6 @@
 [% USE KohaDates %]
 
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Tags
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Tags
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <style type="text/css">
@@ -111,7 +111,7 @@
 		<form method="post" action="opac-tags.pl">
 		<h2>My Tags</h2>
 		<table id="mytagst">
-		<thead><tr><th>Term</th><th>Title</th><th>Date Added</th><th>Delete</th>
+        <thead><tr><th>Term</th><th>Title</th><th>Date added</th><th>Delete</th>
 		</tr></thead>
 	<tbody>[% FOREACH MY_TAG IN MY_TAGS %]
 		<tr><td><a href="/cgi-bin/koha/opac-search.pl?tag=[% MY_TAG.term |url %]&amp;q=[% MY_TAG.term |url %]">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
index 22c198a..5a6ae8c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo;  ISBD
+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo;  ISBD
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-tags-subject">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
index 29296a7..c05f6fc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Most Popular Titles
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Most popular titles
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script language="JavaScript" type="text/javascript">
@@ -79,14 +79,14 @@ function Dopop(link) {
                         </td>
                         <td>[% results_loo.description %]</td>
                         <td>[% results_loo.tot %]</td>
-						[% IF ( opacuserlogin ) %]<td>[% IF ( RequestOnOpac ) %][% UNLESS ( results_loo.norequests ) %]<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% results_loo.biblionumber %]">Place Hold</a>[% END %][% END %]</td>[% END %]
+                        [% IF ( opacuserlogin ) %]<td>[% IF ( RequestOnOpac ) %][% UNLESS ( results_loo.norequests ) %]<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% results_loo.biblionumber %]">Place hold</a>[% END %][% END %]</td>[% END %]
                         </tr>
                 [% END %]</tbody>
         </table>
 [% ELSE %]
 <form method="post" action="/cgi-bin/koha/opac-topissues.pl">
 		<fieldset class="rows">
-		<legend>See the Most Popular Titles</legend>
+        <legend>See the most popular titles</legend>
           <ol>  <li><label for="limit">Show the top </label> <select name="limit" id="limit">
                             [% IF ( limit == 10 ) %]<option value ="10" selected="selected">10 titles</option>[% ELSE %]<option value="10">10 titles</option>[% END %]
                             [% IF ( limit == 15 ) %]<option value ="15" selected="selected">15 titles</option>[% ELSE %]<option value="15">15 titles</option>[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index b8e98a2..bd3520d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -1,7 +1,7 @@
 [% USE KohaDates %]
 
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your library home
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.metadata.min.js"></script>
@@ -60,7 +60,7 @@ $.tablesorter.addParser({
 	<div id="userdetails" class="container">
 	[% IF ( bor_messages ) %]
 	       <div class="dialog message">
-	               <h3>Messages For You</h3>
+                   <h3>Messages for you</h3>
 	               <ul>
 	                       [% FOREACH bor_messages_loo IN bor_messages_loop %]
 					<li>
@@ -110,7 +110,7 @@ $.tablesorter.addParser({
         
 <div id="opac-user-views" class="toptabs">
         <ul>
-            <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">Checked Out</a></li>
+            <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">Checked out</a></li>
             [% IF ( overdues_count ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">Overdue</a></li>[% END %]
 [% IF ( OPACFinesTab ) %]
             [% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li>[% END %]
@@ -124,7 +124,7 @@ $.tablesorter.addParser({
 [% IF ( OPACFinesTab ) %]
         <!-- FINES BOX -->
         [% IF ( BORROWER_INF.amountoverfive ) %]
-            <div id="opac-user-fines"> <h3>Fines and Charges</h3>
+            <div id="opac-user-fines"> <h3>Fines and charges</h3>
             <table>
                 <tr><th colspan="2">Amount</th></tr>
                 <tr>
@@ -135,7 +135,7 @@ $.tablesorter.addParser({
         [% END %]
 
         [% IF ( BORROWER_INF.amountoverzero ) %]
-           <div id="opac-user-fines"> <h3>Fines and Charges</h3>
+           <div id="opac-user-fines"> <h3>Fines and charges</h3>
             <table>
                 <tr><th colspan="2">Amount</th></tr>
                 <tr><td>You currently owe fines and charges amounting to:</td>
@@ -158,11 +158,11 @@ $.tablesorter.addParser({
     [% IF ( atdestination ) %]
     <div id="opac-user-waiting">
         <table id="waitingt">
-            <caption>Holds Waiting</caption>
+            <caption>Holds waiting</caption>
            <thead> <tr>
                 <th colspan="2" class="{sorter:'articles'}">Title</th>
                 <th>Hold date</th>
-                <th>Pick Up Library</th>
+                <th>Pick up library</th>
             </tr></thead>
             <tbody>[% FOREACH WAITIN IN WAITING %]
                 <tr>
@@ -188,12 +188,12 @@ $.tablesorter.addParser({
 	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
 	<input type="hidden" name="from" value="opac_user" />
         <table id="checkoutst">
-        <caption>[% issues_count %] Item(s) Checked Out</caption>
+        <caption>[% issues_count %] Item(s) checked out</caption>
        <thead><tr>
 		[% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
         <th class="{sorter:'articles'}">Title</th>
         <th>Due</th>
-		[% UNLESS ( item_level_itypes ) %]<th>Item Type</th> [% END %]
+        [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
         [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
         <th>Call No.</th>
         [% IF ( OpacRenewalAllowed ) %]
@@ -287,9 +287,9 @@ $.tablesorter.addParser({
 <thead><tr>
 [% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
 <th class="{sorter:'articles'}">Title</th>
-[% UNLESS ( item_level_itypes ) %]<th>Item Type</th> [% END %]
+[% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
 [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
-<th>Call No.</th>
+<th>Call no.</th>
 <th>Due</th>
 [% IF ( OpacRenewalAllowed ) %]
                     <th class="{sorter: false}">Renew</th>
@@ -326,7 +326,7 @@ $.tablesorter.addParser({
 <td>[% OVERDUE.date_due | $KohaDates %]</td>
                 [% IF ( OpacRenewalAllowed ) %]
 <td>
-[% IF ( OVERDUE.debarred ) %]Account Frozen
+[% IF ( OVERDUE.debarred ) %]Account frozen
 [% ELSIF ( OVERDUE.status ) %]
 [% IF ( canrenew ) %]<a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber %]&amp;bornum=[% OVERDUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining)</span>
 [% ELSIF ( OVERDUE.onreserve ) %]On hold
@@ -349,9 +349,9 @@ $.tablesorter.addParser({
             <!-- RESERVES TABLE ROWS -->
             <thead><tr>
                 <th class="{sorter:'articles'}">Title</th>
-                <th>Placed On</th>
-		<th>Expires On</th>
-                <th>Pick Up Location</th>
+                <th>Placed on</th>
+        <th>Expires on</th>
+                <th>Pick up location</th>
 		[% IF ( showpriority ) %]
 			<th>Priority</th>
 		[% END %]
@@ -377,7 +377,7 @@ $.tablesorter.addParser({
                     [% RESERVE.author %]
                 </td>
                 <td>[% RESERVE.reservedate | $KohaDates %]</td>
-		<td>[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never Expires[% END %]</td>
+        <td>[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %]</td>
                 <td>[% RESERVE.branch %]</td>
 				[% IF ( showpriority ) %]
 				<td>[% RESERVE.priority %] </td>
@@ -462,7 +462,7 @@ $.tablesorter.addParser({
               );
               //]]>
               </script>
-              <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('suspend_until').value='';return false;">Clear Date</a></p>
+              <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('suspend_until').value='';return false;">Clear date</a></p>
               [% END %]
             </form>
 	</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
index 2767436..0befa83 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Your personal details
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Your personal details
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body>
@@ -9,23 +9,23 @@
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
 
-<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Personal Details</h3>
+<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Personal details</h3>
 
 <table>
 <tr><th scope="row">Name:</th><td> [% firstname %] [% surname %]</td></tr>
 <tr><th scope="row">
-Card Number:</th><td>[% cardnumber %]</td></tr>
+Card number:</th><td>[% cardnumber %]</td></tr>
 </table>
 
 <table>
-<caption>Contact Details</caption>
-<tr><th scope="row">Mailing Address:</th><td>[% address %], [% city %]</td></tr>
+<caption>Contact details</caption>
+<tr><th scope="row">Mailing address:</th><td>[% address %], [% city %]</td></tr>
 
-<tr><th scope="row">Permanent Address:</th><td> [% B_address %], [% B_address2 %], [% B_city %]</td></tr>
+<tr><th scope="row">Permanent address:</th><td> [% B_address %], [% B_address2 %], [% B_city %]</td></tr>
 
-<tr><th scope="row">Primary Phone:</th><td>[% IF ( phone ) %][% phone %][% ELSE %]&nbsp;[% END %]</td></tr>
+<tr><th scope="row">Primary phone:</th><td>[% IF ( phone ) %][% phone %][% ELSE %]&nbsp;[% END %]</td></tr>
 
-<tr><th scope="row">Secondary Phone:</th><td>[% IF ( mobile ) %][% mobile %][% ELSE %]&nbsp;[% END %]</td></tr>
+<tr><th scope="row">Secondary phone:</th><td>[% IF ( mobile ) %][% mobile %][% ELSE %]&nbsp;[% END %]</td></tr>
 
 <tr><th scope="row">Fax:</th><td>[% IF ( fax ) %][% fax %][% ELSE %]&nbsp;[% END %]</td></tr>
 
@@ -34,10 +34,10 @@ Card Number:</th><td>[% cardnumber %]</td></tr>
 </table>
 
 <table>
-<caption>Membership Details</caption>
-<tr><th scope="row">Membership Number:</th><td> [% borrowernumber %]</td></tr>
+<caption>Membership details</caption>
+<tr><th scope="row">Membership number:</th><td> [% borrowernumber %]</td></tr>
 
-<tr><th scope="row">Membership Category:</th><td>  [% categorycode %]</td></tr>
+<tr><th scope="row">Membership category:</th><td>  [% categorycode %]</td></tr>
 
 <!-- <td>Fee:</th><td>  /year, Paid</td> -->
 
@@ -48,15 +48,15 @@ Card Number:</th><td>[% cardnumber %]</td></tr>
 [% IF ( joiningbranch ) %]<tr><th>Joining library:</th><td>[% joiningbranch %]</td></tr>[% ELSE %]&nbsp;[% END %]</table>
 
 <table>
-<caption>Identity Details</caption>
+<caption>Identity details</caption>
 <tr><th scope="row">DoB:</th><td> [% IF ( dateofbirth ) %][% dateofbirth %][% ELSE %]&nbsp;[% END %]</td></tr>
 
 <tr><th scope="row">Gender:</th><td>[% IF ( sex ) %][% sex %][% ELSE %]&nbsp;[% END %]</td></tr></table>
 
 [% IF ( contactname ) %]
 <table>
-<caption>Alternate Contact Details</caption>
-<tr><th scope="row">Alternate Contact:</th><td> [% IF ( contactname ) %][% contactname %][% ELSE %]&nbsp;[% END %]</td></tr>
+<caption>Alternate contact details</caption>
+<tr><th scope="row">Alternate contact:</th><td> [% IF ( contactname ) %][% contactname %][% ELSE %]&nbsp;[% END %]</td></tr>
 
 <tr><th scope="row">Phone:</th><td> [% IF ( B_phone ) %][% B_phone %][% ELSE %]&nbsp;[% END %]</td></tr>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
index 3a7fb9d..1819241 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
@@ -1,6 +1,6 @@
 [% USE KohaDates %]
 
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Your personal details
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Your personal details
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="opac-userupdate">
@@ -13,7 +13,7 @@
 
 <div id="userupdatecontainer" class="container">
 [% FOREACH BORROWER_INF IN BORROWER_INFO %]
-<h3><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Personal Details</h3>
+<h3><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your personal details</h3>
 
 [% IF ( OPACPatronDetails ) %]
 <form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
@@ -23,13 +23,13 @@
     <img src="/cgi-bin/koha/opac-patron-image.pl" alt="" />
 </p>[% END %]
 <fieldset class="brief"><legend>Name</legend><ol>
-<li><label for="firstname">First Name:</label> <input id="firstname" type="text" value="[% BORROWER_INF.firstname %]"  name="firstname" /></li>
-<li><label for="othernames">Other Name:</label> <input id="othernames" type="text" value="[% BORROWER_INF.othernames %]"  name="othernames" /></li>
-<li><label for="surname">Last Name:</label> <input id="surname" type="text" value="[% BORROWER_INF.surname %]"  name="surname" /></li>
+<li><label for="firstname">First name:</label> <input id="firstname" type="text" value="[% BORROWER_INF.firstname %]"  name="firstname" /></li>
+<li><label for="othernames">Other name:</label> <input id="othernames" type="text" value="[% BORROWER_INF.othernames %]"  name="othernames" /></li>
+<li><label for="surname">Last name:</label> <input id="surname" type="text" value="[% BORROWER_INF.surname %]"  name="surname" /></li>
 </ol>
 </fieldset>
 
-<fieldset class="brief"><legend>Contact Information</legend>
+<fieldset class="brief"><legend>Contact information</legend>
 <ol>
 <li><label for="address">Address:</label>
 	<input id="streetnumber" size ="7" type="text" value="[% BORROWER_INF.streetnumber %]"  name="streetnumber" /> 
@@ -37,24 +37,24 @@
 	<input type="text" name="address2" value="[% BORROWER_INF.address2 %]" id="address2" /></li>
 <li><label for="city">City:</label> <input id="city" type="text" value="[% BORROWER_INF.city %]"  name="city" /></li>
 <li><label for="state">State:</label> <input id="state" type="text" value="[% BORROWER_INF.state %]"  name="state" /></li>
-<li><label for="zipcode">Zip Code: </label><input type="text" id="zipcode" value="[% BORROWER_INF.zipcode %]" name="zipcode" /></li>
+<li><label for="zipcode">Zip code: </label><input type="text" id="zipcode" value="[% BORROWER_INF.zipcode %]" name="zipcode" /></li>
 <li><label for="country">Country: </label><input type="text" id="country" value="[% BORROWER_INF.country %]" name="country" /></li>
-<li><label for="phone">Primary Phone:</label> <input id="phone" type="text" value="[% BORROWER_INF.phone %]"  name="phone" /></li>
-<li><label for="mobile">Secondary Phone:</label> <input id="mobile" type="text" value="[% BORROWER_INF.mobile %]"  name="mobile" /></li>
-<li><label for="phonepro">Other Phone:</label> <input id="phonepro"  type="text" value="[% BORROWER_INF.phonepro %]"  name="phonepro" /></li>
+<li><label for="phone">Primary phone:</label> <input id="phone" type="text" value="[% BORROWER_INF.phone %]"  name="phone" /></li>
+<li><label for="mobile">Secondary phone:</label> <input id="mobile" type="text" value="[% BORROWER_INF.mobile %]"  name="mobile" /></li>
+<li><label for="phonepro">Other phone:</label> <input id="phonepro"  type="text" value="[% BORROWER_INF.phonepro %]"  name="phonepro" /></li>
 <li><label for="fax">Fax:</label> <input id="fax" type="text" value="[% BORROWER_INF.fax %]"  name="fax" /></li>
-<li><label for="emailaddress">Primary Email:</label> <input id="emailaddress" type="text" value="[% BORROWER_INF.email %]"  name="emailaddress" /></li>
-<li><label for="emailpro">Secondary Email:</label> <input id="emailpro" type="text" value="[% BORROWER_INF.emailpro %]"  name="emailpro" /></li>
+<li><label for="emailaddress">Primary email:</label> <input id="emailaddress" type="text" value="[% BORROWER_INF.email %]"  name="emailaddress" /></li>
+<li><label for="emailpro">Secondary email:</label> <input id="emailpro" type="text" value="[% BORROWER_INF.emailpro %]"  name="emailpro" /></li>
 </ol>
 </fieldset>
 
 </div>
 <div class="yui-u">
 <fieldset class="brief">
-<legend>Alternate Contact Information</legend>
+<legend>Alternate contact information</legend>
 <ol>
 <li>
-    <label for="B_streetaddress">Alternate Address:</label> 
+    <label for="B_streetaddress">Alternate address:</label> 
     <input id="B_streetnumber" size ="7" type="text" value="[% BORROWER_INF.B_streetnumber %]"  name="B_streetnumber" /> 
     <input id="B_address" type="text" value="[% BORROWER_INF.B_address %]"  name="B_address" /> 
     <input id="B_address2" type="text" value="[% BORROWER_INF.B_address2 %]"  name="B_address2" />
@@ -62,7 +62,7 @@
 
 <li><label for="B_city">City:</label> <input id="B_city" type="text" value="[% BORROWER_INF.B_city %]"  name="B_city" /></li>
 <li><label for="B_state">State:</label> <input id="B_state" type="text" value="[% BORROWER_INF.B_state %]"  name="B_state" /></li>
-<li><label for="B_zipcode">Zip Code:</label> <input type="text" id="B_zipcode" value="[% BORROWER_INF.B_zipcode %]" name="B_zipcode" /></li>
+<li><label for="B_zipcode">Zip code:</label> <input type="text" id="B_zipcode" value="[% BORROWER_INF.B_zipcode %]" name="B_zipcode" /></li>
 <li><label for="B_country">Country:</label> <input type="text" id="B_country" value="[% BORROWER_INF.B_country %]" name="B_country" /></li>
 <li><label for="B_phone">Phone:</label> <input type="text" id="B_phone" value="[% BORROWER_INF.B_phone %]" name="B_phone" /></li>
 <li><label for="B_email">Email:</label> <input type="text" id="B_email" value="[% BORROWER_INF.B_email %]" name="B_email" /></li>
@@ -70,19 +70,19 @@
 </fieldset>
 <fieldset class="brief">
 <ol>
-<li><label for="dob">Date of Birth: </label> <input id="dob" type="text" size="10" value="[% BORROWER_INF.dateofbirth | $KohaDates %]" name="dateofbirth" /></li>
+<li><label for="dob">Date of birth: </label> <input id="dob" type="text" size="10" value="[% BORROWER_INF.dateofbirth | $KohaDates %]" name="dateofbirth" /></li>
 <li><label for="sex">Gender: </label> <select name="sex" id="sex"><option></option>
 [% IF ( BORROWER_INF.sex == 'F' ) %]<option value="F" selected="selected">Female</option>[% ELSE %]<option value="F">Female</option>[% END %]
 [% IF ( BORROWER_INF.sex == 'M' ) %]<option value="M" selected="selected">Male</option>[% ELSE %]<option value="M">Male</option>[% END %]
 </select></li>
 </ol></fieldset>
 <fieldset class="brief">
-<legend>Library Use:</legend>
+<legend>Library use:</legend>
 <ol>
 	<li><label for="cardnumber">Card number:</label><input type="text" id="cardnumber" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.cardnumber %]" /></li>
     <li><label for="branchname">Home library:</label><input type="text" id="branchname" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.branchname %]" /></li>
-	<li><label for="borrowernumber">Patron Number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.borrowernumber %]" /></li>
-	<li><label for="categorycode">Patron Category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.description %] ([% BORROWER_INF.categorycode %])" /></li>
+    <li><label for="borrowernumber">Patron number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.borrowernumber %]" /></li>
+    <li><label for="categorycode">Patron category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.description %] ([% BORROWER_INF.categorycode %])" /></li>
 	<li><label for="dateenrolled">Joined: </label><input type="text" id="dateenrolled" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.dateenrolled | $KohaDates %]" /></li>
 	<li><label for="dateexpiry">Expires: </label><input type="text" id="dateexpiry" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.dateexpiry | $KohaDates %]" /></li>
    [% IF ( BORROWER_INF.ExtendedPatronAttributes ) %]
@@ -111,29 +111,29 @@
     <img src="/cgi-bin/koha/opac-patron-image.pl" alt="" />
 </p>[% END %]
 <fieldset class="rows">
-<legend>Contact Information</legend>
+<legend>Contact information</legend>
 <ol>
 <li><span class="label">Name:</span> [% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]</li>
-<li><span class="label">Other Name:</span> [% BORROWER_INF.othernames %]</li>
+<li><span class="label">Other name:</span> [% BORROWER_INF.othernames %]</li>
 <li><span class="label">Address:</span> [% BORROWER_INF.streetnumber %] [% BORROWER_INF.address %]</li>
 <li><span class="label">&nbsp;</span>[% BORROWER_INF.address2 %]</li>
 <li><span class="label">City:</span>  [% BORROWER_INF.city %]</li>
 <li><span class="label">State:</span>  [% BORROWER_INF.state %]</li>
-<li><span class="label">Zip Code:</span>  [% BORROWER_INF.zipcode %]</li>
+<li><span class="label">Zip code:</span>  [% BORROWER_INF.zipcode %]</li>
 <li><span class="label">Country:</span>  [% BORROWER_INF.country %]</li>
-<li><span class="label">Primary Phone:</span>  [% BORROWER_INF.phone %]</li>
-<li><span class="label">Secondary Phone:</span>  [% BORROWER_INF.mobile %]</li>
-<li><span class="label">Other Phone:</span>  [% BORROWER_INF.phonepro %]</li>
+<li><span class="label">Primary phone:</span>  [% BORROWER_INF.phone %]</li>
+<li><span class="label">Secondary phone:</span>  [% BORROWER_INF.mobile %]</li>
+<li><span class="label">Other phone:</span>  [% BORROWER_INF.phonepro %]</li>
 <li><span class="label">Fax:</span>  [% BORROWER_INF.fax %]</li>
-<li><span class="label">Primary Email:</span>  [% BORROWER_INF.email %]</li>
-<li><span class="label">Secondary Email:</span>  [% BORROWER_INF.emailpro %]</li>
+<li><span class="label">Primary email:</span>  [% BORROWER_INF.email %]</li>
+<li><span class="label">Secondary email:</span>  [% BORROWER_INF.emailpro %]</li>
 </ol>
 </fieldset>
 
 <fieldset class="rows">
-<legend>Personal Information</legend>
+<legend>Personal information</legend>
 <ol>
-<li><span class="label">Date of Birth:</span> [% BORROWER_INF.dateofbirth | $KohaDates %]</li>
+<li><span class="label">Date of birth:</span> [% BORROWER_INF.dateofbirth | $KohaDates %]</li>
 <li><span class="label">Gender:</span>
 [% IF ( sex == 'F' ) %]Female[% END %]
 [% IF ( sex == 'M' ) %]Male[% END %]
@@ -144,13 +144,13 @@
 
 <div class="yui-u">
 <fieldset class="rows">
-<legend>Alternate Contact Information</legend>
+<legend>Alternate contact information</legend>
 <ol>
-<li><span class="label">Alternate Address:</span> [% BORROWER_INF.B_streetnumber %] [% BORROWER_INF.B_address %] </li>
+<li><span class="label">Alternate address:</span> [% BORROWER_INF.B_streetnumber %] [% BORROWER_INF.B_address %] </li>
 <li><span class="label">&nbsp;</span>[% BORROWER_INF.B_address2 %]</li>
 <li><span class="label">City:</span> [% BORROWER_INF.B_city %]</li>
 <li><span class="label">State:</span> [% BORROWER_INF.B_state %]</li>
-<li><span class="label">Zip Code:</span> [% BORROWER_INF.B_zipcode %]</li>
+<li><span class="label">Zip code:</span> [% BORROWER_INF.B_zipcode %]</li>
 <li><span class="label">Country:</span> [% BORROWER_INF.B_country %]</li>
 <li><span class="label">Phone:</span> [% BORROWER_INF.B_phone %]</li>
 <li><span class="label">Email:</span> [% BORROWER_INF.B_email %]</li>
@@ -158,12 +158,12 @@
 </fieldset>
 
 <fieldset class="rows">
-<legend>Library Use:</legend>
+<legend>Library use:</legend>
 <ol>
 <li><span class="label">Card number:</span> [% BORROWER_INF.cardnumber %]</li>
 <li><span class="label">Home library:</span> [% BORROWER_INF.branchname %]</li>
-<li><span class="label">Patron Number:</span> [% BORROWER_INF.borrowernumber %]</li>
-<li><span class="label">Patron Category:</span> [% BORROWER_INF.description %] ([% BORROWER_INF.categorycode %])</li>
+<li><span class="label">Patron number:</span> [% BORROWER_INF.borrowernumber %]</li>
+<li><span class="label">Patron category:</span> [% BORROWER_INF.description %] ([% BORROWER_INF.categorycode %])</li>
 <li><span class="label">Joined:</span> [% BORROWER_INF.dateenrolled | $KohaDates %]</li>
 <li><span class="label">Expires:</span> [% BORROWER_INF.dateexpiry | $KohaDates %]</li>
    [% IF ( BORROWER_INF.ExtendedPatronAttributes ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
index ba52fcd..df4f0d3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
@@ -1,4 +1,4 @@
-[% INCLUDE 'doc-head-open.inc' %][% LibraryName %] &rsaquo; Self Checkout</title>
+[% INCLUDE 'doc-head-open.inc' %][% LibraryName %] &rsaquo; Self checkout</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
 <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
@@ -10,7 +10,7 @@
   <div id="bd">
     <div class="yui-g">
 
-<h1>Self Checkout Help</h1>
+<h1>Self checkout help</h1>
 
 [% IF ( SelfCheckHelpMessage ) %]
 <div id="selfcheckhelpmessage">
@@ -22,21 +22,21 @@
 is not behaving as expected, you may want to refer to this guide to get
 yourself started.</p>
 
-<h3>Step One: Enter your user id[% IF ( SelfCheckoutByLogin ) %] and password[% END %]</h3>
+<h3>Step one: Enter your user id[% IF ( SelfCheckoutByLogin ) %] and password[% END %]</h3>
 <p>Enter your User ID[% IF ( SelfCheckoutByLogin ) %] and password[% END %], and click the 
 submit button (or press the enter key).</p>
 
-<h3>Step Two: Scan the barcode for each item, one at a time</h3>
+<h3>Step two: Scan the barcode for each item, one at a time</h3>
 <p>Scan each item and wait for the page to reload before scanning the next item.
 The checked-out item should appear in your checkouts list.
 The Submit button only needs to be clicked if you enter the barcode manually.</p>
 
-<h3>Step Three: Click the 'Finish' button</h3>
+<h3>Step three: Click the 'Finish' button</h3>
 <p>If you do not click the 'Finish' button, your session will automatically expire in
 [% SelfCheckTimeout %] seconds.</p>
 
     <div class="button">
-        <a href="javascript:history.go(-1)">Return to the Self-Checkout</a>
+        <a href="javascript:history.go(-1)">Return to the self-checkout</a>
     </div>
 
 </div></div></div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
index 9f8f634..adf6dc1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
@@ -1,6 +1,6 @@
-[% USE KohaDates %]
+[% use KohaDates %]
 
-[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self Checkout </title>
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
 <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
@@ -67,7 +67,7 @@ $(document).ready(function() {
 
 <div id="doc" class="yui-t7">
 
-<div id="masthead"><h1>[% LibraryName %] Self Checkout System</h1></div>
+<div id="masthead"><h1>[% LibraryName %] Self checkout system</h1></div>
 <div id="bd">
 
 [% IF ( impossible ) %]<!-- We tried to issue, but failed. -->
@@ -130,22 +130,22 @@ $(document).ready(function() {
 <input type="hidden" name="confirmed" value="" />
 [% IF ( renew ) %]
 [% IF ( AllowSelfCheckReturns ) %]
-<input type="button" value="Return Item" name="confirm" class="return" onclick="this.form.op.value='returnbook';this.form.submit();"  />
+<input type="button" value="Return item" name="confirm" class="return" onclick="this.form.op.value='returnbook';this.form.submit();"  />
 [% END %]
 [% END %]
-[% UNLESS ( renew ) %]<input type="button" value="Renew Item" name="confirm" class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />
-[% ELSE %]<input type="button" value="Renew Item" class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />[% END %]
+[% UNLESS ( renew ) %]<input type="button" value="Renew item" name="confirm" class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />
+[% ELSE %]<input type="button" value="Renew item" class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />[% END %]
 <input type="button" value="Cancel" class="cancel" onclick="this.form.op.value='';this.form.submit();return true;"  />
 </form>
 </div>
 [% END %]
 
-[% IF ( nopermission ) %]<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Access Denied</h3>
-Sorry, This Self-Checkout Station has lost authentication.  Please contact the administrator to resolve this problem. </div>
+[% IF ( nopermission ) %]<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Access denied</h3>
+Sorry, this self-checkout station has lost authentication.  Please contact the administrator to resolve this problem. </div>
 [% END %]
 [% IF ( timed_out ) %]<!-- This is what is displayed if login has timed out -->
 <div class="dialog alert"><h3>Session timed out</h3>Sorry, your session has timed out, please log in again.</div>[% END %]
-[% IF ( different_ip ) %]<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Session Lost</h3>You are accessing Self-Checkout from a different IP address! please log in again.</div>[% END %]
+[% IF ( different_ip ) %]<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Session lost</h3>You are accessing self-checkout from a different IP address! please log in again.</div>[% END %]
 [% IF ( invalid_username_or_password ) %]
 <!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Record not found</h3><p>Your userid was not found in the database.  Please try again.</p></div>[% END %]
 
@@ -153,7 +153,7 @@ Sorry, This Self-Checkout Station has lost authentication.  Please contact the a
 [% UNLESS ( hide_main ) %]
 	<div class="sco_head">
 	[% UNLESS ( validuser ) %] 
-	<h3>Self Checkout</h3>
+    <h3>Self checkout</h3>
 	[% END %]
 
 	<div id="checkouthelp">
@@ -202,7 +202,7 @@ Sorry, This Self-Checkout Station has lost authentication.  Please contact the a
 	<table id="loanTable"><caption>Checkouts for [% borrowername %] <span class="count">([% issues_count %] total)</span></caption>
 	<!-- ISSUES TABLE ROWS -->
     <thead>
-	<tr><th>Title</th><th>Call No.</th><th>Due</th><th>Renew</th>[% UNLESS ( nofines ) %]<th>Fines</th>[% END %]</tr>
+        <tr><th>Title</th><th>Call no.</th><th>Due</th><th>Renew</th>[% UNLESS ( nofines ) %]<th>Fines</th>[% END %]</tr>
     </thead>
 
     <tbody>
-- 
1.7.5.4


From marc at msys.ch  Thu Apr  5 17:14:24 2012
From: marc at msys.ch (Marc Balmer)
Date: Thu, 05 Apr 2012 17:14:24 +0200
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings
 consistently (OPAC pages)
In-Reply-To: <1333638373-5557-1-git-send-email-oleonard@myacpl.org>
References: <1333638373-5557-1-git-send-email-oleonard@myacpl.org>
Message-ID: <4F7DB6D0.20408@msys.ch>

Am 05.04.12 17:06, schrieb Owen Leonard:
> Correcting capitalization in OPAC templates

Shouldn't titles (<hN>...</hN>) be capitalized according to english
language title rules? I.e. capitalize most words?

Just asking...

> ---
>  koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt  |    4 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt  |    4 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt  |    4 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt  |    4 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt  |    4 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt  |    4 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt       |   42 ++++++------
>  koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt   |    4 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt |    6 +-
>  .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt   |    4 +-
>  .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt   |    8 +-
>  .../opac-tmpl/prog/en/modules/opac-account.tt      |   12 ++--
>  .../prog/en/modules/opac-addbybiblionumber.tt      |   10 ++--
>  .../opac-tmpl/prog/en/modules/opac-advsearch.tt    |   66 +++++++++---------
>  .../prog/en/modules/opac-alert-subscribe.tt        |    2 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |   10 ++--
>  .../prog/en/modules/opac-authorities-home.tt       |    8 +-
>  .../prog/en/modules/opac-authoritiesdetail.tt      |    2 +-
>  .../en/modules/opac-authoritiessearchresultlist.tt |   12 ++--
>  koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt |   18 +++---
>  .../opac-tmpl/prog/en/modules/opac-browser.tt      |    2 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   60 ++++++++--------
>  .../opac-tmpl/prog/en/modules/opac-downloadcart.tt |    4 +-
>  .../prog/en/modules/opac-downloadshelf.tt          |    4 +-
>  .../prog/en/modules/opac-full-serial-issues.tt     |    4 +-
>  .../opac-tmpl/prog/en/modules/opac-imageviewer.tt  |    2 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt   |    4 +-
>  .../opac-tmpl/prog/en/modules/opac-messaging.tt    |   18 +++---
>  koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt |   18 +++---
>  .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    2 +-
>  .../prog/en/modules/opac-readingrecord.tt          |   14 ++--
>  .../opac-tmpl/prog/en/modules/opac-reserve.tt      |   26 ++++----
>  .../prog/en/modules/opac-results-grouped.tt        |   26 ++++----
>  .../opac-tmpl/prog/en/modules/opac-results.tt      |   52 +++++++-------
>  koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt |    6 +-
>  .../prog/en/modules/opac-search-history.tt         |    2 +-
>  .../opac-tmpl/prog/en/modules/opac-sendbasket.tt   |    6 +-
>  .../prog/en/modules/opac-sendbasketform.tt         |    8 +-
>  .../opac-tmpl/prog/en/modules/opac-sendshelf.tt    |    8 +-
>  .../prog/en/modules/opac-sendshelfform.tt          |    6 +-
>  .../prog/en/modules/opac-serial-issues.tt          |   10 ++--
>  .../opac-tmpl/prog/en/modules/opac-shelves.tt      |   48 +++++++-------
>  .../opac-tmpl/prog/en/modules/opac-showmarc.tt     |    2 +-
>  .../prog/en/modules/opac-showreviews-rss.tt        |    4 +-
>  .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |    4 +-
>  .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |   16 ++--
>  koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt   |    4 +-
>  .../opac-tmpl/prog/en/modules/opac-tags_subject.tt |    2 +-
>  .../opac-tmpl/prog/en/modules/opac-topissues.tt    |    6 +-
>  koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |   34 +++++-----
>  .../opac-tmpl/prog/en/modules/opac-userdetails.tt  |   28 ++++----
>  .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |   70 ++++++++++----------
>  koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt    |   12 ++--
>  .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |   22 +++---
>  54 files changed, 381 insertions(+), 381 deletions(-)
> 
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt
> index a24550f..a7ff04b 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="error400">
> @@ -9,7 +9,7 @@
>  <div id="yui-main">
>  <div class="yui-b">
>  <div class="yui-g">
> -            <h3>An Error has Occurred</h3>
> +            <h3>An error has occurred</h3>
>              <h4>Error 400</h4>
>              <ul>
>                  <li>This error means that the Koha is pointed an invalid link.</li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt
> index 8d474a8..59b9042 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="error401">
> @@ -9,7 +9,7 @@
>  <div id="yui-main">
>  <div class="yui-b">
>  <div class="yui-g">
> -            <h3>An Error has Occurred</h3>
> +            <h3>An error has occurred</h3>
>              <h4>Error 401</h4>
>              <ul>
>                  <li>This error means that the you are trying to access a link that you're not authorized to see.</li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt
> index 1741a69..8cd222e 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="error402">
> @@ -9,7 +9,7 @@
>  <div id="yui-main">
>  <div class="yui-b">
>  <div class="yui-g">
> -            <h3>An Error has Occurred</h3>
> +            <h3>An error has occurred</h3>
>              <h4>Error 402</h4>
>              <ul>
>                  <li>This error means that the Koha is pointed an invalid link.</li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt
> index 38e83dd..8bb7d7d 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="error403">
> @@ -9,7 +9,7 @@
>  <div id="yui-main">
>  <div class="yui-b">
>  <div class="yui-g">
> -            <h3>An Error has Occurred</h3>
> +            <h3>An error has occurred</h3>
>              <h4>Error 403</h4>
>              <ul>
>                  <li>This error means that you are forbidden for some reason to see this page.</li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt
> index 68301ca..5f48381 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="error404">
> @@ -9,7 +9,7 @@
>  <div id="yui-main">
>  <div class="yui-b">
>  <div class="yui-g">
> -            <h3>An Error has Occurred</h3>
> +            <h3>An error has occurred</h3>
>              <h4>Error 404</h4>
>              <ul>
>                  <li>This error means that the link was broken and that the page doesn't exist.</li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt
> index 72243e5..7354bf5 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="error500">
> @@ -9,7 +9,7 @@
>  <div id="yui-main">
>  <div class="yui-b">
>  <div class="yui-g">
> -            <h3>An Error has Occurred</h3>
> +            <h3>An error has occurred</h3>
>              <h4>Error 500</h4>
>              <ul>
>                  <li>An error occurred while try to process your request.</li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt
> index 219dc41..9311599 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] &rsaquo; ILS-DI
> +[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] &rsaquo; ILS-DI
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body>
> @@ -36,11 +36,11 @@
>                      <dt><strong>return_fmt</strong> (Optional)</dt>
>                      <dd>requests a particular format or set of formats in reporting availability</dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=GetAvailability&amp;id=1+2+99999&amp;id_type=item">
>                      ilsdi.pl?service=GetAvailability&amp;id=1+2+99999&amp;id_type=item
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;dlf:collection
>    xmlns:dlf="http://diglib.org/ilsdi/1.1"
> @@ -113,7 +113,7 @@
>                  <a href="ilsdi.pl?service=GetRecords&amp;id=1+2+99999">
>                      ilsdi.pl?service=GetRecords&amp;id=1+2+99999
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;GetRecords&gt;
>    &lt;record&gt;
> @@ -313,11 +313,11 @@
>                          </ul>
>                      </dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=GetAuthorityRecords&amp;id=1+2+99999">
>                      ilsdi.pl?service=GetAuthorityRecords&amp;id=1+2+99999
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;xml version="1.0" encoding="UTF-8"&gt;;
>  &lt;GetAuthorityRecords&gt;
>    &lt;record&gt;
> @@ -371,11 +371,11 @@
>                          </ul>
>                      </dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=LookupPatron&amp;id=815&amp;id_type=cardnumber">
>                      ilsdi.pl?service=LookupPatron&amp;id=815&amp;id_type=cardnumber
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;LookupPatron&gt;
>    &lt;id&gt;419&lt;/id&gt;
> @@ -392,7 +392,7 @@
>                      <dt><strong>password</strong> (Required)</dt>
>                      <dd>user's password</dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=AuthenticatePatron&amp;username=john9&amp;password=soul">
>                      ilsdi.pl?service=AuthenticatePatron&amp;username=john9&amp;password=soul
>                  </a>
> @@ -422,11 +422,11 @@
>                      <dt><strong>show_loans</strong> (Optional, default 0)</dt>
>                      <dd>whether or not to return loan information in the response</dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=GetPatronInfo&amp;patron_id=1&amp;show_contact=0&amp;show_loans=1">
>                      ilsdi.pl?service=GetPatronInfo&amp;patron_id=1&amp;show_contact=0&amp;show_loans=1
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;GetPatronInfo&gt;
>    &lt;category_type&gt;A&lt;/category_type&gt;
> @@ -541,7 +541,7 @@
>                      <dt><strong>patron_id</strong> (Required)</dt>
>                      <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=GetPatronStatus&amp;patron_id=1">
>                      ilsdi.pl?service=GetPatronStatus&amp;patron_id=1
>                  </a>
> @@ -564,11 +564,11 @@
>                      <dt><strong>item_id</strong> (Required)</dt>
>                      <dd>system item identifier</dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=GetServices&amp;patron_id=1&amp;item_id=1">
>                      ilsdi.pl?service=GetServices&amp;patron_id=1&amp;item_id=1
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;GetServices&gt;
>    &lt;AvailableFor&gt;title level hold&lt;/AvailableFor&gt;
> @@ -588,11 +588,11 @@
>                      <dt><strong>desired_due_date</strong> (Required)</dt>
>                      <dd>the date the patron would like the item returned by</dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=RenewLoan&amp;patron_id=1&amp;item_id=1">
>                      ilsdi.pl?service=RenewLoan&amp;patron_id=1&amp;item_id=1
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;RenewLoan&gt;
>    &lt;success&gt;0&lt;/success&gt;
> @@ -623,7 +623,7 @@
>                  <a href="ilsdi.pl?service=HoldTitle&amp;patron_id=1&amp;bib_id=1&amp;request_location=127.0.0.1">
>                      ilsdi.pl?service=HoldTitle&amp;patron_id=1&amp;bib_id=1&amp;request_location=127.0.0.1
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;HoldTitle&gt;
>    &lt;title&gt;(les) gal?res de l'Orf?vre&lt;/title&gt;
> @@ -654,7 +654,7 @@
>                  <a href="ilsdi.pl?service=HoldItem&amp;patron_id=1&amp;bib_id=1&amp;item_id=1">
>                      ilsdi.pl?service=HoldItem&amp;patron_id=1&amp;bib_id=1&amp;item_id=1
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;HoldTitle&gt;
>    &lt;title&gt;(les) gal?res de l'Orf?vre&lt;/title&gt;
> @@ -673,11 +673,11 @@
>                      <dt><strong>item_id</strong> (Required)</dt>
>                      <dd>system item identifier</dd>
>                  </dl>
> -                <h4>Example Call</h4>
> +                <h4>Example call</h4>
>                  <a href="ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1">
>                      ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1
>                  </a>
> -                <h4>Example Response</h4>
> +                <h4>Example response</h4>
>  <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
>  &lt;CancelHold&gt;
>    &lt;message&gt;Canceled&lt;/message&gt;
> @@ -685,7 +685,7 @@
>  
>  [% ELSE %]
>  
> -                <h2>Level 1: Basic Discovery Interfaces</h2>
> +                <h2>Level 1: Basic discovery interfaces</h2>
>                  <ul>
>                      <li>HarvestBibliographicRecords <em>(Use OAI-PMH instead)</em></li>
>                      <li>HarvestExpandedRecords <em>(Use OAI-PMH instead)</em></li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt
> index 342dbfa..61ef820 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  An Error Has Occurred
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  An error has occurred
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body>
> @@ -10,7 +10,7 @@
>  <div id="kohaerrorcontainer" class="container">
>  <div id="kohaerror">
>  <div class="dialog message">
> -<h3>An Error has Occurred</h3>
> +<h3>An error has occurred</h3>
>  [% IF ( noadminemail ) %]
>  <p>An error occurred when sending your message to the administrator. Please visit the library to update your personal details. </p>
>  <p><a href="/cgi-bin/koha/opac-user.pl">Return to your summary.</a></p>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt
> index 4414ab5..b979c1b 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tt
> @@ -1,5 +1,5 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
>  [% INCLUDE 'doc-head-close.inc' %]
>  <style type="text/css">
>  #opac-maintenance-message {
> @@ -20,8 +20,8 @@ width:50%;
>    [% END %]
>     <div id="bd">
>  <div id="opac-maintenance-message">
> -<h2>System Maintenance</h2>
> -<p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress %]">Site Administrator</a></p>
> +<h2>System maintenance</h2>
> +<p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress %]">site administrator</a></p>
>  </div>
>  </div>
>  [% INCLUDE 'opac-bottom.inc' %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
> index 97b64ad..35f1895 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; ISBD View
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; ISBD view
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/JavaScript" language="JavaScript">
>  //<![CDATA[
> @@ -37,7 +37,7 @@
>      <div id="catalogue_detail_biblio">
>  	
>       <div id="views">
> -	 <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal View</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC View</a></span> <span class="view"><span id="ISBDview">ISBD View</span></span></div>
> +     <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal view</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC view</a></span> <span class="view"><span id="ISBDview">ISBD view</span></span></div>
>  
>      <div id="isbdcontents">[% ISBD %]</div>
>  
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
> index f3d2c91..810bba8 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  MARC Details for Record No. [% biblionumber %]
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  MARC details for record no. [% biblionumber %]
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript">
>  //<![CDATA[
> @@ -67,10 +67,10 @@ $(document).ready(function(){
>      <div id="catalogue_detail_biblio">
>  
>      <div id="views">
> -    <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal View</a></span>
> +    <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Normal view</a></span>
>  
> -<span class="view"><span id="MARCview">MARC View</span></span>
> -[% IF ( ISBD ) %]<span class="view"><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD View</a></span>[% END %]
> +<span class="view"><span id="MARCview">MARC view</span></span>
> +[% IF ( ISBD ) %]<span class="view"><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD view</a></span>[% END %]
>  </div>
>      <h1 class="title">[% bibliotitle %] (Record no. [% biblionumber %])</h1>
>      [% IF ( OPACXSLTDetailsDisplay ) %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
> index 9549ea2..581b948 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt
> @@ -1,6 +1,6 @@
>  [% USE KohaDates %]
>  
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your fines and charges
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your fines and charges
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-account">
> @@ -13,7 +13,7 @@
>  		<div id="useraccount" class="container">
>  <!--CONTENT-->
>      [% FOREACH BORROWER_INF IN BORROWER_INFO %]
> -        <h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Fines and Charges</h3>
> +        <h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Fines and charges</h3>
>      [% END %]
>  
>      [% IF ( ACCOUNT_LINES ) %]
> @@ -22,14 +22,14 @@
>                  <tr>
>                      <th>Date</th>
>                      <th>Description</th>
> -                    <th>Fine Amount</th>
> -                    <th>Amount Outstanding</th>
> +                    <th>Fine amount</th>
> +                    <th>Amount outstanding</th>
>                  </tr>
>              </thead>
>  
>              <tfoot>
>              <tr>
> -                <th class="sum" colspan="3">Total Due</th>
> +                <th class="sum" colspan="3">Total due</th>
>                  <td class="sum">[% total %]</td>
>              </tr>
>              </tfoot>
> @@ -48,7 +48,7 @@
>  
>          </table>
>      [% ELSE %]
> -        <h4>You have no Fines or Charges</h4>
> +        <h4>You have no fines or charges</h4>
>      [% END %]
>  </div>
>  </div>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
> index e9370c8..a1e1f9b 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tt
> @@ -1,5 +1,5 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Add to Your List
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Add to your list
>  [% INCLUDE 'doc-head-close.inc' %]
>  <style type="text/css">
>     #custom-doc { width:34.62em;*width:33.78em;min-width:450px; margin:auto; margin-top: .4em;text-align:left; }
> @@ -24,8 +24,8 @@
>  		</ul>
>  		[% IF ( existingshelves ) %]
>  			<form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="post">
> -    		<fieldset class="rows"><legend>Select a List</legend>
> -			<ol><li>    <label for="shelfnumber">Add to list:</label> <select name="shelfnumber" id="shelfnumber">
> +            <fieldset class="rows"><legend>Select a list</legend>
> +            <ol><li>    <label for="shelfnumber">Add to list:</label> <select name="shelfnumber" id="shelfnumber">
>  				[% IF ( privatevirtualshelves ) %]<optgroup label="Private Lists">
>  					[% FOREACH privatevirtualshelve IN privatevirtualshelves %]
>  					<option value="[% privatevirtualshelve.shelfnumber %]">[% privatevirtualshelve.shelfname %]</option>
> @@ -54,10 +54,10 @@
>  		[% END %]
>  	[% END %]
>  	[% UNLESS ( singleshelf ) %]<form name="f2" method="post" action="/cgi-bin/koha/opac-addbybiblionumber.pl">
> -		<fieldset class="rows">    <legend>Add to a New List:</legend>
> +        <fieldset class="rows">    <legend>Add to a new list:</legend>
>  		<ol><li>
>  		<label for="newvirtualshelf">
> -		List Name:
> +        List name:
>  		</label>
>  		<input type="text" name="newvirtualshelf" id="newvirtualshelf" size="40" />
>  		</li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
> index d4e92b4..4698324 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
> @@ -1,6 +1,6 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %]
> -    Catalog &rsaquo; Advanced Search
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %]
> +    catalog &rsaquo; Advanced search
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript" language="javascript">//<![CDATA[
>              $(document).ready(function() {
> @@ -68,36 +68,36 @@
>              <option value="kw">Keyword</option>
>              <option value="su,wrdl">Subject</option>
>  [% IF ( search_boxes_loo.expanded_options ) %]
> -            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject Phrase</option>
> +            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject phrase</option>
>  [% END %]
>              <option value="ti">Title</option>
>  [% IF ( expanded_options ) %]
> -            <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase</option>
> -            <option value="se,wrdl">Series Title</option>
> -            <option value="callnum">Call Number</option>
> -            <option value="location">Shelving Location</option>
> +            <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title phrase</option>
> +            <option value="se,wrdl">Series title</option>
> +            <option value="callnum">Call number</option>
> +            <option value="location">Shelving location</option>
>  [% END %]
>              <option value="au,wrdl">Author</option>
>              
>  [% IF ( expanded_options ) %]
> -            <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>
> -            <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
> -            <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
> -            <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name Phrase</option>
> -            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
> -            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
> +            <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author phrase</option>
> +            <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
> +            <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
> +            <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name phrase</option>
> +            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
> +            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name phrase</option>
>  [% END %]
>  [% IF ( expanded_options ) %]
>              <option value="nt">Notes/Comments</option>
>              <option value="curriculum">Curriculum</option>
>  [% END %]
>              <option value="pb,wrdl">Publisher</option>
> -            <option value="pl,wrdl">Publisher Location</option>
> +            <option value="pl,wrdl">Publisher location</option>
>  [% IF ( expanded_options ) %]
> -            <option value="sn">Standard Number</option>
> +            <option value="sn">Standard number</option>
>              <option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
>              <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
> -            <option value="lcn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
> +            <option value="lcn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call number</option>
>  [% ELSE %]
>              <option value="nb">ISBN</option>
>  [% END %]
> @@ -117,18 +117,18 @@
>  
>      <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
>      [% IF ( expanded_options ) %]
> -        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer Options]</a>
> +        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer options]</a>
>      [% ELSE %]
>          <a href="/cgi-bin/koha/opac-search.pl?expanded_options=1">[More options]</a>
>      [% END %]
> -    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New Search]</a>
> +    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New search]</a>
>  
>  <!-- /SEARCH BUTTONS --></div></div>
>  <div class="yui-g">
>  <div id="pubrange" class="container">
>  <fieldset>
>  <!-- PUB RANGE OPTION -->
> -<legend>Publication Date Range:</legend>
> +<legend>Publication date range:</legend>
>  <span>For example:  1999-2001.  You could also use "-1987" for everything published before 1987 or "2008-" for everything published after 2008.</span>
>  <input type="text" size="30" name="limit-yr" title="Enter search terms" value="" />
>  </fieldset>
> @@ -141,10 +141,10 @@
>        [% FOREACH advsearchloo IN advancedsearchesloop %]
>          <li id="advsearch-tab-[% advsearchloo.advanced_search_type %]">
>             <a href="/cgi-bin/koha/opac-search.pl#advsearch-[% advsearchloo.advanced_search_type %]">
> -           [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item Type
> +           [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
>             [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
> -           [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving Location
> -           [% ELSE %]Something Else
> +           [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
> +           [% ELSE %]Something else
>             [% END %]
>             </a>
>          </li>
> @@ -172,7 +172,7 @@
>      <!-- LANGUAGE LIMIT -->
>                  <p><label for="language-limit">Language: </label>                                        
>                  <select id="language-limit" name="limit">
> -                <option value="">No Limit</option>
> +                <option value="">No limit</option>
>                  [% FOREACH search_languages_loo IN search_languages_loop %]
>                      [% IF ( search_languages_loo.selected ) %]
>                          <option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]" selected="selected">[% search_languages_loo.language_description %]</option>
> @@ -189,17 +189,17 @@
>          <!-- SUBTYPE LIMITS -->
>              <div id="subtypes" class="container"><fieldset>
>              <legend>Subtype limits</legend><select name="limit" class="subtype">
> -                <option value="" selected="selected" class="menuheader">Any Audience</option>
> +                <option value="" selected="selected" class="menuheader">Any audience</option>
>                      <option value="aud:a">Easy</option>
>                      <option value="aud:c">Juvenile</option>
> -                    <option value="aud:d">Young Adult</option>
> +                    <option value="aud:d">Young adult</option>
>                      <option value="aud:e">Adult</option>
>                  </select>
>              
>              <select name="limit" class="subtype">
> -                <option value="" selected="selected" class="menuheader">Any Content</option>
> +                <option value="" selected="selected" class="menuheader">Any content</option>
>                      <option value="fic:1">Fiction</option>
> -                    <option value="fic:0">Non Fiction</option>
> +                    <option value="fic:0">Non fiction</option>
>                      <option value="bio:b">Biography</option>
>                      <option value="mus:j">Musical recording</option>
>                      <option value="mus:i">Non-musical recording</option>
> @@ -207,7 +207,7 @@
>      
>              
>              <select name="limit" class="subtype">
> -                <option value="" selected="selected" class="menuheader">Any Format</option>
> +                <option value="" selected="selected" class="menuheader">Any format</option>
>                      <option value="l-format:ta">Regular print</option>
>                      <option value="l-format:tb">Large print</option>
>                      <option value="l-format:fk">Braille</option>
> @@ -216,12 +216,12 @@
>                      <option value="l-format:ss">Cassette recording</option>
>                      <option value="l-format:vf">VHS tape / Videocassette</option>
>                      <option value="l-format:vd">DVD video / Videodisc</option>
> -                    <option value="l-format:co">CD Software</option>
> +                    <option value="l-format:co">CD software</option>
>                      <option value="l-format:cr">Website</option>
>                  </select>
>              
>              <select name="limit" class="subtype">
> -                <option value="">Additional Content Types for Books/Printed Materials</option>
> +                <option value="">Additional content types for books/printed materials</option>
>                      <option value="ctype:a">Abstracts/summaries</option>
>                      <option value="ctype:b">Bibliographies</option>
>                      <option value="ctype:c">Catalogs</option>
> @@ -274,7 +274,7 @@
>          </select>
>          [% IF ( searchdomainloop ) %]
>              <p>OR</p> <!-- should addjs to grey out group pulldown if a library is selected. -->
> -                <label for="categoryloop">Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
> +                <label for="categoryloop">Groups of libraries</label><select name="multibranchlimit" id="categoryloop">
>                  <option value=""> -- none -- </option>
>                  [% FOREACH searchdomainloo IN searchdomainloop %]
>                  <option value="[% searchdomainloo.categorycode %]">[% searchdomainloo.categoryname %]</option>
> @@ -300,11 +300,11 @@
>  
>      <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
>      [% IF ( expanded_options ) %]
> -        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer Options]</a>
> +        <a href="/cgi-bin/koha/opac-search.pl?expanded_options=0">[Fewer options]</a>
>      [% ELSE %]
>          <a href="/cgi-bin/koha/opac-search.pl?expanded_options=1">[More options]</a>
>      [% END %]
> -    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New Search]</a>
> +    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New search]</a>
>  
>  <!-- /SEARCH BUTTONS --></div></div>
>  </form>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
> index 4281a46..07d91a2 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Serials
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Serials
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-alert-subscribe">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
> index febe4d2..6a1bb48 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
> @@ -1,8 +1,8 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] 
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] 
>  [% IF ( opacuserlogin ) %]
> - Catalog &rsaquo;  Log in to Your Account
> + catalog &rsaquo;  Log in to your account
>  [% ELSE %]
> - Catalog &rsaquo; Catalog Login Disabled
> + catalog &rsaquo; Catalog login disabled
>  [% END %]
>  [% INCLUDE 'doc-head-close.inc' %]
>  
> @@ -46,7 +46,7 @@
>  [% END %]
>  
>  [% IF ( casAuthentication ) %]
> -<h4>Cas Login</h4>
> +<h4>Cas login</h4>
>  
>  [% IF ( invalidCasLogin ) %]
>  <!-- This is what is displayed if cas login has failed -->
> @@ -67,7 +67,7 @@ please choose against which one you would like to authenticate: </p>
>  [% END %]
>  </ul>
>  
> -<h4>Local Login</h4>
> +<h4>Local login</h4>
>  <p>If you do not have a CAS account, but a local account, you can still log in : </p>
>  
>  [% END %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
> index 080fa58..04d5a8c 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Browse by author or subject
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Browse by author or subject
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-authorities">
> @@ -15,7 +15,7 @@
>  <fieldset class="rows">
>              <legend>Browse by author or subject</legend>
>  <ol>
> - <li><label for="authtypecode">Search: : </label> <select name="authtypecode" id="authtypecode">
> + <li><label for="authtypecode">Search: </label> <select name="authtypecode" id="authtypecode">
>                  [% FOREACH authtypesloo IN authtypesloop %]
>                  [% IF ( authtypesloo.selected ) %]<option value="[% authtypesloo.value %]" selected="selected">[% authtypesloo.authtypetext %]</option>
>                  [% ELSE %]<option value="[% authtypesloo.value %]"> [% authtypesloo.authtypetext %]</option>
> @@ -34,8 +34,8 @@
>              </li>
>              <li><label for="orderby">Order by: </label><select name="orderby" id="orderby">
>                  <option value="">None</option>
> -                    <option value="HeadingAsc" selected="selected">Heading Ascendant</option>
> -                    <option value="HeadingDsc">Heading Descendant</option>
> +                    <option value="HeadingAsc" selected="selected">Heading ascendant</option>
> +                    <option value="HeadingDsc">Heading descendant</option>
>                  </select>
>              </li></ol>
>  			</fieldset>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tt
> index 048de5b..287f6d1 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Entry
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Entry
>  [% INCLUDE 'doc-head-close.inc' %]
>  [% IF ( displayhierarchy ) %]
>  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/hierarchy.css">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
> index 6638826..5fdfb27 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; [% IF ( total ) %]Authority Search Result[% ELSE %]No results found[% END %]
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; [% IF ( total ) %]Authority search result[% ELSE %]No results found[% END %]
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-authoritiesresultlist">
> @@ -39,12 +39,12 @@
>  <div class="searchresults">
>  		<table>
>  			<tr>
> -				<th>Authorized Headings</th>
> -				<th>Type of Heading</th>
> +                <th>Authorized headings</th>
> +                <th>Type of heading</th>
>  				[% UNLESS ( isEDITORS ) %]
> -					<th>Biblio records</th>
> +                    <th>Biblio records</th>
>  				[% END %]
> -				<th>Full Heading</th>				
> +                <th>Full heading</th>
>  			</tr>
>  			[% FOREACH resul IN result %]
>              [% UNLESS ( loop.odd ) %]
> @@ -63,7 +63,7 @@
>  						</td>
>  					[% END %]
>  						<td>
> -							<a href="opac-authoritiesdetail.pl?authid=[% resul.authid %]">View Full Heading</a>
> +                            <a href="opac-authoritiesdetail.pl?authid=[% resul.authid %]">View full heading</a>
>  						</td>
>  				</tr>
>  			[% END %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
> index 437cbd2..c4d40ed 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt
> @@ -1,5 +1,5 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your Cart
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your cart
>      [% IF ( print_basket ) %]</title>
>  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>  <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
> @@ -140,12 +140,12 @@ function enableCheckboxActions(){
>  [% UNLESS ( print_basket ) %]
>  <div id="toolbar">
>  <ul>
> -	<li>[% IF ( verbose ) %]<a href="opac-basket.pl" class="brief" onclick="showLess(); return false;">Brief Display</a>[% ELSE %]<a href="opac-basket.pl" class="detail" onclick="showMore(); return false;">More Details</a>[% END %]</li>
> +    <li>[% IF ( verbose ) %]<a href="opac-basket.pl" class="brief" onclick="showLess(); return false;">Brief display</a>[% ELSE %]<a href="opac-basket.pl" class="detail" onclick="showMore(); return false;">More details</a>[% END %]</li>
>  	[% IF ( opacuserlogin ) %]<li><a class="send" href="opac-basket.pl" onclick="sendBasket(); return false;">Send</a></li>[% END %]
>  	<li><a class="download" href="opac-basket.pl" onclick="downloadBasket(); return false;">Download</a></li>
>  	<li><a class="print" href="opac-basket.pl" onclick="printBasket(); return false;">Print</a></li>
> -	<li><a class="empty" href="opac-basket.pl" onclick="delBasket(); return false;">Empty and Close</a></li>
> -	<li><a class="hide close" href="opac-basket.pl">Hide Window</a></li>
> +    <li><a class="empty" href="opac-basket.pl" onclick="delBasket(); return false;">Empty and close</a></li>
> +    <li><a class="hide close" href="opac-basket.pl">Hide window</a></li>
>  </ul>
>  </div>
>          [% END %]
> @@ -164,7 +164,7 @@ function enableCheckboxActions(){
>  [% END %]
>  </span>
>       <span id="tagsel_form" style="display:none">
> -       <label for="tagsel_new" style="display:inline">New&nbsp;Tag:</label>
> +       <label for="tagsel_new" style="display:inline">New&nbsp;tag:</label>
>         <input name="tagsel_new" id="tagsel_new" maxlength="100" style="display:inline"/>
>         <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button"
>             type="submit" value="Add" style="display:inline" />
> @@ -296,7 +296,7 @@ function enableCheckboxActions(){
>  
>          [% IF ( BIBLIO_RESULT.MARCurlS ) %]
>          <tr>
> -            <th scope="row">url(s)</th>
> +            <th scope="row">URL(s)</th>
>              <td>
>  	   [% FOREACH MARCurl IN BIBLIO_RESULT.MARCurlS %]
>  		<p>[% IF ( MARCurl.part ) %][% MARCurl.part %]
> @@ -326,8 +326,8 @@ function enableCheckboxActions(){
>  [% UNLESS ( print_basket ) %]
>  <form action="/cgi-bin/koha/opac-basket.pl" method="get" name="bookbag_form" id="bookbag_form" class="checkboxed">
>  <div id="selections-toolbar">
> -    <a id="CheckAll" href="#">Select All</a>
> -    <a id="CheckNone" href="#">Clear All</a>
> +    <a id="CheckAll" href="#">Select all</a>
> +    <a id="CheckNone" href="#">Clear all</a>
>      <span class="sep">|</span> <span class="links"><span id="selections">Select titles to: </span>
>          <a href="#" class="deleteshelf disabled" onclick="delSelRecords(); return false;">Remove</a>
>      [% IF ( opacuserlogin ) %]
> @@ -340,7 +340,7 @@ function enableCheckboxActions(){
>      [% END %]
>      </span>
>           [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]<span id="tagsel_form" style="display:none">
> -           <label for="tagsel_new" style="display:inline">New&nbsp;Tag:</label>
> +           <label for="tagsel_new" style="display:inline">New&nbsp;tag:</label>
>             <input name="tagsel_new" id="tagsel_new" maxlength="100"  style="display:inline"/>
>             <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add"  style="display:inline"/>
>             <a href="#" id="tagsel_cancel" onclick="tagCanceled(); return false;" style="display:inline">Cancel</a>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
> index ab0fad2..dff5743 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  ISBD
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  ISBD
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-browser">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
> index a5be324..ea1d719 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
> @@ -1,6 +1,6 @@
>  [% USE KohaDates %]
>  
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %]
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %]
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tools.min.js"></script>
> @@ -245,7 +245,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  
>      <div id="bookcover">
>      [% IF ( OPACLocalCoverImages ) %]<div style="block" title="[% biblionumber |url %]" class="[% biblionumber %]" id="local-thumbnail-preview"></div>[% END %]
> -    [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover Image" /></a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover Image" /></a>[% END %][% END %][% END %]
> +    [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>[% END %][% END %][% END %]
>  
>      [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( content_identifier_exists ) %][% IF ( using_https ) %]
>      <img src="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/[% SyndeticsCoverImageSize %].GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% normalized_upc %]&amp;oclc=[% normalized_oclc %]" alt="" class="thumbnail" />
> @@ -265,7 +265,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>      <span class="Z3988" title="[% ocoins %]"></span>
>      [% END %]
>  
> -    <div id="views"><span class="view"><span id="Normalview">Normal View</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC View</a></span> [% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD View</a></span>[% END %]
> +    <div id="views"><span class="view"><span id="Normalview">Normal view</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC view</a></span> [% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD view</a></span>[% END %]
>      </div>
>      [% IF ( OPACXSLTDetailsDisplay ) %]
>          [% XSLTBloc %]
> @@ -367,7 +367,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>      </span>[% END %]
>  
>      [% IF ( MARCURLS ) %]
> -    <div class="results_summary"><span class="label">Online Resources:</span>
> +    <div class="results_summary"><span class="label">Online resources:</span>
>      <ul>    [% FOREACH MARCurl IN MARCURLS %]
>          <li>[% IF ( MARCurl.part ) %][% MARCurl.part %]
>              <br />[% END %] 
> @@ -452,7 +452,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  
>          [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsSeries ) %][% IF ( SyndeticsSERIES1Exists ) %]
>          <span class="results_summary">
> -        <span class="label">Series Information:</span>
> +        <span class="label">Series information:</span>
>  
>          [% IF ( using_https ) %]<a target="_blank" href="https://secure.syndetics.com/ffseries.aspx?isbn=[% normalized_isbn %]&amp;type=series&amp;num=1&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]">Click to open in new window</a>
>          [% ELSE %]
> @@ -462,7 +462,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>          [% END %][% END %]
>          [% IF ( SyndeticsAVPROFILEExists ) %]
>          <span class="results_summary">
> -        <span class="label">Audiovisual Profile:</span>
> +        <span class="label">Audiovisual profile:</span>
>          [% IF ( using_https ) %]<a target="_blank" href="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/avprofile.html&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]&amp;type=xw10">Click to open in new window</a>
>          [% ELSE %]
>          <a target="_blank" href="http://www.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/avprofile.html&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]&amp;type=xw10">Click to open in new window</a>
> @@ -471,7 +471,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>          [% END %]
>          [% IF ( SyndeticsFICTIONExists ) %]
>          <span class="results_summary">
> -        <span class="label">Fiction Notes:</span>
> +        <span class="label">Fiction notes:</span>
>          [% IF ( using_https ) %]<a target="_blank" href="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/fiction.html&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]&amp;type=xw10">Click to open in new window</a>
>          [% ELSE %]
>          <a target="_blank" href="http://www.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/fiction.html&amp;client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&amp;upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&amp;oclc=[% normalized_oclc %][% END %]&amp;type=xw10">Click to open in new window</a>
> @@ -490,7 +490,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  
>      [% IF ( BakerTaylorContentURL ) %]
>          <span class="results_summary">
> -        <span class="label">Enhanced Content: </span> 
> +        <span class="label">Enhanced content: </span> 
>                [% IF ( OPACurlOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL |html %]" target="_blank">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL |html %]">Content Cafe</a>[% END %]
>          </span>
>      [% END %]
> @@ -520,7 +520,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  [% IF ( defaulttab == 'holdings' ) %]<li id="tab_holdings" class="ui-tabs-selected">[% ELSE %]<li id="tab_holdings">[% END %]
>      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#holdings">Holdings ( [% count %] )</a>
>  </li>
> -<li id="tab_descriptions"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#descriptions">Title Notes</a></li>
> +<li id="tab_descriptions"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#descriptions">Title notes</a></li>
>  [% IF ( SYNDETICS_TOC ) %]
>      <li id="tab_toc"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#toc">TOC</a></li>
>  [% END %]
> @@ -541,13 +541,13 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>          </li>
>      [% END %][% END %]
>      [% IF ( SyndeticsAuthorNotes ) %][% IF ( SYNDETICS_ANOTES ) %]
> -        <li id="tab_anotes"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#anotes">About the Author</a></li>
> +        <li id="tab_anotes"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#anotes">About the author</a></li>
>      [% END %][% END %]
>  [% END %]
>  [% IF ( LibraryThingForLibrariesID ) %] 
>  [% IF ( LibraryThingForLibrariesTabbedView ) %]
> -    <li id="tab_LFTLSimilarItems"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#LFTLSimilarItems">Similar Items</a></li>
> -    <li id="tab_LTFLTagBrowse"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#LTFLTagBrowse">Tag Browser</a></li>
> +    <li id="tab_LFTLSimilarItems"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#LFTLSimilarItems">Similar items</a></li>
> +    <li id="tab_LTFLTagBrowse"> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#LTFLTagBrowse">Tag browser</a></li>
>  [% END %]
>  [% END %]
>  [% IF ( subscriptionsnumber ) %]
> @@ -574,7 +574,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  [% END %][% END %]
>  
>  [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonReviews ) %]
> -    <li id="tab_amazonreviews"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#amazonreviews">Amazon Reviews</a></li>
> +    <li id="tab_amazonreviews"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#amazonreviews">Amazon reviews</a></li>
>  [% END %][% END %]
>  [% IF ( Babeltheque ) %]
>      <li id="tab_babeltheque"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#babeltheque">Babelth?que</a></li>
> @@ -582,7 +582,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  
>  [% IF ( serialcollection ) %]
>      [% IF ( defaulttab == 'serialcollection' ) %]<li id="tab_serialcollection" class="ui-tabs-selected">[% ELSE %]<li id="tab_serialcollection">[% END %]
> -        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#serialcollection">Serial Collection</a>
> +        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]#serialcollection">Serial collection</a>
>      </li>
>  [% END %]
>  
> @@ -622,13 +622,13 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>              [% IF ( item_level_itypes ) %]<th id="item_itemtype">Item type</th>[% END %]
>              <th id="item_location">Location</th>
>              [% IF ( itemdata_ccode ) %]<th id="item_ccode">Collection</th>[% END %]
> -            <th id="item_callnumber">Call Number</th>
> -            [% IF ( itemdata_enumchron ) %]<th id="item_enumchron">Vol Info</th>[% END %]
> +            <th id="item_callnumber">Call number</th>
> +            [% IF ( itemdata_enumchron ) %]<th id="item_enumchron">Vol info</th>[% END %]
>              [% IF ( itemdata_uri ) %]<th id="item_url">url</th>[% END %]
>              [% IF ( itemdata_copynumber ) %]<th id="item_copy">Copy</th>[% END %]
>              <th id="item_status">Status</th>
>              [% IF ( itemdata_itemnotes ) %]<th id="item_notes">Notes</th>[% END %]
> -            <th id="item_datedue">Date Due</th>
> +            <th id="item_datedue">Date due</th>
>          </tr></thead>
>  	    <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
>  	    <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
> @@ -646,7 +646,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>      <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
>      </td>
>  		[% IF ( itemdata_ccode ) %]<td>[% ITEM_RESULT.ccode %]</td>[% END %]
> -		<td>[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse Shelf</a>)[% END %][% END %]</td>
> +        <td>[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse shelf</a>)[% END %][% END %]</td>
>  		[% IF ( itemdata_enumchron ) %]<td>[% ITEM_RESULT.enumchron %]</td>[% END %]
>  		[% IF ( itemdata_uri ) %]<td><a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a></td>[% END %]
>  		[% IF ( itemdata_copynumber ) %]<td>[% ITEM_RESULT.copynumber %]</td>[% END %]
> @@ -669,7 +669,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  
>  [% IF ( OpenOPACShelfBrowser ) %]
>  <div id="shelfbrowser">
> -<h5 style="text-align: center;">[% IF ( starting_homebranch ) %]Browsing [% starting_homebranch %] Shelves[% END %][% IF ( starting_location ) %], Shelving Location: [% starting_location %][% END %][% IF ( starting_ccode ) %], Collection Code: [% starting_ccode %][% END %] <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Close Shelf Browser</a></h5>
> +<h5 style="text-align: center;">[% IF ( starting_homebranch ) %]Browsing [% starting_homebranch %] Shelves[% END %][% IF ( starting_location ) %], Shelving location: [% starting_location %][% END %][% IF ( starting_ccode ) %], Collection code: [% starting_ccode %][% END %] <a style="font-size: 75%;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]">Close shelf browser</a></h5>
>  
>          
>          <table><tr>
> @@ -742,7 +742,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  [% IF ( SyndeticsEnabled ) %]
>  [% IF ( SyndeticsSummary ) %]
>  [% IF ( SYNDETICS_SUMMARY ) %]
> -    <h4>Enhanced Descriptions from Syndetics:</h4>
> +    <h4>Enhanced descriptions from Syndetics:</h4>
>      <p>[% SYNDETICS_SUMMARY %]</p>
>  [% END %]
>  [% END %]
> @@ -768,7 +768,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  [% IF ( SyndeticsTOC ) %][% IF ( SYNDETICS_TOC ) %]
>  <div id="toc">
>  <div class="content_set">
> -<h3>Table of Contents provided by Syndetics</h3>
> +<h3>Table of contents provided by Syndetics</h3>
>  <ul>
>  [% FOREACH SYNDETICS_TO IN SYNDETICS_TOC %]
>      [% IF ( SYNDETICS_TO.p ) %]
> @@ -812,7 +812,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  [% IF ( SyndeticsAuthorNotes ) %][% IF ( SYNDETICS_ANOTES ) %]
>  <div id="anotes">
>  <div class="content_set">
> -<h3>Author Notes provided by Syndetics</h3>
> +<h3>Author notes provided by Syndetics</h3>
>  [% FOREACH SYNDETICS_ANOTE IN SYNDETICS_ANOTES %]
>      [% IF ( SYNDETICS_ANOTE.content ) %]
>          [% SYNDETICS_ANOTE.content %]
> @@ -863,7 +863,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>                      [% ELSE %]
>                      [% IF ( latestserial.status4 ) %]Missing
>                      [% ELSE %]
> -                    [% IF ( latestserial.status5 ) %]Not Issued
> +                    [% IF ( latestserial.status5 ) %]Not issued
>                      [% END %]
>                      [% END %]
>                      [% END %]
> @@ -917,7 +917,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>              <img class="avatar" src="[% review.avatarurl %]" height="80" width="80" alt="" />
>                  [% END %]
>              <h5>
> -                Your Comment
> +                Your comment
>              </h5>
>              <small>[% review.datereviewed | $KohaDates %]</small>
>          <p>
> @@ -973,7 +973,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  [% IF ( OPACFRBRizeEditions ) %][% IF ( XISBNS ) %]
>  <div id="editions">
>  
> -<h4>Other Editions of this Work</h4>
> +<h4>Other editions of this work</h4>
>  <table>
>  [% FOREACH XISBN IN XISBNS %]
>  <tr>
> @@ -1022,7 +1022,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  <!-- Amazon Reviews -->
>  <div id="amazonreviews">
>          [% IF ( amazon_average_rating ) %]
> -            <div class="clearfix"><h3 style="float: left;">Average Rating (from Amazon[% AmazonTld %]): </h3><span class="starMT" style="float: left;"><span class="starFull" style="float: left; width:[% amazon_average_rating / 2 %]px"></span></span> [% IF ( normalized_isbn ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&amp;asin=[% normalized_isbn %]&amp;store=books" target="_blank">Add your own review</a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&amp;asin=[% normalized_isbn %]&amp;store=books">Add your own review</a>[% END %][% END %]</div>
> +            <div class="clearfix"><h3 style="float: left;">Average rating (from Amazon[% AmazonTld %]): </h3><span class="starMT" style="float: left;"><span class="starFull" style="float: left; width:[% amazon_average_rating / 2 %]px"></span></span> [% IF ( normalized_isbn ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&amp;asin=[% normalized_isbn %]&amp;store=books" target="_blank">Add your own review</a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&amp;asin=[% normalized_isbn %]&amp;store=books">Add your own review</a>[% END %][% END %]</div>
>  
>          [% FOREACH AMAZON_CUSTOMER_REVIEW IN AMAZON_CUSTOMER_REVIEWS %]
>              <div class="content_set">
> @@ -1118,12 +1118,12 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
>  [% IF ( SocialNetworks ) %]
>      <div class="social_networks">
>          <span>Share</span>
> -        <a href="http://www.facebook.com/sharer.php?u=[% current_url |url %]&t=[% title |url %]" title="Share on Facebook"><img alt="Share on Facebook" src="/opac-tmpl/prog/images/socnet/facebook16.png" /></a>
> +        <a href="http://www.facebook.com/sharer.php?u=[% current_url |url %]&amp;t=[% title |url %]" title="Share on Facebook"><img alt="Share on Facebook" src="/opac-tmpl/prog/images/socnet/facebook16.png" /></a>
>          <a href="http://twitter.com/share" title="Share on Twitter"><img alt="Share on Twitter" src="/opac-tmpl/prog/images/socnet/twitter16.png" /></a>
> -        <a href="http://www.linkedin.com/shareArticle?mini=true&url=[% current_url |url %]&title=[% title |url %]" title="Share on LinkedIn"><img alt="Share on LinkedIn" src="/opac-tmpl/prog/images/socnet/linkedin16.png" /></a>
> -        <a href="http://www.delicious.com/save?url=[% current_url |url %]&title=[% title |url %]" title="Share on Delicious"><img alt="Share on Delicious" src="/opac-tmpl/prog/images/socnet/delicious16.gif" /></a>
> +        <a href="http://www.linkedin.com/shareArticle?mini=true&amp;url=[% current_url |url %]&amp;title=[% title |url %]" title="Share on LinkedIn"><img alt="Share on LinkedIn" src="/opac-tmpl/prog/images/socnet/linkedin16.png" /></a>
> +        <a href="http://www.delicious.com/save?url=[% current_url |url %]&amp;title=[% title |url %]" title="Share on Delicious"><img alt="Share on Delicious" src="/opac-tmpl/prog/images/socnet/delicious16.gif" /></a>
>          <g:plusone size="small"></g:plusone>
> -        <a href="mailto:ADRESSE?subject=TO READ : [% title %]>&body=[% title %]> [% current_url |url %]" title="Share by email"><img alt="Share by email" src="/opac-tmpl/prog/images/socnet/mailto16.png" /></a>
> +        <a href="mailto:ADRESSE?subject=TO READ : [% title %]>&amp;body=[% title %]> [% current_url |url %]" title="Share by email"><img alt="Share by email" src="/opac-tmpl/prog/images/socnet/mailto16.png" /></a>
>      </div>
>  [% END %]
>  
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
> index 8d22c4d..6b1e365 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Download cart[% INCLUDE 'doc-head-close.inc' %]
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Download cart[% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-downloadcart" style="padding:1em;">
>  <div id="userdownloadcart" class="container">[% IF ( format ) %]
> @@ -8,7 +8,7 @@
>  	<fieldset class="rows">
>  	<ol><li><label for="format">Download cart:</label>
>          <select name="format" id="format">
> -	    <option value="">-- Choose Format --</option>
> +        <option value="">-- Choose format --</option>
>  	    <option value="iso2709">iso2709</option>
>  	    <option value="ris">RIS</option>
>  	    <option value="bibtex">BibTex</option>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
> index fedcf5d..e3c9a21 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Download list[% INCLUDE 'doc-head-close.inc' %]
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Download list[% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript">//<![CDATA[
>  	$(document).ready(function(){
>  		$(".close").html(_("Close this window"));
> @@ -16,7 +16,7 @@
>  	<fieldset class="rows">
>  		<ol><li><label for="format">Download list:</label>
>  	        <select name="format" id="format">
> -		    <option value="">-- Choose Format --</option>
> +            <option value="">-- Choose format --</option>
>  		    <option value="iso2709">iso2709</option>
>  		    <option value="ris">RIS</option>
>  		    <option value="bibtex">BibTex</option>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
> index 2f956e8..42800ad 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Subscription information for [% bibliotitle %]
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Subscription information for [% bibliotitle %]
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>  <script type="text/javascript" language="javascript">
> @@ -204,7 +204,7 @@ function showlayer(numlayer){
>  			[% IF ( serial.status2 ) %]Arrived[% END %]
>  			[% IF ( serial.status3 ) %]Late[% END %]
>  			[% IF ( serial.status4 ) %]Missing[% END %]
> -			[% IF ( serial.status5 ) %]Not Available[% END %]
> +            [% IF ( serial.status5 ) %]Not available[% END %]
>  			[% IF ( serial.status7 ) %]Claimed[% END %]
>  		    </td>
>  		    <td class="subscriptionidfilterclass">    [% serial.subscriptionid %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
> index f2d10bc..6472f62 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-imageviewer.tt
> @@ -1,5 +1,5 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Images for: [% biblio.title |html %]
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Images for: [% biblio.title |html %]
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript">
>  //<![CDATA[
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
> index 7068a87..d2d68c5 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
> @@ -1,5 +1,5 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-main">
> @@ -47,7 +47,7 @@
>  	<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
>      <input type="hidden" name="koha_login_context" value="opac" />
>  	<fieldset class="brief">
> -		<legend>Log in to Your Account:</legend>
> +        <legend>Log in to your account:</legend>
>  		<ol>
>  		<li><label for="userid">Login:</label><input type="text" id="userid" size="10" name="userid" /></li>
>  		<li><label for="password">Password:</label><input type="password" id="password" size="10" name="password" /></li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
> index 6ecce38..6d6b8cb 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your messaging settings
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your messaging settings
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript">//<![CDATA[
>  	$(document).ready(function(){
> @@ -25,7 +25,7 @@
>  	<div class="yui-b"><div class="yui-g" id="usermessaging">
>  
>  [% FOREACH BORROWER_INF IN BORROWER_INFO %]
> -<h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Messaging Settings</h3>
> +<h3><a href="/cgi-bin/koha/opac-user.pl">[% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your messaging settings</h3>
>  [% END %]
>  
>  <form action="/cgi-bin/koha/opac-messaging.pl" method="get" name="opacmessaging">
> @@ -33,18 +33,18 @@
>  
>  <fieldset class="rows">
>    [% IF ( settings_updated ) %]
> -  <div class="dialog message"><h3>Settings Updated</h3></div>
> +  <div class="dialog message"><h3>Settings updated</h3></div>
>    [% END %]
>    <table style="margin-right:1em;">
>      <tr><th>&nbsp;</th><th>Days in advance</th>[% IF ( SMSSendDriver ) %]<th>SMS</th>[% END %]<th>Email</th><th>Digests only?</th><!-- <th>RSS</th> --><th>Do not notify</th></tr>
>      [% FOREACH messaging_preference IN messaging_preferences %]
>      <tr>
> -      <td>[% IF ( messaging_preference.Item_Due ) %]Item Due
> -          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance Notice
> -          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming Events
> -          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold Filled
> -          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item Check-in
> -          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item Checkout
> +      <td>[% IF ( messaging_preference.Item_Due ) %]Item due
> +          [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance notice
> +          [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming events
> +          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
> +          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
> +          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
>            [% ELSE %]Unknown [% END %]</td>
>        [% IF ( messaging_preference.takes_days ) %]
>        <td><select name="[% messaging_preference.message_attribute_id %]-DAYS">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
> index 22ed097..3be0ef8 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Change your password
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Change your password
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-passwd">
> @@ -9,7 +9,7 @@
>  	<div id="yui-main">
>  	<div class="yui-b"><div class="yui-g">
>  	<div id="userpasswd" class="container">
> -	<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]l../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Change your Password </h3>
> +    <h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]l../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Change your password </h3>
>  
>      [% IF ( Error_messages ) %]
>  <div class="dialog error">        <h3>There was a problem with your submission</h3>
> @@ -21,7 +21,7 @@
>              Your new password must be at least [% minpasslen %] characters long
>              [% END %]
>              [% IF ( WrongPass ) %]
> -            Your current password was entered incorrectly.  If this problem persists, please ask a librarian to re-set your password for you.	
> +            Your current password was entered incorrectly.  If this problem persists, please ask a librarian to re-set your password for you.
>              [% END %]
>          </p></div>
>      [% END %]
> @@ -30,10 +30,10 @@
>          [% IF ( OpacPasswordChange ) %]
>          <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="post"><fieldset class="brief">
>  			[% UNLESS ( ShortPass ) %]<div class="hint">Your password must be at least [% minpasslen %] characters long.</div>[% END %]
> -          <ol>  <li><label for="Oldkey">Current Password:</label> <input type="password" id="Oldkey" size="25"  name="Oldkey" /></li>
> -            <li><label for="Newkey">New Password:</label> <input type="password" id="Newkey"  size="25"  name="Newkey" /></li>
> -            <li><label for="Confirm">Re-Type New Password:</label> <input type="password"  id="Confirm" size="25" name="Confirm" /></li></ol></fieldset>
> -            <fieldset class="action"><input type="submit" value="Submit Changes" class="submit" /> <a href="/cgi-bin/koha/opac-user.pl" class="cancel">Cancel</a></fieldset>
> +          <ol>  <li><label for="Oldkey">Current password:</label> <input type="password" id="Oldkey" size="25"  name="Oldkey" /></li>
> +            <li><label for="Newkey">New password:</label> <input type="password" id="Newkey"  size="25"  name="Newkey" /></li>
> +            <li><label for="Confirm">Re-type new password:</label> <input type="password"  id="Confirm" size="25" name="Confirm" /></li></ol></fieldset>
> +            <fieldset class="action"><input type="submit" value="Submit changes" class="submit" /> <a href="/cgi-bin/koha/opac-user.pl" class="cancel">Cancel</a></fieldset>
>      </form>
>          [% ELSE %]
>              <div class="dialog alert">You can't change your password.</div>
> @@ -41,11 +41,11 @@
>      [% END %]
>      
>      [% IF ( password_updated ) %]
> -        <div class="dialog message"><h1>Password Updated</h1>
> +        <div class="dialog message"><h1>Password updated</h1>
>          Your password has been changed</div>
>          <form action="/cgi-bin/koha/opac-user.pl" method="post">
>              <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
> -            <p><input type="submit" class="icon back" value="Return to Your Record" /></p>
> +            <p><input type="submit" class="icon back" value="Return to your record" /></p>
>          </form>
>      [% END %]
>  </div>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
> index de3d9fd..adbc8f0 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your privacy management
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your privacy management
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-privacy">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
> index 5941369..5f3f39c 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
> @@ -1,6 +1,6 @@
>  [% USE KohaDates %]
>  
> -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo; Your checkout history
> +[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo; Your checkout history
>  [% INCLUDE 'doc-head-close.inc' %]
>  <style type="text/css">ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a  { padding:0.6em 1em; }</style>
>  <script type="text/javascript">
> @@ -24,7 +24,7 @@ $(document).ready(function(){
>  	<div class="yui-b"><div class="yui-g">
>  <div id="userreadingrecord" class="container">
>  <!--CONTENT-->
> -<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Checkout History</h3>
> +<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Checkout history</h3>
>  
>  [% UNLESS ( count ) %]
>  You have never borrowed anything from this library.
> @@ -45,19 +45,19 @@ You have never borrowed anything from this library.
>  
>  [% IF ( showfulllink ) %]
>  [% IF ( limit ) %]
> -<li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=full[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show All Items</a></li><li class="ui-tabs-selected"><a href="#readingrec">Showing Last 50 Items</a></li>
> +<li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=full[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show all items</a></li><li class="ui-tabs-selected"><a href="#readingrec">Showing last 50 items</a></li>
>  [% ELSE %]
> -<li class="ui-tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing All Items</a></li><li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=50[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show Last 50 Items Only</a></li>
> +<li class="ui-tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing all items</a></li><li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=50[% IF ( orderbytitle ) %]&amp;order=title[% END %]">Show last 50 items only</a></li>
>  [% END %]
>  [% ELSE %]
> -<li class="ui-tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing All Items</a></li>
> +<li class="ui-tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing all items</a></li>
>  [% END %]
>  </ul>
>  <div class="ui-tabs-panel"><table id="readingrec">
>  <tr>
>  <th colspan="2">Title</th>
> -<th>Item Type</th>
> -<th>Call No.</th>
> +<th>Item type</th>
> +<th>Call no.</th>
>  <th>Date</th>
>  </tr>
>  
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
> index 7597a4a..a78bc68 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo;  Placing a hold
> +[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo;  Placing a hold
>  [% INCLUDE 'doc-head-close.inc' %]
>  [% INCLUDE 'calendar.inc' %]
>  <script type="text/javascript">
> @@ -240,21 +240,21 @@
>                    <th>Hold</th>
>                    <th>Title</th>
>                    [% UNLESS ( item_level_itypes ) %]
> -                    <th>Item Type</th>
> +                    <th>Item type</th>
>                    [% END %]
>                    [% IF ( showpriority ) %]
>                    <th>Priority</th>
>                    [% END %]
>  		  [% IF ( reserve_in_future ) %]
> -		  <th>Hold Starts on Date</th>
> +        <th>Hold starts on date</th>
>  		  [% END %]
> -		  <th>Hold Not Needed After</th>
> +        <th>Hold not needed after</th>
>                    [% IF ( OPACItemHolds ) %]
> -                    <th id="place_on_hdr" style="display:none">Place On</th>
> +                    <th id="place_on_hdr" style="display:none">Place on</th>
>                    [% END %]
>                    [% UNLESS ( singleBranchMode ) %]
>  		    [% IF ( choose_branch ) %]
> -                        <th>Pickup Location</th>
> +                        <th>Pickup location</th>
>  		    [% END %]
>                    [% END %]
>                  </tr>[% ELSE %]<tr><th colspan="5">Title</th></tr>[% END %]
> @@ -347,7 +347,7 @@
>                //]]>
>                </script>
>        <p style="margin:.3em 2em;">
> -      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('reserve_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
> +      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('reserve_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
>                  </td>[% END %]
>  
>  		    [% END %]
> @@ -380,7 +380,7 @@
>        //]]>
>          </script>
>        <p style="margin:.3em 2em;">
> -      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p>
> +      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
>      </td>[% END %]
>  
>                      [% IF ( bibitemloo.holdable ) %]
> @@ -469,16 +469,16 @@
>                            <tr>
>                              <th>Copy</th>
>                              [% IF ( item_level_itypes ) %]
> -                              <th>Item Type</th>
> +                              <th>Item type</th>
>                              [% END %]
>                              <th>Barcode</th>
>                              [% UNLESS ( singleBranchMode ) %]
> -                              <th>Home Library</th>
> -                              <th>Last Location</th>
> +                              <th>Home library</th>
> +                              <th>Last location</th>
>                              [% END %]
> -                            <th>Call Number</th>
> +                            <th>Call number</th>
>                              [% IF ( bibitemloo.itemdata_enumchron ) %]
> -                              <th>Vol Info</th>
> +                              <th>Vol info</th>
>                              [% END %]
>                              <th>Information</th>
>                            </tr>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
> index 9e1b855..99c31bd 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt
> @@ -1,7 +1,7 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
>  [% IF ( searchdesc ) %]
> -	Results of Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
> +    Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
>  [% ELSE %]
>      You did not specify any search criteria.
>  [% END %]
> @@ -19,9 +19,9 @@ $(document).ready(function(){
>      $('#sort_by').change(function() {
>          $('#bookbag_form').submit();
>      });
> -	$("span.clearall").html("<a id=\"CheckNone\" href=\"#\">Clear All</a>");
> -	$("span.checkall").html("<a id=\"CheckAll\" href=\"#\">Select All</a>");
> -	$("span.addto").html("<label for=\"addto\">Add to: </label><select name=\"addto\" id=\"addto\"><option value=\"\"></option>[% IF ( opacbookbag ) %]<option value=\"addtocart\">Cart</option>[% END %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %]<optgroup label=\"Lists:\">[% IF ( barshelves ) %][% FOREACH barshelvesloo IN barshelvesloop %][% IF ( category == 1 ) %]<option id=\"s[% barshelvesloo.shelfnumber %]\" value=\"addtolist\">[% barshelvesloo.shelfname %]</option>[% END %][% END %][% END %]<option value=\"newlist\">[ New List ]</option></optgroup>[% ELSE %]<option value=\"newlist\">List</option>[% END %][% END %]</select> <input type=\"submit\" class=\"submit\" value=\"Save\" />");
> +    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">Clear all</a>");
> +    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">Select all</a>");
> +    $("span.addto").html("<label for=\"addto\">Add to: </label><select name=\"addto\" id=\"addto\"><option value=\"\"></option>[% IF ( opacbookbag ) %]<option value=\"addtocart\">Cart</option>[% END %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %]<optgroup label=\"Lists:\">[% IF ( barshelves ) %][% FOREACH barshelvesloo IN barshelvesloop %][% IF ( category == 1 ) %]<option id=\"s[% barshelvesloo.shelfnumber %]\" value=\"addtolist\">[% barshelvesloo.shelfname %]</option>[% END %][% END %][% END %]<option value=\"newlist\">[ New list ]</option></optgroup>[% ELSE %]<option value=\"newlist\">List</option>[% END %][% END %]</select> <input type=\"submit\" class=\"submit\" value=\"Save\" />");
>  	$("#addto").change(function(){
>  		cartList();
>  	});
> @@ -108,25 +108,25 @@ function highlightOn() {
>  <!-- Search Results Table -->
>  [% IF ( total ) %]
>  [% IF ( scan ) %]
> -    <h1>Scan Index:</h1>
> +    <h1>Scan index:</h1>
>      <form action="/cgi-bin/koha/opac-search.pl" method="get">
>          <table>
>              <tr>
>                  <td>
> -                    Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="" />
> +                    Scan index for: <input type="text" name="q" id="scan-index" size="35" value="" />
>                  </td>
>              </tr>
>              <tr>
>                  <td>
>                      <label for="scan-index">Indexed in:</label>
>                      <select name="idx" id="scan-index">
> -                        <option value="">Any Word</option>
> -                        <option value="kw,phr:">Any Phrase</option>
> +                        <option value="">Any word</option>
> +                        <option value="kw,phr:">Any phrase</option>
>                          <option value="ti:">Title</option>
> -                        <option value="ti,phr:">Title Phrase</option>
> +                        <option value="ti,phr:">Title phrase</option>
>                          <option value="au,phr:">Author</option>
>                          <option value="su:">Subject</option>
> -                        <option value="su,phr:">Subject Phrase</option>
> +                        <option value="su,phr:">Subject phrase</option>
>                          <option value="se:">Series</option>
>                          <option value="pb:">Publisher</option>
>                          <option value="nt:">Notes</option>
> @@ -261,10 +261,10 @@ function highlightOn() {
>  					[% UNLESS ( GROUP_RESULT.norequests ) %]
>  						[% IF ( opacuserlogin ) %]
>  							[% IF ( AllowOnShelfHolds ) %]
> -								<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> +                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
>  							[% ELSE %]
>  								[% IF ( GROUP_RESULT.itemsissued ) %]
> -									<a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> +                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
>  								[% END %]
>  							[% END %]
>  						[% END %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
> index 4bfab52..d811d86 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
> @@ -1,7 +1,7 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;
>  [% IF ( searchdesc ) %]
> -    Results of Search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
> +    Results of search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]
>  [% ELSE %]
>      You did not specify any search criteria.
>  [% END %]
> @@ -103,29 +103,29 @@ $(document).ready(function(){
>      var param1 = "<label for=\"addto\">"+_("Add to: ")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
>      [% IF ( opacbookbag ) %]    param1 += "<option value=\"addtocart\">"+_("Cart")+"<\/option>";
>      [% END %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %][% IF ( addbarshelves ) %]
> -    param1 += "<optgroup label=\""+_("Your Lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
> +    param1 += "<optgroup label=\""+_("Your lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
>      param1 += "<option id=\"s[% addbarshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addbarshelvesloo.shelfname |html %]<\/option>";[% END %]
>      param1 += "<\/optgroup>";[% END %]
> -    [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public Lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %];
> +    [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %];
>      param1 += "<\/optgroup>";[% END %]
>      [% IF (( addbarshelvesloop && addbarshelvesloop.size>9) || (addpubshelvesloop && addpubshelvesloop.size>9 )) %]
> -        param1 += "<option value=\"morelists\">[ "+_("More Lists")+" ]<\/option>";
> +        param1 += "<option value=\"morelists\">[ "+_("More lists")+" ]<\/option>";
>      [% END %]
> -    param1 += "<option value=\"newlist\">[ "+_("New List")+" ]<\/option>";
> +    param1 += "<option value=\"newlist\">[ "+_("New list")+" ]<\/option>";
>      [% END %]
>      [% END %]
>      param1 += "<\/select> <input type=\"submit\" class=\"submit\" value=\""+_("Save")+"\" />";
>      [% ELSE %]
> -        var param1 = "<a id=\"addto\" class=\"addtocart\" href=\"#\">Add to Cart<\/a>";
> +        var param1 = "<a id=\"addto\" class=\"addtocart\" href=\"#\">Add to cart<\/a>";
>      [% END %]
>  [% ELSE %]
>          var param1 = "<label for=\"addto\">"+_("Add to list: ")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
>  [% IF ( virtualshelves ) %][% IF ( loggedinusername ) %][% IF ( addbarshelves ) %]
> -    param1 += "<optgroup label=\""+_("Your Lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
> +    param1 += "<optgroup label=\""+_("Your lists:")+"\">";[% FOREACH addbarshelvesloo IN addbarshelvesloop %]
>      param1 += "<option id=\"s[% addbarshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addbarshelvesloo.shelfname |html %]<\/option>";[% END %]
>      param1 += "<\/optgroup>";[% END %]
> -    [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public Lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %][% END %]
> -    param1 +="<\/optgroup><option value=\"newlist\">[ "+_("New List")+" ]<\/option>"
> +    [% IF ( addpubshelves ) %]param1 += "<optgroup label=\""+_("Public lists:")+"\">"[% FOREACH addpubshelvesloo IN addpubshelvesloop %]+"<option id=\"s[% addpubshelvesloo.shelfnumber %]\" value=\"addtolist\">[% addpubshelvesloo.shelfname |html %]<\/option>"[% END %][% END %]
> +    param1 +="<\/optgroup><option value=\"newlist\">[ "+_("New list")+" ]<\/option>"
>      [% END %]
>      [% END %]
>      param1 += "<\/select> <input type=\"submit\" class=\"submit\" value=\""+_("Save")+"\" />";
> @@ -135,8 +135,8 @@ $(document).ready(function(){
>      $('#sort_by').change(function() {
>          $('#bookbag_form').submit();
>      });
> -    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear All")+"<\/a>");
> -    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select All")+"<\/a>");
> +    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>");
> +    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>");
>  [% IF ( opacbookbag ) %]$("span.addto").html(param1);[% ELSE %][% IF ( virtualshelves ) %][% IF ( loggedinusername ) %]$("span.addto").html(param1);[% END %][% END %][% END %]
>  [% IF ( opacbookbag ) %]
>      [% IF ( virtualshelves ) %]
> @@ -166,12 +166,12 @@ $(document).ready(function(){
>          } else if($("#addto").find("option:selected").attr("value") == "newlist"){
>              [% IF ( loggedinusername ) %]if (vShelfAdd()) {
>              Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?newshelf=1&' + vShelfAdd());
> -            }[% ELSE %] alert(_('You must be logged in to create or add to Lists')); [% END %]
> +            }[% ELSE %] alert(_('You must be logged in to create or add to lists')); [% END %]
>              return false;
>          } else if($("#addto").find("option:selected").attr("value") == "morelists"){
>              [% IF ( loggedinusername ) %]if (vShelfAdd()) {
>              Dopop('/cgi-bin/koha/opac-addbybiblionumber.pl?' + vShelfAdd());
> -            }[% ELSE %] alert(_('You must be logged in to create or add to Lists')); [% END %]
> +            }[% ELSE %] alert(_('You must be logged in to create or add to lists')); [% END %]
>              return false;
>          }
>          if($("#addto").find("option:selected").attr("value") == "addtocart" || $("#addto").attr("class") == "addtocart"){
> @@ -190,7 +190,7 @@ $(document).ready(function(){
>  [% IF ( RequestOnOpac ) %]
>    [% IF ( opacuserlogin ) %]
>    [% IF ( DisplayMultiPlaceHold ) %]
> -    $("#placehold").html("<input class=\"submit\" type=\"submit\" value=\""+_("Place Hold")+"\"/>");
> +    $("#placehold").html("<input class=\"submit\" type=\"submit\" value=\""+_("Place hold")+"\"/>");
>      $("#placehold").find("input:submit").click(function(){
>          holdMultiple();
>          return false;
> @@ -268,25 +268,25 @@ $(document).ready(function(){
>  <!-- Search Results Table -->
>  [% IF ( total ) %]
>  [% IF ( scan ) %]
> -    <h1>Scan Index:</h1>
> +    <h1>Scan index:</h1>
>      <form action="/cgi-bin/koha/opac-search.pl" method="get">
>          <table>
>              <tr>
>                  <td>
> -                    Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="" />
> +                    Scan index for: <input type="text" name="q" id="scan-index" size="35" value="" />
>                  </td>
>              </tr>
>              <tr>
>                  <td>
>                      <label for="scan-index">Indexed in:</label>
>                      <select name="idx" id="scan-index">
> -                        <option value="">Any Word</option>
> -                        <option value="kw,phr:">Any Phrase</option>
> +                        <option value="">Any word</option>
> +                        <option value="kw,phr:">Any phrase</option>
>                          <option value="ti:">Title</option>
> -                        <option value="ti,phr:">Title Phrase</option>
> +                        <option value="ti,phr:">Title phrase</option>
>                          <option value="au,phr:">Author</option>
>                          <option value="su:">Subject</option>
> -                        <option value="su,phr:">Subject Phrase</option>
> +                        <option value="su,phr:">Subject phrase</option>
>                          <option value="se:">Series</option>
>                          <option value="pb:">Publisher</option>
>                          <option value="nt:">Notes</option>
> @@ -358,7 +358,7 @@ $(document).ready(function(){
>                              <span id="tagsel_span"></span>
>                            [% IF ( loggedinusername ) %]
>                              <span id="tagsel_form" style="display:none">
> -                              <label for="tagsel_new">New Tag:</label>
> +                              <label for="tagsel_new">New tag:</label>
>                                <input name="tagsel_new" id="tagsel_new" maxlength="100" />
>                                <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add" />
>                                <a href="#" id="tagsel_cancel">Cancel</a>
> @@ -531,10 +531,10 @@ $(document).ready(function(){
>                      [% UNLESS ( SEARCH_RESULT.norequests ) %]
>                          [% IF ( opacuserlogin ) %]
>                              [% IF ( AllowOnShelfHolds ) %]
> -                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> +                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
>                              [% ELSE %]
>                                  [% IF ( SEARCH_RESULT.itemsissued ) %]
> -                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> +                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
>                                  [% END %]
>                              [% END %]
>                          [% END %]
> @@ -546,9 +546,9 @@ $(document).ready(function(){
>                  [% END %][% END %][% END %]
>                  [% IF ( opacbookbag ) %]
>                      [% IF ( SEARCH_RESULT.incart ) %]
> -                        <a class="addtocart cart[% SEARCH_RESULT.biblionumber %]" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">In your Cart</a> <a class="cartRemove cartR[% SEARCH_RESULT.biblionumber %]" href="#" onclick="delSingleRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">(remove)</a>
> +                        <a class="addtocart cart[% SEARCH_RESULT.biblionumber %]" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">In your cart</a> <a class="cartRemove cartR[% SEARCH_RESULT.biblionumber %]" href="#" onclick="delSingleRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">(remove)</a>
>                      [% ELSE %]
> -                        <a class="addtocart cart[% SEARCH_RESULT.biblionumber %]" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">Add to Cart</a> <a style="display:none;" class="cartRemove cartR[% SEARCH_RESULT.biblionumber %]" href="#" onclick="delSingleRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">(remove)</a>
> +                        <a class="addtocart cart[% SEARCH_RESULT.biblionumber %]" href="#" onclick="addRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">Add to cart</a> <a style="display:none;" class="cartRemove cartR[% SEARCH_RESULT.biblionumber %]" href="#" onclick="delSingleRecord('[% SEARCH_RESULT.biblionumber %]'); return false;">(remove)</a>
>                      [% END %]
>                  [% END %]
>                  </span>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
> index 57d098e..d140285 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo; Comments on [% title %]
> +[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo; Comments on [% title %]
>  [% INCLUDE 'doc-head-close.inc' %]
>  <style type="text/css">
>    #custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; }
> @@ -9,7 +9,7 @@
>  	 	var inject_old = function(comment) {
>  			[% IF ( reviewid ) %]
>  			[% IF ( cgi_debug ) %]alert(_('injecting OLD comment: ')+comment);[% END %]
> -			parent.opener.$('#c[% reviewid %] p').prev("small").prev("h5").html("Your Edited Comment (preview, pending approval)");
> +            parent.opener.$('#c[% reviewid %] p').prev("small").prev("h5").html("Your edited comment (preview, pending approval)");
>  			parent.opener.$('#c[% reviewid %] p').html(comment);
>  			parent.opener.$('#c[% reviewid %] p').append("<a href=\"#comment\" onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber | uri %]&amp;reviewid=[% reviewid | uri%]\');\">Edit<\/a>");
>  			[% END %]
> @@ -19,7 +19,7 @@
>  			[% IF ( cgi_debug ) %]alert(_("injecting NEW comment: ") +comment);[% END %]
>  			parent.opener.$('#newcomment').attr("class","yours");
>  			parent.opener.$('#newcomment').html(
> -				"<h5>Your Comment (preview, pending approval)<\/h5>" +
> +                "<h5>Your comment (preview, pending approval)<\/h5>" +
>  				"<p>"+comment+"<\/p>" +
>  				"<a href=\"#comment\" onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber |uri%]\');\">Edit<\/a><\/p>"
>  			);
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
> index 26b421a..3bfa668 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt
> @@ -1,5 +1,5 @@
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your search history
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your search history
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>  <script type="text/JavaScript" language="JavaScript">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
> index 32d00f0..7f64f17 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
> @@ -1,5 +1,5 @@
>  <SUBJECT>
> -Your Cart
> +Your cart
>  <END_SUBJECT>
>  
>  <HEADER>
> @@ -8,7 +8,7 @@ Hi,
>  [% firstname %] [% surname %] sent you a cart from our online catalog.
>  
>  Please note that the attached file is a MARC bibliographic records file
> -which can be imported into a Personal Bibliographic Software like EndNote,
> +which can be imported into personal bibliographic software like EndNote,
>  Reference Manager or ProCite.
>  <END_HEADER>
>  
> @@ -30,7 +30,7 @@ Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
>  Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
>  Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
>  LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
> -url : [% BIBLIO_RESULT.url %][% END %]
> +URL : [% BIBLIO_RESULT.url %][% END %]
>  In the online catalog:
>  [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %]
>  Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt
> index 4090f03..927fc7a 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tt
> @@ -1,12 +1,12 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Sending Your Cart
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Sending your cart
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body style="padding: 1em;" id="sendbasket">
>  <div id="usersendbasket" class="container">[% IF ( email_add ) %]
>  
>  	[% IF ( SENT ) %]
> -		<h3>Message Sent</h3>
> -	    <p>The cart was sent to: [% email_add %]</p>
> +        <h3>Message sent</h3>
> +        <p>The cart was sent to: [% email_add %]</p>
>  		<p><a class="focus close" href="#">Close window</a></p>
>  	[% END %]
>  	[% IF ( error ) %]
> @@ -20,7 +20,7 @@
>  <fieldset class="rows"> 
>  <legend>Sending your cart</legend>
>  <ol>   <li>
> -        <label for="email_add">Email Address:</label>
> +        <label for="email_add">Email address:</label>
>          <input type="text" id="email_add" name="email_add" size="43" class="focus" />
>      </li>
>      <li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
> index f9f7c31..c43affb 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
> @@ -1,5 +1,5 @@
>  <SUBJECT>
> -Your List : [% shelfname %]
> +Your list : [% shelfname %]
>  <END_SUBJECT>
>  
>  <HEADER>
> @@ -8,7 +8,7 @@ Hi,
>  [% firstname %] [% surname %], sent you from our online catalog, the virtual shelf called :  [% shelfname %].
>  
>  Please note that the attached file is a MARC bibliographic records file
> -which can be imported into a Personal Bibliographic Software like EndNote,
> +which can be imported into personal bibliographic software like EndNote,
>  Reference Manager or ProCite.
>  <END_HEADER>
>  
> @@ -34,10 +34,10 @@ Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
>  Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
>  Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
>  LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
> -url : [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
> +URL: [% BIBLIO_RESULT.url %][% END %][% IF ( OPACBaseURL ) %]
>  In the online catalog:
>      http://[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %][% END %]
> -Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
> +Items: [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
>      [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
>  
>  ---------------------------------------------
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt
> index 81ce32d..f64eb08 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Sending Your List
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Sending your list
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript">//<![CDATA[
>  	$(document).ready(function(){
> @@ -11,7 +11,7 @@
>  <div id="usersendshelfform" class="container">[% IF ( email ) %]
>  
>      [% IF ( SENT ) %]
> -        <h3>Message Sent</h3>
> +        <h3>Message sent</h3>
>          <p>The list was sent to: [% email %]</p>
>          <p><a class="focus close" href="/cgi-bin/koha/opac-shelves.pl">Back to lists</a></p>
>      [% END %]
> @@ -31,7 +31,7 @@
>          <fieldset class="rows">
>          <legend>Sending your list</legend>
>          <ol>   <li>
> -                <label for="email">Email Address:</label>
> +                <label for="email">Email address:</label>
>                  <input type="text" id="email" name="email" size="43" class="focus" />
>              </li>
>              <li>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
> index 78bc22e..790aa48 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Serials
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Serials
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-serial-issues">
> @@ -12,9 +12,9 @@
>  <div id="userserialissues" class="container">
>  <h2>Issues for a subscription</h2>
>  <div id="views">
> -	<span class="view"><a id="Normalview" href="opac-detail.pl?biblionumber=[% biblionumber | html %]" class="button">Normal View</a></span>
> +    <span class="view"><a id="Normalview" href="opac-detail.pl?biblionumber=[% biblionumber | html %]" class="button">Normal view</a></span>
>  		<span class="view"><span id="Briefhistory">Brief history</span></span>
> -	<span class="view"><a id="Fullhistory" href="opac-serial-issues.pl?selectview=full&amp;biblionumber=[% biblionumber | html%]" class="button">Full History</a></span>
> +    <span class="view"><a id="Fullhistory" href="opac-serial-issues.pl?selectview=full&amp;biblionumber=[% biblionumber | html%]" class="button">Full history</a></span>
>  </div>
>  <form method="post" name="f">
>  [% FOREACH subscription_LOO IN subscription_LOOP %]
> @@ -91,13 +91,13 @@
>  		</p>
>      <h4>[% subscription_LOO.branchname %] [% subscription_LOO.notes %]</h4>
>    [% IF ( subscription_LOO.recievedlist ) %]
> -    <h5>Available Issues</h5>
> +    <h5>Available issues</h5>
>      <p>
>        [% subscription_LOO.recievedlist %]
>      </p>
>    [% END %]
>    [% IF ( subscription_LOO.missinglist ) %]
> -    <h5>Unavailable Issues</h5>
> +    <h5>Unavailable issues</h5>
>      <p>
>        [% subscription_LOO.missinglist %]
>      </p>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
> index a1d865d..b6a2954 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;   [% IF ( viewshelf ) %]Contents of [% shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %]
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;   [% IF ( viewshelf ) %]Contents of [% shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>  <script type="text/javascript">
> @@ -154,7 +154,7 @@ $(function() {
>  		var alertString2;
>  
>  	    if(f.addshelf.value.length ==0){
> -			_alertString += _("- You must enter a List Name") + "\n";
> +        _alertString += _("- You must enter a list name") + "\n";
>  		}
>  
>  		if (_alertString.length==0) {
> @@ -181,7 +181,7 @@ $(function() {
>                [% FOREACH paramsloo IN paramsloop %]
>                  <div class="yui-ge">
>                    <div class="yui-u first">
> -                    [% IF ( paramsloo.already ) %]<div class="dialog alert">A List named <b>[% paramsloo.already %]</b> already exists!</div>[% END %]
> +                    [% IF ( paramsloo.already ) %]<div class="dialog alert">A list named <b>[% paramsloo.already %]</b> already exists!</div>[% END %]
>                      [% IF ( paramsloo.status ) %]<div class="dialog alert">[% paramsloo.string %]</div>[% END %]
>                      [% IF ( paramsloo.nobarcode ) %]<div class="dialog alert">ERROR: No barcode given.</div>[% END %]
>                      [% IF ( paramsloo.noshelfnumber ) %]<div class="dialog alert">ERROR: No shelfnumber given.</div>[% END %]
> @@ -231,20 +231,20 @@ $(function() {
>                [% IF ( itemsloop ) %]
>                    <div id="toolbar" class="list-actions">
>  
> -                      <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfid=[% shelfnumber %]" class="download" onclick="open(CGIBIN+'opac-downloadshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false;">Download List</a>
> +                      <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfid=[% shelfnumber %]" class="download" onclick="open(CGIBIN+'opac-downloadshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false;">Download list</a>
>  
> -[% IF ( opacuserlogin ) %]<span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber %]" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send List</a></span>[% END %]
> +[% IF ( opacuserlogin ) %]<span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelfnumber %]" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=[% shelfnumber %]','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span>[% END %]
>  
> -<a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print List</a>
> +<a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print list</a>
>  
>                  [% IF ( manageshelf ) %] <span class="sep">|</span> <form method="get" action="opac-shelves.pl"><input type="hidden" name="op" value="modif" />
>                  <input type="hidden" name="display" value="viewshelf" />
> -                <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" /> <input type="submit" class="editshelf" value="Edit List" /></form>
> +                <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" /> <input type="submit" class="editshelf" value="Edit list" /></form>
>  
>                        <form method="post" action="opac-shelves.pl">
>                          <input type="hidden" value="1" name="shelves"/>
>                           <input type="hidden" value="1" name="DEL-[% shelfnumber %]"/>
> -                         [% IF ( showprivateshelves ) %]<input type="hidden" name="display" value="privateshelves"/>[% END %]<input type="submit" class="deleteshelf" value="Delete List" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/>
> +                         [% IF ( showprivateshelves ) %]<input type="hidden" name="display" value="privateshelves"/>[% END %]<input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/>
>                        </form> [% END %]
>  
>  
> @@ -259,7 +259,7 @@ $(function() {
>                                          [% IF ( TagsEnabled ) %]
>                                            <span id="addtags"></span>
>                                            <span id="tagsel_form" style="display:none">
> -                                          <label for="tagsel_new" style="display:inline">New&nbsp;Tag:</label>
> +                                          <label for="tagsel_new" style="display:inline">New&nbsp;tag:</label>
>                                            <input name="tagsel_new" id="tagsel_new" maxlength="100" style="display:inline"/>
>                                            <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add" style="display:inline" />
>                                            <a href="#" id="tagsel_cancel" onclick="tagCanceled(); return false;" style="display:inline">Cancel</a>
> @@ -355,10 +355,10 @@ $(function() {
>            [% UNLESS ( itemsloo.norequests ) %]
>              [% IF ( opacuserlogin ) %]
>                [% IF ( AllowOnShelfHolds ) %]
> -                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> +                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
>                [% ELSE %]
>                  [% IF ( itemsloo.itemsissued ) %]
> -                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
> +                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
>                  [% END %]
>                [% END %]
>              [% END %]
> @@ -371,7 +371,7 @@ $(function() {
>                [% IF ( itemsloo.incart ) %]
>                    <a class="addtocart cart[% itemsloo.biblionumber %]" href="#" onclick="addRecord('[% itemsloo.biblionumber %]'); return false;">In your cart</a> <a class="cartRemove cartR[% itemsloo.biblionumber %]" href="#" onclick="delSingleRecord('[% itemsloo.biblionumber %]'); return false;">(remove)</a>
>                [% ELSE %]
> -                  <a class="addtocart cart[% itemsloo.biblionumber %]" href="#" onclick="addRecord('[% itemsloo.biblionumber %]'); return false;">Add to Cart</a> <a style="display:none;" class="cartRemove cartR[% itemsloo.biblionumber %]" href="#" onclick="delSingleRecord('[% itemsloo.biblionumber %]'); return false;">(remove)</a>
> +                  <a class="addtocart cart[% itemsloo.biblionumber %]" href="#" onclick="addRecord('[% itemsloo.biblionumber %]'); return false;">Add to cart</a> <a style="display:none;" class="cartRemove cartR[% itemsloo.biblionumber %]" href="#" onclick="delSingleRecord('[% itemsloo.biblionumber %]'); return false;">(remove)</a>
>                [% END %]
>            [% END %]
>          </span>
> @@ -398,7 +398,7 @@ $(function() {
>                    </div>
>                    [% IF ( pagination_bar ) %]<div class="pages">[% pagination_bar %]</div>[% END %]
>                  [% ELSE %]
> -                  <div class="dialog message">This List is empty.  [% IF ( opacuserlogin ) %]You can add to your lists from the results of any <a href="opac-main.pl">search</a>![% END %]</div>
> +                  <div class="dialog message">This list is empty.  [% IF ( opacuserlogin ) %]You can add to your lists from the results of any <a href="opac-main.pl">search</a>![% END %]</div>
>                [% END %]<!-- /itemsloop -->
>              [% END %]<!-- /viewshelf -->
>  
> @@ -407,14 +407,14 @@ $(function() {
>                  <form method="post" action="opac-shelves.pl">
>                  <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
>                  <input type="hidden" name="modifyshelfcontents" value="1" />
> -                <input type="hidden" name="viewshelf" value="[% shelfnumber %]" /><input type="submit" value="Remove Selected Items" class="icon delete"/>
> +                <input type="hidden" name="viewshelf" value="[% shelfnumber %]" /><input type="submit" value="Remove selected items" class="icon delete"/>
>                  </form>
>              [% ELSIF ( !itemsloop && manageshelf ) %]
>                  <form method="post" action="opac-shelves.pl">
>                    <input type="hidden" name="DEL-[% shelfnumber %]" value="1" />
>                    <input type="hidden" name="shelves" value="1" />
>  		  <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
> -                  <input type="submit" class="icon delete" value="Delete this List" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
> +                  <input type="submit" class="icon delete" value="Delete this list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
>                  </form>
>              [% END %]
>  
> @@ -427,7 +427,7 @@ $(function() {
>                    <input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
>                    <fieldset class="rows">
>                      <ol>
> -                      <li><label for="shelfname">List Name: </label><input type="text" id="shelfname" name="shelfname" size="60" value="[% shelfname |html %]" /></li>
> +                      <li><label for="shelfname">List name: </label><input type="text" id="shelfname" name="shelfname" size="60" value="[% shelfname |html %]" /></li>
>                        <li>
>                          <label for="sortfield" >Sort this list by: </label>
>                          <select name="sortfield" id="sortfield">
> @@ -478,12 +478,12 @@ $(function() {
>                    [% END %]
>          
>                    [% IF ( loggedinusername ) %]
> -                    <div id="toolbar"><a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a></div>
> +                    <div id="toolbar"><a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New list</a></div>
>                    [% IF ( showprivateshelves ) %]
>                      [% IF ( shelveslooppriv ) %]
>                        <table>
>                          <tr>
> -                          <th>List Name</th>
> +                          <th>List name</th>
>                            <th>Contents</th>
>                            <th>Type</th>
>                            <th>&nbsp;</th>
> @@ -531,7 +531,7 @@ $(function() {
>                      [% END %]<!-- /shelveslooppriv -->
>                    [% END %]<!-- /showprivateshelves -->
>                    [% ELSE %]<!-- /loggedinusername -->
> -                      [% IF ( opacuserlogin ) %]<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>[% END %]
> +                      [% IF ( opacuserlogin ) %]<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new lists.</div>[% END %]
>                    [% END %]<!-- /loggedinusername -->
>  
>                    
> @@ -543,14 +543,14 @@ $(function() {
>                      <div id="publicshelves" class="tab-container" style="display:none;">
>                    [% END %]
>                    [% IF ( loggedinusername ) %]
> -                 <div id="toolbar"> <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a></div>
> +                 <div id="toolbar"> <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New list</a></div>
>                    [% ELSE %]
> -                  [% IF ( opacuserlogin ) %]<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>[% END %]
> +                  [% IF ( opacuserlogin ) %]<div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new lists.</div>[% END %]
>                    [% END %]
>                    [% IF ( shelvesloop ) %]
>                        <table>
>                          <tr>
> -                          <th>List Name</th>
> +                          <th>List name</th>
>                            <th>Contents</th>
>                            <th>Type</th><th>&nbsp;</th>
>                          </tr>
> @@ -604,11 +604,11 @@ $(function() {
>                <div id="addshelf">
>                  <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
>                    <fieldset class="rows">
> -                    <legend>Create a New List</legend>
> +                    <legend>Create a new list</legend>
>                      <input type="hidden" name="shelves" value="1" />
>                      <ol>
>                        <li>
> -                        <label class="required" for="addshelf">List Name:</label>
> +                        <label class="required" for="addshelf">List name:</label>
>                          [% IF ( already ) %]
>                            <input id="addshelf" type="text" name="addshelf" value="[% already %]" size="60" />
>                          [% ELSE %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt
> index 5053684..2a30906 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %]MARC View[% INCLUDE 'doc-head-close.inc' %]
> +[% INCLUDE 'doc-head-open.inc' %]MARC view[% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-showmarc">
>  <div id="main">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt
> index 7e9cc24..54cc959 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt
> @@ -3,9 +3,9 @@
>  <?xml version="1.0" encoding="utf-8"?>
>  <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
>  <channel>
> -     <title><![CDATA[[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog Recent Comments]]></title>
> +     <title><![CDATA[[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog Recent Comments]]></title>
>       <link>[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl&amp;format=rss2</link>
> -     <description><![CDATA[ The most recent comments from [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog. Comments can be made by logged in users and are moderated by library staff.]]></description>
> +     <description><![CDATA[ The most recent comments from [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] Catalog. Comments can be made by logged in users and are moderated by library staff.]]></description>
>       <atom:link href="[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl&amp;format=rss2" rel="self" type="application/rss+xml" />
>       <lastBuildDate>[% timestamp %]</lastBuildDate>
>  	 [% FOREACH review IN reviews %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
> index c132d15..9fcc532 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
> @@ -1,8 +1,8 @@
>  [% USE KohaDates %]
>  
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Recent Comments
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Recent comments
>  [% INCLUDE 'doc-head-close.inc' %]
> -<link rel="alternate" type="application/rss+xml" title="[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog Recent Comments" href="[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl?format=rss" />
> +<link rel="alternate" type="application/rss+xml" title="[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog recent comments" href="[% OPACBaseURL %]/cgi-bin/koha/opac-showreviews.pl?format=rss" />
>  <script type="text/javascript">
>  //<![CDATA[
>  $(document).ready(function(){
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
> index 7897f0e..32e4173 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  
>  [% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
>  [% IF ( op_else ) %]Purchase Suggestions[% END %]
>  [% INCLUDE 'doc-head-close.inc' %]
> @@ -83,9 +83,9 @@ $.tablesorter.addParser({
>      <li><label for="copyrightdate">Copyright Date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></li>
>      <li><label for="isbn">Standard Number (ISBN, ISSN or Other):</label><input type="text" id="isbn" name="isbn" size="50" maxlength="80" /></li>
>      <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></li>
> -    <li><label for="collectiontitle">Collection Title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" /></li>
> -    <li><label for="place">Publication Place:</label><input type="text" id="place" name="place" size="50" maxlength="80" /></li>
> -    <li><label for="itemtype">Item Type:</label><select name="itemtype" id="itemtype">
> +    <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" /></li>
> +    <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" /></li>
> +    <li><label for="itemtype">Item type:</label><select name="itemtype" id="itemtype">
>              <option value="">Default</option>
>          [% FOREACH itemtypeloo IN itemtypeloop %]
>  			[% IF ( itemtypeloo.selected ) %]<option value="[% itemtypeloo.itemtype %]" selected="selected"> [% ELSE %]<option value="[% itemtypeloo.itemtype %]"> [% END %] [% itemtypeloo.description %]</option>
> @@ -115,7 +115,7 @@ $.tablesorter.addParser({
>  [% END %]
>  
>  [% IF ( op_else ) %]
> -    <h1>[% UNLESS ( OPACViewOthersSuggestions ) %][% IF ( loggedinusername ) %]My [% END %][% END %]Purchase Suggestions</h1>
> +    <h1>[% UNLESS ( OPACViewOthersSuggestions ) %][% IF ( loggedinusername ) %]My [% END %][% END %]Purchase suggestions</h1>
>  
>      [% IF ( deleted ) %]<div class="dialog message">The selected suggestions have been deleted.</div>[% END %]
>      [% IF ( submitted ) %]<div class="dialog message">Your suggestion has been submitted.</div>[% END %]
> @@ -148,15 +148,15 @@ $.tablesorter.addParser({
>              </form>[% END %]
>          <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
>              <input type="hidden" name="op" value="delete_confirm" />
> -			<div><span class="checkall"><a href="#" id="CheckAll">Select All</a></span>
> -		<span class="clearall"><a href="#" id="CheckNone">Clear All</a></span> | [% IF ( loggedinusername ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% ELSE %][% IF ( AnonSuggestions ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% END %][% END %]
> +            <div><span class="checkall"><a href="#" id="CheckAll">Select all</a></span>
> +        <span class="clearall"><a href="#" id="CheckNone">Clear all</a></span> | [% IF ( loggedinusername ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% ELSE %][% IF ( AnonSuggestions ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% END %][% END %]
>  </div>
>  			<table id="suggestt" class="checkboxed">
>  			<thead><tr>
>              [% IF ( loggedinusername ) %]<th>&nbsp;</th>[% END %]
>              <th>Summary</th>
>              <th>Note</th>
> -            [% IF ( OPACViewOthersSuggestions ) %]<th>Suggested For</th>[% END %]
> +            [% IF ( OPACViewOthersSuggestions ) %]<th>Suggested for</th>[% END %]
>              <th>Managed by</th>
>              <th>Status</th>
>          </tr></thead>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
> index c1ec044..ccdd4b5 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
> @@ -1,6 +1,6 @@
>  [% USE KohaDates %]
>  
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Tags
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Tags
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>  <style type="text/css">
> @@ -111,7 +111,7 @@
>  		<form method="post" action="opac-tags.pl">
>  		<h2>My Tags</h2>
>  		<table id="mytagst">
> -		<thead><tr><th>Term</th><th>Title</th><th>Date Added</th><th>Delete</th>
> +        <thead><tr><th>Term</th><th>Title</th><th>Date added</th><th>Delete</th>
>  		</tr></thead>
>  	<tbody>[% FOREACH MY_TAG IN MY_TAGS %]
>  		<tr><td><a href="/cgi-bin/koha/opac-search.pl?tag=[% MY_TAG.term |url %]&amp;q=[% MY_TAG.term |url %]">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
> index 22c198a..5a6ae8c 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog &rsaquo;  ISBD
> +[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog &rsaquo;  ISBD
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-tags-subject">
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
> index 29296a7..c05f6fc 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Most Popular Titles
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Most popular titles
>  [% INCLUDE 'doc-head-close.inc' %]
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>  <script language="JavaScript" type="text/javascript">
> @@ -79,14 +79,14 @@ function Dopop(link) {
>                          </td>
>                          <td>[% results_loo.description %]</td>
>                          <td>[% results_loo.tot %]</td>
> -						[% IF ( opacuserlogin ) %]<td>[% IF ( RequestOnOpac ) %][% UNLESS ( results_loo.norequests ) %]<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% results_loo.biblionumber %]">Place Hold</a>[% END %][% END %]</td>[% END %]
> +                        [% IF ( opacuserlogin ) %]<td>[% IF ( RequestOnOpac ) %][% UNLESS ( results_loo.norequests ) %]<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% results_loo.biblionumber %]">Place hold</a>[% END %][% END %]</td>[% END %]
>                          </tr>
>                  [% END %]</tbody>
>          </table>
>  [% ELSE %]
>  <form method="post" action="/cgi-bin/koha/opac-topissues.pl">
>  		<fieldset class="rows">
> -		<legend>See the Most Popular Titles</legend>
> +        <legend>See the most popular titles</legend>
>            <ol>  <li><label for="limit">Show the top </label> <select name="limit" id="limit">
>                              [% IF ( limit == 10 ) %]<option value ="10" selected="selected">10 titles</option>[% ELSE %]<option value="10">10 titles</option>[% END %]
>                              [% IF ( limit == 15 ) %]<option value ="15" selected="selected">15 titles</option>[% ELSE %]<option value="15">15 titles</option>[% END %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
> index b8e98a2..bd3520d 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
> @@ -1,7 +1,7 @@
>  [% USE KohaDates %]
>  
>  [% INCLUDE 'doc-head-open.inc' %]
> -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo; Your library home
> +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home
>  [% INCLUDE 'doc-head-close.inc' %]
>  [% INCLUDE 'calendar.inc' %]
>  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.metadata.min.js"></script>
> @@ -60,7 +60,7 @@ $.tablesorter.addParser({
>  	<div id="userdetails" class="container">
>  	[% IF ( bor_messages ) %]
>  	       <div class="dialog message">
> -	               <h3>Messages For You</h3>
> +                   <h3>Messages for you</h3>
>  	               <ul>
>  	                       [% FOREACH bor_messages_loo IN bor_messages_loop %]
>  					<li>
> @@ -110,7 +110,7 @@ $.tablesorter.addParser({
>          
>  <div id="opac-user-views" class="toptabs">
>          <ul>
> -            <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">Checked Out</a></li>
> +            <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">Checked out</a></li>
>              [% IF ( overdues_count ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">Overdue</a></li>[% END %]
>  [% IF ( OPACFinesTab ) %]
>              [% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li>[% END %]
> @@ -124,7 +124,7 @@ $.tablesorter.addParser({
>  [% IF ( OPACFinesTab ) %]
>          <!-- FINES BOX -->
>          [% IF ( BORROWER_INF.amountoverfive ) %]
> -            <div id="opac-user-fines"> <h3>Fines and Charges</h3>
> +            <div id="opac-user-fines"> <h3>Fines and charges</h3>
>              <table>
>                  <tr><th colspan="2">Amount</th></tr>
>                  <tr>
> @@ -135,7 +135,7 @@ $.tablesorter.addParser({
>          [% END %]
>  
>          [% IF ( BORROWER_INF.amountoverzero ) %]
> -           <div id="opac-user-fines"> <h3>Fines and Charges</h3>
> +           <div id="opac-user-fines"> <h3>Fines and charges</h3>
>              <table>
>                  <tr><th colspan="2">Amount</th></tr>
>                  <tr><td>You currently owe fines and charges amounting to:</td>
> @@ -158,11 +158,11 @@ $.tablesorter.addParser({
>      [% IF ( atdestination ) %]
>      <div id="opac-user-waiting">
>          <table id="waitingt">
> -            <caption>Holds Waiting</caption>
> +            <caption>Holds waiting</caption>
>             <thead> <tr>
>                  <th colspan="2" class="{sorter:'articles'}">Title</th>
>                  <th>Hold date</th>
> -                <th>Pick Up Library</th>
> +                <th>Pick up library</th>
>              </tr></thead>
>              <tbody>[% FOREACH WAITIN IN WAITING %]
>                  <tr>
> @@ -188,12 +188,12 @@ $.tablesorter.addParser({
>  	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
>  	<input type="hidden" name="from" value="opac_user" />
>          <table id="checkoutst">
> -        <caption>[% issues_count %] Item(s) Checked Out</caption>
> +        <caption>[% issues_count %] Item(s) checked out</caption>
>         <thead><tr>
>  		[% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
>          <th class="{sorter:'articles'}">Title</th>
>          <th>Due</th>
> -		[% UNLESS ( item_level_itypes ) %]<th>Item Type</th> [% END %]
> +        [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
>          [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
>          <th>Call No.</th>
>          [% IF ( OpacRenewalAllowed ) %]
> @@ -287,9 +287,9 @@ $.tablesorter.addParser({
>  <thead><tr>
>  [% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
>  <th class="{sorter:'articles'}">Title</th>
> -[% UNLESS ( item_level_itypes ) %]<th>Item Type</th> [% END %]
> +[% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
>  [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
> -<th>Call No.</th>
> +<th>Call no.</th>
>  <th>Due</th>
>  [% IF ( OpacRenewalAllowed ) %]
>                      <th class="{sorter: false}">Renew</th>
> @@ -326,7 +326,7 @@ $.tablesorter.addParser({
>  <td>[% OVERDUE.date_due | $KohaDates %]</td>
>                  [% IF ( OpacRenewalAllowed ) %]
>  <td>
> -[% IF ( OVERDUE.debarred ) %]Account Frozen
> +[% IF ( OVERDUE.debarred ) %]Account frozen
>  [% ELSIF ( OVERDUE.status ) %]
>  [% IF ( canrenew ) %]<a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber %]&amp;bornum=[% OVERDUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining)</span>
>  [% ELSIF ( OVERDUE.onreserve ) %]On hold
> @@ -349,9 +349,9 @@ $.tablesorter.addParser({
>              <!-- RESERVES TABLE ROWS -->
>              <thead><tr>
>                  <th class="{sorter:'articles'}">Title</th>
> -                <th>Placed On</th>
> -		<th>Expires On</th>
> -                <th>Pick Up Location</th>
> +                <th>Placed on</th>
> +        <th>Expires on</th>
> +                <th>Pick up location</th>
>  		[% IF ( showpriority ) %]
>  			<th>Priority</th>
>  		[% END %]
> @@ -377,7 +377,7 @@ $.tablesorter.addParser({
>                      [% RESERVE.author %]
>                  </td>
>                  <td>[% RESERVE.reservedate | $KohaDates %]</td>
> -		<td>[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never Expires[% END %]</td>
> +        <td>[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %]</td>
>                  <td>[% RESERVE.branch %]</td>
>  				[% IF ( showpriority ) %]
>  				<td>[% RESERVE.priority %] </td>
> @@ -462,7 +462,7 @@ $.tablesorter.addParser({
>                );
>                //]]>
>                </script>
> -              <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('suspend_until').value='';return false;">Clear Date</a></p>
> +              <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('suspend_until').value='';return false;">Clear date</a></p>
>                [% END %]
>              </form>
>  	</div>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
> index 2767436..0befa83 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Your personal details
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Your personal details
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body>
> @@ -9,23 +9,23 @@
>  	<div id="yui-main">
>  	<div class="yui-b"><div class="yui-g">
>  
> -<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Personal Details</h3>
> +<h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Personal details</h3>
>  
>  <table>
>  <tr><th scope="row">Name:</th><td> [% firstname %] [% surname %]</td></tr>
>  <tr><th scope="row">
> -Card Number:</th><td>[% cardnumber %]</td></tr>
> +Card number:</th><td>[% cardnumber %]</td></tr>
>  </table>
>  
>  <table>
> -<caption>Contact Details</caption>
> -<tr><th scope="row">Mailing Address:</th><td>[% address %], [% city %]</td></tr>
> +<caption>Contact details</caption>
> +<tr><th scope="row">Mailing address:</th><td>[% address %], [% city %]</td></tr>
>  
> -<tr><th scope="row">Permanent Address:</th><td> [% B_address %], [% B_address2 %], [% B_city %]</td></tr>
> +<tr><th scope="row">Permanent address:</th><td> [% B_address %], [% B_address2 %], [% B_city %]</td></tr>
>  
> -<tr><th scope="row">Primary Phone:</th><td>[% IF ( phone ) %][% phone %][% ELSE %]&nbsp;[% END %]</td></tr>
> +<tr><th scope="row">Primary phone:</th><td>[% IF ( phone ) %][% phone %][% ELSE %]&nbsp;[% END %]</td></tr>
>  
> -<tr><th scope="row">Secondary Phone:</th><td>[% IF ( mobile ) %][% mobile %][% ELSE %]&nbsp;[% END %]</td></tr>
> +<tr><th scope="row">Secondary phone:</th><td>[% IF ( mobile ) %][% mobile %][% ELSE %]&nbsp;[% END %]</td></tr>
>  
>  <tr><th scope="row">Fax:</th><td>[% IF ( fax ) %][% fax %][% ELSE %]&nbsp;[% END %]</td></tr>
>  
> @@ -34,10 +34,10 @@ Card Number:</th><td>[% cardnumber %]</td></tr>
>  </table>
>  
>  <table>
> -<caption>Membership Details</caption>
> -<tr><th scope="row">Membership Number:</th><td> [% borrowernumber %]</td></tr>
> +<caption>Membership details</caption>
> +<tr><th scope="row">Membership number:</th><td> [% borrowernumber %]</td></tr>
>  
> -<tr><th scope="row">Membership Category:</th><td>  [% categorycode %]</td></tr>
> +<tr><th scope="row">Membership category:</th><td>  [% categorycode %]</td></tr>
>  
>  <!-- <td>Fee:</th><td>  /year, Paid</td> -->
>  
> @@ -48,15 +48,15 @@ Card Number:</th><td>[% cardnumber %]</td></tr>
>  [% IF ( joiningbranch ) %]<tr><th>Joining library:</th><td>[% joiningbranch %]</td></tr>[% ELSE %]&nbsp;[% END %]</table>
>  
>  <table>
> -<caption>Identity Details</caption>
> +<caption>Identity details</caption>
>  <tr><th scope="row">DoB:</th><td> [% IF ( dateofbirth ) %][% dateofbirth %][% ELSE %]&nbsp;[% END %]</td></tr>
>  
>  <tr><th scope="row">Gender:</th><td>[% IF ( sex ) %][% sex %][% ELSE %]&nbsp;[% END %]</td></tr></table>
>  
>  [% IF ( contactname ) %]
>  <table>
> -<caption>Alternate Contact Details</caption>
> -<tr><th scope="row">Alternate Contact:</th><td> [% IF ( contactname ) %][% contactname %][% ELSE %]&nbsp;[% END %]</td></tr>
> +<caption>Alternate contact details</caption>
> +<tr><th scope="row">Alternate contact:</th><td> [% IF ( contactname ) %][% contactname %][% ELSE %]&nbsp;[% END %]</td></tr>
>  
>  <tr><th scope="row">Phone:</th><td> [% IF ( B_phone ) %][% B_phone %][% ELSE %]&nbsp;[% END %]</td></tr>
>  
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
> index 3a7fb9d..1819241 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
> @@ -1,6 +1,6 @@
>  [% USE KohaDates %]
>  
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %][% ELSE %]Koha Online[% END %] Catalog &rsaquo;  Your personal details
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Your personal details
>  [% INCLUDE 'doc-head-close.inc' %]
>  </head>
>  <body id="opac-userupdate">
> @@ -13,7 +13,7 @@
>  
>  <div id="userupdatecontainer" class="container">
>  [% FOREACH BORROWER_INF IN BORROWER_INFO %]
> -<h3><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Personal Details</h3>
> +<h3><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your personal details</h3>
>  
>  [% IF ( OPACPatronDetails ) %]
>  <form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
> @@ -23,13 +23,13 @@
>      <img src="/cgi-bin/koha/opac-patron-image.pl" alt="" />
>  </p>[% END %]
>  <fieldset class="brief"><legend>Name</legend><ol>
> -<li><label for="firstname">First Name:</label> <input id="firstname" type="text" value="[% BORROWER_INF.firstname %]"  name="firstname" /></li>
> -<li><label for="othernames">Other Name:</label> <input id="othernames" type="text" value="[% BORROWER_INF.othernames %]"  name="othernames" /></li>
> -<li><label for="surname">Last Name:</label> <input id="surname" type="text" value="[% BORROWER_INF.surname %]"  name="surname" /></li>
> +<li><label for="firstname">First name:</label> <input id="firstname" type="text" value="[% BORROWER_INF.firstname %]"  name="firstname" /></li>
> +<li><label for="othernames">Other name:</label> <input id="othernames" type="text" value="[% BORROWER_INF.othernames %]"  name="othernames" /></li>
> +<li><label for="surname">Last name:</label> <input id="surname" type="text" value="[% BORROWER_INF.surname %]"  name="surname" /></li>
>  </ol>
>  </fieldset>
>  
> -<fieldset class="brief"><legend>Contact Information</legend>
> +<fieldset class="brief"><legend>Contact information</legend>
>  <ol>
>  <li><label for="address">Address:</label>
>  	<input id="streetnumber" size ="7" type="text" value="[% BORROWER_INF.streetnumber %]"  name="streetnumber" /> 
> @@ -37,24 +37,24 @@
>  	<input type="text" name="address2" value="[% BORROWER_INF.address2 %]" id="address2" /></li>
>  <li><label for="city">City:</label> <input id="city" type="text" value="[% BORROWER_INF.city %]"  name="city" /></li>
>  <li><label for="state">State:</label> <input id="state" type="text" value="[% BORROWER_INF.state %]"  name="state" /></li>
> -<li><label for="zipcode">Zip Code: </label><input type="text" id="zipcode" value="[% BORROWER_INF.zipcode %]" name="zipcode" /></li>
> +<li><label for="zipcode">Zip code: </label><input type="text" id="zipcode" value="[% BORROWER_INF.zipcode %]" name="zipcode" /></li>
>  <li><label for="country">Country: </label><input type="text" id="country" value="[% BORROWER_INF.country %]" name="country" /></li>
> -<li><label for="phone">Primary Phone:</label> <input id="phone" type="text" value="[% BORROWER_INF.phone %]"  name="phone" /></li>
> -<li><label for="mobile">Secondary Phone:</label> <input id="mobile" type="text" value="[% BORROWER_INF.mobile %]"  name="mobile" /></li>
> -<li><label for="phonepro">Other Phone:</label> <input id="phonepro"  type="text" value="[% BORROWER_INF.phonepro %]"  name="phonepro" /></li>
> +<li><label for="phone">Primary phone:</label> <input id="phone" type="text" value="[% BORROWER_INF.phone %]"  name="phone" /></li>
> +<li><label for="mobile">Secondary phone:</label> <input id="mobile" type="text" value="[% BORROWER_INF.mobile %]"  name="mobile" /></li>
> +<li><label for="phonepro">Other phone:</label> <input id="phonepro"  type="text" value="[% BORROWER_INF.phonepro %]"  name="phonepro" /></li>
>  <li><label for="fax">Fax:</label> <input id="fax" type="text" value="[% BORROWER_INF.fax %]"  name="fax" /></li>
> -<li><label for="emailaddress">Primary Email:</label> <input id="emailaddress" type="text" value="[% BORROWER_INF.email %]"  name="emailaddress" /></li>
> -<li><label for="emailpro">Secondary Email:</label> <input id="emailpro" type="text" value="[% BORROWER_INF.emailpro %]"  name="emailpro" /></li>
> +<li><label for="emailaddress">Primary email:</label> <input id="emailaddress" type="text" value="[% BORROWER_INF.email %]"  name="emailaddress" /></li>
> +<li><label for="emailpro">Secondary email:</label> <input id="emailpro" type="text" value="[% BORROWER_INF.emailpro %]"  name="emailpro" /></li>
>  </ol>
>  </fieldset>
>  
>  </div>
>  <div class="yui-u">
>  <fieldset class="brief">
> -<legend>Alternate Contact Information</legend>
> +<legend>Alternate contact information</legend>
>  <ol>
>  <li>
> -    <label for="B_streetaddress">Alternate Address:</label> 
> +    <label for="B_streetaddress">Alternate address:</label> 
>      <input id="B_streetnumber" size ="7" type="text" value="[% BORROWER_INF.B_streetnumber %]"  name="B_streetnumber" /> 
>      <input id="B_address" type="text" value="[% BORROWER_INF.B_address %]"  name="B_address" /> 
>      <input id="B_address2" type="text" value="[% BORROWER_INF.B_address2 %]"  name="B_address2" />
> @@ -62,7 +62,7 @@
>  
>  <li><label for="B_city">City:</label> <input id="B_city" type="text" value="[% BORROWER_INF.B_city %]"  name="B_city" /></li>
>  <li><label for="B_state">State:</label> <input id="B_state" type="text" value="[% BORROWER_INF.B_state %]"  name="B_state" /></li>
> -<li><label for="B_zipcode">Zip Code:</label> <input type="text" id="B_zipcode" value="[% BORROWER_INF.B_zipcode %]" name="B_zipcode" /></li>
> +<li><label for="B_zipcode">Zip code:</label> <input type="text" id="B_zipcode" value="[% BORROWER_INF.B_zipcode %]" name="B_zipcode" /></li>
>  <li><label for="B_country">Country:</label> <input type="text" id="B_country" value="[% BORROWER_INF.B_country %]" name="B_country" /></li>
>  <li><label for="B_phone">Phone:</label> <input type="text" id="B_phone" value="[% BORROWER_INF.B_phone %]" name="B_phone" /></li>
>  <li><label for="B_email">Email:</label> <input type="text" id="B_email" value="[% BORROWER_INF.B_email %]" name="B_email" /></li>
> @@ -70,19 +70,19 @@
>  </fieldset>
>  <fieldset class="brief">
>  <ol>
> -<li><label for="dob">Date of Birth: </label> <input id="dob" type="text" size="10" value="[% BORROWER_INF.dateofbirth | $KohaDates %]" name="dateofbirth" /></li>
> +<li><label for="dob">Date of birth: </label> <input id="dob" type="text" size="10" value="[% BORROWER_INF.dateofbirth | $KohaDates %]" name="dateofbirth" /></li>
>  <li><label for="sex">Gender: </label> <select name="sex" id="sex"><option></option>
>  [% IF ( BORROWER_INF.sex == 'F' ) %]<option value="F" selected="selected">Female</option>[% ELSE %]<option value="F">Female</option>[% END %]
>  [% IF ( BORROWER_INF.sex == 'M' ) %]<option value="M" selected="selected">Male</option>[% ELSE %]<option value="M">Male</option>[% END %]
>  </select></li>
>  </ol></fieldset>
>  <fieldset class="brief">
> -<legend>Library Use:</legend>
> +<legend>Library use:</legend>
>  <ol>
>  	<li><label for="cardnumber">Card number:</label><input type="text" id="cardnumber" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.cardnumber %]" /></li>
>      <li><label for="branchname">Home library:</label><input type="text" id="branchname" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.branchname %]" /></li>
> -	<li><label for="borrowernumber">Patron Number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.borrowernumber %]" /></li>
> -	<li><label for="categorycode">Patron Category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.description %] ([% BORROWER_INF.categorycode %])" /></li>
> +    <li><label for="borrowernumber">Patron number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.borrowernumber %]" /></li>
> +    <li><label for="categorycode">Patron category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.description %] ([% BORROWER_INF.categorycode %])" /></li>
>  	<li><label for="dateenrolled">Joined: </label><input type="text" id="dateenrolled" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.dateenrolled | $KohaDates %]" /></li>
>  	<li><label for="dateexpiry">Expires: </label><input type="text" id="dateexpiry" disabled="disabled" readonly="readonly" value="[% BORROWER_INF.dateexpiry | $KohaDates %]" /></li>
>     [% IF ( BORROWER_INF.ExtendedPatronAttributes ) %]
> @@ -111,29 +111,29 @@
>      <img src="/cgi-bin/koha/opac-patron-image.pl" alt="" />
>  </p>[% END %]
>  <fieldset class="rows">
> -<legend>Contact Information</legend>
> +<legend>Contact information</legend>
>  <ol>
>  <li><span class="label">Name:</span> [% BORROWER_INF.firstname %] [% BORROWER_INF.surname %]</li>
> -<li><span class="label">Other Name:</span> [% BORROWER_INF.othernames %]</li>
> +<li><span class="label">Other name:</span> [% BORROWER_INF.othernames %]</li>
>  <li><span class="label">Address:</span> [% BORROWER_INF.streetnumber %] [% BORROWER_INF.address %]</li>
>  <li><span class="label">&nbsp;</span>[% BORROWER_INF.address2 %]</li>
>  <li><span class="label">City:</span>  [% BORROWER_INF.city %]</li>
>  <li><span class="label">State:</span>  [% BORROWER_INF.state %]</li>
> -<li><span class="label">Zip Code:</span>  [% BORROWER_INF.zipcode %]</li>
> +<li><span class="label">Zip code:</span>  [% BORROWER_INF.zipcode %]</li>
>  <li><span class="label">Country:</span>  [% BORROWER_INF.country %]</li>
> -<li><span class="label">Primary Phone:</span>  [% BORROWER_INF.phone %]</li>
> -<li><span class="label">Secondary Phone:</span>  [% BORROWER_INF.mobile %]</li>
> -<li><span class="label">Other Phone:</span>  [% BORROWER_INF.phonepro %]</li>
> +<li><span class="label">Primary phone:</span>  [% BORROWER_INF.phone %]</li>
> +<li><span class="label">Secondary phone:</span>  [% BORROWER_INF.mobile %]</li>
> +<li><span class="label">Other phone:</span>  [% BORROWER_INF.phonepro %]</li>
>  <li><span class="label">Fax:</span>  [% BORROWER_INF.fax %]</li>
> -<li><span class="label">Primary Email:</span>  [% BORROWER_INF.email %]</li>
> -<li><span class="label">Secondary Email:</span>  [% BORROWER_INF.emailpro %]</li>
> +<li><span class="label">Primary email:</span>  [% BORROWER_INF.email %]</li>
> +<li><span class="label">Secondary email:</span>  [% BORROWER_INF.emailpro %]</li>
>  </ol>
>  </fieldset>
>  
>  <fieldset class="rows">
> -<legend>Personal Information</legend>
> +<legend>Personal information</legend>
>  <ol>
> -<li><span class="label">Date of Birth:</span> [% BORROWER_INF.dateofbirth | $KohaDates %]</li>
> +<li><span class="label">Date of birth:</span> [% BORROWER_INF.dateofbirth | $KohaDates %]</li>
>  <li><span class="label">Gender:</span>
>  [% IF ( sex == 'F' ) %]Female[% END %]
>  [% IF ( sex == 'M' ) %]Male[% END %]
> @@ -144,13 +144,13 @@
>  
>  <div class="yui-u">
>  <fieldset class="rows">
> -<legend>Alternate Contact Information</legend>
> +<legend>Alternate contact information</legend>
>  <ol>
> -<li><span class="label">Alternate Address:</span> [% BORROWER_INF.B_streetnumber %] [% BORROWER_INF.B_address %] </li>
> +<li><span class="label">Alternate address:</span> [% BORROWER_INF.B_streetnumber %] [% BORROWER_INF.B_address %] </li>
>  <li><span class="label">&nbsp;</span>[% BORROWER_INF.B_address2 %]</li>
>  <li><span class="label">City:</span> [% BORROWER_INF.B_city %]</li>
>  <li><span class="label">State:</span> [% BORROWER_INF.B_state %]</li>
> -<li><span class="label">Zip Code:</span> [% BORROWER_INF.B_zipcode %]</li>
> +<li><span class="label">Zip code:</span> [% BORROWER_INF.B_zipcode %]</li>
>  <li><span class="label">Country:</span> [% BORROWER_INF.B_country %]</li>
>  <li><span class="label">Phone:</span> [% BORROWER_INF.B_phone %]</li>
>  <li><span class="label">Email:</span> [% BORROWER_INF.B_email %]</li>
> @@ -158,12 +158,12 @@
>  </fieldset>
>  
>  <fieldset class="rows">
> -<legend>Library Use:</legend>
> +<legend>Library use:</legend>
>  <ol>
>  <li><span class="label">Card number:</span> [% BORROWER_INF.cardnumber %]</li>
>  <li><span class="label">Home library:</span> [% BORROWER_INF.branchname %]</li>
> -<li><span class="label">Patron Number:</span> [% BORROWER_INF.borrowernumber %]</li>
> -<li><span class="label">Patron Category:</span> [% BORROWER_INF.description %] ([% BORROWER_INF.categorycode %])</li>
> +<li><span class="label">Patron number:</span> [% BORROWER_INF.borrowernumber %]</li>
> +<li><span class="label">Patron category:</span> [% BORROWER_INF.description %] ([% BORROWER_INF.categorycode %])</li>
>  <li><span class="label">Joined:</span> [% BORROWER_INF.dateenrolled | $KohaDates %]</li>
>  <li><span class="label">Expires:</span> [% BORROWER_INF.dateexpiry | $KohaDates %]</li>
>     [% IF ( BORROWER_INF.ExtendedPatronAttributes ) %]
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
> index ba52fcd..df4f0d3 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt
> @@ -1,4 +1,4 @@
> -[% INCLUDE 'doc-head-open.inc' %][% LibraryName %] &rsaquo; Self Checkout</title>
> +[% INCLUDE 'doc-head-open.inc' %][% LibraryName %] &rsaquo; Self checkout</title>
>  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>  <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
>  <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
> @@ -10,7 +10,7 @@
>    <div id="bd">
>      <div class="yui-g">
>  
> -<h1>Self Checkout Help</h1>
> +<h1>Self checkout help</h1>
>  
>  [% IF ( SelfCheckHelpMessage ) %]
>  <div id="selfcheckhelpmessage">
> @@ -22,21 +22,21 @@
>  is not behaving as expected, you may want to refer to this guide to get
>  yourself started.</p>
>  
> -<h3>Step One: Enter your user id[% IF ( SelfCheckoutByLogin ) %] and password[% END %]</h3>
> +<h3>Step one: Enter your user id[% IF ( SelfCheckoutByLogin ) %] and password[% END %]</h3>
>  <p>Enter your User ID[% IF ( SelfCheckoutByLogin ) %] and password[% END %], and click the 
>  submit button (or press the enter key).</p>
>  
> -<h3>Step Two: Scan the barcode for each item, one at a time</h3>
> +<h3>Step two: Scan the barcode for each item, one at a time</h3>
>  <p>Scan each item and wait for the page to reload before scanning the next item.
>  The checked-out item should appear in your checkouts list.
>  The Submit button only needs to be clicked if you enter the barcode manually.</p>
>  
> -<h3>Step Three: Click the 'Finish' button</h3>
> +<h3>Step three: Click the 'Finish' button</h3>
>  <p>If you do not click the 'Finish' button, your session will automatically expire in
>  [% SelfCheckTimeout %] seconds.</p>
>  
>      <div class="button">
> -        <a href="javascript:history.go(-1)">Return to the Self-Checkout</a>
> +        <a href="javascript:history.go(-1)">Return to the self-checkout</a>
>      </div>
>  
>  </div></div></div>
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
> index 9f8f634..adf6dc1 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
> @@ -1,6 +1,6 @@
> -[% USE KohaDates %]
> +[% use KohaDates %]
>  
> -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self Checkout </title>
> +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>
>  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>  <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
>  <link rel="shortcut icon" href="[% themelang %]/includes/favicon.ico" type="image/x-icon" />
> @@ -67,7 +67,7 @@ $(document).ready(function() {
>  
>  <div id="doc" class="yui-t7">
>  
> -<div id="masthead"><h1>[% LibraryName %] Self Checkout System</h1></div>
> +<div id="masthead"><h1>[% LibraryName %] Self checkout system</h1></div>
>  <div id="bd">
>  
>  [% IF ( impossible ) %]<!-- We tried to issue, but failed. -->
> @@ -130,22 +130,22 @@ $(document).ready(function() {
>  <input type="hidden" name="confirmed" value="" />
>  [% IF ( renew ) %]
>  [% IF ( AllowSelfCheckReturns ) %]
> -<input type="button" value="Return Item" name="confirm" class="return" onclick="this.form.op.value='returnbook';this.form.submit();"  />
> +<input type="button" value="Return item" name="confirm" class="return" onclick="this.form.op.value='returnbook';this.form.submit();"  />
>  [% END %]
>  [% END %]
> -[% UNLESS ( renew ) %]<input type="button" value="Renew Item" name="confirm" class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />
> -[% ELSE %]<input type="button" value="Renew Item" class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />[% END %]
> +[% UNLESS ( renew ) %]<input type="button" value="Renew item" name="confirm" class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />
> +[% ELSE %]<input type="button" value="Renew item" class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />[% END %]
>  <input type="button" value="Cancel" class="cancel" onclick="this.form.op.value='';this.form.submit();return true;"  />
>  </form>
>  </div>
>  [% END %]
>  
> -[% IF ( nopermission ) %]<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Access Denied</h3>
> -Sorry, This Self-Checkout Station has lost authentication.  Please contact the administrator to resolve this problem. </div>
> +[% IF ( nopermission ) %]<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Access denied</h3>
> +Sorry, this self-checkout station has lost authentication.  Please contact the administrator to resolve this problem. </div>
>  [% END %]
>  [% IF ( timed_out ) %]<!-- This is what is displayed if login has timed out -->
>  <div class="dialog alert"><h3>Session timed out</h3>Sorry, your session has timed out, please log in again.</div>[% END %]
> -[% IF ( different_ip ) %]<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Session Lost</h3>You are accessing Self-Checkout from a different IP address! please log in again.</div>[% END %]
> +[% IF ( different_ip ) %]<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Session lost</h3>You are accessing self-checkout from a different IP address! please log in again.</div>[% END %]
>  [% IF ( invalid_username_or_password ) %]
>  <!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Record not found</h3><p>Your userid was not found in the database.  Please try again.</p></div>[% END %]
>  
> @@ -153,7 +153,7 @@ Sorry, This Self-Checkout Station has lost authentication.  Please contact the a
>  [% UNLESS ( hide_main ) %]
>  	<div class="sco_head">
>  	[% UNLESS ( validuser ) %] 
> -	<h3>Self Checkout</h3>
> +    <h3>Self checkout</h3>
>  	[% END %]
>  
>  	<div id="checkouthelp">
> @@ -202,7 +202,7 @@ Sorry, This Self-Checkout Station has lost authentication.  Please contact the a
>  	<table id="loanTable"><caption>Checkouts for [% borrowername %] <span class="count">([% issues_count %] total)</span></caption>
>  	<!-- ISSUES TABLE ROWS -->
>      <thead>
> -	<tr><th>Title</th><th>Call No.</th><th>Due</th><th>Renew</th>[% UNLESS ( nofines ) %]<th>Fines</th>[% END %]</tr>
> +        <tr><th>Title</th><th>Call no.</th><th>Due</th><th>Renew</th>[% UNLESS ( nofines ) %]<th>Fines</th>[% END %]</tr>
>      </thead>
>  
>      <tbody>


From oleonard at myacpl.org  Thu Apr  5 17:19:44 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  5 Apr 2012 11:19:44 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Error pages)
Message-ID: <1333639184-6282-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in staff client error pages
---
 .../intranet-tmpl/prog/en/modules/errors/400.tt    |    6 +++---
 .../intranet-tmpl/prog/en/modules/errors/401.tt    |    6 +++---
 .../intranet-tmpl/prog/en/modules/errors/402.tt    |    6 +++---
 .../intranet-tmpl/prog/en/modules/errors/403.tt    |    6 +++---
 .../intranet-tmpl/prog/en/modules/errors/404.tt    |    6 +++---
 .../intranet-tmpl/prog/en/modules/errors/405.tt    |    6 +++---
 .../intranet-tmpl/prog/en/modules/errors/500.tt    |    6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt
index b82ae04..be2f09f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/400.tt
@@ -14,11 +14,11 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-    <h1>An Error has Occurred!</h1>
+    <h1>An error has occurred!</h1>
     <h2>Error 400</h2>
     <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
     <li>This error means that the link was broken and that the page doesn't exist</li>	
-    <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha Administrator</a>.</li>
+    <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
     <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
@@ -73,7 +73,7 @@
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt
index 3097a9e..6eb1423 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/401.tt
@@ -14,11 +14,11 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-    <h1>An Error has Occurred!</h1>
+    <h1>An error has occurred!</h1>
     <h2>Error 401</h2>
     <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
         <li>This error means that you aren't authorized to view this page</li>	
-        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha Administrator</a>.</li>
+        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
@@ -73,7 +73,7 @@
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt
index 20c9032..fa035dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/402.tt
@@ -14,11 +14,11 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-    <h1>An Error has Occurred!</h1>
+    <h1>An error has occurred!</h1>
     <h2>Error 402</h2>
     <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
         <li>This error means that the link was broken and that the page doesn't exist</li>	
-        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha Administrator</a>.</li>
+        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
@@ -73,7 +73,7 @@
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt
index 4f8e68a..82b8f82 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/403.tt
@@ -14,11 +14,11 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-    <h1>An Error has Occurred!</h1>
+    <h1>An error has occurred!</h1>
     <h2>Error 403</h2>
     <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
     <li>This error means that the link was broken and that the page doesn't exist</li>	
-    <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha Administrator</a>.</li>
+    <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
     <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
@@ -73,7 +73,7 @@
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt
index 7416333..7d4485d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/404.tt
@@ -14,11 +14,11 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-    <h1>An Error has Occurred!</h1>
+    <h1>An error has occurred!</h1>
     <h2>Error 404</h2>
     <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
         <li>This error means that the link was broken and that the page doesn't exist</li>	
-        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha Administrator</a>.</li>
+        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
@@ -73,7 +73,7 @@
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt
index 88e0693..4e479c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/405.tt
@@ -14,11 +14,11 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-    <h1>An Error has Occurred!</h1>
+    <h1>An error has occurred!</h1>
     <h2>Error 405</h2>
     <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
         <li>This error means that the link was broken and that the page doesn't exist</li>	
-        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha Administrator</a>.</li>
+        <li>To report this error, you can <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
@@ -73,7 +73,7 @@
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt
index 7cc7b57..3de3563 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/500.tt
@@ -14,11 +14,11 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
-    <h1>An Error has Occurred!</h1>
+    <h1>An error has occurred!</h1>
     <h2>Error 500</h2>
     <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
         <li>In Koha this typically means that the Koha team is working on new features</li>	
-        <li>Wait while system maintenance is being done or <a href="mailto:[% admin %]">email the Koha Administrator</a>.</li>
+        <li>Wait while system maintenance is being done or <a href="mailto:[% admin %]">email the Koha administrator</a>.</li>
         <li>Use top menu bar to navigate to another part of Koha.</li>
     </ul>
 </div>
@@ -73,7 +73,7 @@
     [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
     <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
 	<ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;">
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     </ul>
-- 
1.7.5.4


From oleonard at myacpl.org  Thu Apr  5 18:03:37 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  5 Apr 2012 12:03:37 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Acqui help)
Message-ID: <1333641817-7219-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Acquisitions help templates
---
 .../prog/en/modules/help/acqui/acqcontract.tt      |    8 +++---
 .../prog/en/modules/help/acqui/acqui-home.tt       |    8 +++---
 .../prog/en/modules/help/acqui/basket.tt           |   20 +++++++++---------
 .../prog/en/modules/help/acqui/basketgroup.tt      |    4 +-
 .../prog/en/modules/help/acqui/basketheader.tt     |    6 ++--
 .../prog/en/modules/help/acqui/booksellers.tt      |   14 ++++++------
 .../prog/en/modules/help/acqui/histsearch.tt       |   14 ++++++------
 .../prog/en/modules/help/acqui/lateorders.tt       |    8 +++---
 .../prog/en/modules/help/acqui/neworderbiblio.tt   |    4 +-
 .../prog/en/modules/help/acqui/neworderempty.tt    |    4 +-
 .../en/modules/help/acqui/newordersuggestion.tt    |    4 +-
 .../prog/en/modules/help/acqui/orderreceive.tt     |    4 +-
 .../prog/en/modules/help/acqui/parcel.tt           |    4 +-
 .../prog/en/modules/help/acqui/parcels.tt          |    4 +-
 .../prog/en/modules/help/acqui/supplier.tt         |   22 ++++++++++----------
 .../prog/en/modules/help/acqui/z3950_search.tt     |    2 +-
 16 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
index befb3fc..4d0cd59 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
@@ -1,12 +1,12 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Vendor Contracts</h1>
+<h1>Vendor contracts</h1>
 
 <p>You can define contracts (with a start and end date) and attach it to a vendor. This is used so that at the end of the year you can see how much you spent on a specific contract with a vendor. In some places, contracts are set up with a minimum and maximum yearly amount.</p>
 
-<h2>Add a Contract</h2>
+<h2>Add a contract</h2>
 
-<p>At the top of a vendor search results page with only result or at the top of a vendor information page you will see a 'New Contract' button.</p>
+<p>At the top of a vendor search results page with only result or at the top of a vendor information page you will see a 'New contract' button.</p>
 
 <p>The contract form will ask for some very basic information about the contract.</p>
 
@@ -16,6 +16,6 @@
 
 <p>It will also be an option when creating a basket.</p>
 
-<p><strong>See the full documentation for Vendor Contracts in the <a href="http://manual.koha-community.org/3.6/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for vendor contracts in the <a href="http://manual.koha-community.org/3.6/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
index 0b3e484..85ed10f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
@@ -2,12 +2,12 @@
 
 <h1>Acquisitions</h1>
 
-<p>The Koha Acquisitions module provides a way where the library can record orders placed with vendors and manage purchase budgets.</p>
+<p>The Koha acquisitions module provides a way where the library can record orders placed with vendors and manage purchase budgets.</p>
 
-<p>You do not need to use Acquisitions to add items to your catalog, Acquisitions is used only to track vendors and spending against your budgets.</p>
+<p>You do not need to use acquisitions to add items to your catalog, acquisitions is used only to track vendors and spending against your budgets.</p>
 
-<p>Before using the Acquisitions Module you will want to make sure that you have completed all of the set up.</p>
+<p>Before using the acquisitions module you will want to make sure that you have completed all of the set up.</p>
 
-<p>First, set your Acquisitions System Preferences and Acquisitions Administration to match your library's workflow.</p>
+<p>First, set your acquisitions system preferences and acquisitions administration to match your library's workflow.</p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
index 962b593..4a6967c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h2>Placing an Order</h2>
+<h2>Placing an order</h2>
 
 <p>Once your basket is created you are presented with several options for adding items to the order.</p>
 
@@ -18,7 +18,7 @@
 <ul>
 	<li>
 <ul>
-	<li>From this form you can make changes to the Catalog Details if necessary</li>
+    <li>From this form you can make changes to the catalog details if necessary</li>
 </ul>
 </li>
 </ul>
@@ -30,10 +30,10 @@
 </li>
 	<li>If you want to search other libraries for an item to purchase you can use the 'From an external source' option which will allow you to order from a MARC record found via a Z39.50 search
 <ul>
-	<li>From the results click the Order link next to the item you want to purchase</li>
-	<li>If the item you're ordering from an external source looks like it might be a duplicate, Koha will warn you and give you options on how to proceed
+    <li>From the results click the 'Order' link next to the item you want to purchase</li>
+    <li>If the item you're ordering from an external source looks like it might be a duplicate, Koha will warn you and give you options on how to proceed
 <ul>
-	<li>From the warning you can choose to just order another copy on the existing bib record, create a new bib record, or cancel your order of this item.</li>
+    <li>From the warning you can choose to just order another copy on the existing bib record, create a new bib record, or cancel your order of this item.</li>
 </ul>
 </li>
 	<li>In the order form that pops up you will not be able to edit the catalog details</li>
@@ -65,7 +65,7 @@
 	<li>A basket with at least one uncertain price can't be closed</li>
 </ul>
 </li>
-	<li>If you added Planning Values when creating the Fund those values will appear in the two planning value fields</li>
+    <li>If you added planning values when creating the fund those values will appear in the two planning value fields</li>
 </ul>
 
 <p>Once an item is added to the basket you will be presented with a basket summary.</p>
@@ -78,13 +78,13 @@
 
 <p style="color: #ff0000">Important: A basket with at least one items marked as 'uncertain price' will not be able to be closed</p>
 
-<p>Clicking the 'Uncertain Prices' button will up a list of items with uncertain prices to quick editing.</p>
+<p>Clicking the 'Uncertain prices' button will up a list of items with uncertain prices to quick editing.</p>
 
 <p style="color: #ff0000">Important: The Uncertain Prices page is independent of the basket, it is linked to the vendor, so you will see all items on order for this vendor with uncertain prices.</p>
 
-<h2>Printing Baskets</h2>
+<h2>Printing baskets</h2>
 
-<p>When you are finished adding items to your basket you want to click 'Close this Basket'</p>
+<p>When you are finished adding items to your basket you want to click 'Close this basket'</p>
 
 <p>You will be asked if you want to create a purchase order at this time.</p>
 
@@ -92,6 +92,6 @@
 
 <p>Clicking 'Print' below your order will generate a PDF for printing. The PDF will have all of your library information followed by the items in your order.</p>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
index 9ea5dae..093552e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Basket Groups</h1>
+<h1>Basket groups</h1>
 
 <p>A basket group is a group of closed baskets that you can perform actions on.</p>
 
@@ -8,7 +8,7 @@
 
 <p>A basket group is simply a group of baskets. In some libraries, you have several staff members that create baskets, and, at the end of a period of time, someone then groups them together to send to the vendor in bulk. That said, it is possible to have one basket in a basket group if that's the workflow used in your library.</p>
 
-<p><strong>See the full documentation for Basket Groups in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#acqbasketgroup">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for basket groups in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#acqbasketgroup">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
index 643ba6c..1fe4e87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h2>Adding a Basket</h2>
+<h2>Adding a basket</h2>
 
 <p>When adding a basket you want to give it a name that will help you identify it later. The notes fields are optional and can contain any type of information.</p>
 
@@ -8,11 +8,11 @@
 
 <p>When finished, click 'Save'</p>
 
-<h2>Editing Basket Headers</h2>
+<h2>Editing basket headers</h2>
 
 <p>After creating your basket you can edit the name of the basket, the notes associated with it and the contract you're ordering against.</p>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
index 18ba94d..1a75807 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
@@ -1,19 +1,19 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Acquisitions Searching</h1>
+<h1>Acquisitions searching</h1>
 
-<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a Vendor Search or an Order Search.</p>
+<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a vendor search or an order search.</p>
 
-<p>In the Vendor Search you can enter any part of the vendor name to get results.</p>
+<p>In the vendor search you can enter any part of the vendor name to get results.</p>
 
-<p>Using the Orders Search you can search for items that have been ordered with or without the vendor.</p>
+<p>Using the orders search you can search for items that have been ordered with or without the vendor.</p>
 
 <p>You can enter info in one or both fields and you can enter any part of the title and/or vendor name.</p>
 
-<p>Clicking the plus sign to the right of the Vendor search box will expand the search and allow you to search for additional fields.</p>
+<p>Clicking the plus sign to the right of the vendor search box will expand the search and allow you to search for additional fields.</p>
 
-<p>Clicking Advanced Search to the right of the search button will give you all of the order search options available.</p>
+<p>Clicking "Advanced search" to the right of the search button will give you all of the order search options available.</p>
 
-<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.6/en/acqsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for acquisitions searching in the <a href="http://manual.koha-community.org/3.6/en/acqsearch.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
index 0325343..8432692 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
@@ -1,20 +1,20 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Acquisitions Searching</h1>
+<h1>Acquisitions searching</h1>
 
-<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a Vendor Search or an Order Search.</p>
+<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a vendor search or an order search.</p>
 
-<p>In the Vendor Search you can enter any part of the vendor name to get results.</p>
+<p>In the vendor search you can enter any part of the vendor name to get results.</p>
 
-<p>Using the Orders Search you can search for items that have been ordered with or without the vendor.</p>
+<p>Using the orders search you can search for items that have been ordered with or without the vendor.</p>
 
 <p>You can enter info in one or both fields and you can enter any part of the title and/or vendor name.</p>
 
-<p>Clicking the plus sign to the right of the Vendor search box will expand the search and allow you to search for additional fields.</p>
+<p>Clicking the plus sign to the right of the vendor search box will expand the search and allow you to search for additional fields.</p>
 
-<p>Clicking Advanced Search to the right of the search button will give you all of the order search options available.</p>
+<p>Clicking "Advanced search" to the right of the search button will give you all of the order search options available.</p>
 
-<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.6/en/acqsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for acquisitions searching in the <a href="http://manual.koha-community.org/3.6/en/acqsearch.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
index 35fbfec..f02522d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
@@ -1,17 +1,17 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Claims &amp; Late Orders</h1>
+<h1>Claims &amp; late orders</h1>
 
 <p>If you have entered in an email address for the vendors in your system you can send them claim emails when an order is late. Before you can send claims you will need to set up an acquisitions claim notice.</p>
 
-<p>Upon clicking on the link to 'Late Orders' from the Acquisitions page you will be presented with a series of filter options on the left hand side.</p>
+<p>Upon clicking on the link to 'Late orders' from the Acquisitions page you will be presented with a series of filter options on the left hand side.</p>
 
 <p>Once you filter your orders to show you the things you consider to be late you will be presented with a list of these items.</p>
 
-<p>To the right of each late title you will be see a checkbox. Check off the ones you want a claim letter sent to and click 'Claim Order.' This will automatically send an email to the vendor at the email address you have on file.</p>
+<p>To the right of each late title you will be see a checkbox. Check off the ones you want a claim letter sent to and click 'Claim order.' This will automatically send an email to the vendor at the email address you have on file.</p>
 
 <p>If you would rather use a different acquisition claim letter (other than the default) you can create that in the notices module and choose it from the menu above the list of late items.</p>
 
-<p><strong>See the full documentation for Claims and Late Orders in the <a href="http://manual.koha-community.org/3.6/en/acqclaims.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for claims and late orders in the <a href="http://manual.koha-community.org/3.6/en/acqclaims.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
index f6bb51f..5ebeccd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Order from an Existing Record</h1>
+<h1>Order from an existing record</h1>
 
 <p>If you are ordering another copy of an existing item, you can simply search for the record in your system</p>
 
@@ -12,6 +12,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
index cda0a88..bd65b41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Order from a New Empty Record</h1>
+<h1>Order from a new empty record</h1>
 
 <p>To order from a record that can't be found anywhere else, choose the 'From a new (empty) record'</p>
 
@@ -8,6 +8,6 @@
 	<li>You will be presented with an empty form to fill in all of the necessary details about the item you are ordering</li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
index 8c5ad12..3e7dbe1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
@@ -1,11 +1,11 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Order from Purchase Suggestion</h1>
+<h1>Order from purchase suggestion</h1>
 
 <p>If you allow patrons to make purchase suggestions then you can place orders from those suggestions</p>
 
 <ul>
-	<li>From this form you can make changes to the Catalog Details if necessary</li>
+    <li>From this form you can make changes to the catalog details if necessary</li>
 </ul>
 
 <p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
index ac62220..a2bd19d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Receiving Orders</h1>
+<h1>Receiving orders</h1>
 
 <p>Orders can be received from the vendor information page or the vendor search results page.</p>
 
@@ -14,6 +14,6 @@
 
 <p>You will also see that the item is received if you view the basket.</p>
 
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
index ac62220..14d0c96 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Receiving Orders</h1>
+<h1>Receiving orders</h1>
 
 <p>Orders can be received from the vendor information page or the vendor search results page.</p>
 
@@ -14,6 +14,6 @@
 
 <p>You will also see that the item is received if you view the basket.</p>
 
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for receiving orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
index ac62220..14d0c96 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Receiving Orders</h1>
+<h1>Receiving orders</h1>
 
 <p>Orders can be received from the vendor information page or the vendor search results page.</p>
 
@@ -14,6 +14,6 @@
 
 <p>You will also see that the item is received if you view the basket.</p>
 
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for receiving orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
index ef3eb1c..e24b13d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
@@ -4,19 +4,19 @@
 
 <p>Before any orders can be places you must first enter at least one vendor.</p>
 
-<h2>Add a Vendor</h2>
+<h2>Add a vendor</h2>
 
-<p>To add a vendor click the 'New Vendor' button on the Acquisitions page.</p>
+<p>To add a vendor click the 'New vendor' button on the Acquisitions page.</p>
 
 <p>The vendor add form is broken into three pieces.</p>
 
 <ul>
-	<li>The first section is for basic information about the Vendor
+    <li>The first section is for basic information about the vendor
 <ul>
-	<li>Of these fields, only the Vendor name is required, the rest of the information should be added to help with generating claim letters and invoices</li>
+    <li>Of these fields, only the vendor name is required, the rest of the information should be added to help with generating claim letters and invoices</li>
 </ul>
 </li>
-	<li>The second section is for information regarding your contact at the Vendor's office
+    <li>The second section is for information regarding your contact at the vendor's office
 <ul>
 	<li>None of these fields are required, they should only be entered if you want to keep track of your contact's information within Koha</li>
 </ul>
@@ -24,12 +24,12 @@
 	<li>The final section is for billing information
 <ul>
 	<li>To be able to order from a vendor you must make them 'Active'</li>
-	<li>For List Prices and Invoice Prices choose the currency
+    <li>For list prices and invoice prices choose the currency
 <ul>
-	<li>Currencies are assigned in the Currencies &amp; Exchange Rates admin area</li>
+    <li>Currencies are assigned in the Currencies &amp; Exchange rates admin area</li>
 </ul>
 </li>
-	<li>If the vendor offers a consistent blank discount, enter that in the 'Discount' field
+    <li>If the vendor offers a consistent blank discount, enter that in the 'Discount' field
 <ul>
 	<li>You can enter item specific discounts when placing an order</li>
 </ul>
@@ -40,14 +40,14 @@
 </li>
 </ul>
 
-<h2>View/Edit a Vendor</h2>
+<h2>View/Edit a vendor</h2>
 
-<p>To view a vendor's information page you must search for the vendor from the Acquisitions home page. Your search can be for any part of the Vendor's name.</p>
+<p>To view a vendor's information page you must search for the vendor from the Acquisitions home page. Your search can be for any part of the vendor's name.</p>
 
 <p>From the results, click on the name of the vendor you want to view or edit.</p>
 
 <p>To make changes to the vendor, simply click the 'Edit' button.</p>
 
-<p><strong>See the full documentation for managing Vendors in the <a href="http://manual.koha-community.org/3.6/en/acqvendors.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for managing vendors in the <a href="http://manual.koha-community.org/3.6/en/acqvendors.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
index bc8216a..7afff73 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Order from an External Source</h1>
+<h1>Order from an external source</h1>
 
 <p>If you want to search other libraries for an item to purchase you can use the 'From an external source' option which will allow you to order from a MARC record found via a Z39.50 search</p>
 
-- 
1.7.5.4


From oleonard at myacpl.org  Thu Apr  5 20:55:24 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  5 Apr 2012 14:55:24 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_2780_-_Capitalize_string?=
	=?utf-8?q?s_consistently_=28Admin_help=29?=
Message-ID: <1333652124-9379-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Administration help templates
---
 .../prog/en/modules/help/admin/admin-home.tt       |   12 +++---
 .../prog/en/modules/help/admin/aqbudgetperiods.tt  |   10 ++--
 .../prog/en/modules/help/admin/aqbudgets.tt        |   14 +++---
 .../prog/en/modules/help/admin/aqplan.tt           |    4 +-
 .../modules/help/admin/auth_subfields_structure.tt |   20 +++++-----
 .../en/modules/help/admin/auth_tag_structure.tt    |    8 ++--
 .../en/modules/help/admin/authorised_values.tt     |   34 ++++++++--------
 .../prog/en/modules/help/admin/authtypes.tt        |    6 +-
 .../prog/en/modules/help/admin/biblio_framework.tt |   26 ++++++------
 .../modules/help/admin/branch_transfer_limits.tt   |    4 +-
 .../prog/en/modules/help/admin/branches.tt         |   20 +++++-----
 .../prog/en/modules/help/admin/categorie.tt        |    8 ++--
 .../prog/en/modules/help/admin/checkmarc.tt        |    6 +-
 .../prog/en/modules/help/admin/cities.tt           |   10 ++--
 .../prog/en/modules/help/admin/classsources.tt     |   20 +++++-----
 .../prog/en/modules/help/admin/currency.tt         |    4 +-
 .../prog/en/modules/help/admin/fieldmapping.tt     |    4 +-
 .../modules/help/admin/item_circulation_alerts.tt  |    4 +-
 .../prog/en/modules/help/admin/itemtypes.tt        |   22 +++++-----
 .../prog/en/modules/help/admin/koha2marclinks.tt   |   10 ++--
 .../modules/help/admin/marc_subfields_structure.tt |   16 ++++----
 .../prog/en/modules/help/admin/marctagstructure.tt |    8 ++--
 .../prog/en/modules/help/admin/matching-rules.tt   |   10 ++--
 .../prog/en/modules/help/admin/oai_set_mappings.tt |    2 +-
 .../prog/en/modules/help/admin/oai_sets.tt         |    2 +-
 .../en/modules/help/admin/patron-attr-types.tt     |   12 +++---
 .../prog/en/modules/help/admin/preferences.tt      |   12 +++---
 .../prog/en/modules/help/admin/printers.tt         |    2 +-
 .../prog/en/modules/help/admin/roadtype.tt         |    8 ++--
 .../prog/en/modules/help/admin/smart-rules.tt      |   42 ++++++++++----------
 .../prog/en/modules/help/admin/stopwords.tt        |    6 +-
 .../prog/en/modules/help/admin/z3950servers.tt     |   10 ++--
 32 files changed, 188 insertions(+), 188 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
index b256280..fc17c03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Administration Help</h1>
+<h1>Administration help</h1>
 
 <p>The administration area is where you set all of your preferences for the system. Preference are broken down into several categories.</p>
 
-<h3>Global System Preferences</h3>
+<h3>Global system preferences</h3>
 
 <p>Koha has an extensive set of system preferences. The system preferences control all the various features within Koha and whether they are active in your install or not. System preferences are generally set once at install and then not changed.</p>
 
@@ -12,13 +12,13 @@
 
 <p style="color: #990000">IMPORTANT: many preferences interact with each other. Turning on one system preference may require that others are also set.</p>
 
-<h3>Basic Parameters</h3>
+<h3>Basic parameters</h3>
 
 <p>Basic parameters is where library policies are set and governed. It is best to set your system preferences, and then to work through the Basic Parameters in the order that they appear on this page.</p>
 
 <p>Note not all basic parameters are required to be set. For example if you do not plan to use budget based acquisitions, then Accounts and Budgets, Currencies and Exchange Rates can be ignored.</p>
 
-<h3>Patrons and Circulation</h3>
+<h3>Patrons and circulation</h3>
 
 <p>These parameters help with the control of patron records and circulation rules.  It is best to make sure you set the basic parameters before visiting this section.</p>
 
@@ -26,10 +26,10 @@
 
 <p>Catalog parameters assist in configuring the cataloging functionality within Koha.  
 
-<h3>Additional Parameters</h3>
+<h3>Additional parameters</h3>
 
 <p>This list of parameters includes functionality that didn't fit in any other category.  These items are optional and may not need to be altered depending on how your library is using Koha.</p>
 <p>
-<p><strong>See the full documentation for system Administration in the <a href="http://manual.koha-community.org/3.6/en/administration.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for system administration in the <a href="http://manual.koha-community.org/3.6/en/administration.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
index 5d362e8..86b8372 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
@@ -4,22 +4,22 @@
 
 <p>Budgets are the top level used for tracking accounting values related to acquisitions.</p>
 
-<p>An example would be to create a budget for the current year and then breaking that into Funds for different areas of the library.</p>
+<p>An example would be to create a budget for the current year and then breaking that into funds for different areas of the library.</p>
 
 <h2>Add a budget</h2>
 
-<p>To add a budget click the 'New Budget' button.</p>
+<p>To add a budget click the 'New budget' button.</p>
 
 <ul>
 	<li>Choose the time period this budget is for, whether it's an academic year, a fiscal year, a quarter, etc.</li>
-	<li>The Description should be something that will help you identify the budget when ordering</li>
+    <li>The description should be something that will help you identify the budget when ordering</li>
 	<li>In the amount box do not use any symbols, simply enter the amount of the budget with numbers and decimals.</li>
 	<li>Marking a budget active makes it usable when placing orders in the acquisitions module, even if the order is placed after the budget end date. This will allow you to record orders that were places in a previous budget period.</li>
 	<li>Locking a budget means that Funds will not be able to be modified by librarians</li>
 </ul>
 
-<p>Once you have made your edits, click the 'Save Changes' button. You will be brought to a list of your existing budgets.</p>
+<p>Once you have made your edits, click the 'Save changes' button. You will be brought to a list of your existing budgets.</p>
 
-<p><strong>See the full documentation for Budgets in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#budgetplanning">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for budgets in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#budgetplanning">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
index 08133af..bfb5402 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
@@ -4,33 +4,33 @@
 
 <p>Budgets are broken into funds.</p>
 
-<h2>Add a Fund</h2>
+<h2>Add a fund</h2>
 
 <p>A fund is added to a budget.</p>
 
 <p style="color: #990000;">Important: A budget must be defined before a fund can be created.</p>
 
-<p>To add a new fund click the New button and then choose which Budget you would like to add the fund to.</p>
+<p>To add a new fund click the New button and then choose which budget you would like to add the fund to.</p>
 
 <p>In the form that appears you wan to enter the basics about your fund.</p>
 
 <p>The three first fields are required, the rest are optional</p>
 
 <ul>
-	<li>Fund Code is a unique identifier for your fund</li>
-	<li>The Fund Name should be something that librarians will understand</li>
+    <li>Fund code is a unique identifier for your fund</li>
+    <li>The fund name should be something that librarians will understand</li>
 	<li>Amount should be entered with only numbers and decimals, no other characters</li>
 	<li>You can choose to assign this fund to a librarian. Doing so will make it so that only that librarian can make changes to the Fund</li>
 	<li>Choose which library will be using this fund</li>
 	<li>You can restrict who can order from this fund by choosing either the owner or the library from the 'Restrict access to' menu</li>
 	<li>Notes are simply for any descriptive notes you might want to add so that librarians know when to use this fund</li>
-	<li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the Planning Category FAQ.</li>
+    <li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the <a href="http://manual.koha-community.org/3.6/en/acqfaq.html#planningcatfaq">planning category FAQ</a>.</li>
 </ul>
 
 <p>When complete, click 'Submit' and you will be brought to a list of all of the funds for the budget.</p>
 
-<p>To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add Child Fund' options. A child fund simply a sub-fund of the fund listed. An example would be to have a fund for 'Fiction' and under that have a fund for 'New Releases' and a fund for 'Science Fiction.' It is an optional way to further organize your finances.</p>
+<p>To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add child fund' options. A child fund simply a sub-fund of the fund listed. An example would be to have a fund for 'Fiction' and under that have a fund for 'New releases' and a fund for 'Science fiction.' It is an optional way to further organize your finances.</p>
 
-<p><strong>See the full documentation for Funds in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#funds">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for funds in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#funds">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
index 2518ced..2fac044 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Budget Planning</h1>
+<h1>Budget planning</h1>
 
 <p>When viewing the list of funds click the 'Planning' button and choose how you would like to plan to spend your budget.</p>
 
@@ -12,6 +12,6 @@
 
 <p>Once your changes are made, click the 'Save' button. If you would like to export your data as a CSV file you can do so by entering a file name in the 'Output to a file named' field and clicking the 'Output' button.</p>
 
-<p><strong>See the full documentation for Budget Planning in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#fundsplanning">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Budget planning in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#fundsplanning">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
index 282b96a..6e68cf2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC Record Subfields</h1>
+<h1>MARC record subfields</h1>
 
-<p>Frameworks are made up of MARC fields and subfields. To make edits to most Frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
+<p>Frameworks are made up of MARC fields and subfields. To make edits to most frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
 
 <ul>
 	<li>Each field has a tag (which is the MARC tag)
@@ -12,7 +12,7 @@
 	<li>If you check 'Repeatable' then the field will have a plus sign next to it allowing you to add multiples of that tag</li>
 	<li>If you check 'Mandatory' the record will not be allowed to save unless you have a value assigned to this tag</li>
 	<li>'Authorized value' is where you define an authorized value that your catalogers can choose from a pull down to fill this field in
-To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC Structure' listing</li>
+To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC structure' listing</li>
 </ul>
 </li>
 	<li>From the list of subfields you can click 'Delete' to the right of each to delete the subfields</li>
@@ -79,21 +79,21 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 	<li>9 =&gt; Future use</li>
 </ul>
 </li>
-	<li>( ! means 'not visible' or in the case of Collapsed 'not Collapsed')</li>
+    <li>( ! means 'not visible' or in the case of 'collapsed,' 'not collapsed')</li>
 </ul>
 </li>
 </ul>
 <ul>
-	<li>Is a url
+    <li>Is a URL
 <ul>
-	<li>if checked, it means that the subfield is a url and can be clicked</li>
+    <li>if checked, it means that the subfield is a URL and can be clicked</li>
 </ul>
 </li>
 </ul>
 <ul>
 	<li>Link
 <ul>
-	<li>If you enter a field/subfield here (200b), a link appears after the subfield in the MARC Detail view. This view is present only in the staff client, not the OPAC. If the librarian clicks on the link, a search is done on the database for the field/subfield with the same value. This can be used for 2 main topics :
+    <li>If you enter a field/subfield here (200b), a link appears after the subfield in the MARC detail view. This view is present only in the staff client, not the OPAC. If the librarian clicks on the link, a search is done on the database for the field/subfield with the same value. This can be used for 2 main topics :
 <ul>
 	<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all bib records with the same author.</li>
 	<li>on a field that is a link (4xx) to reach another bib record. For example, put 011a in 464$x, will find the serials that are with this ISSN.</li>
@@ -114,7 +114,7 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 	<li>Authorized value
 <ul>
 	<li>means the value cannot by typed by the librarian, but must be chosen from a pull down generated by the authorized value list</li>
-	<li>In the example above, the 504a field will show the MARC504 Authorized Values when cataloging</li>
+    <li>In the example above, the 504a field will show the MARC504 authorized values when cataloging</li>
 </ul>
 </li>
 </ul>
@@ -134,10 +134,10 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 </li>
 </ul>
 </li>
-	<li>To save your changes simply click the 'Save Changes' button at the top of the screen</li>
+    <li>To save your changes simply click the 'Save changes' button at the top of the screen</li>
 </ul>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
index dc01409..5760f2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Authority Record Tags</h1>
+<h1>Authority record tags</h1>
 
-<p>To add a field to a Authority Framework click the 'New Tag' button at the top of the Authority Framework definition</p>
+<p>To add a field to an authority framework click the 'New Tag' button at the top of the authority framework definition</p>
 
 <p>This will open up a blank form for entering MARC field data</p>
 
@@ -17,10 +17,10 @@
 	<li>If you want this field to be a pull down with limited possible answers, choose which 'Authorized value' list you want to use</li>
 </ul>
 
-<p>When you're finished, click 'Save Changes' and you will be presented with your new field</p>
+<p>When you're finished, click 'Save changes' and you will be presented with your new field</p>
 
 <p>To the right of the new field is a link to 'Subfields,' you will need to add subfields before this tag will appear in your MARC editor.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
index ce3b346..31786ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Authorized Values</h1>
+<h1>Authorized values</h1>
 
 <p>Authorized values can be used in several areas of Koha. One reason you would add an authorized value category would be to control the values that can be entered into MARC fields by catalogers.</p>
 
-<h2>Existing Values</h2>
+<h2>Existing values</h2>
 
 <p>Koha installs with pre-defined values that your library is likely to use, for instance 'Lost'.</p>
 
@@ -51,27 +51,27 @@
 </li>
 	<li>HINGS_AS
 <ul>
-	<li>General Holdings: Acquisition Status Designator :: This data element specifies acquisition status for the unit at the time of the holdings report.a</li>
+    <li>General holdings: Acquisition status designator :: This data element specifies acquisition status for the unit at the time of the holdings report.a</li>
 </ul>
 </li>
 	<li>HINGS_C
 <ul>
-	<li>General Holdings: Completeness Designator</li>
+    <li>General holdings: Completeness designator</li>
 </ul>
 </li>
 	<li>HINGS_PF
 <ul>
-	<li>Physical Form Designators</li>
+    <li>Physical form designators</li>
 </ul>
 </li>
 	<li>HINGS_RD
 <ul>
-	<li>General Holdings: Retention Designator :: This data element specifies the retention policy for the unit at the time of the holdings report.</li>
+    <li>General holdings: Retention designator :: This data element specifies the retention policy for the unit at the time of the holdings report.</li>
 </ul>
 </li>
 	<li>HINGS_UT
 <ul>
-	<li>General Holdings: Type of Unit Designator</li>
+    <li>General holdings: Type of unit designator</li>
 </ul>
 </li>
 	<li>LOC
@@ -117,35 +117,35 @@
 </li>
 </ul>
 
-<h2>Add new Authorized Value Category</h2>
+<h2>Add new authorized value category</h2>
 
 <p>In addition to the existing categories that come by default with Koha, librarians can add their own authorized value categories to control data that is entered into the system. To add a new category:</p>
 
 <ul>
-	<li>Click 'New Category'</li>
-	<li>Limit your Category to 11 characters (something short to make it clear what the category is for)</li>
+    <li>Click 'New category'</li>
+    <li>Limit your category to 11 characters (something short to make it clear what the category is for)</li>
 	<li>When adding a new category you're asked to create at least one authorized value
 <ul>
-	<li>Enter a code for your Authorized Value into the 'Authorized value' field</li>
-	<li>Use the Description field for the actual value that will be entered</li>
+    <li>Enter a code for your authorized value into the 'Authorized value' field</li>
+    <li>Use the description field for the actual value that will be entered</li>
 </ul>
 </li>
 	<li>Click 'Save'</li>
-	<li>Your new category and value will appear on the list of Authorized Values</li>
+    <li>Your new category and value will appear on the list of authorized values</li>
 </ul>
 
-<h2>Add new Authorized Value</h2>
+<h2>Add new authorized value</h2>
 
 <p>New authorized values can be added to any existing or new category. To add a value:</p>
 
 <ul>
 	<li>Click 'New authorized value for ...'</li>
-	<li>Enter a code for your Authorized Value into the 'Authorized value' field</li>
-	<li>Use the Description field for the actual value that will be entered</li>
+    <li>Enter a code for your authorized value into the 'Authorized value' field</li>
+    <li>Use the description field for the actual value that will be entered</li>
 	<li>Click 'Save'</li>
 	<li>The new value will appear in the list along with existing values</li>
 </ul>
 
-<p><strong>See the full documentation for Authorized Values in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#authorizedvalues">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for authorized values in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#authorizedvalues">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
index 78a2095..c315db9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
@@ -2,10 +2,10 @@
 
 <h1>Authority types</h1>
 
-<p>Authority Types are basically MARC Frameworks for Authority records and because of that the rules below refer to the bibliographic frameworks.</p>
+<p>Authority types are basically MARC frameworks for authority records and because of that the rules below refer to the bibliographic frameworks.</p>
 
-<p>Koha comes with many of the necessary Authority frameworks already installed.</p>
+<p>Koha comes with many of the necessary authority frameworks already installed.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
index 9183344..4810dd6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
@@ -1,39 +1,39 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC Bibliographic Frameworks</h1>
+<h1>MARC bibliographic frameworks</h1>
 
-<p>Think of Frameworks as templates for creating new bibliographic records. Koha comes with some predefined frameworks that can be edited or deleted, and librarians can create their own frameworks for content specific to their libraries.</p>
+<p>Think of frameworks as templates for creating new bibliographic records. Koha comes with some predefined frameworks that can be edited or deleted, and librarians can create their own frameworks for content specific to their libraries.</p>
 
-<p>Do not delete or edit the Default Framework since this will cause problems with your cataloging records - always create a new template based on the Default Framework, or alter the other Frameworks.</p>
+<p>Do not delete or edit the default framework since this will cause problems with your cataloging records - always create a new template based on the default framework, or alter the other frameworks.</p>
 
 <p>After clicking the 'MARC structure' link to the right of each framework you can decide how many fields you want to see on one screen by using the pagination options at the top of the table.</p>
 
-<h2>Add New Framework</h2>
+<h2>Add new framework</h2>
 
 <p>To add a new framework</p>
 
 <ul>
-	<li>Click 'New Framework'
+    <li>Click 'New framework'
 <ul>
 	<li>Enter a code of 4 or fewer characters</li>
-	<li>Use the Description field to enter a more detailed definition of your framework</li>
+    <li>Use the description field to enter a more detailed definition of your framework</li>
 </ul>
 </li>
 	<li>Click 'Submit'</li>
-	<li>Once your Framework is added click 'MARC structure' to the right of it on the list of Frameworks
+    <li>Once your framework is added click 'MARC structure' to the right of it on the list of frameworks
 <ul>
-	<li>You will be asked to choose a Framework to base your new Framework off of, this will make it easier than starting from scratch</li>
+    <li>You will be asked to choose a framework to base your new framework off of, this will make it easier than starting from scratch</li>
 </ul>
 </li>
-	<li>Once your Framework appears on the screen you can edit or delete each field by following the instructions for editing subfields</li>
+    <li>Once your framework appears on the screen you can edit or delete each field by following the instructions for editing subfields</li>
 </ul>
 
-<h2>Edit Existing Frameworks</h2>
+<h2>Edit Existing frameworks</h2>
 
-<p>Clicking 'Edit' to the right of a Framework will only allow you to edit the Description for the Framework</p>
+<p>Clicking 'Edit' to the right of a framework will only allow you to edit the description for the framework</p>
 
-<p>To make edits to the fields associated with the Framework you must first click 'MARC Structure' and then follow the instructions for editing subfields</p>
+<p>To make edits to the fields associated with the framework you must first click 'MARC Structure' and then follow the instructions for editing subfields</p>
 
-<p><strong>See the full documentation for Frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
index 8618530..6a61215 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Library Transfer Limits</h1>
+<h1>Library transfer limits</h1>
 
 <p>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the collection code involved.</p>
 
@@ -16,6 +16,6 @@
 
 <p>In the above example, Centerville library will allow patrons to return items from all libraries except Liberty and Franklin to their library.</p>
 
-<p><strong>See the full documentation for Library Transfer Limits in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for library transfer limits in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
index 69e1dd4..f4eefe6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
@@ -1,17 +1,17 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Libraries &amp; Groups</h1>
+<h1>Libraries &amp; groups</h1>
 
 <p>When setting up your Koha system you will want to add information for every library that will be sharing your system. This data is used in several areas of Koha.</p>
 
 <p>When visiting this page you are presented with a list of the libraries and groups that have already been added to the system.</p>
 
-<h2>Adding a Library</h2>
+<h2>Adding a library</h2>
 
 <p>To add a new library:</p>
 
 <ul>
-	<li>Click 'New Library'</li>
+    <li>Click 'New library'</li>
 	<li>Fill in the data requested on the form that follows
 <ul>
 	<li>Of the fields listed, only 'Library code' and 'Name' are required</li>
@@ -21,7 +21,7 @@
 </li>
 </ul>
 
-<h2>Editing/Deleting a Library</h2>
+<h2>Editing/Deleting a library</h2>
 
 <p>You will be unable to delete any library that has patrons or items attached to it.</p>
 
@@ -31,22 +31,22 @@
 
 <h2>Adding a group</h2>
 
-<p>To add a Search Domain or Library Property Group click the 'New Group' button at the top of the screen.</p>
+<p>To add a Search Domain or Library Property Group click the 'New group' button at the top of the screen.</p>
 
 <p>Of the fields on the group form, 'Category code' and 'Name' are the only required fields</p>
 
-<h2>Search Domain Groups</h2>
+<h2>Search domain groups</h2>
 
-<p>Search Domain Groups allow you to search a group of libraries at the same time instead of searching just one library or all libraries.</p>
+<p>Search domain groups allow you to search a group of libraries at the same time instead of searching just one library or all libraries.</p>
 
-<p>To see Search Domain Groups in action visit the staff client advanced search page in your Koha system</p>
+<p>To see Search domain groups in action visit the staff client advanced search page in your Koha system</p>
 
-<h2>Library Property Groups</h2>
+<h2>Library property groups</h2>
 
 <p>You can assign specific categories to your libraries by adding groups for them.</p>
 
 <p>Properties are then applied to libraries via the add or edit library form.</p>
 
-<p><strong>See the full documentation for Libraries &amp; Groups in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#libsgroups">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for libraries &amp; groups in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#libsgroups">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
index 4102c46..aeec6eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Patron Categories</h1>
+<h1>Patron categories</h1>
 
 <p>Patron categories allow you to organize your patrons into different roles, age groups, and patron types.</p>
 
@@ -41,10 +41,10 @@
 
 <h2>Adding a patron category</h2>
 
-<p>To add a new patron category click 'New Category' at the top of the page</p>
+<p>To add a new patron category click 'New category' at the top of the page</p>
 
 <ul>
-	<li>The 'Category Code' is an identifier for your new code.
+    <li>The 'Category code' is an identifier for your new code.
 <ul>
 	<li style="color: #990000;">Important: The category code is limited to 10 characters (numbers and letters)</li>
 </ul>
@@ -77,6 +77,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Categories in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#patcats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for patron categories in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#patcats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
index e9eeba8..5bc9d57 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
@@ -1,11 +1,11 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC Bibliographic Framework Test</h1>
+<h1>MARC bibliographic framework test</h1>
 
 <p>This tool checks the MARC structure in your frameworks.</p>
 
-<p>If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</p>
+<p>If you change your MARC bibliographic framework it's recommended that you run this tool to test for errors in your definition.</p>
 
-<p><strong>See the full documentation for the MARC Bibliographic Framework Test in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworkstest">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the MARC bibliographic framework test in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworkstest">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
index f1574af..5cfc9de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Cities and Towns</h1>
+<h1>Cities and towns</h1>
 
 <p>To standardize patron input you can define cities or towns within your region so that when new patrons are added librarians simply have to select the town from a list instead of having to type the town and zip (or postal) code information.</p>
 
-<h2>Adding a City</h2>
+<h2>Adding a city</h2>
 
 <p>To add a new city, click the 'New City' button at the top of the page and enter the city name, state and zip/postal code.</p>
 
@@ -12,12 +12,12 @@
 
 <p>Cities can be edited or deleted at any time.</p>
 
-<h2>Viewing Cities on Patron Add Form</h2>
+<h2>Viewing cities on patron add form</h2>
 
-<p>If you have defined local cities using the New city form, then when adding or editing a patron record you will see those cities in a pull down menu to make city selection easy.</p>
+<p>If you have defined local cities using the 'New city' form, then when adding or editing a patron record you will see those cities in a pull down menu to make city selection easy.</p>
 
 <p>This will allow for easy entry of local cities into the patron record without risking the potential for typos or mistaken zip/postal codes.</p>
 
-<p><strong>See the full documentation for Cities and Towns in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#citytowns">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for cities and towns in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#citytowns">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
index aad39f0..24ce608 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
@@ -1,14 +1,14 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Classification Sources</h1>
+<h1>Classification sources</h1>
 
-<p>Source of classification or shelving scheme is an Authorized Values category that is mapped to field 942$2 in Koha's MARC Bibliographic frameworks.</p>
+<p>Source of classification or shelving scheme is an authorized values category that is mapped to field 942$2 in Koha's MARC bibliographic frameworks.</p>
 
 <p>Commonly used values of this field are:</p>
 
 <ul>
-	<li>ddc - Dewey Decimal Classification</li>
-	<li>lcc - Library of Congress Classification</li>
+    <li>ddc - Dewey Decimal classification</li>
+    <li>lcc - Library of Congress classification</li>
 </ul>
 
 <p>If you chose to install classification sources during Koha's installation, you would see other values too:</p>
@@ -16,11 +16,11 @@
 <ul>
 	<li>ANSCR (sound recordings)</li>
 	<li>SuDOC classification</li>
-	<li>Universal Decimal Classification</li>
-	<li>Other/Generic Classification</li>
+    <li>Universal decimal classification</li>
+    <li>Other/Generic classification</li>
 </ul>
 
-<h2>Adding/Editing Classification Sources</h2>
+<h2>Adding/Editing classification sources</h2>
 
 <p>You can add your own source of classification by using the New Classification Source button. To edit use the Edit link.</p>
 
@@ -32,7 +32,7 @@
 	<li>Select the appropriate filing rule from the drop down list.</li>
 </ul>
 
-<h2>Classification Filing Rules</h2>
+<h2>Classification filing rules</h2>
 
 <p>Filing rules determine the order in which items are placed on shelves.</p>
 
@@ -44,7 +44,7 @@
 	<li>Generic</li>
 </ul>
 
-<p>Filing rules are mapped to Classification sources. You can setup new filing rules by using the New Filing Rule button. To edit use the Edit link.</p>
+<p>Filing rules are mapped to classification sources. You can setup new filing rules by using the 'New filing rule' button. To edit use the Edit link.</p>
 
 <p>When creating or editing:</p>
 
@@ -53,6 +53,6 @@
 	<li>Choose an appropriate filing routine - dewey, generic or lcc</li>
 </ul>
 
-<p><strong>See the full documentation for Classification Sources in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#classificationsources">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for classification sources in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#classificationsources">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
index 22d2d63..7e6bc26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Currencies and Exchange Rates</h1>
+<h1>Currencies and exchange rates</h1>
 
 <p>If you place orders from more than one country you will want to input currency exchange rates so that your acquisitions module will properly calculate totals.</p>
 
@@ -8,6 +8,6 @@
 
 <p>The active currency is the main currency you use in your library. Your active currency will have a check mark in the 'Active' column. If you don't have an active currency you will see an error message telling you to choose an active currency.</p>
 
-<p><strong>See the full documentation for Currencies and Exchange Rates in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#currexchangeadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for currencies and exchange rates in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#currexchangeadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
index d689c55..1a942c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Keyword to MARC Mapping</h1>
+<h1>Keyword to MARC mapping</h1>
 
 <p>This tool will allow you to map MARC fields to a set of predefined keywords.</p>
 
@@ -20,6 +20,6 @@
 
 <p>Future developments will include additional keyword assigned fields.</p>
 
-<p><strong>See the full documentation for Keyword to MARC Mapping in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#keywordmapping">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for keyword to MARC mapping in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#keywordmapping">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
index e93bdd8..db6da0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Item Circulation Alerts</h1>
+<h1>Item circulation alerts</h1>
 
 <p>Libraries can decide if they want to have patrons automatically notified of circulation events (check ins and check outs).</p>
 
@@ -19,6 +19,6 @@
 	<li>By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item/patron type combo that you would like to stop notices for.</li>
 </ul>
 
-<p><strong>See the full documentation for Item Circulation Alerts in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#itemcircalerts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for item circulation alerts in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#itemcircalerts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
index bbf42b5..949928d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
@@ -1,17 +1,17 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Item Types</h1>
+<h1>Item types</h1>
 
 <p>Koha allows you to organize your collection by item types and collection codes.</p>
 
 <p>Item types typically refer to the material type (book, cd, dvd, etc), but can be used in any way that works for your library.</p>
 
-<h2>Adding Item Types</h2>
+<h2>Adding item types</h2>
 
-<p>To add a new item type, simply click the 'New Item Type' button at the top of the Item Types page.</p>
+<p>To add a new item type, simply click the 'New item type' button at the top of the Item types page.</p>
 
 <ul>
-	<li>In the 'Item Type' field, enter a short code for your item type</li>
+    <li>In the 'Item type' field, enter a short code for your item type</li>
 	<li>The description is the plain text definition of the item type</li>
 	<li>You can choose to have an image associated with your item type
 <ul>
@@ -20,7 +20,7 @@
 	<li>Or you can just have no image associated with the item type</li>
 	<li style="color: #990000;">Important: To have your item type images appear in the OPAC you need to set noItemTypeImages to 'Show'
 <ul>
-	<li>Get there: More &gt; Administration &gt; Global System Preferences &gt; Admin</li>
+    <li>Get there: More &gt; Administration &gt; Global system preferences &gt; Admin</li>
 </ul>
 </li>
 </ul>
@@ -37,26 +37,26 @@
 	<li>This will charge the patron on checkout</li>
 </ul>
 </li>
-	<li>When finished, click 'Save Changes'
+    <li>When finished, click 'Save changes'
 <ul>
-	<li>Tip: All fields, with the exception of the 'Item Type' will be editable from the Item Types list</li>
+    <li>Tip: All fields, with the exception of the 'Item type' will be editable from the item types list</li>
 </ul>
 </li>
 	<li>Your new item type will now appear on the list</li>
 </ul>
 
-<h2>Editing Item Types</h2>
+<h2>Editing item types</h2>
 
 <p>Each item type has an Edit button beside it. To edit an item simply click the 'Edit' link.</p>
 
-<p>You will not be able to edit the code you assigned as the 'Item Type' but you will be able to edit the description for the item.</p>
+<p>You will not be able to edit the code you assigned as the 'Item type' but you will be able to edit the description for the item.</p>
 
-<h2>Deleting Item Types</h2>
+<h2>Deleting item types</h2>
 
 <p>Each item has a Delete button beside it. To delete an item, simply click the 'Delete' link.</p>
 
 <p>You will not be able to delete item types that are being used by items within your system.</p>
 
-<p><strong>See the full documentation for Item Types in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#itemtypeadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for item types in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#itemtypeadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
index 85becbd..8164a19 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
@@ -1,17 +1,17 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Koha to MARC Mapping</h1>
+<h1>Koha to MARC mapping</h1>
 
-<p>While Koha stores the entire MARC record, it also stores common fields for easy access in various tables in the database. Koha to MARC Mapping is used to tell Koha where to find these values in the MARC record. In many cases you will not have to change the default values set by in this tool on installation, but it is important to know that the tool is here and can be used at any time.</p>
+<p>While Koha stores the entire MARC record, it also stores common fields for easy access in various tables in the database. Koha to MARC mapping is used to tell Koha where to find these values in the MARC record. In many cases you will not have to change the default values set by in this tool on installation, but it is important to know that the tool is here and can be used at any time.</p>
 
-<p>The Koha to MARC Mapping page offers you the option of choosing from one of three tables in the database to assign values to.</p>
+<p>The Koha to MARC mapping page offers you the option of choosing from one of three tables in the database to assign values to.</p>
 
-<p>After choosing the table you would like to view, click 'OK.' To edit any mapping click on the 'Koha Filed' or the 'Edit' link.</p>
+<p>After choosing the table you would like to view, click 'OK.' To edit any mapping click on the 'Koha filed' or the 'Edit' link.</p>
 
 <p>Choose which MARC field you would like to map to this Koha Field and click the 'OK' button. If you would like to clear all mappings, click the 'Click to "Unmap"' button.<p>
 
 <p style="color: #990000;">Important: At this time you can map only 1 MARC field to 1 Koha field. This means that you won't be able to map both the 100a and the 700a to the author field, you need to choose one or the other.</p>
 
-<p><strong>See the full documentation for Koha to MARC Mapping in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#kohamarcmapping">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Koha to MARC mapping in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#kohamarcmapping">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
index 0fba909..f55ff05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC Bibliographic Frameworks Subfields</h1>
+<h1>MARC bibliographic frameworks subfields</h1>
 
-<p>Frameworks are made up of MARC fields and subfields. To make edits to most Frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
+<p>Frameworks are made up of MARC fields and subfields. To make edits to most frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
 
 <ul>
 	<li>Each field has a tag (which is the MARC tag)
@@ -12,11 +12,11 @@
 	<li>If you check 'Repeatable' then the field will have a plus sign next to it allowing you to add multiples of that tag</li>
 	<li>If you check 'Mandatory' the record will not be allowed to save unless you have a value assigned to this tag</li>
 	<li>'Authorized value' is where you define an authorized value that your catalogers can choose from a pull down to fill this field in
-To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC Structure' listing</li>
+To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC structure' listing</li>
 </ul>
 </li>
 	<li>From the list of subfields you can click 'Delete' to the right of each to delete the subfields</li>
-	<li>To edit the subfields click 'Edit Subfields'</li>
+    <li>To edit the subfields click 'Edit subfields'</li>
 	<li>For each subfield you can set the following values
 <ul>
 	<li>Text for librarian
@@ -91,9 +91,9 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 </li>
 </ul>
 <ul>
-	<li>Is a url
+    <li>Is a URL
 <ul>
-	<li>if checked, it means that the subfield is a url and can be clicked</li>
+    <li>if checked, it means that the subfield is a URL and can be clicked</li>
 </ul>
 </li>
 </ul>
@@ -141,9 +141,9 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 </li>
 </ul>
 </li>
-	<li>To save your changes simply click the 'Save Changes' button at the top of the screen</li>
+    <li>To save your changes simply click the 'Save changes' button at the top of the screen</li>
 </ul>
 
-<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
index fcd52d9..ce93e70 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC Bibliographic Frameworks Tags</h1>
+<h1>MARC bibliographic frameworks tags</h1>
 
-<p>To add a field to a Framework click the 'New Tag' button at the top of the Framework definition</p>
+<p>To add a field to a framework click the 'New tag' button at the top of the framework definition</p>
 
 <p>This will open up a blank form for entering MARC field data</p>
 
@@ -17,10 +17,10 @@
 	<li>If you want this field to be a pull down with limited possible answers, choose which 'Authorized value' list you want to use</li>
 </ul>
 
-<p>When you're finished, click 'Save Changes' and you will be presented with your new field</p>
+<p>When you're finished, click 'Save changes' and you will be presented with your new field</p>
 
 <p>To the right of the new field is a link to 'Subfields,' you will need to add subfields before this tag will appear in your MARC editor.</p>
 
-<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
index c318cac..a01f5db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Record Matching Rules</h1>
+<h1>Record matching rules</h1>
 
 <p>Record matching rules are used when importing MARC records into Koha.</p>
 
@@ -9,7 +9,7 @@
 <p>To create a new matching rule:</p>
 
 <ul>
-	<li>Click 'New Record Matching Rule'
+    <li>Click 'New record matching rule'
 <ul>
 	<li>Choose a unique name and enter it in the 'Matching rule code' field</li>
 	<li>'Description' can be anything you want to make it clear to you what rule you're picking</li>
@@ -27,7 +27,7 @@
 </li>
 </ul>
 
-<h2>Sample Record Matching Rule: Control Number</h2>
+<h2>Sample record matching rule: Control number</h2>
 
 <ul>
 	<li>Match threshold: 100</li>
@@ -43,9 +43,9 @@
 	<li>Offset: 0</li>
 	<li>Length: 0</li>
 	<li>Normalization rule: Control-number</li>
-	<li>Required Match checks: none (remove the blank one)</li>
+    <li>Required match checks: none (remove the blank one)</li>
 </ul>
 
-<p><strong>See the full documentation for Record Matching Rules in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#recordmatchingrules">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Record matching Rules in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#recordmatchingrules">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
index 39fd21b..ba85010 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>OAI-PMH Sets Mappings Configuration</h1>
+<h1>OAI-PMH sets mappings configuration</h1>
 
 <p>
     Here you can define how a set will be build (what records will belong to
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
index 7fc46cc..c99ea3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>OAI-PMH Sets Configuration</h1>
+<h1>OAI-PMH sets configuration</h1>
 
 <p>On this page you can create, modify and delete OAI-PMH sets<p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
index 1925e69..899df27 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
@@ -1,17 +1,17 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Patron Attribute Types</h1>
+<h1>Patron attribute types</h1>
 
 <p>Patron attributes can be used to define custom fields to associate with your patron records. In order to enable the use of custom fields you need to set the ExtendedPatronAttributes system preference.</p>
 
 <p>A common use for this field would be for a student ID number or a Driver's license number.</p>
 
-<h2>Adding Patron Attributes</h2>
+<h2>Adding patron attributes</h2>
 
-<p>To add a new Patron Attribute Type, click the 'New Patron Attribute Type' button at the top of the page</p>
+<p>To add a new patron attribute type, click the 'New patron attribute type' button at the top of the page</p>
 
 <ul>
-	<li>In the 'Patron attribute type code', enter a short code to identify this field
+    <li>In the 'Patron attribute type code', enter a short code to identify this field
 <ul>
 	<li>This field is limited to 10 characters (numbers and letters only)</li>
 	<li>This setting cannot be changed after an attribute is defined</li>
@@ -43,7 +43,7 @@
 
 <p>Once added your attribute will appear on the list of attributes and also on the patron record add/edit form</p>
 
-<h2>Editing/Deleting Patron Attributes</h2>
+<h2>Editing/Deleting patron attributes</h2>
 
 <p>Each patron attribute has an edit and a delete link beside it on the list of attributes.</p>
 
@@ -57,6 +57,6 @@
 
 <p>You will be unable to delete an attribute if it's in use.</p>
 
-<p><strong>See the full documentation for Patron Attribute Types in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#patronattributetypes">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for patron attribute types in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#patronattributetypes">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
index edc4c97..d064839 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>System Preferences</h1>
+<h1>System preferences</h1>
 
 <p>Global system preferences control the way your Koha system works in general. Set these preferences before anything else in Koha.</p>
 
@@ -21,18 +21,18 @@
 		<li><strong>Cataloging:</strong> holds preferences that control the cataloging functions.  This is where you choose your MARC flavor, set up Z39.50 and barcoding.</li>
 		<li><strong>Circulation:</strong> holds preferences that control circulation functions such as holds and  fines.</li>
 		<li><strong>Creators:</strong> this tab contains preferences related to modules that create objects.</li>
-		<li><strong>Enhanced Content:</strong> holds preferences that will add content from outside sources to your OPAC and Staff Client.  This is where you can turn on cover images, FRBR and tagging.</li>
+        <li><strong>Enhanced content:</strong> holds preferences that will add content from outside sources to your OPAC and Staff Client.  This is where you can turn on cover images, FRBR and tagging.</li>
 		<li><strong>I18N/L10N:</strong> holds preferences related to internationalization and localization such as date formats and languages.</li>
-		<li><strong>Local Use:</strong> this tab will usually be empty unless your library has a preference just for your library.</li>		
+        <li><strong>Local use:</strong> this tab will usually be empty unless your library has a preference just for your library.</li>		
 		<li><strong>Logs:</strong> turn on/off logging functionality in your system.</li>
 		<li><strong>OPAC:</strong> customize the OPAC and OPAC functions (aside from the Enhanced Content preferences).</li>
 		<li><strong>Patrons:</strong> holds preferences that control how your system handles patron functions.  Some preferences include the minimum password length and membership number settings.</li>
 		<li><strong>Searching:</strong> holds preference related to advanced search functions such as removing stop words or allowing stemming.</li>
 		<li><strong>Serials</strong> holds all preferences related to managing serial subscriptions.</li>
-		<li><strong>Staff Client:</strong> customize the staff client by editing the stylesheet and navigation menu.</li>
-		<li><strong>Web Services:</strong> includes preferences related to services like OAI-PMH.</li>
+        <li><strong>Staff client:</strong> customize the staff client by editing the stylesheet and navigation menu.</li>
+        <li><strong>Web services:</strong> includes preferences related to services like OAI-PMH.</li>
 	</ul>
 	
-<p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/3.6/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for system preferences in the <a href="http://manual.koha-community.org/3.6/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
index 5874a98..bc4522f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Printer Administration</h1>
+<h1>Printer administration</h1>
 
 <p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
index 4431222..aab8858 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
@@ -1,15 +1,15 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Adding Road Types</h1>
+<h1>Adding road types</h1>
 
-<p>To add a road type, click 'New Road Type' and then enter the road type the way you'd like it displayed.</p>
+<p>To add a road type, click 'New road type' and then enter the road type the way you'd like it displayed.</p>
 
 <p>Once you submit the form, your new road type will be listed on the Road Types page</p>
 
-<h2>Viewing Road Types on Patron Add form</h2>
+<h2>Viewing road types on patron add form</h2>
 
 <p>When adding or editing a patron, if you have road types defined, there will be a pull down to choose the road type from.</p>
 
-<p><strong>See the full documentation for Road Types in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#roadtypes">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for road types in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#roadtypes">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
index f97ae22..4cb116f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Circulation and Fines Rules</h1>
+<h1>Circulation and fines rules</h1>
 
 <p>These rules define how your items are circulated, how/when fines are calculated and how holds are handled.</p>
 
@@ -20,7 +20,7 @@
 
 <p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.</p>
 
-<h2>Default Circulation Rules</h2>
+<h2>Default circulation rules</h2>
 
 <p>Using the issuing rules matrix you can define rules that depend on patron/item type combos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all libraries):</p>
 
@@ -33,14 +33,14 @@
 	<li>You can also define a hard due date for a specific patron category and item type. A hard due date ignores your usual circulation rules and makes it so that all items of the type defined are due on, before or after the date you specify.</li>
 	<li>'Fine Amount' should have the amount you would like to charge for overdue items</li>
 <ul>
-	<li>Important
Enter only numbers and decimal points (no currency symbols).</li>
+    <li>Important: Enter only numbers and decimal points (no currency symbols).</li>
 </ul>
-	<li>The 'Fine Grace Period' is the period of time an item can be overdue before you start charging fines.</li>
-	<li>Enter the 'Fine Charging Interval' in days (ex. charge fines every 1 day, or every 2 days)</li>
-	<li>If your library 'fines' patrons by suspending their account you can enter the number of days their fine should be suspended in the 'Suspension in Days' field</li>
-	<li>Next decide if the patron can renew this item type and if so, enter how many times they can renew it in the 'Renewals Allowed' box</li>
-	<li>If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds Allowed' field</li>
-	<li>Finally, if you charge a rental fee for the item type and want to give a specific patron type a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental Discount' field</li>
+    <li>The 'Fine grace period' is the period of time an item can be overdue before you start charging fines.</li>
+    <li>Enter the 'Fine charging interval' in days (ex. charge fines every 1 day, or every 2 days)</li>
+    <li>If your library 'fines' patrons by suspending their account you can enter the number of days their fine should be suspended in the 'Suspension in days' field</li>
+    <li>Next decide if the patron can renew this item type and if so, enter how many times they can renew it in the 'Renewals allowed' box</li>
+    <li>If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds allowed' field</li>
+    <li>Finally, if you charge a rental fee for the item type and want to give a specific patron type a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental discount' field</li>
 </ul>
 
 <p>When finished, click 'Add' to save your changes. To modify a rule, create a new one with the same patron type and item type. If you would like to delete your rule, simply click the 'Delete' link to the right of the rule.</p>
@@ -49,42 +49,42 @@
 
 <p>After choosing to clone you will be presented with a confirmation message.</p>
 
-<h2>Default Checkouts and Hold Policy</h2>
+<h2>Default checkouts and hold policy</h2>
 
 <p>You can set a default maximum number of checkouts and hold policy that will be used if none is defined below for a particular item type or category.</p>
 
 <p>From this menu you can set a default to apply to all item types and patrons in the library.</p>
 <ul>
-	<li>In 'Total Current Checkouts Allowed' enter the total number of items patrons can have checked out at one time</li>
-	<li>Control where patrons can place holds from using the 'Hold Policy' menu</li>
+    <li>In 'Total current checkouts allowed' enter the total number of items patrons can have checked out at one time</li>
+    <li>Control where patrons can place holds from using the 'Hold policy' menu</li>
 <ul>
-	<li>From Any Library: Patrons from any library may put this item on hold. (default if none is defined)</li>
-	<li>From Home Library: Only patrons from the item's home library may put this book on hold.</li>
-	<li>No Holds Allowed: No patron may put this book on hold.</li>
+    <li>From any library: Patrons from any library may put this item on hold. (default if none is defined)</li>
+    <li>From home library: Only patrons from the item's home library may put this book on hold.</li>
+    <li>No holds allowed: No patron may put this book on hold.</li>
 </ul>
 	<li>Once your policy is set, you can unset it by clicking the 'Unset' link to the right of the rule</li>
 </ul>
-<h2>Checkouts Per Patron</h2>
+<h2>Checkouts per patron</h2>
 
 <p>For this library, you can specify the maximum number of loans that a patron of a given category can make, regardless of the item type.</p>
 
 <p style="background-color: #ffe599;">Tip: If the total amount loanable for a given patron category is left blank, no limit applies, except possibly for a limit you define for a specific item type.</p>
 
-<h2>Item Hold Policies</h2>
+<h2>Item hold policies</h2>
 
 <p>For this library, you can edit rules for given itemtypes, regardless of the patron's category. Currently, this means hold policies.</p>
 
 <p>The various policies have the following effects:</p>
 <ul>
-	<li>From Any Library: Patrons from any library may put this item on hold. (default if none is defined)</li>
-	<li>From Home Library: Only patrons from the item's home library may put this book on hold.</li>
-	<li>No Holds Allowed: No patron may put this book on hold.</li>
+    <li>From any library: Patrons from any library may put this item on hold. (default if none is defined)</li>
+    <li>From home library: Only patrons from the item's home library may put this book on hold.</li>
+    <li>No holds allowed: No patron may put this book on hold.</li>
 </ul>
 
 <p style="color: #990000;">Important: Note that if the system preference AllowHoldPolicyOverride set to 'allow', these policies can be overridden by your circulation staff.</p>
 
 <p style="color: #990000;">Important: These policies are based on the patron's home library, not the library that the reserving staff member is from.</p>
 
-<p><strong>See the full documentation for Circulation and Fine Rules in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for circulation and fine rules in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
index 12e54e1..2081d98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Stop Words</h1>
+<h1>Stop words</h1>
 
 <p style="color: #990000">Important: If NoZebra is set to 'Use' this option will not appear on the administration menu</p>
 
@@ -8,10 +8,10 @@
 
 <p>Koha comes with a standard list of stop words that can be edited by visiting the Stop Word administration area.</p>
 
-<p>To add a new stop word to the list, click the 'New Stop Word' button and add the word you'd like ignored</p>
+<p>To add a new stop word to the list, click the 'New stop word' button and add the word you'd like ignored</p>
 
 <p style="color: #990000">Important: If you change something in this table, ask your administrator to run misc/batchRebuildBiblioTables.pl script.</p>
 
-<p><strong>See the full documentation for Stop Words in the <a href="http://manual.koha-community.org/3.6/en/additionaladmin.html#stopwordsadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for stop words in the <a href="http://manual.koha-community.org/3.6/en/additionaladmin.html#stopwordsadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
index 51a2a8f..4eec624 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Z39.50 Servers</h1>
+<h1>Z39.50 servers</h1>
 
 <p>Koha has a powerful copy cataloging tool. Using Koha you can connect to any Z39.50 target that is publicly available or that you have the log in information to.</p>
 
@@ -8,16 +8,16 @@
 
 <p>To find additional targets you use IndexData's IRSpy: <a href="http://irspy.indexdata.com">http://irspy.indexdata.com</a></p>
 
-<h2>Add a Z39.50 Target</h2>
+<h2>Add a Z39.50 target</h2>
 <ul>
-	<li>From the main Z39.50 page, click 'New Z39.50 Server'
+    <li>From the main Z39.50 page, click 'New Z39.50 server'
 <ul>
 	<li>Userid and Password are only required for servers that are password protected</li>
 </ul>
 </li>
 </ul>
 
-<h2>Suggested Z39.50 Targets</h2>
+<h2>Suggested Z39.50 targets</h2>
 
 <p>The following targets have been used successfully by other Koha libraries (in the Americas):</p>
 
@@ -38,6 +38,6 @@
 	<li>VANCOUVER PUBLIC LIBRARY z3950.vpl.ca:210 Horizon</li>
 </ul>
 
-<p><strong>See the full documentation for Z39.50 Servers in the <a href="http://manual.koha-community.org/3.6/en/additionaladmin.html#z3950admin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Z39.50 servers in the <a href="http://manual.koha-community.org/3.6/en/additionaladmin.html#z3950admin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.5.4


From jonathan.druart at biblibre.com  Fri Apr  6 12:19:10 2012
From: jonathan.druart at biblibre.com (Jonathan Druart)
Date: Fri,  6 Apr 2012 12:19:10 +0200
Subject: [Koha-patches] [PATCH 1/1] Bug 7919 : Display of values depending
	on the connexion librairy
Message-ID: <1333707550-13950-1-git-send-email-jonathan.druart@biblibre.com>

In a librairies network, we would like to declare specific values just
for one (or more) librairy.
Here we implement the ability to associate categories, patron attributes
types and/or authorised_values with librairies (branches).

This patch adds 3 new association tables:
- categories_branches ( association table between categories and branches )
- authorised_values_branches ( association table between
  authorised_values and branches )
- borrower_attribute_types_branches (association table between
  borrower_attribute_types and branches )

Plan test:
  - Create (or modify) categories, patron attributes and
    authorised_values and link it with one (or more) library.
  - Set one of these librairies
  - Go to one of the multiple pages where this specific value must be displayed
    and check that it does appear.
  - Set a librairy not concerned.
  - Check on the same pages this value is doest not appear.

A page list:
cataloguing/addbiblio.pl
cataloguing/additems.pl
members/members-home.pl
members/memberentry.pl
acqui/neworderempty.pl
tools/import_borrowers.pl
and others :)

Please say me if filters don't work on some pages.
---
 C4/Budgets.pm                                      |   23 +++++--
 C4/Category.pm                                     |   25 +++++--
 C4/Input.pm                                        |   67 ++++++++++++--------
 C4/Koha.pm                                         |   54 +++++++++++-----
 C4/Members.pm                                      |   63 ++++++++++++------
 C4/Members/AttributeTypes.pm                       |   62 +++++++++++++++++-
 C4/Members/Attributes.pm                           |    2 +
 admin/authorised_values.pl                         |   58 ++++++++++++++++-
 admin/categorie.pl                                 |   46 ++++++++++++--
 admin/patron-attr-types.pl                         |   36 +++++++++-
 cataloguing/addbiblio.pl                           |   21 ++++--
 cataloguing/additem.pl                             |   13 ++--
 installer/data/mysql/kohastructure.sql             |   38 +++++++++++
 installer/data/mysql/updatedatabase.pl             |   17 +++++
 .../prog/en/modules/admin/authorised_values.tt     |   20 ++++++-
 .../prog/en/modules/admin/categorie.tt             |   21 ++++++-
 .../prog/en/modules/admin/patron-attr-types.tt     |   19 ++++++
 members/member.pl                                  |    4 +-
 tools/batchMod.pl                                  |   12 +++-
 tools/import_borrowers.pl                          |    2 +-
 20 files changed, 489 insertions(+), 114 deletions(-)

diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 7c867e0..8399b5b 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -354,12 +354,25 @@ sub GetBudgetAuthCats  {
 # -------------------------------------------------------------------
 sub GetAuthvalueDropbox {
     my ( $authcat, $default ) = @_;
+    my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare(
-        'SELECT authorised_value,lib FROM authorised_values
-        WHERE category = ? ORDER BY lib'
-    );
-    $sth->execute( $authcat );
+
+    my $query = qq{
+        SELECT *
+        FROM authorised_values
+    };
+    $query .= qq{
+          LEFT JOIN authorised_values_branches ON ( id = av_id )
+    } if $branch_limit;
+    $query .= qq{
+        WHERE category = ?
+    };
+    $query .= " AND ( branchcode = ? OR branchcode IS NULL )" if $branch_limit;
+    $query .= " GROUP BY lib ORDER BY category, lib, lib_opac";
+    my $sth = $dbh->prepare($query);
+    $sth->execute( $authcat, $branch_limit ? $branch_limit : () );
+
+
     my $option_list = [];
     my @authorised_values = ( q{} );
     while (my ($value, $lib) = $sth->fetchrow_array) {
diff --git a/C4/Category.pm b/C4/Category.pm
index 8536128..f12b52f 100644
--- a/C4/Category.pm
+++ b/C4/Category.pm
@@ -71,13 +71,24 @@ C<description>.
 =cut
 
 sub all {
-    my $class = shift;
-    map {
-        utf8::encode($_->{description});
-        $class->new($_);
-    } @{C4::Context->dbh->selectall_arrayref(
-        "SELECT * FROM categories ORDER BY description", { Slice => {} }
-    )};
+    my ( $class ) = @_;
+    my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
+    my $dbh = C4::Context->dbh;
+    # The categories table is small enough for
+    # `SELECT *` to be harmless.
+    my $query = "SELECT * FROM categories";
+    $query .= qq{
+        LEFT JOIN categories_branches ON categories_branches.categorycode = categories.categorycode
+        WHERE categories_branches.branchcode = ? OR categories_branches.branchcode IS NULL
+    } if $branch_limit;
+    $query .= " ORDER BY description";
+    return map { $class->new($_) } @{
+        $dbh->selectall_arrayref(
+            $query,
+            { Slice => {} },
+            $branch_limit ? $branch_limit : ()
+        )
+    };
 }
 
 
diff --git a/C4/Input.pm b/C4/Input.pm
index 2ee07f3..6ba5ceb 100644
--- a/C4/Input.pm
+++ b/C4/Input.pm
@@ -119,33 +119,48 @@ Returns NULL if no authorised values found
 =cut
 
 sub buildCGIsort {
-	my ($name,$input_name,$data) = @_;
-	my $dbh=C4::Context->dbh;
-	my $query=qq{SELECT * FROM authorised_values WHERE category=? order by lib};
-	my $sth=$dbh->prepare($query);
-	$sth->execute($name);
-	my $CGISort;
-	if ($sth->rows>0){
-		my @values;
-		my %labels;
-
-		for (my $i =0;$i<$sth->rows;$i++){
-			my $results = $sth->fetchrow_hashref;
-			push @values, $results->{authorised_value};
-			$labels{$results->{authorised_value}}=$results->{lib};
-		}
-		$CGISort= CGI::scrolling_list(
-					-name => $input_name,
-					-id =>   $input_name,
-					-values => \@values,
-					-labels => \%labels,
-					-default=> $data,
-					-size => 1,
-					-multiple => 0);
-	}
-	$sth->finish;
-	return $CGISort;
+    my ( $name, $input_name, $data ) = @_;
+    my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
+
+    my $dbh=C4::Context->dbh;
+    my $query = qq{
+        SELECT *
+        FROM authorised_values
+    };
+    $query .= qq{
+          LEFT JOIN authorised_values_branches ON ( id = av_id )
+    } if $branch_limit;
+    $query .= qq{
+        WHERE category = ?
+    };
+    $query .= qq{ AND ( branchcode = ? OR branchcode IS NULL )} if $branch_limit;
+    $query .= qq{ GROUP BY lib ORDER BY lib};
+
+    my $sth=$dbh->prepare($query);
+    $sth->execute( $branch_limit ? $branch_limit : (), $name );
+    my $CGISort;
+    if ($sth->rows>0){
+        my @values;
+        my %labels;
+
+        for (my $i =0;$i<$sth->rows;$i++){
+            my $results = $sth->fetchrow_hashref;
+            push @values, $results->{authorised_value};
+            $labels{$results->{authorised_value}}=$results->{lib};
+        }
+        $CGISort= CGI::scrolling_list(
+                    -name => $input_name,
+                    -id =>   $input_name,
+                    -values => \@values,
+                    -labels => \%labels,
+                    -default=> $data,
+                    -size => 1,
+                    -multiple => 0);
+    }
+    $sth->finish;
+    return $CGISort;
 }
+
 END { }       # module clean-up code here (global destructor)
 
 1;
diff --git a/C4/Koha.pm b/C4/Koha.pm
index 0192989..050e8ae 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1007,25 +1007,45 @@ C<$opac> If set to a true value, displays OPAC descriptions rather than normal o
 =cut
 
 sub GetAuthorisedValues {
-    my ($category,$selected,$opac) = @_;
-	my @results;
+    my ( $category, $selected, $opac ) = @_;
+    my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
+    my @results;
     my $dbh      = C4::Context->dbh;
-    my $query    = "SELECT * FROM authorised_values";
-    $query .= " WHERE category = '" . $category . "'" if $category;
-    $query .= " ORDER BY category, lib, lib_opac";
+    my $query = qq{
+        SELECT *
+        FROM authorised_values
+    };
+    $query .= qq{
+          LEFT JOIN authorised_values_branches ON ( id = av_id )
+    } if $branch_limit;
+    my @where_strings;
+    my @where_args;
+    if($category) {
+        push @where_strings, "category = ?";
+        push @where_args, $category;
+    }
+    if($branch_limit) {
+        push @where_strings, "( branchcode = ? OR branchcode IS NULL )";
+        push @where_args, $branch_limit;
+    }
+    if(@where_strings > 0) {
+        $query .= " WHERE " . join(" AND ", @where_strings);
+    }
+    $query .= " GROUP BY lib ORDER BY category, lib, lib_opac";
+
     my $sth = $dbh->prepare($query);
-    $sth->execute;
-	while (my $data=$sth->fetchrow_hashref) {
-	    if ($selected && $selected eq $data->{'authorised_value'} ) {
-		    $data->{'selected'} = 1;
-	    }
-	    if ($opac && $data->{'lib_opac'}) {
-		$data->{'lib'} = $data->{'lib_opac'};
-	    }
-	    push @results, $data;
-	}
-    #my $data = $sth->fetchall_arrayref({});
-    return \@results; #$data;
+    $sth->execute( @where_args );
+    while (my $data=$sth->fetchrow_hashref) {
+        if ($selected && $selected eq $data->{'authorised_value'} ) {
+            $data->{'selected'} = 1;
+        }
+        if ($opac && $data->{'lib_opac'}) {
+            $data->{'lib'} = $data->{'lib_opac'};
+        }
+        push @results, $data;
+    }
+    $sth->finish;
+    return \@results;
 }
 
 =head2 GetAuthorisedValueCategories
diff --git a/C4/Members.pm b/C4/Members.pm
index 056f7e4..2d50ef4 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1373,20 +1373,35 @@ to category descriptions.
 
 #'
 sub GetborCatFromCatType {
-    my ( $category_type, $action ) = @_;
-	# FIXME - This API  seems both limited and dangerous. 
+    my ( $category_type, $action, $no_branch_limit ) = @_;
+
+    my $branch_limit = $no_branch_limit
+        ? 0
+        : C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
+
+    # FIXME - This API  seems both limited and dangerous. 
     my $dbh     = C4::Context->dbh;
-    my $request = qq|   SELECT categorycode,description 
-            FROM categories 
-            $action
-            ORDER BY categorycode|;
-    my $sth = $dbh->prepare($request);
-	if ($action) {
-        $sth->execute($category_type);
-    }
-    else {
-        $sth->execute();
+
+    my $request = qq{
+        SELECT categories.categorycode, categories.description
+        FROM categories
+    };
+    $request .= qq{
+        LEFT JOIN categories_branches ON categories.categorycode = categories_branches.categorycode
+    } if $branch_limit;
+    if($action) {
+        $request .= " $action ";
+        $request .= " AND (branchcode = ? OR branchcode IS NULL) GROUP BY description" if $branch_limit;
+    } else {
+        $request .= " WHERE branchcode = ? OR branchcode IS NULL GROUP BY description" if $branch_limit;
     }
+    $request .= " ORDER BY categorycode";
+
+    my $sth = $dbh->prepare($request);
+    $sth->execute(
+        $action ? $category_type : (),
+        $branch_limit ? $branch_limit : ()
+    );
 
     my %labels;
     my @codes;
@@ -1395,6 +1410,7 @@ sub GetborCatFromCatType {
         push @codes, $data->{'categorycode'};
         $labels{ $data->{'categorycode'} } = $data->{'description'};
     }
+    $sth->finish;
     return ( \@codes, \%labels );
 }
 
@@ -1437,16 +1453,21 @@ If no category code provided, the function returns all the categories.
 =cut
 
 sub GetBorrowercategoryList {
+    my $no_branch_limit = @_ ? shift : 0;
+    my $branch_limit = $no_branch_limit
+        ? 0
+        : C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
     my $dbh       = C4::Context->dbh;
-    my $sth       =
-    $dbh->prepare(
-    "SELECT * 
-    FROM categories 
-    ORDER BY description"
-        );
-    $sth->execute;
-    my $data =
-    $sth->fetchall_arrayref({});
+    my $query = "SELECT * FROM categories";
+    $query .= qq{
+        LEFT JOIN categories_branches ON categories.categorycode = categories_branches.categorycode
+        WHERE branchcode = ? OR branchcode IS NULL GROUP BY description
+    } if $branch_limit;
+    $query .= " ORDER BY description";
+    my $sth = $dbh->prepare( $query );
+    $sth->execute( $branch_limit ? $branch_limit : () );
+    my $data = $sth->fetchall_arrayref( {} );
+    $sth->finish;
     return $data;
 }    # sub getborrowercategory
 
diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm
index 8c96e54..eb48883 100644
--- a/C4/Members/AttributeTypes.pm
+++ b/C4/Members/AttributeTypes.pm
@@ -69,12 +69,24 @@ If $all_fields is true, then each hashref also contains the other fields from bo
 =cut
 
 sub GetAttributeTypes {
-    my ($all) = @_;
-    my $select = $all ? '*' : 'code, description, class';
+    my $all    = @_   ? shift : 0;
+    my $no_branch_limit = @_ ? shift : 0;
+    my $branch_limit = $no_branch_limit
+        ? 0
+        : C4::Context->userenv ? C4::Context->userenv->{"branch"} : 0;
+    my $select = $all ? '*'   : 'DISTINCT(code), description';
+
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("SELECT $select FROM borrower_attribute_types ORDER by code");
-    $sth->execute();
+    my $query = "SELECT $select FROM borrower_attribute_types";
+    $query .= qq{
+        LEFT JOIN borrower_attribute_types_branches ON bat_code = code
+        WHERE b_branchcode = ? OR b_branchcode IS NULL
+    } if $branch_limit;
+    $query .= " ORDER BY code";
+    my $sth    = $dbh->prepare($query);
+    $sth->execute( $branch_limit ? $branch_limit : () );
     my $results = $sth->fetchall_arrayref({});
+    $sth->finish;
     return @$results;
 }
 
@@ -166,6 +178,13 @@ sub fetch {
     $self->{'category_description'}      = $row->{'category_description'};
     $self->{'class'}                     = $row->{'class'};
 
+    $sth = $dbh->prepare("SELECT branchcode, branchname FROM borrower_attribute_types_branches, branches WHERE b_branchcode = branchcode AND bat_code = ?;");
+    $sth->execute( $code );
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push @{ $self->{branches} }, $data;
+    }
+    $sth->finish();
+
     bless $self, $class;
     return $self;
 }
@@ -219,6 +238,22 @@ sub store {
     $sth->bind_param(11, $self->{'code'});
     $sth->execute;
 
+    if ( defined $$self{branches} ) {
+        $sth = $dbh->prepare("DELETE FROM borrower_attribute_types_branches WHERE bat_code = ?");
+        $sth->execute( $$self{code} );
+        $sth = $dbh->prepare(
+            "INSERT INTO borrower_attribute_types_branches
+                        ( bat_code, b_branchcode )
+                        VALUES ( ?, ? )"
+        );
+        for my $branchcode ( @{$$self{branches}} ) {
+            next if not $branchcode;
+            $sth->bind_param( 1, $$self{code} );
+            $sth->bind_param( 2, $branchcode );
+            $sth->execute;
+        }
+    }
+    $sth->finish;
 }
 
 =head2 code
@@ -250,6 +285,24 @@ sub description {
     @_ ? $self->{'description'} = shift : $self->{'description'};
 }
 
+=head2 branches
+
+=over 4
+
+my $branches = $attr_type->branches();
+$attr_type->branches($branches);
+
+=back
+
+Accessor.
+
+=cut
+
+sub branches {
+    my $self = shift;
+    @_ ? $self->{branches} = shift : $self->{branches};
+}
+
 =head2 repeatable
 
   my $repeatable = $attr_type->repeatable();
@@ -432,6 +485,7 @@ sub delete {
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare_cached("DELETE FROM borrower_attribute_types WHERE code = ?");
     $sth->execute($code);
+    $sth->finish;
 }
 
 =head2 num_patrons
diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm
index 33d2407..cecb630 100644
--- a/C4/Members/Attributes.pm
+++ b/C4/Members/Attributes.pm
@@ -70,6 +70,7 @@ marked for OPAC display are returned.
 sub GetBorrowerAttributes {
     my $borrowernumber = shift;
     my $opac_only = @_ ? shift : 0;
+    my $branch_limit = @_ ? shift : 0;
 
     my $dbh = C4::Context->dbh();
     my $query = "SELECT code, description, attribute, lib, password, display_checkout, category_code, class
@@ -94,6 +95,7 @@ sub GetBorrowerAttributes {
             class             => $row->{'class'},
         }
     }
+    $sth->finish;
     return \@results;
 }
 
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 1545f0e..e808e1d 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -22,6 +22,7 @@ use warnings;
 
 use CGI;
 use C4::Auth;
+use C4::Branch;
 use C4::Context;
 use C4::Koha;
 use C4::Output;
@@ -67,13 +68,32 @@ $template->param(  script_name => $script_name,
 # called by default. Used to create form to add or  modify a record
 if ($op eq 'add_form') {
 	my $data;
+    my @selected_branches;
 	if ($id) {
 		my $sth=$dbh->prepare("select id, category, authorised_value, lib, lib_opac, imageurl from authorised_values where id=?");
 		$sth->execute($id);
 		$data=$sth->fetchrow_hashref;
+        $sth = $dbh->prepare("SELECT b.branchcode, b.branchname FROM authorised_values_branches AS avb, branches AS b WHERE avb.branchcode = b.branchcode AND avb.av_id = ?;");
+        $sth->execute( $id );
+        while ( my $branch = $sth->fetchrow_hashref ) {
+            push @selected_branches, $branch;
+        }
 	} else {
 		$data->{'category'} = $input->param('category');
 	}
+
+    my $branches = GetBranches;
+    my @branches_loop;
+
+    foreach my $branch (sort keys %$branches) {
+        my $selected = ( grep {$_->{branchcode} eq $branch} @selected_branches ) ? 1 : 0;
+        push @branches_loop, {
+            branchcode => $branches->{$branch}{branchcode},
+            branchname => $branches->{$branch}{branchname},
+            selected => $selected,
+        };
+    }
+
 	if ($id) {
 		$template->param(action_modify => 1);
 		$template->param('heading_modify_authorized_value_p' => 1);
@@ -92,6 +112,7 @@ if ($op eq 'add_form') {
                          id               => $data->{'id'},
                          imagesets        => C4::Koha::getImageSets( checked => $data->{'imageurl'} ),
                          offset           => $offset,
+                         branches_loop    => \@branches_loop,
                      );
                           
 ################## ADD_VALIDATE ##################################
@@ -102,6 +123,7 @@ if ($op eq 'add_form') {
     my $imageurl     = $input->param( 'imageurl' ) || '';
 	$imageurl = '' if $imageurl =~ /removeImage/;
     my $duplicate_entry = 0;
+    my @branches = $input->param('branches');
 
     if ( $id ) { # Update
         my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id = ? ");
@@ -125,7 +147,21 @@ if ($op eq 'add_form') {
             my $lib_opac = $input->param('lib_opac');
             undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
             undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string
-            $sth->execute($new_category, $new_authorised_value, $lib, $lib_opac, $imageurl, $id);          
+            $sth->execute($new_category, $new_authorised_value, $lib, $lib_opac, $imageurl, $id);
+            if ( @branches ) {
+                $sth = $dbh->prepare("DELETE FROM authorised_values_branches WHERE av_id = ?");
+                $sth->execute( $id );
+                $sth = $dbh->prepare(
+                    "INSERT INTO authorised_values_branches
+                                ( av_id, branchcode )
+                                VALUES ( ?, ? )"
+                );
+                for my $branchcode ( @branches ) {
+                    next if not $branchcode;
+                    $sth->execute($id, $branchcode);
+                }
+            }
+            $sth->finish;
             print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$new_category."&offset=$offset\"></html>";
             exit;
         }
@@ -137,13 +173,25 @@ if ($op eq 'add_form') {
         ($duplicate_entry) = $sth->fetchrow_array();
         unless ( $duplicate_entry ) {
             my $sth=$dbh->prepare( 'INSERT INTO authorised_values
-                                    ( id, category, authorised_value, lib, lib_opac, imageurl )
-                                    values (?, ?, ?, ?, ?, ?)' );
+                                    ( category, authorised_value, lib, lib_opac, imageurl )
+                                    values (?, ?, ?, ?, ?)' );
     	    my $lib = $input->param('lib');
     	    my $lib_opac = $input->param('lib_opac');
     	    undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
     	    undef $lib_opac if ($lib_opac eq ""); # to insert NULL instead of a blank string
-    	    $sth->execute($id, $new_category, $new_authorised_value, $lib, $lib_opac, $imageurl );
+            $sth->execute( $new_category, $new_authorised_value, $lib, $lib_opac, $imageurl );
+            $id = $dbh->{'mysql_insertid'};
+            if ( @branches ) {
+                $sth = $dbh->prepare(
+                    "INSERT INTO authorised_values_branches
+                                ( av_id, branchcode )
+                                VALUES ( ?, ? )"
+                );
+                for my $branchcode ( @branches ) {
+                    next if not $branchcode;
+                    $sth->execute($id, $branchcode);
+                }
+            }
     	    print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."&offset=$offset\"></html>";
     	    exit;
         }
@@ -176,6 +224,8 @@ if ($op eq 'add_form') {
 	my $id = $input->param('id');
 	my $sth=$dbh->prepare("delete from authorised_values where id=?");
 	$sth->execute($id);
+    $sth = $dbh->prepare("DELETE FROM authorised_values_branches WHERE id = ?");
+    $sth->execute($id);
 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=$searchfield&offset=$offset\"></html>";
 	exit;
 													# END $OP eq DELETE_CONFIRMED
diff --git a/admin/categorie.pl b/admin/categorie.pl
index 521346b..e93d0b3 100755
--- a/admin/categorie.pl
+++ b/admin/categorie.pl
@@ -36,11 +36,12 @@
 # with Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
+
 use CGI;
 use C4::Context;
 use C4::Auth;
+use C4::Branch;
 use C4::Output;
 use C4::Dates;
 use C4::Form::MessagingPreferences;
@@ -90,16 +91,34 @@ if ($op eq 'add_form') {
 	
 	#---- if primkey exists, it's a modify action, so read values to modify...
 	my $data;
+    my @selected_branches;
 	if ($categorycode) {
 		my $dbh = C4::Context->dbh;
 		my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?");
 		$sth->execute($categorycode);
 		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
+
+        $sth = $dbh->prepare("SELECT b.branchcode, b.branchname FROM categories_branches AS cb, branches AS b WHERE cb.branchcode = b.branchcode AND cb.categorycode = ?");
+        $sth->execute( $categorycode );
+        while ( my $branch = $sth->fetchrow_hashref ) {
+            push @selected_branches, $branch;
+        }
+        $sth->finish;
+    }
 
     $data->{'enrolmentperioddate'} = undef if ($data->{'enrolmentperioddate'} eq '0000-00-00');
 
+    my $branches = GetBranches;
+    my @branches_loop;
+    foreach my $branch (sort keys %$branches) {
+        my $selected = ( grep {$$_{branchcode} eq $branch} @selected_branches ) ? 1 : 0;
+        push @branches_loop, {
+            branchcode => $$branches{$branch}{branchcode},
+            branchname => $$branches{$branch}{branchname},
+            selected => $selected,
+        };
+    }
+
 	$template->param(description        => $data->{'description'},
 				enrolmentperiod         => $data->{'enrolmentperiod'},
 				enrolmentperioddate     => C4::Dates::format_date($data->{'enrolmentperioddate'}),
@@ -113,7 +132,8 @@ if ($op eq 'add_form') {
 				category_type           => $data->{'category_type'},
 				DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 				"type_".$data->{'category_type'} => 1,
-				SMSSendDriver => C4::Context->preference("SMSSendDriver")
+				SMSSendDriver => C4::Context->preference("SMSSendDriver"),
+                branches_loop           => \@branches_loop,
 				);
     if (C4::Context->preference('EnhancedMessagingPreferences')) {
         C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode } , $template);
@@ -132,6 +152,22 @@ if ($op eq 'add_form') {
 	if ($is_a_modif) {
             my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=? WHERE categorycode=?");
             $sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','categorycode'));
+            my @branches = $input->param("branches");
+            if ( @branches ) {
+                $sth = $dbh->prepare("DELETE FROM categories_branches WHERE categorycode = ?");
+                $sth->execute( $input->param( "categorycode" ) );
+                $sth = $dbh->prepare(
+                    "INSERT INTO categories_branches
+                                ( categorycode, branchcode )
+                                VALUES ( ?, ? )"
+                );
+                for my $branchcode ( @branches ) {
+                    next if not $branchcode;
+                    $sth->bind_param( 1, $input->param( "categorycode" ) );
+                    $sth->bind_param( 2, $branchcode );
+                    $sth->execute;
+                }
+            }
             $sth->finish;
         } else {
             my $sth=$dbh->prepare("INSERT INTO categories  (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?,?)");
diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl
index 638456e..108b6a4 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -19,12 +19,13 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-use strict;
-use warnings;
+use Modern::Perl;
+
 use CGI;
 use List::MoreUtils qw/uniq/;
 
 use C4::Auth;
+use C4::Branch;
 use C4::Context;
 use C4::Output;
 use C4::Koha;
@@ -82,10 +83,20 @@ exit 0;
 sub add_attribute_type_form {
     my $template = shift;
 
+    my $branches = GetBranches;
+    my @branches_loop;
+    foreach my $branch (sort keys %$branches) {
+        push @branches_loop, {
+            branchcode => $$branches{$branch}{branchcode},
+            branchname => $$branches{$branch}{branchname},
+        };
+    }
+
     $template->param(
         attribute_type_form => 1,
         confirm_op => 'add_attribute_type_confirmed',
         categories => GetBorrowercategoryList,
+        branches_loop => \@branches_loop,
     );
     authorised_value_category_list($template);
     pa_classes($template);
@@ -162,6 +173,8 @@ sub add_update_attribute_type {
     $attr_type->display_checkout($display_checkout);
     $attr_type->category_code($input->param('category_code'));
     $attr_type->class($input->param('class'));
+    my @branches = $input->param('branches');
+    $attr_type->branches( \@branches );
 
     if ($op eq 'edit') {
         $template->param(edited_attribute_type => $attr_type->code());
@@ -244,6 +257,20 @@ sub edit_attribute_type_form {
     authorised_value_category_list($template, $attr_type->authorised_value_category());
     pa_classes( $template, $attr_type->class );
 
+
+    my $branches = GetBranches;
+    my @branches_loop;
+    my $selected_branches = $attr_type->branches;
+    foreach my $branch (sort keys %$branches) {
+        my $selected = ( grep {$$_{branchcode} eq $branch} @$selected_branches ) ? 1 : 0;
+        push @branches_loop, {
+            branchcode => $branches->{$branch}{branchcode},
+            branchname => $branches->{$branch}{branchname},
+            selected => $selected,
+        };
+    }
+    $template->param( branches_loop => \@branches_loop );
+
     $template->param ( category_code => $attr_type->category_code );
     $template->param ( category_description => $attr_type->category_description );
 
@@ -259,8 +286,9 @@ sub edit_attribute_type_form {
 sub patron_attribute_type_list {
     my $template = shift;
 
-    my @attr_types = C4::Members::AttributeTypes::GetAttributeTypes();
-    my @classes = uniq( map {$_->{class}} @attr_types );
+    my @attr_types = C4::Members::AttributeTypes::GetAttributeTypes( 1, 1 );
+
+    my @classes = uniq( map { $_->{class} } @attr_types );
     @classes = sort @classes;
 
     my @attributes_loop;
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index d5778a4..b9581f1 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -221,8 +221,11 @@ sub build_authorized_values_list {
         #---- "true" authorised value
     }
     else {
+        my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
         $authorised_values_sth->execute(
-            $tagslib->{$tag}->{$subfield}->{authorised_value} );
+            $branch_limit ? $branch_limit : (),
+            $tagslib->{$tag}->{$subfield}->{authorised_value}
+        );
 
         push @authorised_values, ""
           unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
@@ -232,6 +235,7 @@ sub build_authorized_values_list {
             $authorised_lib{$value} = $lib;
         }
     }
+    $authorised_values_sth->finish;
     return CGI::scrolling_list(
         -name     => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
         -values   => \@authorised_values,
@@ -523,12 +527,14 @@ sub build_tabs {
     my @loop_data = ();
     my $tag;
 
-    my $authorised_values_sth = $dbh->prepare(
-        "select authorised_value,lib
-        from authorised_values
-        where category=? order by lib"
-    );
-    
+    my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
+    my $query = "SELECT authorised_value, lib
+                FROM authorised_values";
+    $query .= qq{ JOIN authorised_values_branches ON ( id = av_id AND ( branchcode = ? OR branchcode IS NULL ) )} if $branch_limit;
+    $query .= " WHERE category = ?";
+    $query .= " GROUP BY lib ORDER BY lib, lib_opac";
+    my $authorised_values_sth = $dbh->prepare( $query );
+
     # in this array, we will push all the 10 tabs
     # to avoid having 10 tabs in the template : they will all be in the same BIG_LOOP
     my @BIG_LOOP;
@@ -713,6 +719,7 @@ sub build_tabs {
             };
         }
     }
+    $authorised_values_sth->finish;
     $template->param( BIG_LOOP => \@BIG_LOOP );
 }
 
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 9c8120e..847434c 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -104,8 +104,7 @@ sub generate_subfield_form {
   
   my $frameworkcode = &GetFrameworkCode($biblionumber);
         my %subfield_data;
-        my $dbh = C4::Context->dbh;        
-        my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib");
+        my $dbh = C4::Context->dbh;
         
         my $index_subfield = int(rand(1000000)); 
         if ($subfieldtag eq '@'){
@@ -200,11 +199,11 @@ sub generate_subfield_form {
                   #---- "true" authorised value
             }
             else {
-                  push @authorised_values, "" unless ( $subfieldlib->{mandatory} );
-                  $authorised_values_sth->execute( $subfieldlib->{authorised_value} );
-                  while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
-                      push @authorised_values, $value;
-                      $authorised_lib{$value} = $lib;
+                  push @authorised_values, qq{} unless ( $subfieldlib->{mandatory} );
+                  my $av = GetAuthorisedValues( $subfieldlib->{authorised_value} );
+                  for my $r ( @$av ) {
+                      push @authorised_values, $r->{authorised_value};
+                      $authorised_lib{$r->{authorised_value}} = $r->{lib};
                   }
             }
 
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 4912e19..f921ce8 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2810,6 +2810,44 @@ CREATE TABLE IF NOT EXISTS `social_data` (
   PRIMARY KEY  (`isbn`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+--
+-- Table structure for table categories_branches
+--
+
+DROP TABLE IF EXISTS categories_branches;
+CREATE TABLE categories_branches( -- association table between categories and branches
+    categorycode VARCHAR(10),
+    branchcode VARCHAR(10),
+    FOREIGN KEY (categorycode) REFERENCES categories(categorycode) ON DELETE CASCADE,
+    FOREIGN KEY (branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table authorised_values_branches
+--
+
+DROP TABLE IF EXISTS authorised_values_branches;
+CREATE TABLE authorised_values_branches( -- association table between authorised_values and branches
+    av_id INTEGER,
+    branchcode VARCHAR(10),
+    FOREIGN KEY (av_id) REFERENCES authorised_values(id) ON DELETE CASCADE,
+    FOREIGN KEY (branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+
+--
+-- Table structure for table borrower_attribute_types_branches
+--
+
+DROP TABLE IF EXISTS borrower_attribute_types_branches;
+CREATE TABLE borrower_attribute_types_branches( -- association table between borrower_attribute_types and branches
+    bat_code VARCHAR(10),
+    b_branchcode VARCHAR(10),
+    FOREIGN KEY (bat_code) REFERENCES borrower_attribute_types(code) ON DELETE CASCADE,
+    FOREIGN KEY (b_branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 503c8ee..f9e287e 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5146,6 +5146,23 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+
+
+
+
+$DBversion = "3.06.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do(qq{CREATE TABLE borrower_attribute_types_branches(bat_code VARCHAR(10), b_branchcode VARCHAR(10),FOREIGN KEY (bat_code) REFERENCES borrower_attribute_types(code) ON DELETE CASCADE,FOREIGN KEY (b_branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE ) ENGINE=INNODB DEFAULT CHARSET=utf8;});
+
+    $dbh->do(qq{CREATE TABLE categories_branches(categorycode VARCHAR(10), branchcode VARCHAR(10), FOREIGN KEY (categorycode) REFERENCES categories(categorycode) ON DELETE CASCADE, FOREIGN KEY (branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE ) ENGINE=INNODB DEFAULT CHARSET=utf8;});
+
+    $dbh->do(qq{CREATE TABLE authorised_values_branches(av_id INTEGER, branchcode VARCHAR(10), FOREIGN KEY (av_id) REFERENCES authorised_values(id) ON DELETE CASCADE, FOREIGN KEY  (branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE ) ENGINE=INNODB DEFAULT CHARSET=utf8;});
+
+    print "Upgrade to $DBversion done (Add 3 associations tables with branches)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index 0c806ce..728615a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -13,7 +13,10 @@
 		sortList: [[1,0]],
 		headers: { 4: { sorter: false}, 5: { sorter: false}}
 		   		}).tablesorterPager({container: $("#pagertable_authorized_values"),positionFixed: false,size: 50});
-	
+
+    if ( $("#branches option:selected").length < 1 ) {
+        $("#branches option:first").attr("selected", "selected");
+    }
 }); </script>
 
 <script type="text/JavaScript" language="JavaScript">
@@ -77,6 +80,21 @@
             <label for="lib_opac">Description (OPAC)</label>
             <input type="text" name="lib_opac" id="lib_opac" value="[% lib_opac %]" maxlength="80" />
         </li>
+        <li><label for="branches">Branches limitation: </label>
+            <select id="branches" name="branches" multiple size="10">
+                <option value="">All branches</option>
+                [% FOREACH branch IN branches_loop %]
+                  [% IF ( branch.selected ) %]
+                    <option selected="selected" value="[% branch.branchcode %]">[% branch.branchname %]</option>
+                  [% ELSE %]
+                    <option value="[% branch.branchcode %]">[% branch.branchname %]</option>
+                  [% END %]
+                [% END %]
+            </select>
+            <span>Select All if this authorised value must to be displayed all the time. Otherwise select librairies you want to associate with this value.
+            </span>
+        </li>
+
 		</ol>
 		<div id="icons" class="toptabs">
 		<h5 style="margin-left:10px;">Choose an Icon:</h5>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
index d2c353e..881f545 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
@@ -12,6 +12,10 @@
 		widgets: ['zebra'],
 		headers: { 11: { sorter: false}}
 	}).tablesorterPager({container: $("#pagertable_categorie"),positionFixed: false,size: 20});
+
+    if ( $("#branches option:selected").length < 1 ) {
+        $("#branches option:first").attr("selected", "selected");
+    }
 }); </script>
 [% INCLUDE 'calendar.inc' %]
 <script type="text/javascript">
@@ -179,7 +183,22 @@
 					[% IF ( type_P ) %]<option value="P" selected="selected">Professional</option>[% ELSE %]<option value="P">Professional</option>[% END %]
 					[% IF ( type_X ) %]<option value="X" selected="selected">Statistical</option>[% ELSE %]<option value="X">Statistical</option>[% END %]
 					</select>
-	</li></ol>
+    </li>
+    <li><label for="branches">Branches limitation: </label>
+        <select id="branches" name="branches" multiple size="10">
+            <option value="">All branches</option>
+            [% FOREACH branch IN branches_loop %]
+              [% IF ( branch.selected ) %]
+                <option selected="selected" value="[% branch.branchcode %]">[% branch.branchname %]</option>
+              [% ELSE %]
+                <option value="[% branch.branchcode %]">[% branch.branchname %]</option>
+              [% END %]
+            [% END %]
+        </select>
+        <span>Select All if this category type must to be displayed all the time. Otherwise select librairies you want to associate with this value.
+        </span>
+    </li>
+    </ol>
 </fieldset>
 
     [% IF ( EnhancedMessagingPreferences ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index 54bd8f2..3c61a98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -15,6 +15,11 @@
 
 <script type="text/javascript">
 //<![CDATA[
+$(document).ready(function() {
+    if ( $("#branches option:selected").length < 1 ) {
+        $("#branches option:first").attr("selected", "selected");
+    }
+} );
 
 function DoCancel(f) {
   f.op.value='';
@@ -186,6 +191,20 @@ function CheckAttributeTypeForm(f) {
                   to be chosen from the authorized value list.  However, an authorized value list is not 
                   enforced during batch patron import.</span>
         </li>
+        <li><label for="branches">Branches limitation: </label>
+            <select id="branches" name="branches" multiple size="10">
+                <option value="">All branches</option>
+                [% FOREACH branch IN branches_loop %]
+                  [% IF ( branch.selected ) %]
+                    <option selected="selected" value="[% branch.branchcode %]">[% branch.branchname %]</option>
+                  [% ELSE %]
+                    <option value="[% branch.branchcode %]">[% branch.branchname %]</option>
+                  [% END %]
+                [% END %]
+            </select>
+            <span>Select All if this attribute type must to be displayed all the time. Otherwise select librairies you want to associate with this value.
+            </span>
+        </li>
         <li>
             <label for="category">Category: </label>
             <select name="category_code" id="category">
diff --git a/members/member.pl b/members/member.pl
index 9b793f4..0b4a4c9 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -134,8 +134,8 @@ foreach my $borrower(@$results[$from..$to-1]){
 
   my %row = (
     count => $index++,
-	%$borrower,
-	%{$categories_dislay{$$borrower{categorycode}}},
+    %$borrower,
+    (defined $categories_dislay{ $borrower->{categorycode} }?   %{ $categories_dislay{ $borrower->{categorycode} } }:()),
     overdues => $od,
     issues => $issue,
     odissue => "$od/$issue",
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 9d59e3a..e1f5627 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -259,7 +259,13 @@ if ($op eq "show"){
 # now, build the item form for entering a new item
 my @loop_data =();
 my $i=0;
-my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib");
+my $query = qq{
+    SELECT authorised_value, lib FROM authorised_values
+    JOIN authorised_values_branches ON ( id = av_id AND ( branchcode = ? OR branchcode IS NULL ) )
+    WHERE category = ?
+    GROUP BY lib ORDER BY lib, lib_opac
+};
+my $authorised_values_sth = $dbh->prepare( $query );
 
 my $branches = GetBranchesLoop();  # build once ahead of time, instead of multiple times later.
 
@@ -352,7 +358,7 @@ foreach my $tag (sort keys %{$tagslib}) {
       }
       else {
           push @authorised_values, ""; # unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-          $authorised_values_sth->execute( $tagslib->{$tag}->{$subfield}->{authorised_value} );
+          $authorised_values_sth->execute( C4::Context->userenv ? C4::Context->userenv->{"branch"} : "", $tagslib->{$tag}->{$subfield}->{authorised_value} );
           while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
               push @authorised_values, $value;
               $authorised_lib{$value} = $lib;
@@ -420,6 +426,8 @@ foreach my $tag (sort keys %{$tagslib}) {
     $i++
   }
 } # -- End foreach tag
+$authorised_values_sth->finish;
+
 
 
     # what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index 83db522..78353c9 100755
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -304,7 +304,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
 } else {
     if ($extended) {
         my @matchpoints = ();
-        my @attr_types = C4::Members::AttributeTypes::GetAttributeTypes();
+        my @attr_types = C4::Members::AttributeTypes::GetAttributeTypes(undef, 1);
         foreach my $type (@attr_types) {
             my $attr_type = C4::Members::AttributeTypes->fetch($type->{code});
             if ($attr_type->unique_id()) {
-- 
1.7.7.3


From oleonard at myacpl.org  Fri Apr  6 15:21:47 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  6 Apr 2012 09:21:47 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Authorities and Cataloging help)
Message-ID: <1333718508-14437-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Authorities and Cataloging help pages
---
 .../modules/help/authorities/authorities-home.tt   |    4 +-
 .../en/modules/help/authorities/authorities.tt     |    8 ++--
 .../prog/en/modules/help/authorities/detail.tt     |    4 +-
 .../prog/en/modules/help/catalogue/issuehistory.tt |    4 +-
 .../prog/en/modules/help/catalogue/moredetail.tt   |    4 +-
 .../prog/en/modules/help/catalogue/search.tt       |   10 +++---
 .../prog/en/modules/help/cataloguing/addbiblio.tt  |   30 ++++++++++----------
 .../prog/en/modules/help/cataloguing/addbooks.tt   |    2 +-
 .../prog/en/modules/help/cataloguing/additem.tt    |   20 ++++++------
 .../prog/en/modules/help/cataloguing/merge.tt      |    4 +-
 .../prog/en/modules/help/cataloguing/moveitem.tt   |   10 +++---
 11 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
index fcb8b9c..20fb975 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
@@ -4,7 +4,7 @@
 
 <p>Authority records are a way of controlling fields in your MARC records. Using authority records will provide you with control over subject headings, personal names and places.</p>
 
-<h2>Searching Authorities</h2>
+<h2>Searching authorities</h2>
 
 <p>From the authorities page you can search for existing terms and the bibliographic records they are attached to.</p>
 
@@ -12,7 +12,7 @@
 
 <p>Clicking on the authority record summary will open the full record and the option to edit the record.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
 
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
index 7cfe9cc..cad2f26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
@@ -1,14 +1,14 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h2>Adding Authorities</h2>
+<h2>Adding authorities</h2>
 
-<p>To add a new authority record, choose the authority type from the 'New Authority' button.</p>
+<p>To add a new authority record, choose the authority type from the 'New authority' button.</p>
 
 <p>The form that appears will allow you to enter all of the necessary details regarding your authority record.</p>
 
 <p>To expand collapsed values simply click on the title and the subfields will appear.</p>
 
-<h2>Editing Authorities</h2>
+<h2>Editing authorities</h2>
 
 <p>Authorities can be edited by clicking on the authority summary from the search results and then clicking the 'Edit' button above the record.</p>
 
@@ -16,6 +16,6 @@
 
 <p>To delete an authority record you first must make sure it's not linked to any bibliographic records. If it is not used by any bibliographic records a 'Delete' link will appear to the right of the record on the search results and as a button that appears after clicking on the summary of the authority record.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
index e411afa..e3c8752 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
@@ -4,7 +4,7 @@
 
 <p>Authority records are a way of controlling fields in your MARC records. Using authority records will provide you with control over subject headings, personal names and places.</p>
 
-<h2>Searching Authorities</h2>
+<h2>Searching authorities</h2>
 
 <p>From the authorities page you can search for existing terms and the bibliographic records they are attached to.</p>
 
@@ -12,6 +12,6 @@
 
 <p>Clicking on the authority record summary will open the full record and the option to edit the record.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
index 58270cf..8dd53e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
@@ -1,11 +1,11 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Checkout History</h1>
+<h1>Checkout history</h1>
 
 <p>Each bibliographic record keeps a circulation history (with or without the patron information depending on your settings), but each item also has its own circulation history page. To see this, click on the 'Items' tab to the left of the record you are viewing.</p>
 
 <p>Below the 'History' heading is a link to 'View item's checkout history,' clicking that will open up the item's history which will look slightly different from the bibliographic record's history page.</p>
 
-<p><strong>See the full documentation for Item Checkout History in the <a href="http://manual.koha-community.org/3.6/en/catitems.html#itemcirchistory">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for item checkout history in the <a href="http://manual.koha-community.org/3.6/en/catitems.html#itemcirchistory">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
index d91aaa7..edea67e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Item Details</h1>
+<h1>Item details</h1>
 
 <p>This page provides information regarding all of the items attached to a record.  From here you can easily mark and item lost, damaged or withdrawn.  You can slo view the circulation history or edit the items.</p>
 
-<p><strong>See the full documentation for Item Records in the <a href="http://manual.koha-community.org/3.6/en/catitems.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for item records in the <a href="http://manual.koha-community.org/3.6/en/catitems.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
index 3dfea20..2b3db1b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
@@ -4,7 +4,7 @@
 
 <p>To see more search options click [More Options] at the bottom of the page. This will allow for more advanced boolean searching.</p>
 
-<h2>Searching Subtypes on the Staff Client</h2>
+<h2>Searching subtypes in the Staff Client</h2>
 
 <p>Below is a summary of  the various pieces of the advanced search limit: </p>
 
@@ -19,7 +19,7 @@
 
 <h3>Content</h3>
 
-<p>There are three indexes that comprise Content: 'fic' is derived from 003/33; 'bio' is derived from the 008/34 and 'mus' is derived from LEADER/06. Common values for each of these are:</p>
+<p>There are three indexes that comprise content: 'fic' is derived from 003/33; 'bio' is derived from the 008/34 and 'mus' is derived from LEADER/06. Common values for each of these are:</p>
 
 <ul><li>fic:1 Fiction</li>
 <li>fic:0 Non fiction</li>
@@ -38,10 +38,10 @@
 <li>l-format:ss Cassette recording</li>
 <li>l-format:vf VHS tape / Videocassette</li>
 <li>l-format:vd DVD video / Videodisc</li>
-<li>l-format:co CD Software</li>
+<li>l-format:co CD software</li>
 <li>l-format:cr Website</li></ul>
 
-<h3>Additional Content Types</h3>
+<h3>Additional content types</h3>
 
 <p>The index name is 'ctype' is taken from the 008 and it's where we get the 'additional content types'. It's position 008/24-28 field. Common values are: </p>
 
@@ -68,6 +68,6 @@
 <li>ctype:w Law reports and digests</li>
 <li>ctype:z Treaties</li></ul>
 
-<p><strong>See the full documentation for Searching in the <a href="http://manual.koha-community.org/3.6/en/searching.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for searching in the <a href="http://manual.koha-community.org/3.6/en/searching.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
index 55774dc..d3a5cd5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
@@ -5,7 +5,7 @@
 <p>Records can be added to Koha via original or copy cataloging. If you would like to catalog a record using a blank template</p>
 
 <ul>
-	<li>Click 'New Record'
+    <li>Click 'New record'
 <ul>
 	<li>Choose the framework you would like to base your record off of</li>
 </ul>
@@ -15,18 +15,18 @@
 <p>If you want to catalog a record based on an existing record at another library</p>
 
 <ul>
-	<li>Click 'z39.50 Search'
+    <li>Click 'Z39.50 search'
 <ul>
 	<li>Search for the item you would like to catalog
 <ul>
 	<li>Tip: If no results are found, try searching for fewer fields, not all Z39.50 targets can search all of the fields above.</li>
 </ul>
 </li>
-	<li>Search targets can be altered by using the Z39.50 Admin area.</li>
-	<li>From the results you can view the MARC or Card view for the records or choose to Import them into Koha
+    <li>Search targets can be altered by using the Z39.50 admin area.</li>
+    <li>From the results you can view the MARC or Card view for the records or choose to import them into Koha
 <ul>
-	<li>In addition to the Import link to the right of each title, you can click on the title you're interested in and a menu will pop up with links to preview the record and import it</li>
-	<li>If you don't find the title you need in your Z39.50 search results you can click the 'Try Another Search' button at the bottom left of your results</li>
+    <li>In addition to the 'Import' link to the right of each title, you can click on the title you're interested in and a menu will pop up with links to preview the record and import it</li>
+    <li>If you don't find the title you need in your Z39.50 search results you can click the 'Try another search' button at the bottom left of your results</li>
 </ul>
 </li>
 </ul>
@@ -37,7 +37,7 @@
 
 <ul>
 	<li>To expand a collapsed tag click on the tag description</li>
-	<li>To get help from the Library of Congress on a Marc tag click the question mark (?) to the right of each field number
+    <li>To get help from the Library of Congress on a MARC tag click the question mark (?) to the right of each field number
 <ul>
 	<li>If you feel that this clutters the screen you can hide the question marks by unchecking the box next to the 'Show MARC tag documentation links' note at the top right of the editor</li>
 </ul>
@@ -67,28 +67,28 @@
 </li>
 </ul>
 
-<h2>Editing Records</h2>
+<h2>Editing records</h2>
 
-<p>To edit a record you can click 'Edit Biblio' from the search results on the cataloging page or by clicking the Edit button on the Bibliographic Record and choosing 'Edit Record'</p>
+<p>To edit a record you can click 'Edit Biblio' from the search results on the cataloging page or by clicking the Edit button on the Bibliographic Record and choosing 'Edit record'</p>
 
 <p>The record will open in the MARC editor</p>
 
-<p>The alternative is to search via Z39.50 to overlay your record with a fuller record found at another library. You can do this by choosing 'Replace Record via Z39.50' from the Edit menu.</p>
+<p>The alternative is to search via Z39.50 to overlay your record with a fuller record found at another library. You can do this by choosing 'Replace record via Z39.50' from the 'Edit' menu.</p>
 
 <p>Once you choose that you will be brought to a Z39.50 search window to search other libraries for the record in question.</p>
 
 <p>Once you have made your edits (via either method) you can click 'Save' at the top left of the editor.</p>
 
-<h2>Duplicating Records</h2>
+<h2>Duplicating records</h2>
 
-<p>Sometimes a copy of the record you need to catalog can't be found via Z39.50. In these cases you can create a duplicate of similar record and edit the necessary pieces to create a new record. To duplicate an existing record click 'Edit as New (Duplicate)' from the Edit menu on the Bibliographic Record</p>
+<p>Sometimes a copy of the record you need to catalog can't be found via Z39.50. In these cases you can create a duplicate of similar record and edit the necessary pieces to create a new record. To duplicate an existing record click 'Edit as new (duplicate)' from the 'Edit' menu on the bibliographic record</p>
 
-<p>This will open a new MARC record with the fields filled in with the values from the original Bibliographic Record.</p>
+<p>This will open a new MARC record with the fields filled in with the values from the original bibliographic record.</p>
 
-<h2>Merging Records</h2>
+<h2>Merging records</h2>
 
 <p>If you would like to merge together multiple records you can do that via the Lists tool.</p>
 
-<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.6/en/cataloging.html#catbibs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for cataloging in the <a href="http://manual.koha-community.org/3.6/en/cataloging.html#catbibs">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt
index 21a2be2..e394ae7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Cataloging Help</h1><h2>How to edit a bibliographic record?</h2>
+<h1>Cataloging help</h1><h2>How to edit a bibliographic record?</h2>
 
 <p>To edit a bibliographic record, use the cataloging search to find the record. This can be done either via the cataloging interface or the catalog search. A search with in the Cataloging module will search the catalog and the reservoir (see below).</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
index 43b2a31..169ecb7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h2>Adding Items</h2>
+<h2>Adding items</h2>
 
-<p>After saving a new bibliographic record, you will be redirected to a blank item record so that you can attach an item to the bibliographic record. You can also click 'Add Holdings' from the cataloging search results or you can add new item at any time by clicking 'New' on the bibliographic record and choosing 'New Item'</p>
+<p>After saving a new bibliographic record, you will be redirected to a blank item record so that you can attach an item to the bibliographic record. You can also click 'Add holdings' from the cataloging search results or you can add new item at any time by clicking 'New' on the bibliographic record and choosing 'New item'</p>
 
 <p>The item edit form will appear:</p>
 
@@ -25,9 +25,9 @@
 <p>Below the add form there are 3 buttons for adding the item</p>
 
 <ul>
-	<li>Add Item will add just the one item</li>
-	<li>Add &amp; Duplicate will add the item and fill in a new form with the same values for your to alter</li>
-	<li>Add Multiple Copies will ask how many copies and will then add that number of copies adding +1 to the barcode so each barcode is unique</li>
+    <li>'Add item' will add just the one item</li>
+    <li>'Add &amp; duplicate' will add the item and fill in a new form with the same values for your to alter</li>
+    <li>'Add multiple copies' will ask how many copies and will then add that number of copies adding +1 to the barcode so each barcode is unique</li>
 </ul>
 
 <p>Your added items will appear above the add form once submitted</p>
@@ -36,18 +36,18 @@
 
 <p>If you have SpineLabelShowPrintOnBibDetails set to 'Display' then there will also be a link to print a quick spine label next to each item.</p>
 
-<h2>Editing Items</h2>
+<h2>Editing items</h2>
 
 <p>Items can be edited in several ways.</p>
 
 <ul>
-	<li>Clicking 'Edit' and 'Edit Items' from the bibliographic record</li>
-	<li>Clicking 'Edit Items' beside the item on the 'Items' tab</li>
+    <li>Clicking 'Edit' and 'Edit items' from the bibliographic record</li>
+    <li>Clicking 'Edit items' beside the item on the 'Items' tab</li>
 </ul>
 
 <p>The edit menu is also where items can be deleted from</p>
 
-<h2>Deleting Items</h2>
+<h2>Deleting items</h2>
 
 <p>There are many ways to delete item records. If you only need to delete one item you can do this by opening up the detail page for the bib record and clicking the 'Edit' button at the top. From there you can choose to 'Edit items'.</p>
 
@@ -57,6 +57,6 @@
 
 <p>Finally you can use the batch delete tool to delete a batch of items.</p>
 
-<p><strong>See the full documentation for Adding/Editing Items in the <a href="http://manual.koha-community.org/3.6/en/catitems.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for adding/editing items in the <a href="http://manual.koha-community.org/3.6/en/catitems.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
index 854bafe..9e572ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Merging Items</h1>
+<h1>Merging items</h1>
 
 <p style="color: rgb(153, 0, 0);">Important: Merging will only work with two items that use the same bibliographic framework.</p>
 
@@ -20,6 +20,6 @@
 
 <p style="color: rgb(153, 0, 0);">Important: It is important to rebuild your zebra index immediately after merging records. If a search is performed for a record which has been deleted Koha will present the patrons with an error in the OPAC.</p>
 
-<p><strong>See the full documentation for Merging Items in the <a href="http://manual.koha-community.org/3.6/en/stafflists.html#mergebibrecs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for merging items in the <a href="http://manual.koha-community.org/3.6/en/stafflists.html#mergebibrecs">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
index d35eead..040316d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
@@ -1,15 +1,15 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Moving Items</h1>
+<h1>Moving items</h1>
 
-<p>Items can be moved from one bibliographic record to another using the Attach Item option</p>
+<p>Items can be moved from one bibliographic record to another using the 'Attach item' option</p>
 
-<p>Visit the bibliographic record you want to attach the item to and choose 'Attach Item' from the 'Edit' menu.</p>
+<p>Visit the bibliographic record you want to attach the item to and choose 'Attach item' from the 'Edit' menu.</p>
 
 <p>Simply enter the barcode for the item you want to move and click 'Select'</p>
 
-<p>If you want to move all items to a new record creating only one bibliographic record you can use the Merge Records tool instead.</p>
+<p>If you want to move all items to a new record creating only one bibliographic record you can use the 'Merge Records' tool instead.</p>
 
-<p><strong>See the full documentation for Moving Items in the <a href="http://manual.koha-community.org/3.6/en/catitems.html#moveitemrec">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for moving items in the <a href="http://manual.koha-community.org/3.6/en/catitems.html#moveitemrec">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.5.4


From oleonard at myacpl.org  Fri Apr  6 16:32:19 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  6 Apr 2012 10:32:19 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Circulation help)
Message-ID: <1333722739-15597-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Circulation help templates
---
 .../prog/en/modules/help/circ/branchoverdues.tt    |    4 +-
 .../prog/en/modules/help/circ/branchtransfers.tt   |    4 +-
 .../prog/en/modules/help/circ/circulation-home.tt  |    6 ++--
 .../prog/en/modules/help/circ/circulation.tt       |   22 ++++++++++----------
 .../prog/en/modules/help/circ/overdue.tt           |    2 +-
 .../prog/en/modules/help/circ/pendingreserves.tt   |    8 +++---
 .../prog/en/modules/help/circ/reserveratios.tt     |    4 +-
 .../prog/en/modules/help/circ/returns.tt           |   20 +++++++++---------
 .../en/modules/help/circ/selectbranchprinter.tt    |    4 +-
 .../en/modules/help/circ/transferstoreceive.tt     |    4 +-
 .../prog/en/modules/help/circ/view_holdsqueue.tt   |    6 ++--
 .../prog/en/modules/help/circ/waitingreserves.tt   |    6 ++--
 12 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
index e4043ec..4f8735d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 	   
-<h1>Overdues with Fines</h1>
+<h1>Overdues with fines</h1>
 
 <p>This report shows items that:
 <ul>
@@ -13,6 +13,6 @@
 
 <p>Once open the report can be filtered by the shelving location.</p>
 
-<p><strong>See the full documentation for Overdues with Fines in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#overduesfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for overdues with fines in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#overduesfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
index c89baf6..e5e917f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
@@ -16,11 +16,11 @@
 	<li>When the item arrives at the other library the librarian must check the item in to acknowledge that it is no longer in transit</li>
 	<li>The item will not be permanently moved to the new library
 <ul>
-	<li>The item shows the same 'Home Library' but has updated the 'Current Location' to note where it resides at this time</li>
+    <li>The item shows the same 'Home library' but has updated the 'Current location' to note where it resides at this time</li>
 </ul>
 </li>
 </ul>
 
-<p><strong>See the full documentation for Transfers in the <a href="http://manual.koha-community.org/3.6/en/transfers.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for transfers in the <a href="http://manual.koha-community.org/3.6/en/transfers.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
index 887bad5..8dc2101 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
@@ -2,9 +2,9 @@
  
 <h1>Circulation</h1>
 
-<p>Circulation functions can be accessed in several different ways. On the main page of the staff client there are some quick links in the center of the page to check items out, in or transfer them. For a complete listing of Circulation functions you can visit the Circulation page which is linked from the top left of every page or from the center of the main page.</p>
+<p>Circulation functions can be accessed in several different ways. On the main page of the staff client there are some quick links in the center of the page to check items out, in or transfer them. For a complete listing of circulation functions you can visit the Circulation page which is linked from the top left of every page or from the center of the main page.</p>
 
-<p>Before circulating your collection you will want to set your Global System Preferences, Basic Parameters and Patrons &amp; Circulation Rules.</p>
+<p>Before circulating your collection you will want to set your global system preferences, basic parameters and patrons &amp; circulation rules.</p>
 
 <p>While in Circulation you can jump between the tabs on the quick search box at the top of the screen by using the following hot keys:</p>
 
@@ -20,6 +20,6 @@
 
 <p style="background-color: #ffe599">Tip: Mac users use the OPTION button in place of ALT</p>
 
-<p><strong>See the full documentation for Circulation in the <a href="http://manual.koha-community.org/3.6/en/circulation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for circulation in the <a href="http://manual.koha-community.org/3.6/en/circulation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
index f9f92ab..6ff7d93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Checking Out (Issuing)</h1>
+<h1>Checking out (issuing)</h1>
 
 <p>To begin the checkout process you must enter the patron barcode or part of their name. The checkout option appears in three main places:</p>
 
@@ -10,14 +10,14 @@
 	<li>Check out option on the quick search bar</li>
 </ul>
 
-<h2>Checking Items Out</h2>
+<h2>Checking items out</h2>
 
 <p>To check an item out to a patron, first search for that patron using one of the many options listed above.</p>
 
 <p>At the top of the Check Out screen is a box for you to type or scan the item's barcode into.</p>
 
 <ul>
-	<li style="color: #990000;">Important: Many modern barcode scanners will send a 'return' to the browser, making it so that the 'Check Out' button is automatically clicked</li>
+    <li style="color: #990000;">Important: Many modern barcode scanners will send a 'return' to the browser, making it so that the 'Check out' button is automatically clicked</li>
 	<li>If the barcode is not found you will be prompted to use fast cataloging to add the item. Learn more about fast cataloging later in this manual.</li>
 </ul>
 
@@ -42,19 +42,19 @@
 
 <p>Once you have checked out all of the items for the patron you can print them a receipt by choosing one of two methods.</p>
 
-<p>The first is that you can simply hit enter on your keyboard or scan a blank piece of paper with your barcode scanner. The idea being that you're "checking out" a blank barcode which triggers Koha to print the 'Quick Slip.'</p>
+<p>The first is that you can simply hit enter on your keyboard or scan a blank piece of paper with your barcode scanner. The idea being that you're "checking out" a blank barcode which triggers Koha to print the 'Quick slip.'</p>
 
-<p>The second is that you can click the Print button at the top of the screen and choosing 'Print Slip' or 'Quick Slip'.</p>
+<p>The second is that you can click the Print button at the top of the screen and choosing 'Print slip' or 'Quick slip'.</p>
 
-<p>If you choose 'Print Slip' it will print all of the items the patron has checked out, including those they checked out at an earlier date. Choosing 'Quick Slip' will print only the items that were checked out today.</p>
+<p>If you choose 'Print slip' it will print all of the items the patron has checked out, including those they checked out at an earlier date. Choosing 'Quick slip' will print only the items that were checked out today.</p>
 
 <p>If there are notes on the patron record these will appear to the right of the checkout box</p>
 
 <p>If the patron has a hold waiting at the library that too will appear to the right of the check out box making it easy for the circulation librarian to see that there is another item to give the patron</p>
 
-<p>When you're done checking an item out if you have the DisplayClearScreenButton preference set to 'Show' you can clear the current patron by clicking the X in the top right of the patron's info to remove the current patron from the screen and start over.</p>
+<p>When you're done checking an item out if you have the DisplayClearScreenButton preference set to 'Show' you can clear the current patron by clicking the 'X' in the top right of the patron's info to remove the current patron from the screen and start over.</p>
 
-<h2>Check Out Messages</h2>
+<h2>Check out messages</h2>
 
 <p>There are times when Koha will prevent the librarian from being able to check out items to a patron. When this happens a warning will appear notifying the librarian of why the patron cannot check items out.</p>
 
@@ -68,7 +68,7 @@
 </li>
 	<li>Patron has been barred from the library
 <ul>
-	<li>This can be set by the librarian editing a patron record and adding a flag or by the Overdue/Notice Status Triggers</li>
+    <li>This can be set by the librarian editing a patron record and adding a flag or by the Overdue/Notice status triggers</li>
 </ul>
 </li>
 	<li>Patron needs to confirm their address
@@ -83,7 +83,7 @@
 </li>
 </ul>
 
-<h2>Check Out Warnings</h2>
+<h2>Check out warnings</h2>
 
 <p>Sometimes checkouts will trigger warning messages that will appear in a yellow box above the check out field. These warnings need to be acknowledged before you will be able to continue checking items out.</p>
 
@@ -105,6 +105,6 @@
 	<li>Barcode not found</li>
 </ul>
 
-<p><strong>See the full documentation for Checking Out in the <a href="http://manual.koha-community.org/3.6/en/circulation.html#checkingout">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for checking out in the <a href="http://manual.koha-community.org/3.6/en/circulation.html#checkingout">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
index c6446dd..fdf5689 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
@@ -11,6 +11,6 @@
 	<li style="background-color: #ffe599">Tip: Large libraries can choose to filter the report before it runs by setting the FilterBeforeOverdueReport system preference to 'Require'.</li>
 </ul>
 
-<p><strong>See the full documentation for Overdues in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#overduesreport">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for overdues in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#overduesreport">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
index 4ab1ae1..4c1594a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Holds to Pull</h1>
+<h1>Holds to pull</h1>
 
 <p>This report will show you all of the items that have holds on them that are available at the library for pulling.</p>
 
@@ -14,15 +14,15 @@
 </li>
 	<li>RandomizeHoldsQueueWeight
 <ul>
-	<li>If 'RandomizeHoldsQueueWeight' and 'StaticHoldsQueueWeight' are set, the list of library codes in the 'StaticHoldsQueueWeight' system preference are randomized rather than statically ranked. If RandomizeHoldsQueueWeight alone is set, the list of all available library codes is used to randomize the weight.</li>
+    <li>If 'RandomizeHoldsQueueWeight' and 'StaticHoldsQueueWeight' are set, the list of library codes in the 'StaticHoldsQueueWeight' system preference are randomized rather than statically ranked. If 'RandomizeHoldsQueueWeight' alone is set, the list of all available library codes is used to randomize the weight.</li>
 </ul>
 </li>
 </ul>
 
 <p>If neither 'RandomizeHoldsQueueWeight' or 'StaticHoldsQueueWeight' is set, the holds queue is statically ranked according to how they are pulled out of the system database.</p>
 
-<p>You can limit the results you see by using the Refine box on the left side of the page</p>
+<p>You can limit the results you see by using the 'Refine' box on the left side of the page</p>
 
-<p><strong>See the full documentation for Holds to Pull in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdspull">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for holds to pull in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdspull">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
index ab3b231..bdc3381 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Hold Ratios</h1>
+<h1>Hold ratios</h1>
 
 <p>Hold ratios help with collection development. Using this report you will be able to see how many of your patrons have holds on items and whether you should buy more. By default it will be set to the library needing 3 items per hold that has been placed. The report will tell you how many additional items need to be purchased to meet this quota.</p>
 
-<p><strong>See the full documentation for Hold Ratios in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdratios">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for hold ratios in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdratios">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
index 613a626..1e14d4b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Checking in (Returning)</h1>
+<h1>Checking in (returning)</h1>
 
 <p>Checking in items can be performed from various different locations</p>
 
@@ -10,7 +10,7 @@
 	<li>The check in link on the patron's checkout summary (and on the checkout summary page)</li>
 </ul>
 
-<h2>Checking Items In</h2>
+<h2>Checking items in</h2>
 
 <p>To check an item in scan the barcode for the item into the box provided. A summary of all items checked in will appear below the checkin box</p>
 
@@ -22,7 +22,7 @@
 
 <p>You can also choose to forgive all overdue charges for items you are checking in by checking the 'Forgive overdue charges' box before scanning items.</p>
 
-<h2>Check In Messages</h2>
+<h2>Check in messages</h2>
 
 <p>There are several messages that can appear when checking items in:</p>
 
@@ -39,20 +39,20 @@
 </li>
 	<li>If you're checking an item in that has a hold on it, you will be prompted to confirm the hold
 <ul>
-	<li>Clicking the Confirm hold button will mark the item as waiting for pickup from the library</li>
-	<li>Clicking the Print Slip and Confirm button will mark the item as waiting for pickup at the library and present the library with a receipt to print and place on the book with the patron's information</li>
-	<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
+    <li>Clicking the 'Confirm' hold button will mark the item as waiting for pickup from the library</li>
+    <li>Clicking the 'Print slip and confirm' button will mark the item as waiting for pickup at the library and present the library with a receipt to print and place on the book with the patron's information</li>
+    <li>Ignoring the hold will leave the item on hold, but leave its status as available (it will not cancel the hold)</li>
 </ul>
 </li>
 	<li>If you're checking in an item that has a hold on it at another library you will be prompted to confirm and transfer the item
 <ul>
-	<li>Clicking the Confirm hold and Transfer button will mark the item as in transit to the library where the hold was placed</li>
-	<li>Clicking the Print Slip, Transfer and Confirm button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information</li>
-	<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
+    <li>Clicking the 'Confirm hold and transfer' button will mark the item as in transit to the library where the hold was placed</li>
+    <li>Clicking the 'Print slip, transfer and confirm' button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information</li>
+    <li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
 </ul>
 </li>
 </ul>
 
-<p><strong>See the full documentation for Checking In in the <a href="http://manual.koha-community.org/3.6/en/checkingin.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for checking in in the <a href="http://manual.koha-community.org/3.6/en/checkingin.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
index 4f399cc..b913cbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Set Library</h1>
+<h1>Set library</h1>
 
 <p>By default you will enter the staff client as if you are at your home library. This library will appear in the top right of the Staff Client.</p>
 
@@ -8,6 +8,6 @@
 
 <p>Once you have saved your changes you new library will appear in the top right.</p>
 
-<p><strong>See the full documentation for Setting your Library in the <a href="http://manual.koha-community.org/3.6/en/setlibrary.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for setting your library in the <a href="http://manual.koha-community.org/3.6/en/setlibrary.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
index 865aaa7..8f93352 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Transfers To Receive</h1>
+<h1>Transfers To receive</h1>
 
 <p>This report will list all of the items that Koha thinks are in transit to your library.</p>
 
@@ -8,6 +8,6 @@
 
 <p style="color: #990000">Important: An item is considered late based on the number of days you have entered in the TransfersMaxDaysWarning system preference.</p>
 
-<p><strong>See the full documentation for Transfers to Receive in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#transferstoreceive">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for transfers to receive in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#transferstoreceive">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
index 409cce0..8395024 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Holds Queue</h1>
+<h1>Holds queue</h1>
 
-<p>This report will show you all of the holds at your library. To generate this report, you must have the Build Holds Queue cron job running.</p>
+<p>This report will show you all of the holds at your library. To generate this report, you must have the 'Build holds queue' cron job running.</p>
 
-<p><strong>See the full documentation for the Holds Queue in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdsqueue">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the holds queue in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdsqueue">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
index eb1e3ec..417d7f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
@@ -1,11 +1,11 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Holds Awaiting Pickup</h1>
+<h1>Holds awaiting pickup</h1>
 
 <p>This report will show all of the holds that are waiting for patrons to pick them up.</p>
 
-<p>Items that have been on the hold shelf longer than you normally allow (based on the ReservesMaxPickUpDelay preference value) will appear on the 'Holds Over' tab, they will not automatically be cancelled.</p>
+<p>Items that have been on the hold shelf longer than you normally allow (based on the ReservesMaxPickUpDelay preference value) will appear on the 'Holds over' tab, they will not automatically be cancelled.</p>
 
-<p><strong>See the full documentation for Holds Awaiting Pickup in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdspickup">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for holds awaiting pickup in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdspickup">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.5.4


From dpavlin at rot13.org  Fri Apr  6 19:10:21 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri,  6 Apr 2012 19:10:21 +0200
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow SQL
	performance
Message-ID: <1333732221-5798-1-git-send-email-dpavlin@rot13.org>

ShelfBrowser uses two SQL queries with syntax

WHERE ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?)
AND homebranch = ? AND location = ? AND ccode = ?

homebranch already has index, and adding indexes on ccode and location
improves performance by 30% for each query since MySQL is able to use
index_merge intersect(items_ccode,homebranch,items_location)
---
 installer/data/mysql/kohastructure.sql |    2 ++
 installer/data/mysql/updatedatabase.pl |    8 ++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 03911fe..21c657d 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1054,6 +1054,8 @@ CREATE TABLE `items` ( -- holdings/item information
   KEY `homebranch` (`homebranch`),
   KEY `holdingbranch` (`holdingbranch`),
   KEY `itemcallnumber` (`itemcallnumber`),
+  KEY `items_location` (`location`),
+  KEY `items_ccode` (`ccode`),
   CONSTRAINT `items_ibfk_1` FOREIGN KEY (`biblioitemnumber`) REFERENCES `biblioitems` (`biblioitemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `items_ibfk_2` FOREIGN KEY (`homebranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE,
   CONSTRAINT `items_ibfk_3` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index b3c5691..fae6351 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5159,6 +5159,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("CREATE INDEX items_location ON items(location)");
+    $dbh->do("CREATE INDEX items_ccode ON items(ccode)");
+    print "Upgrade to $DBversion done (items_location and items_ccode indexes added for ShelfBrowser)";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
-- 
1.7.2.5


From oleonard at myacpl.org  Fri Apr  6 20:56:48 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  6 Apr 2012 14:56:48 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Misc. help pages)
Message-ID: <1333738608-17309-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in various help templates
---
 .../intranet-tmpl/prog/en/modules/help/about.tt    |    8 +++---
 .../intranet-tmpl/prog/en/modules/help/edithelp.tt |    2 +-
 .../prog/en/modules/help/export/marc.tt            |    6 ++--
 .../intranet-tmpl/prog/en/modules/help/mainpage.tt |   14 +++++-----
 .../intranet-tmpl/prog/en/modules/help/nohelp.tt   |    2 +-
 .../en/modules/help/offline_circ/process_koc.tt    |    4 +-
 .../prog/en/modules/help/reserve/request.tt        |   20 ++++++++--------
 .../prog/en/modules/help/reviews/reviewswaiting.tt |    2 +-
 .../prog/en/modules/help/suggestion/suggestion.tt  |    4 +-
 .../prog/en/modules/help/tags/review.tt            |    4 +-
 .../prog/en/modules/help/virtualshelves/shelves.tt |   24 ++++++++++----------
 11 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
index e7c9d96..a25afc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
@@ -2,15 +2,15 @@
 
 <h1>About Koha</h1><p>This section provides information about your Koha installation. It is useful for developers and if you wish to report bugs or issues to the Koha community.</p>
 
-<h2>Server Information</h2>
+<h2>Server information</h2>
 
 <p>This section tells you which version of Koha and supporting software you are using. If possible, when reporting issues to the Koha community, always give details of which version of Koha you are using. Koha is under active development and it is highly likely that an upgrade to a more recent version will provide patches and bug fixes you require.</p>
 
-<h2>Perl Modules</h2>
+<h2>Perl modules</h2>
 
-<p>This tab lists all the dependant Perl Modules for Koha and whether or not you have them installed, and the version number. If you are reporting an issue, the developer may ask what is the state of the Perl modules you have installed.</p>
+<p>This tab lists all the dependant Perl modules for Koha and whether or not you have them installed, and the version number. If you are reporting an issue, the developer may ask what is the state of the Perl modules you have installed.</p>
 
-<h2>Koha Team</h2>
+<h2>Koha team</h2>
 
 <p>Koha is developed and supported by a large number of developers around the world. Thanks to all the developers and libraries who support Koha</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
index ad4b4a1..9226c8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Online Help</title>
+<title>Online help</title>
 <script language="javascript" type="text/javascript" src="[% themelang %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
 <script language="javascript" type="text/javascript">
 tinyMCE.init({
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt
index cac8df8..936b37b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC Export</h1>
+<h1>MARC export</h1>
 
 <p>Koha comes with a tool that will allow you to export your bibliographic and/or holdings data in bulk. This can be used to send your records to fellow libraries, organizations or services; or simply for backup purposes.</p>
 
@@ -25,7 +25,7 @@
 </li>
 	<li>Finally choose the file type and file name
 <ul>
-	<li>Choose to export your data in marc or marcxml format</li>
+    <li>Choose to export your data in MARC or MARCXML format</li>
 	<li>Choose the name you want your file to save as</li>
 </ul>
 </li>
@@ -34,6 +34,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Marc Export in the <a href="http://manual.koha-community.org/3.6/en/exportbibs.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC export in the <a href="http://manual.koha-community.org/3.6/en/exportbibs.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
index 1d17541..00c0f97 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
@@ -1,18 +1,18 @@
 [% INCLUDE 'help-top.inc' %]
 <h2>I can log in, what is next?</h2>
 
-<p>If this is your first time logging into Koha, you should now got to Koha Administration and setup all system parameters, especially Patron Categories.</p>
+<p>If this is your first time logging into Koha, you should now got to Koha Administration and setup all system parameters, especially patron categories.</p>
 
 <p>Once you have set up patron categories, you should create a new user in &quot;Patrons&quot; with super librarian privileges. Then use that user to log in rather than the root user set up as part of installation.</p>
 
 <p>Here are some other suggestions: </p>
 
 <ul>
-<li><a href="http://koha-community.org/documentation/">Read Koha Documentation</a></li>
-<li><a href="http://wiki.koha-community.org">Read/Write to the Koha Wiki</a></li>
-<li><a href="http://koha-community.org/support/koha-mailing-lists/">Read and Contribute to Discussions</a></li>
-<li><a href="http://bugs.koha-community.org">Report Koha Bugs</a></li>
-<li><a href="http://wiki.koha-community.org/wiki/Version_Control_Using_Git">Submit Patches to Koha using Git (Version Control System)</a></li>
+<li><a href="http://koha-community.org/documentation/">Read Koha documentation</a></li>
+<li><a href="http://wiki.koha-community.org">Read/Write to the Koha wiki</a></li>
+<li><a href="http://koha-community.org/support/koha-mailing-lists/">Read and contribute to discussions</a></li>
+<li><a href="http://bugs.koha-community.org">Report koha bugs</a></li>
+<li><a href="http://wiki.koha-community.org/wiki/Version_Control_Using_Git">Submit patches to Koha using git (version control system)</a></li>
 <li><a href="http://koha-community.org/get-involved/irc/">Chat with Koha users and developers</a></li>
 </ul>
 
@@ -20,7 +20,7 @@
 
 <p>You can edit the online help through the Koha Staff Client by clicking the &quot;Edit Help&quot; button. This feature has been designed so that library workflow and policies can be documented within&nbsp; Koha. </p>
 
-<p><strong>IMPORTANT NOTE Online Help is overwritten during a Koha Upgrade.</strong></p>
+<p><strong>IMPORTANT NOTE: Online help is overwritten during a Koha upgrade.</strong></p>
 
 <p>As part of the upgrade process your online help will be overwritten with the new Help as part of the install. If you want to keep a copy of your online help, you should instruct your System Administrator to upgrade the Online Help directory in the Koha file tree.</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
index 57c5ffc..bcaac88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 	
-<h1>Online Help</h1>
+<h1>Online help</h1>
 
 <p>Sorry, there is no help available for this topic, please refer to the <a href="http://manual.koha-community.org/3.6/en/">Koha 3.6 manual</a> (online).</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
index ab66580..fd9af7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Offline Circulation File (.koc) Uploader</h1>
+<h1>Offline circulation file (.koc) uploader</h1>
 
 <p>The offline circulation tool for Windows will generate a KOC file that you can upload into Koha once your system comes back up.</p>
 
@@ -10,6 +10,6 @@
 
 <p>When this is complete you'll see the summary of actions from when you were offline (including any errors).</p>
 
-<p><strong>See the full documentation for the Offline Circulation File Uploader in the <a href="http://manual.koha-community.org/3.6/en/offlinecirc.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the offline circulation file uploader in the <a href="http://manual.koha-community.org/3.6/en/offlinecirc.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
index 4053388..4423141 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
@@ -2,19 +2,19 @@
 
 <h1>Holds</h1>
 
-<h2>Placing Holds in Staff Client</h2>
+<h2>Placing holds in staff client</h2>
 
-<p>There are several ways to place holds from the staff client. The most obvious is using the 'Place Hold' button at the top of any bibliographic record.</p>
+<p>There are several ways to place holds from the staff client. The most obvious is using the 'Place hold' button at the top of any bibliographic record.</p>
 
-<p>You can also click the smaller 'Place Hold' link found at the top of your catalog search results, or the 'Holds' link found below each result.</p>
+<p>You can also click the smaller 'Place hold' link found at the top of your catalog search results, or the 'Holds' link found below each result.</p>
 
 <p>You will be asked to search for a patron by barcode or any part of their name to start the hold process.</p>
 
-<p>If you'd like to search for the patron first and then the bib record for the hold, you can open the patron record and click on the 'Search to Hold' button at the top of the patron record.</p>
+<p>If you'd like to search for the patron first and then the bib record for the hold, you can open the patron record and click on the 'Search to hold' button at the top of the patron record.</p>
 
-<p>After clicking the button you will be brought to the catalog search page where you can find the book(s) you want to place a hold on. Under each title on the results you'll see an option to 'Hold for Patron Name.'</p>
+<p>After clicking the button you will be brought to the catalog search page where you can find the book(s) you want to place a hold on. Under each title on the results you'll see an option to 'Hold for patron name.'</p>
 
-<p>If you want to place a hold on multiple items, simply check the boxes to the left of them and click the arrow to the right of the 'Place Hold' button.</p>
+<p>If you want to place a hold on multiple items, simply check the boxes to the left of them and click the arrow to the right of the 'Place hold' button.</p>
 
 <p>Depending on how many items you choose to place a hold on at once you will be see a different place hold form. If you are placing a hold on one bibliographic record you will see a list of all of the items you can place a hold on.</p>
 
@@ -36,7 +36,7 @@
 
 <p>If you're placing a hold on multiple items you will be presented with the next available option for all titles. If no items are available for hold it will say so on the confirmation screen.</p>
 
-<h2>Managing Holds</h2>
+<h2>Managing holds</h2>
 
 <p>Holds can be altered and canceled from the Holds tab found on the left of the bibliographic record.</p>
 
@@ -54,13 +54,13 @@
 
 <p>Once you have made your changes, click the 'Update hold(s)' button and your changes will be saved.</p>
 
-<h2>Receiving Holds</h2>
+<h2>Receiving holds</h2>
 
 <p>When items that are on hold are checked in or out the system will remind the circulation librarian that the item is on hold and offer them options for managing the hold.</p>
 
 <p>When you check in an item that has a hold on it the system will ask you to either confirm and transfer the item or just confirm the hold</p>
 
-<p>Clicking the Confirm button will mark the item as on hold for the patron. If the item needs to be transferred the item will also be marked as in transit to the proper library. Clicking 'Ignore' will retain the hold, but allow you to check the item out to another patron. Choosing to confirm and print will present you with a printable page that you can slip inside the book with the necessary hold and/or transfer information.</p>
+<p>Clicking the 'Confirm' button will mark the item as on hold for the patron. If the item needs to be transferred the item will also be marked as in transit to the proper library. Clicking 'Ignore' will retain the hold, but allow you to check the item out to another patron. Choosing to confirm and print will present you with a printable page that you can slip inside the book with the necessary hold and/or transfer information.</p>
 
 <p>Once confirmed the hold will show on the patron record and on the checkout screen under the 'Hold' tab.</p>
 
@@ -70,6 +70,6 @@
 
 <p>From here you can check the item out to the patron at the desk and cancel the hold for the patron.</p>
 
-<p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.6/en/holds.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for holds in the <a href="http://manual.koha-community.org/3.6/en/holds.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
index 36a09d8..2fdcf40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
@@ -6,6 +6,6 @@
 
 <p>If there are no comments to moderate you will see a message saying just that</p>
 
-<p><strong>See the full documentation for Comments in the <a href="http://manual.koha-community.org/3.6/en/comments.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for comments in the <a href="http://manual.koha-community.org/3.6/en/comments.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
index 346ee2b..502cb93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
@@ -6,7 +6,7 @@
 
 <p>Clicking 'Manage suggestions' will take you to the suggestion management tool. If there are no pending suggestions you can access the suggestion management tool by clicking the 'Manage suggestions' link on the menu on the left of the Acquisitions page.</p>
 
-<p>Your suggestions will be sorted into three categories: Accepted, Pending, and Rejected. Each accepted or rejected suggestion will show the name of the librarian who managed the suggestion and the reason they gave for accepting or rejecting it (found under 'Status').</p>
+<p>Your suggestions will be sorted into three categories: 'Accepted', 'Pending', and 'Rejected'. Each accepted or rejected suggestion will show the name of the librarian who managed the suggestion and the reason they gave for accepting or rejecting it (found under 'Status').</p>
 
 <p>For libraries with lots of suggestions, there are filters on the left hand side of the Manage Suggestions page to assist in limiting the number of titles displayed on the screen.</p>
 
@@ -28,7 +28,7 @@
 
 <p>Once you have clicked 'Submit' the suggestion will be moved to the matching tab. The status will also be updated on the patron's account in the OPAC and an email notice will be sent to the patron using the template that matches the status you have chosen.</p>
 
-<p><strong>See the full documentation for Purchase Suggestions in the <a href="http://manual.koha-community.org/3.6/en/managesuggest.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for purchase suggestions in the <a href="http://manual.koha-community.org/3.6/en/managesuggest.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
index 653c262..98acbab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
@@ -2,7 +2,7 @@
 
 <h1>Tags</h1>
 
-<p>Depending on your tagging system preferences, librarians may need to approve tags before they are published on the OPAC. This is done via the Tag Moderation Tool.</p>
+<p>Depending on your tagging system preferences, librarians may need to approve tags before they are published on the OPAC. This is done via the tag moderation tool.</p>
 
 <p>When first visiting the tool, you will be presented with a list of tags that are pending approval or rejection by a librarian</p>
 
@@ -18,6 +18,6 @@
 
 <p>To check terms against the approved and rejected lists (and possibly against the dictionary you have assigned for tag moderation) simply enter the term into the search box on the bottom right of the screen to see the status of the term</p>
 
-<p><strong>See the full documentation for Tag Moderation in the <a href="http://manual.koha-community.org/3.6/en/tagsmoderation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for tag moderation in the <a href="http://manual.koha-community.org/3.6/en/tagsmoderation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
index 0bd79ab..d71a254 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
@@ -2,7 +2,7 @@
 
 <h1>Lists</h1>
    
-<p>A list can be created by visiting the Lists page and clicking 'New List'</p>
+<p>A list can be created by visiting the Lists page and clicking 'New list'</p>
 
 <p>The new list form offers several options for creating your list:</p>
 
@@ -11,9 +11,9 @@
 	<li>You can also choose how to sort the list</li>
 	<li>Finally there are three types of lists you can choose from
 <ul>
-	<li>A Private List is managed by you and can be seen only by you</li>
-	<li>A Public List can be seen by everybody, but managed only by you</li>
-	<li>A Open List can be seen and managed by everybody</li>
+    <li>A private list is managed by you and can be seen only by you</li>
+    <li>A public list can be seen by everybody, but managed only by you</li>
+    <li>A open list can be seen and managed by everybody</li>
 </ul>
 </li>
 </ul>
@@ -22,13 +22,13 @@
 
 <ul>
 	<li>Check the box to the left of the titles you want to add to the new list</li>
-	<li>Choose [New List] from the 'Add to:' pull down menu
+    <li>Choose [New list] from the 'Add to:' pull down menu
 <ul>
 	<li>Name the list and choose what type of list this is
 <ul>
-	<li>A Private List is managed by you and can be seen only by you</li>
-	<li>A Public List can be seen by everybody, but managed only by you</li>
-	<li>A Open List can be seen and managed by everybody</li>
+    <li>A private list is managed by you and can be seen only by you</li>
+    <li>A public list can be seen by everybody, but managed only by you</li>
+    <li>A open list can be seen and managed by everybody</li>
 </ul>
 </li>
 </ul>
@@ -37,7 +37,7 @@
 
 <p>Once the list is saved it will accessible from the Lists page and from the 'Add to' menu at the top of the search results.</p>
 
-<h2>Add to a List</h2>
+<h2>Add to a list</h2>
 
 <p>To add titles to an existing list click on the list name from the page of lists</p>
 
@@ -45,12 +45,12 @@
 
 <p>A title can also be added to a list by selecting titles on the search results page and choosing the list from the 'Add to' menu</p>
 
-<h2>Viewing Lists</h2>
+<h2>Viewing lists</h2>
 
 <p>To see the contents of a list, visit the Lists page on the staff client</p>
 
-<p>Clicking on the 'List Name' will show the contents of the list</p>
+<p>Clicking on the 'List name' will show the contents of the list</p>
 
-<p><strong>See the full documentation for Lists in the <a href="http://manual.koha-community.org/3.6/en/stafflists.html#lists">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for lists in the <a href="http://manual.koha-community.org/3.6/en/stafflists.html#lists">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.5.4


From oleonard at myacpl.org  Fri Apr  6 21:14:35 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  6 Apr 2012 15:14:35 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Labels help)
Message-ID: <1333739675-17843-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Labels help templates
---
 .../en/modules/help/labels/label-edit-batch.tt     |    8 ++++----
 .../en/modules/help/labels/label-edit-layout.tt    |    8 ++++----
 .../en/modules/help/labels/label-edit-profile.tt   |   14 +++++++-------
 .../en/modules/help/labels/label-edit-template.tt  |   14 +++++++-------
 .../prog/en/modules/help/labels/spinelabel-home.tt |    4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
index 62a3335..b500ac3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
@@ -4,9 +4,9 @@
 
 <p>Batches are made up of the barcodes you would like to print. Once in this tool you can search for the item records you would like to print out labels for.</p>
 
-<h2>Add a Batch</h2>
+<h2>Add a batch</h2>
 
-<p>Batches can be created in one of two ways. The first is to click the 'Create Label Batch' link on the 'Staged MARC Management' page</p>
+<p>Batches can be created in one of two ways. The first is to click the 'Create label batch' link on the 'Staged MARC management' page</p>
 
 <p>The other is to choose to create a new batch from the label creator tool</p>
 
@@ -16,12 +16,12 @@
 
 <p>Once you have added all of the items click the 'Done' button. The resulting page will list the items you have selected.</p>
 
-<p>To print your labels, click the 'Export Batch' button. To print only some of the labels, click the 'Export Item(s)' button. Either way you will be presented with a confirmation screen where you can choose your template and layout.</p>
+<p>To print your labels, click the 'Export batch' button. To print only some of the labels, click the 'Export item(s)' button. Either way you will be presented with a confirmation screen where you can choose your template and layout.</p>
 
 <p>You will then be presented with three download options: PDF, Excel, and CSV.</p>
 
 <p>After saving your file, simply print to the blank labels you have in your library.</p>
 
-<p><strong>See the full documentation for Label Batches in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labelbatches">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for label batches in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labelbatches">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
index 23d1332..8ca7eac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
@@ -4,14 +4,14 @@
 
 <p>A layout is used to define the fields you want to appear on your labels.</p>
 
-<h2>Add a Layout</h2>
+<h2>Add a layout</h2>
 
-<p>To add a new layout, you want to click on the 'Layouts' button at the top of your page and choose 'New Layout'</p>
+<p>To add a new layout, you want to click on the 'Layouts' button at the top of your page and choose 'New layout'</p>
 
 <p>Using the form that appears you can create a profile to fix any problems with your template.</p>
 
-<p>After saving, your layouts will appear on the 'Manage Layouts' page.</p>
+<p>After saving, your layouts will appear on the 'Manage layouts' page.</p>
 
-<p><strong>See the full documentation for Label Layouts in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labellayouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for label layouts in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labellayouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
index 1d5627e..72c3992 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
@@ -6,17 +6,17 @@
 
 <p>If your labels are printing just the way you want, you will not need a profile.</p>
 
-<h2>Add a Profile</h2>
+<h2>Add a profile</h2>
 
-<p>To add a new profile, you want to click on the 'Profiles' button at the top of your page and choose 'New Profile'</p>
+<p>To add a new profile, you want to click on the 'Profiles' button at the top of your page and choose 'New profile'</p>
 
 <p>Using the form that appears you can create a profile to fix any problems with your template.</p>
 
 <ul>
-	<li>The Printer Name and Paper Bin do not have to match your printer exactly, they are for your reference so you can remember what printer you have set the profile for. So if you want to use the Printer model number in printer name or you can call it 'the printer on my desk'</li>
+    <li>'Printer Name' and 'Paper Bin' do not have to match your printer exactly, they are for your reference so you can remember what printer you have set the profile for. So if you want to use the Printer model number in printer name or you can call it 'the printer on my desk'</li>
 	<li>Template will be filled in once you have chosen which template to apply the profile to on the template edit form</li>
-	<li>The Units pull down is used to define what measurement scale you're going to be using for your profile.&nbsp;</li>
-	<li>Offset describes what happens when the entire image is off center either vertically or horizontally and creep describes a condition where the distance between the labels changes across the page or up and down the page
+    <li>The 'Units' pull down is used to define what measurement scale you're going to be using for your profile.&nbsp;</li>
+    <li>'Offset' describes what happens when the entire image is off center either vertically or horizontally and creep describes a condition where the distance between the labels changes across the page or up and down the page
 <ul>
 	<li>For these values, negative numbers move the error up and to the left and positive numbers move the error down and to the right</li>
 	<li>Example: the text is .25" from the left edge of the first label, .28" from the left edge of the second label and .31" from the left edge of the third label. This means the horizontal creep should be set to .03" to make up for this difference.</li>
@@ -24,10 +24,10 @@
 </li>
 </ul>
 
-<p>After saving, your profiles will appear on the 'Manage Profiles' page.</p>
+<p>After saving, your profiles will appear on the 'Manage profiles' page.</p>
 
 <p>Once you have saved your new profile, you can return to the list of templates and choose to edit the template that this profile is for.</p>
 
-<p><strong>See the full documentation for Label Profiles in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labelprofiles">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for label profiles in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labelprofiles">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
index d5b2674..6837621 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
@@ -6,15 +6,15 @@
 
 <h2>Add a Template</h2>
 
-<p>To add a new template, you want to click on the 'Templates' button at the top of your page and choose 'New Template'</p>
+<p>To add a new template, you want to click on the 'Templates' button at the top of your page and choose 'New template'</p>
 
 <p>Using the form that appears you can define the template for your sheet of labels or cards.</p>
 
 <ul>
-	<li>Template ID will be automatically generated after saving your template, this is simply a system generated unique id</li>
-	<li>Template Code should be something you can use to identify your template on a list of templates</li>
-	<li>You can use the Template Description to add additional information about the template</li>
-	<li>The Units pull down is used to define what measurement scale you're going to be using for the template. This should probably match the unit of measurement used on the template description provided by the product vendor.&nbsp;</li>
+    <li>'Template ID' will be automatically generated after saving your template, this is simply a system generated unique id</li>
+    <li>'Template code' should be something you can use to identify your template on a list of templates</li>
+    <li>You can use the 'Template description' to add additional information about the template</li>
+    <li>The 'Units' pull down is used to define what measurement scale you're going to be using for the template. This should probably match the unit of measurement used on the template description provided by the product vendor.&nbsp;</li>
 	<li>The measurements, number of columns and number of rows can be found on the vendor product packaging or website.
 <ul>
 	<li style="color: #990000">Important: If you do not supply a left text margin in the template, a 3/16" (13.5 point) left text margin will apply by default.</li>
@@ -28,8 +28,8 @@
 </li>
 </ul>
 
-<p>After saving, your templates will appear on the 'Manage Templates' page.</p>
+<p>After saving, your templates will appear on the 'Manage templates' page.</p>
 
-<p><strong>See the full documentation for Label Templates in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labeltemplates">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for label templates in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labeltemplates">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
index 8dc513d..9bf04e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Quick Spine Label Creator</h1>
+<h1>Quick spine label creator</h1>
 
 <p style="background-color: #ffe599">Tip: This tool does not use the label layouts or templates, it simply prints a spine label in the first spot on the label sheet.</p>
 
@@ -11,6 +11,6 @@
 
 <p>To use this tool you simply need the barcode for the book you'd like to print the spine label for.</p>
 
-<p><strong>See the full documentation for Quick Spine Label Creator in the <a href="http://manual.koha-community.org/3.6/en/quicklabelcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the quick spine label creator in the <a href="http://manual.koha-community.org/3.6/en/quicklabelcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.5.4


From oleonard at myacpl.org  Fri Apr  6 21:45:49 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  6 Apr 2012 15:45:49 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Installer)
Message-ID: <1333741549-18567-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Installer templates
---
 .../prog/en/modules/installer/auth.tt              |    2 +-
 .../prog/en/modules/installer/step1.tt             |   10 +++++-----
 .../prog/en/modules/installer/step2.tt             |   11 ++++-------
 .../prog/en/modules/installer/step3.tt             |   18 +++++++++---------
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
index 909398e..026d022 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
@@ -32,7 +32,7 @@
 [% FOREACH INPUT IN INPUTS %]
     <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
 [% END %]
-<h3>Welcome to the Koha Web Installer</h3>
+<h3>Welcome to the Koha web installer</h3>
 <p>Before we begin, please verify you have the correct credentials to continue. Please log in
 with the username and password given to you by your systems administrator and located in your
 <code>koha-conf.xml</code> configuration file.</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
index 52c52c6..3712217 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Web Installer &rsaquo; Step 1</title>
+<title>Koha &rsaquo; Web installer &rsaquo; Step 1</title>
 [% INCLUDE 'installer-doc-head-close.inc' %]
 <div>
-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer &rsaquo; Step 1</h1>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 1</h1>
 [% UNLESS ( language ) %]
 <p>You are about to install Koha.</p>
 
@@ -26,13 +26,13 @@ listed, please inform your systems administrator.</p>
 </select>
 </p>
 
-<p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
+<p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
 </form>
 [% END %]
 [% IF ( language ) %]
   [% UNLESS ( checkmodule ) %]
   [% IF ( missing_modules ) %]
-  <p>Some perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br />
+  <p>Some Perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br />
   <ul>
   [% FOREACH missing_module IN missing_modules %]
     [% IF ( missing_module.require ) %]
@@ -59,7 +59,7 @@ listed, please inform your systems administrator.</p>
 [% IF ( checkmodule ) %]
 <input type="hidden" name="step" value="2" />
 <p> All dependencies installed.</p>
-<p>Please click next to continue <input value="Next &gt;&gt;" type="submit" /></p>
+<p>Please click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
 [% ELSE %]
 <input type="hidden" name="step" value="1" />
 <p>Click to recheck dependencies <input value="Recheck" type="submit" /></p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
index 1cac173..458ff42 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
@@ -1,10 +1,7 @@
-
-
-
-[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web Installer &rsaquo; Step 2</title>
+[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Step 2</title>
 [% INCLUDE 'installer-doc-head-close.inc' %]
 <div>
-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer &rsaquo; Step 2</h1>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 2</h1>
 <h2 align="center">Database settings:</h2>
 <ul>
 <li><em>database type : </em>[% dbms %]</li>
@@ -44,14 +41,14 @@
   [% END %]
   [% IF ( error ) %][% ELSE %]
 <input type="hidden" name="step" value="3" />
-<p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
+<p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
 [% END %]
 </form>
 [% ELSE %]
 <form name="checkinformation" type="post" action="install.pl">
 <input type="hidden" name="step" value="2" />
 <input type="hidden" name="checkdb" value="1" />
-<p> Please click Next to continue if this information is correct <input value="Next &gt;&gt;" type="submit" /></p>
+<p> Please click 'Next' to continue if this information is correct <input value="Next &gt;&gt;" type="submit" /></p>
 </form>
 [% END %]
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
index 9db885a..7351c36 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -1,8 +1,8 @@
-[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web Installer &rsaquo; Step 3</title>
+[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Step 3</title>
 [% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]
 [% INCLUDE 'installer-doc-head-close.inc' %]
 <div>
-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer &rsaquo; Step 3</h1>
+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 3</h1>
 
 [% IF ( selectframeworks ) %]
     <script language="JavaScript">
@@ -77,11 +77,11 @@
     </script>
 [% END %]
 [% IF ( finish ) %]
-    <h1>Congratulations, Installation complete</h1>
+    <h1>Congratulations, installation complete</h1>
     <p>If this page does not redirect in 5 seconds, click <a href="/">here</a>.</p> 
 [% END %]
 [% IF ( choosemarc ) %]
-    <h2 align="center">Select your MARC flavour</h2>
+    <h2 align="center">Select your MARC flavor</h2>
     <form name="frameworkselection" method="post" action="install.pl">   
     <input type="hidden" name="step" value="3" />
     <input type="hidden" name="op" value="selectframeworks" />
@@ -96,7 +96,7 @@
     </div>
     [% END %]
     </p>
-    <p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
+    <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
     </form>
 [% END %]
 
@@ -107,7 +107,7 @@
     <input type="hidden" name="op" value="addframeworks" />
     
     [% IF ( frameworksloop ) %]
-    <h2>MARC Frameworks: [% marcflavour %]</h2>
+    <h2>MARC frameworks: [% marcflavour %]</h2>
     [% IF ( en_marc_frameworks ) %]
         <h4><span class="error">No MARC frameworks are available for your language.  
                 Defaulting to the frameworks supplied for English (en)<span></h4>
@@ -182,7 +182,7 @@
     [% END %]
     <h3>All done!</h3>
     <p>Installation complete.<br />
-        <p>Click on Finish to complete and load the Koha Staff Interface.
+        <p>Click on 'Finish' to complete and load the Koha Staff Interface.
         <form name="finish">
         <input type="hidden" name="step" value="3" />
         <input type="hidden" name="op" value="finish" />
@@ -204,7 +204,7 @@
         </ul>
         <form action="install.pl">
         <input type="hidden" name="step" value="3" />
-            <p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
+            <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
         </form>
     [% END %]
 [% END %]
@@ -215,7 +215,7 @@
     <form action="install.pl">
     <input type="hidden" name="step" value="3" />
     <input type="hidden" name="op" value="importdatastructure" />
-    <p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
+    <p> Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>
     </form>
 [% END %]
 
-- 
1.7.5.4


From oleonard at myacpl.org  Fri Apr  6 22:02:21 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  6 Apr 2012 16:02:21 -0400
Subject: [Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently
	(Labels templates)
Message-ID: <1333742541-19294-1-git-send-email-oleonard@myacpl.org>

Correcting capitalization in Labels templates
---
 .../prog/en/modules/labels/label-edit-batch.tt     |   12 +++---
 .../prog/en/modules/labels/label-edit-layout.tt    |   30 +++++++++---------
 .../prog/en/modules/labels/label-edit-profile.tt   |    8 ++--
 .../prog/en/modules/labels/label-edit-template.tt  |   34 ++++++++++----------
 .../prog/en/modules/labels/label-home.tt           |    6 ++--
 .../prog/en/modules/labels/label-manage.tt         |   10 +++---
 .../prog/en/modules/labels/label-print.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/labels/result.tt |    4 +-
 .../intranet-tmpl/prog/en/modules/labels/search.tt |   26 +++++++-------
 .../prog/en/modules/labels/spinelabel-print.tt     |   10 +++---
 10 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
index 2ef4aec..b42a497 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
@@ -1,6 +1,6 @@
     <!-- PLEASE MAINTAIN PROPER INDENTATION!!!!  -->
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Labels &rsaquo; Manage Label Batches</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Labels &rsaquo; Manage label batches</title>
     [% INCLUDE 'doc-head-close.inc' %]
     [% INCLUDE 'greybox.inc' %]
     <script type="text/javascript">
@@ -26,9 +26,9 @@
     <div id="breadcrumbs">
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; 
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
-        <a href="/cgi-bin/koha/labels/label-home.pl">Labels Home</a> &rsaquo;
-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Manage Label Batches</a> &rsaquo;
-        Manage Batch Number [% batch_id %]
+        <a href="/cgi-bin/koha/labels/label-home.pl">Labels home</a> &rsaquo;
+        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Manage label batches</a> &rsaquo;
+        Manage batch number [% batch_id %]
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
@@ -37,14 +37,14 @@
                     [% INCLUDE 'labels-batches-toolbar.inc' %]
                     <div class="yui-g">
                         <div class="yui-u first" id="manage-label-batches">
-                            <div class="hint">Current Library: [% LoginBranchname %]</div>
+                            <div class="hint">Current library: [% LoginBranchname %]</div>
                             <form name="add_by_barcode" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
                                 <div>
                                     <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
                                     <ol><li>
                                     <input type="hidden" name="op" value="add" \>
                                     <input type="hidden" name="batch_id" value="[% batch_id %]" \>
-                                    <label for="barcode">Add by Barcode(s): 
+                                    <label for="barcode">Add by barcode(s): 
                                         <br \> <span class="hint">One barcode per line.</span>
                                         <br \> <span class="hint">Leave empty to add via item search.</span>
                                     </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
index 9b8a57a..45a084d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
@@ -25,9 +25,9 @@
     <div id="breadcrumbs">
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
-        <a href="/cgi-bin/koha/labels/label-home.pl">Labels Home</a> &rsaquo;
-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Manage Label Layouts</a> &rsaquo;
-        [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Label Layout
+        <a href="/cgi-bin/koha/labels/label-home.pl">Labels home</a> &rsaquo;
+        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Manage label layouts</a> &rsaquo;
+        [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Label layout
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
@@ -35,14 +35,14 @@
                 <div class="yui-b">
                     <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
                         <fieldset class="rows">
-                            <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Label Layout</legend>
+                            <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] Label layout</legend>
                             <ol>
                                 <li>
-                                    <label for="layout_name">Layout Name</label>
+                                    <label for="layout_name">Layout name</label>
                                     <input type="text" name="layout_name" id="layout_name" size="20" value="[% layout_name %]" />
                                 </li>
                                 <li>
-                                    <label for="barcode_type">Choose Barcode Type (encoding)</label>
+                                    <label for="barcode_type">Choose barcode type (encoding)</label>
                                     <select name="barcode_type" id="barcode_type">
                                     [% FOREACH barcode_type IN barcode_types %]
                                     [% IF ( barcode_type.selected ) %]
@@ -54,7 +54,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <label for="printing_type">Choose Layout Type</label>
+                                    <label for="printing_type">Choose layout type</label>
                                     <select name="printing_type" id="printing_type">
                                     [% FOREACH label_type IN label_types %]
                                     [% IF ( label_type.selected ) %]
@@ -67,10 +67,10 @@
                                 </li>
                                 <li>
                                     <fieldset>
-                                        <legend>Bibliographic Data to Print</legend>
+                                        <legend>Bibliographic data to print</legend>
 										<ol>
                                         <li class="radio">[% IF ( layout_string ) %]
-                                        <input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" checked="checked" /><label for="layout_choice_order">Choose Order Of Text Fields to Print</label>
+                                        <input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" checked="checked" /><label for="layout_choice_order">Choose order of text fields to print</label>
                                         [% ELSE %]
                                         <input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" /><label for="layout_choice_order">Choose Order Of Text Fields to Print</label>
                                         [% END %]
@@ -95,12 +95,12 @@
 											</div>
                                             </li>
                                             [% UNLESS ( layout_string ) %]
-                                            <li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layout_string" checked="checked" /> <label for="layout_choice_list">List Fields</label></li>
+                                            <li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layout_string" checked="checked" /> <label for="layout_choice_list">List fields</label></li>
                                             [% ELSE %]
                                             <li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layout_string" /> <label for="layout_choice_list">List Fields</label></li>
                                             [% END %]
                                            <li> <fieldset id="layout_string" class="brief">
-                                                <label for="format_string">Data Fields</label>
+                                                <label for="format_string">Data fields</label>
                                                 <input type="text" name="format_string" id="format_string" size="80" value="[% format_string |html %]" />
                                                 <div class="hint">
                                                     <p>Enter a comma separated list of fields to print.  You may include any <em>Koha field</em> or MARC subfield.</p>
@@ -112,7 +112,7 @@
                                     </fieldset>
                                 </li>
                                 <li>
-                                    <label for="guidebox">Draw Guide Boxes</label>
+                                    <label for="guidebox">Draw guide boxes</label>
                                     [% IF ( guidebox ) %]
                                     <input type="checkbox" name="guidebox" id="guidebox" value="1"  checked="checked" />
                                     [% ELSE %]
@@ -120,7 +120,7 @@
                                     [% END %]
                                 </li>
                                 <li>
-                                    <label for="callnum_split">Split Call Numbers</label>
+                                    <label for="callnum_split">Split call numbers</label>
                                     [% IF ( callnum_split ) %]
                                     <input type="checkbox" name="callnum_split" id="callnum_split" value="1"  checked="checked" />
                                     [% ELSE %]
@@ -128,7 +128,7 @@
                                     [% END %]
                                 </li>
                                 <li>
-                                    <label for="text_justify">Text Justification</label>
+                                    <label for="text_justify">Text justification</label>
                                     <select name="text_justify" id="text_justify">
                                         [% FOREACH text_justification_type IN text_justification_types %]
                                         [% IF ( text_justification_type.selected ) %]
@@ -152,7 +152,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <label for="font_size">Font Size</label>
+                                    <label for="font_size">Font size</label>
                                     <input type="text" name="font_size" id="font_size" size="2" value="[% font_size |html %]" />
                                 </li>
                             </ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
index 88243b2..3051521 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
@@ -43,15 +43,15 @@
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         <a href="/cgi-bin/koha/labels/label-home.pl">Labels</a> &rsaquo;
-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer Profiles</a> &rsaquo;
-        Edit Printer Profile
+        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer profiles</a> &rsaquo;
+        Edit printer profile
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
 	    <div id="yui-main">
 	        <div class="yui-b">
                         <div class="yui-g">
-                            <h3>Edit Printer Profile</h3>
+                            <h3>Edit printer profile</h3>
                                 <div class="yui-g first">
                     <form name="input" action="/cgi-bin/koha/labels/label-edit-profile.pl" method="get">
                                     <fieldset class="rows"><legend>Profile settings</legend>
@@ -76,7 +76,7 @@
                                                 [% IF ( label_template ) %]
                                                  <label for="template_name">Template name:</label> [% label_template %]
                                                 [% ELSE %]
-                                                 <span class="label">Template name:</span> Profile Unassigned
+                                                 <span class="label">Template name:</span> Profile unassigned
                                                 [% END %]
                                             </li>
                                             <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
index 6c96bab..7a316b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
@@ -43,8 +43,8 @@
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>&rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>&rsaquo;
         <a href="/cgi-bin/koha/labels/label-home.pl">Labels</a>&rsaquo;
-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label Templates</a>&rsaquo;
-        Edit Label Template
+        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label templates</a>&rsaquo;
+        Edit label template
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
@@ -52,7 +52,7 @@
                 <div class="yui-b">
                     <form name="input" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get">
                     <div class="yui-g">
-                        <h3>Edit Label Template</h3>
+                        <h3>Edit label template</h3>
                         <div class="yui-u first">
                             <fieldset class="rows">
                                 <ol>
@@ -60,11 +60,11 @@
                                         <span class="label">Template ID:</span>[% IF ( template_id ) %][% template_id %][% ELSE %]N/A[% END %]
                                     </li>
                                     <li>
-                                        <label for="template_code">Template Code:</label>
+                                        <label for="template_code">Template code:</label>
                                         <input type="text" size="30" maxlength="43" name="template_code" id="template_code" value="[% template_code %]" />
                                     </li>
                                     <li>
-                                        <label for="template_desc">Template Description:</label>
+                                        <label for="template_desc">Template description:</label>
                                         <textarea cols="30" rows="3" id="template_desc" name="template_desc">[% template_desc %]</textarea>
                                     </li>
  									<li>
@@ -84,19 +84,19 @@
                                  </select>
                              </li>
                                     <li>
-                                        <label for="page_height">Page Height:</label>
+                                        <label for="page_height">Page height:</label>
                                         <input type="text" size="4" name="page_height" id="page_height" value="[% page_height %]" />
                                     </li>
                                     <li>
-                                        <label for="page_width">Page Width:</label>
+                                        <label for="page_width">Page width:</label>
                                         <input type="text" size="4" name="page_width" id="page_width" value="[% page_width %]" />
                                     </li>
                                     <li>
-                                        <label for="label_width">Label Width:</label>
+                                        <label for="label_width">Label width:</label>
                                         <input type="text" size="4" name="label_width" id="label_width" value="[% label_width %]" />
                                     </li>
                                     <li>
-                                        <label for="label_height">Label Height:</label>
+                                        <label for="label_height">Label height:</label>
                                         <input type="text" size="4" name="label_height" id="label_height" value="[% label_height %]" />
                                     </li>
 
@@ -106,35 +106,35 @@
                         <div class="yui-u">
                             <fieldset class="rows">
                                 <ol><li>
-                                    <label for="top_margin">Top Page Margin:</label>
+                                    <label for="top_margin">Top page margin:</label>
                                     <input type="text" size="4" name="top_margin" id="top_margin" value="[% top_margin %]" />
                                 </li>
                                 <li>
-                                    <label for="left_margin">Left Page Margin:</label>
+                                    <label for="left_margin">Left page margin:</label>
                                     <input type="text" size="4" name="left_margin" id="left_margin" value="[% left_margin %]" />
                                 </li>
                                     <li>
-                                        <label for="top_text_margin">Top Text Margin:</label>
+                                        <label for="top_text_margin">Top text margin:</label>
                                         <input type="text" size="4" name="top_text_margin" id="top_text_margin" value="[% top_text_margin %]" />
                                     </li>
                                     <li>
-                                        <label for="left_text_margin">Left Text Margin:</label>
+                                        <label for="left_text_margin">Left text margin:</label>
                                         <input type="text" size="4" name="left_text_margin" id="left_text_margin" value="[% left_text_margin %]" />
                                     </li>
                                     <li>
-                                        <label for="cols">Number of Columns:</label>
+                                        <label for="cols">Number of columns:</label>
                                         <input type="text" size="4" name="cols" id="cols" value="[% cols %]" />
                                     </li>
                                     <li>
-                                        <label for="rows">Number of Rows:</label>
+                                        <label for="rows">Number of rows:</label>
                                         <input type="text" size="4" name="rows" id="rows" value="[% rows %]" />
                                     </li>
                                     <li>
-                                        <label for="col_gap">Gap between Columns:</label>
+                                        <label for="col_gap">Gap between columns:</label>
                                         <input type="text" size="4" name="col_gap" id="col_gap" value="[% col_gap %]" />
                                     </li>
                                     <li>
-                                        <label for="row_gap">Gap between Rows:</label>
+                                        <label for="row_gap">Gap between rows:</label>
                                         <input type="text" size="4" name="row_gap" id="row_gap" value="[% row_gap %]" />
                                     </li>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
index 5c21837..22f5dc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Labels Home</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Labels home</title>
     [% INCLUDE 'doc-head-close.inc' %]
     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/label.css" />
 </head>
@@ -9,7 +9,7 @@
     <div id="breadcrumbs">
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>&rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>&rsaquo;
-        Labels Home
+        Labels home
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
@@ -22,7 +22,7 @@
                             <div class="lci_01"></div>
                             <div class="lci_02"></div>
                             <div class="lci_03"></div>
-                                <h2>Welcome to Koha's Label Creator Module</h2>
+                                <h2>Welcome to Koha's label creator module</h2>
                                 <p>The Label Creator allow you to use layouts and templates which you design to print a nearly unlimited variety of labels including barcodes. Here are some of the features of the Label Creator module:</p>
                                 <ul>
                                     <li>Customize label layouts</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
index 3f88920..cd5abcf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Labels &rsaquo; Manage Label Elements</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Labels &rsaquo; Manage label elements</title>
     [% INCLUDE 'doc-head-close.inc' %]
     [% INCLUDE 'greybox.inc' %]
     <script type="text/javascript">
@@ -85,8 +85,8 @@
     <div id="breadcrumbs">
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
-        <a href="/cgi-bin/koha/labels/label-home.pl">Labels Home</a> &rsaquo;
-        Manage Label [% label_element_title %]
+        <a href="/cgi-bin/koha/labels/label-home.pl">Labels home</a> &rsaquo;
+        Manage label [% label_element_title %]
     </div>
     <div id="doc3" class="yui-t2">
         <div id="bd">
@@ -95,7 +95,7 @@
                     [% INCLUDE 'labels-toolbar.inc' %]
                     <div class="yui-gc">
                         <div class="yui-u first" id="manage-label-layouts">
-                            <div class="hint">Current Library: [% LoginBranchname %]</div>
+                            <div class="hint">Current library: [% LoginBranchname %]</div>
                             [% IF ( table_loop ) %]
                             <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element %]">
                             <h2>Currently Available [% label_element_title %]</h2>
@@ -130,7 +130,7 @@
                             </form>
                             [% ELSE %]
 							<div class="dialog message">
-                            <h4>There Are No [% label_element_title %] Currently Available.</h4>
+                            <h4>There are no [% label_element_title %] currently available.</h4>
                             <p>Use the toolbar above to create a new [% label_element %].</p></div>
                             [% END %]
                         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
index 59c1fed..2dff50c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Labels &rsaquo; Label Printing/Exporting</title>
+    <title>Koha &rsaquo; Tools &rsaquo; Labels &rsaquo; Label Printing/exporting</title>
     [% INCLUDE 'doc-head-close.inc' %]
     <script type="text/javascript">
         //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
index d272f01..65837ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
@@ -1,5 +1,5 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Barcodes and Labels &rsaquo; Search Results</title>
+    <title>Koha &rsaquo; Barcodes and labels &rsaquo; Search results</title>
     [% INCLUDE 'doc-head-close.inc' %]
     <style type="text/css">#custom-doc { width:46.23em;*width:45.04em;min-width:700px; margin:auto;margin-top: .4em; text-align:left; }</style>
     <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
@@ -67,7 +67,7 @@
             </div>
 
             <form name="resultform" class="checkboxed" action="">
-            <p><a id="CheckAll" href="#">Select All</a> <a id="CheckNone" href="#">Clear All</a> | <input type="button" value="Add checked" onclick="add_item('checked',[% batch_id %],'[% type %]'); return false;" />
+            <p><a id="CheckAll" href="#">Select all</a> <a id="CheckNone" href="#">Clear all</a> | <input type="button" value="Add checked" onclick="add_item('checked',[% batch_id %],'[% type %]'); return false;" />
                     <input type="button" class="close" value="Done" /></p>
 
                 <div id="label-search-results">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
index 1d9d45d..3928edb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt
@@ -29,11 +29,11 @@ to add to Batch [% batch_id %]
 [% IF ( selected ) %]<option value="au" selected="selected">Author</option>
 [% ELSE %]<option value="au">Author</option>[% END %]
 
-[% IF ( selected ) %]<option value="yr" selected="selected">Publication Date</option>
-[% ELSE %]<option value="yr">Publication Date</option>[% END %]
+[% IF ( selected ) %]<option value="yr" selected="selected">Publication date</option>
+[% ELSE %]<option value="yr">Publication date</option>[% END %]
 
-[% IF ( selected ) %]<option value="sn" selected="selected">Standard Number</option>
-[% ELSE %]<option value="sn">Standard Number</option>[% END %]
+[% IF ( selected ) %]<option value="sn" selected="selected">Standard number</option>
+[% ELSE %]<option value="sn">Standard number</option>[% END %]
 
 [% IF ( selected ) %]<option value="nb" selected="selected">ISBN</option>
 [% ELSE %]<option value="nb">ISBN</option>[% END %]
@@ -41,8 +41,8 @@ to add to Batch [% batch_id %]
 [% IF ( selected ) %]<option value="ns" selected="selected">ISSN</option>
 [% ELSE %]<option value="ns">ISSN</option>[% END %]
 
-[% IF ( selected ) %]<option value="lcn,phr" selected="selected">Call Number</option>
-[% ELSE %]<option value="lcn,phr">Call Number</option>[% END %]
+[% IF ( selected ) %]<option value="lcn,phr" selected="selected">Call number</option>
+[% ELSE %]<option value="lcn,phr">Call number</option>[% END %]
 
 [% IF ( selected ) %]<option value="su" selected="selected">Subject</option>
 [% ELSE %]<option value="su">Subject</option>[% END %]
@@ -52,17 +52,17 @@ to add to Batch [% batch_id %]
 [% ELSE %]
    <option value="ti" selected="selected">Title</option>[% END %]
 
-[% IF ( selected ) %]<option value="ti,phr" selected="selected">Title Phrase</option>
-[% ELSE %]<option value="ti,phr">Title Phrase</option>[% END %]
+[% IF ( selected ) %]<option value="ti,phr" selected="selected">Title phrase</option>
+[% ELSE %]<option value="ti,phr">Title phrase</option>[% END %]
 
-[% IF ( selected ) %]<option value="se" selected="selected">Series Title</option>
-[% ELSE %]<option value="se">Series Title</option>[% END %]
+[% IF ( selected ) %]<option value="se" selected="selected">Series title</option>
+[% ELSE %]<option value="se">Series title</option>[% END %]
 
 [% IF ( selected ) %]<option value="bc" selected="selected">Barcode</option>
 [% ELSE %]<option value="bc">Barcode</option>[% END %]
 
-[% IF ( selected ) %]<option value="acqdate" selected="selected">Acquisition Date</option>
-[% ELSE %]<option value="acqdate">Acquisition Date</option>[% END %]
+[% IF ( selected ) %]<option value="acqdate" selected="selected">Acquisition date</option>
+[% ELSE %]<option value="acqdate">Acquisition date</option>[% END %]
 </select>
 
    <input type="text" size="30" id="ccl_textbox" name="ccl_textbox" class="focus" title="Enter search terms" value=""/>
@@ -74,7 +74,7 @@ to add to Batch [% batch_id %]
 [% IF ( sort_by_loop ) %]
 <fieldset><legend>Sort by: </legend>
     <p><select id="sort_by" name="sort_by">
-        <option value="">Field-weighted, Relevance Ranked</option>
+        <option value="">Field-weighted, relevance ranked</option>
         [% FOREACH sort_by_loo IN sort_by_loop %]
 
 [% IF ( sort_by_loo.selected ) %]<option value="[% sort_by_loo.value %]" selected="selected">[% sort_by_loo.label %]</option>[% ELSE %]<option value="[% sort_by_loo.value %]">[% sort_by_loo.label %]</option>[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
index 3df9cd0..ab51f9f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
@@ -6,9 +6,9 @@
 <html lang="[% lang %]" xml:lang="[% lang %]" xmlns="http://www.w3.org/1999/xhtml">
 [% END %]
 <head>
-	<title>Koha &rsaquo; Tools &rsaquo; Spine Labels</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/spinelabel.css" />
+<title>Koha &rsaquo; Tools &rsaquo; Spine labels</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/spinelabel.css" />
 
 		<style type="text/css">
 		@media print {
@@ -19,7 +19,7 @@
 	[% IF ( BarcodeNotFound ) %]
 		<body id="labels_spinelabel-print" class="tools labels">
 			<p>The barcode [% Barcode %] was not found.</p>
-			<p><a href="spinelabel-home.pl">Return To Spine Label Printer</a></p>
+            <p><a href="spinelabel-home.pl">Return to spine label printer</a></p>
 		</body>
 	[% ELSE %]
 		[% IF ( autoprint ) %]
@@ -31,7 +31,7 @@
 				[% content %]
 			</span>
 			<span id="print_button" class="noprint">
-				<button onclick="window.print()">Print This Label</button>
+                <button onclick="window.print()">Print this label</button>
 			</span>
 		</body>
 	[% END %]
-- 
1.7.5.4


From marc at msys.ch  Fri Apr  6 22:04:26 2012
From: marc at msys.ch (Marc Balmer)
Date: Fri, 06 Apr 2012 22:04:26 +0200
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow SQL
	performance
In-Reply-To: <1333732221-5798-1-git-send-email-dpavlin@rot13.org>
References: <1333732221-5798-1-git-send-email-dpavlin@rot13.org>
Message-ID: <4F7F4C4A.1010203@msys.ch>

Am 06.04.12 19:10, schrieb Dobrica Pavlinusic:
> ShelfBrowser uses two SQL queries with syntax
> 
> WHERE ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?)
> AND homebranch = ? AND location = ? AND ccode = ?
> 
> homebranch already has index, and adding indexes on ccode and location
> improves performance by 30% for each query since MySQL is able to use
> index_merge intersect(items_ccode,homebranch,items_location)

ah, it's these MySQL backquotes again... Can't we get rid of them in new
code?

> ---
>  installer/data/mysql/kohastructure.sql |    2 ++
>  installer/data/mysql/updatedatabase.pl |    8 ++++++++
>  2 files changed, 10 insertions(+), 0 deletions(-)
> 
> diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
> index 03911fe..21c657d 100644
> --- a/installer/data/mysql/kohastructure.sql
> +++ b/installer/data/mysql/kohastructure.sql
> @@ -1054,6 +1054,8 @@ CREATE TABLE `items` ( -- holdings/item information
>    KEY `homebranch` (`homebranch`),
>    KEY `holdingbranch` (`holdingbranch`),
>    KEY `itemcallnumber` (`itemcallnumber`),
> +  KEY `items_location` (`location`),
> +  KEY `items_ccode` (`ccode`),
>    CONSTRAINT `items_ibfk_1` FOREIGN KEY (`biblioitemnumber`) REFERENCES `biblioitems` (`biblioitemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
>    CONSTRAINT `items_ibfk_2` FOREIGN KEY (`homebranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE,
>    CONSTRAINT `items_ibfk_3` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE
> diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
> index b3c5691..fae6351 100755
> --- a/installer/data/mysql/updatedatabase.pl
> +++ b/installer/data/mysql/updatedatabase.pl
> @@ -5159,6 +5159,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>      SetVersion($DBversion);
>  }
>  
> +$DBversion = "3.07.00.XXX";
> +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
> +    $dbh->do("CREATE INDEX items_location ON items(location)");
> +    $dbh->do("CREATE INDEX items_ccode ON items(ccode)");
> +    print "Upgrade to $DBversion done (items_location and items_ccode indexes added for ShelfBrowser)";
> +    SetVersion($DBversion);
> +}
> +
>  =head1 FUNCTIONS
>  
>  =head2 DropAllForeignKeys($table)


From mjr at phonecoop.coop  Fri Apr  6 22:56:26 2012
From: mjr at phonecoop.coop (MJ Ray)
Date: Fri, 06 Apr 2012 21:56:26 +0100
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow
	SQL	performance
In-Reply-To: <4F7F4C4A.1010203@msys.ch>
Message-ID: <E1SGGCo-0000hA-3T@petrol.towers.org.uk>

Marc Balmer <marc at msys.ch>
> ah, it's these MySQL backquotes again... Can't we get rid of them in new
> code?

Please note that in this case:

> >  installer/data/mysql/kohastructure.sql |    2 ++
> >  installer/data/mysql/updatedatabase.pl |    8 ++++++++

Both files are in the mysql folder.  Aren't mysqlisms fine in there?


More generally, it is not safe to simply omit backquotes because some
column names in koha are mysql reserved words (so I am told).

Meanwhile, Koha doesn't set the session mode to ANSI or require all
sysadmins to set the global mode to ANSI (which would break other apps
I suspect), which would allow double-quotes to be used instead.
Anyway, double-quotes are currently used in some places for string
literals, which would need fixing (and probably should be).

So how can we quote in a portable way?  Is anyone willing to do the
work replacing ""s so we can set session mode to ANSI and everything
still will work?

Bemused,
-- 
MJ Ray (slef), member of www.software.coop, a for-more-than-profit co-op.
http://koha-community.org supporter, web and library systems developer.
In My Opinion Only: see http://mjr.towers.org.uk/email.html
Available for hire (including development) at http://www.software.coop/

From dpavlin at rot13.org  Fri Apr  6 22:55:04 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri, 6 Apr 2012 22:55:04 +0200
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow SQL
 performance
In-Reply-To: <4F7F4C4A.1010203@msys.ch>
References: <1333732221-5798-1-git-send-email-dpavlin@rot13.org>
	<4F7F4C4A.1010203@msys.ch>
Message-ID: <20120406205504.GD2993@rot13.org>

On Fri, Apr 06, 2012 at 10:04:26PM +0200, Marc Balmer wrote:
> Am 06.04.12 19:10, schrieb Dobrica Pavlinusic:
> > ShelfBrowser uses two SQL queries with syntax
> > 
> > WHERE ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?)
> > AND homebranch = ? AND location = ? AND ccode = ?
> > 
> > homebranch already has index, and adding indexes on ccode and location
> > improves performance by 30% for each query since MySQL is able to use
> > index_merge intersect(items_ccode,homebranch,items_location)
> 
> ah, it's these MySQL backquotes again... Can't we get rid of them in new
> code?

I wrote updatedatabase.pl in non-database specific way, but
data/mysql/kohastructure.sql is MySQL specific anyway, so I decided to be
consistent with rest of SQL file since there is also
installer/data/Pg/kohastructure.sql and DDL syntax in
data/mysql/kohastructure.sql wouldn't work on PostgreSQL even if it didn't
have quotes.

Is this wrong assumption?

While we are at installer/data/Pg/kohastructure.sql it seems it wasn't
touched since 2009. Should I provide patch against it also?

> > ---
> >  installer/data/mysql/kohastructure.sql |    2 ++
> >  installer/data/mysql/updatedatabase.pl |    8 ++++++++
> >  2 files changed, 10 insertions(+), 0 deletions(-)
> > 
> > diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
> > index 03911fe..21c657d 100644
> > --- a/installer/data/mysql/kohastructure.sql
> > +++ b/installer/data/mysql/kohastructure.sql
> > @@ -1054,6 +1054,8 @@ CREATE TABLE `items` ( -- holdings/item information
> >    KEY `homebranch` (`homebranch`),
> >    KEY `holdingbranch` (`holdingbranch`),
> >    KEY `itemcallnumber` (`itemcallnumber`),
> > +  KEY `items_location` (`location`),
> > +  KEY `items_ccode` (`ccode`),
> >    CONSTRAINT `items_ibfk_1` FOREIGN KEY (`biblioitemnumber`) REFERENCES `biblioitems` (`biblioitemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
> >    CONSTRAINT `items_ibfk_2` FOREIGN KEY (`homebranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE,
> >    CONSTRAINT `items_ibfk_3` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE
> > diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
> > index b3c5691..fae6351 100755
> > --- a/installer/data/mysql/updatedatabase.pl
> > +++ b/installer/data/mysql/updatedatabase.pl
> > @@ -5159,6 +5159,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
> >      SetVersion($DBversion);
> >  }
> >  
> > +$DBversion = "3.07.00.XXX";
> > +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
> > +    $dbh->do("CREATE INDEX items_location ON items(location)");
> > +    $dbh->do("CREATE INDEX items_ccode ON items(ccode)");
> > +    print "Upgrade to $DBversion done (items_location and items_ccode indexes added for ShelfBrowser)";
> > +    SetVersion($DBversion);
> > +}
> > +
> >  =head1 FUNCTIONS
> >  
> >  =head2 DropAllForeignKeys($table)
> 
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

-- 
Dobrica Pavlinusic               2share!2flame            dpavlin at rot13.org
Unix addict. Internet consultant.             http://www.rot13.org/~dpavlin

From chris at bigballofwax.co.nz  Sat Apr  7 07:53:14 2012
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Sat, 7 Apr 2012 17:53:14 +1200
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow SQL
	performance
In-Reply-To: <20120406205504.GD2993@rot13.org>
References: <1333732221-5798-1-git-send-email-dpavlin@rot13.org>
	<4F7F4C4A.1010203@msys.ch> <20120406205504.GD2993@rot13.org>
Message-ID: <CA+95qVTy3XM3gcvyGHJZ7iO75mepP3AjN2nqjMp+1pGShzPcjA@mail.gmail.com>

On 7 April 2012 08:55, Dobrica Pavlinusic <dpavlin at rot13.org> wrote:
> On Fri, Apr 06, 2012 at 10:04:26PM +0200, Marc Balmer wrote:

>> ah, it's these MySQL backquotes again... Can't we get rid of them in new
>> code?
>
> I wrote updatedatabase.pl in non-database specific way, but
> data/mysql/kohastructure.sql is MySQL specific anyway, so I decided to be
> consistent with rest of SQL file since there is also
> installer/data/Pg/kohastructure.sql and DDL syntax in
> data/mysql/kohastructure.sql wouldn't work on PostgreSQL even if it didn't
> have quotes.
>
> Is this wrong assumption?
>
No, it is the correct assumption, removing backticks from a mysql
specific file is at best a pointless exercise and at worst a dangerous
one. In fact, if we were to remove them all, this file would no longer
be able to be used to create a mysql db.


mysql -uroot -p test_comments < installer/data/mysql/kohastructure.sql
Enter password:
ERROR 1064 (42000) at line 1421: You have an error in your SQL syntax;
check the manual that corresponds to your MySQL server version for the
right syntax to use near 'return varchar(4) default NULL,
  renewals tinyint(4) default NULL,
  timestamp' at line 9

As you pointed out we have a postgres schema file already, and a much
better use of time would be, rather than badgering people to break the
mysql specific file, bring the postgre schema file up to date.

Chris

From marc at msys.ch  Sat Apr  7 21:19:24 2012
From: marc at msys.ch (Marc Balmer)
Date: Sat, 7 Apr 2012 21:19:24 +0200
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow SQL
	performance
In-Reply-To: <CA+95qVTy3XM3gcvyGHJZ7iO75mepP3AjN2nqjMp+1pGShzPcjA@mail.gmail.com>
References: <1333732221-5798-1-git-send-email-dpavlin@rot13.org>
	<4F7F4C4A.1010203@msys.ch> <20120406205504.GD2993@rot13.org>
	<CA+95qVTy3XM3gcvyGHJZ7iO75mepP3AjN2nqjMp+1pGShzPcjA@mail.gmail.com>
Message-ID: <F40F2727-595D-4984-A984-075AEDB4FEEA@msys.ch>





Am 07.04.2012 um 07:53 schrieb Chris Cormack <chris at bigballofwax.co.nz>:

> On 7 April 2012 08:55, Dobrica Pavlinusic <dpavlin at rot13.org> wrote:
>> On Fri, Apr 06, 2012 at 10:04:26PM +0200, Marc Balmer wrote:
> 
>>> ah, it's these MySQL backquotes again... Can't we get rid of them in new
>>> code?
>> 
>> I wrote updatedatabase.pl in non-database specific way, but
>> data/mysql/kohastructure.sql is MySQL specific anyway, so I decided to be
>> consistent with rest of SQL file since there is also
>> installer/data/Pg/kohastructure.sql and DDL syntax in
>> data/mysql/kohastructure.sql wouldn't work on PostgreSQL even if it didn't
>> have quotes.
>> 
>> Is this wrong assumption?
>> 
> No, it is the correct assumption, removing backticks from a mysql
> specific file is at best a pointless exercise and at worst a dangerous
> one. In fact, if we were to remove them all, this file would no longer
> be able to be used to create a mysql db.
> 
> 
> mysql -uroot -p test_comments < installer/data/mysql/kohastructure.sql
> Enter password:
> ERROR 1064 (42000) at line 1421: You have an error in your SQL syntax;
> check the manual that corresponds to your MySQL server version for the
> right syntax to use near 'return varchar(4) default NULL,
>  renewals tinyint(4) default NULL,
>  timestamp' at line 9
> 
> As you pointed out we have a postgres schema file already, and a much
> better use of time would be, rather than badgering people to break the
> mysql specific file, bring the postgre schema file up to date.
> 
> Chris


bla bla

using return as a column name is wrong in the first place.



From chris at bigballofwax.co.nz  Sun Apr  8 09:36:21 2012
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Sun, 8 Apr 2012 19:36:21 +1200
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow SQL
	performance
In-Reply-To: <F40F2727-595D-4984-A984-075AEDB4FEEA@msys.ch>
References: <1333732221-5798-1-git-send-email-dpavlin@rot13.org>
	<4F7F4C4A.1010203@msys.ch> <20120406205504.GD2993@rot13.org>
	<CA+95qVTy3XM3gcvyGHJZ7iO75mepP3AjN2nqjMp+1pGShzPcjA@mail.gmail.com>
	<F40F2727-595D-4984-A984-075AEDB4FEEA@msys.ch>
Message-ID: <CA+95qVQg3ZBsOQYKX2Y6kUshsFfyXPE-CHj2wVHmXveiaYkkFg@mail.gmail.com>

On 8 April 2012 07:19, Marc Balmer <marc at msys.ch> wrote:
>

>
>
> bla bla
>
> using return as a column name is wrong in the first place.
>
>
Rudeness aside, you are correct. However, that does not take away from
the fact that this is a mySQL specific file, and unless PostgreSQL has
decided to switch to innodb, will not be able to be used as a schema
for it. So removing backticks in this file, before changing the column
names will 1/ Break the file for it's intended use (creating a MySQL
db for use with Koha) and 2/ Still not be able to be used with
PostgreSQL

This will be my last exchange with you on this matter, as I find you
most unpleasant to deal with.

Chris

From Katrin.Fischer.83 at web.de  Mon Apr  9 11:49:54 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon,  9 Apr 2012 11:49:54 +0200
Subject: [Koha-patches] [PATCH] Bug 3413: Checkboxes for new subfields not
	saving correctly
Message-ID: <1333964994-6671-1-git-send-email-Katrin.Fischer.83@web.de>

The bug was in the numbering of the fields and subfields in the form.
The form elements for the 'new subfield' got the same numbered names and ids as
the form elements for the second subfield. (example: repeatable1)
The patch fixes the numbering to continue to the new subfield.

To test:
- Create some new subfields and check all checkbox fields save correctly
  (mandatory, repeatable, is url)
- Check that other subfields' checkboxes are not changed
- Check existing subfields and newly created subfields can be edited
---
 admin/marc_subfields_structure.pl                  |   27 +++++++++----------
 .../en/modules/admin/marc_subfields_structure.tt   |    4 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index f837644..5da9812 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -274,14 +274,13 @@ if ( $op eq 'add_form' ) {
     }
 
     # add more_subfields empty lines for add if needed
-    for ( my $j = 1 ; $j <= 1 ; $j++ ) {
         my %row_data;    # get a fresh hash for the row data
         $row_data{'new_subfield'} = 1;
         $row_data{'subfieldcode'} = '';
 
         $row_data{tab} = CGI::scrolling_list(
             -name   => 'tab',
-            -id     => "tab$j",
+            -id     => "tab$i",
             -values =>
               [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ],
             -labels => {
@@ -311,7 +310,7 @@ if ( $op eq 'add_form' ) {
         $row_data{seealso}      = "";
         $row_data{kohafield}    = CGI::scrolling_list(
             -name     => 'kohafield',
-            -id       => "kohafield$j",
+            -id       => "kohafield$i",
             -values   => \@kohafields,
             -default  => "",
             -size     => 1,
@@ -319,29 +318,29 @@ if ( $op eq 'add_form' ) {
         );
         $row_data{hidden}     = "";
         $row_data{repeatable} = CGI::checkbox(
-            -name     => "repeatable$j",
-            -id       => "repeatable$j",
+            -name     => "repeatable$i",
+            -id       => "repeatable$i",
             -checked  => '',
             -value    => 1,
             -label    => ''
         );
         $row_data{mandatory} = CGI::checkbox(
-            -name     => "mandatory$j",
-            -id       => "mandatory$j",
+            -name     => "mandatory$i",
+            -id       => "mandatory$i",
             -checked  => '',
             -value    => 1,
             -label    => ''
         );
         $row_data{isurl} = CGI::checkbox(
-            -name     => "isurl$j",
-            -id       => "isurl$j",
+            -name     => "isurl$i",
+            -id       => "isurl$i",
             -checked  => '',
             -value    => 1,
             -label    => ''
         );
         $row_data{value_builder} = CGI::scrolling_list(
             -name     => "value_builder",
-            -id       => "value_builder$j",
+            -id       => "value_builder$i",
             -values   => \@value_builder,
             -default  => $data->{'value_builder'},
             -size     => 1,
@@ -349,22 +348,22 @@ if ( $op eq 'add_form' ) {
         );
         $row_data{authorised_value} = CGI::scrolling_list(
             -name     => "authorised_value",
-            -id       => "authorised_value$j",
+            -id       => "authorised_value$i",
             -values   => \@authorised_values,
             -size     => 1,
             -multiple => 0,
         );
         $row_data{authtypes} = CGI::scrolling_list(
             -name     => "authtypecode",
-            -id       => "authtypecode$j",
+            -id       => "authtypecode$i",
             -values   => \@authtypes,
             -size     => 1,
             -multiple => 0,
         );
         $row_data{link}   = CGI::escapeHTML( $data->{'link'} );
-        $row_data{row}    = $j;
+        $row_data{row}    = $i;
         push( @loop_data, \%row_data );
-    }
+    
     $template->param( 'use_heading_flags_p'      => 1 );
     $template->param( 'heading_edit_subfields_p' => 1 );
     $template->param(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index 71c83b9..f7e10d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -112,7 +112,7 @@ $(document).ready(function() {
                     <input type="text" name="defaultvalue" id="defaultvalue[% loo.row %]" value="[% loo.defaultvalue %]" /></li>
 				<li><label for="maxlength[% loo.row %]">Max length:</label><input type="text" id="maxlength[% loo.row %]" name="maxlength" value="[% loo.maxlength %]" size="4" /> (see online help)</li>
                 <li><label for="hidden[% loo.row %]">hidden</label><input type="text" id="hidden[% loo.row %]" name="hidden" value="[% loo.hidden %]" size="2" /> (see online help)</li>
-                <li><label for="isurl[% loo.row %]">Is a url:</label>[% loo.isurl %] (if checked, it means that the subfield is a url and can be clicked)</li>
+                <li><label for="isurl[% loo.row %]">Is a URL:</label>[% loo.isurl %] (if checked, it means that the subfield is a URL and can be clicked)</li>
                 <li><label for="link[% loo.row %]">Link:</label><input type="text" id="link[% loo.row %]" name="link" value="[% loo.link %]" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>NOTE: If you change this value you must ask your administrator to run misc/batchRebuildBiblioTables.pl.</em></span></li>
                 <li><label for="kohafield[% loo.row %]">Koha link:</label>[% loo.kohafield %]</li>
 			</ol>
@@ -202,7 +202,7 @@ $(document).ready(function() {
             [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,[% END %]
             [% IF ( loo.seealso ) %] | See Also: [% loo.seealso %],[% END %]
             [% IF ( loo.hidden ) %]hidden,[% END %]
-            [% IF ( loo.isurl ) %]is a url,[% END %]
+            [% IF ( loo.isurl ) %]is a URL,[% END %]
             [% IF ( loo.authorised_value ) %] | Auth value:[% loo.authorised_value %],[% END %]
             [% IF ( loo.authtypecode ) %] | Authority:[% loo.authtypecode %],[% END %]
             [% IF ( loo.value_builder ) %] | Plugin:[% loo.value_builder %],[% END %]
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Mon Apr  9 12:00:21 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon,  9 Apr 2012 12:00:21 +0200
Subject: [Koha-patches] [PATCH] Bug 7834: order search at the top of acq
	does nothing
Message-ID: <1333965621-7255-1-git-send-email-Katrin.Fischer.83@web.de>

Entering a search term for 'title' or 'vendor' at the top search
form in acq (tab 'Orders search') did redirect to the advanced
search form, but didn't start the search.

After applying the patch the search will bring back results immediately
or redirect to the form, when there are no results.

To test:
- Check all searches still work as expected by searching for title,
vendor, order name and invoice number
- Check advanced search still has the search terms prepopulated
- Check searches with and without results are ok
---
 .../prog/en/includes/acquisitions-search.inc       |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index 32c76a2..8ccfe84 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -11,7 +11,9 @@
 	<p class="tip">Search orders:</p>
 	
 		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
-		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="[% title %]" /> <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name|html %]" />
+        <label for="title">Title: </label> <input type="text" id="title" name="title" size="15" value="[% title %]" /> 
+        <label for="searchsupplier">Vendor:</label> <input type="text" id="searchsupplier" name="name" size="15" value="[% name|html %]" />
+        <input type="hidden" id="do_search" name="do_search" value="do" />
         <span class="filteraction" id="filteraction_off" style="display:none"> <a href="#" onclick="$('#filters').toggle();$('.filteraction').hide();">[-]</a></span>
         <span class="filteraction" id="filteraction_on"> <a href="#" onclick="$('#filters').show();$('.filteraction').toggle();">[+]</a></span>
     <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Mon Apr  9 17:48:13 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon,  9 Apr 2012 17:48:13 +0200
Subject: [Koha-patches] [PATCH] Bug 7845: Multiple 260s don't display
	properly in search results
Message-ID: <1333986493-11658-1-git-send-email-Katrin.Fischer.83@web.de>

Corrects display for multiple 260 fields in intranet and OPAC.
In intranet the order of fields was wrong on the detail page.
In OPAC and intranet punctuation for multiple 260 fields in the
result list was not displaying properly.

Example after correction:
Publisher: Jena : Elsevier, 1907 ; Stuttgart : Franckh, 1907-1992 ; Jena : Urban & Fischer, 1993-2003
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   12 +++++++--
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |   24 +++++++++++++++---
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    5 ++-
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |   26 ++++++++++++++++----
 4 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index a1dca4f..80dbe03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -296,10 +296,16 @@
                 <xsl:with-param name="label">Publisher: </xsl:with-param>
             </xsl:call-template>
         </xsl:if>
-        
+
         <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary publisher"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <xsl:if test="marc:subfield[@code='a']">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">a</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:if>
+                <xsl:text> </xsl:text>
                 <xsl:if test="marc:subfield[@code='b']">
                 <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:{marc:subfield[@code='b']}">
                     <xsl:call-template name="subfieldSelect">
@@ -311,11 +317,11 @@
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">acg</xsl:with-param>
+                        <xsl:with-param name="codes">cg</xsl:with-param>
                     </xsl:call-template>
                    </xsl:with-param>
                </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
             </xsl:for-each>
         </span>
         </xsl:if>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
index 87aebec..6bb1c10 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -769,14 +769,30 @@
     </xsl:if>
 
     <xsl:if test="marc:datafield[@tag=260]">
-	<span class="results_summary">
-    <span class="label">Publisher: </span>
+        <span class="results_summary publisher"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <xsl:if test="marc:subfield[@code='a']">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abcg</xsl:with-param>
+                        <xsl:with-param name="codes">a</xsl:with-param>
                     </xsl:call-template>
+                </xsl:if>
+                <xsl:text> </xsl:text>
+                <xsl:if test="marc:subfield[@code='b']">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">b</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:if>
+                <xsl:text> </xsl:text>
+                <xsl:call-template name="chopPunctuation">
+                  <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">cg</xsl:with-param>
+                    </xsl:call-template>
+                   </xsl:with-param>
+                </xsl:call-template>
+                <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
             </xsl:for-each>
-	</span>
+        </span>
     </xsl:if>
 
     <!-- Other Title  Statement: Alternate Graphic Representation (MARC 880) -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 189bffe..f507e11 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -310,8 +310,9 @@
                 <xsl:if test="marc:subfield[@code='a']">
                     <xsl:call-template name="subfieldSelect">
                         <xsl:with-param name="codes">a</xsl:with-param>
-                    </xsl:call-template>&nbsp;
+                    </xsl:call-template>
                 </xsl:if>
+                <xsl:text> </xsl:text>
                 <xsl:if test="marc:subfield[@code='b']">
                 <a href="/cgi-bin/koha/opac-search.pl?q=pb:{marc:subfield[@code='b']}">
                     <xsl:call-template name="subfieldSelect">
@@ -327,7 +328,7 @@
                     </xsl:call-template>
                    </xsl:with-param>
                </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
             </xsl:for-each>
         </span>
         </xsl:if>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index d742a29..68a6a1b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -871,16 +871,32 @@
         <xsl:with-param name="label">Publisher: </xsl:with-param>
       </xsl:call-template>
     </xsl:if>
-        
+
     <xsl:if test="marc:datafield[@tag=260]">
-	<span class="results_summary">
-    <span class="label">Publisher: </span> 
+        <span class="results_summary publisher"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <xsl:if test="marc:subfield[@code='a']">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">a</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:if>
+                <xsl:text> </xsl:text>
+                <xsl:if test="marc:subfield[@code='b']">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abcg</xsl:with-param>
+                        <xsl:with-param name="codes">b</xsl:with-param>
                     </xsl:call-template>
+                </xsl:if>
+                <xsl:text> </xsl:text>
+                <xsl:call-template name="chopPunctuation">
+                  <xsl:with-param name="chopString">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">cg</xsl:with-param>
+                    </xsl:call-template>
+                   </xsl:with-param>
+                </xsl:call-template>
+                <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
             </xsl:for-each>
-	</span>
+        </span>
     </xsl:if>
 
     <!-- Other Title  Statement: Alternate Graphic Representation (MARC 880) -->
-- 
1.7.5.4


From nengard at bywatersolutions.com  Mon Apr  9 21:58:45 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Mon,  9 Apr 2012 15:58:45 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: 3.8 Help Files
Message-ID: <1334001525-16690-1-git-send-email-nengard@bywatersolutions.com>

These are the three help files that do not belong in any
specific directory. Links updated to the 3.8 manual.
---
 .../intranet-tmpl/prog/en/modules/help/about.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/help/mainpage.tt |    3 +++
 .../intranet-tmpl/prog/en/modules/help/nohelp.tt   |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
index e7c9d96..f29b1e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
@@ -14,6 +14,6 @@
 
 <p>Koha is developed and supported by a large number of developers around the world. Thanks to all the developers and libraries who support Koha</p>
 
-<p><strong>See the full documentation for the About page in the <a href="http://manual.koha-community.org/3.6/en/aboutkoha.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the About page in the <a href="http://manual.koha-community.org/3.8/en/aboutkoha.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
index 1d17541..3e0bc07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
@@ -26,4 +26,7 @@
 
 <p>The online help directory is: <pre>&nbsp;/koha-tmpl/intranet-tmpl/prog/en/modules/help</pre></p>
 
+<p><strong>See the full documentation for Koha in the <a href="http://manual.koha-community.org/3.8/en/">manual</a> (online).</strong></p>
+
+
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
index 57c5ffc..28a1db0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
@@ -2,7 +2,7 @@
 	
 <h1>Online Help</h1>
 
-<p>Sorry, there is no help available for this topic, please refer to the <a href="http://manual.koha-community.org/3.6/en/">Koha 3.6 manual</a> (online).</p>
+<p>Sorry, there is no help available for this topic, please refer to the <a href="http://manual.koha-community.org/3.8/en/">Koha 3.8 manual</a> (online).</p>
 
 <form action="/cgi-bin/koha/edithelp.pl" method="post">
 	<input type="hidden" name="referer" value="[% referer %]" />
-- 
1.7.2.3


From nengard at bywatersolutions.com  Mon Apr  9 22:07:09 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Mon,  9 Apr 2012 16:07:09 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Help file for Lists
Message-ID: <1334002029-16780-1-git-send-email-nengard@bywatersolutions.com>

This is the 3.8 help file for lists.
---
 .../prog/en/modules/help/virtualshelves/shelves.tt |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
index 0bd79ab..aceae7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
@@ -51,6 +51,22 @@
 
 <p>Clicking on the 'List Name' will show the contents of the list</p>
 
-<p><strong>See the full documentation for Lists in the <a href="http://manual.koha-community.org/3.6/en/stafflists.html#lists">manual</a> (online).</strong></p>
+<h2>Merging Bibliographic Records Via Lists</h2>
+
+<p>The easiest way to merge together duplicate bibliographic records is to add them to a list and use the Merge Tool from there.</p>
+
+<p>From the list, check the two items you want to merge. If you choose more than or fewer than 2, you will be presented with an error</p>
+
+<p>Once you have selected the records you want to merge, click the 'Merge selected items' button. You will be asked which of the two records you would like to keep as your primary record and which will be deleted after the merge. If the records were created using different frameworks, Koha will also ask you what Framework you would like the newly merged record to use.</p>
+
+<p>You will be presented with the MARC for both of the records (each accessible by tabs labeled with the bib numbers for those records). By default the entire first record will be selected, uncheck the fields you don't want in the final (destination) record and then move on to the second tab to choose which fields should be in the final (destination) record.</p>
+
+<p>Should you try to add a field that is not repeatable two times (like choosing the 245 field from both record #1 and #2) you will be presented with an error</p>
+
+<p>Once you have completed your selections click the 'merge' button. The primary record will now show the data you chose for it as well as all of the items/holdings from both bib records, and the second record will be deleted.</p>
+
+<p style="color: rgb(153, 0, 0);">Important: It is important to rebuild your zebra index immediately after merging records. If a search is performed for a record which has been deleted Koha will present the patrons with an error in the OPAC.</p>
+
+<p><strong>See the full documentation for Lists in the <a href="http://manual.koha-community.org/3.8/en/stafflists.html#lists">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From Katrin.Fischer.83 at web.de  Mon Apr  9 21:40:06 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon,  9 Apr 2012 21:40:06 +0200
Subject: [Koha-patches] [PATCH] Bug 7935: Introduce sys pref to control
	'browse results' in OPAC
Message-ID: <1334000406-14936-1-git-send-email-Katrin.Fischer.83@web.de>

Patch introduces a new system preference "OpacBrowseResults" to control
the feature for browsing and paging through results shown on top of the
left menu on detail pages in OPAC.

Preference is activated by default and can be deactivated using the
system preference.

To test:
 - Check database update works correctly
 - Check that browsing and paging still works with after database update
 - Deactivate the feature by setting 'OpacBrowseResults' to 'Disable'
 - Check the feature does no longer show up in OPAC
 - Check that a new installation also has the system preference with correct default
---
 C4/Auth.pm                                         |    2 +-
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   12 +++++++++++-
 .../prog/en/modules/admin/preferences/opac.pref    |    8 ++++++++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   15 +++++++++------
 opac/opac-detail.pl                                |    4 ++++
 6 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 0d5ddba..549c5c2 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -373,7 +373,7 @@ sub get_template_and_user {
         $LibraryNameTitle =~ s/<(?:\/?)(?:br|p)\s*(?:\/?)>/ /sgi;
         $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
         # clean up the busc param in the session if the page is not opac-detail
-        if ($in->{'template_name'} =~ /opac-(.+)\.(?:tt|tmpl)$/ && $1 !~ /^(?:MARC|ISBD)?detail$/) {
+        if (C4::Context->preference("OpacBrowseResults") && $in->{'template_name'} =~ /opac-(.+)\.(?:tt|tmpl)$/ && $1 !~ /^(?:MARC|ISBD)?detail$/) {
             my $sessionSearch = get_session($sessionID || $in->{'query'}->cookie("CGISESSID"));
             $sessionSearch->clear(["busc"]) if ($sessionSearch->param("busc"));
         }
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 34ac684..eb86cf2 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -360,3 +360,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('SocialNetworks','1','Enable/Disable social networks links in opac detail pages','','YesNo');
 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('SubscriptionDuplicateDroppedInput','','','List of fields which must not be rewritten when a subscription is duplicated (Separated by pipe |)','Free');
 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('AutoResumeSuspendedHolds',  '1', NULL ,  'Allow suspended holds to be automatically resumed by a set date.',  'YesNo');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index b3c5691..f958ce1 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5090,7 +5090,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
 $DBversion = "3.07.00.041";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('SubscriptionDuplicateDroppedInput','','','List of fields which must not be rewritten when a subscription is duplicated (Separated by pipe |)','Free')");
-    print "Upgrade to $DBversion done (Add System Preferences SubscriptionDuplicateDroppedInput)\n";
+    print "Upgrade to $DBversion done (Add system preference SubscriptionDuplicateDroppedInput)\n";
     SetVersion($DBversion);
 }
 
@@ -5159,6 +5159,16 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo')");
+    print "Upgrade to $DBversion done (Add system preference OpacBrowseResults ))\n";
+    SetVersion($DBversion);
+}
+
+
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 54cc43a..715bf94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -315,6 +315,14 @@ OPAC:
                   yes: Enable
                   no: Disable
             - social network links in opac detail pages
+        -
+            - pref: OpacBrowseResults
+              default: 1
+              choices:
+                  yes: Enable
+                  no: Disable
+            - browsing and paging search results from the OPAC detail page.
+
     Policy:
         -
             - pref: singleBranchMode
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 36ef631..4f80aa1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -11,7 +11,8 @@
 [% END %]
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
-    [% IF ( busc ) %]
+
+    [% IF ( OpacBrowseResults && busc ) %]
         var arrPagination = new Array();
         var pag_index_ini = [% indexPag %];
         [% IF ( listResults ) %]
@@ -55,7 +56,9 @@
         [% END %]
 	[% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]
         $(".tagbutton").click(KOHA.Tags.add_tag_button);[% END %][% END %][% END %]
-        [% IF ( busc ) %]
+
+
+    [% IF ( OpacBrowseResults && busc ) %]
         if (arrPagination.length > 0) {
             renderPagIndexList(pag_index_ini, $("#listResults"));
         }
@@ -80,14 +83,13 @@
             var navigation = $(".pagination");
             navigation.hide();
         });
-        [% END %]
+    [% END %]
 
         $(".branch-info-tooltip-trigger").tooltip({delay: 100, position: "top right"});
 });
 
 
-[% IF ( busc ) %]
-
+[% IF ( OpacBrowseResults && busc ) %]
 var timeoutRFW;
 var totalPagItemList = 10;
 
@@ -1078,7 +1080,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
 <div class="yui-u">
 <div id="ulactioncontainer" class="container">
-[% IF ( busc ) %]
+
+[% IF ( OpacBrowseResults && busc ) %]
     <div class="nav_results">
         <div class="l_Results">[% IF ( listResults ) %]<a href="#" id="a_listResults" title="Show pagination list ([% indexPag %]-[% indexPagEnd %] / [% totalPag %])">Browse results</a>[% ELSE %]<span>Browse results</span>[% END %]</div>
         <ul class="pg_menu clearfix">
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 796f3b0..640f9e7 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -94,8 +94,11 @@ if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
     $template->param( 'XSLTBloc' => XSLTParse4Display($biblionumber, $record, "OPACXSLTDetailsDisplay" ) );
 }
 
+my $OpacBrowseResults = C4::Context->preference("OpacBrowseResults");
+$template->{VARS}->{'OpacBrowseResults'} = $OpacBrowseResults;
 
 # We look for the busc param to build the simple paging from the search
+if ($OpacBrowseResults) {
 my $session = get_session($query->cookie("CGISESSID"));
 my %paging = (previous => {}, next => {});
 if ($session->param('busc')) {
@@ -375,6 +378,7 @@ if ($session->param('busc')) {
     $template->param('listResults' => \@listResults) if (@listResults);
     $template->param('indexPag' => 1 + $offset, 'totalPag' => $arrParamsBusc{'total'}, 'indexPagEnd' => scalar(@arrBiblios) + $offset);
 }
+}
 
 
 
-- 
1.7.5.4


From nengard at bywatersolutions.com  Mon Apr  9 22:12:49 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Mon,  9 Apr 2012 16:12:49 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Cataloging Help Files
Message-ID: <1334002369-16849-1-git-send-email-nengard@bywatersolutions.com>

These are the updated help files for cataloging
---
 .../prog/en/modules/help/cataloguing/addbiblio.tt  |    2 +-
 .../prog/en/modules/help/cataloguing/additem.tt    |    2 +-
 .../prog/en/modules/help/cataloguing/merge.tt      |    4 +---
 .../prog/en/modules/help/cataloguing/moveitem.tt   |    2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
index 55774dc..e2408f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
@@ -89,6 +89,6 @@
 
 <p>If you would like to merge together multiple records you can do that via the Lists tool.</p>
 
-<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.6/en/cataloging.html#catbibs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.8/en/cataloging.html#catbibs">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
index 43b2a31..bf2cf64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
@@ -57,6 +57,6 @@
 
 <p>Finally you can use the batch delete tool to delete a batch of items.</p>
 
-<p><strong>See the full documentation for Adding/Editing Items in the <a href="http://manual.koha-community.org/3.6/en/catitems.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Adding/Editing Items in the <a href="http://manual.koha-community.org/3.8/en/catitems.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
index 854bafe..157012d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
@@ -2,8 +2,6 @@
 
 <h1>Merging Items</h1>
 
-<p style="color: rgb(153, 0, 0);">Important: Merging will only work with two items that use the same bibliographic framework.</p>
-
 <p>The easiest way to merge together duplicate bibliographic records is to add them to a list and use the Merge Tool from there.</p>
 
 <p>From the list, check the two items you want to merge. If you choose more than or fewer than 2, you will be presented with an error</p>
@@ -20,6 +18,6 @@
 
 <p style="color: rgb(153, 0, 0);">Important: It is important to rebuild your zebra index immediately after merging records. If a search is performed for a record which has been deleted Koha will present the patrons with an error in the OPAC.</p>
 
-<p><strong>See the full documentation for Merging Items in the <a href="http://manual.koha-community.org/3.6/en/stafflists.html#mergebibrecs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Merging Items in the <a href="http://manual.koha-community.org/3.8/en/stafflists.html#mergebibrecs">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
index d35eead..ea3f0bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
@@ -10,6 +10,6 @@
 
 <p>If you want to move all items to a new record creating only one bibliographic record you can use the Merge Records tool instead.</p>
 
-<p><strong>See the full documentation for Moving Items in the <a href="http://manual.koha-community.org/3.6/en/catitems.html#moveitemrec">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Moving Items in the <a href="http://manual.koha-community.org/3.8/en/catitems.html#moveitemrec">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From Katrin.Fischer.83 at web.de  Tue Apr 10 00:43:18 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Tue, 10 Apr 2012 00:43:18 +0200
Subject: [Koha-patches] [PATCH 1/2] Bug 7937: Silence warns in OPAC error
	log (koha-opac-error_log)
Message-ID: <1334011399-23470-1-git-send-email-Katrin.Fischer.83@web.de>

To reproduce:
Access a detail page where at least some items are available and have
no due date.

Log:
opac-detail.pl: Use of uninitialized value in concatenation (.) or string at
/home/katrin/kohaclone/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
line 657.
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 36ef631..e056beb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -630,7 +630,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             [% IF ( itemdata_itemnotes ) %]<th id="item_notes">Notes</th>[% END %]
             <th id="item_datedue">Date due</th>
         </tr></thead>
-	    <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
+        <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
 	    <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
 		<td>
     [% UNLESS ( singleBranchMode ) %]
@@ -652,7 +652,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 		[% IF ( itemdata_copynumber ) %]<td>[% ITEM_RESULT.copynumber %]</td>[% END %]
 		<td>[% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
 		[% IF ( itemdata_itemnotes ) %]<td>[% ITEM_RESULT.itemnotes %]</td>[% END %]
-		<td>[% ITEM_RESULT.datedue | $KohaDates %]</td>
+        <td>[% IF ( ITEM_RESULT.datedue ) %][% ITEM_RESULT.datedue | $KohaDates %][% END %]</td>
 	    </tr>
 	    [% END %]</tbody>
 	</table>
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Tue Apr 10 00:43:19 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Tue, 10 Apr 2012 00:43:19 +0200
Subject: [Koha-patches] [PATCH 2/2] Bug 7937: Silence warns in OPAC error
	log (koha-opac-error_log)
In-Reply-To: <1334011399-23470-1-git-send-email-Katrin.Fischer.83@web.de>
References: <1334011399-23470-1-git-send-email-Katrin.Fischer.83@web.de>
Message-ID: <1334011399-23470-2-git-send-email-Katrin.Fischer.83@web.de>

I noticed warnings in the logs for an item without itemtype on item
and record level. While trying to resolve the warns, I noticed a possible
optimization in XSLT.pm.

GetItemsInfo is built to return the notforloan value both for the item
and record level, depending on the item-level_itype setting.

- $item->{notforloan} doesn't exist in @items
- $itemtypes->{ $item->{itype} }->{notforloan} can be replaced by $item->{notforloan_per_itemtype}
---
 C4/XSLT.pm |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index 56ba544..02922e9 100644
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -232,7 +232,6 @@ sub buildKohaItemsNamespace {
         @items = grep { !$hi{$_->{itemnumber}} } @items;
     }
     my $branches = GetBranches();
-    my $itemtypes = GetItemTypes();
     my $xml = '';
     for my $item (@items) {
         my $status;
@@ -240,13 +239,12 @@ sub buildKohaItemsNamespace {
         my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
 
 	my ( $reservestatus, $reserveitem, undef ) = C4::Reserves::CheckReserves($item->{itemnumber});
-
-        if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} || 
+        if ( $item->{notforloan_per_itemtype} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} || 
              (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ 
             if ( $item->{notforloan} < 0) {
                 $status = "On order";
             } 
-            if ( $item->{itemnotforloan} > 0 || $item->{notforloan} > 0 || $itemtypes->{ $item->{itype} }->{notforloan} == 1 ) {
+            if ( $item->{itemnotforloan} > 0 || ($item->{notforloan_per_itemtype} && $item->{notforloan_per_itemtype}) == 1 ) {
                 $status = "reference";
             }
             if ($item->{onloan}) {
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Tue Apr 10 01:25:11 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Tue, 10 Apr 2012 01:25:11 +0200
Subject: [Koha-patches] [PATCH] Bug 7937: Fix warns on opac-userupdate.pl
Message-ID: <1334013911-24447-1-git-send-email-Katrin.Fischer.83@web.de>

1) opac-userupdate.pl: Use of uninitialized value $updateemailaddress in
pattern match (m//) at /home/katrin/kohaclone/opac/opac-userupdate.pl line 61.

Warn was created when branch has no email address.
The script falls back to KohaAdminEmailAddress first and shows an
error message in OPAC when there is no email address to be used.

2) opac-userupdate.pl: Use of uninitialized value in concatenation (.) or
string at /home/katrin/kohaclone/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
line 75.

Warn was created when patron has no date of birth.
---
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |    9 ++++++++-
 opac/opac-userupdate.pl                            |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
index b903e4d..90a39ad 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt
@@ -70,7 +70,14 @@
 </fieldset>
 <fieldset class="brief">
 <ol>
-<li><label for="dob">Date of birth: </label> <input id="dob" type="text" size="10" value="[% BORROWER_INF.dateofbirth | $KohaDates %]" name="dateofbirth" /></li>
+<li>
+    <label for="dob">Date of birth: </label> 
+    [% IF ( BORROWER_INF.dateofbirth ) %]
+        <input id="dob" type="text" size="10" value="[% BORROWER_INF.dateofbirth | $KohaDates %]" name="dateofbirth" />
+    [% ELSE %]
+        <input id="dob" type="text" size="10" value="" name="dateofbirth" />
+    [% END %]
+</li>
 <li><label for="sex">Gender: </label> <select name="sex" id="sex"><option></option>
 [% IF ( BORROWER_INF.sex == 'F' ) %]<option value="F" selected="selected">Female</option>[% ELSE %]<option value="F">Female</option>[% END %]
 [% IF ( BORROWER_INF.sex == 'M' ) %]<option value="M" selected="selected">Male</option>[% ELSE %]<option value="M">Male</option>[% END %]
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index b37d88c..1dfc87f 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -57,7 +57,7 @@ my @fields = (
     'surname','firstname','othernames','streetnumber','address','address2','city','state','zipcode','country','phone','mobile','fax','phonepro', 'emailaddress','emailpro','B_streetnumber','B_address','B_address2','B_city','B_state','B_zipcode','B_country','B_phone','B_email','dateofbirth','sex'
 );
 my $update;
-my $updateemailaddress = $lib->{'branchemail'};
+my $updateemailaddress = $lib->{'branchemail'} || '';
 $updateemailaddress = C4::Context->preference('KohaAdminEmailAddress') unless( $updateemailaddress =~ /\w+@\w+/);
 if ( !$updateemailaddress || $updateemailaddress eq '' ) {
     warn
-- 
1.7.5.4


From nengard at bywatersolutions.com  Tue Apr 10 18:00:58 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 12:00:58 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_7936=3A_Tools_Help_for_3?=
	=?utf-8?q?=2E8?=
Message-ID: <1334073658-2238-1-git-send-email-nengard@bywatersolutions.com>

This updates the tools help files and adds a new
help file for the new upload cover images tool.
---
 .../prog/en/modules/help/tools/batchMod.tt         |    5 +-
 .../prog/en/modules/help/tools/cleanborrowers.tt   |    2 +-
 .../prog/en/modules/help/tools/csv-profiles.tt     |    2 +-
 .../prog/en/modules/help/tools/export.tt           |    2 +-
 .../prog/en/modules/help/tools/holidays.tt         |   32 ++++--
 .../prog/en/modules/help/tools/import_borrowers.tt |    2 +-
 .../prog/en/modules/help/tools/inventory.tt        |    2 +-
 .../prog/en/modules/help/tools/koha-news.tt        |    2 +-
 .../prog/en/modules/help/tools/letter.tt           |  110 ++++++++++++++------
 .../en/modules/help/tools/manage-marc-import.tt    |    2 +-
 .../prog/en/modules/help/tools/overduerules.tt     |    2 +-
 .../prog/en/modules/help/tools/picture-upload.tt   |    2 +-
 .../prog/en/modules/help/tools/scheduler.tt        |    2 +-
 .../en/modules/help/tools/stage-marc-import.tt     |    8 +-
 .../prog/en/modules/help/tools/tools-home.tt       |    2 +-
 .../en/modules/help/tools/upload-cover-image.tt    |   45 ++++++++
 .../prog/en/modules/help/tools/viewlog.tt          |    2 +-
 17 files changed, 159 insertions(+), 65 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/upload-cover-image.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
index 09563fe..acec1db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
@@ -1,5 +1,4 @@
 [% INCLUDE 'help-top.inc' %]
-<!--<h1>Batch Modify Items</h1>-->
 
 <h1>Batch Modify Items</h1>
 
@@ -19,10 +18,10 @@
 
 <p>From the tool you can choose to upload a file of barcodes or item ids, or you can scan items one by one into the box below the upload tool. Once you have your file uploaded or the barcodes listed you can click 'Continue.'</p>
 
-<p>You will be presented with a confirmation screen. From here you can uncheck the items you don't want to delete before clicking 'Go.' If the items are checked out you will be presented with an error after clicking 'Go' and the items will not be deleted.</p>
+<p>You will be presented with a confirmation screen. From here you can uncheck the items you don't want to delete and decide if Koha should delete the bib record if the last item is being deleted before clicking 'Delete selected items.' If the items are checked out you will be presented with an error after clicking 'Delete selected items' and the items will not be deleted.</p>
 
 <p>If the items can be deleted they will be and you will be presented with a confirmation of your deletion.</p>
 
-<p><strong>See the full documentation for <a href="http://manual.koha-community.org/3.6/en/batchmodifyitems.html">Batch Item Modifications</a> and <a href="http://manual.koha-community.org/3.6/en/batchdeleteitems.html">Batch Item Deletions</a> in the manual (online).</strong></p>
+<p><strong>See the full documentation for <a href="http://manual.koha-community.org/3.8/en/batchmodifyitems.html">Batch Item Modifications</a> and <a href="http://manual.koha-community.org/3.8/en/batchdeleteitems.html">Batch Item Deletions</a> in the manual (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
index df1a6c7..236e89e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
@@ -16,6 +16,6 @@
 	<li>Clicking 'Finish' will delete or anonymize your data</li>
 </ul>
 
-<p><strong>See the full documentation for Anonymizing Patrons in the <a href="http://manual.koha-community.org/3.6/en/anonpatrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Anonymizing Patrons in the <a href="http://manual.koha-community.org/3.8/en/anonpatrons.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
index 86cb391..8f960ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
@@ -48,6 +48,6 @@
 
 <p>Your CSV Profiles will appear on the export list or cart menu under the 'Download' button</p>
 
-<p><strong>See the full documentation for CSV Profiles in the <a href="http://manual.koha-community.org/3.6/en/csvprofiles.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for CSV Profiles in the <a href="http://manual.koha-community.org/3.8/en/csvprofiles.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
index df3425a..5188b9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
@@ -30,6 +30,6 @@
 </ul>
 </ul>
 
-<p><strong>See the full documentation for Exporting MARC Records in the <a href="http://manual.koha-community.org/3.6/en/exportbibs.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Exporting MARC Records in the <a href="http://manual.koha-community.org/3.8/en/exportbibs.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
index b34e684..2102d15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
@@ -5,37 +5,49 @@
 <p>Libraries can define library closings and holidays to be used when calculating due dates. You can make use of the Calendar by turning on the proper system preferences:</p>
 
 <ul>
-	<li>Get there: More &gt; Administration &gt; Global System Preferences &gt; Circulation &gt; useDaysMode
+	<li><em>Get there: </em>More &gt; Administration &gt; Global System Preferences &gt; Circulation &gt; <span class="link"><span class="link">useDaysMode</span></span>
 <ul>
 	<li>Choose the method for calculating due date - either include days the library is closed in the calculation or don't include them.</li>
 </ul>
 </li>
-	<li>Get there: More &gt; Administration &gt; Global System Preferences &gt; Circulation &gt; finescalendar
+	<li><em>Get there:</em> More &gt; Administration &gt; Global System Preferences &gt; Circulation &gt; <span class="link"><span class="link">finescalendar</span></span>
 <ul>
 	<li>This will check the holiday calendar before charging fines</li>
 </ul>
 </li>
 </ul>
 
-<h2>Adding Events</h2>
+<h3>Adding Events</h3>
 
-<p>Before adding events, choose the library you would like to apply the closings to. When adding events you will be asked if you would like to apply the event to one library or all libraries. To add events, simply</p>
+<p>Before adding events, choose the library you would like to apply the closings to. When adding events you will be asked if you would like to apply the event to one branch or all branches. To add events, simply</p>
 
 <ul>
 	<li>Click on the date on the calendar that you would like to apply the closing to</li>
-	<li>In the form that appears above the calendar, enter the closing information
+	<li>In the form that appears above the calendar, enter the closing information (for more info on each option click the question mark [?] to the right of the option)
 <ul>
 	<li>Library will be filled in automatically based on the library you chose from the pull down at the top of the page</li>
 	<li>The day information will also be filled in automatically based on the date you clicked on the calendar</li>
 	<li>In the description enter the reason the library is closed</li>
-	<li>Next you can choose if this event is a one time event or if it is repeatable.</li>
-	<li>Finally decide if this event should be applied to all libraries or just the one you have originally selected</li>
+	<li>Next you can choose if this event is a one time event or if it is repeatable.
+<ul>
+	<li>If this is a one day holiday choose 'Holiday only on this day'</li>
+	<li>If this is a weekly closing (like a weekend day) then you can choose 'Holiday repeated every same day of the week'</li>
+	<li>If this is an annual holiday closing choose 'Holiday repeated yearly on the same date'</li>
+	<li>If the library is going to be closed for the week or a range of time choose 'Holiday on a range' and enter a 'To Date' at the top</li>
+	<li>If the library is going to be closed for a range of time each year (such as summer holidays for schools) choose 'Holiday repeated yearly on a range' and enter a 'To Date' at the top</li>
+</ul>
+</li>
+	<li>Finally decide if this event should be applied to all libraries or just the one you have originally selected
+<ul>
+	<li>If you'd rather enter all the holidays and then copy them all to another branch all at once you can use the copy menu below the calendar</li>
+</ul>
+</li>
 </ul>
 </li>
 	<li>After saving you will see the event listed in the summary to the right the calendar</li>
 </ul>
 
-<h2>Editing Events</h2>
+<h3>Editing Events</h3>
 
 <p>To edit events</p>
 
@@ -49,11 +61,11 @@
 </li>
 </ul>
 
-<h2>Additional Help</h2>
+<h3>Additional Help</h3>
 
 <p>When adding or editing events you can get additional help by clicking on the question mark next to various different options on the form</p>
 
-<p><strong>See the full documentation for the Calendar in the <a href="http://manual.koha-community.org/3.6/en/calholidays.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Calendar in the <a href="http://manual.koha-community.org/3.8/en/calholidays.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
index 65cd1db..f65ff9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
@@ -55,6 +55,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Import in the <a href="http://manual.koha-community.org/3.6/en/patronimport.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Import in the <a href="http://manual.koha-community.org/3.8/en/patronimport.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
index 070de90..4eba729 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
@@ -16,6 +16,6 @@
 
 <p>Choose the text file and the date you want to mark all times as seen and click 'Submit.'</p>
 
-<p><strong>See the full documentation for Inventory in the <a href="http://manual.koha-community.org/3.6/en/inventory.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Inventory in the <a href="http://manual.koha-community.org/3.8/en/inventory.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
index 95916f3..9eb742d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
@@ -22,6 +22,6 @@
 	<li>News on the circulation receipts will appear below the items that are checked out</li>
 </ul>
 
-<p><strong>See the full documentation for News in the <a href="http://manual.koha-community.org/3.6/en/tools.html#newstool">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for News in the <a href="http://manual.koha-community.org/3.8/en/tools.html#newstool">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]    
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
index b44cdbd..6f0288c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
@@ -1,62 +1,68 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Notices</h1>
+<h1>Notices & Slips</h1>
 
-<p>All notices sent by Koha can be customized using the Notices Tool. The system comes with several predefined templates that will appear when you first visit the Notices Tool</p>
+<p>All notices and circulation receipts (or slips) generated by Koha can be customized using the Notices &amp; Slips Tool. The system comes with several predefined templates that will appear when you first visit this tool.</p>
 
-<p>Each notice can be edited, but only a few can be deleted, this is to prevent system errors should a message try to send without a template.</p>
+<p>Each notice can be edited, but only a few can be deleted, this is to prevent system errors should a message try to send without a template. Each notice and slip can be edited on a per library basis, by default you will see the notices for all libraries.</p>
 
-<h2>Adding Notices</h2>
+<p>If you have a style you'd like applied to all slips you can point the SlipCSS preference to a stylesheet. The same is true for notices, using the NoticeCSS preference to define a stylesheet.</p>
 
-<p>To add a new notice</p>
+<h3>Adding Notices & Slips</h3>
+
+<p>To add a new notice or slip
 
 <ul>
 	<li>Click 'New Notice'</li>
+	<li>Choose which library this notice or slip is for</li>
 	<li>Choose the module this notice is related to</li>
 	<li>The Code is limited to 20 characters</li>
 	<li>Use the name field to expand on your Code</li>
+	<li>If you plan on writing the notice or slip in HTML check the 'HTML Message' box, otherwise the content will be generated as plain text</li>
 	<li>Message Subject is what will appear in the subject line of the email</li>
 	<li>In the message body feel free to type whatever message you feel is best, use the fields on the left hand side to enter individualized data from the from database.
 <ul>
-	<li style="color: #990000;">Important: On overdue notices make sure to use &lt;&lt;items.content&gt;&gt; to print out the data related to all items that are overdue. The other option is to use the &lt;item&gt;&lt;/item&gt; tags to span the line so that it will print out multiple lines</li>
-	<li style="color: #990000;">Important: Only the overdue notices take advantage of the &lt;item&gt;&lt;/item&gt; tags, all other notices referencing items need to use &lt;&lt;items.content&gt;&gt;</li>
+	<li style="color: #990000;">Important: Overdue notices can use &lt;&lt;items.content&gt;&gt; tags by themselves, or use &lt;item&gt;&lt;/item&gt; to span all of the tags. Learn more about the Overdue Notice Markup</li>
+<ul>
+	<li>On overdue notices make sure to use &lt;&lt;items.content&gt;&gt; tags to print out the data related to all items that are overdue.</li>
+</ul>
+<ul>
+	<li>The other option, only for overdue notices, is to use the &lt;item&gt;&lt;/item&gt; tags to span the line so that it will print out multiple lines One example for the &lt;item&gt;&lt;/item&gt; tag option is:&lt;item&gt;"&lt;&lt;biblio.title&gt;&gt;" by &lt;&lt;biblio.author&gt;&gt;, &lt;&lt;items.itemcallnumber&gt;&gt;, Barcode: &lt;&lt;items.barcode&gt;&gt; , Checkout date: &lt;&lt;issues.issuedate&gt;&gt;, Due date: &lt;&lt;issues.date_due&gt;&gt; Fine: &lt;fine&gt;USD&lt;/fine&gt; Due date: &lt;&lt;issues.date_due&gt;&gt; &lt;/item&gt;</li>
+</ul>
 </ul>
 </li>
+	<li style="color: #990000;">Important: Only the overdue notices take advantage of the &lt;item&gt;&lt;/item&gt; tags, all other notices referencing items need to use &lt;&lt;items.content&gt;&gt;</li>
 </ul>
 
-<h3>Notice Markup</h3>
+<h4>Overdue Notice Markup</h4>
 
 <p>When creating your overdue notices there are two tags in addition to the various database fields that you can use in your notices.</p>
 
-<p style="color: #990000;">Important: These new tags only work on the overdue notices, not other circulation related notices at this time.</p>
+<p style="color: #990000;">Important These new tags only work on the overdue notices, not other circulation related notices at this time.</p>
 
 <ul>
 	<li>&lt;item&gt;&lt;/item&gt; which should enclose all fields from the biblio, biblioitems, and items tables.</li>
 	<li>&lt;fine&gt;&lt;/fine&gt; which should be enclosed by the item tag and should enclose a currency identifier per ISO 4217. If this tag is present with a proper identifier, the fine for that item will be displayed in the proper currency format.
 <ul>
-	<li>Note: ISO 4217 changes from time to time therefore all currencies may not be supported. If you find one that is not supported, please file a bug with the Locale::Currency::Format author Tan D Nguyen &lt;tnguyen at cpan doe org&gt;.</li>
+	<li>Note: ISO 4217 changes from time to time therefore all currencies may not be supported. If you find one that is not supported, please file a bug with the Locale::Currency::Format author Tan D Nguyen &lt;tnguyen at cpan doe org&gt;</li>
 </ul>
 </li>
 </ul>
 
-<p>An example of using these two tags in a notice template might be like:
+<p>An example of using these two tags in a notice template might be like:</p>
 
-<blockquote>
-<pre>The following item(s) is/are currently overdue:
-   &lt;item&gt;"&lt;&lt;biblio.title&gt;&gt;" by &lt;&lt;biblio.author&gt;&gt;, &lt;&lt;items.itemcallnumber&gt;&gt;, Barcode: &lt;&lt;items.barcode&gt;&gt; Fine: &lt;fine&gt;GBP&lt;/fine&gt;&lt;/item&gt;</pre>
-</blockquote>
+<pre class="programlisting">   The following item(s) is/are currently overdue:
 
-<p>Which, assuming two items were overdue, would result in a notice like:</p>
+   &lt;item&gt;"&lt;&lt;biblio.title&gt;&gt;" by &lt;&lt;biblio.author&gt;&gt;, &lt;&lt;items.itemcallnumber&gt;&gt;, Barcode: &lt;&lt;items.barcode&gt;&gt; Fine: &lt;fine&gt;GBP&lt;/fine&gt;&lt;/item&gt;</pre>
+Which, assuming two items were overdue, would result in a notice like:
+<pre class="programlisting">   The following item(s) is/are currently overdue:
 
-<blockquote>
-<pre>The following item(s) is/are currently overdue:
-"A Short History of Western Civilization" by Harrison, John B, 909.09821 H2451, Barcode: 08030003 Fine: ?3.50 
-"History of Western Civilization" by Hayes, Carlton Joseph Huntley, 909.09821 H3261 v.1, Barcode: 08030004 Fine: ?3.50</pre>
-</blockquote>
+   "A Short History of Western Civilization" by Harrison, John B, 909.09821 H2451, Barcode: 08030003 Fine: ?3.50
+   "History of Western Civilization" by Hayes, Carlton Joseph Huntley, 909.09821 H3261 v.1, Barcode: 08030004 Fine: ?3.50</pre>
 
-<h2>Existing Notices</h2>
+<h3>Existing Notices & Slips</h3>
 
-<p>Among the default notices are notices for several common actions within Koha, here are some of what those notices do</p>
+<p>Among the default notices are notices for several common actions within Koha. All of these notices can be customized by altering their text via the Notices &amp; Slips tool and their style using the NoticeCSS preference to define a stylesheet. Here are some of what those notices do</p>
 
 <ul>
 	<li>ACCTDETAILS
@@ -67,53 +73,89 @@
 	<li>ACQCLAIM (Acquisition Claim)
 <ul>
 	<li>Used in the claim acquisition module</li>
-	<li>Get there: More &gt; Acquisitions &gt; Late issues</li>
+	<li><span class="emphasis"><em>Get there:</em></span> More &gt; Acquisitions &gt; Late issues</li>
 </ul>
 </li>
 	<li>HOLD (Hold Available for Pickup)
 <ul>
 	<li>This notice is used if two criteria are met:
-<ul>
-	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+<div class="orderedlist">
+<ol type="1">
+	<li>The <span class="link">EnhancedMessagingPreferences</span> is set to 'Allow'</li>
 	<li>The patron has requested to receive this notice
 <ul>
-	<li>Get there: OPAC &gt; Login &gt; my messaging</li>
-	<li>Get there: Staff Client &gt; Patron Record &gt; Notices</li>
-</ul>
-</li>
+	<li><span class="emphasis"><em>Get there: </em></span>OPAC &gt; Login &gt; my messaging</li>
+	<li><span class="emphasis"><em>Get there: </em></span>Staff Client &gt; Patron Record &gt; Notices</li>
 </ul>
 </li>
+</ol>
+</div></li>
+	<li>When this notice references the branches table it is referring to the pickup branch information.</li>
 </ul>
 </li>
 	<li>HOLDPLACED (a notice to the library staff that a hold has been placed)
 <ul>
 	<li>This notice requires the emailLibrarianWhenHoldIsPlaced system preference to be set to 'Enable'</li>
+	<li>When this notice references the branches table it is referring to the pickup branch information.</li>
 </ul>
 </li>
 	<li>HOLD_PRINT (Printed notice when hold available for pickup)
 <ul>
 	<li>This notice is used for hold confirmation notices that are sent out in print format. This will not effect what the email notice looks like.</li>
+	<li>When this notice references the branches table it is referring to the pickup branch information.</li>
 </ul>
 </li>
 	<li>ODUE (Overdue Notice)
 <ul>
 	<li>This notice is used to send Overdue Notices to Patrons</li>
-	<li>Requires that you set Overdue Notice/Status Triggers</li>
+	<li>See a <span class="link">Sample Overdue Notice</span></li>
+	<li>Requires that you set <span class="link">Overdue Notice/Status Triggers</span></li>
 </ul>
 </li>
 	<li>RLIST (Routing List)
 <ul>
 	<li>Used in the serials module to notify patrons/staff of new issues of a serial
 <ul>
-	<li>Get there: More &gt; Serials &gt; New Subscription</li>
+	<li><span class="emphasis"><em>Get there:</em></span> More &gt; Serials &gt; <span class="link">New Subscription</span></li>
 </ul>
 </li>
 	<li>You have the option to select the 'Routing List' notice when creating a new subscription (Choose from the 'Patron notification' drop down).</li>
-	<li style="background-color: #ffe599">Tip: Notice also that if you'd like to notify patrons of new serial issues, you can click on 'define a notice' which will take you to the 'Notices' tool</li>
+	<li style="background-color: #ffe599;">Tip: Notice also that if you'd like to notify patrons of new serial issues, you can click on 'define a notice' which will take you to the 'Notices' tool</li>
+</ul>
+</li>
+</ul>
+
+<p>There are also a set of predefined slips (or receipts) listed on this page. All of these slips can be customized by altering their text via the Notices &amp; Slips tool and their style using the <span class="link">SlipCSS</span> preference to define a stylesheet.</p>
+
+<p>Here is what those slips are used for:</p>
+
+<ul>
+	<li>ISSUEQSLIP
+<ul>
+	<li>Used to print the quick slip in circulation</li>
+	<li>The quick slip only includes items that were checked out today</li>
+</ul>
+</li>
+	<li>ISSUESLIP
+<ul>
+	<li>Used to print a full slip in circulation</li>
+	<li>The slip or receipt will show items checked out today as well as items that are still checked out</li>
+</ul>
+</li>
+	<li>RESERVESLIP
+<ul>
+	<li>Used to print a holds slip</li>
+	<li>The holds slip is generated when a hold is confirmed</li>
+</ul>
+</li>
+	<li>TRANSFERSLIP
+<ul>
+	<li>Used to print a transfer slip</li>
+	<li>The transfer sliip is printed when you confirm a transfer from one branch to another in your system</li>
 </ul>
 </li>
 </ul>
 
-<p><strong>See the full documentation for Notices in the <a href="http://manual.koha-community.org/3.6/en/notices.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Notices in the <a href="http://manual.koha-community.org/3.8/en/notices.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
index c31d1d6..a911863 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
@@ -40,7 +40,7 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for the Managing Staged MARC Records in the <a href="http://manual.koha-community.org/3.6/en/managestaged.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Managing Staged MARC Records in the <a href="http://manual.koha-community.org/3.8/en/managestaged.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
index a1cb85b..06839ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
@@ -41,7 +41,7 @@
 
 <p>Sincerely, Library Staff</p>
 
-<p><strong>See the full documentation for the Overdue Notice/Status Triggers in the <a href="http://manual.koha-community.org/3.6/en/noticetriggers.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Overdue Notice/Status Triggers in the <a href="http://manual.koha-community.org/3.8/en/noticetriggers.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
index e81d72d..1feb07f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
@@ -20,6 +20,6 @@
 
 <p style="color:#990000;">Important: There is a limit of 520K on the size of the picture uploaded and it is recommended that the image be 200x300 pixels, but smaller images will work as well.</p>
 
-<p><strong>See the full documentation for the Patron Image Uploader in the <a href="http://manual.koha-community.org/3.6/en/uploadpatronimages.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Image Uploader in the <a href="http://manual.koha-community.org/3.8/en/uploadpatronimages.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
index 4626c21..d864149 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
@@ -23,6 +23,6 @@
 
 <p>Task scheduler will not work if the user the web server runs as doesn't have the permission to use it. To find out if the right user has the permissions necessary, check /etc/at.allow to see what users are in it. If you don't have that file, check etc/at.deny. If at.deny exists but is blank, then every user can use it. Talk to your system admin about adding the user to the right place to make the task scheduler work.</p>
 
-<p><strong>See the full documentation for the Task Scheduler in the <a href="http://manual.koha-community.org/3.6/en/taskscheduler.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Task Scheduler in the <a href="http://manual.koha-community.org/3.8/en/taskscheduler.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
index fbee311..e47c334 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
@@ -9,11 +9,7 @@
 	<li>Next you will be presented with options for record matching and item imports
 <ul>
 	<li>Enter 'Comments about this file' to identify your upload when going to the 'Manage Staged MARC Records' tool</li>
-	<li>Choose the character encoding
-<ul>
-	<li>If you leave this set to Default Koha will try to guess the encoding, but it should be noted that this is almost always wrong for non-UTF8 records with non-ASCII characters. Specifying a character set is much more reliable if you're not using UTF-8.</li>
-</ul>
-</li>
+	<li>Choose the character encoding</li>
 	<li>Choose whether or not you want to look for matching records
 <ul>
 	<li>You can set up record matching rules through the administration area</li>
@@ -29,6 +25,6 @@
 	<li>To complete the process continue to the Managed Staged MARC Records Tool</li>
 </ul>
 
-<p><strong>See the full documentation for the MARC Import in the <a href="http://manual.koha-community.org/3.6/en/stagemarc.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the MARC Import in the <a href="http://manual.koha-community.org/3.8/en/stagemarc.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
index 6823273..40697de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
@@ -4,6 +4,6 @@
 
 <p>Tools in Koha all perform some sort of action. Often many of the items listed under Tools in Koha are referred to as 'Reports' in other library management systems.</p>
 
-<p><strong>See the full documentation for Tools in the <a href="http://manual.koha-community.org/3.6/en/tools.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Tools in the <a href="http://manual.koha-community.org/3.8/en/tools.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/upload-cover-image.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/upload-cover-image.tt
new file mode 100644
index 0000000..fe90e3c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/upload-cover-image.tt
@@ -0,0 +1,45 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Upload Cover Images</h1>
+
+<p>This tool will allow you to upload cover images for the materials in your catalog. To access this tool, staff will need the upload_local_cover_images permission. In order for images to show in the staff client and/or OPAC you will need to set your LocalCoverImages and/or OPACLocalCoverImages preferences to 'Display.' Images can be uploaded in batches or one by one.</p>
+
+<p>If uploading a single image:</p>
+
+<ul>
+	<li>Visit the tool and click the 'Browse' button to browse to the image on your local machine.</li>
+	<li>Click 'Upload file'</li>
+	<li>Choose 'Image file' under the 'File type' section</li>
+	<li>Enter the biblionumber for the record you're attaching this image to. This is not the same as the barcode, this is the system generated number assigned by Koha.</li>
+<ul>
+	<li>Find the biblionumber by looking at the end of the URL in the address bar when on the detail page or by clicking on the MARC tab on the detail page in the staff client</li>
+</ul>
+	<li>If you would like to replace any other cover images you may have uploaded in the past, check the 'Replace existing covers' box under the 'Options' section</li>
+	<li>Click 'Process images'</li>
+	<li>You will be presented with a summary of the upload and a link to the record you have just added the image to</li>
+</ul>
+
+<p>If uploading a batch of images at once you will need to prepare a ZIP file first.</p>
+
+<ul>
+	<li>Enter in to the ZIP file all the images you are uploading</li>
+	<li>Also include a text file (*.TXT) named either datalink.txt or idlink.txt listing the biblionumber followed by the image name for each image one per line
+<ul>
+	<li>ex. 4091,image4091.jpg</li>
+</ul>
+</li>
+	<li>Browse your local computer to the ZIP file</li>
+	<li>Click 'Upload file'</li>
+	<li>Choose 'Zip file' under the 'File type' section</li>
+	<li>If you would like to replace any other cover images you may have uploaded in the past, check the 'Replace existing covers' box under the 'Options' section</li>
+	<li>Click 'Process images'</li>
+	<li>You will be presented with a summary of the upload</li>
+</ul>
+
+<p>You will be able to see your cover images in the staff client on the detail page under the 'Image' tab in the holdings table at the bottom</p>
+
+<p>In the OPAC the cover images will also appear in the images tab, as well as next to the title and on the search results.</p>
+
+<p><strong>See the full documentation for Uploading Cover Images in the <a href="http://manual.koha-community.org/3.8/en/uploadlocalimages.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
index 6bf9cb1..8783a90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
@@ -8,6 +8,6 @@
 
 <p>You will note that real names do not appear on the log, only identifying numbers. You need to use the identifying numbers when searching the logs as well.</p>
 
-<p><strong>See the full documentation for the Log Viewer in the <a href="http://manual.koha-community.org/3.6/en/logviewer.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Log Viewer in the <a href="http://manual.koha-community.org/3.8/en/logviewer.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Apr 10 20:55:49 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 14:55:49 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Tags help file
Message-ID: <1334084149-2736-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/tags/review.tt            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
index 98acbab..a6b6bfb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
@@ -2,7 +2,7 @@
 
 <h1>Tags</h1>
 
-<p>Depending on your tagging system preferences, librarians may need to approve tags before they are published on the OPAC. This is done via the tag moderation tool.</p>
+<p>Depending on your tagging system preferences, librarians may need to approve tags before they are published on the OPAC. This is done via the Tag Moderation Tool.</p>
 
 <p>When first visiting the tool, you will be presented with a list of tags that are pending approval or rejection by a librarian</p>
 
@@ -18,6 +18,6 @@
 
 <p>To check terms against the approved and rejected lists (and possibly against the dictionary you have assigned for tag moderation) simply enter the term into the search box on the bottom right of the screen to see the status of the term</p>
 
-<p><strong>See the full documentation for tag moderation in the <a href="http://manual.koha-community.org/3.6/en/tagsmoderation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Tag Moderation in the <a href="http://manual.koha-community.org/3.8/en/tagsmoderation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Apr 10 20:57:59 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 14:57:59 -0400
Subject: [Koha-patches] [PATCH 1/2] Bug 7936: Tags help file
Message-ID: <1334084280-2793-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/tags/review.tt            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
index 98acbab..a6b6bfb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
@@ -2,7 +2,7 @@
 
 <h1>Tags</h1>
 
-<p>Depending on your tagging system preferences, librarians may need to approve tags before they are published on the OPAC. This is done via the tag moderation tool.</p>
+<p>Depending on your tagging system preferences, librarians may need to approve tags before they are published on the OPAC. This is done via the Tag Moderation Tool.</p>
 
 <p>When first visiting the tool, you will be presented with a list of tags that are pending approval or rejection by a librarian</p>
 
@@ -18,6 +18,6 @@
 
 <p>To check terms against the approved and rejected lists (and possibly against the dictionary you have assigned for tag moderation) simply enter the term into the search box on the bottom right of the screen to see the status of the term</p>
 
-<p><strong>See the full documentation for tag moderation in the <a href="http://manual.koha-community.org/3.6/en/tagsmoderation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Tag Moderation in the <a href="http://manual.koha-community.org/3.8/en/tagsmoderation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Apr 10 20:58:00 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 14:58:00 -0400
Subject: [Koha-patches] [PATCH 2/2] Bug 7936: Marc Export Help File
In-Reply-To: <1334084280-2793-1-git-send-email-nengard@bywatersolutions.com>
References: <1334084280-2793-1-git-send-email-nengard@bywatersolutions.com>
Message-ID: <1334084280-2793-2-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/export/marc.tt            |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt
index 936b37b..f12727a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC export</h1>
+<h1>MARC Export</h1>
 
 <p>Koha comes with a tool that will allow you to export your bibliographic and/or holdings data in bulk. This can be used to send your records to fellow libraries, organizations or services; or simply for backup purposes.</p>
 
@@ -25,7 +25,7 @@
 </li>
 	<li>Finally choose the file type and file name
 <ul>
-    <li>Choose to export your data in MARC or MARCXML format</li>
+	<li>Choose to export your data in marc or marcxml format</li>
 	<li>Choose the name you want your file to save as</li>
 </ul>
 </li>
@@ -34,6 +34,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for MARC export in the <a href="http://manual.koha-community.org/3.6/en/exportbibs.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Marc Export in the <a href="http://manual.koha-community.org/3.8/en/exportbibs.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Apr 10 21:01:34 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 15:01:34 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Authorities Help Files
Message-ID: <1334084494-2869-1-git-send-email-nengard@bywatersolutions.com>

---
 .../modules/help/authorities/authorities-home.tt   |    4 ++--
 .../en/modules/help/authorities/authorities.tt     |    8 ++++----
 .../prog/en/modules/help/authorities/detail.tt     |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
index 20fb975..b774993 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
@@ -4,7 +4,7 @@
 
 <p>Authority records are a way of controlling fields in your MARC records. Using authority records will provide you with control over subject headings, personal names and places.</p>
 
-<h2>Searching authorities</h2>
+<h2>Searching Authorities</h2>
 
 <p>From the authorities page you can search for existing terms and the bibliographic records they are attached to.</p>
 
@@ -12,7 +12,7 @@
 
 <p>Clicking on the authority record summary will open the full record and the option to edit the record.</p>
 
-<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catauthorities.html">manual</a> (online).</strong></p>
 
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
index cad2f26..07d1624 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
@@ -1,14 +1,14 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h2>Adding authorities</h2>
+<h2>Adding Authorities</h2>
 
-<p>To add a new authority record, choose the authority type from the 'New authority' button.</p>
+<p>To add a new authority record, choose the authority type from the 'New Authority' button.</p>
 
 <p>The form that appears will allow you to enter all of the necessary details regarding your authority record.</p>
 
 <p>To expand collapsed values simply click on the title and the subfields will appear.</p>
 
-<h2>Editing authorities</h2>
+<h2>Editing Authorities</h2>
 
 <p>Authorities can be edited by clicking on the authority summary from the search results and then clicking the 'Edit' button above the record.</p>
 
@@ -16,6 +16,6 @@
 
 <p>To delete an authority record you first must make sure it's not linked to any bibliographic records. If it is not used by any bibliographic records a 'Delete' link will appear to the right of the record on the search results and as a button that appears after clicking on the summary of the authority record.</p>
 
-<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catauthorities.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
index e3c8752..3d43ba7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
@@ -4,7 +4,7 @@
 
 <p>Authority records are a way of controlling fields in your MARC records. Using authority records will provide you with control over subject headings, personal names and places.</p>
 
-<h2>Searching authorities</h2>
+<h2>Searching Authorities</h2>
 
 <p>From the authorities page you can search for existing terms and the bibliographic records they are attached to.</p>
 
@@ -12,6 +12,6 @@
 
 <p>Clicking on the authority record summary will open the full record and the option to edit the record.</p>
 
-<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catauthorities.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Apr 10 21:14:04 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 15:14:04 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_7936=3A_Suggestion_help_?=
	=?utf-8?q?file?=
Message-ID: <1334085244-2944-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/suggestion/suggestion.tt  |   24 +++++++++++--------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
index 502cb93..0965c94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
@@ -2,33 +2,37 @@
 
 <h1>Purchase Suggestions</h1>
 
-<p>Depending on your settings in the suggestion system preference, patrons may be able to make purchase suggestions via the OPAC. When a suggestion is waiting for library review, it will appear on the Acquisitions home page in the list of links on the left of the page.</p>
+<p>Depending on your settings in your <em>suggestion</em> system preference, patrons may be able to make purchase suggestions via the OPAC. When a suggestion is waiting for library review, it will appear on the Acquisitions home page in the list of links on the left of the page.</p>
 
-<p>Clicking 'Manage suggestions' will take you to the suggestion management tool. If there are no pending suggestions you can access the suggestion management tool by clicking the 'Manage suggestions' link on the menu on the left of the Acquisitions page.</p>
+<p>It will also appear on the main staff dashboard under the Acquisitions label.</p>
 
-<p>Your suggestions will be sorted into three categories: 'Accepted', 'Pending', and 'Rejected'. Each accepted or rejected suggestion will show the name of the librarian who managed the suggestion and the reason they gave for accepting or rejecting it (found under 'Status').</p>
+<p>Clicking ?Manage suggestions? will take you to the suggestion management tool. If there are no pending suggestions you can access the suggestion management tool by clicking the ?Manage suggestions? link on the menu on the left of the Acquisitions page.</p>
+
+<p>Your suggestions will be sorted into three categories: Accepted, Pending, and Rejected. Each accepted or rejected suggestion will show the name of the librarian who managed the suggestion and the reason they gave for accepting or rejecting it (found under ?Status?).</p>
 
 <p>For libraries with lots of suggestions, there are filters on the left hand side of the Manage Suggestions page to assist in limiting the number of titles displayed on the screen.</p>
 
-<p>Clicking on the blue headings will expand the filtering options and clicking '[clear]' will clear all filters and show all suggestions.</p>
+<p>Clicking on the blue headings will expand the filtering options and clicking ?[clear]? will clear all filters and show all suggestions.</p>
+
+<p>When reviewing ?Pending? suggestions you can choose to check the box next to the item(s) you want to approve/reject and then choose the status and reason for your selection. You can also choose to completely delete the suggestion by checking the ?Delete selected? box.</p>
 
-<p>When reviewing 'Pending' suggestions you can choose to check the box next to the item(s) you want to approve/reject and then choose the status and reason for your selection. You can also choose to completely delete the suggestion by checking the 'Delete selected' box.</p>
+<p>Another option for libraries with long lists of suggestions is to approve or reject suggestions one by one by clicking on the title of the suggestion to open a summary of the suggestion, including information if the item was purchased.</p>
 
-<p>Another option for libraries with long lists of suggestions is to approve or reject suggestions one by one by clicking on the title of the suggestion to open a suggestion editing page.</p>
+<p>Clicking ?edit? to the right of the suggested title will open a suggestion editing page.</p>
 
 <p>From this form you can make edits to the suggestion (adding more details or updating incorrect information provided by the patron). You can also choose to accept or reject the suggestion on an individual basis.</p>
 
 <ul>
-    <li>Choosing to mark a request as 'Asked' will move the request back to the 'Pending' tab.</li>
+<li>Choosing to mark a request as ?Asked? will move the request back to the ?Pending? tab.</li>
 </ul>
 
 <p>Reasons for accepting and rejecting suggestions are defined by the SUGGEST authorized value.</p>
 
-<p>If you choose 'Others...' as your reason you will be prompted to enter your reason in a text box. Clicking 'Cancel' to the right of the box will bring back the pull down menu with authorized reasons.</p>
+<p>If you choose ?Others?? as your reason you will be prompted to enter your reason in a text box. Clicking ?Cancel? to the right of the box will bring back the pull down menu with authorized reasons.</p>
 
-<p>Once you have clicked 'Submit' the suggestion will be moved to the matching tab. The status will also be updated on the patron's account in the OPAC and an email notice will be sent to the patron using the template that matches the status you have chosen.</p>
+<p>Once you have clicked ?Submit? the suggestion will be moved to the matching tab. The status will also be updated on the patron?s account in the OPAC and an email notice will be sent to the patron using the template that matches the status you have chosen.</p>
 
-<p><strong>See the full documentation for purchase suggestions in the <a href="http://manual.koha-community.org/3.6/en/managesuggest.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Purchase Suggestions in the <a href="http://manual.koha-community.org/3.8/en/managesuggest.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Apr 10 21:46:46 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 15:46:46 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Comments Moderation Help File
Message-ID: <1334087206-3158-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/reviews/reviewswaiting.tt |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
index 2fdcf40..6ba41ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
@@ -2,10 +2,14 @@
 
 <h1>Comments</h1>
 
-<p>All comments added by patrons via the OPAC to bibliographic records require moderation by the librarians. To moderate comments simply click 'Approve' or 'Delete' to the right of the comments awaiting moderation.</p>
+<p>All comments added by patrons via the OPAC to bibliographic records require moderation by the librarians. If there are comments awaiting moderation they will be listed on the main staff dashboard under the Tools label</p>
+
+<p>To moderate comments click on the notification on the main dashboard or go directly to the Comments Tool and click 'Approve' or 'Delete' to the right of the comments awaiting moderation.</p>
 
 <p>If there are no comments to moderate you will see a message saying just that</p>
 
-<p><strong>See the full documentation for comments in the <a href="http://manual.koha-community.org/3.6/en/comments.html">manual</a> (online).</strong></p>
+<p>You can also review and unapprove comments you have approved in the past by choosing the 'Approved comments' tab</p>
+
+<p><strong>See the full documentation for Comments in the <a href="http://manual.koha-community.org/3.8/en/comments.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From dpavlin at rot13.org  Wed Apr 11 14:25:52 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Wed, 11 Apr 2012 14:25:52 +0200
Subject: [Koha-patches] [PATCH] Bug 1918 - Minify JavaScript and CSS
Message-ID: <1334147152-2340-1-git-send-email-dpavlin@rot13.org>

This provides new Koha::Template::Plugin::Combine which is intended
to replace direct include of JavaScript and CSS files.

This plugin preserves order of included files when combining them.

Code need cleanup and documentation, but attaching it to bug will
provide easier way to try it out.
---
 Koha/Template/Plugin/Combine.pm                    |  141 +++++++++++++++++++
 .../intranet-tmpl/prog/en/css/staff-global.css     |    3 +-
 .../prog/en/includes/doc-head-close.inc            |   46 ++++---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    3 -
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |  143 +++++++++++++-------
 koha-tmpl/opac-tmpl/prog/en/js/script.js           |    1 -
 6 files changed, 259 insertions(+), 78 deletions(-)
 create mode 100644 Koha/Template/Plugin/Combine.pm

diff --git a/Koha/Template/Plugin/Combine.pm b/Koha/Template/Plugin/Combine.pm
new file mode 100644
index 0000000..c84bc7f
--- /dev/null
+++ b/Koha/Template/Plugin/Combine.pm
@@ -0,0 +1,141 @@
+package Koha::Template::Plugin::Combine;
+use Template::Plugin;
+use base qw( Template::Plugin );
+use warnings;
+use strict;
+
+# PLACK_DEBUG=1 always re-create files but report correct hit/miss ration
+
+use File::Slurp;
+use Digest::MD5;
+use Data::Dump qw(dump);
+
+use CSS::Minifier::XS;
+use JavaScript::Minifier::XS;
+
+sub new {
+	my ($class, $context, @params) = @_;
+#warn "## context ",dump( $context );
+	bless {
+		_CONTEXT => $context,
+		js  => [], # same as extension!
+		css => [],
+		inline => 1,
+		minify => 1,
+	}, $class;
+}
+
+sub _html_params {
+	my $params = shift;
+	return join(' ', map { $_ . '="' . $params->{$_} . '"' } keys %$params );
+}
+
+sub javascript {
+	my ( $self, $params ) = @_;
+	warn "## combine.javascript ", dump( $params );
+	$params->{type} ||= 'text/javascript';
+	push @{ $self->{js} }, $params;
+	my $html = _html_params( $params );
+	if ( $self->{inline} ) {
+		return "<!-- script $html -->\n";
+	} elsif ( my $cdata = $params->{cdata} ) {
+		return qq|<script type="text/javascript" language="javascript">\n//<![CDATA[\n$cdata\n//]]>\n</script>\n|;
+	} else {
+		return "<script $html></script>\n";
+	}
+}
+
+sub css {
+	my ( $self, $params ) = @_;
+	warn "## combine.css ",dump( $params );
+	$params->{rel}  ||= 'stylesheet';
+	$params->{type} ||= 'text/css';
+	die "no href in ",dump($params) unless exists $params->{href};
+	my $html = _html_params( $params );
+
+	if ( exists $params->{media} ) { # FIXME not combined!
+		push @{ $self->{css_media} }, "<link $html />";
+		return "<!-- media $html -->";
+	}
+
+	push @{ $self->{css} }, $params;
+	if ( $self->{inline}) {
+		return "<!-- link $html -->\n";
+	} else {
+		return "<link $html />\n";
+	}
+}
+
+sub combined_files {
+	my ( $self, $what, $attr, $params ) = @_;
+warn "## combined_files $what $attr ",dump($params);
+	my $key = join(' ', map { $_->{$attr} || $_->{cdata} } @{ $self->{$what} } );
+	$key = Digest::MD5::md5_hex( $key ); # shorten filenames
+	warn "# $what $attr key = $key\n";
+	my $htdocs = C4::Context->config('intrahtdocs');
+	$htdocs =~ s{/intranet-tmpl/?$}{}; # FIXME DocumentRoot even for OPAC
+
+	my ( $path, $url );
+	if ( my $prefix = $params->{prefix} ) {
+		$path = "$htdocs/$prefix/combined/$key.$what";
+		$url  = "$prefix/combined/$key.$what";
+	} else {
+		$path = "$htdocs/intranet-tmpl/combined/$key.$what";
+		$url  = "/intranet-tmpl/combined/$key.$what";
+	}
+	$path =~ s{//+}{/}; # plack is picky about paths
+	if ( -e $path ) {
+		$Koha::Persistant::stats->{combine_files}->[0]++; # hit
+		return $url if ! $ENV{PLACK_DEBUG}; # FIXME no caching with debug
+	}
+	$Koha::Persistant::stats->{combine_files}->[1]++ if ! $ENV{PLACK_DEBUG}; # miss
+
+	my $mix;
+	foreach my $include ( @{ $self->{$what} } ) {
+		if ( my $path = $include->{$attr} ) {
+			warn "combine_files $what $attr - $path";
+			my $chunk = read_file("$htdocs/$path");
+			die "$htdocs/$path found \@import" if $what eq 'css' && $chunk =~ m'@import';
+			$mix .= "\n/* BEGIN $path */\n$chunk\n/* END $path */\n";
+		} elsif ( my $cdata = $include->{cdata} ) {
+			warn "combine_files CDATA $cdata";
+			$mix .= "\n/* BEGIN CDATA */\n$cdata\n/* END CDATA */\n";
+		}
+	}
+	my $combined_size = length($mix);
+	if ( $self->{minify} ) {
+		if ( $what eq 'js' ) {
+			$mix = JavaScript::Minifier::XS::minify( $mix );
+		} elsif ( $what eq 'css' ) {
+			$mix = CSS::Minifier::XS::minify( $mix );
+		} else {
+			die "can't minify $what";
+		}
+		my $size = length($mix);
+		warn sprintf "minify %s %d -> %d %.2f%%\n", $what, $combined_size, $size, $size * 100 / $combined_size;
+	}
+	write_file $path, $mix;
+	warn "## $path ", -s $path, "/$combined_size bytes\n";
+	return $url;
+}
+
+sub html {
+	my ( $self, $params ) = @_;
+
+	if ( $self->{inline} ) {
+		warn "## css ",dump( $self->{css} );
+		warn "## javascript ",dump( $self->{js} );
+		my $mix;
+		my $js  = $self->combined_files( 'js'  => 'src', $params );
+		my $css = $self->combined_files( 'css' => 'href', $params );
+		return qq{
+		<!-- combined.html -->
+		<link type="text/css" href="$css" rel="stylesheet" />
+		<script type="text/javascript" src="$js"></script>
+		};
+	} else {
+		return "<!-- javascript and css combine disabled -->";
+	}
+}
+
+1;
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 ef01648..3519d20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1,5 +1,4 @@
- at import url("../lib/yui/reset-fonts-grids.css");
- at import url("../lib/yui/skin.css");
+/* import moved to koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc */
 
 a, a:link, a:visited, a:active {
 	color : #0000CC;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index bc551ac..b15aea4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -1,42 +1,45 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+[% USE combine = Combine %]
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
-<link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/plugins/ui.tabs.css" />
-<link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" />
+[% combine.css( href => themelang _ "/lib/jquery/plugins/ui.tabs.css" ) %]
+[% combine.css( media => "print" href => themelang _ "/css/print.css" ) %]
 [% IF ( intranetstylesheet ) %]
-    <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" />
+    [% combine.css( href => intranetstylesheet ) %]
 [% ELSE %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
+    [% combine.css( href => yuipath _ "/reset-fonts-grids.css" ) %]
+    [% combine.css( href => yuipath _ "/skin.css" ) %]
+    [% combine.css( href => themelang _ "/css/staff-global.css" ) %]
 [% END %]
 [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/ui.tabs.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.hotkeys.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
+[% combine.javascript( src => themelang _ "/lib/jquery/jquery.js" ) %]
+[% combine.javascript( src => themelang _ "/lib/jquery/plugins/ui.tabs.js" ) %]
+[% combine.javascript( src => themelang _ "/lib/jquery/plugins/jquery.hotkeys.min.js" ) %]
+[% combine.javascript( src => themelang _ "/lib/jquery/plugins/jquery.cookie.min.js" ) %]
+[% combine.javascript( src => themelang _ "/lib/jquery/plugins/jquery.highlight-3.js" ) %]
 [% IF ( login ) %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/login.css" />
+    [% combine.css( href => themelang _ "/css/login.css" ) %]
 [% END %]
 [% IF ( wizard ) %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/wizard.css" />
+    [% combine.css( href => themelang _ "/css/wizard.css" ) %]
 [% END %]
 
 <!-- local colors -->
 [% IF ( intranetcolorstylesheet ) %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetcolorstylesheet %]" />
+    [% combine.css( href => themelang _ "/css/" _ intranetcolorstylesheet ) %]
 [% END %]
 
 <!-- yui js --> 
-<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
-<script type="text/javascript" src="[% yuipath %]/datasource/datasource-min.js"></script>
+[% combine.javascript( src => yuipath _ "/utilities/utilities.js" ) %] 
+[% combine.javascript( src => yuipath _ "/datasource/datasource-min.js" ) %]
 [% IF ( CircAutocompl ) %]
-    <script type="text/javascript" src="[% yuipath %]/autocomplete/autocomplete-min.js"></script>
+    [% combine.javascript( src => yuipath _ "/autocomplete/autocomplete-min.js" ) %]
 [% END %]
-<script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script> 
-<script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script> 
-<script type="text/javascript" src="[% yuipath %]/menu/menu-min.js"></script> 
+[% combine.javascript( src => yuipath _ "/button/button-min.js" ) %] 
+[% combine.javascript( src => yuipath _ "/container/container_core-min.js" ) %] 
+[% combine.javascript( src => yuipath _ "/menu/menu-min.js" ) %] 
 
 <!-- koha core js -->
-<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
+[% combine.javascript( src => themelang _ "/js/staff-global.js" ) %]
 [% IF ( intranetuserjs ) %]
     <script type="text/javascript">
     //<![CDATA[
@@ -60,13 +63,14 @@
     //]]>
     </script>
     [% IF ( virtualshelves || intranetbookbag ) %]
-        <script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js"></script>
+        [% combine.javascript( src => themelang _ "/js/basket.js" ) %]
     [% END %]
 [% IF LocalCoverImages %]
-<script type="text/javascript" language="javascript" src="[% themelang %]/js/localcovers.js"></script>
+[% combine.javascript( src => themelang _ "/js/localcovers.js" ) %]
 <script type="text/javascript" language="javascript">
 //<![CDATA[
 var NO_LOCAL_JACKET = _("No cover image available");
 //]]>
 </script>
 [% END %]
+[% combine.html( prefix => themelang ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index c10e08d..c48a59c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1,6 +1,3 @@
- at import url("../lib/yui/reset-fonts-grids.css");
- at import url("../lib/yui/skin.css");
-
 a {
 	font-weight : bold;
 }
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 3907f34..d5ea90e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -2,50 +2,62 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
 <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
-[% IF ( opacstylesheet ) %]<link rel="stylesheet" type="text/css" href="[% opacstylesheet %]" />[% ELSE %]
-[% IF ( opaclayoutstylesheet ) %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaclayoutstylesheet %]" />[% ELSE %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/opac.css" />[% END %][% END %]
+[% USE combine = Combine %]
+[% IF ( opacstylesheet ) %]
+    [% combine.css( href => opacstylesheet ) %]
+[% ELSE %]
+    [% IF ( opaclayoutstylesheet ) %]
+        [% combine.css( href => themelang _ "/css/" _ opaclayoutstylesheet ) %]
+    [% ELSE %]
+        [% combine.css( href => themelang _ "/css/opac.css" ) %]
+    [% END %]
+[% END %]
 [% IF ( opaccolorstylesheet ) %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opaccolorstylesheet %]" />
+    [% combine.css( href => themelang _ "/css/" _ opaccolorstylesheet ) %]
 [% END %]
 [% IF ( opacexternalsheet ) %]
-    <link rel="stylesheet" type="text/css" href="[% opacexternalsheet %]" />
+    [% combine.css( href => opacexternalsheet ) %]
 [% END %]
 [% IF ( opac_css_override ) %]
-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% opac_css_override %]" />
+    [% combine.css( href => therelang _ "/css/" _ opac_css_override ) %]
 [% END %]
 <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" />
-<link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/plugins/ui.tabs.css" />
+[% combine.css( href => themelang _ "/lib/jquery/plugins/ui.tabs.css" ) %]
 [% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
 <!-- yui js --> 
-<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
-<script type="text/javascript" src="[% yuipath %]/container/container-min.js"></script> 
-<script type="text/javascript" src="[% yuipath %]/menu/menu-min.js"></script> 
-<script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/ui.tabs.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.hoverIntent.minified.js"></script>
-<script type="text/javascript" language="javascript" src="[% themelang %]/js/script.js"></script>
+[% combine.css( href => yuipath _ "/reset-fonts-grids.css" ) %]
+[% combine.css( href => yuipath _ "/skin.css" ) %]
+[% combine.javascript( src => yuipath  _ "/utilities/utilities.js" ) %] 
+[% combine.javascript( src => yuipath  _ "/container/container-min.js" ) %] 
+[% combine.javascript( src => yuipath  _ "/menu/menu-min.js" ) %] 
+[% combine.javascript( src => themelang  _ "/lib/jquery/jquery.js" ) %]
+[% combine.javascript( src => themelang  _ "/lib/jquery/plugins/ui.tabs.js" ) %]
+[% combine.javascript( src => themelang  _ "/lib/jquery/plugins/jquery.hoverIntent.minified.js" ) %]
+[% combine.javascript( src => themelang _ "/js/script.js" ) %]
+
 [% IF ( OPACAmazonCoverImages ) %]
-<script type="text/javascript" language="javascript">//<![CDATA[
-		var NO_AMAZON_IMAGE = _("No cover image available");
-	//]]>
-</script>
-<script type="text/javascript" language="javascript" src="[% themelang %]/js/amazonimages.js"></script>
+[% combine.javascript( cdata => "var NO_AMAZON_IMAGE = _(\"No cover image available\");" ) %]
+[% combine.javascript( src => themelang _ "/js/amazonimages.js" ) %]
 [% END %]
 [% IF ( SyndeticsCoverImages ) %]
-<script type="text/javascript" language="javascript">//<![CDATA[
-        var NO_AMAZON_IMAGE = _("No cover image available");
-    //]]>
-</script>
-<script type="text/javascript" language="javascript" src="[% themelang %]/js/amazonimages.js"></script>          [% END %]
+[% combine.javascript( cdata => "var NO_AMAZON_IMAGE = _(\"No cover image available\");" ) %]
+[% combine.javascript( src => themelang _ "/js/amazonimages.js" ) %]
+[% END %]
 
-[% IF ( opacbookbag ) %]<script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js">
-[% ELSIF ( virtualshelves ) %]<script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js">
-[% ELSE %]<script type="text/javascript" language="javascript"> var readCookie;[% END %]
-</script>
+[% IF ( opacbookbag ) %]
+  [% combine.javascript( src => themelang _ "/js/basket.js" ) %]
+[% ELSIF ( virtualshelves ) %]
+  [% combine.javascript( src => themelang _ "/js/basket.js" ) %]
+[% ELSE %]
+  [% combine.javascript( cdata => "var readCookie;" ) %]
+[% END %]
 
+[% combine.javascript( cdata => "var cdata_test;" ) %]
 <script type="text/javascript" language="javascript">
 	//<![CDATA[
-    [% IF ( opacbookbag ) %]var MSG_BASKET_EMPTY = _("Your cart is currently empty");
+function _(s) { return s } // dummy function for gettext
+[% IF ( opacbookbag ) %]
+    var MSG_BASKET_EMPTY = _("Your cart is currently empty");
     var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
     var MSG_RECORD_ADDED = _("This item has been added to your cart");
     var MSG_RECORD_REMOVED = _("This item has been removed from your cart");
@@ -57,9 +69,16 @@
     var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
     var MSG_ITEM_IN_CART = _("In your cart");
     var MSG_ITEM_NOT_IN_CART = _("Add to your cart");
-	$("#cartDetails").ready(function(){ $("#cmspan").html("<a href=\"#\" id=\"cartmenulink\" class=\"\"><i><\/i><span><i><\/i><span><\/span><span id=\"carticon\"></span> "+_("Cart")+"<span id=\"basketcount\"><\/span><\/span><\/a>"); }); [% ELSE %][% IF ( virtualshelves ) %]
-    var MSG_NO_RECORD_SELECTED = _("No item was selected");[% END %][% END %]
-    [% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %]var MSG_TAGS_DISABLED = _("Sorry, tags are not enabled on this system.");
+//	$("#cartDetails").ready(function(){ $("#cmspan").html("<a href=\"#\" id=\"cartmenulink\" class=\"\"><i><\/i><span><i><\/i><span><\/span><span id=\"carticon\"></span> "+_("Cart")+"<span id=\"basketcount\"><\/span><\/span><\/a>"); });
+[% ELSE %]
+  [% IF ( virtualshelves ) %]
+    var MSG_NO_RECORD_SELECTED = _("No item was selected");
+  [% END %]
+[% END %]
+
+[% IF ( opacuserlogin ) %]
+  [% IF ( TagsEnabled ) %]
+    var MSG_TAGS_DISABLED = _("Sorry, tags are not enabled on this system.");
     var MSG_TAG_ALL_BAD = _("Error! Your tag was entirely markup code.  It was NOT added.  Please try again with plain text.");
     var MSG_ILLEGAL_PARAMETER = _("Error! Illegal parameter");
     var MSG_TAG_SCRUBBED = _("Note: your tag contained markup code that was removed. The tag was added as ");
@@ -71,21 +90,40 @@
     var MSG_TAGS_ADDED = _("Tags added: ");
     var MSG_TAGS_DELETED = _("Tags added: ");
     var MSG_TAGS_ERRORS = _("Errors: ");
-    var MSG_MULTI_ADD_TAG_FAILED = _("Unable to add one or more tags.");[% END %][% END %]
-	[% IF ( OPACAmazonCoverImages ) %]$(window).load(function() {
-		 	verify_images();
-		 });[% END %]
-	[% IF ( SyndeticsCoverImages ) %]$(window).load(function() {
-            verify_images();
-         });[% END %]
-	[% IF ( opacuserjs ) %][% opacuserjs %][% END %]
+    var MSG_MULTI_ADD_TAG_FAILED = _("Unable to add one or more tags.");
+  [% END %]
+[% END %]
+[% IF ( OPACAmazonCoverImages ) %]
+    $(window).load(function() {
+        verify_images();
+    });
+[% END %]
+[% IF ( SyndeticsCoverImages ) %]
+    $(window).load(function() {
+        verify_images();
+    });
+[% END %]
+[% IF ( opacuserjs ) %]
+    [% opacuserjs %]
+[% END %]
 	//]]>
-[% IF ( opacbookbag ) %]</script><script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js">
-[% ELSIF ( virtualshelves ) %]</script><script type="text/javascript" language="javascript" src="[% themelang %]/js/basket.js">
-[% ELSE %]</script><script type="text/javascript" language="javascript">var readCookie;[% END %]</script>
-[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %]<script type="text/javascript" language="javascript" src="[% themelang %]/js/tags.js"></script>[% END %][% ELSE %][% END %]
+</script>
+[% IF ( opacbookbag ) %]
+[% compose.javascript( src => themelang _ "/js/basket.js" ) %]
+[% ELSIF ( virtualshelves ) %]
+[% compose.javascript( src => themelang _ "/js/basket.js" ) %]
+[% ELSE %]
+<script type="text/javascript" language="javascript">var readCookie;</script>
+[% END %]
+
+[% IF ( opacuserlogin ) %]
+  [% IF ( TagsEnabled ) %]
+    [% combine.javascript( src => themelang _ "/js/tags.js" ) %]
+  [% END %]
+[% END %]
+
 [% IF ( GoogleJackets ) %]
-<script type="text/javascript" language="javascript" src="[% themelang %]/js/google-jackets.js"></script>
+[% combine.javascript( src => themelang _ "/js/google-jackets.js" ) %]
 <script type="text/javascript" language="javascript">
 	//<![CDATA[
 	var NO_GOOGLE_JACKET = _("No cover image available");
@@ -93,7 +131,7 @@
 </script>
 [% END %]
 [% IF OpenLibraryCovers %]
-<script type="text/javascript" language="javascript" src="[% themelang %]/js/openlibrary.js"></script>
+[% combine.javascript( src => themelang _ "/js/openlibrary.js" ) %]
 <script type="text/javascript" language="javascript">
 //<![CDATA[
 var NO_OL_JACKET = _("No cover image available");
@@ -102,7 +140,7 @@ var NO_OL_JACKET = _("No cover image available");
 [% END %]
 
 [% IF OPACLocalCoverImages %]
-<script type="text/javascript" language="javascript" src="[% themelang %]/js/localcovers.js"></script>
+[% combine.javascript( src => themelang _ "/js/localcovers.js" ) %]
 <script type="text/javascript" language="javascript">
 //<![CDATA[
 var NO_LOCAL_JACKET = _("No cover image available");
@@ -110,7 +148,8 @@ var NO_LOCAL_JACKET = _("No cover image available");
 </script>
 [% END %]
 
-[% IF ( BakerTaylorEnabled ) %]<script type="text/javascript" language="javascript" src="[% themelang %]/js/bakertaylorimages.js"></script>
+[% IF ( BakerTaylorEnabled ) %]
+[% combine.javascript( src => themelang _ "/js/bakertaylorimages.js" ) %]
 <script type="text/javascript" language="javascript">
 	//<![CDATA[
 	var NO_BAKERTAYLOR_IMAGE = _("No cover image available");
@@ -118,10 +157,12 @@ var NO_LOCAL_JACKET = _("No cover image available");
 		bt_verify_images();
 	});
 	//]]>
-</script>[% END %]
+</script>
+[% END %]
+
 <link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL %]/cgi-bin/koha/unapi" />
 [% IF ( GoogleIndicTransliteration ) %]
-        <script type="text/javascript" src="http://www.google.com/jsapi"></script>
-        <script type="text/javascript" language="javascript" src="[% themelang %]/js/googleindictransliteration.js"></script>
+	<script type="text/javascript" src="http://www.google.com/jsapi"></script>
+        [% combine.javascript( src => themelang _ "/js/googleindictransliteration.js" ) %]
 [% END %]
-
+[% combine.html( prefix => themelang ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/script.js b/koha-tmpl/opac-tmpl/prog/en/js/script.js
index a3cfab8..67ea771 100644
--- a/koha-tmpl/opac-tmpl/prog/en/js/script.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/script.js
@@ -1,4 +1,3 @@
-function _(s) { return s } // dummy function for gettext
 function confirmDelete(message) {
 	return (confirm(message) ? true : false);
 }
-- 
1.7.2.5


From dpavlin at rot13.org  Wed Apr 11 14:38:47 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Wed, 11 Apr 2012 14:38:47 +0200
Subject: [Koha-patches] [PATCH] Bug 7844 - plack intranet tooling for
	developers
Message-ID: <1334147927-3324-1-git-send-email-dpavlin@rot13.org>

koha.psgi example and plackup.sh script to run any Koha site
intranet or opac interface under plack with optional multi-process
Starman server

  plackup.sh site-name [intranet]

site-name is used to find config /etc/koha/sites/site-name/koha-conf.xml

All configuration is specified in koha.psgi, which you are welcomed to edit
and tune according to your development needs.

When you are happy with it, rename it to site name and save it for safe-keeping.

Test scenario:
1. install plack and dependencies, using ./cpanm-install.pl

2. start ./plackup.sh sitename

3. open intranet page http://localhost:5001/cgi-bin/koha/mainpage.pl
   and verify that it works

4. start ./plackup.sh sitename i[ntranet]

5. open OPAC http://localhost:5000/cgi-bin/koha/opac-main.pl
   and verify that it works

6. next step is to take a look into koha.psgi and enable additional
   debug modules, save file and reload page (plackup will reload
   code automatically)
---
 misc/plack/README.plack |   31 ++++++++++++++++++
 misc/plack/koha.psgi    |   78 +++++++++++++++++++++++++++++++++++++++++++++++
 misc/plack/plackup.sh   |   53 ++++++++++++++++++++++++++++++++
 3 files changed, 162 insertions(+), 0 deletions(-)
 create mode 100644 misc/plack/README.plack
 create mode 100644 misc/plack/koha.psgi
 create mode 100755 misc/plack/plackup.sh

diff --git a/misc/plack/README.plack b/misc/plack/README.plack
new file mode 100644
index 0000000..0561a7e
--- /dev/null
+++ b/misc/plack/README.plack
@@ -0,0 +1,31 @@
+Bug 7844 - plack intranet tooling for developers
+
+koha.psgi example and plackup.sh script to run any Koha site
+intranet or opac interface under plack with optional multi-process
+Starman server
+
+  plackup.sh site-name [intranet]
+
+site-name is used to find config /etc/koha/sites/site-name/koha-conf.xml
+
+All configuration is specified in koha.psgi, which you are welcomed to edit
+and tune according to your development needs.
+
+When you are happy with it, rename it to site name and save it for safe-keeping.
+
+Test scenario:
+1. install plack and dependencies, using ./cpanm-install.pl
+
+2. start ./plackup.sh sitename
+
+3. open intranet page http://localhost:5001/cgi-bin/koha/mainpage.pl
+   and verify that it works
+
+4. start ./plackup.sh sitename i[ntranet]
+
+5. open OPAC http://localhost:5000/cgi-bin/koha/opac-main.pl
+   and verify that it works
+
+6. next step is to take a look into koha.psgi and enable additional
+   debug modules, save file and reload page (plackup will reload
+   code automatically)
diff --git a/misc/plack/koha.psgi b/misc/plack/koha.psgi
new file mode 100644
index 0000000..e388dae
--- /dev/null
+++ b/misc/plack/koha.psgi
@@ -0,0 +1,78 @@
+#!/usr/bin/perl
+use Plack::Builder;
+use Plack::App::CGIBin;
+use lib qw( ./lib );
+use Plack::Middleware::Debug;
+use Plack::App::Directory;
+
+BEGIN {
+
+# override configuration from startup script below:
+# (requires --reload option)
+
+$ENV{PLACK_DEBUG} = 1; # toggle debugging
+
+# memcache change requires restart
+$ENV{MEMCACHED_SERVERS} = "localhost:11211";
+#$ENV{MEMCACHED_DEBUG} = 0;
+
+$ENV{PROFILE_PER_PAGE} = 1; # reset persistant and profile counters after each page, like CGI
+#$ENV{INTRANET} = 1; # usually passed from script
+
+#$ENV{DBI_AUTOPROXY}='dbi:Gofer:transport=null;cache=DBI::Util::CacheMemory'
+
+} # BEGIN
+
+use C4::Context;
+use C4::Languages;
+use C4::Members;
+use C4::Dates;
+use C4::Boolean;
+use C4::Letters;
+use C4::Koha;
+use C4::XSLT;
+use C4::Branch;
+use C4::Category;
+=for preload
+use C4::Tags; # FIXME
+=cut
+
+use Devel::Size 0.77; # 0.71 doesn't work for Koha
+my $watch_capture_regex = '(C4|Koha)';
+
+sub watch_for_size {
+	my @watch =
+	map { s/^.*$watch_capture_regex/$1/; s/\//::/g; s/\.pm$//; $_ } # fix paths
+	grep { /$watch_capture_regex/ }
+	keys %INC
+	;
+	warn "# watch_for_size ",join(' ', at watch);
+	return @watch;
+};
+
+my $CGI_ROOT = $ENV{INTRANET} ? $ENV{INTRANETDIR} : $ENV{OPACDIR};
+warn "# using Koha ", $ENV{INTRANET} ? 'intranet' : 'OPAC', " CGI from $CGI_ROOT\n";
+my $app=Plack::App::CGIBin->new(root => $CGI_ROOT);
+
+builder {
+
+	enable_if { $ENV{PLACK_DEBUG} } 'Debug',  panels => [
+ 		qw(Koha Persistant),
+		qw(Environment Response Timer Memory),
+		# optional plugins (uncomment to enable) are sorted according to performance implact
+#		[ 'Devel::Size', for => \&watch_for_size ], # https://github.com/dpavlin/p5-plack-devel-debug-devel-size
+#		[ 'DBIProfile', profile => 2 ],
+#		[ 'DBITrace', level => 1 ], # a LOT of fine-graded SQL trace
+#		[ 'Profiler::NYTProf', exclude => [qw(.*\.css .*\.png .*\.ico .*\.js .*\.gif)] ],
+	];
+
+	enable_if { $ENV{PLACK_DEBUG} } 'StackTrace';
+
+	enable_if { $ENV{INTRANETDIR} } "Plack::Middleware::Static",
+		path => qr{^/(intranet|opac)-tmpl/},
+		root => "$ENV{INTRANETDIR}/koha-tmpl/";
+
+	mount "/cgi-bin/koha" => $app;
+
+};
+
diff --git a/misc/plack/plackup.sh b/misc/plack/plackup.sh
new file mode 100755
index 0000000..3d03e30
--- /dev/null
+++ b/misc/plack/plackup.sh
@@ -0,0 +1,53 @@
+#!/bin/sh -xe
+
+# This is plack startup script for Koha
+
+# ./plackup.sh [site] [intranet]
+
+site=$1
+test ! -z "$site" && shift || site=srvgit # default
+
+export KOHA_CONF=/etc/koha/sites/$site/koha-conf.xml
+export LOGDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/logdir' $KOHA_CONF )"
+export INTRANETDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/intranetdir' $KOHA_CONF )"
+export OPACDIR="$( sudo -u $site-koha xmlstarlet sel -t -v 'yazgfs/config/opacdir' $KOHA_CONF | sed 's,/cgi-bin/opac,,' )"
+
+dir=`dirname $0`
+
+# enable memcache - it's safe even on installation which don't have it
+# since Koha has check on C4::Context
+#export MEMCACHED_SERVERS=localhost:11211
+# pass site name as namespace to perl code
+export MEMCACHED_NAMESPACE=$site
+#export MEMCACHED_DEBUG=1
+
+if [ ! -e "$INTRANETDIR/C4" ] ; then
+	echo "intranetdir in $KOHA_CONF doesn't point to Koha git checkout"
+	exit 1
+fi
+
+if [ -z "$1" ] ; then # type anything after site name for intranet!
+	INTRANET=0
+	PORT=5000
+else
+	INTRANET=1
+	PORT=5001
+	shift # pass rest of arguments to plackup
+fi
+export INTRANET # pass to plack
+
+# uncomment to enable logging
+#opt="$opt --access-log $LOGDIR/opac-access.log --error-log $LOGDIR/opac-error.log"
+
+# --max-requests 50 decreased from 1000 to keep memory usage sane
+# --workers 4       number of cores on machine
+#test "$INTRANET" != 1 && \ # don't use Starman for intranet
+opt="$opt --server Starman -M FindBin --max-requests 50 --workers 4"
+
+# -E deployment     turn off access log on STDOUT
+opt="$out -E deployment"
+
+# comment out reload in production!
+opt="$opt --reload -R $INTRANETDIR/C4 -R $INTRANETDIR/Koha"
+
+sudo -E -u $site-koha plackup --port $PORT -I $INTRANETDIR -I $INTRANETDIR/installer $opt $* $dir/koha.psgi
-- 
1.7.2.5


From nengard at bywatersolutions.com  Wed Apr 11 04:59:52 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 22:59:52 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Holds Help File for 3.8
Message-ID: <1334113192-4410-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/reserve/request.tt        |   44 ++++++++------------
 1 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
index 4423141..eef6972 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
@@ -2,21 +2,21 @@
 
 <h1>Holds</h1>
 
-<h2>Placing holds in staff client</h2>
+<h2>Placing Holds in Staff Client</h2>
 
-<p>There are several ways to place holds from the staff client. The most obvious is using the 'Place hold' button at the top of any bibliographic record.</p>
+<p>There are several ways to place holds from the staff client. The most obvious is using the 'Place Hold' button at the top of any bibliographic record.</p>
 
-<p>You can also click the smaller 'Place hold' link found at the top of your catalog search results, or the 'Holds' link found below each result.</p>
+<p>You can also click the smaller 'Place Hold' link found at the top of your catalog search results, or the 'Holds' link found below each result.</p>
 
 <p>You will be asked to search for a patron by barcode or any part of their name to start the hold process.</p>
 
-<p>If you'd like to search for the patron first and then the bib record for the hold, you can open the patron record and click on the 'Search to hold' button at the top of the patron record.</p>
+<p>If you'd like to search for the patron first and then the bib record for the hold, you can open the patron record and click on the 'Search to Hold' button at the top of the patron record.</p>
 
-<p>After clicking the button you will be brought to the catalog search page where you can find the book(s) you want to place a hold on. Under each title on the results you'll see an option to 'Hold for patron name.'</p>
+<p>After clicking the button you will be brought to the catalog search page where you can find the book(s) you want to place a hold on. Under each title on the results you'll see an option to 'Hold for Patron Name.'</p>
 
-<p>If you want to place a hold on multiple items, simply check the boxes to the left of them and click the arrow to the right of the 'Place hold' button.</p>
+<p>If you want to place a hold on multiple items, simply check the boxes to the left of them and click the arrow to the right of the 'Place Hold' button.</p>
 
-<p>Depending on how many items you choose to place a hold on at once you will be see a different place hold form. If you are placing a hold on one bibliographic record you will see a list of all of the items you can place a hold on.</p>
+<p>Depending on how many items you choose to place a hold on at once you will see a different place hold form. If you are placing a hold on one bibliographic record you will see a list of all of the items you can place a hold on.</p>
 
 <ul>
 	<li>Enter any notes that might apply to this hold</li>
@@ -36,40 +36,30 @@
 
 <p>If you're placing a hold on multiple items you will be presented with the next available option for all titles. If no items are available for hold it will say so on the confirmation screen.</p>
 
-<h2>Managing holds</h2>
+<p>Once your hold is placed, if you'd like to have Koha forget that you used the 'Search to Hold' function, you can choose to have Koha 'forget' the patron's name by clicking the arrow to the right of the 'Place Hold' button on the search results and choosing the 'Forget' option.</p>
+
+<h2>Managing Holds</h2>
 
 <p>Holds can be altered and canceled from the Holds tab found on the left of the bibliographic record.</p>
 
 <p>From the list of holds you can change the order of the holds, the pickup location and/or cancel the hold.</p>
 
-<p>Note: Depending on how you have your HidePatronName system preference set the list may show patron names instead of card numbers in the Patron column like in the image above.</p>
+<p><strong>Note</strong> If you have your AutoResumeSuspendedHolds preference set to "Don't allow" then you will not have the option to put an end date on the hold suspension</p>
+
+<p><strong>Note</strong> Depending on how you have your HidePatronName system preference set the list may show card numbers instead of names in the Patron column like in the image above.</p>
 
 <p>To rearrange or delete holds, simply make a selection from the 'Priority' pull down or click the arrows to the right of the priority pull down.</p>
 
 <p>To delete or cancel a hold, choose 'del' from the menu or click the red 'X' to the right of the hold line.</p>
 
+<p>If you use the priority pull down to rearrange or delete holds you will need to click the 'Update hold(s)' button to save your changes.</p>
+
 <p>Clicking the down arrow to the right of the hold will stick the hold at the bottom of the list even if more requests are made.</p>
 
 <p>For example, your library has home-bound patrons that are allowed to keep books out for months at a time. It would not be fair to other patrons if a home-bound patron were able to check out a brand new book and keep it for months. For this reason, the home-bound patron's hold request would stay at the bottom of the queue until everyone else who wanted to read that book has already done so.</p>
 
-<p>Once you have made your changes, click the 'Update hold(s)' button and your changes will be saved.</p>
-
-<h2>Receiving holds</h2>
-
-<p>When items that are on hold are checked in or out the system will remind the circulation librarian that the item is on hold and offer them options for managing the hold.</p>
-
-<p>When you check in an item that has a hold on it the system will ask you to either confirm and transfer the item or just confirm the hold</p>
-
-<p>Clicking the 'Confirm' button will mark the item as on hold for the patron. If the item needs to be transferred the item will also be marked as in transit to the proper library. Clicking 'Ignore' will retain the hold, but allow you to check the item out to another patron. Choosing to confirm and print will present you with a printable page that you can slip inside the book with the necessary hold and/or transfer information.</p>
-
-<p>Once confirmed the hold will show on the patron record and on the checkout screen under the 'Hold' tab.</p>
-
-<p>The item record will also show that the item is on hold.</p>
-
-<p>In some cases a patron may come in to pick up a hold for their partner (or someone else in their household). In this case you want to make sure that the hold is cancelled when you check the item out to someone else. When trying to check out an item that is already waiting for someone else you will be presented with a warning message.</p>
-
-<p>From here you can check the item out to the patron at the desk and cancel the hold for the patron.</p>
+<p>If a patron asks to have their hold suspended you can do so by clicking the Suspend button to far right. If the patron gives you a date for the items to become unsuspended you can enter that in the date box and click the 'Update hold(s)' button to save your changes.</p>
 
-<p><strong>See the full documentation for holds in the <a href="http://manual.koha-community.org/3.6/en/holds.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.8/en/holds.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Wed Apr 11 05:56:32 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 10 Apr 2012 23:56:32 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Circ Help Files
Message-ID: <1334116592-4660-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/circ/branchoverdues.tt    |    4 +-
 .../prog/en/modules/help/circ/branchtransfers.tt   |    4 +-
 .../prog/en/modules/help/circ/circulation-home.tt  |    6 +-
 .../prog/en/modules/help/circ/circulation.tt       |  111 +++++++++++++-------
 .../prog/en/modules/help/circ/overdue.tt           |    2 +-
 .../prog/en/modules/help/circ/pendingreserves.tt   |    8 +-
 .../prog/en/modules/help/circ/reserveratios.tt     |    4 +-
 .../prog/en/modules/help/circ/returns.tt           |   50 ++++++---
 .../en/modules/help/circ/selectbranchprinter.tt    |    4 +-
 .../en/modules/help/circ/transferstoreceive.tt     |    4 +-
 .../prog/en/modules/help/circ/view_holdsqueue.tt   |    6 +-
 .../prog/en/modules/help/circ/waitingreserves.tt   |    6 +-
 12 files changed, 130 insertions(+), 79 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
index 4f8735d..8808c90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 	   
-<h1>Overdues with fines</h1>
+<h1>Overdues with Fines</h1>
 
 <p>This report shows items that:
 <ul>
@@ -13,6 +13,6 @@
 
 <p>Once open the report can be filtered by the shelving location.</p>
 
-<p><strong>See the full documentation for overdues with fines in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#overduesfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Overdues with Fines in the <a href="http://manual.koha-community.org/3.8/en/circreports.html#overduesfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
index e5e917f..5b38b75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
@@ -16,11 +16,11 @@
 	<li>When the item arrives at the other library the librarian must check the item in to acknowledge that it is no longer in transit</li>
 	<li>The item will not be permanently moved to the new library
 <ul>
-    <li>The item shows the same 'Home library' but has updated the 'Current location' to note where it resides at this time</li>
+	<li>The item shows the same 'Home Library' but has updated the 'Current Location' to note where it resides at this time</li>
 </ul>
 </li>
 </ul>
 
-<p><strong>See the full documentation for transfers in the <a href="http://manual.koha-community.org/3.6/en/transfers.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Transfers in the <a href="http://manual.koha-community.org/3.8/en/transfers.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
index 8dc2101..07f0b68 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
@@ -2,9 +2,9 @@
  
 <h1>Circulation</h1>
 
-<p>Circulation functions can be accessed in several different ways. On the main page of the staff client there are some quick links in the center of the page to check items out, in or transfer them. For a complete listing of circulation functions you can visit the Circulation page which is linked from the top left of every page or from the center of the main page.</p>
+<p>Circulation functions can be accessed in several different ways. On the main page of the staff client there are some quick links in the center of the page to check items out, in or transfer them. For a complete listing of Circulation functions you can visit the Circulation page which is linked from the top left of every page or from the center of the main page.</p>
 
-<p>Before circulating your collection you will want to set your global system preferences, basic parameters and patrons &amp; circulation rules.</p>
+<p>Before circulating your collection you will want to set your Global System Preferences, Basic Parameters and Patrons &amp; Circulation Rules.</p>
 
 <p>While in Circulation you can jump between the tabs on the quick search box at the top of the screen by using the following hot keys:</p>
 
@@ -20,6 +20,6 @@
 
 <p style="background-color: #ffe599">Tip: Mac users use the OPTION button in place of ALT</p>
 
-<p><strong>See the full documentation for circulation in the <a href="http://manual.koha-community.org/3.6/en/circulation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation in the <a href="http://manual.koha-community.org/3.8/en/circulation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
index 6ff7d93..b61ac11 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
@@ -1,64 +1,59 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Checking out (issuing)</h1>
-
-<p>To begin the checkout process you must enter the patron barcode or part of their name. The checkout option appears in three main places:</p>
-
-<ul>
-	<li>Check out option on main staff client</li>
-	<li>Check out option on the patron record</li>
-	<li>Check out option on the quick search bar</li>
-</ul>
-
-<h2>Checking items out</h2>
+<h1>Checking Out (Issuing)</h1>
 
 <p>To check an item out to a patron, first search for that patron using one of the many options listed above.</p>
 
-<p>At the top of the Check Out screen is a box for you to type or scan the item's barcode into.</p>
+<p>At the top of the Check Out screen is a box for you to type or scan the item's barcode into.
 
 <ul>
-    <li style="color: #990000;">Important: Many modern barcode scanners will send a 'return' to the browser, making it so that the 'Check out' button is automatically clicked</li>
+	<li style="color: #990000">Important: Many modern barcode scanners will send a 'return' to the browser, making it so that the 'Check Out' button is automatically clicked</li>
+</ul>
+<ul>
 	<li>If the barcode is not found you will be prompted to use fast cataloging to add the item. Learn more about fast cataloging later in this manual.</li>
 </ul>
 
-<p>Below the box for the barcode there may be options for you to override the default due date for the item.</p>
+<p>Below the box for the barcode there may be options for you to override the default due date for the item.
 
 <ul>
 	<li>This option will only appear if you have set the SpecifyDueDate system preference to allow staff to override the due date</li>
 </ul>
 
-<p>At the bottom of the page there is a summary of the patron's current checked out items along with the due date, items checked out today will appear at the top.</p>
+<p>At the bottom of the page there is a summary of the patron's current checked out items along with the due date (and time if the item is an hourly loan), items checked out today will appear at the top.</p>
 
-<ul>
-	<li>This screen will show whether an item is renewable and if not, why not.</li>
-	<li>To override the renewal limits you can set the AllowRenewalLimitOverride system preference to allow overrides and a checkbox will appear below the list of checkouts that reads 'Override Renewal Limit'
-<ul>
-	<li>Checking that box will add checkboxes in the renew column above where before the item was not renewable.</li>
-</ul>
-</li>
-</ul>
+<p style="background-color: #ffe599"><strong>Tip</strong> If the checked out time is listed as 00:00 then the item is a daily loan item. The due time for daily checkouts will show 23:59 which is the last minute of the day.</p>
 
-<p>Also at the bottom of the page is the list of items the patron has on hold
+<p>Also at the bottom of the page is the list of items the patron has on hold</p>
+
+<p>From the holds list you can suspend or resume patrons holds using the options at the bottom of the list.</p>
+
+<p>If there are notes on the patron record these will appear to the right of the checkout box</p>
+
+<p>If the patron has a hold waiting at the library that too will appear to the right of the check out box making it easy for the circulation librarian to see that there is another item to give the patron</p>
+
+<h3>Printing Receipts</h3>
 
 <p>Once you have checked out all of the items for the patron you can print them a receipt by choosing one of two methods.</p>
 
-<p>The first is that you can simply hit enter on your keyboard or scan a blank piece of paper with your barcode scanner. The idea being that you're "checking out" a blank barcode which triggers Koha to print the 'Quick slip.'</p>
+<p>If you have the CircAutoPrintQuickSlip preference set to 'open a print quick slip window' you can simply hit enter on your keyboard or scan a blank piece of paper with your barcode scanner. The idea being that you're "checking out" a blank barcode which triggers Koha to print the 'Quick slip.'</p>
 
-<p>The second is that you can click the Print button at the top of the screen and choosing 'Print slip' or 'Quick slip'.</p>
+<p>You can also click the Print button at the top of the screen and choose 'Print slip' or 'Print quick slip'.</p>
 
-<p>If you choose 'Print slip' it will print all of the items the patron has checked out, including those they checked out at an earlier date. Choosing 'Quick slip' will print only the items that were checked out today.</p>
+<p>If you choose 'Print slip' it will print all of the items the patron has checked out, including those they checked out at an earlier date. Choosing 'Print quick slip' will print only the items that were checked out today.</p>
 
-<p>If there are notes on the patron record these will appear to the right of the checkout box</p>
+<p>What prints on the slips can be customized by altering the slip templates under the Notices Slips tool.</p>
 
-<p>If the patron has a hold waiting at the library that too will appear to the right of the check out box making it easy for the circulation librarian to see that there is another item to give the patron</p>
+<h3>Clear Patron Information</h3>
 
-<p>When you're done checking an item out if you have the DisplayClearScreenButton preference set to 'Show' you can clear the current patron by clicking the 'X' in the top right of the patron's info to remove the current patron from the screen and start over.</p>
+<p>When you're done checking an item out if you have the DisplayClearScreenButton preference set to 'Show' you can clear the current patron by clicking the X in the top right of the patron's info to remove the current patron from the screen and start over.</p>
 
-<h2>Check out messages</h2>
+<p>If you have the CircAutoPrintQuickSlip preference set to 'clear the screen' then you simply need to hit enter or scan a blank barcode and the screen will be cleared of the current patron.</p>
 
-<p>There are times when Koha will prevent the librarian from being able to check out items to a patron. When this happens a warning will appear notifying the librarian of why the patron cannot check items out.</p>
+<h2>Check Out Messages</h2>
 
-<p>These are the possible messages you might see:</p>
+<p>If you check out an item that has multiple pieces and you have cataloged that information in subfield 3 of the item record (in MARC21) a message will pop up when you check out that item telling you how many pieces should be there.</p>
+
+<p>There are times when Koha will prevent the librarian from being able to check out items to a patron. When this happens a warning will appear notifying the librarian of why the patron cannot check items out.</p>
 
 <ul>
 	<li>Patron owes too much in fines
@@ -68,7 +63,7 @@
 </li>
 	<li>Patron has been barred from the library
 <ul>
-    <li>This can be set by the librarian editing a patron record and adding a flag or by the Overdue/Notice status triggers</li>
+	<li>This can be set by the librarian editing a patron record and adding a flag or by the Overdue/Notice Status Triggers</li>
 </ul>
 </li>
 	<li>Patron needs to confirm their address
@@ -83,12 +78,10 @@
 </li>
 </ul>
 
-<h2>Check out warnings</h2>
+<h2>Check Out Warnings</h2>
 
 <p>Sometimes checkouts will trigger warning messages that will appear in a yellow box above the check out field. These warnings need to be acknowledged before you will be able to continue checking items out.</p>
 
-<p>These are the possible warnings you might see:</p>
-
 <ul>
 	<li>Patron has outstanding fines</li>
 	<li>Item on hold for someone else</li>
@@ -102,9 +95,49 @@
 	<li>This can be overridden with the AllowRenewalLimitOverride system preference</li>
 </ul>
 </li>
-	<li>Barcode not found</li>
+	<li>Barcode not found
+<ul>
+	<li>Learn more about fast cataloging later in this manual.</li>
+</ul>
+</li>
 </ul>
 
-<p><strong>See the full documentation for checking out in the <a href="http://manual.koha-community.org/3.6/en/circulation.html#checkingout">manual</a> (online).</strong></p>
+<h2>Fast Add Cataloging</h2>
+
+<p>Sometimes circulation librarians need to quickly add a record to the system for an item they are about to check out. This is called 'Fast Add.' To allow circulation librarians access to the Fast Add Cataloging tool, simply make sure they have the fast_cataloging permissions. There are two ways to add titles via fast add. If you know that you're about to check out an item that isn't in you catalog you can go to the Circulation module and click 'Fast cataloging.'</p>
+
+<p>The cataloging interface will open up with the short cataloging record</p>
+
+<p>After adding your cataloging data you will be asked to enter item data. Enter the items barcode, collection code, etc and save the item before checking it out.</p>
+
+<p>The other way to fast catalog is from the checkout screen. When you enter a barcode at checkout that Koha can't find, it will prompt you to use fast cataloging to add the item to Koha and check it out.</p>
+
+<p>Clicking 'Fast cataloging' will bring you to the fast cataloging form where you can enter the title information</p>
+
+<p>After clicking 'Save' you will be brought to the item record where the barcode will already be filled in with the barcode you're trying to check out.</p>
+
+<p>After clicking the 'Add item' button the item will automatically be checked out the patron you were trying to check the book out to originally.</p>
+
+<h2>Circulation Messages</h2>
+
+<p>Circulation messages are short messages that librarians can leave for their patrons or their colleagues that will appear at the time of circulation.</p>
+
+<h3>Setting up Messages</h3>
+
+<p>Circulation messages are set up as Authorized Values. To add or edit Circulation Messages you want to work with the BOR_NOTES value.</p>
+
+<h3>Adding a Message</h3>
+
+<p>When on the patron's check out tab you will see a link to 'Add a new message' to the right of the check out box.</p>
+
+<p>When you click 'Add a new message' you will be asked to choose if the message is for the librarians or the patron and the message you would like to leave.</p>
+
+<h3>Viewing Messages</h3>
+
+<p>Circulation messages meant for the staff will appear on the patron's checkout screen.</p>
+
+<p>Circulation messages meant for the patron will appear when they log into the OPAC.</p>
+
+<p><strong>See the full documentation for Checking Out in the <a href="http://manual.koha-community.org/3.8/en/circulation.html#checkingout">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
index fdf5689..5e847b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
@@ -11,6 +11,6 @@
 	<li style="background-color: #ffe599">Tip: Large libraries can choose to filter the report before it runs by setting the FilterBeforeOverdueReport system preference to 'Require'.</li>
 </ul>
 
-<p><strong>See the full documentation for overdues in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#overduesreport">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Overdues in the <a href="http://manual.koha-community.org/3.8/en/circreports.html#overduesreport">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
index 4c1594a..be1695e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Holds to pull</h1>
+<h1>Holds to Pull</h1>
 
 <p>This report will show you all of the items that have holds on them that are available at the library for pulling.</p>
 
@@ -14,15 +14,15 @@
 </li>
 	<li>RandomizeHoldsQueueWeight
 <ul>
-    <li>If 'RandomizeHoldsQueueWeight' and 'StaticHoldsQueueWeight' are set, the list of library codes in the 'StaticHoldsQueueWeight' system preference are randomized rather than statically ranked. If 'RandomizeHoldsQueueWeight' alone is set, the list of all available library codes is used to randomize the weight.</li>
+	<li>If 'RandomizeHoldsQueueWeight' and 'StaticHoldsQueueWeight' are set, the list of library codes in the 'StaticHoldsQueueWeight' system preference are randomized rather than statically ranked. If RandomizeHoldsQueueWeight alone is set, the list of all available library codes is used to randomize the weight.</li>
 </ul>
 </li>
 </ul>
 
 <p>If neither 'RandomizeHoldsQueueWeight' or 'StaticHoldsQueueWeight' is set, the holds queue is statically ranked according to how they are pulled out of the system database.</p>
 
-<p>You can limit the results you see by using the 'Refine' box on the left side of the page</p>
+<p>You can limit the results you see by using the Refine box on the left side of the page</p>
 
-<p><strong>See the full documentation for holds to pull in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdspull">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Holds to Pull in the <a href="http://manual.koha-community.org/3.8/en/circreports.html#holdspull">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
index bdc3381..1582fe5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Hold ratios</h1>
+<h1>Hold Ratios</h1>
 
 <p>Hold ratios help with collection development. Using this report you will be able to see how many of your patrons have holds on items and whether you should buy more. By default it will be set to the library needing 3 items per hold that has been placed. The report will tell you how many additional items need to be purchased to meet this quota.</p>
 
-<p><strong>See the full documentation for hold ratios in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdratios">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Hold Ratios in the <a href="http://manual.koha-community.org/3.8/en/circreports.html#holdratios">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
index 1e14d4b..1db1ea2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
@@ -1,58 +1,76 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Checking in (returning)</h1>
+<h1>Checking in (Returning)</h1>
 
 <p>Checking in items can be performed from various different locations</p>
 
 <ul>
-	<li>The check in box on main staff client</li>
+	<li>The check in box on the top of the main staff client</li>
 	<li>The check in option on the quick search bar on the Circulation page</li>
 	<li>The check in link on the patron's checkout summary (and on the checkout summary page)</li>
+	<li>The Check in page under the Circulation menu</li>
 </ul>
 
-<h2>Checking items in</h2>
+<h3>Checking Items In</h3>
 
 <p>To check an item in scan the barcode for the item into the box provided. A summary of all items checked in will appear below the checkin box</p>
 
 <p>If you are checking items in that were put in the dropbox while the library was closed you can check the 'Dropbox mode' box before scanning items. This will effectively roll back the returned date to the last date the library was open.</p>
 
 <ul>
-	<li>This requires that you have your closings added to the Holidays &amp; Calendar Tool</li>
+	<li>This requires that you have your closings added to the Holidays & Calendar Tool</li>
 </ul>
 
 <p>You can also choose to forgive all overdue charges for items you are checking in by checking the 'Forgive overdue charges' box before scanning items.</p>
 
-<h2>Check in messages</h2>
+<h3>Check In Messages</h3>
 
 <p>There are several messages that can appear when checking items in:</p>
 
 <ul>
-	<li>If you are checking an item in at a library other than the home library, a message will appear asking you to transfer the book to the home library
+	<li>If you are checking an item in at a library other than the home branch, a message will appear asking you to transfer the book to the home library
 <ul>
 	<li>After this item is checked in the status of the item will be changed in the catalog to 'in transit'</li>
-	<li>To mark an item as back at the home library, check the item in at the home library
+	<li>To mark an item as back at the home branch, check the item in at the home branch
 <ul>
-	<li>A message will appear tell you that the item is not checked out, but the status will now say available in the catalog. This step is necessary to mark items as received by the home library.</li>
+	<li>A message will appear tell you that the item is not checked out, but the status will now say available in the catalog. This step is necessary to mark items as received by the home branch.</li>
 </ul>
 </li>
 </ul>
 </li>
+	<li>If you are checking in an item that should have multiple parts or pieces a message will appear warning you about the number of pieces you should have in your hand</li>
 	<li>If you're checking an item in that has a hold on it, you will be prompted to confirm the hold
 <ul>
-    <li>Clicking the 'Confirm' hold button will mark the item as waiting for pickup from the library</li>
-    <li>Clicking the 'Print slip and confirm' button will mark the item as waiting for pickup at the library and present the library with a receipt to print and place on the book with the patron's information</li>
-    <li>Ignoring the hold will leave the item on hold, but leave its status as available (it will not cancel the hold)</li>
+	<li>Clicking the Confirm hold button will mark the item as waiting for pickup from the library</li>
+	<li>Clicking the Print Slip and Confirm button will mark the item as waiting for pickup at the library and present the library with a receipt to print and place on the book with the patron's information</li>
+	<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
 </ul>
 </li>
-	<li>If you're checking in an item that has a hold on it at another library you will be prompted to confirm and transfer the item
+	<li>If you're checking in an item that has a hold on it at another branch you will be prompted to confirm and transfer the item
 <ul>
-    <li>Clicking the 'Confirm hold and transfer' button will mark the item as in transit to the library where the hold was placed</li>
-    <li>Clicking the 'Print slip, transfer and confirm' button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information</li>
-    <li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
+	<li>Clicking the Confirm hold and Transfer button will mark the item as in transit to the library where the hold was placed</li>
+	<li>Clicking the Print Slip, Transfer and Confirm button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information</li>
+	<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
 </ul>
 </li>
 </ul>
 
-<p><strong>See the full documentation for checking in in the <a href="http://manual.koha-community.org/3.6/en/checkingin.html">manual</a> (online).</strong></p>
+<h2>Receiving Holds</h2>
+
+<p>When items that are on hold are checked in or out the system will remind the circulation librarian that the item is on hold and offer them options for managing the hold.</p>
+
+<p>When you check in an item that has a hold on it the system will ask you to either confirm and transfer the item or just confirm the hold</p>
+
+<p>Clicking the Confirm button will mark the item as on hold for the patron. If the item needs to be transferred the item will also be marked as in transit to the proper branch. Clicking 'Ignore' will retain the hold, but allow you to check the item out to another patron. Choosing to confirm and print will present you with a printable page that you can slip inside the book with the necessary hold and/or transfer information.</p>
+
+<p>Once confirmed the hold will show on the patron record and on the checkout screen under the 'Hold' tab.</p>
+
+<p>The item record will also show that the item is on hold.</p>
+
+<p>In some cases a patron may come in to pick up a hold for their partner (or someone else in their household). In this case you want to make sure that the hold is cancelled when you check the item out to someone else. When trying to check out an item that is already waiting for someone else you will be presented with a warning message.</p>
+
+<p>From here you can check the item out to the patron at the desk and cancel the hold for the patron.</p>
+
+<p><strong>See the full documentation for Checking In in the <a href="http://manual.koha-community.org/3.8/en/checkingin.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
index b913cbf..1fbefd4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Set library</h1>
+<h1>Set Library</h1>
 
 <p>By default you will enter the staff client as if you are at your home library. This library will appear in the top right of the Staff Client.</p>
 
@@ -8,6 +8,6 @@
 
 <p>Once you have saved your changes you new library will appear in the top right.</p>
 
-<p><strong>See the full documentation for setting your library in the <a href="http://manual.koha-community.org/3.6/en/setlibrary.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Setting your Library in the <a href="http://manual.koha-community.org/3.8/en/setlibrary.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
index 8f93352..5b2b567 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Transfers To receive</h1>
+<h1>Transfers To Receive</h1>
 
 <p>This report will list all of the items that Koha thinks are in transit to your library.</p>
 
@@ -8,6 +8,6 @@
 
 <p style="color: #990000">Important: An item is considered late based on the number of days you have entered in the TransfersMaxDaysWarning system preference.</p>
 
-<p><strong>See the full documentation for transfers to receive in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#transferstoreceive">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Transfers to Receive in the <a href="http://manual.koha-community.org/3.8/en/circreports.html#transferstoreceive">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
index 8395024..9e9c730 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
@@ -1,9 +1,9 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Holds queue</h1>
+<h1>Holds Queue</h1>
 
-<p>This report will show you all of the holds at your library. To generate this report, you must have the 'Build holds queue' cron job running.</p>
+<p>This report will show you all of the holds at your library. To generate this report, you must have the Build Holds Queue cron job running.</p>
 
-<p><strong>See the full documentation for the holds queue in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdsqueue">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Holds Queue in the <a href="http://manual.koha-community.org/3.8/en/circreports.html#holdsqueue">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
index 417d7f0..f6120e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
@@ -1,11 +1,11 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Holds awaiting pickup</h1>
+<h1>Holds Awaiting Pickup</h1>
 
 <p>This report will show all of the holds that are waiting for patrons to pick them up.</p>
 
-<p>Items that have been on the hold shelf longer than you normally allow (based on the ReservesMaxPickUpDelay preference value) will appear on the 'Holds over' tab, they will not automatically be cancelled.</p>
+<p>Items that have been on the hold shelf longer than you normally allow (based on the ReservesMaxPickUpDelay preference value) will appear on the 'Holds Over' tab, they will not automatically be cancelled.</p>
 
-<p><strong>See the full documentation for holds awaiting pickup in the <a href="http://manual.koha-community.org/3.6/en/circreports.html#holdspickup">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Holds Awaiting Pickup in the <a href="http://manual.koha-community.org/3.8/en/circreports.html#holdspickup">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Wed Apr 11 06:21:10 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 11 Apr 2012 00:21:10 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Label Help Files
Message-ID: <1334118070-4790-1-git-send-email-nengard@bywatersolutions.com>

---
 .../en/modules/help/labels/label-edit-batch.tt     |    8 ++++----
 .../en/modules/help/labels/label-edit-layout.tt    |    8 ++++----
 .../en/modules/help/labels/label-edit-profile.tt   |   14 +++++++-------
 .../en/modules/help/labels/label-edit-template.tt  |   14 +++++++-------
 .../prog/en/modules/help/labels/label-home.tt      |    2 +-
 .../prog/en/modules/help/labels/spinelabel-home.tt |    4 ++--
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
index b500ac3..4964e92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
@@ -4,9 +4,9 @@
 
 <p>Batches are made up of the barcodes you would like to print. Once in this tool you can search for the item records you would like to print out labels for.</p>
 
-<h2>Add a batch</h2>
+<h2>Add a Batch</h2>
 
-<p>Batches can be created in one of two ways. The first is to click the 'Create label batch' link on the 'Staged MARC management' page</p>
+<p>Batches can be created in one of two ways. The first is to click the 'Create Label Batch' link on the 'Staged MARC Management' page</p>
 
 <p>The other is to choose to create a new batch from the label creator tool</p>
 
@@ -16,12 +16,12 @@
 
 <p>Once you have added all of the items click the 'Done' button. The resulting page will list the items you have selected.</p>
 
-<p>To print your labels, click the 'Export batch' button. To print only some of the labels, click the 'Export item(s)' button. Either way you will be presented with a confirmation screen where you can choose your template and layout.</p>
+<p>To print your labels, click the 'Export Batch' button. To print only some of the labels, click the 'Export Item(s)' button. Either way you will be presented with a confirmation screen where you can choose your template and layout.</p>
 
 <p>You will then be presented with three download options: PDF, Excel, and CSV.</p>
 
 <p>After saving your file, simply print to the blank labels you have in your library.</p>
 
-<p><strong>See the full documentation for label batches in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labelbatches">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Label Batches in the <a href="http://manual.koha-community.org/3.8/en/labelcreator.html#labelbatches">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
index 8ca7eac..75cf75f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
@@ -4,14 +4,14 @@
 
 <p>A layout is used to define the fields you want to appear on your labels.</p>
 
-<h2>Add a layout</h2>
+<h2>Add a Layout</h2>
 
-<p>To add a new layout, you want to click on the 'Layouts' button at the top of your page and choose 'New layout'</p>
+<p>To add a new layout, you want to click on the 'Layouts' button at the top of your page and choose 'New Layout'</p>
 
 <p>Using the form that appears you can create a profile to fix any problems with your template.</p>
 
-<p>After saving, your layouts will appear on the 'Manage layouts' page.</p>
+<p>After saving, your layouts will appear on the 'Manage Layouts' page.</p>
 
-<p><strong>See the full documentation for label layouts in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labellayouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Label Layouts in the <a href="http://manual.koha-community.org/3.8/en/labelcreator.html#labellayouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
index 1bf4a2e..d577637 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
@@ -6,17 +6,17 @@
 
 <p>If your labels are printing just the way you want, you will not need a profile.</p>
 
-<h2>Add a profile</h2>
+<h2>Add a Profile</h2>
 
-<p>To add a new profile, you want to click on the 'Profiles' button at the top of your page and choose 'New profile'</p>
+<p>To add a new profile, you want to click on the 'Profiles' button at the top of your page and choose 'New Profile'</p>
 
 <p>Using the form that appears you can create a profile to fix any problems with your template.</p>
 
 <ul>
-    <li>'Printer name' and 'Paper bin' do not have to match your printer exactly, they are for your reference so you can remember what printer you have set the profile for. So if you want to use the Printer model number in printer name or you can call it 'the printer on my desk'</li>
+	<li>The Printer Name and Paper Bin do not have to match your printer exactly, they are for your reference so you can remember what printer you have set the profile for. So if you want to use the Printer model number in printer name or you can call it 'the printer on my desk'</li>
 	<li>Template will be filled in once you have chosen which template to apply the profile to on the template edit form</li>
-    <li>The 'Units' pull down is used to define what measurement scale you're going to be using for your profile.&nbsp;</li>
-    <li>'Offset' describes what happens when the entire image is off center either vertically or horizontally and creep describes a condition where the distance between the labels changes across the page or up and down the page
+	<li>The Units pull down is used to define what measurement scale you're going to be using for your profile.&nbsp;</li>
+	<li>Offset describes what happens when the entire image is off center either vertically or horizontally and creep describes a condition where the distance between the labels changes across the page or up and down the page
 <ul>
 	<li>For these values, negative numbers move the error up and to the left and positive numbers move the error down and to the right</li>
 	<li>Example: the text is .25" from the left edge of the first label, .28" from the left edge of the second label and .31" from the left edge of the third label. This means the horizontal creep should be set to .03" to make up for this difference.</li>
@@ -24,10 +24,10 @@
 </li>
 </ul>
 
-<p>After saving, your profiles will appear on the 'Manage profiles' page.</p>
+<p>After saving, your profiles will appear on the 'Manage Profiles' page.</p>
 
 <p>Once you have saved your new profile, you can return to the list of templates and choose to edit the template that this profile is for.</p>
 
-<p><strong>See the full documentation for label profiles in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labelprofiles">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Label Profiles in the <a href="http://manual.koha-community.org/3.8/en/labelcreator.html#labelprofiles">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
index 6837621..6b0f256 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
@@ -6,15 +6,15 @@
 
 <h2>Add a Template</h2>
 
-<p>To add a new template, you want to click on the 'Templates' button at the top of your page and choose 'New template'</p>
+<p>To add a new template, you want to click on the 'Templates' button at the top of your page and choose 'New Template'</p>
 
 <p>Using the form that appears you can define the template for your sheet of labels or cards.</p>
 
 <ul>
-    <li>'Template ID' will be automatically generated after saving your template, this is simply a system generated unique id</li>
-    <li>'Template code' should be something you can use to identify your template on a list of templates</li>
-    <li>You can use the 'Template description' to add additional information about the template</li>
-    <li>The 'Units' pull down is used to define what measurement scale you're going to be using for the template. This should probably match the unit of measurement used on the template description provided by the product vendor.&nbsp;</li>
+	<li>Template ID will be automatically generated after saving your template, this is simply a system generated unique id</li>
+	<li>Template Code should be something you can use to identify your template on a list of templates</li>
+	<li>You can use the Template Description to add additional information about the template</li>
+	<li>The Units pull down is used to define what measurement scale you're going to be using for the template. This should probably match the unit of measurement used on the template description provided by the product vendor.&nbsp;</li>
 	<li>The measurements, number of columns and number of rows can be found on the vendor product packaging or website.
 <ul>
 	<li style="color: #990000">Important: If you do not supply a left text margin in the template, a 3/16" (13.5 point) left text margin will apply by default.</li>
@@ -28,8 +28,8 @@
 </li>
 </ul>
 
-<p>After saving, your templates will appear on the 'Manage templates' page.</p>
+<p>After saving, your templates will appear on the 'Manage Templates' page.</p>
 
-<p><strong>See the full documentation for label templates in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html#labeltemplates">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Label Templates in the <a href="http://manual.koha-community.org/3.8/en/labelcreator.html#labeltemplates">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
index fe90abb..298e967 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
@@ -41,6 +41,6 @@
 
 <p>Batches are made up of the barcodes you would like to print. Once in this tool you can search for the item records you would like to print out labels for.</p>
 
-<p><strong>See the full documentation for the Label Creator in the <a href="http://manual.koha-community.org/3.6/en/labelcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Label Creator in the <a href="http://manual.koha-community.org/3.8/en/labelcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
index 9bf04e1..7e7eb88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Quick spine label creator</h1>
+<h1>Quick Spine Label Creator</h1>
 
 <p style="background-color: #ffe599">Tip: This tool does not use the label layouts or templates, it simply prints a spine label in the first spot on the label sheet.</p>
 
@@ -11,6 +11,6 @@
 
 <p>To use this tool you simply need the barcode for the book you'd like to print the spine label for.</p>
 
-<p><strong>See the full documentation for the quick spine label creator in the <a href="http://manual.koha-community.org/3.6/en/quicklabelcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Quick Spine Label Creator in the <a href="http://manual.koha-community.org/3.8/en/quicklabelcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Wed Apr 11 06:24:37 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 11 Apr 2012 00:24:37 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Patron Card Help Files
Message-ID: <1334118277-4847-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/patroncards/edit-batch.tt |    2 +-
 .../en/modules/help/patroncards/edit-layout.tt     |    2 +-
 .../en/modules/help/patroncards/edit-profile.tt    |    2 +-
 .../en/modules/help/patroncards/edit-template.tt   |    2 +-
 .../prog/en/modules/help/patroncards/home.tt       |    2 +-
 .../en/modules/help/patroncards/image-manage.tt    |    2 +-
 .../prog/en/modules/help/patroncards/manage.tt     |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tt
index 00da73f..b69371e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tt
@@ -8,6 +8,6 @@
 
 <p>To add a new batch, you want to click on the 'Batches' button at the top of your page and choose 'New Batch'</p>
 
-<p><strong>See the full documentation for the Patron Card Batches in the <a href="http://manual.koha-community.org/3.6/en/patroncardcreator.html#patroncardbatches">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Batches in the <a href="http://manual.koha-community.org/3.8/en/patroncardcreator.html#patroncardbatches">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
index 434f981..f1e4155 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
@@ -31,6 +31,6 @@
 
 <p>After saving, your layouts will appear on the 'Manage Layouts' page.</p>
 
-<p><strong>See the full documentation for the Patron Card Layouts in the <a href="http://manual.koha-community.org/3.6/en/patroncardcreator.html#cardlayouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Layouts in the <a href="http://manual.koha-community.org/3.8/en/patroncardcreator.html#cardlayouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
index ef53d87..964a4ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
@@ -28,6 +28,6 @@
 
 <p>Once you have saved your new profile, you can return to the list of templates and choose to edit the template that this profile is for.</p>
 
-<p><strong>See the full documentation for the Patron Card Profiles in the <a href="http://manual.koha-community.org/3.6/en/patroncardcreator.html#patronprofile">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Profiles in the <a href="http://manual.koha-community.org/3.8/en/patroncardcreator.html#patronprofile">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
index 55585a2..9e8c42d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
@@ -25,6 +25,6 @@ After saving, your templates will appear on the 'Manage Templates' page.</li>
 </li>
 </ul>
 
-<p><strong>See the full documentation for the Patron Card Templates in the <a href="http://manual.koha-community.org/3.6/en/patroncardcreator.html#patrontemplate">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Templates in the <a href="http://manual.koha-community.org/3.8/en/patroncardcreator.html#patrontemplate">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
index a50aba3..360e73e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
@@ -17,6 +17,6 @@
 
 <p>The developers of the Patron Card Creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.</p>
 
-<p><strong>See the full documentation for the Patron Card Creator in the <a href="http://manual.koha-community.org/3.6/en/patroncardcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Creator in the <a href="http://manual.koha-community.org/3.8/en/patroncardcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
index ca043ff..f6b2b18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
@@ -16,6 +16,6 @@
 
 <p>To delete one or multiple of these images, click the checkbox to the right of each image you want to delete and click the 'Delete' button.</p>
 
-<p><strong>See the full documentation for Managing Images in the <a href="http://manual.koha-community.org/3.6/en/patroncardcreator.html#managecardimages">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Managing Images in the <a href="http://manual.koha-community.org/3.8/en/patroncardcreator.html#managecardimages">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
index 130487b..957497f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
@@ -16,6 +16,6 @@
 
 <p>A batch is a collection of patrons for whom you want to generate cards.</p>
 
-<p><strong>See the full documentation for the Patron Card Creator in the <a href="http://manual.koha-community.org/3.6/en/patroncardcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Creator in the <a href="http://manual.koha-community.org/3.8/en/patroncardcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From f.demians at tamil.fr  Wed Apr 11 18:23:51 2012
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Wed, 11 Apr 2012 18:23:51 +0200
Subject: [Koha-patches] [PATCH] Bug 3087 Fix Z39.50 server to return the
	correct record syntax
Message-ID: <1334161431-2445-1-git-send-email-f.demians@tamil.fr>

Modify Makefile.PL and Zebra configuration files in order to parametrized
biblio record type returned by Zebra Z39.50 server.

How to test:

- Test with a MARC21 and a UNIMARC DB
- Do a new installation
- Search from OPAC
- Search from a Z39.50 client like yaz-client: syntax = MARC21/UNIMARC must be
  choosed
- It was working for MARC21: it continues to work
- It wasn't working for UNIMARC: it works now, both in OPAC and from a Z39.50
  client
---
 C4/Context.pm              |    2 +
 Makefile.PL                |    1 +
 etc/koha-conf.xml          |   46 ++++++++++++++++++++++----------------------
 etc/zebradb/etc/usmarc.mar |    4 +-
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/C4/Context.pm b/C4/Context.pm
index 67d31ee..d368643 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -656,6 +656,8 @@ sub Zconn {
         $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
 
         $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
+        $context->{ Zconn }->{ $server }->option(
+            preferredRecordSyntax => C4::Context->preference("marcflavour") );
         return $context->{"Zconn"}->{$server};
     }
 }
diff --git a/Makefile.PL b/Makefile.PL
index 2e414d5..11c3b5a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -500,6 +500,7 @@ my $pl_files = {
 if ($config{'INSTALL_ZEBRA'} eq "yes") {
     push @{ $pl_files->{'rewrite-config.PL'} }, (
         'blib/ZEBRA_CONF_DIR/etc/passwd',
+        'blib/ZEBRA_CONF_DIR/etc/usmarc.mar',
         'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
         'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
         'blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg',
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index f5e2c0f..68d8e7c 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -41,47 +41,47 @@ __PAZPAR2_TOGGLE_XML_POST__
      <!-- <stylesheet>xsl/default.xsl</stylesheet> -->
      <!-- <maximumrecordsize>2000000</maximumrecordsize> -->
      <retrievalinfo>
-       <retrieval syntax="usmarc" name="F"/>
-       <retrieval syntax="usmarc" name="B"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="F"/>
        <retrieval syntax="xml" name="B"/>
        <retrieval syntax="xml" name="marcxml"
                   identifier="info:srw/schema/1/marcxml-v1.1">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="dc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="mods">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rdfdc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rss2">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="utils">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
@@ -119,38 +119,38 @@ __PAZPAR2_TOGGLE_XML_POST__
                 xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>
      <retrievalinfo>
-       <retrieval syntax="usmarc" name="F"/>
-       <retrieval syntax="usmarc" name="B"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="marcxml"
                   identifier="info:srw/schema/1/marcxml-v1.1">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="dc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="mods">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rdfdc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="utils">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
@@ -185,47 +185,47 @@ __PAZPAR2_TOGGLE_XML_POST__
     <config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
     <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
      <retrievalinfo>
-       <retrieval syntax="usmarc" name="F"/>
-       <retrieval syntax="usmarc" name="B"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="F"/>
        <retrieval syntax="xml" name="B"/>
        <retrieval syntax="xml" name="marcxml"
                   identifier="info:srw/schema/1/marcxml-v1.1">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="dc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="mods">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rdfdc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rss2">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="utils">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
diff --git a/etc/zebradb/etc/usmarc.mar b/etc/zebradb/etc/usmarc.mar
index 99920f9..a977ae5 100644
--- a/etc/zebradb/etc/usmarc.mar
+++ b/etc/zebradb/etc/usmarc.mar
@@ -1,3 +1,3 @@
 # $Id: usmarc.mar,v 1.1 2002/10/22 12:51:09 adam Exp $
-name usmarc
-reference USmarc
+name __ZEBRA_MARC_FORMAT__
+reference __ZEBRA_MARC_FORMAT__
-- 
1.7.8


From nengard at bywatersolutions.com  Wed Apr 11 09:00:15 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 11 Apr 2012 03:00:15 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Catalogue Help Files
Message-ID: <1334127615-7672-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/catalogue/issuehistory.tt |    4 ++--
 .../prog/en/modules/help/catalogue/moredetail.tt   |   20 +++++++++++++++++---
 .../prog/en/modules/help/catalogue/search.tt       |   10 +++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
index 8dd53e8..a763f37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
@@ -1,11 +1,11 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Checkout history</h1>
+<h1>Checkout History</h1>
 
 <p>Each bibliographic record keeps a circulation history (with or without the patron information depending on your settings), but each item also has its own circulation history page. To see this, click on the 'Items' tab to the left of the record you are viewing.</p>
 
 <p>Below the 'History' heading is a link to 'View item's checkout history,' clicking that will open up the item's history which will look slightly different from the bibliographic record's history page.</p>
 
-<p><strong>See the full documentation for item checkout history in the <a href="http://manual.koha-community.org/3.6/en/catitems.html#itemcirchistory">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Checkout History in the <a href="http://manual.koha-community.org/3.8/en/catitems.html#itemcirchistory">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
index edea67e..7eae764 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
@@ -1,9 +1,23 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Item details</h1>
+<h1>Item Details</h1>
 
-<p>This page provides information regarding all of the items attached to a record.  From here you can easily mark and item lost, damaged or withdrawn.  You can slo view the circulation history or edit the items.</p>
+<p>This page provides information regarding all of the items attached to a record.</p>
 
-<p><strong>See the full documentation for item records in the <a href="http://manual.koha-community.org/3.6/en/catitems.html">manual</a> (online).</strong></p>
+<h2>Quick Item Status Updates</h2>
+
+<p>Often circulation staff need to change the status of an item to Lost or Damaged. This doesn't require you to edit the entire item record. Instead clicking on the item barcode on the checkout summary or checkin history will bring you to an item summary. You can also get to the item summary by clicking on the Items tab to the left of the bib detail page.</p>
+
+<p>From this view you can mark an item lost by choosing a lost status from the pull down and clicking the 'Set Status' button.</p>
+
+<p>You can also mark an item as damaged by choosing a damaged status from the pull down and clicking the 'Set Status' button.</p>
+
+<h2>Item Specific Circulation History</h2>
+
+<p>Each bibliographic record keeps a circulation history (with or without the patron information depending on your settings), but each item also has its own circulation history page. To see this, click on the 'Items' tab to the left of the record you are viewing.</p>
+
+<p>Below the 'History' heading is a link to 'View item's checkout history,' clicking that will open up the item's history which will look slightly different from the bibliographic record's history page.</p>
+
+<p><strong>See the full documentation for Item Records in the <a href="http://manual.koha-community.org/3.8/en/catitems.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
index 2b3db1b..38d1b3e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
@@ -4,7 +4,7 @@
 
 <p>To see more search options click [More Options] at the bottom of the page. This will allow for more advanced boolean searching.</p>
 
-<h2>Searching subtypes in the Staff Client</h2>
+<h2>Searching Subtypes on the Staff Client</h2>
 
 <p>Below is a summary of  the various pieces of the advanced search limit: </p>
 
@@ -19,7 +19,7 @@
 
 <h3>Content</h3>
 
-<p>There are three indexes that comprise content: 'fic' is derived from 003/33; 'bio' is derived from the 008/34 and 'mus' is derived from LEADER/06. Common values for each of these are:</p>
+<p>There are three indexes that comprise Content: 'fic' is derived from 003/33; 'bio' is derived from the 008/34 and 'mus' is derived from LEADER/06. Common values for each of these are:</p>
 
 <ul><li>fic:1 Fiction</li>
 <li>fic:0 Non fiction</li>
@@ -38,10 +38,10 @@
 <li>l-format:ss Cassette recording</li>
 <li>l-format:vf VHS tape / Videocassette</li>
 <li>l-format:vd DVD video / Videodisc</li>
-<li>l-format:co CD software</li>
+<li>l-format:co CD Software</li>
 <li>l-format:cr Website</li></ul>
 
-<h3>Additional content types</h3>
+<h3>Additional Content Types</h3>
 
 <p>The index name is 'ctype' is taken from the 008 and it's where we get the 'additional content types'. It's position 008/24-28 field. Common values are: </p>
 
@@ -68,6 +68,6 @@
 <li>ctype:w Law reports and digests</li>
 <li>ctype:z Treaties</li></ul>
 
-<p><strong>See the full documentation for searching in the <a href="http://manual.koha-community.org/3.6/en/searching.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Searching in the <a href="http://manual.koha-community.org/3.8/en/searching.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From Katrin.Fischer.83 at web.de  Thu Apr 12 07:57:29 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Thu, 12 Apr 2012 07:57:29 +0200
Subject: [Koha-patches] [PATCH] Bug 7371: Add 'cardnumber' as option for
	AutoEmailPrimaryAddress
Message-ID: <1334210249-14295-1-git-send-email-Katrin.Fischer.83@web.de>

The systempref.sql file had one more option 'cardnumber' that was not
visible from the system preference editor. This patch adds the setting.

To test:
- Check new setting cardnumber is available for AutoEmailPrimaryAddress
- Use setting with a patron that has an email address as cardnumber and
verify email is sent out correctly.
---
 .../prog/en/modules/admin/preferences/patrons.pref |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index 3d88883..55b4457 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -20,6 +20,7 @@ Patrons:
                email: home
                emailpro: work
                B_email: alternate
+               cardnumber: cardnumber as
                "OFF": first valid
          - "patron email address for sending out emails."
      -
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Thu Apr 12 09:02:42 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Thu, 12 Apr 2012 09:02:42 +0200
Subject: [Koha-patches] [PATCH] Bug 7354: Can't edit local use system
	preferences
Message-ID: <1334214162-15483-1-git-send-email-Katrin.Fischer.83@web.de>

Fixes adding and editing of local use system preferences and redirects to correct
page after saving.

To test:
- Create a new local use system preference
- Edit an existing local use system preference from summary page
- Edit an existing local use system preference using 'Edit'
- Delete a local use system preference
---
 admin/systempreferences.pl |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index f4069ae..5e3848d 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -95,7 +95,7 @@ $tabsysprefs{AutoLocation}          = "Admin";
 $tabsysprefs{DebugLevel}            = "Admin";
 $tabsysprefs{SessionStorage}        = "Admin";
 
-# This script is depricated so all of these prefs are lumped here to avoid their being displayed in the local use prefs tab
+# This script is deprecated so all of these prefs are lumped here to avoid their being displayed in the local use prefs tab
 
 $tabsysprefs{noItemTypeImages}      = "Admin";
 $tabsysprefs{OPACBaseURL}           = "Admin";
@@ -693,9 +693,8 @@ if ( $op eq 'add_form' ) {
     }
 
     $data->{'lang'} = $template->param('lang');
-
-    $template->param( GetPrefParams($data) );
-
+    my $prefparams = GetPrefParams($data);
+    $template->param( %$prefparams );
     $template->param( searchfield => $searchfield );
 
 ################## ADD_VALIDATE ##################################
@@ -746,7 +745,7 @@ if ( $op eq 'add_form' ) {
         }
     }
     $sth->finish;
-    print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=systempreferences.pl?tab=" . $tabsysprefs{ $input->param('variable') } . "\"></html>";
+    print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=systempreferences.pl?tab=\"></html>";
     exit;
 ################## DELETE_CONFIRM ##################################
     # called by default form, used to confirm deletion of data in DB
-- 
1.7.5.4


From gaetan.boisson at biblibre.com  Thu Apr 12 18:09:49 2012
From: gaetan.boisson at biblibre.com (Gaetan Boisson)
Date: Thu, 12 Apr 2012 18:09:49 +0200
Subject: [Koha-patches] [PATCH] Bug 7693 - clear screen button misaligned
Message-ID: <1334246989-22228-1-git-send-email-gaetan.boisson@biblibre.com>

This patch removes firefox specific lines in the css which were breaking the display
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    9 +--------
 1 files changed, 1 insertions(+), 8 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 ef01648..e145158 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2076,18 +2076,11 @@ fieldset.rows+h3 {clear:both;padding-top:.5em;}
     }
 
 #clearscreen {
-    margin-right: 0;
     position: absolute;
     top:0;
     right:0;
     }
-/* CSS Hack to target Firefox */
- at -moz-document url-prefix() {
-    #clearscreen {
-        margin-right : 1em;
-        top: -1em;
-    }
-}
+ 
 #clearscreen a {
     display:block;
     -moz-border-radius: 0 0 0 5px;
-- 
1.7.5.4


From gaetan.boisson at biblibre.com  Thu Apr 12 18:25:34 2012
From: gaetan.boisson at biblibre.com (Gaetan Boisson)
Date: Thu, 12 Apr 2012 18:25:34 +0200
Subject: [Koha-patches] [PATCH] Bug 7949 - a different favicon for the staff
	client
Message-ID: <1334247934-22941-1-git-send-email-gaetan.boisson@biblibre.com>

different favicon proposal
---
 .../intranet-tmpl/prog/en/includes/favicon.ico     |  Bin 1406 -> 1406 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/favicon.ico b/koha-tmpl/intranet-tmpl/prog/en/includes/favicon.ico
index 586bd559d9cd6d67a69a1e0f5b96cc7a1b95ca46..ef3a60ce49148080242ede64032fc4537a9e13b3 100644
GIT binary patch
literal 1406
zcmeH^TS(Jk7>6G#%g$5VOgp$fwN}#(mYwXlQfF!NPeD<55rK6hD<Rg3!XlS?BP2py
ztO9K%D=(s0L6|`owY4;CikTFHsM&!oM$4RAf5GW)y6P(M{rG*n&+~p)?*}pRQ7Dk_
zIF7}F3ed=r6>2%d{%=)WVj%y}UJ4HHC;#X{3}vO{R+M5i8p%0#1e3``c2yZ>vl(5j
z5q- at Gv<>B0EEY6Zja1jxl5xEPVLOT1ZX)&WDbiX_Q*CX)YPFK$ILq<d^{AdyVzb#$
zwN;{gdY-~Zb=<T!lkof^@h_@~cUF<;w4iidBFR-v^2-_;AGDDEs*Ve7&1gF=<8V00
z?5HP8j=tSWYilby&o%P8Zcx<S$iALi9C+J|%jM!s??ddJ&nSO?ACJd_ySo#2Zx>fS
zJL&n*N7I+rc)ecke0{^c at 7+B9(TC6H!`I)B+y9Yv|0muBzVR~<z&{Y+cW{tkFvzc=
zK?XuWhC(4i;o*b{%Nein4g8NA5F at oH(g^j0<V-OK)$)jm-I=!_CRN&%JtAgm_e`H=
z$X~d9gy+tZ6q`#{MV<>WY4;9k%NU9&8zd<!isR==8`milN6q{=Y3-7&E4HOY%tXCT
zy|l1+l&9ttEf$((k+Dcfl2(s`5bD{JrA<+sG9y<ih+>hxa?SdTXff9R>!1ArW>dhx

literal 1406
zcmeH`J&#gB6o#Mcdf62fk=5&>a$VQ2tDr8dvVLy at KZ1gW4ht&6KOlqvJ&84;0ct8b
zLT5stAc2AcC`f4dNFYGM^)3Qon{DjOzLPUK&zUos%sUwnv|%)&&3pV5K>`#lv=WC}
zoYybY$?souyIp)fAHiUd;c&=cFu-cH5{X2Z&*v-_3!>2|Hk*xHF2`&(V=|dAolXgd
z!?@jUMxzm}R*O_BMKYPB)9GNh+i5nN`2BuFQN&;{P%f9z>2zc=8H&Xsi9~{YK2N1m
zp-?Cg2n1-i+l<F!yk0M6vl)xULa9`u-|rKP#R!E$I2;bD)hZ^FiCV3OAP6)X4YJuR
zilWf#^>DddNRoss%cRq3JRT46c$|8 at j??M9%$BRQD+m5-2UJx(|1%e*6}Kb^8hrb%
z*Z(*;+t<=1?>J9SKYjl4b<M~2W5>w{_2Zgt^4oXsjT)``Un#HOSeN*Bzy3KdUT(2!
zk)IqsJ$kn8S05Zm=7*0SZ`gR(w14luv|;_tTenrioeitH-Mt$ct<F=g?QmV(;$^zx
Li?<d2^@0BY<gf51

-- 
1.7.5.4


From nengard at bywatersolutions.com  Thu Apr 12 10:16:12 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 12 Apr 2012 04:16:12 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Patron Help Files
Message-ID: <1334218572-3621-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/members/boraccount.tt     |    2 +-
 .../prog/en/modules/help/members/mancredit.tt      |    2 +-
 .../prog/en/modules/help/members/maninvoice.tt     |    3 +-
 .../prog/en/modules/help/members/member-flags.tt   |   39 +++++++++-----
 .../en/modules/help/members/member-password.tt     |    8 ++--
 .../prog/en/modules/help/members/member.tt         |   34 +++++++++++-
 .../prog/en/modules/help/members/memberentry.tt    |   25 ++++++---
 .../prog/en/modules/help/members/members-home.tt   |   34 +++++++++++-
 .../prog/en/modules/help/members/moremember.tt     |   19 +++++--
 .../prog/en/modules/help/members/notices.tt        |    2 +-
 .../prog/en/modules/help/members/pay.tt            |   55 +++++++++++--------
 .../prog/en/modules/help/members/paycollect.tt     |   55 +++++++++++--------
 .../prog/en/modules/help/members/readingrec.tt     |    6 ++-
 13 files changed, 193 insertions(+), 91 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
index 8d26aea..15e1e74 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
@@ -19,6 +19,6 @@
 
 <p>To the right of each account line there is a print link. Clicking that link will print an invoice for the line item that includes the date and description of the line item along with the total outstanding on the account.</p>
 
-<p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/3.8/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
index 4238795..073d52f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
@@ -11,6 +11,6 @@
 	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
 </ul>
 
-<p><strong>See the full documentation for Creating Manual Credits in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html#manualcredit">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Creating Manual Credits in the <a href="http://manual.koha-community.org/3.8/en/patroninformation.html#manualcredit">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
index 0b6378f..3054fbb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
@@ -3,7 +3,6 @@
 <h1>Create Manual Invoice</h1>
 
 <p>For fees that are not automatically charged, librarians can create a manual invoice</p>
-
 <ul>
 	<li>First choose the type of invoice you would like to create
 <ul>
@@ -15,6 +14,6 @@
 	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
 </ul>
 
-<p><strong>See the full documentation for Creating Manual Invoices in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html#manualinvoice">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Creating Manual Invoices in the <a href="http://manual.koha-community.org/3.8/en/patroninformation.html#manualinvoice">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
index 9559314..a48beac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
@@ -6,7 +6,7 @@
 
 <p style="color: #990000">Important: In order for a staff member to log into the staff interface they must have (at the very least) 'catalogue' permissions which allow them to view the staff interface.</p>
 
-<h2>6.1. Setting Patron Permissions</h2>
+<h2>Setting Patron Permissions</h2>
 
 <p>To set patron permissions, you must first have a patron of the 'Staff' type open</p>
 
@@ -15,12 +15,16 @@
 	<li>You will be presented with a list of preferences, some of which can be expanded by clicking the plus sign to the left of the section title.</li>
 </ul>
 
-<h2>Patron Permissions Defined</h2>
+<h3>Patron Permissions Defined</h3>
 
 <ul>
 	<li>superlibrarian
 <ul>
-	<li>Access to all functions within the staff client</li>
+	<li>Access to all functions within the staff client
+<ul>
+	<li style="background-color: #ffe599;">Tip:  With this selected there is no need to choose any other permissions</li>
+</ul>
+</li>
 </ul>
 </li>
 	<li>circulate
@@ -110,28 +114,30 @@
 	<li>staffaccess
 <ul>
 	<li>Provides the ability to modify login / permissions for staff users</li>
+	<li style="color: #990000">Important: Requires the borrowers permission above</li>
 </ul>
 </li>
 </ul>
 
-<h3>Granular Circulate Permissions</h3>
+<h4>Granular Circulate Permissions</h4>
 
 <p>If the staff member has 'circulate' permissions they have the ability to perform all of these actions. If you would like to control circulation permissions on a more granular level choose from these options:</p>
 
 <ul>
 	<li>circulate_remaining_permissions
 <ul>
-	<li>All circulation rights except override permissions</li>
+	<li>All circulation rights except the ability to override renewals</li>
 </ul>
 </li>
 	<li>override_renewals
 <ul>
 	<li>Override blocked renewals</li>
+	<li>Requires that the staff member also has circulate_remaining_permissions</li>
 </ul>
 </li>
 </ul>
 
-<h3>Granular Holds Permissions</h3>
+<h4>Granular Holds Permissions</h4>
 
 <p>If the staff member has 'reserveforothers' permissions they have the ability to perform all of these actions. If you would like to control holds permissions on a more granular level choose from these options:</p>
 
@@ -143,12 +149,12 @@
 </li>
 	<li>place_holds
 <ul>
-	<li>All staff members to place holds for patrons via the staff interface</li>
+	<li>Allows staff members to place holds for patrons via the staff interface</li>
 </ul>
 </li>
 </ul>
 
-<h3>Granular Cataloging Permissions</h3>
+<h4>Granular Cataloging Permissions</h4>
 
 <p>If the staff member has 'editcatalogue' permissions they have the ability to perform all of these actions. If you would like to control cataloging permissions on a more granular level choose from these options:</p>
 
@@ -170,14 +176,14 @@
 </li>
 </ul>
 
-<h3>Granular Acquisitions Permissions</h3>
+<h4>Granular Acquisitions Permissions</h4>
 
 <p>If the staff member has 'acquisition' permissions they have the ability to perform all of these actions. If you would like to control acquisitions permissions on a more granular level choose from these options:</p>
 
 <ul>
 	<li>budget_add_del
 <ul>
-	<li>Ability to add and delete budgets (not modify()</li>
+	<li>Ability to add and delete budgets (not modify)</li>
 </ul>
 </li>
 	<li>budget_manage
@@ -227,7 +233,7 @@
 </li>
 </ul>
 
-<h3>Granular Serials Permissions</h3>
+<h4>Granular Serials Permissions</h4>
 
 <p>If the staff member has 'serials' permissions they have the ability to perform all of these actions. If you would like to control serials permissions on a more granular level choose from these options:</p>
 
@@ -274,7 +280,7 @@
 </li>
 </ul>
 
-<h3>Granular Tools Permissions</h3>
+<h4>Granular Tools Permissions</h4>
 
 <p>If the staff member has 'tools' permissions they have the ability to access and use all items under the Tools menu. If you would like to control which tools staff members have access to on a more granular level choose from these options:</p>
 
@@ -364,6 +370,11 @@
 	<li>Stage MARC records into the reservoir (Access to the Stage MARC Records Tool)</li>
 </ul>
 </li>
+	<li>upload_local_cover_images
+<ul>
+	<li>Upload local cover images (Access to the Upload Local Cover Image Tool)</li>
+</ul>
+</li>
 	<li>view_system_logs
 <ul>
 	<li>Browse the system logs (Access to the Log Viewer Tool)</li>
@@ -371,7 +382,7 @@
 </li>
 </ul>
 
-<h3>Granular Reports Permissions</h3>
+<h4>Granular Reports Permissions</h4>
 
 <p>If the staff member has 'reports' permissions they have the ability to perform all of these actions. If you would like to control reports permissions on a more granular level choose from these options:</p>
 
@@ -388,6 +399,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Permissions in the <a href="http://manual.koha-community.org/3.6/en/patronpermissions.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Permissions in the <a href="http://manual.koha-community.org/3.8/en/patronpermissions.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
index 3aa783c..94522f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
@@ -5,9 +5,9 @@
 <p>To only change the patron's password, click the 'Change Password' button</p>
 
 <ul>
-    <li>Patron passwords are encrypted and cannot be recovered by the library staff</li>
-    <li>This form will automatically generate a random password, this password is not the patron's current password, just a new random password</li>
-</ul>
+    <li>Koha cannot display existing passwords. Leave the field blank to leave password unchanged.</li>
+    <li>This form can automatically generate a random password if you click the link labeled "Click to fill with a randomly generated suggestion. Passwords will be displayed as text."</li>
+</ul>    
 
 <p>The default minimum password length is 3 characters long.  To change this value, update your system preferences.</p>
 
@@ -15,7 +15,7 @@
 	<li><em>Get there:</em> More &gt; Administration &gt; Global System Preferences &gt; Patrons &gt; minPasswordLength</li>
 </ul>
 
-<p><strong>See the full documentation for Editing Patrons in the <a href="http://manual.koha-community.org/3.6/en/editpatrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Editing Patrons in the <a href="http://manual.koha-community.org/3.8/en/editpatrons.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
index 4a6e75f..fff6828 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
@@ -2,12 +2,40 @@
 
 <h1>Patron Search</h1>
 
-<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron by entering any part of their name or barcode in the search box at the top.</p>
+<p>From here you can search for a patron by using the search boxes at the top of the page.</p>
 
-<p>If you want to search for more than just a part of a patron name or number, you can click the plus sign [+] to the right of the search box.</p>
+<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron.</p>
+
+<p>Depending on what you have chosen for the 'Search fields' you can search for patrons in various different ways.</p>
+
+<ul>
+	<li>Standard:
+<ul>
+	<li>Enter any part of their name, username, email address or barcode</li>
+</ul>
+</li>
+	<li>Email:
+<ul>
+	<li>Enter any part of their email address.</li>
+</ul>
+</li>
+	<li>Borrower number:
+<ul>
+	<li>Enter the Koha borrower number</li>
+</ul>
+</li>
+	<li>Phone number:
+<ul>
+	<li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
+	<li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
+</ul>
+</li>
+</ul>
+
+<p>If you want to filter your results to a specific branch or category, you can click the plus sign [+] to the right of the search box.</p>
 
 <p>You can also browse through the patron records by clicking on the linked letters across the top.</p>
 
-<p><strong>See the full documentation for Patron Search in the <a href="http://manual.koha-community.org/3.6/en/patronsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Search in the <a href="http://manual.koha-community.org/3.8/en/patronsearch.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
index fb91651..a7ccd1b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
@@ -16,17 +16,24 @@
 </ul>
 </li>
 </ul>
+
 <h2>Add a new Patron</h2>
+
+<p>Patrons are added by going to the 'Patrons' module.</p>
+
 <ul>
 	<li>Click 'New'</li>
-	<li>Enter the identifying information regarding your patron
+	<li>First enter the identifying information regarding your patron
 <ul>
 	<li>Required fields are defined in the BorrowerMandatoryField system preference</li>
-	<li>Unwanted fields are defined in the BorrowerUnwantedField system preference</li>
 	<li>Salutation is populated by the BorrowersTitles system preference</li>
 </ul>
 </li>
-	<li>Next enter the contact information</li>
+	<li>Next enter the contact information
+<ul>
+	<li>For contact information, note that the primary phone and email addresses are the ones that appear on notices and slips printed during circulation (receipts, transfer slips and hold slips). The primary email is also the one that overdue notices and other messages go to.</li>
+</ul>
+</li>
 	<li>If this patron is a child, you will be asked to attach the child patron to an adult patron
 <ul>
 	<li>Click 'Set to Patron' to search your system for an existing patron</li>
@@ -47,6 +54,7 @@
 	<li>The library management section includes values that are used within the library
 <ul>
 	<li>The card number field is automatically calculated if you have the autoMemberNum system preference set that way</li>
+	<li><strong>Note:</strong> For a newly installed system this preference will start at 1 and increment by 1 each time after. To have it start with the starting number of your barcodes, enter the first barcode by hand in the patron record and save the patron. After that the field will increment that number by 1.</li>
 	<li>If you accidentally chose the wrong patron category at the beginning you can fix that here</li>
 	<li>Sort 1 and 2 are used for statistical purposes within your library</li>
 </ul>
@@ -57,26 +65,27 @@
 	<li>If your patron cards expire (based on your patron category settings) the Expiry date will automatically be calculated</li>
 	<li>The OPAC Note is a note for the patron - it will appear in the OPAC on the patron's record</li>
 	<li>The Circulation Note is meant solely for your library staff and will appear when the circulation staff goes to check an item out to the patron</li>
-	<li>The OPAC Login and Password are used by the patron to log into their account in the OPAC. They are also used for staff accounts to provide them access to the staff client.</li>
+	<li>The Staff/OPAC asks for the username and password to be used by the patron (and/or staff member) to log into their account in the OPAC and for staff to log in to the staff client.</li>
 </ul>
 </li>
 	<li>If you have set additional patron attributes up, these will appear next</li>
 	<li>Finally, if you have EnhancedMessagingPreferences set to 'allow,' you can choose the messaging preferences for this patron.
 <ul>
-	<li>These preferences will override any you set via the patron categories</li>
-	<li>These preference can be altered by the patron via the OPAC</li>
+	<li style="color: #990000">Important: These preferences will override any you set via the patron categories</li>
+	<li style="color: #990000">Important: These preference can be altered by the patron via the OPAC</li>
 </ul>
 </li>
 	<li>Once finished, click 'Save'</li>
-	<li>At this point if the system suspects this patron is a duplicate of another it will warn you.</li>
 </ul>
 
+<p>If the system suspects this patron is a duplicate of another it will warn you.</p>
+
 <h2>Add a Staff Patron</h2>
 
 <p>All staff members must be entered into Koha as patrons of the 'Staff' type. Follow the steps in Add a Patron to add a staff member. To give the staff member permissions to access the staff client, follow the steps in Patron Permissions</p>
 
 <p style="color: #990000">Remember to assign your staff secure usernames and passwords since these will be used to log into the staff client.</p>
 
-<p><strong>See the full documentation for Adding Patrons in the <a href="http://manual.koha-community.org/3.6/en/patrons.html#addnewpatron">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Adding Patrons in the <a href="http://manual.koha-community.org/3.8/en/patrons.html#addnewpatron">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
index 765a813..34db9f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
@@ -4,12 +4,40 @@
 
 <p>The Patrons module stores the information you add about your patrons.</p>
 
-<p>From here you can search for a patron by entering any part of their name, username, email address or barcode in the search box at the top.</p>
+<p>From here you can search for a patron by using the search boxes at the top of the page.</p>
 
-<p>If you want to search for more than just a part of a patron name, username, email address or barcode, you can click the plus sign [+] to the right of the search box.</p>
+<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron.</p>
+
+<p>Depending on what you have chosen for the 'Search fields' you can search for patrons in various different ways.</p>
+
+<ul>
+	<li>Standard:
+<ul>
+	<li>Enter any part of their name, username, email address or barcode</li>
+</ul>
+</li>
+	<li>Email:
+<ul>
+	<li>Enter any part of their email address.</li>
+</ul>
+</li>
+	<li>Borrower number:
+<ul>
+	<li>Enter the Koha borrower number</li>
+</ul>
+</li>
+	<li>Phone number:
+<ul>
+	<li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
+	<li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
+</ul>
+</li>
+</ul>
+
+<p>If you want to filter your results to a specific branch or category, you can click the plus sign [+] to the right of the search box.</p>
 
 <p>You can also browse through the patron records by clicking on the linked letters across the top.</p>
 
-<p><strong>See the full documentation for the Patrons module in the <a href="http://manual.koha-community.org/3.6/en/patrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patrons module in the <a href="http://manual.koha-community.org/3.8/en/patrons.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
index d674919..1dc88df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
@@ -47,32 +47,39 @@
 <h2>Editing Patrons</h2>
 
 <p>Patrons in Koha can be edited using one of many edit buttons.</p>
+
 <ul>
 	<li>To edit the entire patron record simply click the 'Edit' button at the top of the patron record.</li>
 	<li>To only change the patron's password, click the 'Change Password' button
 <ul>
-	<li>Patron passwords are encrypted and cannot be recovered by the library staff</li>
-	<li>This form will automatically generate a random password, this password is not the patron's current password, just a new random password</li>
+	<li>Koha cannot display existing passwords. Leave the field blank to leave password unchanged.</li>
+	<li>This form can automatically generate a random password if you click the link labeled "Click to fill with a randomly generated suggestion. Passwords will be displayed as text."</li>
 </ul>
 </li>
 	<li>To edit a specific section of the patron record (for example the Library Use section) click the 'Edit' link below the section</li>
 	<li>A patron image can be added by browsing for the image on your machine from the 'Manage Patron Image' section
 <ul>
-	<li>This form will not appear if you have the patronimages system preference to allow patron images</li>
+	<li>This form will not appear if you have the patronimages system preference to not allow patron images</li>
 	<li>To add patron images in bulk, use the Upload Patron Images Tool</li>
 </ul>
 </li>
 	<li>Patrons can also be blocked from checking items out by setting Patron Flags
 <ul>
 	<li>If you would like your circulation staff to confirm a patron's address before checking items out to the patron, you can see the 'Gone no Address' flag</li>
-	<li>If you would like to prevent a patron from checking items out or performing circulation actions at the library you can set the 'Restricted' flag
+	<li>If you would like to bar a patron from the library you can set the 'Restricted' flag
 <ul>
-	<li>This flag can automatically be set with the Overdue/Notice Status Triggers</li>
+	<li>This flag can automatically be set with the Overdue/Notice StatusTriggers</li>
 </ul>
 </li>
+	<li>If you enter in a date and/or note related to the restriction you will see that in the restricted message as well</li>
 	<li>If the patron reports that they have lost their card you can set the 'Lost Card' flag to prevent someone else from using that card to check items out</li>
 </ul>
 </li>
+	<li>Children patrons do not become adults automatically in Koha. To upgrade a child patron to and adult patron category click on the 'More' menu and choose 'Update Child to Adult Patron'
+<ul>
+	<li>You will then be presented with a pop up window asking which one of your adult patron categories this Child should be updated to</li>
+</ul>
+</li>
 </ul>
 
 <h2>Duplicate a Patron</h2>
@@ -90,6 +97,6 @@
 	<li>You will be brought to your new patron</li>
 </ul>
 
-<p><strong>See the full documentation for the Patron Details in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Details in the <a href="http://manual.koha-community.org/3.8/en/patroninformation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
index df521c4..2e5bf37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
@@ -6,6 +6,6 @@
 
 <p>Clicking on the message title will expand the view to show you the full text of the message that was sent.</p>
 
-<p><strong>See the full documentation for Patron Notices in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html#patnotices">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Notices in the <a href="http://manual.koha-community.org/3.8/en/patroninformation.html#patnotices">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
index beb76e5..67b8a3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
@@ -2,52 +2,61 @@
 
 <h1>Pay and Writeoff Fines</h1>
 
-<p>Each line item can be paid in full, partially paid, or written off.</p>
+<p>Each line item can be paid in full (or written off) using the 'Pay Fines' tab.</p>
 
-<h4>Pay a fine in full</h4>
+<ul>
+	<li>Each line item can be paid in full, partially paid, or written off.</li>
+	<li>Pay a fine in full
 <ul>
 	<li>Click "Pay" next to the fine you want to pay in full</li>
 	<li>The full amount of the fine will be populated for you in the "Collect From Patron" box</li>
-	<li>Click "Confirm" </li>
+	<li>Click "Confirm"</li>
 	<li>The fine will be removed from outstanding fines, and displayed as fully paid.</li>
 </ul>
-
-<h4>Pay a partial fine</h4>
+</li>
+	<li>Pay a partial fine
 <ul>
 	<li>Click "Pay" next to the fine you want to partially pay</li>
 	<li>Enter the amount you are collecting from the patron in the "Collect From Patron" box</li>
-	<li>Click "Confirm" </li>
+	<li>Click "Confirm"</li>
 	<li>The fine will be updated to show the original Amount, and the current Amount Outstanding</li>
 </ul>
-
-<h4>Writeoff a single fine</h4>
-<ul>
-	<li>Click "Writeoff" next to the fine you wish to writeoff.</li>
-	<li>The fine will be removed from outstanding fines, and displayed as fully paid.</li>
-</ul>
-
-<h4>Pay an amount towards all fines</h4>
+</li>
+	<li>Pay an amount towards all fines
 <ul>
 	<li>Click the "Pay Amount" button</li>
 	<li>Enter the amount you are collecting from the patron in "Collect from Patron." The sum of all fines is shown in "Total Amount Outstanding"</li>
 	<li>Click "Confirm"</li>
 	<li>The fine totals will be updated with the payment applied to oldest fines first.</li>
 </ul>
-
-<h4>Writeoff All fines</h4>
-<ul>
-        <li>Click the "Writeoff All" button</li>
-        <li>All fines will be removed from outstanding fines, and displayed as written off.</li>
-</ul> 
-
-<h4>Pay Selected fines</h4>
+</li>
+	<li>Pay Selected fines
 <ul>
 	<li>Check the selection boxes next to the fines you wish to pay, click "Pay Selected"</li>
 	<li>Enter an amount to pay towards the fines.</li>
 	<li>Click "Confirm"</li>
 	<li>The fine totals will be updated with the payment applied to the oldest selected fines first.</li>
 </ul>
+</li>
+	<li>Writeoff a single fine
+<ul>
+	<li>Click "Writeoff" next to the fine you wish to writeoff.</li>
+	<li>The fine will be removed from outstanding fines, and displayed as written off.</li>
+</ul>
+</li>
+	<li>Writeoff All fines
+<ul>
+	<li>Click the "Writeoff All" button</li>
+	<li>All fines will be removed from outstanding fines, and displayed as written off.</li>
+</ul>
+</li>
+	<li>If you accidentally mark and item as paid, you can reverse that line item by clicking 'Reverse' to the right of the line
+<ul>
+	<li>Once clicked a new line item will be added to the account, showing the payment as reversed</li>
+</ul>
+</li>
+</ul>
 
-<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.8/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
index beb76e5..67b8a3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
@@ -2,52 +2,61 @@
 
 <h1>Pay and Writeoff Fines</h1>
 
-<p>Each line item can be paid in full, partially paid, or written off.</p>
+<p>Each line item can be paid in full (or written off) using the 'Pay Fines' tab.</p>
 
-<h4>Pay a fine in full</h4>
+<ul>
+	<li>Each line item can be paid in full, partially paid, or written off.</li>
+	<li>Pay a fine in full
 <ul>
 	<li>Click "Pay" next to the fine you want to pay in full</li>
 	<li>The full amount of the fine will be populated for you in the "Collect From Patron" box</li>
-	<li>Click "Confirm" </li>
+	<li>Click "Confirm"</li>
 	<li>The fine will be removed from outstanding fines, and displayed as fully paid.</li>
 </ul>
-
-<h4>Pay a partial fine</h4>
+</li>
+	<li>Pay a partial fine
 <ul>
 	<li>Click "Pay" next to the fine you want to partially pay</li>
 	<li>Enter the amount you are collecting from the patron in the "Collect From Patron" box</li>
-	<li>Click "Confirm" </li>
+	<li>Click "Confirm"</li>
 	<li>The fine will be updated to show the original Amount, and the current Amount Outstanding</li>
 </ul>
-
-<h4>Writeoff a single fine</h4>
-<ul>
-	<li>Click "Writeoff" next to the fine you wish to writeoff.</li>
-	<li>The fine will be removed from outstanding fines, and displayed as fully paid.</li>
-</ul>
-
-<h4>Pay an amount towards all fines</h4>
+</li>
+	<li>Pay an amount towards all fines
 <ul>
 	<li>Click the "Pay Amount" button</li>
 	<li>Enter the amount you are collecting from the patron in "Collect from Patron." The sum of all fines is shown in "Total Amount Outstanding"</li>
 	<li>Click "Confirm"</li>
 	<li>The fine totals will be updated with the payment applied to oldest fines first.</li>
 </ul>
-
-<h4>Writeoff All fines</h4>
-<ul>
-        <li>Click the "Writeoff All" button</li>
-        <li>All fines will be removed from outstanding fines, and displayed as written off.</li>
-</ul> 
-
-<h4>Pay Selected fines</h4>
+</li>
+	<li>Pay Selected fines
 <ul>
 	<li>Check the selection boxes next to the fines you wish to pay, click "Pay Selected"</li>
 	<li>Enter an amount to pay towards the fines.</li>
 	<li>Click "Confirm"</li>
 	<li>The fine totals will be updated with the payment applied to the oldest selected fines first.</li>
 </ul>
+</li>
+	<li>Writeoff a single fine
+<ul>
+	<li>Click "Writeoff" next to the fine you wish to writeoff.</li>
+	<li>The fine will be removed from outstanding fines, and displayed as written off.</li>
+</ul>
+</li>
+	<li>Writeoff All fines
+<ul>
+	<li>Click the "Writeoff All" button</li>
+	<li>All fines will be removed from outstanding fines, and displayed as written off.</li>
+</ul>
+</li>
+	<li>If you accidentally mark and item as paid, you can reverse that line item by clicking 'Reverse' to the right of the line
+<ul>
+	<li>Once clicked a new line item will be added to the account, showing the payment as reversed</li>
+</ul>
+</li>
+</ul>
 
-<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.8/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
index 1b3a114..6f44ad1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
@@ -4,8 +4,10 @@
 
 <p>The circulation history tab will appear if you have set the intranetreadinghistory preference to allow it to appear. If you have the OPACPrivacy system preference set to 'Allow' and the patron has decided that the library cannot keep this information this tab will only show currently checked out items.</p>
 
-<p>You can export today's checked in barcodes by clicking on the link above the table. It simply generates a list of barcodes.</p>
+<p>If you would like to export a list of barcodes for the items checked in today you can find that option under the More menu on the top right of the page.</p>
 
-<p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.6/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
+<p>This will generate a text file with one barcode per line.</p>
+
+<p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.8/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From wizzyrea at gmail.com  Fri Apr 13 00:08:58 2012
From: wizzyrea at gmail.com (Liz Rea)
Date: Thu, 12 Apr 2012 17:08:58 -0500
Subject: [Koha-patches] [PATCH] Bug 7953 - add opacuserjs to the sco template
Message-ID: <1334268538-21611-1-git-send-email-wizzyrea@gmail.com>

To test:
add some jquery to opacuserjs that would change the screen
a la: $(".checkout label[for='patronid']").css("border","3px solid red");
verify you see a red box on the sco-main page.

Also adds the ability to use opacusercss to style sco-main.tt

to test:
Add some css to opacusercss that would change the screen:
.checkout { background: grey; }
verify you see a grey box around the checkout div.
---
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
index 646366b..c06bde7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
@@ -60,7 +60,13 @@ $(document).ready(function() {
 });
 //]]>
 </script>
+<script type="text/javascript">
+[% IF ( opacuserjs ) %][% opacuserjs %][% END %]
+</script>
+
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
+[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
+
 </head>
 <body onload="dofocus();">
 
-- 
1.7.2.5


From dpavlin at rot13.org  Fri Apr 13 00:21:55 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri, 13 Apr 2012 00:21:55 +0200
Subject: [Koha-patches] [PATCH] Bug 7952 - PDF::Reuse under plack writes to
	console STDOUT instead to browser
Message-ID: <1334269315-748-1-git-send-email-dpavlin@rot13.org>

Without name option to prFile, PDF::Reuse opens '-' file which is real
console STDOUT on plack so pdf file gets emited to terminal instead of
sending it to browser.

This change creates temporary file using File::Temp, pass it to PDF::Reuse
and then reads it back and prints it out for plack (or CGI) to pick up.

Test secenario:

1. Home ? Tools ? Patron Card Creator ? Manage Card Batches
2. select batch checkbox and click Export
3. select template and click Export
4. click on pdf file to download it
---
 C4/Creators/PDF.pm |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/C4/Creators/PDF.pm b/C4/Creators/PDF.pm
index 0aae09c..b3dd1dd 100644
--- a/C4/Creators/PDF.pm
+++ b/C4/Creators/PDF.pm
@@ -21,6 +21,7 @@ use strict;
 use warnings;
 use PDF::Reuse;
 use PDF::Reuse::Barcode;
+use File::Temp;
 
 BEGIN {
     use version; our $VERSION = qv('1.0.0_1');
@@ -42,7 +43,13 @@ sub new {
     delete($opts{InitVars});
     prDocDir($opts{'DocDir'}) if $opts{'DocDir'};
     delete($opts{'DocDir'});
-    prFile(%opts);
+
+    my $fh = File::Temp->new( UNLINK => 0, SUFFIX => '.pdf' );
+    $opts{Name} = $self->{filename} = "$fh"; # filename
+    close $fh; # we need just filename
+    warn "## Name [$opts{Name}] $fh";
+
+    prFile(\%opts);
     bless ($self, $type);
     return $self;
 }
@@ -52,6 +59,13 @@ sub End {
     # if the pdf stream is utf8, explicitly set it to utf8; this avoids at lease some wide character errors -chris_n
     utf8::encode($PDF::Reuse::stream) if utf8::is_utf8($PDF::Reuse::stream);
     prEnd();
+
+    # slurp temporary filename and print it out for plack to pick up
+    local $/ = undef;
+    open(my $fh, '<', $self->{filename}) || die "$self->{filename}: $!";
+    print <$fh>;
+    close $fh;
+    unlink $self->{filename};
 }
 
 sub Add {
-- 
1.7.2.5


From marc at msys.ch  Fri Apr 13 12:35:25 2012
From: marc at msys.ch (Marc Balmer)
Date: Fri, 13 Apr 2012 12:35:25 +0200
Subject: [Koha-patches] [PATCH] Bug 7886 - C4/ShelfBrowser slow SQL
	performance
In-Reply-To: <CA+95qVQg3ZBsOQYKX2Y6kUshsFfyXPE-CHj2wVHmXveiaYkkFg@mail.gmail.com>
References: <1333732221-5798-1-git-send-email-dpavlin@rot13.org>
	<4F7F4C4A.1010203@msys.ch> <20120406205504.GD2993@rot13.org>
	<CA+95qVTy3XM3gcvyGHJZ7iO75mepP3AjN2nqjMp+1pGShzPcjA@mail.gmail.com>
	<F40F2727-595D-4984-A984-075AEDB4FEEA@msys.ch>
	<CA+95qVQg3ZBsOQYKX2Y6kUshsFfyXPE-CHj2wVHmXveiaYkkFg@mail.gmail.com>
Message-ID: <4F88016D.5020205@msys.ch>

Am 08.04.2012 09:36, schrieb Chris Cormack:
> On 8 April 2012 07:19, Marc Balmer<marc at msys.ch>  wrote:
>>
>
>>
>>
>> bla bla

I whish I had not used these sloppy words here.  It was not my intent to 
insult you in any way, althouth I realize that I did.  It was late, I 
was tired, I read your email whith which I did not agree and completely 
chose the wrong words and did not even explain why I disagreed or offer 
a better solution.  So please accept my apologies for this.

>>
>> using return as a column name is wrong in the first place.
>>
>>
> Rudeness aside, you are correct. However, that does not take away from
> the fact that this is a mySQL specific file, and unless PostgreSQL has
> decided to switch to innodb, will not be able to be used as a schema
> for it. So removing backticks in this file, before changing the column
> names will 1/ Break the file for it's intended use (creating a MySQL
> db for use with Koha) and 2/ Still not be able to be used with
> PostgreSQL
>
> This will be my last exchange with you on this matter, as I find you
> most unpleasant to deal with.
>
> Chris


From dpavlin at rot13.org  Fri Apr 13 12:49:34 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri, 13 Apr 2012 12:49:34 +0200
Subject: [Koha-patches] [PATCH] Bug 7846 - get_batch_summary massive speedup
Message-ID: <1334314174-16646-1-git-send-email-dpavlin@rot13.org>

current code is using DISTINCT and another SQL query which can be replaced with GROUP BY
for massive speedup. In our case, generating Manage Batches screen DBI time decreased
from 24.762 s to 0.147 s

Aside from correct usage of relational database, this change also cleans up code nicely.

Test scenario:

1. open Manage Batches screen and take note of time needed to generate it
2. apply this patch
3. reload page and check page genration time
---
 C4/Creators/Lib.pm |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/C4/Creators/Lib.pm b/C4/Creators/Lib.pm
index 8fd25fd..c80da05 100644
--- a/C4/Creators/Lib.pm
+++ b/C4/Creators/Lib.pm
@@ -263,8 +263,9 @@ NOTE: Do not pass in the keyword 'WHERE.'
 sub get_batch_summary {
     my %params = @_;
     my @batches = ();
-    my $query = "SELECT DISTINCT batch_id FROM creator_batches WHERE creator=?";
-    $query .= ($params{'filter'} ? " AND $params{'filter'};" : ';');
+    my $query = "SELECT batch_id,count(batch_id) as _item_count FROM creator_batches WHERE creator=?";
+    $query .= ($params{'filter'} ? " AND $params{'filter'}" : '');
+    $query .= " GROUP BY batch_id";
     my $sth = C4::Context->dbh->prepare($query);
 #    $sth->{'TraceLevel'} = 3;
     $sth->execute($params{'creator'});
@@ -272,17 +273,7 @@ sub get_batch_summary {
         warn sprintf('Database returned the following error on attempted SELECT: %s', $sth->errstr);
         return -1;
     }
-    ADD_BATCHES:
     while (my $batch = $sth->fetchrow_hashref) {
-        my $query = "SELECT count(batch_id) FROM creator_batches WHERE batch_id=? AND creator=?;";
-        my $sth1 = C4::Context->dbh->prepare($query);
-        $sth1->execute($batch->{'batch_id'}, $params{'creator'});
-        if ($sth1->err) {
-            warn sprintf('Database returned the following error on attempted SELECT count: %s', $sth1->errstr);
-            return -1;
-        }
-        my $count = $sth1->fetchrow_arrayref;
-        $batch->{'_item_count'} = @$count[0];
         push(@batches, $batch);
     }
     return \@batches;
@@ -521,7 +512,11 @@ be passed off as a T::P template parameter and used to build an html table.
 
 =cut
 
+use Carp;
+use Data::Dump qw(dump);
+
 sub html_table {
+Carp::cluck("# html_table ",dump(@_));
     my $headers = shift;
     my $data = shift;
     return undef if scalar(@$data) == 0;      # no need to generate a table if there is not data to display
-- 
1.7.2.5


From dpavlin at rot13.org  Fri Apr 13 12:54:10 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri, 13 Apr 2012 12:54:10 +0200
Subject: [Koha-patches] [PATCH] Bug 7846 - get_batch_summary massive speedup
Message-ID: <1334314450-17093-1-git-send-email-dpavlin@rot13.org>

current code is using DISTINCT and another SQL query which can be replaced with GROUP BY
for massive speedup. In our case, generating Manage Batches screen DBI time decreased
from 24.762 s to 0.147 s

Aside from correct usage of relational database, this change also cleans up code nicely.

This change removed semi-columns from SQL query which broke Manage Patron batches.

Test scenario:

1. open Manage Batches screen and take note of time needed to generate it
2. apply this patch
3. reload page and check page genration time
---
 C4/Creators/Lib.pm |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/C4/Creators/Lib.pm b/C4/Creators/Lib.pm
index 8fd25fd..68a758b 100644
--- a/C4/Creators/Lib.pm
+++ b/C4/Creators/Lib.pm
@@ -263,8 +263,9 @@ NOTE: Do not pass in the keyword 'WHERE.'
 sub get_batch_summary {
     my %params = @_;
     my @batches = ();
-    my $query = "SELECT DISTINCT batch_id FROM creator_batches WHERE creator=?";
-    $query .= ($params{'filter'} ? " AND $params{'filter'};" : ';');
+    my $query = "SELECT batch_id,count(batch_id) as _item_count FROM creator_batches WHERE creator=?";
+    $query .= ($params{'filter'} ? " AND $params{'filter'}" : '');
+    $query .= " GROUP BY batch_id";
     my $sth = C4::Context->dbh->prepare($query);
 #    $sth->{'TraceLevel'} = 3;
     $sth->execute($params{'creator'});
@@ -272,17 +273,7 @@ sub get_batch_summary {
         warn sprintf('Database returned the following error on attempted SELECT: %s', $sth->errstr);
         return -1;
     }
-    ADD_BATCHES:
     while (my $batch = $sth->fetchrow_hashref) {
-        my $query = "SELECT count(batch_id) FROM creator_batches WHERE batch_id=? AND creator=?;";
-        my $sth1 = C4::Context->dbh->prepare($query);
-        $sth1->execute($batch->{'batch_id'}, $params{'creator'});
-        if ($sth1->err) {
-            warn sprintf('Database returned the following error on attempted SELECT count: %s', $sth1->errstr);
-            return -1;
-        }
-        my $count = $sth1->fetchrow_arrayref;
-        $batch->{'_item_count'} = @$count[0];
         push(@batches, $batch);
     }
     return \@batches;
-- 
1.7.2.5


From dpavlin at rot13.org  Fri Apr 13 12:55:29 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri, 13 Apr 2012 12:55:29 +0200
Subject: [Koha-patches] [PATCH] Bug 7846 - get_batch_summary massive
	speedup
In-Reply-To: <1334314174-16646-1-git-send-email-dpavlin@rot13.org>
References: <1334314174-16646-1-git-send-email-dpavlin@rot13.org>
Message-ID: <20120413105529.GB3220@rot13.org>

On Fri, Apr 13, 2012 at 12:49:34PM +0200, Dobrica Pavlinusic wrote:
> +use Carp;
> +use Data::Dump qw(dump);
> +
>  sub html_table {
> +Carp::cluck("# html_table ",dump(@_));
>      my $headers = shift;
>      my $data = shift;
>      return undef if scalar(@$data) == 0;      # no need to generate a table if there is not data to display

Ignore man who handn't had enough copy not to commit debug code :-)

Fixed patch in next e-mail...

-- 
Dobrica Pavlinusic               2share!2flame            dpavlin at rot13.org
Unix addict. Internet consultant.             http://www.rot13.org/~dpavlin

From nengard at bywatersolutions.com  Thu Apr 12 16:04:17 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 12 Apr 2012 10:04:17 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Reports Help Files for 3.8
Message-ID: <1334239457-4891-1-git-send-email-nengard@bywatersolutions.com>

This updates the existing help files and adds a new
help file for the holds stats report.
---
 .../en/modules/help/reports/acquisitions_stats.tt  |    2 +-
 .../prog/en/modules/help/reports/bor_issues_top.tt |    2 +-
 .../prog/en/modules/help/reports/borrowers_out.tt  |    2 +-
 .../en/modules/help/reports/borrowers_stats.tt     |    2 +-
 .../prog/en/modules/help/reports/cat_issues_top.tt |    2 +-
 .../prog/en/modules/help/reports/catalogue_out.tt  |    2 +-
 .../en/modules/help/reports/catalogue_stats.tt     |    2 +-
 .../prog/en/modules/help/reports/dictionary.tt     |    2 +-
 .../prog/en/modules/help/reports/guided_reports.tt |   53 ++++++++++++++------
 .../en/modules/help/reports/issues_avg_stats.tt    |    2 +-
 .../prog/en/modules/help/reports/issues_stats.tt   |    2 +-
 .../prog/en/modules/help/reports/itemslost.tt      |    2 +-
 .../prog/en/modules/help/reports/manager.tt        |    2 +-
 .../prog/en/modules/help/reports/reports-home.tt   |    4 +-
 .../prog/en/modules/help/reports/reserves_stats.tt |   15 ++++++
 .../prog/en/modules/help/reports/serials_stats.tt  |    2 +-
 16 files changed, 69 insertions(+), 29 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reserves_stats.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tt
index 63a2f53..59d31ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tt
@@ -12,6 +12,6 @@
 
 <p>Choosing amount will change your results to appear as the sum of the amounts spent.</p>
 
-<p><strong>See the full documentation for Acquisitions Statistics in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#acqstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions Statistics in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#acqstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/bor_issues_top.tt
index 384844c..2811f37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/bor_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/bor_issues_top.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Patrons with the most Checkouts report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#mostcheckouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patrons with the most Checkouts report in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#mostcheckouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_out.tt
index 13d88ee..22c8a8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_out.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Patrons with no Checkouts report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#patnocheckouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patrons with no Checkouts report in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#patnocheckouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_stats.tt
index eeeeca3..f26347f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_stats.tt
@@ -8,7 +8,7 @@
 
 <p>Based on your selections, you may see some query information above your results table. You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#patstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#patstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/cat_issues_top.tt
index 90e956e..8dd03cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/cat_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/cat_issues_top.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Most Circulation Items report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#mostcirculated">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Most Circulation Items report in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#mostcirculated">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_out.tt
index 3cbd511..9efdf8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_out.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Items with no Checkouts report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#itemnocheckouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Items with no Checkouts report in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#itemnocheckouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_stats.tt
index 946b23c..fc346e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_stats.tt
@@ -8,7 +8,7 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for Catalog Statistics in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#catstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Catalog Statistics in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#catstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/dictionary.tt
index 137883c..1880846 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/dictionary.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/dictionary.tt
@@ -18,6 +18,6 @@
 
 <p>Then when generating reports on the module you created the value for you will see an option to limit by the definition at the bottom of the usual filters.</p>
 
-<p><strong>See the full documentation for the Reports Dictionary in the <a href="http://manual.koha-community.org/3.6/en/reportdic.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Reports Dictionary in the <a href="http://manual.koha-community.org/3.8/en/reportdic.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt
index 2eaba5a..7858baa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt
@@ -2,6 +2,8 @@
 
 <h1>Add a Custom Report</h1>
 
+<h2>Guided Report Wizard</h2>
+
 <p>If the report you need is not already available, the 'Guided Reports' Wizard will walk you through creating a custom report.</p>
 
 <ul>
@@ -47,32 +49,53 @@
 <li>A page with editable fields will open so that you can change the title, notes and SQL related to the report</li>
 </ul>
 
-<h1>Questions</h1>
-
-<p><strong>Is there a repository for reports?</strong></p>
+<h2>Report from SQL</h2>
 
-<p>There is a page on the Koha Wiki: <a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="_new">http://wiki.koha-community.org/wiki/SQL_Reports_Library</a> with reports written by Koha libraries around the world.</p>
+<p>In addition to the report wizard, you have the option to write your own queries using SQL. To find reports written by other Koha users, visit the Koha Wiki: <a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library">http://wiki.koha-community.org/wiki/SQL_Reports_Library</a>. You can also find your database structure in /installer/data/mysql/kohastructure.sql or online at: <a href="http://schema.koha-community.org">http://schema.koha-community.org</a>.</p>
 
-<p>NEKLS also has a great page (<a href="http://www.nexpresslibrary.org/training/reports-training/" target="_new">http://www.nexpresslibrary.org/training/reports-training/</a>) with a list of reports they have written.</p>
+<p>To add your query, click the link to 'Create from SQL' on the main reports module or the New button at the top of the Saved Reports page.</p>
 
-<p><strong>Can I have run-time defined parameters?</strong></p>
+<p>Fill in the form presented</p>
+<ul>
+    <li>The name is what will appear on the Saved Reports page to help you identify the report later. It will also be searchable using the filters found the left of the Saved Reports page.</li>
+    <li>Notes will also appear on the Saved Reports page, this can be used to provide more details about the report or tips on how to enter values when it runs</li>
+    <li>The type should always be 'Tabular' at this time since the other formats have not been implemented</li>
+    <li>In the SQL box you will type or paste the SQL for the report</li>
+	<li>If you feel that your report might be too resource intensive you might want to consider using runtime parameters to your query. Runtime parameters basically make a filter appear before the report is run to save your system resources.
+<ul>
+	<li><strong>Note:</strong> There is a limit of 10,000 records put on SQL statements entered in Koha. To get around this you want to add 'LIMIT 100000' to the end of your SQL statement (or any other number above 10,000.</li>
+	<li>There is a specific syntax that Koha will understand as 'ask for values when running the report'. The syntax is &lt;&lt;Question to ask|authorized_value&gt;&gt;.</li>
+	<li>The &lt;&lt; and &gt;&gt; are just delimiters. You must put &lt;&lt; at the beginning and &gt;&gt; at the end of your parameter</li>
+	<li>The 'Question to ask' will be displayed on the left of the string to enter.</li>
+	<li>The authorized_value can be omitted if not applicable. If it contains an authorized value category, or branches or itemtype or categorycode, a list with the Koha authorized values will be displayed instead of a free field Note that you can have more than one parameter in a given SQL Note that entering nothing at run time won't probably work as you expect. It will be considered as "value empty" not as "ignore this parameter". For example entering nothing for : "title=&lt;&lt;Enter title&gt;&gt;" will display results with title='' (no title). If you want to have to have something not mandatory, use "title like &lt;&lt;Enter title&gt;&gt;" and enter a % at run time instead of nothing</li>
+</ul>
 
-<p>Yes, you can: there is a specific syntax that Koha will understand as 'ask for values when running the report'. The syntax is &lt;&lt;Question to ask|authorised_value&gt;&gt;.</p>
+<p>Examples:</p>
 
 <ul>
-<li>The &lt;&lt; and &gt;&gt; are just delimiters. You must put &lt;&lt; at the beginning and &gt;&gt; at the end of your parameter</li>
-<li>The <strong>Question to ask</strong> will be displayed on the left of the string to enter. 
-<li>The <strong>authorised_value</strong> can be omitted if not applicable. If it contains an authorised value category, or <strong>branches</strong> or <strong>itemtype</strong> or <strong>categorycode</strong>, a list with the Koha authorised values will be displayed instead of a free field.  If the authorised value is <strong>date</strong>, a date selector button will be added after the input field</li>
+	<li>SELECT surname, firstname<br />
+	FROM borrowers<br />
+	WHERE branchcode=&lt;&lt;Enter patrons library|branches&gt;&gt; AND surname like &lt;&lt;Enter filter for patron surname (% if none)&gt;&gt;</li>
+	<li>SELECT *<br />
+	FROM items<br />
+	WHERE homebranch = &lt;&lt;Pick your branch|branches&gt;&gt; and barcode like &lt;&lt;Partial barcode value here (use % for wildcard)&gt;&gt;</li>
+</ul>
+</li>
+	<li style="background-color: #ffe599;">Tip: To generate a date picker calendar to the right of the field when running a report you can use the 'date' keyword like this: &lt;&lt;Enter Date|date&gt;&gt;</li>
+	<li style="background-color: #ffe599;">Tip: You have to put "%" in a text box to 'leave it blank'. Otherwise, it literally looks for "" (empty string) as the value for the field.</li>
+	<li style="color: #990000;">Important: In addition to using any authorized value code to generate a dropdown, you can use the following values as well: Branches (branches), Item Types (itemtypes) and Patron Categories (categorycode). For example a branch pull down would be generated like this &lt;&lt;Branch|branches&gt;&gt;</li>
 </ul>
 
-<p>Note that you can have more than one parameter in a given SQL</p>
+<p>Once everything is entered click the 'Save Report' button and you'll be presented with options to run it. Once a report is saved you do not have to recreate it you can simply find it on the Saved Reports page and run or edit it.</p>
 
-<p>Note that entering nothing at run time won't probably work as you expect. It will be considered as "value empty" not as "ignore this parameter". For example entering nothing for : "title=&lt;&lt;Enter title&gt;&gt;" will display results with title='' (no title). If you want to have to have something not mandatory, use "title like &lt;&lt;Enter title&gt;&gt;" and enter a % at run time instead of nothing</p>
+<h1>Questions</h1>
 
-<p>Sample :</p>
+<p><strong>Is there a repository for reports?</strong></p>
 
-<ul><li>SELECT surname,firstname FROM borrowers WHERE branchcode=&lt;&lt;Enter patrons library|branches&gt;&gt; AND surname like &lt;&lt;Enter filter for patron surname (% if none)&gt;&gt;</li></ul>
+<p>There is a page on the Koha Wiki: <a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="_new">http://wiki.koha-community.org/wiki/SQL_Reports_Library</a> with reports written by Koha libraries around the world.</p>
+
+<p>NEKLS also has a great page (<a href="http://www.nexpresslibrary.org/training/reports-training/" target="_new">http://www.nexpresslibrary.org/training/reports-training/</a>) with a list of reports they have written.</p>
 
-<p><strong>See the full documentation for Custom Reports in the <a href="http://manual.koha-community.org/3.6/en/reports.html#customreports">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Custom Reports in the <a href="http://manual.koha-community.org/3.8/en/reports.html#customreports">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_avg_stats.tt
index 5b83f72..09ec95f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_avg_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_avg_stats.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Average Loan Time report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#avloantime">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Average Loan Time report in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#avloantime">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt
index 9a36808..7080f07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt
@@ -19,6 +19,6 @@
 	<li>For a single day, an example would be: 11/15/2009 to 11/16/2009 to find what circulated on the 15th</li>
 </ul>
 
-<p><strong>See the full documentation for Circulation Statistics in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#circstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation Statistics in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#circstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
index 3bd1c3a..8ee9408 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
@@ -16,6 +16,6 @@
 		</ul>
 	</div>	
 
-<p><strong>See the full documentation for the Lost Items report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#lostreport">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Lost Items report in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#lostreport">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
index 21bc077..e4fecf1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Catalog by Item Type report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#catbyitem">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Catalog by Item Type report in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#catbyitem">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt
index a20a122..3b5fc33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt
@@ -8,6 +8,8 @@
 	<li>Custom Reports
 <ul>
 	<li>Koha's data is stored in a MySQL database which means that librarians can generate nearly any report they would like by either using the Guided Reports Wizard or writing their own SQL query.</li>
+	<li>The <a href="http://schema.koha-community.org/" target="blank">Koha database schema</a> will help you learn the Koha database structure so that you can write effective SQL Queries</li>
+    <li>The <a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha reports library</a> lists reports written by Koha users around the world.</li>
 </ul>
 </li>
 	<li>Statistical Reports
@@ -17,6 +19,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Reports in the <a href="http://manual.koha-community.org/3.6/en/reports.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Reports in the <a href="http://manual.koha-community.org/3.8/en/reports.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reserves_stats.tt
new file mode 100644
index 0000000..5383afd
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reserves_stats.tt
@@ -0,0 +1,15 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Holds Statistics</h1>
+
+<p><strong>Note:</strong> These reports are limited in what data they can look at, so it's often recommended to use custom reports for official end of the year statistics.</p>
+
+<p>Using the form provided you can see statistics for holds placed, filled, cancelled and more at your library. From the form choose what value you want to display in the column and what value to show in the row. You can also choose from the filters on the far right of the form.</p>
+
+<p>If you choose to output to the browser your results will print to the screen.</p>
+
+<p>You can also choose to export to a file that you can manipulate to your needs.</p>
+
+<p><strong>See the full documentation for Holds Statistics in the <a href="manual.koha-community.org/3.8/en/statsreports.html#holdstats">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/serials_stats.tt
index cba7247..2dd4c57 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/serials_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/serials_stats.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for Serials Statistics in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#serialstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serials Statistics in the <a href="http://manual.koha-community.org/3.8/en/statsreports.html#serialstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Apr 12 18:03:16 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 12 Apr 2012 12:03:16 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Acq Help Files for 3.8
Message-ID: <1334246596-5258-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/acqui/acqcontract.tt      |    8 ++--
 .../prog/en/modules/help/acqui/acqui-home.tt       |   10 +++--
 .../prog/en/modules/help/acqui/basket.tt           |   20 ++++++------
 .../prog/en/modules/help/acqui/basketgroup.tt      |    4 +-
 .../prog/en/modules/help/acqui/basketheader.tt     |    6 ++--
 .../prog/en/modules/help/acqui/booksellers.tt      |   17 +++++-----
 .../prog/en/modules/help/acqui/histsearch.tt       |   14 ++++----
 .../prog/en/modules/help/acqui/lateorders.tt       |   12 +++++--
 .../prog/en/modules/help/acqui/neworderbiblio.tt   |    4 +-
 .../prog/en/modules/help/acqui/neworderempty.tt    |    4 +-
 .../en/modules/help/acqui/newordersuggestion.tt    |    6 ++--
 .../prog/en/modules/help/acqui/orderreceive.tt     |    6 ++-
 .../prog/en/modules/help/acqui/parcel.tt           |    6 ++-
 .../prog/en/modules/help/acqui/parcels.tt          |    6 ++-
 .../prog/en/modules/help/acqui/supplier.tt         |   33 +++++++++++--------
 .../prog/en/modules/help/acqui/z3950_search.tt     |    4 +-
 16 files changed, 89 insertions(+), 71 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
index 4d0cd59..8440894 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
@@ -1,12 +1,12 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Vendor contracts</h1>
+<h1>Vendor Contracts</h1>
 
 <p>You can define contracts (with a start and end date) and attach it to a vendor. This is used so that at the end of the year you can see how much you spent on a specific contract with a vendor. In some places, contracts are set up with a minimum and maximum yearly amount.</p>
 
-<h2>Add a contract</h2>
+<h2>Add a Contract</h2>
 
-<p>At the top of a vendor search results page with only result or at the top of a vendor information page you will see a 'New contract' button.</p>
+<p>At the top of a vendor search results page with only result or at the top of a vendor information page you will see a 'New Contract' button.</p>
 
 <p>The contract form will ask for some very basic information about the contract.</p>
 
@@ -16,6 +16,6 @@
 
 <p>It will also be an option when creating a basket.</p>
 
-<p><strong>See the full documentation for vendor contracts in the <a href="http://manual.koha-community.org/3.6/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Vendor Contracts in the <a href="http://manual.koha-community.org/3.8/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
index 85ed10f..491f184 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
@@ -2,12 +2,14 @@
 
 <h1>Acquisitions</h1>
 
-<p>The Koha acquisitions module provides a way where the library can record orders placed with vendors and manage purchase budgets.</p>
+<p>The Koha Acquisitions module provides a way where the library can record orders placed with vendors and manage purchase budgets.</p>
 
-<p>You do not need to use acquisitions to add items to your catalog, acquisitions is used only to track vendors and spending against your budgets.</p>
+<p>You do not need to use Acquisitions to add items to your catalog, Acquisitions is used only to track vendors and spending against your budgets.</p>
 
-<p>Before using the acquisitions module you will want to make sure that you have completed all of the set up.</p>
+<p>Before using the Acquisitions Module you will want to make sure that you have completed all of the set up.</p>
 
-<p>First, set your acquisitions system preferences and acquisitions administration to match your library's workflow.</p>
+<p>First, set your Acquisitions System Preferences and Acquisitions Administration to match your library's workflow.</p>
+
+<p><strong>See the full documentation for Acquisitions in the <a href="http://manual.koha-community.org/3.8/en/acqmodule.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
index 4a6967c..9c8898a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h2>Placing an order</h2>
+<h2>Placing an Order</h2>
 
 <p>Once your basket is created you are presented with several options for adding items to the order.</p>
 
@@ -18,7 +18,7 @@
 <ul>
 	<li>
 <ul>
-    <li>From this form you can make changes to the catalog details if necessary</li>
+	<li>From this form you can make changes to the Catalog Details if necessary</li>
 </ul>
 </li>
 </ul>
@@ -30,10 +30,10 @@
 </li>
 	<li>If you want to search other libraries for an item to purchase you can use the 'From an external source' option which will allow you to order from a MARC record found via a Z39.50 search
 <ul>
-    <li>From the results click the 'Order' link next to the item you want to purchase</li>
-    <li>If the item you're ordering from an external source looks like it might be a duplicate, Koha will warn you and give you options on how to proceed
+	<li>From the results click the Order link next to the item you want to purchase</li>
+	<li>If the item you're ordering from an external source looks like it might be a duplicate, Koha will warn you and give you options on how to proceed
 <ul>
-    <li>From the warning you can choose to just order another copy on the existing bib record, create a new bib record, or cancel your order of this item.</li>
+	<li>From the warning you can choose to just order another copy on the existing bib record, create a new bib record, or cancel your order of this item.</li>
 </ul>
 </li>
 	<li>In the order form that pops up you will not be able to edit the catalog details</li>
@@ -65,7 +65,7 @@
 	<li>A basket with at least one uncertain price can't be closed</li>
 </ul>
 </li>
-    <li>If you added planning values when creating the fund those values will appear in the two planning value fields</li>
+	<li>If you added Planning Values when creating the Fund those values will appear in the two planning value fields</li>
 </ul>
 
 <p>Once an item is added to the basket you will be presented with a basket summary.</p>
@@ -78,13 +78,13 @@
 
 <p style="color: #ff0000">Important: A basket with at least one items marked as 'uncertain price' will not be able to be closed</p>
 
-<p>Clicking the 'Uncertain prices' button will up a list of items with uncertain prices to quick editing.</p>
+<p>Clicking the 'Uncertain Prices' button will up a list of items with uncertain prices to quick editing.</p>
 
 <p style="color: #ff0000">Important: The Uncertain Prices page is independent of the basket, it is linked to the vendor, so you will see all items on order for this vendor with uncertain prices.</p>
 
-<h2>Printing baskets</h2>
+<h2>Printing Baskets</h2>
 
-<p>When you are finished adding items to your basket you want to click 'Close this basket'</p>
+<p>When you are finished adding items to your basket you want to click 'Close this Basket'</p>
 
 <p>You will be asked if you want to create a purchase order at this time.</p>
 
@@ -92,6 +92,6 @@
 
 <p>Clicking 'Print' below your order will generate a PDF for printing. The PDF will have all of your library information followed by the items in your order.</p>
 
-<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
index 093552e..6da5426 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Basket groups</h1>
+<h1>Basket Groups</h1>
 
 <p>A basket group is a group of closed baskets that you can perform actions on.</p>
 
@@ -8,7 +8,7 @@
 
 <p>A basket group is simply a group of baskets. In some libraries, you have several staff members that create baskets, and, at the end of a period of time, someone then groups them together to send to the vendor in bulk. That said, it is possible to have one basket in a basket group if that's the workflow used in your library.</p>
 
-<p><strong>See the full documentation for basket groups in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#acqbasketgroup">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Basket Groups in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#acqbasketgroup">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
index 1fe4e87..4f8598e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h2>Adding a basket</h2>
+<h2>Adding a Basket</h2>
 
 <p>When adding a basket you want to give it a name that will help you identify it later. The notes fields are optional and can contain any type of information.</p>
 
@@ -8,11 +8,11 @@
 
 <p>When finished, click 'Save'</p>
 
-<h2>Editing basket headers</h2>
+<h2>Editing Basket Headers</h2>
 
 <p>After creating your basket you can edit the name of the basket, the notes associated with it and the contract you're ordering against.</p>
 
-<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
index 1a75807..b11f84a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
@@ -1,19 +1,20 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Acquisitions searching</h1>
+<h1>Acquisitions Searching</h1>
 
-<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a vendor search or an order search.</p>
+<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a Vendor Search or an Order Search.</p>
 
-<p>In the vendor search you can enter any part of the vendor name to get results.</p>
+<p>In the Vendor Search you can enter any part of the vendor name to get results.</p>
 
-<p>Using the orders search you can search for items that have been ordered with or without the vendor.</p>
+<p>Using the Orders Search you can search for items that have been ordered with or without the vendor.</p>
 
 <p>You can enter info in one or both fields and you can enter any part of the title and/or vendor name.</p>
 
-<p>Clicking the plus sign to the right of the vendor search box will expand the search and allow you to search for additional fields.</p>
+<p>Clicking the plus sign to the right of the Vendor search box will expand the search and allow you to search for additional fields.</p>
 
-<p>Clicking "Advanced search" to the right of the search button will give you all of the order search options available.</p>
+<p>Clicking Advanced Search to the right of the search button will give you all of the order search options available.</p>
 
-<p><strong>See the full documentation for acquisitions searching in the <a href="http://manual.koha-community.org/3.6/en/acqsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.8/en/acqsearch.html">manual</a> (online).</strong></p>
 	
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
index 8432692..b11f84a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
@@ -1,20 +1,20 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Acquisitions searching</h1>
+<h1>Acquisitions Searching</h1>
 
-<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a vendor search or an order search.</p>
+<p>At the top of the various Acquisition pages there is a quick search box where you can perform either a Vendor Search or an Order Search.</p>
 
-<p>In the vendor search you can enter any part of the vendor name to get results.</p>
+<p>In the Vendor Search you can enter any part of the vendor name to get results.</p>
 
-<p>Using the orders search you can search for items that have been ordered with or without the vendor.</p>
+<p>Using the Orders Search you can search for items that have been ordered with or without the vendor.</p>
 
 <p>You can enter info in one or both fields and you can enter any part of the title and/or vendor name.</p>
 
-<p>Clicking the plus sign to the right of the vendor search box will expand the search and allow you to search for additional fields.</p>
+<p>Clicking the plus sign to the right of the Vendor search box will expand the search and allow you to search for additional fields.</p>
 
-<p>Clicking "Advanced search" to the right of the search button will give you all of the order search options available.</p>
+<p>Clicking Advanced Search to the right of the search button will give you all of the order search options available.</p>
 
-<p><strong>See the full documentation for acquisitions searching in the <a href="http://manual.koha-community.org/3.6/en/acqsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.8/en/acqsearch.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
index f02522d..8ab0fba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
@@ -1,17 +1,21 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Claims &amp; late orders</h1>
+<h1>Claims &amp; Late Orders</h1>
 
 <p>If you have entered in an email address for the vendors in your system you can send them claim emails when an order is late. Before you can send claims you will need to set up an acquisitions claim notice.</p>
 
-<p>Upon clicking on the link to 'Late orders' from the Acquisitions page you will be presented with a series of filter options on the left hand side.</p>
+<p>Upon clicking on the link to 'Late Orders' from the Acquisitions page you will be presented with a series of filter options on the left hand side. These filters will be applied only closed baskets.</p>
+
+<p><strong>Note:</strong> The vendor pull down only shows vendors with closed baskets that are late.</p>
 
 <p>Once you filter your orders to show you the things you consider to be late you will be presented with a list of these items.</p>
 
-<p>To the right of each late title you will be see a checkbox. Check off the ones you want a claim letter sent to and click 'Claim order.' This will automatically send an email to the vendor at the email address you have on file.</p>
+<p>To the right of each late title you will be see a checkbox. Check off the ones you want a claim letter sent to and click 'Claim Order' at the bottom right of the list. This will automatically send an email to the vendor at the email address you have on file.</p>
+
+<p><strong>Note:</strong> The Estimated Delivery Date is based on the Delivery time value entered on the vendor record.</p>
 
 <p>If you would rather use a different acquisition claim letter (other than the default) you can create that in the notices module and choose it from the menu above the list of late items.</p>
 
-<p><strong>See the full documentation for claims and late orders in the <a href="http://manual.koha-community.org/3.6/en/acqclaims.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Claims and Late Orders in the <a href="http://manual.koha-community.org/3.8/en/acqclaims.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
index 5ebeccd..707b73a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Order from an existing record</h1>
+<h1>Order from an Existing Record</h1>
 
 <p>If you are ordering another copy of an existing item, you can simply search for the record in your system</p>
 
@@ -12,6 +12,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
index bd65b41..cda5510 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Order from a new empty record</h1>
+<h1>Order from a New Empty Record</h1>
 
 <p>To order from a record that can't be found anywhere else, choose the 'From a new (empty) record'</p>
 
@@ -8,6 +8,6 @@
 	<li>You will be presented with an empty form to fill in all of the necessary details about the item you are ordering</li>
 </ul>
 
-<p><strong>See the full documentation for ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
index 3e7dbe1..447924f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
@@ -1,13 +1,13 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Order from purchase suggestion</h1>
+<h1>Order from Purchase Suggestion</h1>
 
 <p>If you allow patrons to make purchase suggestions then you can place orders from those suggestions</p>
 
 <ul>
-    <li>From this form you can make changes to the catalog details if necessary</li>
+	<li>From this form you can make changes to the Catalog Details if necessary</li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
index a2bd19d..b8ebfeb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Receiving orders</h1>
+<h1>Receiving Orders</h1>
 
 <p>Orders can be received from the vendor information page or the vendor search results page.</p>
 
@@ -12,8 +12,10 @@
 
 <p>From this form you can alter the cost information. You can also choose to only receive 1 of multiple items if only 1 arrived. Once you have made any changes necessary, click 'Save' to mark the item as received.</p>
 
+<p>When you're finished receiving items you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
+
 <p>You will also see that the item is received if you view the basket.</p>
 
-<p><strong>See the full documentation for Receiving orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
index 14d0c96..b8ebfeb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Receiving orders</h1>
+<h1>Receiving Orders</h1>
 
 <p>Orders can be received from the vendor information page or the vendor search results page.</p>
 
@@ -12,8 +12,10 @@
 
 <p>From this form you can alter the cost information. You can also choose to only receive 1 of multiple items if only 1 arrived. Once you have made any changes necessary, click 'Save' to mark the item as received.</p>
 
+<p>When you're finished receiving items you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
+
 <p>You will also see that the item is received if you view the basket.</p>
 
-<p><strong>See the full documentation for receiving orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
index 14d0c96..b8ebfeb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Receiving orders</h1>
+<h1>Receiving Orders</h1>
 
 <p>Orders can be received from the vendor information page or the vendor search results page.</p>
 
@@ -12,8 +12,10 @@
 
 <p>From this form you can alter the cost information. You can also choose to only receive 1 of multiple items if only 1 arrived. Once you have made any changes necessary, click 'Save' to mark the item as received.</p>
 
+<p>When you're finished receiving items you can navigate away from this page or click the 'Finish receiving' button at the bottom of the screen.</p>
+
 <p>You will also see that the item is received if you view the basket.</p>
 
-<p><strong>See the full documentation for receiving orders in the <a href="http://manual.koha-community.org/3.6/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.8/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
index e24b13d..17b1b12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
@@ -4,19 +4,19 @@
 
 <p>Before any orders can be places you must first enter at least one vendor.</p>
 
-<h2>Add a vendor</h2>
+<h2>Add a Vendor</h2>
 
-<p>To add a vendor click the 'New vendor' button on the Acquisitions page.</p>
+<p>To add a vendor click the 'New Vendor' button on the Acquisitions page</p>
 
-<p>The vendor add form is broken into three pieces.</p>
+<p>The vendor add form is broken into three pieces</p>
 
 <ul>
-    <li>The first section is for basic information about the vendor
+	<li>The first section is for basic information about the Vendor
 <ul>
-    <li>Of these fields, only the vendor name is required, the rest of the information should be added to help with generating claim letters and invoices</li>
+	<li>Of these fields, only the Vendor name is required, the rest of the information should be added to help with generating claim letters and invoices</li>
 </ul>
 </li>
-    <li>The second section is for information regarding your contact at the vendor's office
+	<li>The second section is for information regarding your contact at the Vendor's office
 <ul>
 	<li>None of these fields are required, they should only be entered if you want to keep track of your contact's information within Koha</li>
 </ul>
@@ -24,30 +24,35 @@
 	<li>The final section is for billing information
 <ul>
 	<li>To be able to order from a vendor you must make them 'Active'</li>
-    <li>For list prices and invoice prices choose the currency
+	<li>For List Prices and Invoice Prices choose the currency
 <ul>
-    <li>Currencies are assigned in the Currencies &amp; Exchange rates admin area</li>
+	<li>Currencies are assigned in the Currencies &amp; Exchange Rates admin area</li>
 </ul>
 </li>
-    <li>If the vendor offers a consistent blank discount, enter that in the 'Discount' field
+	<li>If your library is charged tax mark your Tax Number as registered</li>
+	<li>Note if you list prices and/or invoice prices include tax</li>
+	<li>If the vendor offers a consistent blank discount, enter that in the 'Discount' field
 <ul>
 	<li>You can enter item specific discounts when placing an order</li>
 </ul>
 </li>
-	<li>GST rate is for any tax the vendor may charge</li>
+	<li>Enter your tax rate if your library is charged taxes on orders</li>
+	<li>If you know about how long it usually takes orders to arrive from this vendor you can enter a delivery time. This will allow Koha to estimate when orders will arrive at your library on the late orders report.</li>
 	<li>Notes are for internal use</li>
 </ul>
 </li>
 </ul>
 
-<h2>View/Edit a vendor</h2>
+<h2>View/Edit a Vendor</h2>
 
-<p>To view a vendor's information page you must search for the vendor from the Acquisitions home page. Your search can be for any part of the vendor's name.</p>
+<p>To view a vendor's information page you must search for the vendor from the Acquisitions home page. Your search can be for any part of the Vendor's name</p>
 
-<p>From the results, click on the name of the vendor you want to view or edit.</p>
+<p>From the results, click on the name of the vendor you want to view or edit</p>
 
 <p>To make changes to the vendor, simply click the 'Edit' button.</p>
 
-<p><strong>See the full documentation for managing vendors in the <a href="http://manual.koha-community.org/3.6/en/acqvendors.html">manual</a> (online).</strong></p>
+<p>If the vendor has no baskets attached to it then a 'Delete' button will also be visible and the vendor can be deleted.</p>
+
+<p><strong>See the full documentation for managing Vendors in the <a href="http://manual.koha-community.org/3.8/en/acqvendors.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
index 7afff73..0017900 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Order from an external source</h1>
+<h1>Order from an External Source</h1>
 
 <p>If you want to search other libraries for an item to purchase you can use the 'From an external source' option which will allow you to order from a MARC record found via a Z39.50 search</p>
 
@@ -14,6 +14,6 @@
 	<li>In the order form that pops up you will not be able to edit the catalog details</li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.6/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.8/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Apr 12 18:47:44 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 12 Apr 2012 12:47:44 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Admin Help files for 3.8
Message-ID: <1334249264-5471-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/admin/admin-home.tt       |   18 ++--
 .../prog/en/modules/help/admin/aqbudgetperiods.tt  |   10 +-
 .../prog/en/modules/help/admin/aqbudgets.tt        |   14 ++--
 .../prog/en/modules/help/admin/aqplan.tt           |    4 +-
 .../modules/help/admin/auth_subfields_structure.tt |   20 ++--
 .../en/modules/help/admin/auth_tag_structure.tt    |    8 +-
 .../en/modules/help/admin/authorised_values.tt     |   34 +++---
 .../prog/en/modules/help/admin/authtypes.tt        |    6 +-
 .../prog/en/modules/help/admin/biblio_framework.tt |   26 +++---
 .../modules/help/admin/branch_transfer_limits.tt   |    4 +-
 .../prog/en/modules/help/admin/branches.tt         |   20 ++--
 .../prog/en/modules/help/admin/categorie.tt        |    8 +-
 .../prog/en/modules/help/admin/checkmarc.tt        |    6 +-
 .../prog/en/modules/help/admin/cities.tt           |   10 +-
 .../prog/en/modules/help/admin/classsources.tt     |   20 ++--
 .../prog/en/modules/help/admin/currency.tt         |    4 +-
 .../prog/en/modules/help/admin/fieldmapping.tt     |    4 +-
 .../modules/help/admin/item_circulation_alerts.tt  |    4 +-
 .../prog/en/modules/help/admin/itemtypes.tt        |   22 ++--
 .../prog/en/modules/help/admin/koha2marclinks.tt   |   10 +-
 .../modules/help/admin/marc_subfields_structure.tt |   16 ++--
 .../prog/en/modules/help/admin/marctagstructure.tt |    8 +-
 .../prog/en/modules/help/admin/matching-rules.tt   |   10 +-
 .../prog/en/modules/help/admin/oai_set_mappings.tt |   41 ++------
 .../prog/en/modules/help/admin/oai_sets.tt         |   31 ++----
 .../en/modules/help/admin/patron-attr-types.tt     |   38 +++++---
 .../prog/en/modules/help/admin/preferences.tt      |   12 +-
 .../prog/en/modules/help/admin/printers.tt         |    2 +-
 .../prog/en/modules/help/admin/roadtype.tt         |    8 +-
 .../prog/en/modules/help/admin/smart-rules.tt      |  106 ++++++++++++++------
 .../prog/en/modules/help/admin/stopwords.tt        |    6 +-
 .../prog/en/modules/help/admin/z3950servers.tt     |   10 +-
 32 files changed, 284 insertions(+), 256 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
index fc17c03..ae38e2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
@@ -1,35 +1,35 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Administration help</h1>
+<h1>Administration Help</h1>
 
 <p>The administration area is where you set all of your preferences for the system. Preference are broken down into several categories.</p>
 
-<h3>Global system preferences</h3>
+<h3>Global System Preferences</h3>
 
 <p>Koha has an extensive set of system preferences. The system preferences control all the various features within Koha and whether they are active in your install or not. System preferences are generally set once at install and then not changed.</p>
 
-<p>If  you are not sure what combination of system preferences to use, try using one of the sample profiles at install. </p>
+<p>If  you are not sure what combination of system preferences to use, try using one of the sample profiles at install.</p>
 
 <p style="color: #990000">IMPORTANT: many preferences interact with each other. Turning on one system preference may require that others are also set.</p>
 
-<h3>Basic parameters</h3>
+<h3>Basic Parameters</h3>
 
 <p>Basic parameters is where library policies are set and governed. It is best to set your system preferences, and then to work through the Basic Parameters in the order that they appear on this page.</p>
 
 <p>Note not all basic parameters are required to be set. For example if you do not plan to use budget based acquisitions, then Accounts and Budgets, Currencies and Exchange Rates can be ignored.</p>
 
-<h3>Patrons and circulation</h3>
+<h3>Patrons and Circulation</h3>
 
 <p>These parameters help with the control of patron records and circulation rules.  It is best to make sure you set the basic parameters before visiting this section.</p>
 
 <h3>Catalog</h3>
 
-<p>Catalog parameters assist in configuring the cataloging functionality within Koha.  
+<p>Catalog parameters assist in configuring the cataloging functionality within Koha.</p>
 
-<h3>Additional parameters</h3>
+<h3>Additional Parameters</h3>
 
 <p>This list of parameters includes functionality that didn't fit in any other category.  These items are optional and may not need to be altered depending on how your library is using Koha.</p>
-<p>
-<p><strong>See the full documentation for system administration in the <a href="http://manual.koha-community.org/3.6/en/administration.html">manual</a> (online).</strong></p>
+
+<p><strong>See the full documentation for system Administration in the <a href="http://manual.koha-community.org/3.8/en/administration.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
index 86b8372..db0e79b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
@@ -4,22 +4,22 @@
 
 <p>Budgets are the top level used for tracking accounting values related to acquisitions.</p>
 
-<p>An example would be to create a budget for the current year and then breaking that into funds for different areas of the library.</p>
+<p>An example would be to create a budget for the current year and then breaking that into Funds for different areas of the library.</p>
 
 <h2>Add a budget</h2>
 
-<p>To add a budget click the 'New budget' button.</p>
+<p>To add a budget click the 'New Budget' button.</p>
 
 <ul>
 	<li>Choose the time period this budget is for, whether it's an academic year, a fiscal year, a quarter, etc.</li>
-    <li>The description should be something that will help you identify the budget when ordering</li>
+	<li>The Description should be something that will help you identify the budget when ordering</li>
 	<li>In the amount box do not use any symbols, simply enter the amount of the budget with numbers and decimals.</li>
 	<li>Marking a budget active makes it usable when placing orders in the acquisitions module, even if the order is placed after the budget end date. This will allow you to record orders that were places in a previous budget period.</li>
 	<li>Locking a budget means that Funds will not be able to be modified by librarians</li>
 </ul>
 
-<p>Once you have made your edits, click the 'Save changes' button. You will be brought to a list of your existing budgets.</p>
+<p>Once you have made your edits, click the 'Save Changes' button. You will be brought to a list of your existing budgets.</p>
 
-<p><strong>See the full documentation for budgets in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#budgetplanning">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Budgets in the <a href="http://manual.koha-community.org/3.8/en/acqadmin.html#budgetplanning">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
index bfb5402..67608de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
@@ -4,33 +4,33 @@
 
 <p>Budgets are broken into funds.</p>
 
-<h2>Add a fund</h2>
+<h2>Add a Fund</h2>
 
 <p>A fund is added to a budget.</p>
 
 <p style="color: #990000;">Important: A budget must be defined before a fund can be created.</p>
 
-<p>To add a new fund click the New button and then choose which budget you would like to add the fund to.</p>
+<p>To add a new fund click the New button and then choose which Budget you would like to add the fund to.</p>
 
 <p>In the form that appears you wan to enter the basics about your fund.</p>
 
 <p>The three first fields are required, the rest are optional</p>
 
 <ul>
-    <li>Fund code is a unique identifier for your fund</li>
-    <li>The fund name should be something that librarians will understand</li>
+	<li>Fund Code is a unique identifier for your fund</li>
+	<li>The Fund Name should be something that librarians will understand</li>
 	<li>Amount should be entered with only numbers and decimals, no other characters</li>
 	<li>You can choose to assign this fund to a librarian. Doing so will make it so that only that librarian can make changes to the Fund</li>
 	<li>Choose which library will be using this fund</li>
 	<li>You can restrict who can order from this fund by choosing either the owner or the library from the 'Restrict access to' menu</li>
 	<li>Notes are simply for any descriptive notes you might want to add so that librarians know when to use this fund</li>
-    <li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the <a href="http://manual.koha-community.org/3.6/en/acqfaq.html#planningcatfaq">planning category FAQ</a>.</li>
+	<li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the Planning Category FAQ.</li>
 </ul>
 
 <p>When complete, click 'Submit' and you will be brought to a list of all of the funds for the budget.</p>
 
-<p>To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add child fund' options. A child fund simply a sub-fund of the fund listed. An example would be to have a fund for 'Fiction' and under that have a fund for 'New releases' and a fund for 'Science fiction.' It is an optional way to further organize your finances.</p>
+<p>To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add Child Fund' options. A child fund simply a sub-fund of the fund listed. An example would be to have a fund for 'Fiction' and under that have a fund for 'New Releases' and a fund for 'Science Fiction.' It is an optional way to further organize your finances.</p>
 
-<p><strong>See the full documentation for funds in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#funds">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Funds in the <a href="http://manual.koha-community.org/3.8/en/acqadmin.html#funds">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
index 2fac044..96346ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Budget planning</h1>
+<h1>Budget Planning</h1>
 
 <p>When viewing the list of funds click the 'Planning' button and choose how you would like to plan to spend your budget.</p>
 
@@ -12,6 +12,6 @@
 
 <p>Once your changes are made, click the 'Save' button. If you would like to export your data as a CSV file you can do so by entering a file name in the 'Output to a file named' field and clicking the 'Output' button.</p>
 
-<p><strong>See the full documentation for Budget planning in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#fundsplanning">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Budget Planning in the <a href="http://manual.koha-community.org/3.8/en/acqadmin.html#fundsplanning">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
index 6e68cf2..0654c77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC record subfields</h1>
+<h1>MARC Record Subfields</h1>
 
-<p>Frameworks are made up of MARC fields and subfields. To make edits to most frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
+<p>Frameworks are made up of MARC fields and subfields. To make edits to most Frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
 
 <ul>
 	<li>Each field has a tag (which is the MARC tag)
@@ -12,7 +12,7 @@
 	<li>If you check 'Repeatable' then the field will have a plus sign next to it allowing you to add multiples of that tag</li>
 	<li>If you check 'Mandatory' the record will not be allowed to save unless you have a value assigned to this tag</li>
 	<li>'Authorized value' is where you define an authorized value that your catalogers can choose from a pull down to fill this field in
-To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC structure' listing</li>
+To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC Structure' listing</li>
 </ul>
 </li>
 	<li>From the list of subfields you can click 'Delete' to the right of each to delete the subfields</li>
@@ -79,21 +79,21 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 	<li>9 =&gt; Future use</li>
 </ul>
 </li>
-    <li>( ! means 'not visible' or in the case of 'collapsed,' 'not collapsed')</li>
+	<li>( ! means 'not visible' or in the case of Collapsed 'not Collapsed')</li>
 </ul>
 </li>
 </ul>
 <ul>
-    <li>Is a URL
+	<li>Is a url
 <ul>
-    <li>if checked, it means that the subfield is a URL and can be clicked</li>
+	<li>if checked, it means that the subfield is a url and can be clicked</li>
 </ul>
 </li>
 </ul>
 <ul>
 	<li>Link
 <ul>
-    <li>If you enter a field/subfield here (200b), a link appears after the subfield in the MARC detail view. This view is present only in the staff client, not the OPAC. If the librarian clicks on the link, a search is done on the database for the field/subfield with the same value. This can be used for 2 main topics :
+	<li>If you enter a field/subfield here (200b), a link appears after the subfield in the MARC Detail view. This view is present only in the staff client, not the OPAC. If the librarian clicks on the link, a search is done on the database for the field/subfield with the same value. This can be used for 2 main topics :
 <ul>
 	<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all bib records with the same author.</li>
 	<li>on a field that is a link (4xx) to reach another bib record. For example, put 011a in 464$x, will find the serials that are with this ISSN.</li>
@@ -114,7 +114,7 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 	<li>Authorized value
 <ul>
 	<li>means the value cannot by typed by the librarian, but must be chosen from a pull down generated by the authorized value list</li>
-    <li>In the example above, the 504a field will show the MARC504 authorized values when cataloging</li>
+	<li>In the example above, the 504a field will show the MARC504 Authorized Values when cataloging</li>
 </ul>
 </li>
 </ul>
@@ -134,10 +134,10 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 </li>
 </ul>
 </li>
-    <li>To save your changes simply click the 'Save changes' button at the top of the screen</li>
+	<li>To save your changes simply click the 'Save Changes' button at the top of the screen</li>
 </ul>
 
-<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
index 5760f2f..abaa8ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Authority record tags</h1>
+<h1>Authority Record Tags</h1>
 
-<p>To add a field to an authority framework click the 'New Tag' button at the top of the authority framework definition</p>
+<p>To add a field to a Authority Framework click the 'New Tag' button at the top of the Authority Framework definition</p>
 
 <p>This will open up a blank form for entering MARC field data</p>
 
@@ -17,10 +17,10 @@
 	<li>If you want this field to be a pull down with limited possible answers, choose which 'Authorized value' list you want to use</li>
 </ul>
 
-<p>When you're finished, click 'Save changes' and you will be presented with your new field</p>
+<p>When you're finished, click 'Save Changes' and you will be presented with your new field</p>
 
 <p>To the right of the new field is a link to 'Subfields,' you will need to add subfields before this tag will appear in your MARC editor.</p>
 
-<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
index 31786ce..fa47102 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Authorized values</h1>
+<h1>Authorized Values</h1>
 
 <p>Authorized values can be used in several areas of Koha. One reason you would add an authorized value category would be to control the values that can be entered into MARC fields by catalogers.</p>
 
-<h2>Existing values</h2>
+<h2>Existing Values</h2>
 
 <p>Koha installs with pre-defined values that your library is likely to use, for instance 'Lost'.</p>
 
@@ -51,27 +51,27 @@
 </li>
 	<li>HINGS_AS
 <ul>
-    <li>General holdings: Acquisition status designator :: This data element specifies acquisition status for the unit at the time of the holdings report.a</li>
+	<li>General Holdings: Acquisition Status Designator :: This data element specifies acquisition status for the unit at the time of the holdings report.a</li>
 </ul>
 </li>
 	<li>HINGS_C
 <ul>
-    <li>General holdings: Completeness designator</li>
+	<li>General Holdings: Completeness Designator</li>
 </ul>
 </li>
 	<li>HINGS_PF
 <ul>
-    <li>Physical form designators</li>
+	<li>Physical Form Designators</li>
 </ul>
 </li>
 	<li>HINGS_RD
 <ul>
-    <li>General holdings: Retention designator :: This data element specifies the retention policy for the unit at the time of the holdings report.</li>
+	<li>General Holdings: Retention Designator :: This data element specifies the retention policy for the unit at the time of the holdings report.</li>
 </ul>
 </li>
 	<li>HINGS_UT
 <ul>
-    <li>General holdings: Type of unit designator</li>
+	<li>General Holdings: Type of Unit Designator</li>
 </ul>
 </li>
 	<li>LOC
@@ -117,35 +117,35 @@
 </li>
 </ul>
 
-<h2>Add new authorized value category</h2>
+<h2>Add new Authorized Value Category</h2>
 
 <p>In addition to the existing categories that come by default with Koha, librarians can add their own authorized value categories to control data that is entered into the system. To add a new category:</p>
 
 <ul>
-    <li>Click 'New category'</li>
-    <li>Limit your category to 11 characters (something short to make it clear what the category is for)</li>
+	<li>Click 'New Category'</li>
+	<li>Limit your Category to 11 characters (something short to make it clear what the category is for)</li>
 	<li>When adding a new category you're asked to create at least one authorized value
 <ul>
-    <li>Enter a code for your authorized value into the 'Authorized value' field</li>
-    <li>Use the description field for the actual value that will be entered</li>
+	<li>Enter a code for your Authorized Value into the 'Authorized value' field</li>
+	<li>Use the Description field for the actual value that will be entered</li>
 </ul>
 </li>
 	<li>Click 'Save'</li>
-    <li>Your new category and value will appear on the list of authorized values</li>
+	<li>Your new category and value will appear on the list of Authorized Values</li>
 </ul>
 
-<h2>Add new authorized value</h2>
+<h2>Add new Authorized Value</h2>
 
 <p>New authorized values can be added to any existing or new category. To add a value:</p>
 
 <ul>
 	<li>Click 'New authorized value for ...'</li>
-    <li>Enter a code for your authorized value into the 'Authorized value' field</li>
-    <li>Use the description field for the actual value that will be entered</li>
+	<li>Enter a code for your Authorized Value into the 'Authorized value' field</li>
+	<li>Use the Description field for the actual value that will be entered</li>
 	<li>Click 'Save'</li>
 	<li>The new value will appear in the list along with existing values</li>
 </ul>
 
-<p><strong>See the full documentation for authorized values in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#authorizedvalues">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorized Values in the <a href="http://manual.koha-community.org/3.8/en/basicparams.html#authorizedvalues">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
index c315db9..80d9be6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
@@ -2,10 +2,10 @@
 
 <h1>Authority types</h1>
 
-<p>Authority types are basically MARC frameworks for authority records and because of that the rules below refer to the bibliographic frameworks.</p>
+<p>Authority Types are basically MARC Frameworks for Authority records and because of that the rules below refer to the bibliographic frameworks.</p>
 
-<p>Koha comes with many of the necessary authority frameworks already installed.</p>
+<p>Koha comes with many of the necessary Authority frameworks already installed.</p>
 
-<p><strong>See the full documentation for authorities in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
index 4810dd6..ca114ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
@@ -1,39 +1,39 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC bibliographic frameworks</h1>
+<h1>MARC Bibliographic Frameworks</h1>
 
-<p>Think of frameworks as templates for creating new bibliographic records. Koha comes with some predefined frameworks that can be edited or deleted, and librarians can create their own frameworks for content specific to their libraries.</p>
+<p>Think of Frameworks as templates for creating new bibliographic records. Koha comes with some predefined frameworks that can be edited or deleted, and librarians can create their own frameworks for content specific to their libraries.</p>
 
-<p>Do not delete or edit the default framework since this will cause problems with your cataloging records - always create a new template based on the default framework, or alter the other frameworks.</p>
+<p>Do not delete or edit the Default Framework since this will cause problems with your cataloging records - always create a new template based on the Default Framework, or alter the other Frameworks.</p>
 
 <p>After clicking the 'MARC structure' link to the right of each framework you can decide how many fields you want to see on one screen by using the pagination options at the top of the table.</p>
 
-<h2>Add new framework</h2>
+<h2>Add New Framework</h2>
 
 <p>To add a new framework</p>
 
 <ul>
-    <li>Click 'New framework'
+	<li>Click 'New Framework'
 <ul>
 	<li>Enter a code of 4 or fewer characters</li>
-    <li>Use the description field to enter a more detailed definition of your framework</li>
+	<li>Use the Description field to enter a more detailed definition of your framework</li>
 </ul>
 </li>
 	<li>Click 'Submit'</li>
-    <li>Once your framework is added click 'MARC structure' to the right of it on the list of frameworks
+	<li>Once your Framework is added click 'MARC structure' to the right of it on the list of Frameworks
 <ul>
-    <li>You will be asked to choose a framework to base your new framework off of, this will make it easier than starting from scratch</li>
+	<li>You will be asked to choose a Framework to base your new Framework off of, this will make it easier than starting from scratch</li>
 </ul>
 </li>
-    <li>Once your framework appears on the screen you can edit or delete each field by following the instructions for editing subfields</li>
+	<li>Once your Framework appears on the screen you can edit or delete each field by following the instructions for editing subfields</li>
 </ul>
 
-<h2>Edit Existing frameworks</h2>
+<h2>Edit Existing Frameworks</h2>
 
-<p>Clicking 'Edit' to the right of a framework will only allow you to edit the description for the framework</p>
+<p>Clicking 'Edit' to the right of a Framework will only allow you to edit the Description for the Framework</p>
 
-<p>To make edits to the fields associated with the framework you must first click 'MARC Structure' and then follow the instructions for editing subfields</p>
+<p>To make edits to the fields associated with the Framework you must first click 'MARC Structure' and then follow the instructions for editing subfields</p>
 
-<p><strong>See the full documentation for frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Frameworks in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
index 6a61215..baac455 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Library transfer limits</h1>
+<h1>Library Transfer Limits</h1>
 
 <p>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the collection code involved.</p>
 
@@ -16,6 +16,6 @@
 
 <p>In the above example, Centerville library will allow patrons to return items from all libraries except Liberty and Franklin to their library.</p>
 
-<p><strong>See the full documentation for library transfer limits in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Library Transfer Limits in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
index dc76796..fbdd7d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
@@ -1,17 +1,17 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Libraries &amp; groups</h1>
+<h1>Libraries &amp; Groups</h1>
 
 <p>When setting up your Koha system you will want to add information for every library that will be sharing your system. This data is used in several areas of Koha.</p>
 
 <p>When visiting this page you are presented with a list of the libraries and groups that have already been added to the system.</p>
 
-<h2>Adding a library</h2>
+<h2>Adding a Library</h2>
 
 <p>To add a new library:</p>
 
 <ul>
-    <li>Click 'New library'</li>
+	<li>Click 'New Library'</li>
 	<li>Fill in the data requested on the form that follows
 <ul>
 	<li>Of the fields listed, only 'Library code' and 'Name' are required</li>
@@ -21,7 +21,7 @@
 </li>
 </ul>
 
-<h2>Editing/Deleting a library</h2>
+<h2>Editing/Deleting a Library</h2>
 
 <p>You will be unable to delete any library that has patrons or items attached to it.</p>
 
@@ -31,22 +31,22 @@
 
 <h2>Adding a group</h2>
 
-<p>To add a search domain or library property group click the 'New group' button at the top of the screen.</p>
+<p>To add a Search Domain or Library Property Group click the 'New Group' button at the top of the screen.</p>
 
 <p>Of the fields on the group form, 'Category code' and 'Name' are the only required fields</p>
 
-<h2>Search domain groups</h2>
+<h2>Search Domain Groups</h2>
 
-<p>Search domain groups allow you to search a group of libraries at the same time instead of searching just one library or all libraries.</p>
+<p>Search Domain Groups allow you to search a group of libraries at the same time instead of searching just one library or all libraries.</p>
 
-<p>To see Search domain groups in action visit the staff client advanced search page in your Koha system</p>
+<p>To see Search Domain Groups in action visit the staff client advanced search page in your Koha system</p>
 
-<h2>Library property groups</h2>
+<h2>Library Property Groups</h2>
 
 <p>You can assign specific categories to your libraries by adding groups for them.</p>
 
 <p>Properties are then applied to libraries via the add or edit library form.</p>
 
-<p><strong>See the full documentation for libraries &amp; groups in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#libsgroups">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Libraries &amp; Groups in the <a href="http://manual.koha-community.org/3.8/en/basicparams.html#libsgroups">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
index aeec6eb..9b6dd8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Patron categories</h1>
+<h1>Patron Categories</h1>
 
 <p>Patron categories allow you to organize your patrons into different roles, age groups, and patron types.</p>
 
@@ -41,10 +41,10 @@
 
 <h2>Adding a patron category</h2>
 
-<p>To add a new patron category click 'New category' at the top of the page</p>
+<p>To add a new patron category click 'New Category' at the top of the page</p>
 
 <ul>
-    <li>The 'Category code' is an identifier for your new code.
+	<li>The 'Category Code' is an identifier for your new code.
 <ul>
 	<li style="color: #990000;">Important: The category code is limited to 10 characters (numbers and letters)</li>
 </ul>
@@ -77,6 +77,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for patron categories in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#patcats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Categories in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#patcats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
index 5bc9d57..1e43fb0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
@@ -1,11 +1,11 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC bibliographic framework test</h1>
+<h1>MARC Bibliographic Framework Test</h1>
 
 <p>This tool checks the MARC structure in your frameworks.</p>
 
-<p>If you change your MARC bibliographic framework it's recommended that you run this tool to test for errors in your definition.</p>
+<p>If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</p>
 
-<p><strong>See the full documentation for the MARC bibliographic framework test in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworkstest">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the MARC Bibliographic Framework Test in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#marcbibframeworkstest">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
index 5cfc9de..98b1b4d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
@@ -1,10 +1,10 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Cities and towns</h1>
+<h1>Cities and Towns</h1>
 
 <p>To standardize patron input you can define cities or towns within your region so that when new patrons are added librarians simply have to select the town from a list instead of having to type the town and zip (or postal) code information.</p>
 
-<h2>Adding a city</h2>
+<h2>Adding a City</h2>
 
 <p>To add a new city, click the 'New City' button at the top of the page and enter the city name, state and zip/postal code.</p>
 
@@ -12,12 +12,12 @@
 
 <p>Cities can be edited or deleted at any time.</p>
 
-<h2>Viewing cities on patron add form</h2>
+<h2>Viewing Cities on Patron Add Form</h2>
 
-<p>If you have defined local cities using the 'New city' form, then when adding or editing a patron record you will see those cities in a pull down menu to make city selection easy.</p>
+<p>If you have defined local cities using the New city form, then when adding or editing a patron record you will see those cities in a pull down menu to make city selection easy.</p>
 
 <p>This will allow for easy entry of local cities into the patron record without risking the potential for typos or mistaken zip/postal codes.</p>
 
-<p><strong>See the full documentation for cities and towns in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#citytowns">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Cities and Towns in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#citytowns">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
index 24ce608..e3c6c82 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
@@ -1,14 +1,14 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Classification sources</h1>
+<h1>Classification Sources</h1>
 
-<p>Source of classification or shelving scheme is an authorized values category that is mapped to field 942$2 in Koha's MARC bibliographic frameworks.</p>
+<p>Source of classification or shelving scheme is an Authorized Values category that is mapped to field 942$2 in Koha's MARC Bibliographic frameworks.</p>
 
 <p>Commonly used values of this field are:</p>
 
 <ul>
-    <li>ddc - Dewey Decimal classification</li>
-    <li>lcc - Library of Congress classification</li>
+	<li>ddc - Dewey Decimal Classification</li>
+	<li>lcc - Library of Congress Classification</li>
 </ul>
 
 <p>If you chose to install classification sources during Koha's installation, you would see other values too:</p>
@@ -16,11 +16,11 @@
 <ul>
 	<li>ANSCR (sound recordings)</li>
 	<li>SuDOC classification</li>
-    <li>Universal decimal classification</li>
-    <li>Other/Generic classification</li>
+	<li>Universal Decimal Classification</li>
+	<li>Other/Generic Classification</li>
 </ul>
 
-<h2>Adding/Editing classification sources</h2>
+<h2>Adding/Editing Classification Sources</h2>
 
 <p>You can add your own source of classification by using the New Classification Source button. To edit use the Edit link.</p>
 
@@ -32,7 +32,7 @@
 	<li>Select the appropriate filing rule from the drop down list.</li>
 </ul>
 
-<h2>Classification filing rules</h2>
+<h2>Classification Filing Rules</h2>
 
 <p>Filing rules determine the order in which items are placed on shelves.</p>
 
@@ -44,7 +44,7 @@
 	<li>Generic</li>
 </ul>
 
-<p>Filing rules are mapped to classification sources. You can setup new filing rules by using the 'New filing rule' button. To edit use the Edit link.</p>
+<p>Filing rules are mapped to Classification sources. You can setup new filing rules by using the New Filing Rule button. To edit use the Edit link.</p>
 
 <p>When creating or editing:</p>
 
@@ -53,6 +53,6 @@
 	<li>Choose an appropriate filing routine - dewey, generic or lcc</li>
 </ul>
 
-<p><strong>See the full documentation for classification sources in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#classificationsources">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Classification Sources in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#classificationsources">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
index 7e6bc26..ff4245c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Currencies and exchange rates</h1>
+<h1>Currencies and Exchange Rates</h1>
 
 <p>If you place orders from more than one country you will want to input currency exchange rates so that your acquisitions module will properly calculate totals.</p>
 
@@ -8,6 +8,6 @@
 
 <p>The active currency is the main currency you use in your library. Your active currency will have a check mark in the 'Active' column. If you don't have an active currency you will see an error message telling you to choose an active currency.</p>
 
-<p><strong>See the full documentation for currencies and exchange rates in the <a href="http://manual.koha-community.org/3.6/en/acqadmin.html#currexchangeadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Currencies and Exchange Rates in the <a href="http://manual.koha-community.org/3.8/en/acqadmin.html#currexchangeadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
index 1a942c7..9981403 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Keyword to MARC mapping</h1>
+<h1>Keyword to MARC Mapping</h1>
 
 <p>This tool will allow you to map MARC fields to a set of predefined keywords.</p>
 
@@ -20,6 +20,6 @@
 
 <p>Future developments will include additional keyword assigned fields.</p>
 
-<p><strong>See the full documentation for keyword to MARC mapping in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#keywordmapping">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Keyword to MARC Mapping in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#keywordmapping">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
index db6da0b..f9bafcc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Item circulation alerts</h1>
+<h1>Item Circulation Alerts</h1>
 
 <p>Libraries can decide if they want to have patrons automatically notified of circulation events (check ins and check outs).</p>
 
@@ -19,6 +19,6 @@
 	<li>By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item/patron type combo that you would like to stop notices for.</li>
 </ul>
 
-<p><strong>See the full documentation for item circulation alerts in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#itemcircalerts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Circulation Alerts in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#itemcircalerts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
index 949928d..f5a455b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
@@ -1,17 +1,17 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Item types</h1>
+<h1>Item Types</h1>
 
 <p>Koha allows you to organize your collection by item types and collection codes.</p>
 
 <p>Item types typically refer to the material type (book, cd, dvd, etc), but can be used in any way that works for your library.</p>
 
-<h2>Adding item types</h2>
+<h2>Adding Item Types</h2>
 
-<p>To add a new item type, simply click the 'New item type' button at the top of the Item types page.</p>
+<p>To add a new item type, simply click the 'New Item Type' button at the top of the Item Types page.</p>
 
 <ul>
-    <li>In the 'Item type' field, enter a short code for your item type</li>
+	<li>In the 'Item Type' field, enter a short code for your item type</li>
 	<li>The description is the plain text definition of the item type</li>
 	<li>You can choose to have an image associated with your item type
 <ul>
@@ -20,7 +20,7 @@
 	<li>Or you can just have no image associated with the item type</li>
 	<li style="color: #990000;">Important: To have your item type images appear in the OPAC you need to set noItemTypeImages to 'Show'
 <ul>
-    <li>Get there: More &gt; Administration &gt; Global system preferences &gt; Admin</li>
+	<li>Get there: More &gt; Administration &gt; Global System Preferences &gt; Admin</li>
 </ul>
 </li>
 </ul>
@@ -37,26 +37,26 @@
 	<li>This will charge the patron on checkout</li>
 </ul>
 </li>
-    <li>When finished, click 'Save changes'
+	<li>When finished, click 'Save Changes'
 <ul>
-    <li>Tip: All fields, with the exception of the 'Item type' will be editable from the item types list</li>
+	<li>Tip: All fields, with the exception of the 'Item Type' will be editable from the Item Types list</li>
 </ul>
 </li>
 	<li>Your new item type will now appear on the list</li>
 </ul>
 
-<h2>Editing item types</h2>
+<h2>Editing Item Types</h2>
 
 <p>Each item type has an Edit button beside it. To edit an item simply click the 'Edit' link.</p>
 
-<p>You will not be able to edit the code you assigned as the 'Item type' but you will be able to edit the description for the item.</p>
+<p>You will not be able to edit the code you assigned as the 'Item Type' but you will be able to edit the description for the item.</p>
 
-<h2>Deleting item types</h2>
+<h2>Deleting Item Types</h2>
 
 <p>Each item has a Delete button beside it. To delete an item, simply click the 'Delete' link.</p>
 
 <p>You will not be able to delete item types that are being used by items within your system.</p>
 
-<p><strong>See the full documentation for item types in the <a href="http://manual.koha-community.org/3.6/en/basicparams.html#itemtypeadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Types in the <a href="http://manual.koha-community.org/3.8/en/basicparams.html#itemtypeadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
index 8164a19..6b7c75a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
@@ -1,17 +1,17 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Koha to MARC mapping</h1>
+<h1>Koha to MARC Mapping</h1>
 
-<p>While Koha stores the entire MARC record, it also stores common fields for easy access in various tables in the database. Koha to MARC mapping is used to tell Koha where to find these values in the MARC record. In many cases you will not have to change the default values set by in this tool on installation, but it is important to know that the tool is here and can be used at any time.</p>
+<p>While Koha stores the entire MARC record, it also stores common fields for easy access in various tables in the database. Koha to MARC Mapping is used to tell Koha where to find these values in the MARC record. In many cases you will not have to change the default values set by in this tool on installation, but it is important to know that the tool is here and can be used at any time.</p>
 
-<p>The Koha to MARC mapping page offers you the option of choosing from one of three tables in the database to assign values to.</p>
+<p>The Koha to MARC Mapping page offers you the option of choosing from one of three tables in the database to assign values to.</p>
 
-<p>After choosing the table you would like to view, click 'OK.' To edit any mapping click on the 'Koha filed' or the 'Edit' link.</p>
+<p>After choosing the table you would like to view, click 'OK.' To edit any mapping click on the 'Koha Filed' or the 'Edit' link.</p>
 
 <p>Choose which MARC field you would like to map to this Koha Field and click the 'OK' button. If you would like to clear all mappings, click the 'Click to "Unmap"' button.<p>
 
 <p style="color: #990000;">Important: At this time you can map only 1 MARC field to 1 Koha field. This means that you won't be able to map both the 100a and the 700a to the author field, you need to choose one or the other.</p>
 
-<p><strong>See the full documentation for Koha to MARC mapping in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#kohamarcmapping">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Koha to MARC Mapping in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#kohamarcmapping">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
index f55ff05..130c16e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC bibliographic frameworks subfields</h1>
+<h1>MARC Bibliographic Frameworks Subfields</h1>
 
-<p>Frameworks are made up of MARC fields and subfields. To make edits to most frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
+<p>Frameworks are made up of MARC fields and subfields. To make edits to most Frameworks you must edit the fields and subfields. Clicking 'Edit' to the right of each subfield will allow you to make changes to the text associated with the field</p>
 
 <ul>
 	<li>Each field has a tag (which is the MARC tag)
@@ -12,11 +12,11 @@
 	<li>If you check 'Repeatable' then the field will have a plus sign next to it allowing you to add multiples of that tag</li>
 	<li>If you check 'Mandatory' the record will not be allowed to save unless you have a value assigned to this tag</li>
 	<li>'Authorized value' is where you define an authorized value that your catalogers can choose from a pull down to fill this field in
-To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC structure' listing</li>
+To edit the subfields associated with the tag, click 'Subfields' to the right of the tag on the 'MARC Structure' listing</li>
 </ul>
 </li>
 	<li>From the list of subfields you can click 'Delete' to the right of each to delete the subfields</li>
-    <li>To edit the subfields click 'Edit subfields'</li>
+	<li>To edit the subfields click 'Edit Subfields'</li>
 	<li>For each subfield you can set the following values
 <ul>
 	<li>Text for librarian
@@ -91,9 +91,9 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 </li>
 </ul>
 <ul>
-    <li>Is a URL
+	<li>Is a url
 <ul>
-    <li>if checked, it means that the subfield is a URL and can be clicked</li>
+	<li>if checked, it means that the subfield is a url and can be clicked</li>
 </ul>
 </li>
 </ul>
@@ -141,9 +141,9 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
 </li>
 </ul>
 </li>
-    <li>To save your changes simply click the 'Save changes' button at the top of the screen</li>
+	<li>To save your changes simply click the 'Save Changes' button at the top of the screen</li>
 </ul>
 
-<p><strong>See the full documentation for MARC frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
index ce93e70..3ba7a39 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>MARC bibliographic frameworks tags</h1>
+<h1>MARC Bibliographic Frameworks Tags</h1>
 
-<p>To add a field to a framework click the 'New tag' button at the top of the framework definition</p>
+<p>To add a field to a Framework click the 'New Tag' button at the top of the Framework definition</p>
 
 <p>This will open up a blank form for entering MARC field data</p>
 
@@ -17,10 +17,10 @@
 	<li>If you want this field to be a pull down with limited possible answers, choose which 'Authorized value' list you want to use</li>
 </ul>
 
-<p>When you're finished, click 'Save changes' and you will be presented with your new field</p>
+<p>When you're finished, click 'Save Changes' and you will be presented with your new field</p>
 
 <p>To the right of the new field is a link to 'Subfields,' you will need to add subfields before this tag will appear in your MARC editor.</p>
 
-<p><strong>See the full documentation for MARC frameworks in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
index a01f5db..82ba588 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Record matching rules</h1>
+<h1>Record Matching Rules</h1>
 
 <p>Record matching rules are used when importing MARC records into Koha.</p>
 
@@ -9,7 +9,7 @@
 <p>To create a new matching rule:</p>
 
 <ul>
-    <li>Click 'New record matching rule'
+	<li>Click 'New Record Matching Rule'
 <ul>
 	<li>Choose a unique name and enter it in the 'Matching rule code' field</li>
 	<li>'Description' can be anything you want to make it clear to you what rule you're picking</li>
@@ -27,7 +27,7 @@
 </li>
 </ul>
 
-<h2>Sample record matching rule: Control number</h2>
+<h2>Sample Record Matching Rule: Control Number</h2>
 
 <ul>
 	<li>Match threshold: 100</li>
@@ -43,9 +43,9 @@
 	<li>Offset: 0</li>
 	<li>Length: 0</li>
 	<li>Normalization rule: Control-number</li>
-    <li>Required match checks: none (remove the blank one)</li>
+	<li>Required Match checks: none (remove the blank one)</li>
 </ul>
 
-<p><strong>See the full documentation for Record matching Rules in the <a href="http://manual.koha-community.org/3.6/en/catadmin.html#recordmatchingrules">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Record Matching Rules in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#recordmatchingrules">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
index ba85010..7ed3a8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
@@ -1,40 +1,23 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>OAI-PMH sets mappings configuration</h1>
+<h1>OAI-PMH Sets Mappings Configuration</h1>
 
-<p>
-    Here you can define how a set will be build (what records will belong to
-    this set) by defining mappings. Mappings are a list of conditions on record
-    content. A record only need to match one condition to belong to the set.
-<p>
+<p>Here you can define how a set will be build (what records will belong to this set) by defining mappings. Mappings are a list of conditions on record content. A record only need to match one condition to belong to the set.</p>
 
 <h2>Defining a mapping</h2>
+
 <ol>
-    <li>
-        Fill the fields 'Field', 'Subfield' and 'Value'. For example if you
-        want to include in this set all records that have a 999$9 equal to
-        'XXX'. Fill 'Field' with 999, 'Subfield' with 9 and 'Value' with XXX.
-    </li>
-    <li>
-        If you want to add another condition, click on 'OR' button and repeat
-        step 1.
-    </li>
+    <li>Fill the fields 'Field', 'Subfield' and 'Value'. For example if you want to include in this set all records that have a 999$9 equal to 'XXX'. Fill 'Field' with 999, 'Subfield' with 9 and 'Value' with XXX.</li>
+    <li>If you want to add another condition, click on 'OR' button and repeat step 1.</li>
     <li>Click on 'Save'</li>
 </ol>
 
-<p>
-    To delete a condition, just leave at least one of 'Field', 'Subfield' or
-    'Value' empty and click on 'Save'.
-</p>
-
-<p>
-    Note: Actually, a condition is true if value in the corresponding subfield
-    is strictly equal to what is defined if 'Value'. A record having
-    999$9 = 'XXX YYY' will not belong to a set where condition is
-    999$9 = 'XXX'.
-    <br />
-    And it is case sensitive : a record having 999$9 = 'xxx' will not belong
-    to a set where condition is 999$9 = 'XXX'.
-</p>
+<p>To delete a condition, just leave at least one of 'Field', 'Subfield' or 'Value' empty and click on 'Save'.</p>
+
+<p>Note: Actually, a condition is true if value in the corresponding subfield is strictly equal to what is defined if 'Value'. A record having 999$9 = 'XXX YYY' will not belong to a set where condition is 999$9 = 'XXX'.</p>
+    
+<p>And it is case sensitive : a record having 999$9 = 'xxx' will not belong to a set where condition is 999$9 = 'XXX'.</p>
+
+<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
index c99ea3a..9944c40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>OAI-PMH sets configuration</h1>
+<h1>OAI-PMH Sets Configuration</h1>
 
 <p>On this page you can create, modify and delete OAI-PMH sets<p>
 
@@ -9,41 +9,26 @@
 <ol>
     <li>Click on the link 'Add a new set'</li>
     <li>Fill the mandatory fields 'setSpec' and 'setName'</li>
-    <li>
-        Then you can add descriptions for this set. To do this click on
-        'Add description' and fill the newly created text box. You can add as
-        many descriptions as you want.
-    </li>
+    <li>Then you can add descriptions for this set. To do this click on 'Add description' and fill the newly created text box. You can add as many descriptions as you want.</li>
     <li>Click on 'Save' button'</li>
 </ol>
 
 <h2>Modify a set</h2>
 
-<p>
-    To modify a set, just click on the link 'Modify' on the same line of the
-    set you want to modify. A form similar to set creation form will appear and
-    allow you to modify the setSpec, setName and descriptions.
-<p>
+<p>To modify a set, just click on the link 'Modify' on the same line of the set you want to modify. A form similar to set creation form will appear and allow you to modify the setSpec, setName and descriptions.</p>
 
 <h2>Delete a set</h2>
 
-<p>
-    To delete a set, just click on the link 'Delete' on the same line of the
-    set you want to delete.
-</p>
+<p>To delete a set, just click on the link 'Delete' on the same line of the set you want to delete.</p>
 
 <h2>Define mappings</h2>
 
-<p>
-    The 'Define mappings' link allow you to tell how the set will be build
-    (what records will belong to this set)
-</p>
+<p>The 'Define mappings' link allow you to tell how the set will be build (what records will belong to this set)</p>
 
 <h2>Build sets</h2>
 
-<p>
-    Once you have configured all your sets, you have to build the sets. This is
-    done by calling the script misc/migration_tools/build_oai_sets.pl.
-</p>
+<p>Once you have configured all your sets, you have to build the sets. This is done by calling the script misc/migration_tools/build_oai_sets.pl.</p>
+
+<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.8/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
index 899df27..a0b1944 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
@@ -1,31 +1,35 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Patron attribute types</h1>
+<h1>Patron Attribute Types</h1>
 
 <p>Patron attributes can be used to define custom fields to associate with your patron records. In order to enable the use of custom fields you need to set the ExtendedPatronAttributes system preference.</p>
 
+<ul>
+	<li><em>Get there:</em> More &gt; Administration &gt; Patrons &amp; Circulation &gt; Patron attribute types</li>
+</ul>
+
 <p>A common use for this field would be for a student ID number or a Driver's license number.</p>
 
-<h2>Adding patron attributes</h2>
+<h3>Adding Patron Attributes</h3>
 
-<p>To add a new patron attribute type, click the 'New patron attribute type' button at the top of the page</p>
+<p>To add a new Patron Attribute Type, click the 'New Patron Attribute Type' button at the top of the page</p>
 
 <ul>
-    <li>In the 'Patron attribute type code', enter a short code to identify this field
+	<li>In the 'Patron attribute type code', enter a short code to identify this field
 <ul>
-	<li>This field is limited to 10 characters (numbers and letters only)</li>
-	<li>This setting cannot be changed after an attribute is defined</li>
+	<li style="color: #990000;">Important: This field is limited to 10 characters (numbers and letters only)</li>
+	<li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
 </ul>
 </li>
 	<li>In the 'Description' field, enter a longer (plain text) explanation of what this field will contain</li>
 	<li>Check the box next to 'Repeatable' to let a patron record have multiple values of this attribute.
 <ul>
-	<li>This setting cannot be changed after an attribute is defined</li>
+	<li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
 </ul>
 </li>
 	<li>If 'Unique identifier' is checked, the attribute will be a unique identifier which means, if a value is given to a patron record, the same value cannot be given to a different record.
 <ul>
-	<li>This setting cannot be changed after an attribute is defined</li>
+	<li style="color: #990000;">Important: This setting cannot be changed after an attribute is defined</li>
 </ul>
 </li>
 	<li>Check 'Allow password' to make it possible to associate a password with this attribute.</li>
@@ -34,16 +38,24 @@
 	<li>Check 'Display in check-out' to make this attribute visible in the patron's short detail display on the left of the checkout screen and other patron pages</li>
 	<li>Authorized value category; if one is selected, the patron record input page will only allow values to be chosen from the authorized value list.
 <ul>
-	<li>You will first need to add an authorized value list for it to appear in this menu</li>
-	<li>An authorized value list is not enforced during batch patron import.</li>
+	<li>You will first need to add an authorized value list for it to appear in this menu
+<ul>
+	<li><em>Get there: </em>More &gt; Administration &gt; Basic Parameters &gt; Authorized Values</li>
 </ul>
 </li>
+	<li style="color: #990000;"> Important: an authorized value list is not enforced during batch patron import.</li>
+</ul>
+</li>
+	<li>If you'd like to only show this attribute on patrons of one type choose that patron type from the 'Category' pull down</li>
+	<li>If you have a lot of attributes it might be handy to group them so that you can easily find them for editing. If you create an Authorized Value for PA_CLASS it will show in the 'Class' pull down and you can then change your attributes page to have sections of attributes</li>
 	<li>Click Save to save your new attribute</li>
 </ul>
 
-<p>Once added your attribute will appear on the list of attributes and also on the patron record add/edit form</p>
+<p>Once added your attribute will appear on the list of attributes and also on the patron record add/edit form</o>
+
+<p>If you have set up classes for organizing attributes they will appear that way on the add/edit patron form</p>
 
-<h2>Editing/Deleting patron attributes</h2>
+<h3>Editing/Deleting Patron Attributes</h3>
 
 <p>Each patron attribute has an edit and a delete link beside it on the list of attributes.</p>
 
@@ -57,6 +69,6 @@
 
 <p>You will be unable to delete an attribute if it's in use.</p>
 
-<p><strong>See the full documentation for patron attribute types in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#patronattributetypes">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Attribute Types in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#patronattributetypes">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
index bdb40f5..22900c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>System preferences</h1>
+<h1>System Preferences</h1>
 
 <p>Global system preferences control the way your Koha system works in general. Set these preferences before anything else in Koha.</p>
 
@@ -21,18 +21,18 @@
 		<li><strong>Cataloging:</strong> holds preferences that control the cataloging functions.  This is where you choose your MARC flavor, set up Z39.50 and barcoding.</li>
 		<li><strong>Circulation:</strong> holds preferences that control circulation functions such as holds and  fines.</li>
 		<li><strong>Creators:</strong> this tab contains preferences related to modules that create objects.</li>
-        <li><strong>Enhanced content:</strong> holds preferences that will add content from outside sources to your OPAC and Staff Client.  This is where you can turn on cover images, FRBR and tagging.</li>
+		<li><strong>Enhanced Content:</strong> holds preferences that will add content from outside sources to your OPAC and Staff Client.  This is where you can turn on cover images, FRBR and tagging.</li>
 		<li><strong>I18N/L10N:</strong> holds preferences related to internationalization and localization such as date formats and languages.</li>
-        <li><strong>Local use:</strong> this tab will usually be empty unless your library has a preference just for your library.</li>
+		<li><strong>Local Use:</strong> this tab will usually be empty unless your library has a preference just for your library.</li>		
 		<li><strong>Logs:</strong> turn on/off logging functionality in your system.</li>
 		<li><strong>OPAC:</strong> customize the OPAC and OPAC functions (aside from the Enhanced Content preferences).</li>
 		<li><strong>Patrons:</strong> holds preferences that control how your system handles patron functions.  Some preferences include the minimum password length and membership number settings.</li>
 		<li><strong>Searching:</strong> holds preference related to advanced search functions such as removing stop words or allowing stemming.</li>
 		<li><strong>Serials</strong> holds all preferences related to managing serial subscriptions.</li>
-        <li><strong>Staff client:</strong> customize the staff client by editing the stylesheet and navigation menu.</li>
-        <li><strong>Web services:</strong> includes preferences related to services like OAI-PMH.</li>
+		<li><strong>Staff Client:</strong> customize the staff client by editing the stylesheet and navigation menu.</li>
+		<li><strong>Web Services:</strong> includes preferences related to services like OAI-PMH.</li>
 	</ul>
 	
-<p><strong>See the full documentation for system preferences in the <a href="http://manual.koha-community.org/3.6/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/3.8/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
index bc4522f..5874a98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Printer administration</h1>
+<h1>Printer Administration</h1>
 
 <p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
index aab8858..926175a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
@@ -1,15 +1,15 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Adding road types</h1>
+<h1>Adding Road Types</h1>
 
-<p>To add a road type, click 'New road type' and then enter the road type the way you'd like it displayed.</p>
+<p>To add a road type, click 'New Road Type' and then enter the road type the way you'd like it displayed.</p>
 
 <p>Once you submit the form, your new road type will be listed on the Road Types page</p>
 
-<h2>Viewing road types on patron add form</h2>
+<h2>Viewing Road Types on Patron Add form</h2>
 
 <p>When adding or editing a patron, if you have road types defined, there will be a pull down to choose the road type from.</p>
 
-<p><strong>See the full documentation for road types in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#roadtypes">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Road Types in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#roadtypes">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
index 4cb116f..4b42c30 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
@@ -1,10 +1,15 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Circulation and fines rules</h1>
+<h1>Circulation and Fines Rules</h1>
 
 <p>These rules define how your items are circulated, how/when fines are calculated and how holds are handled.</p>
 
+<ul>
+	<li><em>Get there:</em> More &gt; Administration &gt; Patrons &amp; Circulation &gt; Circulation and fines rules</li>
+</ul>
+
 <p>The rules are applied from most specific to less specific, using the first found in this order:</p>
+
 <ul>
 	<li>same library, same patron type, same item type</li>
 	<li>same library, same patron type, all item type</li>
@@ -16,31 +21,43 @@
 	<li>all libraries, all patron types, all item types</li>
 </ul>
 
-<p style="background-color: #ffe599;">Tip: If you are a single library system choose your library name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)</p>
+<p style="background-color: #ffe599;">Tip: If you are a single library system choose your branch name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)
 
-<p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.</p>
+<p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.
 
-<h2>Default circulation rules</h2>
+<h3>Default Circulation Rules</h3>
 
-<p>Using the issuing rules matrix you can define rules that depend on patron/item type combos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all libraries):</p>
+<p>Using the issuing rules matrix you can define rules that depend on patron/item type combos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all branches)</p>
 
 <p>From the matrix you can choose any combination of patron categories and item types to apply the rules to</p>
+
 <ul>
 	<li>First choose which patron category you'd like the rule to be applied to. If you leave this to 'All' it will apply to all patron categories</li>
 	<li>Choose the 'Item Type' you would like this rule to apply to. If you leave this to 'All' it will apply to all item types</li>
 	<li>Limit the number of items a patron can have checked out at the same time by entering a number in the 'Current Checkouts Allowed' field</li>
-	<li>Define the period of time and item can be checked out to a patron by entering the number of days in the 'Loan Period' box.</li>
+	<li>Define the period of time an item can be checked out to a patron by entering the number of units (days or hours) in the 'Loan Period' box.</li>
+	<li>Choose which unit of time, Days or Hours, that the loan period and fines will be calculate in</li>
 	<li>You can also define a hard due date for a specific patron category and item type. A hard due date ignores your usual circulation rules and makes it so that all items of the type defined are due on, before or after the date you specify.</li>
-	<li>'Fine Amount' should have the amount you would like to charge for overdue items</li>
+	<li>'Fine Amount' should have the amount you would like to charge for overdue items
 <ul>
-    <li>Important: Enter only numbers and decimal points (no currency symbols).</li>
+	<li style="color: #990000;">Important: Enter only numbers and decimal points (no currency symbols).</li>
+
 </ul>
-    <li>The 'Fine grace period' is the period of time an item can be overdue before you start charging fines.</li>
-    <li>Enter the 'Fine charging interval' in days (ex. charge fines every 1 day, or every 2 days)</li>
-    <li>If your library 'fines' patrons by suspending their account you can enter the number of days their fine should be suspended in the 'Suspension in days' field</li>
-    <li>Next decide if the patron can renew this item type and if so, enter how many times they can renew it in the 'Renewals allowed' box</li>
-    <li>If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds allowed' field</li>
-    <li>Finally, if you charge a rental fee for the item type and want to give a specific patron type a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental discount' field</li>
+</li>
+	<li>Enter the 'Fine Charging Interval' in the unit you set (ex. charge fines every 1 day, or every 2 hours)</li>
+	<li>The 'Fine Grace Period' is the period of time an item can be overdue before you start charging fines.
+<ul>
+	<li style="color: #990000;">Important: This can only be set for the Day unit, not in Hours</li>
+</ul>
+</li>
+	<li>If your library 'fines' patrons by suspending their account you can enter the number of days their fine should be suspended in the 'Suspension in Days' field
+<ul>
+	<li style="color: #990000;">Important: This can only be set for the Day unit, not in Hours</li>
+</ul>
+</li>
+	<li>Next decide if the patron can renew this item type and if so, enter how many times they can renew it in the 'Renewals Allowed' box</li>
+	<li>If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds Allowed' field</li>
+	<li>Finally, if you charge a rental fee for the item type and want to give a specific patron type a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental Discount' field</li>
 </ul>
 
 <p>When finished, click 'Add' to save your changes. To modify a rule, create a new one with the same patron type and item type. If you would like to delete your rule, simply click the 'Delete' link to the right of the rule.</p>
@@ -49,42 +66,73 @@
 
 <p>After choosing to clone you will be presented with a confirmation message.</p>
 
-<h2>Default checkouts and hold policy</h2>
+<h3>Default Checkouts and Hold Policy</h3>
 
 <p>You can set a default maximum number of checkouts and hold policy that will be used if none is defined below for a particular item type or category.</p>
 
 <p>From this menu you can set a default to apply to all item types and patrons in the library.</p>
+
 <ul>
-    <li>In 'Total current checkouts allowed' enter the total number of items patrons can have checked out at one time</li>
-    <li>Control where patrons can place holds from using the 'Hold policy' menu</li>
+	<li>In 'Total Current Checkouts Allowed' enter the total number of items patrons can have checked out at one time</li>
+	<li>Control where patrons can place holds from using the 'Hold Policy' menu
 <ul>
-    <li>From any library: Patrons from any library may put this item on hold. (default if none is defined)</li>
-    <li>From home library: Only patrons from the item's home library may put this book on hold.</li>
-    <li>No holds allowed: No patron may put this book on hold.</li>
+	<li>From Any Library: Patrons from any library may put this item on hold. (default if none is defined)</li>
+	<li>From Home Library: Only patrons from the item's home library may put this book on hold.</li>
+	<li>No Holds Allowed: No patron may put this book on hold.</li>
 </ul>
+</li>
+	<li>Control where the item returns to once it is checked in
+<ul>
+	<li>Item returns home</li>
+	<li>Item returns to issuing branch</li>
+	<li>Item floats
+<ul>
+	<li>When an item floats it stays where it was checked in and does not ever return 'home'</li>
+</ul>
+</li>
+</ul>
+</li>
 	<li>Once your policy is set, you can unset it by clicking the 'Unset' link to the right of the rule</li>
 </ul>
-<h2>Checkouts per patron</h2>
+
+<h3>Checkouts Per Patron</h3>
 
 <p>For this library, you can specify the maximum number of loans that a patron of a given category can make, regardless of the item type.</p>
 
 <p style="background-color: #ffe599;">Tip: If the total amount loanable for a given patron category is left blank, no limit applies, except possibly for a limit you define for a specific item type.</p>
 
-<h2>Item hold policies</h2>
+<h3>Item Hold Policies</h3>
 
-<p>For this library, you can edit rules for given itemtypes, regardless of the patron's category. Currently, this means hold policies.</p>
+For this library, you can edit rules for given itemtypes, regardless of the patron's category. Currently, this means hold policies.
+
+<p>The various Hold Policies have the following effects:</p>
 
-<p>The various policies have the following effects:</p>
 <ul>
-    <li>From any library: Patrons from any library may put this item on hold. (default if none is defined)</li>
-    <li>From home library: Only patrons from the item's home library may put this book on hold.</li>
-    <li>No holds allowed: No patron may put this book on hold.</li>
+	<li>From Any Library: Patrons from any library may put this item on hold. (default if none is defined)</li>
+	<li>From Home Library: Only patrons from the item's home library may put this book on hold.</li>
+	<li>No Holds Allowed: No patron may put this book on hold.</li>
 </ul>
 
 <p style="color: #990000;">Important: Note that if the system preference AllowHoldPolicyOverride set to 'allow', these policies can be overridden by your circulation staff.</p>
 
-<p style="color: #990000;">Important: These policies are based on the patron's home library, not the library that the reserving staff member is from.</p>
+<p style="color: #990000;">Important: These policies are based on the patron's home branch, not the branch that the reserving staff member is from.</p>
+
+<p>The various Return Policies have the following effects:</p>
+
+<ul>
+	<li>Item returns home: The item will prompt the librarian to transfer the item to its home library
+<ul>
+	<li style="color: #990000;">Important: If the AutomaticItemReturn preference is set to automatically transfer the items home, then a prompt will not appear</li>
+</ul>
+</li>
+	<li>Item returns to issuing branch: The item will prompt the librarian to transfer the item back to the library where it was checked out
+<ul>
+	<li style="color: #990000;">Important: If the AutomaticItemReturn preference is set to automatically transfer the items home, then a prompt will not appear</li>
+</ul>
+</li>
+	<li>Item floats: The item will not be transferred from the branch it was checked in at, instead it will remain there until transferred manually or checked in at another branch</li>
+</ul>
 
-<p><strong>See the full documentation for circulation and fine rules in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation and Fine Rules in the <a href="http://manual.koha-community.org/3.8/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
index 2081d98..bbdda18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Stop words</h1>
+<h1>Stop Words</h1>
 
 <p style="color: #990000">Important: If NoZebra is set to 'Use' this option will not appear on the administration menu</p>
 
@@ -8,10 +8,10 @@
 
 <p>Koha comes with a standard list of stop words that can be edited by visiting the Stop Word administration area.</p>
 
-<p>To add a new stop word to the list, click the 'New stop word' button and add the word you'd like ignored</p>
+<p>To add a new stop word to the list, click the 'New Stop Word' button and add the word you'd like ignored</p>
 
 <p style="color: #990000">Important: If you change something in this table, ask your administrator to run misc/batchRebuildBiblioTables.pl script.</p>
 
-<p><strong>See the full documentation for stop words in the <a href="http://manual.koha-community.org/3.6/en/additionaladmin.html#stopwordsadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Stop Words in the <a href="http://manual.koha-community.org/3.8/en/additionaladmin.html#stopwordsadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
index 4eec624..eefbced 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Z39.50 servers</h1>
+<h1>Z39.50 Servers</h1>
 
 <p>Koha has a powerful copy cataloging tool. Using Koha you can connect to any Z39.50 target that is publicly available or that you have the log in information to.</p>
 
@@ -8,16 +8,16 @@
 
 <p>To find additional targets you use IndexData's IRSpy: <a href="http://irspy.indexdata.com">http://irspy.indexdata.com</a></p>
 
-<h2>Add a Z39.50 target</h2>
+<h2>Add a Z39.50 Target</h2>
 <ul>
-    <li>From the main Z39.50 page, click 'New Z39.50 server'
+	<li>From the main Z39.50 page, click 'New Z39.50 Server'
 <ul>
 	<li>Userid and Password are only required for servers that are password protected</li>
 </ul>
 </li>
 </ul>
 
-<h2>Suggested Z39.50 targets</h2>
+<h2>Suggested Z39.50 Targets</h2>
 
 <p>The following targets have been used successfully by other Koha libraries (in the Americas):</p>
 
@@ -38,6 +38,6 @@
 	<li>VANCOUVER PUBLIC LIBRARY z3950.vpl.ca:210 Horizon</li>
 </ul>
 
-<p><strong>See the full documentation for Z39.50 servers in the <a href="http://manual.koha-community.org/3.6/en/additionaladmin.html#z3950admin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Z39.50 Servers in the <a href="http://manual.koha-community.org/3.8/en/additionaladmin.html#z3950admin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Fri Apr 13 19:56:43 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 13 Apr 2012 13:56:43 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Offline Circ Help for 3.8
Message-ID: <1334339803-1818-1-git-send-email-nengard@bywatersolutions.com>

This is missing a new file for the Firefox plugin because
I haven't documented it yet because I can't get it to work.
---
 .../prog/en/modules/offline_circ/process_koc.tt    |   88 ++------------------
 1 files changed, 8 insertions(+), 80 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
index a101023..1389cd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
@@ -1,87 +1,15 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Circulation &rsaquo; Offline circulation file upload</title>
-[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'file-upload.inc' %]
-[% INCLUDE 'background-job.inc' %]
-<script type="text/javascript">
-//<![CDATA[
-$(document).ready(function(){
-	$("#processfile").hide();
-});
-function CheckUpload(f){
-	if(f.fileToUpload.value == ""){
-		alert(_("Please choose a file to upload"));
-	} else {
-		return ajaxFileUpload()
-	}
-		return false;
-}
-function CheckForm(f) {
-    if (f.uploadedfileid.value == '') {
-        alert(_('Please upload a file first.'));
-    } else {
-		$("#fileuploadstatus").hide();
-		$("#fileuploadform").slideUp();
-        return submitBackgroundJob(f);
-    }
-    return false;
-}
+[% INCLUDE 'help-top.inc' %]
 
-//]]>
-</script>
-<style type="text/css">
-	#fileuploadstatus,#jobstatus { margin:.4em; }
-	#fileuploadprogress,#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; }
-</style>
-</head>
-<body id="ocirc_process_koc" class="circ ocirc">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'circ-search.inc' %]
+<h1>Offline Circulation File (.koc) Uploader</h1>
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; [% IF ( transactions_loaded ) %] <a href="/cgi-bin/koha/offline_circ/process_koc.pl">Offline circulation file upload</a> &rsaquo; Results[% ELSE %] Offline circulation file upload[% END %]</div>
+<p>The offline circulation tool for Windows will generate a KOC file that you can upload into Koha once your system comes back up.</p>
 
-<div id="doc" class="yui-t7">
+<p>Browse your computer for the *.koc file</p>
 
-   <div id="bd">
+<p>Once the file is uploaded, click the process the file</p>
 
-[% IF ( transactions_loaded ) %]
-  <h2>Koha offline circulation</h2>
-  <p>Your data was processed. Here are the results:</p>
-  [% FOREACH message IN messages %]
-    [% IF ( message.message ) %]
-	<div class="dialog alert">
-		[% IF ( message.ERROR_file_version ) %]<p>Warning: This file is version [% message.upload_version %], but I only know how to import version [% message.current_version %]. I'll try my best.</p>[% END %]
-	</div>
-	[% END %]
-	[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.</p>[% END %]
-	[% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
-	[% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a>  ([% message.barcode %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
-	[% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber %]">[% message.title |html %]</a> ([% message.barcode %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
-	[% IF ( message.payment ) %]<p>Accepted payment ([% message.amount %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber %]">[% message.firstname %] [% message.surname %]</a> ([% message.cardnumber %]): [% message.datetime %]</p>[% END %]
-  [% END %]
-[% ELSE %]
-  <h2>Upload offline circulation data</h2>
-   <div id="fileuploadform">
-     <form method="post" action="[% SCRIPT_NAME %]" enctype="multipart/form-data">
-		<fieldset class="brief">
-       <ol><li><label for="fileToUpload">Choose .koc file: </label>
-       <input type="file" id="fileToUpload" size="50" name="fileToUpload" /></li></ol>
-	   <fieldset class="action"><input type="button" class="submit" value="Upload file" onclick="CheckUpload(this.form);" /></fieldset>
-	   </fieldset>
-     </form>
-     <div id="fileuploadstatus" style="display:none">Upload progress: <div id="fileuploadprogress"></div> <span id="fileuploadpercent">0</span>%</div>
-     <div id="fileuploadfailed" style="display:none"></div>
-   </div>
-   <form action="process_koc.pl" id="processfile" method="post" enctype="multipart/form-data">
-     <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
-     <input type="hidden" name="runinbackground" id="runinbackground" value="" />
-     <input type="hidden" name="completedJobID" id="completedJobID" value="" />
-     <input type="submit" value="Process offline circulation file" onclick="return CheckForm(this.form);" id="mainformsubmit" />
-     <div id="jobstatus" style="display:none">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
-     <div id="jobfailed" style="display:none"></div>
-   </form>
-[% END %]
+<p>When this is complete you'll see the summary of actions from when you were offline (including any errors).</p>
 
+<p><strong>See the full documentation for the Offline Circulation File Uploader in the <a href="http://manual.koha-community.org/3.8/en/offlinecirc.html">manual</a> (online).</strong></p>
 
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Fri Apr 13 19:58:42 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 13 Apr 2012 13:58:42 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Help for Serials in 3.8
Message-ID: <1334339922-1875-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/serials/checkexpiration.tt     |  133 +--
 .../prog/en/modules/serials/claims.tt              |  408 +-----
 .../prog/en/modules/serials/routing.tt             |   98 +--
 .../prog/en/modules/serials/serials-collection.tt  |  280 +----
 .../prog/en/modules/serials/serials-edit.tt        |  446 +------
 .../prog/en/modules/serials/serials-home.tt        |  159 +--
 .../prog/en/modules/serials/subscription-add.tt    | 1537 ++------------------
 .../prog/en/modules/serials/subscription-detail.tt |  392 +-----
 8 files changed, 151 insertions(+), 3302 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
index 272f19e..369ba8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -1,132 +1,13 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials &rsaquo; Check expiration</title>
-[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-<script type="text/javascript" language="JavaScript">
-// <![CDATA[
-    /**
-     *  Function CheckForm
-     *  This function checks the form before submit
-     */
-     function CheckForm(form){
-        if(form.date.value){
-            return true;
-        }
-        else {
-            alert(_("You must enter a date !"));
-            document.f.date.focus();
-            return false;
-        }
-     }
+[% INCLUDE 'help-top.inc' %]
 
-	function popup(subscriptionid) {
-	   newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
-	}
+<h1>Check Serial Expiration</h1>
 
-     // ]]>
-</script>
-<!-- End of additions -->
-</head>
-<body id="ser_checkexpiration" class="ser">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'serials-search.inc' %]
+<p>When adding serials you enter a subscription length, using the check expiration tool you can see when your subscriptions are about to expire. To use the tool click the link to 'Check expiration' on the serials menu.</p>
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Check expiration </div>
+<p>In the form that appears you need to enter at least a date to search by.</p>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
+<p>In your results you will see all subscriptions that will expire before the date you entered. From there you can choose to view the subscription further or renew it in one click.</P>
 
-<h1>Check expiration</h1>
+<p><strong>See the full documentation for Checking Serial Expiration in the <a href="http://manual.koha-community.org/3.8/en/serialexpiration.html">manual</a> (online).</strong></p>
 
-    <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
-<fieldset class="rows">
-    <legend>Filter results :</legend>
-    
-         <ol>
-        <li><label for="title">Title:</label>
-        <input id="title" type="text" name="title" size="15" value="[% title %]" /></li>
-
-        <li><label for="issn">ISSN:</label>
-        <input id="issn" type="text" name="issn" size="15" value="[% issn %]" /></li>
-
-        <li><label for="date" class="required" title="Required field">Expiring before:</label>
-        <input id="date" type="text" name="date" size="10" value="[% date %]" class="focus" />
-                <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendar" style="cursor: pointer;" />
-            <script type="text/javascript">
-                Calendar.setup(
-                 {
-					button : "openCalendar",
-                     inputField : "date",
-                     ifFormat : "[% DHTMLcalendar_dateformat %]"
-                 }
-                );
-            </script> <span class="required">Required</span>
-			<div class="hint">[% INCLUDE 'date-format.inc' %]</div></li>
-			</ol>
-        
-</fieldset>
-<fieldset class="action"><input type="submit" value="Search" /></fieldset>
-</form>
-
-[% IF ( subscriptions_loop ) %]
-<p>
-    <b>[% numsubscription %]</b> subscription(s)
-        [% IF ( title ) %]
-        with title matching <span class="title">[% title %]</class>
-        [% IF ( issn ) %]and [% END %]
-    [% END %]
-    [% IF ( issn ) %]
-        with ISSN matching <b>[% issn %]</b>
-    [% END %]
-        will expire before <b>[% date %]</b>
-</p>
-<table>
-        <tr>
-            <th>ISSN</th>
-            <th>Title</th>
-            <th>Note</th>
-            <th>Expiration date</th>
-			<th colspan="2">&nbsp;</th>
-        </tr>
-    [% FOREACH subscriptions_loo IN subscriptions_loop %]
-        [% IF ( subscriptions_loo.toogle ) %]
-        <tr class="highlight">
-        [% ELSE %]
-        <tr>
-        [% END %]
-            <td>
-                [% subscriptions_loo.issn %]
-            </td>
-            <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptions_loo.subscriptionid |url %]">[% IF ( subscriptions_loo.title ) %]
-                    [% subscriptions_loo.title |html %]
-                [% ELSE %]
-                    |
-                [% END %]
-                </a>
-            </td>
-            <td>
-                [% subscriptions_loo.notes %]
-            </td>
-            <td>
-                [% subscriptions_loo.expirationdate %]
-            </td>
-			<td><a href="/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=[% subscriptions_loo.subscriptionid %]">Edit</a></td>
-			<td><a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid %]" onclick="popup([% subscriptions_loo.subscriptionid %]); return false;">Renew</a></td>
-        </tr>
-    [% END %]
-    </table>
-[% ELSE %]
-    <p>No results for your query</p>
-[% END %]
-
-</div>
-</div>
-
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index 399c933..c6d8ade 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -1,408 +1,18 @@
-[% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Serials &rsaquo; Claims</title>
-    [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.uitablefilter.js"></script>
-<script type="text/JavaScript" language="JavaScript">
-//<![CDATA[
-	 $(document).ready(function() {
-		[% UNLESS ( preview ) %]$("#claimst").tablesorter({[% IF ( dateformat == 'metric' ) %]
-			dateFormat: 'uk',[% END %]
-			headers: { 0: { sorter: false },1:{sorter:false}}
-		});[% END %]
-	    $('#supplierid').change(function() {
-    	    $('#claims').submit();
-	    });
+[% INCLUDE 'help-top.inc' %]
 
-	    // Case-insensitive version of jquery's contains function
-	    jQuery.extend(
-		jQuery.expr[':'], { 
-		    icontains : "jQuery(a).text().toUpperCase().indexOf(m[3].toUpperCase())>=0" 
-		}
-	    );
+<h1>Serials Claims</h1>
 
+<p>Koha can send email messages to your serial vendors if you have late issues. To the left of the main serials page there is a link to 'Claims'</p>
 
-	    // Checkboxes : Select All / None
-	    $("span.checkall").html("<input type=\"checkbox\" name=\"CheckAll\"> "+_("Check All")+"</input>");
-	    $("span.exportSelected").html("<a id=\"ExportSelected\" href=\"/cgi-bin/koha/serials/claims.pl\"> "+_("Export selected items data") +"<\/a>");
+<p>The links to claims also appears to the left of the subscription detail page</p>
 
-        $("#CheckAll").click(function() {
-            $("#claimst tr:visible :checkbox").attr('checked', $("#CheckAll").is(':checked'));
-        });
+<p>If you don't have a claim notice defined yet you will see a warning message that you need to first define a notice.</p>
 
-	    // Generates a dynamic link for exporting the selection's data as CSV
-	    $("#ExportSelected").click(function() {
-		// We use input:checked because it's faster, but if there must new checkboxes  
-		// used for other purpose on this page, please use [name=serialid]:checked instead
-		var selected = $("input:checked");
+<p>Clicking 'Claims' will open a report that will ask you to choose from your various serial vendors to generate claims for late issues.</p>
 
-		if (selected.length == 0) {
-			alert(_('Please select at least one item to export.'));
-			return false;
-		}
-		
-		// Building the url from currently checked boxes
-		var url = '/cgi-bin/koha/serials/lateissues-excel.pl?supplierid=&amp;op=claims';
-		for (var i = 0; i < selected.length; i++) {
-		    url += '&amp;serialid=' + selected[i].value;
-		}
-		// And redirecting to the CSV page
-		location.href = url;
-		return false;
-	    });	
+<p>From the list of late issues you can choose which ones you want to send a claim email to by clicking the checkbox to the left of late issue, choosing the notice template to use and clicking the 'Send notification' button.</p>
 
-        $("#titlefilter").keyup(function() {
-            $.uiTableFilter($("#claimst"), $("#titlefilter").val())
-	    });
+<p><strong>See the full documentation for Serial Claims in the <a href="http://manual.koha-community.org/3.8/en/serialclaims.html">manual</a> (online).</strong></p>
 
-        $("#branchfilter").keyup(function() {
-            $.uiTableFilter($("#claimst"), $("#branchfilter").val())
-	    });
-	 });
+[% INCLUDE 'help-bottom.inc' %]
 
-	// Checks if the form can be sent (at least one checkbox must be checked)
-	function checkForm() {
-	    if ($("input:checked").length == 0) {
-		alert(_('Please select at least one item.'));
-		return false;
-	    }
-	}
-
-	// Filter by status
-	function filterByStatus() {
-	    selectedStatus = $("#statusfilter").val();
-	    if (selectedStatus == "all") {
-		clearFilters();
-	    } else {
-		$("table#claimst tbody tr").hide();
-		$("table#claimst tbody tr:contains(" + selectedStatus + ")").show();
-	    }
-	}
-
-	// Filter by branch
-	function filterByBranch() {
-	    selectedBranch = $("#branchfilter").val();
-	    if (selectedBranch == "all") {
-		clearFilters();
-	    } else {
-		$("table#claimst tbody tr").hide();
-		$("table#claimst tbody tr:contains(" + selectedBranch + ")").show();
-	    }
-	}
-	// Filter by date
-	function filterByDate() {
-	    var beginDate = Date_from_syspref($("#begindate").val()).getTime();
-	    var endDate   = Date_from_syspref($("#enddate").val()).getTime();
-	    
-	    // Checks if the beginning date is valid
-	    if (!parseInt(beginDate)) {
-		alert(_('The beginning date is missing or invalid.'));
-		return false;
-	    }
-
-	    // Checks if the ending date is valid
-	    if (!parseInt(endDate)) {
-		alert(_('The ending date is missing or invalid.'));
-		return false;
-	    }
-
-	    // Checks if beginning date is before ending date
-	    if (beginDate > endDate) {
-		// If not, we swap them
-		var tmpDate = endDate;
-		endDate = beginDate;
-		beginDate = tmpDate;
-	    }
-	   
-	    // We hide everything
-	    $("table#claimst tbody tr").hide();
-
-	    // For each date in the table
-	    $(".planneddate").each(function() {
-
-		// We make a JS Date Object, according to the locale
-		var pdate = Date_from_syspref($(this).text()).getTime();
-
-		// And checks if the date is between the beginning and ending dates
-		if (pdate > beginDate && 
-		    pdate < endDate) {
-			// If so, we can show the row
-			$(this).parent().show();
-		    }
-
-	    });
-	}
-
-	// Clears filters : shows everything
-	function clearFilters() {
-	    $("table#claimst tbody tr").show();
-	}
-
-	function popup(supplierid,serialid){
-		window.open('claims.pl?supplierid='+ supplierid +'&amp;serialid='+ serialid +'&amp;op=preview' ,'popup', 'width=600,height=400,toolbar=no,scrollbars=yes');
-	}
-
-//]]>
-</script>
-[% INCLUDE 'calendar.inc' %]
-</head>
-<body id="ser_claims" class="ser">
-    [% INCLUDE 'header.inc' %]
-[% UNLESS ( preview ) %]
-    [% INCLUDE 'serials-search.inc' %]
-[% END %]
-
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Claims</div>
-
-[% UNLESS ( preview ) %]
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
-
-    <h1>Claims</h1>
-
-[% IF ( letter ) %][% UNLESS ( missingissues ) %][% IF ( supplierid ) %] <div class="dialog alert">No missing issues found.</div>[% ELSE %]<div class="dialog message">Please choose a vendor.</div>[% END %][% END %][% END %]
-	
-	     [% IF ( SHOWCONFIRMATION ) %]
-     <div class="dialog alert">Your notification has been sent.</div>
-     [% END %]
-[% UNLESS ( letter ) %]<div class="dialog alert">No claims notice defined. <a href="/cgi-bin/koha/tools/letter.pl">Please define one</a>.</div>[% END %]
-    <form id="claims" name="claims" action="claims.pl" method="post">
-    <fieldset>
-	    <label for="supplierid">Vendor: </label>
-	    <select id="supplierid" name="supplierid">
-	        [% FOREACH suploo IN suploop %]
-	            [% IF ( suploo.selected ) %]
-	            <option value="[% suploo.id %]" selected="selected" >
-	            [% ELSE %]
-	            <option value="[% suploo.id %]">
-	            [% END %]
-	                [% suploo.name %]
-	                ([% suploo.count %])
-	            </option>
-	        [% END %]
-	    </select>
-        <input type="submit" value="OK" />
-        [% IF ( phone ) %]Phone: [% phone %][% END %]
-        [% IF ( booksellerfax ) %]Fax: [% booksellerfax %][% END %]
-        [% IF ( bookselleremail ) %]</p><p><a href="mailto:[% bookselleremail %]">[% bookselleremail %]</a>[% END %]
-    </fieldset>
-</form>
-
-   [% IF ( missingissues ) %]	
-    <h3>Missing issues</h3>
-    <form action="claims.pl" onsubmit="return false;">
-	<fieldset class="rows">
-	<legend>Filters :</legend>
-	
-	<ol>
-	<li>
-	    <label for="statusfilter">Status : </label>
-	    <select id="statusfilter" onchange="filterByStatus();">
-		<option value="all" selected="selected">(All)</option>
-		<option>Expected</option>
-		<option>Arrived</option>
-		<option>Late</option>
-		<option>Missing</option>
-		<option>Claimed</option>
-	    </select>
-	</li>
-	
-	<li>
-	    <label for="titlefilter">Title : </label>
-	    <input id="titlefilter" type="text" />
-	    <label for="branchfilter">Library: </label>
-	    <select id="branchfilter" onchange="filterByBranch();">
-            [% FOREACH branchloo IN branchloop %]
-                [% IF ( branchloo.selected ) %]
-                <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
-                [% ELSE %]
-                <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
-                [% END %]
-            [% END %]
-        </select>
-	</li>
-	
-	<li>
-	    <label for="begindate">From</label>
-        <img src="[% themelang %]/lib/calendar/cal.gif" id="begindatebutton" style="cursor: pointer;" alt="Show calendar" title="Show Calendar" />
-	    <input type="text" name="begindate" id="begindate" value="[% begindate %]" size="10" maxlength="10" />
-	    <script type="text/javascript">
-		 //<![CDATA[ 
-		Calendar.setup({
-		    inputField	: "begindate", 
-		    button		: "begindatebutton",
-		    ifFormat	: "[% DHTMLcalendar_dateformat %]"
-		});
-		//]]>
-	    </script>
-
-	    <label for="enddate" style="float:none;">To</label>
-        <img src="[% themelang %]/lib/calendar/cal.gif" id="enddatebutton" style="cursor: pointer;" alt="Show calendar" title="Show Calendar" />
-	    <input type="text" name="enddate" id="enddate" value="[% enddate %]" size="10" maxlength="10" />
-	    <script type="text/javascript">
-		 //<![CDATA[ 
-		 Calendar.setup({
-		    inputField      : "enddate", 
-		    button          : "enddatebutton",
-		    ifFormat        : "[% DHTMLcalendar_dateformat %]"
-		});
-		//]]>
-	    </script> <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
-	    <input type="button" value="OK" onclick="filterByDate();" />
-        </li>
-	
-	<li>
-        <input type="reset" value="Clear filters" onclick="clearFilters();" />
-	</li>
-	</ol>
-	</fieldset>
-    </form>
-
-    <fieldset>
-	<form action="claims.pl" method="post" class="checkboxed" onsubmit="return checkForm()">
-        <input type="hidden" name="order" value="[% order %]" />
-         <table id="claimst">
-                <thead><tr>
-                    [% IF ( letter ) %]
-                    <th><input type="checkbox" id="CheckAll"></th>
-                    [% END %]
-                    <th>Vendor</th>
-                    <th>Library</th>
-                    <th>Title</th>
-                    <th>Issue number</th>
-                    <th>Status</th>
-                    <th>Since</th>
-                    <th>Claim date</th>
-                <th>Begin claim</th>
-                </tr></thead>
-                <tbody>[% FOREACH missingissue IN missingissues %]
-                    <tr>
-                        [% IF ( letter ) %]
-                            <td>
-                    <input type="checkbox" name="serialid" value="[% missingissue.serialid %]" />
-                            </td>
-                        [% END %]
-                        <td>
-                        [% missingissue.name %]
-                        </td>
-                        <td>
-                        [% missingissue.branchcode %]
-                        </td>
-                        <td>
-                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid %]">[% missingissue.title |html %]</a>
-                        </td>
-                        <td>
-                        [% missingissue.serialseq %]
-                        </td>
-                        <td>
-                            [% IF ( missingissue.status1 ) %]Expected[% END %]
-                            [% IF ( missingissue.status2 ) %]Arrived[% END %]
-                            [% IF ( missingissue.status3 ) %]Late[% END %]
-                            [% IF ( missingissue.status4 ) %]Missing[% END %]
-                            [% IF ( missingissue.status7 ) %]Claimed[% END %]
-                        </td>
-                        <td class="planneddate">
-                        [% missingissue.planneddate %]
-                        </td>
-                        <td>
-                        [% missingissue.claimdate %]
-                        </td>
-                        <td>
-                            <a href="/cgi-bin/koha/serials/lateissues-excel.pl?supplierid=[% missingissue.supplieri %]&amp;serialid=[% missingissue.serialid %]&amp;op=claims">Export item data</a>
-                        </td>
-                    </tr>
-                [% END %]</tbody>
-            </table>
-	     <p><span class="exportSelected"></span></p>
-
-[% IF ( letter ) %]
-        <fieldset class="action"> <label for="letter_code">Select notice:</label>
-            <select name="letter_code" id="letter_code">
-                [% FOREACH letter IN letters %]
-                    <option value="[% letter.code %]">[% letter.name %]</option>
-                [% END %]
-			</select>
-	    <input type="hidden" name="op" value="send_alert" /><input type="submit" name="submit" class="button" value="Send notification" /></fieldset>
-            [% END %]
-        </form>
-    </fieldset>
-[% END %]
-
-[% ELSE %]
-
-<div id="doc" class="yui-t7">
-   <div id="bd">
-	
-[% IF ( supplierloop ) %]
-        [% FOREACH supplierloo IN supplierloop %]
-        [% IF ( supplierloo.name ) %]
-        <p><b>[% supplierloo.name %]</b><br />
-        [% END %]
-        [% IF ( supplierloo.postal ) %]
-        [% supplierloo.postal %]<br />
-        [% END %]
-        [% IF ( supplierloo.contphone ) %]
-        Ph: [% supplierloo.contphone %]<br />
-        [% END %]
-        [% IF ( supplierloo.contfax ) %]
-        Fax: [% supplierloo.contfax %]<br />
-        [% END %]
-        [% IF ( supplierloo.contemail ) %]
-        Email: [% supplierloo.contemail %]<br />
-        [% END %]
-        [% IF ( supplierloo.accountnumber ) %]
-        A/C: [% supplierloo.accountnumber %]</p>
-        [% END %]
-        [% IF ( supplierloo.contact ) %]
-        <p>Dear [% supplierloo.contact %]</p>
-        [% ELSE %]
-        <p>To whom it may concern</p>
-        [% END %]
-        <p>The following items have not been received from you and are now considered missing:</p>
-        [% END %]
-[% END %]
-        [% IF ( missingissues ) %]
-        <h3>Missing issues</h3>
-        <table>
-            <tr>
-                <td><b>Vendor<b></td>
-                <td><b>Title</b></td>
-                <td><b>Issue number</b></td>
-                <td><b>Missing since</b></td>
-            </tr>
-            [% FOREACH missingissue IN missingissues %]
-                <tr>
-                    <td>
-                    [% missingissue.name %]
-                    </td>
-                    <td>
-                    [% missingissue.Title |html %]
-                    </td>
-                    <td>
-                    [% missingissue.serialseq %]
-                    </td>
-                    <td>
-                    [% missingissue.planneddate %]
-                    </td>
-                </tr>
-            [% END %]
-        </table>
-        [% END %]
-
-<p class="noprint"><a href="#" onclick="window.print(); return false;">Print</a> &nbsp; <a href="#" class="close">Close</a></p>
-[% END %]
-
-</div>
-</div>
-
-[% UNLESS ( preview ) %]
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-[% END %]
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
index a677e29..911e239 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
@@ -1,97 +1,21 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials &rsaquo; [% title |html %] &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</title>
-[% INCLUDE 'doc-head-close.inc' %]
-<script language="javascript" type="text/javascript">
-<!--
+[% INCLUDE 'help-top.inc' %]
 
-function reorder_item(sid,rid,rank){
-    var mylocation = 'reorder_members.pl?subscriptionid='+sid+'&routingid='+rid+'&rank='+rank;
-    window.location.href=mylocation; 
-}
+<h1>Routing Lists</h1>
 
-function search_member(subscriptionid){
-    var myurl = 'member-search.pl?subscriptionid='+subscriptionid; window.open(myurl,'FindAMember','width=550,height=480,toolbar=no,scrollbars=yes');
-}
+<p>A routing list is a list of people who receive the serial before it goes to the shelf. When setting up your serial subscription you want to be sure to pick 'Routing List' from the 'Patron Notification' pull down.</p>
 
-//-->
-</script>
-</head>
-<body id="ser_routing" class="ser">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'serials-search.inc' %]
+<p>When on the subscription page you will see a link to the left that reads 'Create Routing List.'</p>
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title |html %]</i></a> &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</div>
+<p>Clicking that link will bring you to the menu to add a new routing list.</p>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
+<p>From here you want to click 'Add recipients' in order to add people to the routing list. In the menu that appears you can filter patrons by part of their name, their library and/or patron category.</p>
 
+<p>Clicking 'Add' to the right of each name will add them to the routing list. When you have chosen all of the people for the list, click the 'Close' link to be redirected to the routing list.</p>
 
-[% IF ( op ) %]
-<h1>Create routing list for <i>[% title |html %]</i></h1>
-[% ELSE %]
-<h1>Edit routing list for <i>[% title |html %]</i></h1>
-[% END %]
+<p>If the list looks the way you expect it to, then click 'Save'. Next you will be brought to a preview of the routing list. To print the list click 'Save and preview routing slip.' This will open a printable version of the list.</p>
 
-<form method="post" action="routing.pl">
-<input type="hidden" name="op" value="save" />
-<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
-<fieldset class="rows">
-	<ol>
-		<li><label for="date_selected">Issue: </label>
-<select name="date_selected" id="date_selected">
-[% FOREACH date IN dates %]
-[% IF ( date.selected ) %]<option value="[% date.serialseq %] ([% date.planneddate %])" selected="selected">[% date.serialseq %] ([% date.planneddate %])</option>[% ELSE %]<option value="[% date.serialseq %] ([% date.planneddate %])">[% date.serialseq %] ([% date.planneddate %])</option>[% END %]
-[% END %]
-</select> [% issue %]</li>
+<p>If RoutingListAddReserves is set to on then patrons listed in the routing list will automatically be added to the holds list for the issue.</p>
 
-[% IF memberloop %]
-<li><span class="label">Recipients:</span><table style="clear:none;margin:0;">
-        <tr><th>Name</th>
-            <th>Rank</th>
-            <th>Delete</th>
-        </tr>
-        [% USE m_loop = iterator(memberloop) %]
-        [% FOREACH member IN m_loop %]
-        <tr><td>[% member.name %]</td>
-            <td>
-                <select name="itemrank" onchange="reorder_item([%- subscriptionid -%], [%- member.routingid -%], this.option[this.selectedIndex].value)">
-                [% rankings = [1 .. m_loop.size] %]
-                [% FOREACH r IN rankings %]
-                    [% IF r == member.ranking %]
-                      <option selected="selected" value="[% r %]">[% r %]</option>
-                    [% ELSE %]
-                      <option value="[% r %]">[% r %]</option>
-                    [% END %]
-                [% END %]
-                </select>
-            </td>
-            <td><a href="/cgi-bin/koha/serials/routing.pl?routingid=[% member.routingid %]&amp;subscriptionid=[% subscriptionid %]&amp;op=delete">Delete</a></td>
-        </tr>
-        [% END %]
-        </table><p style="margin-left:10em;"><a onclick="search_member([% subscriptionid %]); return false"
-href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=[% subscriptionid %]" class="button">Add recipients</a> &nbsp; <a
-href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=delete" class="button">Delete all</a></p></li>
-[% ELSE %]
-<li><span class="label">Recipients:</span>
-    <a onclick="search_member([% subscriptionid %]); return false" href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=[% subscriptionid %]" class="button">Add recipients</a></li>
-[% END %]
+<p><strong>See the full documentation for Routing Lists in the <a href="http://manual.koha-community.org/3.8/en/routinglist.html">manual</a> (online).</strong></p>
 
-	<li><label for="notes">Notes:</label><textarea name="notes" id="notes" rows="3" cols="50">[% routingnotes %]</textarea></li>
-	</ol>
-
-</fieldset>
-<fieldset class="action"><input type="submit" name="submit" value="Save" /></fieldset>
-</form>
-
-
-</div>
-</div>
-
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index a478461..45916df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -1,279 +1,15 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials &rsaquo; Serial collection information for [% bibliotitle %]</title>
-[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'help-top.inc' %]
 
-<script type="text/javascript">
-//<![CDATA[
-function print_slip(subscriptionid,issue){
-    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
-    window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
-}
-function addsubscriptionid()
-{
-	var tab=new Array();
-    var serialids = document.edition.serialid;
-    for (i=0; i<serialids.length; i++){
-      if (serialids[i].checked == true){
-        var found=false;
-        for (var val in tab){
-          if (tab[val] == document.getElementsByName("subs")[i].getAttribute('val')){found = true;}
-        }
-        if (found == false){
-          tab=tab.concat((document.getElementsByName("subs")[i].getAttribute('val')));
-        }
-      }
-    }
-    var string="";
-    for (var val in tab){
-      string = string + tab[val] + ",";
-    }
-    string=string.substring(0,string.length -1);
-    document.edition.subscriptionid.value=string;
-}
-function popup(subscriptionid) {
-    newin=window.open('subscription-renew.pl?mode=popup&subscriptionid='+subscriptionid,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
-}
+<h1>Serial Collection</h1>
 
-function generateNext(subscriptionid) {
-	if(confirm(_("Do you really want to generate next serial?"))){
-		document.location = 'serials-collection.pl?op=gennext&subscriptionid='+subscriptionid;
-	}
-}
+<p>This page shows a short summary of the subscription along with all of the issues that have been received, are expected, or marked late.</p>
 
-$(document).ready(function() {
-	$('#subscription_years > ul').tabs();
-});
- 
+<p>From here you can choose to edit specific issue or receive new issues.</p>
 
-//]]>
-</script>
-</head>
-<body id="ser_serials-collection" class="yui-skin-sam ser">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'serials-search.inc' %]
+<p>To edit or receive an issue, simply check the box in the 'Edit' column and click the 'Edit Serial' button.</p>
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial collection information for  <i>[% bibliotitle %]</i></div>
+<p>If you are adding multiple issues at once or if the latest expected issue is late, you can click the 'Generate Next' button to generate the next issue based on the subscription pattern.</p>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
 
-
-[% UNLESS ( popup ) %]
-	[% INCLUDE 'serials-toolbar.inc' %]
-
-	<h1>Serial collection information for  <i>[% bibliotitle %]</i>
-        [% IF location %] ([% location %] ) [% END %]
-		[% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]</h1>
-[% END %]
-
-[% IF ( subscriptions ) %]
-<table>
-[% IF ( subscriptions.size == 1 ) %]
-<caption> Subscription summary</caption>
-[% ELSE %]
-<caption> Subscription summaries</caption>
-[% END %]
-<tr>
-  <th>Subscription num.</th>
-  <th>Frequency</th>
-  <th>Numbering pattern</th>
-  <th>Library</th>
-  <th>Call number</th>
-  <th>Notes</th>
-  [% IF ( routing && CAN_user_serials_routing ) %]<th>Routing</th>[% END %]
-  <th>Renew</th>
-</tr>
-[% FOREACH subscription IN subscriptions %]
-    [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
-      <td><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]"># [% subscription.subscriptionid %]</a> </td>
-      <td>         [% IF ( subscription.periodicity1 ) %]
-                        1/day
-                [% END %]
-                [% IF ( subscription.periodicity2 ) %]
-                        1/week
-                [% END %]
-                [% IF ( subscription.periodicity3 ) %]
-                        1/2 weeks
-                [% END %]
-                [% IF ( subscription.periodicity4 ) %]
-                        1/3 weeks
-                [% END %]
-                [% IF ( subscription.periodicity5 ) %]
-                        1/Month
-                [% END %]
-                [% IF ( subscription.periodicity6 ) %]
-                        1/2 Months (6/year)
-                [% END %]
-                [% IF ( subscription.periodicity7 ) %]
-                        1/quarter
-                [% END %]
-                [% IF ( subscription.periodicity8 ) %]
-                        1/quarter
-                [% END %]
-                [% IF ( subscription.periodicity9 ) %]
-                        2/year
-                [% END %]
-                [% IF ( subscription.periodicity10 ) %]
-                        1/year
-                [% END %]
-                [% IF ( subscription.periodicity11 ) %]
-                        1/2 years
-                [% END %]</td>
-           <td>
-                [% IF ( subscription.numberpattern1 ) %]
-                    Number
-                [% END %]
-                [% IF ( subscription.numberpattern2 ) %]
-                    Volume, number, issue
-                [% END %]
-                [% IF ( subscription.numberpattern3 ) %]
-                    Volume, number
-                [% END %]
-                [% IF ( subscription.numberpattern4 ) %]
-                    Volume, issue
-                [% END %]
-                [% IF ( subscription.numberpattern5 ) %]
-                    Number, issue
-                [% END %]
-                [% IF ( subscription.numberpattern6 ) %]
-                    Seasonal only
-                [% END %]
-                [% IF ( subscription.numberpattern7 ) %]
-                    None of the above
-                [% END %]</td>
-            <td> [% subscription.branchcode %]</td>
-            <td> [% subscription.callnumber %]</td>
-        <td> [% subscription.notes %]        [% IF ( subscription.subscriptionexpired ) %]<br /><span class="problem"> Subscription expired</span>
-        [% END %]
-        </td>
-        [% IF ( routing && CAN_user_serials_routing ) %]
-        <td>
-            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
-        </td>
-        [% END %]
-        [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
-        [% ELSE %]
-        [% IF ( subscription.subscriptionexpired ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
-        [% ELSE %]
-        <td> &nbsp;</td>
-        [% END %]
-        [% END %]
-
-      </tr>
-[% END %]
-[% IF ( subscr ) %]
-[% IF ( subscriptioncount > 1 ) %]
-<tr ><td colspan="8">  <a href="serials-collection.pl?biblionumber=[% biblionumber %]">See any subscription attached to this biblio</a></td>
-</tr>
-[% END %]
-[% END %]
-</table>
-[% END %]
-
-
-[% IF ( years ) %]<form name="edition" action="serials-edit.pl" method="post">
-<div id="subscription_years" class="toptabs numbered">
-<ul>
-	[% FOREACH year IN years %]
-        [% IF ( year.year ) %]
-            <li><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% year.subscriptionid %]#subscription-year-[% year.year %]">[% year.year %]</a></li>
-        [% END %]
-    [% END %]
-</ul>
-
- [% FOREACH year IN years %]
-<div id="subscription-year-[% year.year %]">
-    [% IF ( CAN_user_serials_receive_serials ) %]
-        <p>
-            <input type="submit" value="Edit serials" />&nbsp;
-            <input type="button" value="Generate Next" onclick="javascript:generateNext([% subscriptionidlist %])" />
-        </p>
-    [% END %]
-
-        <table>
-	  <tr>
-[% IF ( subscriptions.size > 1 ) %]
-                <th># Subs</th>
-[% END %]
-                <th>Date published
-                </th>
-                <th>Date received
-                </th>
-                <th>Number
-                </th>
-                <th>Status
-                </th>
-                <th>Notes
-                </th>
-                <th>Library
-                </th>
-                [% IF ( routing ) %]<th>Routing</th>[% END %]
-                [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
-            </tr>
-      [% FOREACH serial IN year.serials %]
-    [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
-[% IF ( subscriptions.size > 1 ) %]
-                 <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid %]">[% serial.subscriptionid %]</a></td>
-[% END %]
-                <td>
-                    [% serial.publisheddate %]
-                </td>
-                <td>
-                    [% serial.planneddate %]
-                </td>
-                <td>
-                    [% serial.serialseq %]
-                </td>
-                <td>
-                    [% IF ( serial.status1 ) %]Expected[% END %][% IF ( serial.status2 ) %]Arrived[% END %][% IF ( serial.status3 ) %]Late[% END %][% IF ( serial.status4 ) %]Missing[% END %][% IF ( serial.status5 ) %]Not Available[% END %][% IF ( serial.status7 ) %]Claimed[% END %]
-                </td>
-                <td>
-                    [% serial.notes %]
-                </td>
-                <td>
-                    [% serial.branchcode %]
-                </td>
-                [% IF ( routing ) %]
-                <td>
-                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.planneddate %])'); return false" >Print list</a>
-                </td>
-                [% END %]
-            [% IF ( CAN_user_serials_receive_serials ) %]
-                <td>
-                  [% IF ( serial.cannotedit ) %]
-                    disabled
-                  [% ELSE %]
-                    [% IF ( serial.subscriptionexpired ) %]
-                    <input type="checkbox" name="serialid" value="[% serial.serialid %]" disabled="disabled" />
-                    [% ELSE %]
-                      [% IF ( serial.checked ) %]
-                    <input type="checkbox" name="serialid" checked="checked" value="[% serial.serialid %]" />
-                      [% ELSE %]
-                    <input type="checkbox" name="serialid" value="[% serial.serialid %]" />
-                      [% END %]           
-                    [% END %]
-                  [% END %]
-                </td>
-            [% END %]
-            </tr>
-      [% END %]
-        </table>
-    </div>
-    [% END %]
-  <input type="hidden" name="subscriptionid" value="[% subscriptionidlist %]" />
-
-</div>
-</form>
-[% END %]
-
-</div>
-</div>
-
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 7c82b48..f3f76fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -1,443 +1,29 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials &rsaquo; Serial edition [% bibliotitle %]</title>
-[% INCLUDE 'doc-head-close.inc' %]
-<script language="JavaScript" type="text/javascript">
-//<![CDATA[
-function popup(subscriptionid) {
-	window.open("subscription-renew.pl?subscriptionid="+subscriptionid,"subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
-}
+[% INCLUDE 'help-top.inc' %]
 
-function barcode_check(){
-    [% IF ( count ) %]
-    var count = [% count %];
-    for(var i=1;i<=count;i++){
+<h1>Recieving Serials</h1>
 
-        var barcodenum = "barcode"+i;
-        var statusnum = "status"+i;
-        var elembarcode = "document.getElementById('"+barcodenum+"')";
-        var elemstatus = "document.getElementById('"+statusnum+"')";
-// alert(elembarcode+"\n"+eval(elembarcode+".value));
-// alert(elemstatus+"\n"+eval(elemstatus+".value"));
-        if(eval(elembarcode+".value") =='' && eval(elemstatus+".value") == 2){
-            var answer = confirm("Leave barcode blank?\n - Note: unable to change this later");
-            if (answer){
-                document.f.submit();
-            } else {
-                return false;
-            }
-        }
-        if(eval(elembarcode+".value".indexOf('TEMP')) > 0 && eval(elemstatus+".value") == 2){
-            var answer = confirm("A barcode was not entered.\nDo you want to put in a barcode\nor do you want to use a system generated barcode?");
-            if (answer){
-                document.f.submit();
-            } else {
-                return false;
-            }
-        }
-    }
-    [% END %]
-}
-function unHideItems(index,labelindex, serialId) {
-	subfield = document.getElementById(index);
-	subfield.style.display = 'block';
-	label = document.getElementById(labelindex);
-	label.style.display='none';	
+<p>Issues can be marked as received from several locations. To find a subscription, use the search box at the top of the Serials page to search for the serial you'd like to receive issues for</p>
 
-	// Prefilling 995$h with serial enumeration/issue number
-	// Getting item id
-	itemid = $("fieldset#" + index + " div.cataloguing_additem_itemlist div.items").attr("id");
-	// Getting subfield id
-	subfieldid = "subfield" + itemid.substr(4) + "h";
-	// Setting text field 
-	$("#" + subfieldid + " input[type='text']").val($("#serialseq" + serialId).val());
+<p>From the search results you can click the 'Serial Receive' link or you can click on the subscription title and then click the 'Receive' button.</p>
 
-}
-function HideItems(index,labelindex) {
-	subfield = document.getElementById(index);
-	subfield.style.display = 'none';
-	label = document.getElementById(labelindex);
-	label.style.display='block';	
-}
-function setStatus(serialid){
-    $("#status"+serialid).val("2").attr("selected","selected");
-}
-function changeDate(elem, adate) {
-    $(elem).closest('tr').find('#expecteddate').val(adate);
-}
-function changeDate2(adate) {
-   var elem = document.getElementById("supexpecteddate");
-    elem.value = adate;
-}
-function CloneSubfield(index){
-    var original = document.getElementById(index); //original <div>
-    var clone = original.cloneNode(true);
-    var new_key = CreateKey();
-    var old_id =  original.getAttribute('id');
-    old_id=old_id.substr(12);
-    var new_id  = old_id+new_key;
-    
-    // set the attribute for the new 'div' subfields
-    var inputs     = clone.getElementsByTagName('input');
-    var selects    = clone.getElementsByTagName('select');
-    var textareas  = clone.getElementsByTagName('textarea');
-        
-    // input
-    var id_input = "";
-    for(var i=0,len=inputs.length; i<len ; i++ ){
-        id_input = inputs[i].getAttribute('id')+new_key;
-        inputs[i].setAttribute('id',id_input);
-        inputs[i].setAttribute('name',inputs[i].getAttribute('name'));
-    }
-    
-    // select 
-    for(var i=0,len=selects.length; i<len ; i++ ){
-        id_input = selects[i].getAttribute('id')+new_key;
-        selects[i].setAttribute('id',selects[i].getAttribute('id')+new_key);
-        selects[i].setAttribute('name',selects[i].getAttribute('name'));
-    }
-    
-    // textarea
-    for(var i=0,len=textareas.length; i<len ; i++ ){
-        id_input = textareas[i].getAttribute('id')+new_key;
-        textareas[i].setAttribute('id',textareas[i].getAttribute('id')+new_key);
-        textareas[i].setAttribute('name',textareas[i].getAttribute('name'));
-    }
-    
-    [% UNLESS ( advancedMARCEditor ) %]
-    // when cloning a subfield, reset its label too.
-    var label = clone.getElementsByTagName('label')[0];
-    label.setAttribute('for',id_input);
-    [% END %]
-    
-    // setting a new if for the parent div
-    clone.setAttribute('id',new_id);
-    
-    var CloneButtonPlus;
-    try {
-      var spans = clone.getElementsByTagName('span');
-      if(spans.length){
-          for(var i = 0 ,lenspans = spans.length ; i < lenspans ; i++){
-            if(spans[i].getAttribute('class') == 'buttonPlus'){
-                    CloneButtonPlus = spans[i];
-                    CloneButtonPlus.setAttribute('onclick',"CloneSubfield('" + new_id + "')");
-                    var buttonUp = clone.getElementsByTagName('img')[0];
-                    buttonUp.setAttribute('onclick',"upSubfield('" + new_id + "')");
-                }
-            }
-        }
-    }
-    catch(e){
-        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
-    }
-    // insert this line on the page
-    original.parentNode.insertBefore(clone,original.nextSibling);
-}
-$(document).ready(function() {
-	$("form#serials_edit").submit(function() {
-	    var total_errors = 0;
-        $(".subfield_line:visible", this).each(function() {
-            if ($("*[name=field_value]", this).val().length == 0 &&
-                $("*[name=mandatory]", this).val() == 1) {
-                total_errors++;
-            }
-        });
-        if ( total_errors > 0 ) {
-            var mes  = _("Form not submitted because of the following problem(s)");
-            mes += "\n------------------------------------------------------------------------------------\n";
-            mes += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
-            alert(mes);
-            return false;
-        }
-    });
-});
-//]]>
-</script>
-<style type="text/css">#serials_edit fieldset.rows label, #serials_edit fieldset.rows span.label {
-	font-size : 100%;
-	width : 25%;
-}
-#serials_edit fieldset.rows select { max-width : 15em; }
-#serials_edit fieldset.rows li {
-	padding-bottom : 3px;
-}
-#serials_edit .input_marceditor {
-	width : auto;
-}</style>
-</head>
-<body id="ser_serials-edit" class="ser">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'serials-search.inc' %]
+<p>The final way to receive serials is from the 'Serial Collection' page. To the left of the Subscription summary page there is a menu with a link to 'Serial Collection'</p>
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial edition <i>[% bibliotitle %] [% IF ( callnumber ) %]([% callnumber %])[% END %]</i></div>
+<p>From the page that opens up you can click 'Edit Serial' with the issue you want to receive checked.</p>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
+<p>All three of these options will open up the issue receive form:</p>
 
-<h1>Serial edition <i>[% bibliotitle %]</i>
-	[% IF location %] ( [% location %] ) [% END %]
-    [% IF ( callnumber ) %] callnumber: [% callnumber %][% END %]</h1>
-<form method="post" name="f" action="serials-edit.pl" id="serials_edit">
-<!--onsubmit="return barcode_check()">-->
-
-[% IF ( Errors ) %]
-<div class="dialog alert">
 <ul>
-[% IF ( barcode_not_unique ) %]<li>Error: Barcode not unique for [% FOREACH errse IN errseq %]serialseq [% errse.serialseq %]<br/>[% END %]</li>[% END %]
+	<li>Choose 'Arrived' from the status pull down to mark a serial as received.</li>
+	<li>If you have decided to have an item record created for each issue an item add form will appear</li>
+	<li>If your issue has a supplemental issue with it, fill in the Supplemental Issue information.</li>
+	<li>If you have decided to have an item record created for each issue an item add form will appear for your supplement and for the issue itself</li>
+	<li>Once you have entered your info you can click 'Save'</li>
 </ul>
-</div>
-[% END %]
-
-    <input type="hidden" name="op" value="serialchangestatus" />
-    [% FOREACH subscription IN subscriptions %]
-    <input type="hidden" name="subscriptionid" value="[% subscription.subscriptionid %]" />
-    [% END %]
-	<table>
-	<tr>
-		<th>Numbered</th>
-		<th>Published on</th>
-		<th>Expected on</th>
-		<th>Status</th>
-		<th>Notes</th>
-	</tr>
-[% FOREACH serialslis IN serialslist %]
-    [% UNLESS ( loop.odd ) %]
-    <tr class="highlight">
-    [% ELSE %]
-    <tr>
-    [% END %]
-        <td>
-            <input type="hidden" name="serialid" value="[% serialslis.serialid %]" />
-            <input type="hidden" name="biblionumber" value="[% serialslis.biblionumber %]" />
-            <input type="hidden" name="itemcount" value="[% serialslis.issuesatonce %]" />
-            <input type="hidden" name="user" value="[% serialslis.librarian %]" />
-            Issue <input type="text" name="serialseq" id="serialseq[% serialslis.serialid %]" value="[% serialslis.serialseq %]" size="20" maxlength="100" />
-        </td>
-        <td>
-            <input type="text" name="publisheddate" value="[% serialslis.publisheddate %]" size="10" maxlength="15" />
-        </td>
-        <td>
-            <input type="text" id="expecteddate" name="planneddate" value="[% serialslis.planneddate %]" size="10" maxlength="15" />
-        </td>
-        <td>
-            [% IF ( serialslis.editdisable ) %]
-              <input type="hidden" name="status" id="status[% serialslis.serialid %]" value="1">
-              <select name="status" size="1"  disabled="disabled">
-            [% ELSE %]
-              [% IF ( serialslis.serialsadditems ) %]
-              <select name="status" size="1" id="status[% serialslis.serialid %]" onchange="if (this.value==2){unHideItems('items'+[% serialslis.subscriptionid %][% serialslis.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]','[% serialslis.serialid %]'); changeDate(this, '[% serialslis.arriveddate %]')} else if (this.value==7){changeDate(this, '[% serialslis.arriveddate %]')} else { HideItems('items'+[% serialslis.subscriptionid %]+[% serialslis.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]'); changeDate(this, '[% serialslis.planneddate %]')}" >
-               [% ELSE %]
-              <select name="status" size="1" id="status[% serialslis.serialid %]" onchange="if (this.value==2 || this.value==7){changeDate(this, '[% serialslis.arriveddate %]')} else {changeDate(this, '[% serialslis.planneddate %]')}" >
-               [% END %] 
-            [% END %]
-  [% IF ( serialslis.status1 ) %]
-                    <option value="1" selected="selected">Expected</option>
-  [% END %]
-  [% IF ( serialslis.status2 ) %]
-                    <option value="2" selected="selected">Arrived</option>
-  [% ELSE %]
-                    <option value="2">Arrived</option>
-  [% END %]
-  [% IF ( serialslis.status3 ) %]
-                    <option value="3" selected="selected">Late</option>
-  [% ELSE %]
-                    <option value="3">Late</option>
-  [% END %]
-  [% IF ( serialslis.status4 ) %]
-                    <option value="4" selected="selected">Missing</option>
-  [% ELSE %]
-                    <option value="4">Missing</option>
-  [% END %]
-  [% IF ( serialslis.status7 ) %]
-                    <option value="7" selected="selected">Claimed</option>
-  [% ELSE %]
-                    <option value="7">Claimed</option>
-  [% END %]
-  [% IF ( serialslis.status5 ) %]
-                    <option value="5" selected="selected">Not available</option>
-  [% ELSE %]
-                    <option value="5">Not available</option>
-  [% END %]
-  [% IF ( serialslis.status6 ) %]
-                    <option value="6" selected="selected">Delete</option>
-  [% ELSE %]
-                    <option value="6">Delete</option>
-  [% END %]
-            </select>
-
-        </td>
-        <td>
-            <input type="text" name="notes" value="[% serialslis.sernotes %]" size="20" maxlength="255" />
-        </td>
-    </tr>
-  [% UNLESS ( serialslis.subscriptionexpired ) %]
-  [% IF ( serialslis.serialsadditems ) %]
-          <tr>
-          <td colspan="5">
-      <a id="label[% serialslis.subscriptionid %][% serialslis.serialid %]" style="color: grey; font-size: 80%; cursor: pointer;"  onclick="unHideItems('items[% serialslis.subscriptionid %][% serialslis.serialid %]','label[% serialslis.subscriptionid %][% serialslis.serialid %]',  '[% serialslis.serialid %]');setStatus([% serialslis.serialid %]);">
-             Click to add item</a>
-        <fieldset class="rows" style="display:none;" id="items[% serialslis.subscriptionid %][% serialslis.serialid %]">
-        <legend><a style="cursor: pointer;"  onclick="HideItems('items[% serialslis.subscriptionid %][% serialslis.serialid %]','label[% serialslis.subscriptionid %][% serialslis.serialid %]')">
-                Item</a>
-        </legend>
-          <div class="cataloguing_additem_itemlist">
-        [% FOREACH item IN serialslis.items %]
-        <div id="item[% item.serialid %][% item.countitems %]" class="items">
-        <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li>
-               <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
-                              
-                <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
-                [% iteminformatio.marc_value %]
-                <input type="hidden" name="itemid" value="[% item.itemid %]" />
-                <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
-                <input type="hidden" name="tag" value="[% iteminformatio.tag %]" />
-                <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
-                <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
-                [% IF ( iteminformatio.ITEM_SUBFIELDS_ARE_NOT_REPEATABLE ) %]
-                    <span class="buttonPlus" onclick="CloneSubfield('subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
-                [% END %]
-        
-            </div></li>
-        [% END %]</ol></div><!-- /iteminformation -->
-        
-        <input type="hidden" name="moditem" value="" /> 
-        <input type="hidden" name="tag" value="[% item.itemtagfield %]" />
-        <input type="hidden" name="subfield" value="[% item.itemtagsubfield %]" />
-        <input type="hidden" name="serial" value="[% item.serialid %]" />
-        <input type="hidden" name="bibnum" value="[% item.biblionumber %]" />
-        <input type="hidden" name="itemid" value="[% item.itemid %]" />
-        <input type="hidden" name="field_value" value="[% item.itemnumber %]" />
-        [% END %] <!-- /items -->
-        </div>
-        </fieldset>
-    </td>
-    </tr>
-  [% END %]
-  [% END %]
-[% END %]
-[% FOREACH newserialloo IN newserialloop %]
-    [% UNLESS ( newserialloo.subscriptionexpired ) %]
-    <tr>
-        <td>
-            <input type="hidden" name="serialid" value="NEW" />
-            <input type="hidden" name="biblionumber" value="[% newserialloo.biblionumber %]" />
-            <input type="hidden" name="itemcount" value="[% newserialloo.issuesatonce %]" />
-            <input type="hidden" name="user" value="[% newserialloo.librarian %]" />
-            Supplemental issue <input type="text" name="serialseq" id="serialseq[% newserialloo.serialid %]" value="" size="20" maxlength="100" onchange="if (this.value!=''){unHideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]', '[% newserialloo.serialid %]')} else {HideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]')}" />
-        </td>
-        <td>
-            <input type="text" name="publisheddate" value="[% newserialloo.publisheddate %]" size="10" maxlength="15" />
-        </td>
-        <td>
-            <input type="text" name="planneddate" id="supexpecteddate" value="[% newserialloo.planneddate %]" size="10" maxlength="15" />
-        </td>
-        <td>
-            <select name="status" size="1" id="addstatus[% newserialloo.serialid %]" onchange="if (this.value==2){unHideItems('items'+'[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]','[% newserialloo.serialid %]'); changeDate2('[% newserialloo.arriveddate %]')} else if (this.value==7){changeDate('[% newserialloo.arriveddate %]')} else { HideItems('items'+'[% newserialloo.subscriptionid %]'+[% newserialloo.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]'); changeDate2('[% serialslis.planneddate %]')}" >
 
-                    <option value="">----</option>
-  [% IF ( newserialloo.status1 ) %]
-                    <option value="1" selected="selected">Expected</option>
-  [% END %]
-  [% IF ( newserialloo.status2 ) %]
-                    <option value="2" selected="selected">Arrived</option>
-  [% ELSE %]
-                    <option value="2">Arrived</option>
-  [% END %]
-  [% IF ( newserialloo.status3 ) %]
-                    <option value="3" selected="selected">Late</option>
-  [% ELSE %]
-                    <option value="3">Late</option>
-  [% END %]
-  [% IF ( newserialloo.status4 ) %]
-                    <option value="4" selected="selected">Missing</option>
-  [% ELSE %]
-                    <option value="4">Missing</option>
-  [% END %]
-  [% IF ( newserialloo.status7 ) %]
-                    <option value="7" selected="selected">Claimed</option>
-  [% ELSE %]
-                    <option value="7">Claimed</option>
-  [% END %]
-  [% IF ( newserialloo.status5 ) %]
-                    <option value="5" selected="selected">Not available</option>
-  [% ELSE %]
-                    <option value="5">Not available</option>
-  [% END %]
-  [% IF ( newserialloo.status6 ) %]
-                    <option value="6" selected="selected">Delete</option>
-  [% ELSE %]
-                    <option value="6">Delete</option>
-  [% END %]
-            </select>
+<p>If you are receiving multiple issues at once, or have marked an issue as 'Late' or 'Missing' there you can click the 'Generate Next' button below the list of issues.</p>
 
-        </td>
-        <td>
-            <input type="text" name="notes" value="" size="20" maxlength="255" />
-        </td>
-    </tr>
-  [% IF ( newserialloo.serialsadditems ) %]
-          <tr>
-          <td colspan="5">
-      <a id="label[% newserialloo.subscriptionid %][% newserialloo.serialid %]" style="color: grey; font-size: 80%; cursor: pointer;"  onclick="unHideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]', '[% newserialloo.serialid %]')">
-             Click to add item</a>
-        <fieldset  class="rows" style="display:none;" id="items[% newserialloo.subscriptionid %][% newserialloo.serialid %]">
-        <legend><a style="cursor: pointer;"  onclick="HideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]')">
-                Item</a>
-        </legend>
-          <div class="cataloguing_additem_itemlist">
-        <div id="item[% newserialloo.serialid %][% newserialloo.countitems %]" class="items">
-        <ol>[% FOREACH iteminformatio IN newserialloo.iteminformation %]<li>
-               <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
-   
-                <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
-                [% iteminformatio.marc_value %]
-                <input type="hidden" name="itemid" value="[% newserialloo.itemid %]" />
-                <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
-                <input type="hidden" name="tag" value="[% iteminformatio.tag %]" />
-                <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
-                <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
-                [% IF ( iteminformatio.ITEM_SUBFIELDS_ARE_NOT_REPEATABLE ) %]
-                    <span class="buttonPlus" onclick="CloneSubfield('subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
-                [% END %]
-        </div>
-       </li>[% END %]</ol>
-        
-        <input type="hidden" name="moditem" value="" /> 
-        <input type="hidden" name="tag" value="[% newserialloo.itemtagfield %]" />
-        <input type="hidden" name="subfield" value="[% newserialloo.itemtagsubfield %]" />
-        <input type="hidden" name="serial" value="[% newserialloo.serialid %]" />
-        <input type="hidden" name="bibnum" value="[% newserialloo.biblionumber %]" />
-        <input type="hidden" name="itemid" value="[% newserialloo.itemid %]" />
-        <input type="hidden" name="field_value" value="[% newserialloo.itemnumber %]" />
-        </div>
-        </div>
-        </fieldset>
-    </td>
-    </tr>
-  [% END %]
-  [% END %]
-[% END %]
+<p>Clicking this button will generate the next issue for you and mark the previously expected issue as 'Late' automatically. You can then check the 'Edit' box to the right of each issue and edit the status on multiple issues at once.</p>
 
-</table>
-    <fieldset class="action"><input type="submit" value="Save"  class="button" accesskey="w" />
-</form>
+<p><strong>See the full documentation for Receiving a Serial in the <a href="http://manual.koha-community.org/3.8/en/receiveissues.html">manual</a> (online).</strong></p>
 
-</div>
-</div>
-
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-<ul>
-    [% FOREACH subscription IN subscriptions %]
-        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]" title="serial collection for [% subscription.bibliotitle %]">Serial collection #[% subscription.subscriptionid %]</a></li>
-        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid %]</a></li>
-        [% IF ( subscription.abouttoexpire ) %]
-            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid %])">Renew #[% subscription.subscriptionid %]</a></li>
-        [% END %]
-    [% END %]
-    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% biblionumber %]" title="go to [% bibliotitle %]">Show biblio</a></li></ul>
-</div>
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
index 1fdf693..d4ee4f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
@@ -1,159 +1,12 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials [% biblionumber %]</title>
-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
-[% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
-<script type="text/javascript">
-//<![CDATA[
- $(document).ready(function() {
-    var srlt = $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
-        "aoColumnDefs": [
-            { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
-        ],
-        "sPaginationType": "four_button"
-    } ) );
+[% INCLUDE 'help-top.inc' %]
 
-    srlt.fnAddFilters("filter", 750);
- });
- //]]>
-</script>
-</head>
-<body id="ser_serials-home" class="ser">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'serials-search.inc' %]
+<h1>Serials</h1>
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; [% IF ( done_searched ) %]<a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Search results[% ELSE %]Serials [% END %] </div>
+<p>The serials module assists in managing your serial subscriptions (journals, magazines, and newspapers).</p>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
-	[% INCLUDE 'serials-toolbar.inc' %]
-	
-[% IF ( information ) %]
-Serials updated :
-<table>
-  <tr>
-    <th>
-      Serialseq
-    </th>
-    <th>
-      Status
-    </th>
-    <th>
-      Published date
-    </th>
-    <th>
-      Planned date
-    </th>
-    <th>
-      Notes
-    </th>
-  </tr>  
-[% FOREACH informatio IN information %]
-  <tr>
-    <td>
-      [% informatio.serialseq %]
-    </td>
-    <td>
-      [% informatio.status %]
-    </td>
-    <td>
-      [% informatio.publisheddate %]
-    </td>
-    <td>
-      [% informatio.planneddate %]
-    </td>
-    <td>
-      [% informatio.notes %]
-    </td>
-  </tr>  
-[% END %]
-</table>
-[% END %]
-        [% IF ( done_searched ) %]
-<h2>Serials subscriptions</h2>
+<p>You can search for existing subscriptions by using the search box at the top of the page. You can search for any part of the serial title or ISSN.</p>
 
-    <table id="srlt">
-	<thead>
-        <tr>
-            <th>ISSN</th>
-            <th>Title</th>
-            <th> Notes </th>
-            <th>
-                Library (callnumber)
-            </th>
-            [% IF ( routing && CAN_user_serials_routing ) %]
-              <th>Routing list</th>
-            [% END %]        
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-        </tr>
-	</thead>
-    <tfoot>
-        <tr>
-            <td><input type="text" class="filter" data-column_num="0" placeholder="Search ISSN" /></td>
-            <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
-            <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
-            <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
-            [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %]
-            <td></td>
-            <td></td>
-        </tr>
-    </tfoot>
-	<tbody> 
-        [% FOREACH subscription IN subscriptions %]
-            <tr>
-                <td>
-                [% IF ( subscription.issn ) %][% subscription.issn %]
-                [% END %]
-                </td>
-                <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title |html %]</a>
-                </td>
-                <td>[% IF ( subscription.notes ) %][% subscription.notes %][% END %]
-                [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes %])[% END %]
-                </td>
-                <td>
-                [% IF ( subscription.branchname ) %][% subscription.branchname %][% END %]
-                [% IF ( subscription.callnumber ) %]([% subscription.callnumber %])[% END %]
-                </td>
-                [% IF ( routing && CAN_user_serials_routing ) %]
-                <td>
-                    [% IF ( subscription.cannotedit ) %]
-                        &nbsp;
-                    [% ELSE %]
-                        [% IF ( subscription.routingedit ) %]
-                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
-                        [% ELSE %]
-                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
-                        [% END %]
-                    [% END %]
-                </td>
-                [% END %]
-                <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
-                </td>
-                <td>
-                [% IF ( subscription.cannotedit ) %]
-                  &nbsp;        
-                [% ELSE %]
-                  [% IF ( CAN_user_serials_receive_serials ) %]<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>[% END %]
-                [% END %]
-                </td>
-            </tr>
-        [% END %]
-	</tbody>
-    </table>
-    
-        [% END %]
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
 
-</div>
-</div>
+[% INCLUDE 'help-bottom.inc' %]
 
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index 3312f7f..247ded7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -1,1450 +1,89 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials &rsaquo; [% IF ( modify ) %][% bibliotitle |html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>
-[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Add A New Serial Subscription</h1>
+
+<p>Subscriptions can be added by clicking the 'New' button on any bibliographic record or by visiting the Serials module and clicking 'New Subscription'</p>
+
+<p>If you are entering a new subscription from the Serials module you will be presented with a blank form (if creating new from a bibliographic record the form will include the bib info).</p>
+
+<ul>
+	<li>'Librarian' field will show the logged in librarian's username</li>
+	<li>'Vendor' can be found by either searching vendors entered via the Acquisitions module or entering the vendor ID number
+<ul>
+	<li>Vendor information is not required</li>
+	<li>In order to claim missing and late issues you need to enter vendor information</li>
+</ul>
+</li>
+	<li>'Biblio' is the MARC record you'd like to link this subscription to
+<ul>
+	<li>This can be done by searching for an existing record by clicking on the 'Search for Biblio' link below the boxes or by entering the bib number for a record in the first box. Only if you search with the field between the parenthesis.</li>
+</ul>
+</li>
+	<li>Next you can choose whether a new item is created when receiving an issue</li>
+	<li>'Location' is for the shelving location</li>
+	<li>'Call Number' is for your item's call number prefix</li>
+	<li>'Library' is the library that owns this subscription.
+<ul>
+	<li>If more than one library subscribes to this serial you will need to create a subscription for each library</li>
+	<li>This can be done easily by using the 'Edit as New (Duplicate)' option found on the subscription information page and changing only the 'Library' field</li>
+</ul>
+</li>
+	<li>The 'Grace Period' is the number of days before an issue is automatically moved from 'expected' status to 'waiting' and how many days before an issue is automatically moved from 'waiting' status to 'late'</li>
+	<li>Use the 'Public Note' for any notes you would like to appear in the OPAC for the patrons</li>
+	<li>'Nonpublic Note' should be used for notes that are only visible to the librarians via the staff client</li>
+	<li>To set up a routing list for serials, choose 'Routing List' from the 'Patron notification' field.
+<ul>
+	<li>For this option to appear you need to make sure that you have a Routing List notice set up in the Notices Tool</li>
+	<li>Learn more about Routing Lists later in this manual</li>
+</ul>
+</li>
+	<li>The Staff and OPAC Display options allow you to control how many issues appear by default on bibliographic records in the Staff Client and the OPAC
+<ul>
+	<li>If no values are entered in these fields, they will use the OPACSerialIssueDisplayCount and StaffSerialIssueDisplayCount system preference values</li>
+</ul>
+</li>
+	<li>In 'First issue publication date' you want to enter the date of the issue you have in your hand, the date from which the prediction pattern will start</li>
+	<li>There are several pre-defined options for the 'Frequency' of publication
+<ul>
+	<li>Without periodicy: some very specific (usually high level science journals) don't have a true periodicity. When you subscribe to the title, you subscribe for 6 issues, which can arrive in 1 year... or 2... There is no regularity or known schedule.</li>
+	<li>Unknown select this if none of the other choices are relevant</li>
+	<li>Irregular: The journal is not "regular" but has a periodicity. You know that it comes out on January, then in October and December, it is irregular, but you know when it's going to arrive.</li>
+	<li>2/day: Twice daily</li>
+	<li>1/day: Daily</li>
+	<li>3/week: Three times a week</li>
+	<li>1/week: Weekly</li>
+	<li>1/ 2 weeks: Twice monthly (fortnightly)</li>
+	<li>1/ 3 weeks: Tri-weekly</li>
+	<li>1/month: Monthly</li>
+	<li>1/ 2 months (6/year): Bi-monthly</li>
+	<li>1/ 3 months (1/quarter): Quarterly</li>
+	<li>1/quarter (seasonal) : Quarterly related to seasons (ie. Summer, Autumn, Winter, Spring)</li>
+	<li>2/year: Half yearly</li>
+	<li>1/year: Annual</li>
+	<li>1/ 2 years: Bi-annual</li>
+</ul>
+</li>
+	<li>Checking the 'Manual history' box will allow you to enter serials outside the prediction pattern.</li>
+	<li>'Numbering pattern' will help you determine how the numbers are printed for each issue
+<ul>
+	<li>Start with the numbering on the issue you have in hand, the numbering that matches the date you entered in the 'First issue publication' field</li>
+	<li>If you have chosen any 'Numbering Format' other than 'Number' in the 'Rollover at' field, enter the last issue number before the volume number changes
+<ul>
+	<li>If you chose the 'Number' Numbering Format you will see 'issues expected' in which you will enter the total number of issues you expect to receive.</li>
+</ul>
+</li>
+	<li>You can choose to create your own numbering pattern by choosing 'None of the above' and clicking the 'Show/Hide Advanced Pattern' button at the bottom of the form</li>
+</ul>
+</li>
+	<li>'Subscription start date' is the date at which the subscription begins. This is used for setting up renewal alerts</li>
+	<li>'Subscription length' is the number of issues or months in the subscription. This is also used for setting up renewal alerts</li>
+	<li>'Subscription end date' should only be entered for subscriptions that have ended (if you're entering in a backlog of serials)</li>
+	<li>The 'Numbering formula' is editable to match the way you'd like your numbering to print on the item record and subscription information pages</li>
+</ul>
+
+<p>Click 'Save Subscription' to save the information you have entered.</p>
+
+<p><strong>See the full documentation for Adding a Subscription in the <a href="http://manual.koha-community.org/3.8/en/serials.html#newsubscription">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
 
-<style type="text/css">
-fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
-.yui-u li p label.widelabel {
-    width: 300px;  /* not enough for IE7 apparently */
-}
-</style>
-<script type="text/javascript">
-//<![CDATA[
-
-// 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 weekno_label = _("Week # ");
-var is_season = 0;
-var is_hemisphere = 1;
-var irregular_issues;   // will hold irregularity object.
-
-function formatDate(myDate) {
-    var d = new Array( myDate.getFullYear(), myDate.getMonth() + 1 ,myDate.getDate());
-    if(d[1].toString().length == 1) { d[1] = '0'+d[1] };
-    if(d[2].toString().length == 1) { d[2] = '0'+d[2] };
-    [% IF ( dateformat_us ) %]
-        return(d[1] + '/' + d[2] + '/' + d[0]) ;
-    [% ELSIF ( dateformat_metric ) %]
-        return(d[2] + '/' + d[1] + '/' + d[0]) ;
-    [% ELSE %]
-        return(''+d[0] + '-' + d[1] + '-' + d[2]) ;
-    [% END %]    
-}
-
-Date.prototype.addDays = function(days) {
-    this.setDate(this.getDate()+days);
-}
-
-function getWeeksArray(startDate,periodicity) {
-// returns an array of syspref-formatted dates starting at the first day of startDate's year.
-// This prediction method will not accurately predict irregularites beyond the first year.
-// FIXME : Should replace with ajax query to get the first Monday of the year so that week numbers have correct dates.
-    var incr=1;
-    if(periodicity==3) {  // 1/2 wks
-        incr=2;
-    } else if(periodicity == 4) { // 1/3 wks
-        incr=3;
-    }
-    var weeksArray = new Array;
-    var jan01 = new Date();
-    jan01.setDate(1);
-    jan01.setMonth(0);
-    jan01.setFullYear(startDate.getFullYear());
-    for(var i=0;i<52;i++) {
-        weeksArray[i] = formatDate(jan01) + ' ' + weekno_label + (i + 1);
-        jan01.addDays( 7 ); 
-    }
-    return weeksArray;
-}
-
-function YMDaToYWDa(S) {
-    with (new Date(Date.UTC(S[0], S[1] - 1, S[2]))) {
-        var DoW = getUTCDay();
-        setUTCDate(getUTCDate() - (DoW + 6) % 7 + 3);
-        var ms = valueOf();
-        setUTCMonth(0, 4);
-        var WN = Math.round((ms - valueOf()) / 604800000) + 1;
-        return [getUTCFullYear(), WN, DoW == 0 ? 7 : DoW];
-    }
-}
-function dayofyear(d) { // d is a Date object
-var yn = d.getFullYear();
-var mn = d.getMonth();
-var dn = d.getDate();
-var d1 = new Date(yn,0,1,12,0,0); // noon on Jan. 1
-var d2 = new Date(yn,mn,dn,12,0,0); // noon on input date
-var ddiff = Math.round((d2-d1)/864e5);
-return ddiff+1;
-}
-
-
-// create irregularity object.
-function IrregularPattern() {
-	this.months = new Array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
-	this.seasons = new Array(_("Autumn"),_("Winter"),_("Spring"),_("Summer"),_("Fall"));
-    this.daynames = new Array(_("Monday"),_("Tuesday"),_("Wednesday"),_("Thursday"),_("Friday"),_("Saturday"),_("Sunday"));
-    // create weeks irregularity selection array:
-    this.firstissue = new Date();
-    this.firstissue.setDate(1);
-    this.firstissue.setMonth(0);
-    [% IF ( firstacquiyear ) %] // it's a mod, we already have a start date.
-        this.firstissue.setFullYear( [% firstacquiyear %] );
-    [% END %]
-   	this.weeks = getWeeksArray(this.firstissue); 
-
-    this.numskipped = 0;
-    // init:
-	var irregular = '[% irregularity %]';
-    this.skipped = irregular.split(',');
-}
-
-IrregularPattern.prototype.update = function() {
-		this.skipped= new Array;
-		var cnt = 0;
-		// daily periodicity, we interpret irregular array as which days of week to skip.
-		// else if weekly periodicity, week numbers (starting from 01 Jan) to skip.
-        // else  irregular array is list of issues to skip
-		var summary_str = '';
-		this.numskipped = 0;
-        if(document.f.irregularity_select) {
-            //$("#irregularity_select option:selected").each(...); //jquery can combine both conditionals and the for loop
-            for( var i in document.f.irregularity_select.options ) {
-                if( document.f.irregularity_select.options[i].selected ) {
-                    this.skipped[cnt] = document.f.irregularity_select.options[i].value ;
-                    summary_str += document.f.irregularity_select.options[i].text + "\n" ;
-				    cnt++;
-				    this.numskipped++;
-			    }
-		    }
-		    var summary = document.getElementById("irregularity_summary");
-		    if(summary) {
-			    summary.value = summary_str;
-			    summary.rows= ( cnt > 6 ) ? cnt : 6 ; // textarea will bre resized, but not more than 6 lines will show.
-		    }
-        }
-}
-
-IrregularPattern.prototype.irregular = function(index) { 
-	for( var i in this.skipped) {
-			if( this.skipped[i] == index) {
-				return true;
-			}
-	}
-	return false;
-}
-
-function init_pattern() {
-	irregular_issues = new IrregularPattern();
-}
-function reset_pattern() {
-	document.getElementById("numberpattern").value = '';
-    document.getElementById("irregularity").innerHTML = '';
-	init_pattern();
-	reset_num_pattern();
-}
-
-// common pre defined number patterns
-function reset_num_pattern() {
-var patternchoice = document.getElementById("numberpattern").value;
-    switch(patternchoice){
-    case "2":
-        document.f.add1.value=1;
-        document.f.add2.value=1;
-        document.f.add3.value=1;
-        document.f.every1.value=12;
-        document.f.every2.value=1;
-        document.f.every3.value=1;
-        document.f.whenmorethan1.value=9999999;
-        document.f.whenmorethan2.value=12;
-        document.f.whenmorethan3.value=4;
-        document.f.setto1.value=0;
-        document.f.setto2.value=1;
-        document.f.setto3.value=1;
-        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}");
-        moreoptions(text[1],text[0],text[2]);
-        display_table(0); // toggle info box on (1) or off (0)
-        break;
-    case "3":
-        document.f.add1.value=1;
-        document.f.add2.value=1;
-        document.f.add3.value='';
-        document.f.every1.value=12;
-        document.f.every2.value=1;
-        document.f.every3.value='';
-        document.f.whenmorethan1.value=9999999;
-        document.f.whenmorethan2.value=12;
-        document.f.whenmorethan3.value='';
-        document.f.setto1.value=0;
-        document.f.setto2.value=1;
-        document.f.setto3.value='';
-        document.f.lastvalue1.value=1;
-        document.f.lastvalue2.value=1;
-        document.f.lastvalue3.value='';
-        document.f.numberingmethod.value=_("Vol {X}, No {Y}");
-        moreoptions(text[1],text[0]);
-        display_table(0);
-        break;
-    case "4":
-        document.f.add1.value=1;
-        document.f.add2.value=1;
-        document.f.add3.value='';
-        document.f.every1.value=12;
-        document.f.every2.value=1;
-        document.f.every3.value='';
-        document.f.whenmorethan1.value=9999999;
-        document.f.whenmorethan2.value=12;
-        document.f.whenmorethan3.value='';
-        document.f.setto1.value=0;
-        document.f.setto2.value=1;
-        document.f.setto3.value='';
-        document.f.lastvalue1.value=1;
-        document.f.lastvalue2.value=1;
-        document.f.lastvalue3.value='';
-        document.f.numberingmethod.value=_("Vol {X}, Issue {Y}");
-        moreoptions(text[1],text[2]);
-        display_table(0);
-        break;
-    case "5":
-//        var d = new Date(document.f.firstacquidate.value);
-//        var smonth = d.getMonth();
-        document.f.add1.value=1;
-        document.f.add2.value=1;
-        document.f.add3.value='';
-        document.f.every1.value=12;
-        document.f.every2.value=1;
-        document.f.every3.value='';
-        document.f.whenmorethan1.value=9999999;
-        document.f.whenmorethan2.value=12;
-        document.f.whenmorethan3.value='';
-        document.f.setto1.value=0;
-        document.f.setto2.value=1;
-        document.f.setto3.value='';
-        document.f.numberingmethod.value=_("No {X}, Issue {Y}");
-        moreoptions(text[0],text[2]);
-        display_table(0);
-        break;
-    case "6":
-        var d = new Date(document.f.firstacquidate.value);
-        var sYear = d.getFullYear();
-        moreoptions_seasons(text[15],sYear);
-        var d = new Date(document.f.firstacquidate.value);
-        var sYear = d.getFullYear();
-        document.f.add1.value=1;
-        document.f.add2.value='1';
-        document.f.add3.value='';
-        document.f.every1.value=4;
-        document.f.every2.value='1';
-        document.f.every3.value='';
-        document.f.whenmorethan1.value=9999999;
-        document.f.whenmorethan2.value='4';
-        document.f.whenmorethan3.value='';
-        document.f.setto1.value=0;
-        document.f.setto2.value='1';
-        document.f.setto3.value='';
-        document.f.periodicity.value='8';
-        document.f.numberingmethod.value=_("{Y} {X}");
-        moreoptions_seasons(text[15],sYear);
-        document.f.lastvalue1temp.value=document.f.lastvalue1.value=sYear;
-        display_table(0);
-        is_season = 1;
-        break;
-    case "7":
-        display_table(1);
-        document.getElementById("more_options").innerHTML = '';
-        document.f.irreg_check.value=1; 
-        break;
-    case "8":  // Year/Number
-        var d = (document.f.firstacquidate.value) ? new Date( document.f.firstacquidate.value) : new Date() ;
-        var sYear = d.getFullYear();
-        document.f.add1.value=1;
-        document.f.add2.value=1;
-        document.f.add3.value='';
-        document.f.every1.value=12;
-        document.f.every2.value=1;
-        document.f.every3.value='';
-        document.f.whenmorethan1.value=9999999;
-        document.f.whenmorethan2.value=12;
-        document.f.whenmorethan3.value='';
-        document.f.setto1.value=0;
-        document.f.setto2.value=1;
-        document.f.setto3.value='';
-        document.f.lastvalue1.value=sYear;
-          switch (document.f.periodicity.value){
-            case 1:              
-              var doy = dayofyear(d);
-              document.f.lastvalue2.value=doy; 
-              document.f.whenmorethan2.value=365; 
-              break;      
-            case 12:     
-              var doy = dayofyear(d);
-              document.f.lastvalue2.value=doy*2; 
-              document.f.whenmorethan2.value=730; 
-              break;      
-            case 2:
-            case 3:
-            case 4:
-              var YWDa = YMDaToYWDa(d);
-              document.f.lastvalue2.value=YWDA[1]/(document.f.periodicity.value-1); 
-              break;      
-            case 5:
-              var smonth = d.getMonth();
-              document.f.lastvalue2.value=smonth;
-              break;      
-            case 6:
-              var smonth = d.getMonth();
-              document.f.lastvalue2.value=smonth/2;
-              document.f.whenmorethan2.value=6;
-              break;      
-            case 7:
-            case 8:      
-              var smonth = d.getMonth();
-              document.f.lastvalue2.value=smonth/3;
-              document.f.whenmorethan2.value=4;
-              break;      
-            case 9:                        
-              var smonth = d.getMonth();
-              document.f.lastvalue2.value=smonth/6;
-              document.f.whenmorethan2.value=2;
-              break;      
-            default:
-          } 
-        document.f.lastvalue3.value='';
-        document.f.numberingmethod.value=_("{X} / {Y}");
-        moreoptions(text[16],text[0]);
-     //   document.f.lastvalue1temp.value=sYear;
-     //   document.f.lastvalue2temp.value=document.f.lastvalue2.value;
-        display_table(0);
-        break;
-    default:
-        document.f.add1.value=1;
-        document.f.add2.value='';
-        document.f.add3.value='';
-        document.f.every1.value=1;
-        document.f.every2.value='';
-        document.f.every3.value='';
-        document.f.whenmorethan1.value=9999999;
-        document.f.whenmorethan2.value='';
-        document.f.whenmorethan3.value='';
-        document.f.setto1.value=0;
-        document.f.setto2.value='';
-        document.f.setto3.value='';
-        document.f.lastvalue1.value=1;
-        document.f.lastvalue2.value='';
-        document.f.lastvalue3.value='';
-        document.f.numberingmethod.value='{X}';
-//        moreoptions_daily_check(text[0]);
-        moreoptions(text[0]);
-        document.f.irreg_check.value=1;
-        display_table(0);
-        break;
-    }
-}
-
-function display_table(n) {
-    if(n==1){
-        document.getElementById("basetable").style.display = 'block';
-    } else if(n==0){
-        document.getElementById("basetable").style.display = 'none';
-    } else {
-		var disp_val = ( document.getElementById("basetable").style.display == 'none' ) ? 'block' : 'none' ;
-			document.getElementById("basetable").style.display = disp_val;
-	}
-}
-
-function set_num_pattern_from_template_vars() {
-	if(!document.getElementById("numberpattern")){ return false; }
-    document.getElementById("numberpattern").value = '[% numberpattern %]';
-    reset_num_pattern();
-    
-    document.f.add1.value='[% add1 %]';
-    document.f.add2.value='[% add2 %]';
-    document.f.add3.value='[% add3 %]';
-    document.f.every1.value='[% every1 %]';
-    document.f.every2.value='[% every2 %]';
-    document.f.every3.value='[% every3 %]';
-    document.f.whenmorethan1.value='[% whenmorethan1 %]';
-    document.f.whenmorethan2.value='[% whenmorethan2 %]';
-    document.f.whenmorethan3.value='[% whenmorethan3 %]';
-    document.f.setto1.value='[% setto1 %]';
-    document.f.setto2.value='[% setto2 %]';
-    document.f.setto3.value='[% setto3 %]';
-    document.f.lastvalue1.value='[% lastvalue1 %]';
-    document.f.lastvalue2.value='[% lastvalue2 %]';
-    document.f.lastvalue3.value='[% lastvalue3 %]';
-    document.f.numberingmethod.value='[% numberingmethod %]';
-
-    var more_strY;
-    var more_strZ;
-    [% IF ( add2 ) %]
-    if([% add2 %] > 0){
-        more_strY="Y";
-    }
-    [% END %]
-    [% IF ( add3 ) %]
-    if([% add3 %] > 0){
-        more_strZ="Z";
-    }
-    [% END %]
-    document.f.lastvalue1temp.value='[% lastvalue1 %]';
-    if(more_strY){
-        document.f.lastvalue2temp.value='[% lastvalue2 %]';
-    document.f.whenmorethan2temp.value='[% whenmorethan2 %]';
-    }
-    if(more_strZ){
-        document.f.lastvalue3temp.value='[% lastvalue3 %]';
-    document.f.whenmorethan3temp.value='[% whenmorethan3 %]';
-    }
-}
-
-// a pre check with more options to see if 'number' and '1/day' are chosen
-function moreoptions_daily_check(x) {
-    var periodicity = document.f.periodicity.value;
-    var errortext='';
-    if(periodicity == 1){ // i.e. daily
-        document.getElementById("irregularity").innerHTML = '';
-        errortext =_("Please indicate which days of the week you DO NOT expect to receive issues.")+"<br \/>";
-        for(var j=0;j<irregular_issues.daynames.length;j++){
-            errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+irregular_issues.daynames[j]+" &nbsp; ";
-        }
-        var error = errortext;
-        moreoptions(x);
-        document.getElementById("irregularity").innerHTML = error;
-    } else {
-        document.getElementById("irregularity").innerHTML = '';
-        document.getElementById("more_options").innerHTML = '';
-        moreoptions(x);
-    }
-}
-
-// to dispaly the more options section
-function moreoptions(x,y,z){
-document.getElementById("irregularity").innerHTML = '';
-document.getElementById("more_options").innerHTML = '';
-var textbox = '';
-    // alert("X: "+x+"Y: "+y+"Z: "+z);
-    if(x){
-        textbox +="<table id='irregularity_table'>\n<tr><th>&nbsp;<\/th><th>"+x+"<\/th>";
-        if(y){
-            textbox +="<th>"+y+"<\/th>";
-            if(z){
-                textbox +="<th>"+z+"<\/th>";
-            }
-        }
-        textbox +="<\/tr>\n";
-        textbox +="<tr><th scope=\"row\">"+text[5]+"<\/td><td><input type='text' name='lastvalue1temp' id='lastvalue1temp' size='4' onkeyup='moreoptionsupdate(this)' value=\"" + document.f.lastvalue1.value +  "\" /><\/td>\n";
-        if(y){
-            textbox +="<td><input type=\"text\" name=\"lastvalue2temp\" id=\"lastvalue2temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this)\" value=\"" + document.f.lastvalue2.value + "\" /><\/td>\n";
-            if(z){
-                textbox +="<td><input type=\"text\" name=\"lastvalue3temp\" id=\"lastvalue3temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this)\" value=\"" + document.f.lastvalue3.value + "\" /><\/td>\n";
-            }
-        }
-        textbox +="<\/tr>\n";
-        if(y){
-            textbox +="<tr><th scope=\"row\">"+text[6]+"<\/th>";
-            textbox +="<td>&nbsp;<\/td>\n";
-            textbox +="<td><input type=\"text\" name=\"whenmorethan2temp\" id=\"whenmorethan2temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,1)\"><\/td>\n";
-            if(z){
-                textbox +="<td><input type=\"text\" name=\"whenmorethan3temp\" id=\"whenmorethan3temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,1)\"><\/td>\n";
-            }
-            textbox +="<\/tr>";
-        } else {
-          textbox +="<tr> <td>"+_("issues expected")+"<\/td><td><input type=\"text\" name=\"issuesexpected1temp\" id=\"issuesexpected1temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,0)\" value=\"" + document.f.issuesexpected1.value + "\" ><\/td><\/tr>";
-        }
-        textbox +="<\/table>\n";
-    }
-    document.getElementById("more_options").innerHTML = textbox;
-}
-
-function hemispheres(chosen){
-var selbox = document.getElementById("season1");
-    if(selbox){
-    var selboxselected = selbox.options[selbox.selectedIndex].value;
-    selbox.options.length = 0;
-
-    if ( (chosen == "1") || ( ! (chosen) && is_hemisphere == 1 )) {
-        selbox.options[selbox.options.length] = new Option(text[11],'1');
-        selbox.options[selbox.options.length] = new Option(text[12],'2');
-        selbox.options[selbox.options.length] = new Option(text[13],'3');
-        selbox.options[selbox.options.length] = new Option(text[14],'4');
-        is_hemisphere = 1;
-        selbox.options[selboxselected-1].selected = true;
-    }
-
-    if ( (chosen == "2") || ( ! (chosen) && is_hemisphere == 2 )) {
-        selbox.options[selbox.options.length] = new Option(text[13],'1');
-        selbox.options[selbox.options.length] = new Option(text[10],'2');
-        selbox.options[selbox.options.length] = new Option(text[11],'3');
-        selbox.options[selbox.options.length] = new Option(text[12],'4');
-        is_hemisphere = 2;
-        selbox.options[selboxselected-1].selected = true;
-    }
-    }
-}
-
-// to display the more options section for seasons
-function moreoptions_seasons(x,y){
-// x = 'Season'.  y = 'Year'.
-document.getElementById("irregularity").innerHTML = '';
-document.getElementById("more_options").innerHTML = '';
-var textbox = '';
-    //alert("X: "+x+"Year: "+y);
-    if(x){
-        var hemi_select = parseInt('[% hemisphere %]');
-        textbox +="<li><label for=\"hemisphere\">"+ text[7]  +"<\/label><select name=\"hemisphere\" id=\"hemisphere\" onchange=\"hemispheres(this.options[this.selectedIndex].value)\">";
-        for(var i = 1; i <= 2; i++){
-            textbox +="<option value='"+i+"'";
-            if(i == hemi_select){
-                textbox += " selected "
-            }
-            textbox +=">"+text[i+7]+"<\/option>";
-        }
-        textbox +="<\/li>\n";
-        textbox +="<table id=\"seasonal_irregularity\"><tr><th>&nbsp;<\/th><th>"+x+"<\/th>";
-        textbox +="<th>"+text[16]+"<\/th>";
-        textbox +="<\/tr>\n";
-        textbox +="<tr><th scope=\"row\">"+text[5]+"<\/th><td><select name=\"lastvalue2temp\" id=\"lastvalue2temp\" id=\"season1\" onchange=\"moreoptionsupdate(this)\">";
-        for(var j = 1; j <= 4; j++){
-            textbox +="<option value='"+j+"'>"+text[j+9]+"<\/option>";
-        }
-        textbox +="<\/select><\/td>";
-        var isyr = irregular_issues.firstissue;
-        textbox += "<td>" + irregular_issues.firstissue.getFullYear() + "<\/td><\/tr>\n";
-        textbox +="<tr><th scope=\"row\">"+text[6]+"<\/th>";
-        textbox +="<td><input type=\"text\" name=\"whenmorethan2temp\" id=\"whenmorethan2temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,1)\"><\/td>\n";
-        textbox +="<\/tr><\/table>\n";
-    }
-    document.getElementById("more_options").innerHTML = textbox;
-}
-
-function irregularity_check(){
-    document.f.irreg_check.value = 1; // Irregularity button now pushed
-    var periodicity = document.f.periodicity.value;
-	var rollover = document.f.issuesexpected1.value;
-    if( (document.f.whenmorethan2) && ( document.f.whenmorethan2.value > 0) ){
-      rollover = document.f.whenmorethan2.value;
-    }
-    if((document.f.whenmorethan3) && document.f.whenmorethan3.value > 0 ){
-        // FIXME: Irregularity check assumes that the full prediction pattern repeats each year.
-		//  In cases where the outermost periodicity is > 1 year,  
-		//  e.g. where a volume spans two years, the irregularity check will be incorrect, 
-        // but you can safely ignore the check, submit the form, and the prediction pattern should be correct.
-		//  a way to distinguish between these two cases is needed.
-		rollover = document.f.whenmorethan3.value * document.f.whenmorethan2.value;
-    }
-    var error='';
-    var toobig;
-    var expected; 
-    var errortext = "<b>"+_("Warning irregularity detected")+"</b><br \/>";
-    switch(periodicity){
-    case "12":
-        if(rollover < 730) expected =730;
-        if(rollover > 730) {
-            expectedover=730;
-            toobig=1;
-        }
-        break;
-    case "1":
-        if(rollover < 365) expected =365;
-        if(rollover > 365) {
-            expectedover=365;
-            toobig=1;
-        }
-        break;
-    case "2":
-        if(rollover < 52) expected =52;
-        if(rollover > 52){
-            expectedover=52;
-            toobig=1;
-        }
-        break;
-    case "3":
-        if(rollover < 26) expected =26;
-        if(rollover > 26){
-            expectedover=26;
-            toobig=1;
-        }
-        break;
-    case "4":
-        if(rollover < 17) expected =17;
-        if(rollover > 17){
-            expectedover=17;
-            toobig=1;
-        }
-        break;
-    case "5":
-        if(rollover < 12) expected =12;
-        if(rollover > 12){
-            expectedover=12;
-            toobig=1;
-        }
-        break;
-    case "6":
-        if(rollover < 6) expected =6;
-        if(rollover > 6){
-            expectedover=6;
-            toobig=1;
-        }
-        break;
-    case "7":
-        if(rollover < 4) expected =4;
-        if(rollover > 4){
-            expectedover=4;
-            toobig=1;
-        }
-        break;
-    case "8":
-        if(rollover < 4) expected =4;
-        if(rollover > 4){
-            expectedover=4;
-            toobig=1;
-        }
-        break;
-    case "9":
-        if(rollover < 2) expected =2;
-        if(rollover > 2){
-            expectedover=2;
-            toobig=1;
-        }
-        break;
-    case "10":
-        if(rollover < 1) expected =1;
-        if(rollover > 1){
-            expectedover=1;
-            toobig=1;
-        }
-        break;
-    default:
-        break;
-    }
-    if(expected){
-        if(expected == 365 || expected==730){  // what about leap years ?
-			// FIXME:  We interpret irregularity as which days per week for periodicity==1.
-			//  We need two cases: one in which we're published n days/week, in which case irregularity should be per week,
-			//  and a regular daily pub, where irregularity should be per year.
-            errortext += _("Please indicate which days of the week you DO NOT expect to receive issues.")+"<br \/>";
-        } else {
-            errortext +=expected+_(" issues expected, ")+rollover+_(" were entered.")+"<br \/>"+_("Please indicate which date(s) an issue is not expected")+"<br \/>";
-            irregular_issues.numskipped = expected - rollover;
-		}
-        errortext +="<select multiple id=\"irregularity_select\" name=\"irregularity_select\" onchange=\"irregular_issues.update();\">\n";
-		errortext +=irregular_options(periodicity);
-		errortext += "<\/select>\n <textarea rows=\"6\" width=\"18\" id=\"irregularity_summary\" name=\"irregularity_summary\" value=\"foo\"><\/textarea>";
-        error=errortext;
-    }
-    if(toobig){
-        errortext +=expectedover+_(" issues expected, ")+rollover+_(" were entered")+"<p class=\"warning\">"+_("You seem to have indicated more issues per year than expected.<\/p>");
-        error=errortext;
-    }
-    if(error.length ==0){
-        error=_("No irregularities noticed");
-    }
-	display_example(expected);
-    document.getElementById("irregularity").innerHTML = error;
-	irregular_issues.update();
-}
-
-function irregular_options(periodicity){
-    var titles;
-    var count;
-    var errortext='';
-    var numberpattern = document.getElementById('numberpattern').value;
-    if(periodicity == 1) {
-        expected = 7;
-        titles = irregular_issues.daynames;
-        count = 1;
-    }
-    if(periodicity == 2 || periodicity == 3 || periodicity == 4) { 
-        titles = irregular_issues.weeks;
-		count = 1;
-        if(periodicity==3) {  // 1/2 wks
-            expected = 26;
-        } else if(periodicity == 4) { // 1/3 wks
-            expected = 17;
-        } else {
-            expected = 52;
-        }
-    }
-    if(periodicity == 5 || periodicity == 6 || periodicity == 7 || periodicity == 8 || periodicity == 9) {
-        if(periodicity == 8 && numberpattern==8) {
-            is_season = 1; // setting up from edit page
-        } 
-        if(is_season){
-            titles = irregular_issues.seasons;
-            expected = 4;
-            if(is_hemisphere == 2){
-                count = 2;
-            } else {
-                count = 1;
-            }
-        } else {
-            titles = irregular_issues.months;
-            expected = 12;
-            count = 1;
-        }
-    }
-	if( !expected) {
-		return '';   // don't know how to deal with irregularity.
-	} 	
-    for(var j=0;j<expected;j++){   // rch - changed frrom (1..expected).
-        if(isArray(titles)){
-            if(count>expected){
-                count = count-expected;
-            }
-            if(is_season && is_hemisphere == 1){
-                errortext +="<option value='"+((count*3)-2)+"'>"+titles[j]+"<\/option>\n";
-// alert("value: "+((count*3)-2)+" title: "+titles[j]);
-            } else if(is_season && is_hemisphere == 2){
-                errortext +="<option value='"+((count*3)-2)+"'>"+titles[j-1]+"<\/option>\n";
-// alert("value: "+((count*3)-2)+" title: "+titles[j-1]);
-            } else {  // all non-seasonal periodicities:
-                var incr=1; // multiplier for ( 1/n weeks)  patterns; in this case the irreg calc relies on the week# , not the issue#.
-                if(periodicity==3) {  // 1/2 wks
-                    incr=2;
-                } else if(periodicity == 4) { // 1/3 wks
-                    incr=3;
-                }
-                errortext += "<option value='" + (1+j*incr) ;  
-				if(irregular_issues.irregular(1+incr*j)) {
-					errortext += "' selected='selected" ;
-				}
-				errortext += "'>"+titles[incr*j]+"<\/option>\n";
-            }
-            count++;
-        } else { 
-            errortext +="<option value='"+j+"'>"+titles+" "+j+"<\/option>\n";
-        }
-    }
-    return errortext;
-}
-
-
-function display_example(expected){
-    var startfrom1 = parseInt(document.f.lastvalue1.value);
-    var startfrom2 = parseInt(document.f.lastvalue2.value);
-    var startfrom3 = parseInt(document.f.lastvalue3.value);
-    var every1 = parseInt(document.f.every1.value);
-    var every2 = parseInt(document.f.every2.value);
-    var every3 = parseInt(document.f.every3.value);
-    var numberpattern = document.f.numberingmethod.value;
-    var whenmorethan2 = parseInt(document.f.whenmorethan2.value);
-    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 entered, the Numbering Pattern will look like this: ") + "<br \/><ul class=\"numpattern_preview\">";
-    if(startfrom3>0){
-        var count=startfrom3-1;
-        var count2=startfrom2;
-        for(var i = 0 ; i < 12; i++){
-            if(count>=whenmorethan3){
-                count=setto3;
-                if(count2>=whenmorethan2){
-                    startfrom1++;
-                    count2=setto2;
-                } else {
-                    count2++;
-                }
-            } else {
-                count++;
-            }
-            displaytext += '<li>' + numberpattern.replace(/{Z}/,count) + '<\/li>\n';
-            displaytext = displaytext.replace(/{Y}/,count2);
-            displaytext = displaytext.replace(/{X}/,startfrom1);
-
-        }
-    }
-    if(startfrom2>0 && !startfrom3){
-        var count=startfrom2-1;
-        for(var i=0;i<12;i++){
-            if(count>=whenmorethan2){
-                startfrom1++;
-                count=setto2;
-            } else {
-                count++;
-            }
-
-            if(is_season){
-                if(is_hemisphere == 2){
-                    if(count == 1) {
-                        displaytext += numberpattern.replace(/{Y}/,text[count+12])+'\n';
-                    } else {
-                        displaytext += numberpattern.replace(/{Y}/,text[count+8])+'\n';
-                    }
-                } else {
-                displaytext += numberpattern.replace(/{Y}/,text[count+10])+'\n';
-                }
-            } else {
-                displaytext += numberpattern.replace(/{Y}/,count)+'\n';
-            }
-            displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
-        }
-    }
-    if(startfrom1>0 && !startfrom2 && !startfrom3){
-        var offset=eval(document.f.issuesexpected1.value);
-        if (!offset){
-            offset = 12 
-        }
-        for(var i=startfrom1;i<(startfrom1+offset);i+=every1){
-            displaytext += numberpattern.replace(/{X}/,i)+'<br \/>\n';
-        }
-    }
-   //  displaytext = "<div style='padding: 5px; background-color: #CCCCCC'>"+displaytext+"<\/div>";
-    document.getElementById("displayexample").innerHTML = displaytext;
-}
-
-function isArray(obj) {
-if (obj.constructor.toString().indexOf("Array") == -1)
-    return false;
-else
-    return true;
-}
-
-function moreoptionsupdate(inputfield,rollover){
-    fieldname = inputfield.name;
-    // find parent element in base table by stripping 'temp' from element name.
-    basefield = document.getElementById(fieldname.slice(0,-4));
-    var fieldnumber = fieldname.slice(-5,-4);
-
-    basefield.value = inputfield.value;
-    var patternchoice = document.getElementById("numberpattern").value;
-    switch(patternchoice){
-    case "2":
-    case "4":
-    case "5":
-    case "8": // Year, Number.  -- Why not just use Vol, Number withvol==year??
-                //  FIXME: this my conflict with innerloop calc below.
-       if (document.f.lastvalue2temp.value > 0){document.f.innerloop1.value = document.f.lastvalue2temp.value - 1;}
-      break;   
-    }  
-    if(basefield.name.slice(0,-1) == 'lastvalue' || 'whenmorethan' ) {
-        // The enumeration string is held in a positional numeral notation with three positions, X,Y,Z.
-        // The last values lastvalue1, lastvalue2,lastvalue3 should match the last received serial's X,Y,Z enumeration.
-        // make array indexes start with 1 for consistency with variable names.
-        var innerloop = new Array( undefined, document.getElementById('innerloop1'), document.getElementById('innerloop2'), document.getElementById('innerloop3') );
-        var lastvalue = new Array( undefined, document.getElementById('lastvalue1').value *1 , document.getElementById('lastvalue2').value *1 , document.getElementById('lastvalue3').value *1  );
-        var every = new Array( undefined, document.getElementById('every1').value *1 , document.getElementById('every2').value *1 , document.getElementById('every3').value *1  );
-        var add = new Array( undefined, document.getElementById('add1').value *1 , document.getElementById('add2').value *1 , document.getElementById('add3').value *1  );
-        var whenmorethan = new Array( undefined, document.getElementById('whenmorethan1').value *1 , document.getElementById('whenmorethan2').value *1 , document.getElementById('whenmorethan3').value *1  );
-        
-       if(rollover){
-       // calculate rollover  for higher level of periodicity.
-       // if there are two levels of periodicity, (e.g. vol{X},num{Y},issue{Z}, then every1=every2*whenmorethan2 / add2 .
-          for(var N=3;N>1;N--){
-            if( add[N] > 0){
-                var addN = (add[N]) ? add[N] : 1 ;
-                var everyN = (document.getElementById('every'+N)) ? document.getElementById('every'+N).value : 1 ;
-                document.getElementById('every'+(N-1)).value = whenmorethan[N] * everyN / addN ;
-            }
-          }
-        }
-        innerloop[3].value = ( every[3] > 1 ) ? lastvalue[3] % every[3] : 0 ;
-        innerloop[2].value = ( every[2] > 1 ) ? lastvalue[3] - 1 : 0 ;
-        innerloop[1].value = ( every[1] > 1 ) ? 
-                                    ( whenmorethan[3] > 0 ) ?  (lastvalue[2] - 1) * every[2] + 1* innerloop[2].value 
-                                                            : lastvalue[2] - 1
-                                               : 0 ;
-    }
-     //FIXME : add checks for innerloop || lastvalue .gt. rollover  
-}
-
-
-function check_input(e){
-    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"));
-            return false // disable key press
-        }
-    }
-}
-
-function addbiblioPopup(biblionumber) {
-	var destination = "/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup";
-	if(biblionumber){ destination += "&biblionumber="+biblionumber; }
- window.open(destination,'AddBiblioPopup','width=1024,height=768,toolbar=no,scrollbars=yes');
-}
-
-function Plugin(f)
-{
-	 window.open('subscription-bib-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
-}
-
-function FindAcqui(f)
-{
-	 window.open('acqui-search.pl','FindASupplier','width=800,height=400,toolbar=no,scrollbars=yes');
-}
-
-function Find_ISSN(f)
-{
-	 window.open('issn-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
-}
-
-
-function Check(f) {
-    if (f.aqbooksellerid.value.length==0) {
-        input_box = confirm(_("If you wish to claim late or missing issues you must link this subscription to a vendor. Click OK to ignore or Cancel to return and enter a vendor"));
-		if (input_box==true) {
-		}
-		else {
-			return false;
-		}
-    }
-	if (f.biblionumber.value.length==0) {
-        alert(_("You must choose or create a biblio"));
-    } else if(f.startdate.value.length != 0 && f.sublength.value > 0) {
-        if (f.irreg_check.value == 1) {
-            document.f.submit();
-        } else {
-            if(f.numbering_pattern.value == ''){
-                alert(_("Please choose a numbering pattern"));
-            } else {
-                alert(_("Please check for irregularity by clicking 'Test Prediction Pattern'"));
-            }
-        }
-    } else {
-        alert(_("You must choose a start date and a subscription length"));
-    }
-	if(irregular_issues.numskipped < irregular_issues.skipped.length ) {
-		alert(_("You have not accounted for all missing issues."));
-	}
-    return false;
-}
-
-$(document).ready(function() {
-    init_pattern();
-	
-	[% IF ( history ) %] $("#subscription_form_history").show();[% END %]
-	$("#cancel_manual_history").click(function(){
-		$("#subscription_form_history").hide();
-		$("#manuallist").attr("checked","");
-	});
-   	$("#manuallist").click( function(){
-		if($(this).attr("checked")){
-			$("#subscription_form_history").show();
-		} else {
-			$("#subscription_form_history").hide();
-		}
-	}
-	);
-   //  $(".widelabel").attr("width", "300px");  // labels stay skinny in IE7 anyway.
-[% IF ( modify ) %]
-    set_num_pattern_from_template_vars();
-    [% IF ( hemisphere ) %]
-	is_hemisphere = [% hemisphere %] ;
-    hemispheres();
-    [% END %]
-[% END %]
-[% IF ( irregularity ) %]
-    irregularity_check();
-[% END %]
-    $('#numberpattern').change( function() { 
-        reset_num_pattern(); 
-    });
-
-    var node;
-    [% FOREACH field IN dont_export_field_loop %]
-        node = $("#[% field.fieldid %]");
-        if ( $(node).is('input') || $(node).is('textarea') ) {
-            $(node).val("");
-        } else if ( $(node).is('select') ) {
-            $(node).find("option:first").attr('selected','selected');
-        }
-    [% END %]
-});
-//]]>
-</script>
-</head>
-<body id="ser_subscription-add" class="ser">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'serials-search.inc' %]
-
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% bibliotitle |html %]</i></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</div>
-
-<div id="doc3" class="yui-t7">
-   
-   <div id="bd">
-<h1>[% IF ( modify ) %] Modify subscription for <i>[% bibliotitle |html %]</i>[% ELSE %]Add a new subscription[% END %]</h1>
-   <div class="yui-g">
-    <form method="post" name="f" action="/cgi-bin/koha/serials/subscription-add.pl">
-[% IF ( modify ) %]
-        <input type="hidden" name="op" value="modsubscription" />
-        <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
-[% ELSE %]
-        <input type="hidden" name="op" value="addsubscription" />
-[% END %]
-<input type="hidden" name="user" value="[% loggedinusername %]" />
-<input type="hidden" name="irreg_check" value="0" />
-<input type="hidden" name="issuesexpected1" id="issuesexpected1" value="0" />
-
-	<div class="yui-u first">
-    <fieldset id="subscription_add_information" class="rows">
-	<legend>Subscription details</legend>
-	<ol>
-	    [% IF ( subscriptionid ) %]
-        <li><span class="label">Subscription #</span> [% subscriptionid %]</li>
-        [% END %]
-        <li>
-            <label for="aqbooksellerid">Vendor: </label>
-            <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid %]" size="8" /> (<input type="text" name="aqbooksellername" value="[% aqbooksellername %]" disabled="disabled" readonly="readonly" />) <a href="#" onclick="FindAcqui(f)">Search for a vendor</a>
-        </li>
-        <li>
-            <label for="biblionumber" class="required" title="Subscriptions must be associated with a bibliographic record">Biblio:</label>
-            
-                <input type="text" name="biblionumber" id="biblionumber" value="[% bibnum %]" size="8" /> 
-                (<input type="text" name="title" value="[% bibliotitle %]" disabled="disabled" readonly="readonly" />) <span class="required" title="Subscriptions must be associated with a bibliographic record">Required</span>
-               <div class="inputnote"> <a href="#" onclick="Plugin(f)">Search for Biblio</a>
-		    [% IF ( CAN_user_editcatalogue ) %] 
-		       [% IF ( modify ) %]
-		       | <a href="#" onclick="addbiblioPopup([% bibnum %]); return false;">Edit biblio</a>
-		       [% ELSE %]
-		       | <a href="#" onclick="addbiblioPopup(); return false;">Create Biblio</a>
-		       [% END %]
-		    [% END %]
-	       </div>
-            
-        </li>
-        <li class="radio">
-            [% IF ( serialsadditems ) %]
-                <p><input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1" checked="checked" /><label class="widelabel" for="serialsadditems-yes">create an item record when receiving this serial</label></p>
-                <p><input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" /><label class="widelabel" for="serialsadditems-no">do not create an item record when receiving this serial </label></p>
-            [% ELSE %]
-                <p><input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1"/><label class="widelabel" for="serialsadditems-yes">create an item record when receiving this serial</label></p>
-                <p><input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" checked="checked" /><label class="widelabel" for="serialsadditems-no">do not create an item record when receiving this serial</label></p>
-            [% END %]
-        </li>
-        <li>
-            <label for="branchcode">Library:</label>
-            
-                <select name="branchcode" id="branchcode" style="width: 20em;">
-                    [% UNLESS ( Independantbranches ) %]<option value="">None</option>[% END %]
-                    [% FOREACH branchloo IN branchloop %][% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
-				[% ELSE %]
-				<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
-				[% END %]
-                    [% END %]
-                </select> (select a library)
-            
-        </li>
-        <li>
-            <label for="location">Location:</label>
-            <select name="location" id="location">
-                <option value="">None</option>
-                [% FOREACH locations_loo IN locations_loop %][% IF ( locations_loo.selected ) %]<option value="[% locations_loo.authorised_value %]" selected="selected">[% locations_loo.lib %]</option>[% ELSE %]<option value="[% locations_loo.authorised_value %]">[% locations_loo.lib %]</option>[% END %][% END %]
-            </select>
-        </li>
-         <li>
-            <label for="callnumber">Call number:</label>
-            <input type="text" name="callnumber" id="callnumber" value="[% callnumber %]" size="20" />
-        </li>
-        <li>
-            <label for="graceperiod">Grace period:</label> <input type="text" name="graceperiod" id="graceperiod" value="[% graceperiod %]" size="5"/> day(s)
-        </li>
-        <li>
-            <label for="notes">OPAC note:</label>
-            <textarea name="notes" id="notes" cols="30" rows="2">[% notes %]</textarea>
-        </li>
-        <li>
-            <label for="internalnotes">Nonpublic note:</label>
-            <textarea name="internalnotes" id="internalnotes" cols="30" rows="2">[% internalnotes %]</textarea>
-        </li>
-        <li>
-            
-               [% IF ( letterloop ) %]
-            <label for="letter">Patron notification: </label>
-			   <select name="letter" id="letter">
-                    <option value="">None</option>
-                [% FOREACH letterloo IN letterloop %]
-				[% IF ( letterloo.selected ) %]
-                    <option value="[% letterloo.value %]" selected="selected">[% letterloo.lettername %]</option>
-[% ELSE %]
-                    <option value="[% letterloo.value %]">[% letterloo.lettername %]</option>
-[% END %]
-                [% END %]
-                </select> 
-                <div class="hint">Select a notice and subscribers will be notified when new issues are received.</div>
-            	[% ELSE %]
-            <span class="label">Patron notification: </span>
-				<div class="hint">To notify patrons of new serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div>
-				[% END %]
-        </li>
-		<li>
-			 <label class="widelabel" for="staffdisplaycount">Number of issues to display to staff: </label>
-			 <input type="text" name="staffdisplaycount" id="staffdisplaycount" value="[% staffdisplaycount %]" size="4"/>
-		 </li>
-		 <li>
-            <label class="widelabel" for="opacdisplaycount">Number of issues to display in OPAC: </label>
-			<input type="text" name="opacdisplaycount" id="opacdisplaycount" value="[% opacdisplaycount %]" size="4"/>
-		</li>
-	</ol>
-	</fieldset>
-	</div>
-	
-<div id="subscription_form_history" class="yui-u" style="display:none">
-<div><h3 style="display:inline">Subscription history</h3> <a href="#" id="cancel_manual_history">[cancel manual history]</a></div>
-        <p>Hint: you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify these fields with care, as future serial receive will continue to update them automatically.</p>
-        <fieldset class="rows">
-            <ol>
-                <li>
-                <label for="histstartdate">Subscription start date</label>
-                <input type="text" name="histstartdate" id="histstartdate" value="[% histstartdate %]" /><div class="hint"> (start date of the 1st subscription)</div>
-                </li>
-                <li>
-                <label for="histenddate">Subscription end date</label>
-                <input type="text" name="histenddate" id="histenddate" value="[% histenddate %]" /> <div class="hint">(if empty, subscription is still active)</div>
-                </li>
-                <li>
-                <label for="recievedlist">Received issues</label>
-                <textarea name="recievedlist" id="recievedlist" cols="60" rows="5">[% recievedlist %]</textarea>
-                </li>
-                <li>
-                <label for="missinglist">Missing issues</label>
-                <textarea name="missinglist" id="missinglist" cols="60" rows="5">[% missinglist %]</textarea>
-                </li>
-                <li>
-                <label for="opacnote">Note for OPAC</label>
-                <textarea name="opacnote" id="opacnote" cols="60" rows="5">[% opacnote %]</textarea>
-                </li>
-                <li>
-                <label for="librariannote">Note for staff</label>
-                <textarea name="librariannote" id="librariannote" cols="60" rows="5">[% librariannote %]</textarea>
-                </li>
-            </ol>
-        </fieldset>
-    <fieldset class="action"><input type="submit" value="Save subscription history"  /></fieldset>
-</div>
-
-<div class="yui-g">
-<div id="subscription_form_planning">
-	<fieldset class="rows">
-	<legend>Serials planning</legend>
-    <ol>
-        <li>
-           <label for="acqui_date"> First issue publication date:</label>
-                [% UNLESS ( modify ) %]<img src="[% themelang %]/lib/calendar/cal.gif" id="acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />[% END %]
-                [% IF ( modify ) %]<input type="text" name="firstacquidate" value="[% firstacquidate %]"  size="13" maxlength="10" id="acqui_date" disabled="disabled" />
-                [% ELSE %]<input type="text" name="firstacquidate" value="[% firstacquidate %]"  size="13" maxlength="10" id="acqui_date" />[% END %]
-        </li>
-           [% IF ( modify ) %]<li><label for="next_acqui_date"> Next issue publication date:</label>
-                <img src="[% themelang %]/lib/calendar/cal.gif" id="next_acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
-                <input type="text" name="nextacquidate" value="[% nextacquidate %]" size="13" maxlength="10" id="next_acqui_date" />
-                </li>[% END %]
-                
-        <li><!-- both scripts for calendar must follow the input field --> 
-                <script type="text/javascript">
-                    Calendar.setup({
-                        inputField      :   "[% IF ( modify ) %]next_[% END %]acqui_date",
-                        ifFormat       :   "[% DHTMLcalendar_dateformat %]",
-                        button         :   "[% IF ( modify ) %]next_[% END %]acqui_button",
-                        align          :   "Tl",
-                        onUpdate        :    function(cal) { 
-                                                             irregular_issues.weeks = getWeeksArray(cal.date);
-                                                            irregular_issues.firstissue = cal.date;
-                                                            if(document.irregularity_summary) {
-                                                                irregular_issues.update();
-                                                            }
-                                                            if(document.getElementById("seasonal_irregularity")) {
-                                                                moreoptions_seasons(text[15]);
-                                                            }
-                                                        } 
-                        });
-                    Calendar.setup({
-                        inputField      :   "[% IF ( modify ) %]next_[% END %]acqui_date",
-                        ifFormat       :   "[% DHTMLcalendar_dateformat %]",
-                        button         :   "[% IF ( modify ) %]next_[% END %]acqui_date",
-                        align          :   "Tl",
-                        onUpdate        :    function(cal) { irregular_issues.weeks = getWeeksArray(cal.date);
-                                                            irregular_issues.firstissue = cal.date;
-                                                            if(document.irregularity_summary) {
-                                                                irregular_issues.update();
-                                                            }
-                                                            if(document.getElementById("seasonal_irregularity")) {
-                                                                moreoptions_seasons(text[15]);
-                                                            }
-                                                        } 
-                        });
-                </script>
-            <label for="periodicity" class="required">Frequency:</label>
-            
-                <select name="periodicity" size="1" id="periodicity" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1); reset_num_pattern();">
-                <option value="" selected="selected">-- please choose --</option>
-                [% IF ( periodicity16 ) %]
-                <option value="16" selected="selected">Without periodicity</option>
-                [% ELSE %]
-                    <option value="16">Without periodicity</option>
-                [% END %]
-                [% IF ( periodicity48 ) %]
-                <option value="48" selected="selected">Unknown</option>
-                [% ELSE %]
-                <option value="48">Unknown</option>
-                [% END %]
-                [% IF ( periodicity32 ) %]
-                <option value="32" selected="selected">Irregular</option>
-                [% ELSE %]
-                    <option value="32">Irregular</option>
-                [% END %]
-
-                [% IF ( periodicity12 ) %]
-                    <option value="12" selected="selected">2/day</option>
-                [% ELSE %]
-                    <option value="12">2/day</option>
-                [% END %]
-                [% IF ( periodicity1 ) %]
-                    <option value="1" selected="selected">daily (n/week)</option>
-                [% ELSE %]
-                    <option value="1">daily (n/week)</option>
-                [% END %]
-                [% IF ( periodicity2 ) %]
-                    <option value="2" selected="selected">1/week</option>
-                [% ELSE %]
-                    <option value="2">1/week</option>
-                [% END %]
-                [% IF ( periodicity3 ) %]
-                    <option value="3" selected="selected">1/2 weeks </option>
-                [% ELSE %]
-                    <option value="3">1/2 weeks </option>
-                [% END %]
-                [% IF ( periodicity4 ) %]
-                    <option value="4" selected="selected">1/3 weeks</option>
-                [% ELSE %]
-                    <option value="4">1/3 weeks</option>
-                [% END %]
-                [% IF ( periodicity5 ) %]
-                    <option value="5" selected="selected">1/month</option>
-                [% ELSE %]
-                    <option value="5">1/month</option>
-                [% END %]
-                [% IF ( periodicity6 ) %]
-                    <option value="6" selected="selected">1/2 months (6/year)</option>
-                [% ELSE %]
-                    <option value="6">1/2 months (6/year)</option>
-                [% END %]
-                [% IF ( periodicity7 ) %]
-                    <option value="7" selected="selected">1/3 months (1/quarter)</option>
-                [% ELSE %]
-                    <option value="7">1/3 months (1/quarter)</option>
-                [% END %]
-                <!-- periodicity8 is 1/quarter, exactly like periodicity7 but will use it for seasonal option -->
-                [% IF ( periodicity8 ) %]
-                    <option value="8" selected="selected">1/quarter (seasonal)</option>
-                [% ELSE %]
-                    <option value="8">1/quarter (seasonal)</option>
-                [% END %]
-                [% IF ( periodicity13 ) %]
-                    <option value="13" selected="selected">1/4 months (3/year)</option>
-                [% ELSE %]
-                    <option value="13">1/4 months (3/year)</option>
-                [% END %]
-
-                [% IF ( periodicity9 ) %]
-                    <option value="9" selected="selected">2/years</option>
-                [% ELSE %]
-                    <option value="9">2/year</option>
-                [% END %]
-                [% IF ( periodicity10 ) %]
-                    <option value="10" selected="selected">1/year</option>
-                [% ELSE %]
-                    <option value="10">1/year</option>
-                [% END %]
-                [% IF ( periodicity11 ) %]
-                    <option value="11" selected="selected">1/2 years</option>
-                [% ELSE %]
-                    <option value="11">1/2 years</option>
-                [% END %]
-                </select> <span class="required">Required</span></li>
-                <li>
-                    <label for="manuallist"> Manual history:</label>
-                    [% IF ( manualhistory ) %]
-                        <input type="checkbox" name="manualhist" id="manuallist" value="1" checked="checked" />
-                    [% ELSE %]
-                        <input type="checkbox" name="manualhist" id="manuallist" value="1" />
-                    [% END %]
-                </li>
-        <li>
-           <label for="numberpattern"> Numbering pattern:</label>
-            
-                <select name="numbering_pattern" size="1" id="numberpattern" >
-                    <option value="" selected="selected">-- please choose --</option>
-                    [% IF ( numberpattern1 ) %]
-                        <option value="1" selected="selected">Number</option>
-                    [% ELSE %]
-                        <option value="1">Number</option>
-                    [% END %]
-                    [% IF ( numberpattern2 ) %]
-                        <option value="2" selected="selected">Volume, number, issue</option>
-                    [% ELSE %]
-                        <option value="2">Volume, number, issue</option>
-                    [% END %]
-                    [% IF ( numberpattern3 ) %]
-                        <option value="3" selected="selected">Volume, number</option>
-                    [% ELSE %]
-                        <option value="3">Volume, number</option>
-                    [% END %]
-                    [% IF ( numberpattern4 ) %]
-                        <option value="4" selected="selected">Volume, issue</option>
-                    [% ELSE %]
-                        <option value="4">Volume, issue</option>
-                    [% END %]
-                    [% IF ( numberpattern5 ) %]
-                        <option value="5" selected="selected">Number, issue</option>
-                    [% ELSE %]
-                        <option value="5">Number, issue</option>
-                    [% END %]
-                    [% IF ( numberpattern6 ) %]
-                        <option value="6" selected="selected">Seasonal only</option>
-                    [% ELSE %]
-                        <option value="6">Seasonal only</option>
-                    [% END %]
-                    [% IF ( numberpattern8 ) %]
-                        <option value="8" selected="selected">Year/Number</option>
-                    [% ELSE %]
-                        <option value="8">Year/Number</option>
-                    [% END %]          
-                    [% IF ( numberpattern7 ) %]
-                        <option value="7" selected="selected">None of the above</option>
-                    [% ELSE %]
-                        <option value="7">None of the above</option>
-                    [% END %]
-                </select>
-        </li>
-                <li id="more_options"></li>
-                <li id="irregularity"></li>
-   	           <li id="displayexample"></li>
-        <li>
-           <label for="beginning_date" class="required"> Subscription start date:</label>
-            
-                <img src="[% themelang %]/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="Show calendar" title="Show calendar" />
-                <input type="text" name="startdate" value="[% startdate %]" size="13" maxlength="10" id="beginning_date" />
-                <!-- both scripts for calendar must follow the input field --> 
-                <script type="text/javascript">
-                    Calendar.setup({
-                        inputField   : "beginning_date",
-                        ifFormat     : "[% DHTMLcalendar_dateformat %]",
-                        button       : "button1",
-                        align        : "Tl"
-                    });
-                    Calendar.setup({
-                        inputField   : "beginning_date",
-                        ifFormat     : "[% DHTMLcalendar_dateformat %]",
-                        button       : "beginning_date",
-                        align        : "Tl"
-                    });
-                </script>
-            <span class="required">Required</span>
-        </li>
-        <li>
-            <label for="subtype" class="required">Subscription length:</label>
-            
-                <select name="subtype" id="subtype">
-                    [% IF ( subtype_monthlength ) %]<option value="monthlength" selected="selected">[% ELSE %]<option value="monthlength">[% END %] Number of months</option>
-                    [% IF ( subtype_numberlength ) %]<option value="numberlength" selected="selected">[% ELSE %]<option value="numberlength">[% END %] Number of issues</option>
-                    [% IF ( subtype_weeklength ) %]<option value="weeklength" selected="selected">[% ELSE %]<option value="weeklength">[% END %] Number of weeks</option>
-                </select>
-                <input type="text" id="numberlength" name="sublength" value="[% sublength %]" size="3" onkeypress="return check_input(event)" /> (enter amount in numerals)
-            <span class="required">Required</span>
-        </li>
-        <li>
-           <label for="ending_date"> Subscription end date:</label>
-            
-                <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonend1" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
-                <input type="text" name="enddate" value="[% enddate %]" size="13" maxlength="10" id="ending_date" />
-                <!-- both scripts for calendar must follow the input field --> 
-                <script type="text/javascript">
-                    Calendar.setup({
-                        inputField   : "ending_date",
-                        ifFormat     : "[% DHTMLcalendar_dateformat %]",
-                        button       : "buttonend1",
-                        align        : "Tl"
-                    });
-                    Calendar.setup({
-                        inputField   : "ending_date",
-                        ifFormat     : "[% DHTMLcalendar_dateformat %]",
-                        button       : "ending_date",
-                        align        : "Tl"
-                    });
-                </script>
-        </li>
-    <li><label for="numberingmethod">Numbering formula:</label> <input type="text" name="numberingmethod" id="numberingmethod" value="[% numberingmethod %]" />
-    </li>
-    </ol>
-	</fieldset>
-</div>
-	<fieldset class="action">
-    <input type="button" class="action_test" value="Test prediction pattern" onclick="javascript:irregularity_check()" />
-    <input type="button" class="action_reset" value="Reset pattern" onclick="javascript:reset_pattern()" />
-    <input type="button" class="action_save"  value="Save subscription" onclick="Check(this.form)" accesskey="w" />
-	</fieldset>
-    <fieldset class="action">
-    <input type="button" class="action_advanced" value="Show/Hide advanced pattern" onclick="javascript:display_table()" />
-    </fieldset>
-           <div id="basetable"  style="display: none;">
-            <table class="small">
-                <tr><th colspan="4">Advanced prediction pattern</th></tr>
-				<tr>
-                    <th>&nbsp;</th>
-                    <th>X</th>
-                    <th>Y</th>
-                    <th>Z</th>
-                </tr>
-                <tr>
-                    <td>Add</td>
-                    <td>
-                        <input type="text" name="add1" id="add1" value="[% add1 %]" />
-                    </td>
-                    <td>
-                        <input type="text" name="add2" id="add2" value="[% add2 %]" />
-                    </td>
-                    <td>
-                        <input type="text" name="add3" id="add3" value="[% add3 %]" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>once every</td>
-                    <td><input type="text" name="every1" id="every1" value="[% every1 %]" /></td>
-                    <td><input type="text" name="every2" id="every2" value="[% every2 %]" /></td>
-                    <td><input type="text" name="every3" id="every3" value="[% every3 %]" /></td>
-                </tr>
-                <tr>
-                    <td>When more than</td>
-                    <td><input type="text" name="whenmorethan1" id="whenmorethan1" value="[% whenmorethan1 %]" /></td>
-                    <td><input type="text" name="whenmorethan2" id="whenmorethan2" value="[% whenmorethan2 %]" /></td>
-                    <td><input type="text" name="whenmorethan3" id="whenmorethan3" value="[% whenmorethan3 %]" /></td>
-                </tr>
-                <tr>
-                    <td>inner counter</td>
-                    <td><input type="text" name="innerloop1" id="innerloop1" value="[% innerloop1 %]" /></td>
-                    <td><input type="text" name="innerloop2" id="innerloop2" value="[% innerloop2 %]" /></td>
-                    <td><input type="text" name="innerloop3" id="innerloop3" value="[% innerloop3 %]" /></td>
-                </tr>
-                <tr>
-                    <td>Set back to</td>
-                    <td><input type="text" name="setto1" id="setto1" value="[% setto1 %]" /></td>
-                    <td><input type="text" name="setto2" id="setto2" value="[% setto2 %]" /></td>
-                    <td><input type="text" name="setto3" id="setto3" value="[% setto3 %]" /></td>
-                </tr>
-                <tr>
-                    <td>
-                        [% IF ( modify ) %]
-                            Last value
-                        [% ELSE %]
-                            Begins with
-                        [% END %]
-                    </td>
-                    <td><input type="text" name="lastvalue1" id="lastvalue1" value="[% lastvalue1 %]" /></td>
-                    <td><input type="text" name="lastvalue2" id="lastvalue2" value="[% lastvalue2 %]" /></td>
-                    <td><input type="text" name="lastvalue3" id="lastvalue3" value="[% lastvalue3 %]" /></td>
-                </tr>
-            </table>
-        </div>
-
-</div>
-
-</form>
-</div>
-
-</div>
-
-[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index ebf2afc..fbada5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -1,391 +1,11 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid %]</title>
-[% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript">
-//<![CDATA[
-// 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"));
+[% INCLUDE 'help-top.inc' %]
 
+<h1>Subscription Detail</h1>
 
-// to display the options section
-function options(x,y,z){
-var textbox = '';
-    // alert("X: "+x+"Y: "+y+"Z: "+z);
-    if(x){
-        document.f.xfield.value = x;
-        if(y){
-            document.f.yfield.value = y;
-            if(z){
-                document.f.zfield.value = z;
-            }
-        }
-    }
-}
+<p>This page shows you all of the information about your subscription including issue history.</p>
 
-function confirm_deletion() {
-    var is_confirmed = confirm(_("Are you sure you want to delete this subscription?"));
-    if (is_confirmed) {
-        window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=del";
-    }
-}
-function popup(subscriptionid) {
-    newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes');
-}
-$(document).ready(function() {
-    $("#subscription_description > ul").tabs();
-});
-//]]>
-</script>
-</head>
-<body id="ser_subscription-detail" class="ser">
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'serials-search.inc' %]
+<p>From here you can edit your subscription, renew it and/or recieve issues.</p>
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Details for subscription #[% subscriptionid %]</div>
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
-	[% INCLUDE 'serials-toolbar.inc' %]
-
-    <h1>Subscription for [% bibliotitle %] </h1>
-    [% IF ( abouttoexpire ) %]<div class="problem">Subscription is near its end. It should be renewed now.</div>[% END %]
-    [% IF ( NEEDSCONFIRMATION ) %]
-    <div id="circ_needsconfirmation" class="dialog alert">
-			<h3>Please Confirm Subscription deletion</h3>
-
-			<ul>
-			[% IF ( NOTEXPIRED ) %] <li>The subscription has not expired yet</li> [% END %] 
-			[% IF ( LINKEDISSUES ) %] <li>The subscription has linked issues</li> [% END %]
-			[% IF ( LINKEDITEMS ) %] <li>The subscription has linked items<br /> Those items won't be deleted</li> [% END %]
-			</ul>
-			<form method="post" action="/cgi-bin/koha/serials/subscription-detail.pl">
-			<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
-			<input type="hidden" name="issueconfirmed" value="1" />
-			<input type="hidden" name="op" value="del" />
-            <input type="submit" class="approve" value="Yes, delete (Y)" accesskey="y" />
-			</form>
-			<form method="get" action="/cgi-bin/koha/serials/subscription-detail.pl">
-			<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
-            <input type="submit" class="deny" value="No, don't delete (N)" accesskey="n" />
-			</form>
-
-	</div>
-	[% END %] <!-- NEEDSCONFIRMATION -->
-
-<div id="subscription_description" class="toptabs">
-<ul class="ui-tabs-nav">
-    <li><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]#subscription_info">Information</a></li>
-    <li><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]#subscription_planning">Planning</a></li>
-    <li><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]#subscription_issues">Issues</a></li>
-    <li><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]#subscription_summary">Summary</a></li>
-</ul>
-
-<div id="subscription_info">
-    <div class="yui-g">
-    <div class="yui-u first">
-    <div class="rows">
-		<ol>
-		<li><span class="label">Subscription ID: </span>[% subscriptionid %]</li>
-        <li><span class="label">Librarian identity:</span> [% librarian %]</li>
-        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid %]">[% aqbooksellername %]</a></li>
-        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% bibnum %]">[% bibliotitle %]</a> <i>([% bibnum %])</i></li>
-[% IF ( branchcode ) %]<li><span class="label">Library:</span> [% branchcode %]</li>[% END %]
-        [% IF ( serialsadditems ) %]
-            <li><span class="label">Items:</span> Serial receipt creates an item record.</li>
-        [% ELSE %]
-            <li><span class="label">Items:</span> Serial receipt does not create an item record.</li>
-        [% END %]
-        <li><span class="label">Grace period:</span> [% graceperiod %]</li>
-        </ol>
-    </div>
-    </div>
-    <div class="yui-u">
-    <div class="rows">
-        <ol>
-        [% IF ( location ) %]<li><span class="label">Location:</span> [% location %]</li>[% END %]
-        [% IF ( callnumber ) %]<li><span class="label">Call number:</span> [% callnumber %]</li>[% END %]
-		[% IF ( staffdisplaycount ) %]<li><span class="label">Number of issues to display to staff:</span>[% staffdisplaycount %]</li>[% END %]
-        [% IF ( opacdisplaycount ) %]<li><span class="label">Number of issues to display in OPAC:</span>[% opacdisplaycount %]</li>[% END %]
-        [% IF ( letter ) %]
-            <li>
-                <span class="label">Patron notification:</span> [% letter %]
-                (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid %]">subscribers</a>)
-            </li>
-        [% END %]
-        [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %]
-     </ol>
-     </div>
-     </div>
-</div>
-</div>
-    <div id="subscription_planning">
-    <div class="yui-g">
-    <div class="rows">
-        <ol>
-            <li><span class="label">Beginning date:</span> [% startdate %]
-            </li>
-            <li><span class="label">Frequency (*):</span>
-                [% IF ( periodicity16 ) %]
-                        Without regularity
-                [% END %]
-                [% IF ( periodicity32 ) %]
-                        Irregular
-                [% END %]
-                [% IF ( periodicity0 ) %]
-                        Unknown
-                [% END %]
-                [% IF ( periodicity12 ) %]
-                        2/day
-                [% END %]
-                [% IF ( periodicity1 ) %]
-                        1/day
-                [% END %]
-                [% IF ( periodicity13 ) %]
-                        1/4 months (3/year)
-                [% END %]
-                [% IF ( periodicity2 ) %]
-                        1/week
-                [% END %]
-                [% IF ( periodicity3 ) %]
-                        1/2 weeks
-                [% END %]
-                [% IF ( periodicity4 ) %]
-                        1/3 weeks
-                [% END %]
-                [% IF ( periodicity5 ) %]
-                        1/month
-                [% END %]
-                [% IF ( periodicity6 ) %]
-                        1/2 months (6/year)
-                [% END %]
-                [% IF ( periodicity7 ) %]
-                        1/quarter
-                [% END %]
-                [% IF ( periodicity8 ) %]
-                        1/quarter
-                [% END %]
-                [% IF ( periodicity9 ) %]
-                        2/year
-                [% END %]
-                [% IF ( periodicity10 ) %]
-                        1/year
-                [% END %]
-                [% IF ( periodicity11 ) %]
-                        1/2 years
-                [% END %]
-            </li>
-            <li>
-              <span class="label">Manual history: </span>
-                [% IF ( manualhistory ) %]
-                    Disabled
-                [% ELSE %]
-                    Enabled
-                [% END %]
-            </li>
-            <li><span class="label">Number pattern:</span>
-                [% IF ( numberpattern1 ) %]
-                    Number only
-                [% END %]
-                [% IF ( numberpattern2 ) %]
-                    Volume, number, issue
-                [% END %]
-                [% IF ( numberpattern3 ) %]
-                    Volume, number
-                [% END %]
-                [% IF ( numberpattern4 ) %]
-                    Volume, issue
-                [% END %]
-                [% IF ( numberpattern5 ) %]
-                    Number, issue
-                [% END %]
-                [% IF ( numberpattern8 ) %]
-                    Year/Number
-                [% END %]
-                [% IF ( numberpattern6 ) %]
-                    Seasonal only
-                [% END %]
-                [% IF ( numberpattern7 ) %]
-                    None of the above
-                [% END %]
-            </li>
-            <li><table>
-            <tr><td>Starting with:</td>
-                <td align="center">[% lastvalue1 %]</td>
-            [% IF ( lastvalue2 ) %]
-                <td align="center">&nbsp; 
-                    [% lastvalue2 %]
-                </td>
-            [% END %]
-            [% IF ( lastvalue3 ) %]
-                <td align="center">&nbsp; 
-                    [% lastvalue3 %]
-                </td>
-            [% END %]
-            </tr>
-            <tr><td>Rollover:</td>
-                <td align="center">
-                    [% IF ( whenmorethan1 < 9999999 ) %][% whenmorethan1 %][% ELSE %]Never[% END %]
-                </td>
-            [% IF ( whenmorethan2 ) %]
-                <td align="center">&nbsp;
-                    [% IF ( whenmorethan2 < 9999999 ) %][% whenmorethan2 %][% ELSE %]Never[% END %]
-                </td>
-            [% END %]
-            [% IF ( whenmorethan3 ) %]
-                <td align="center">&nbsp;
-                    [% IF ( whenmorethan3 < 9999999 ) %][% whenmorethan3 %][% ELSE %]Never[% END %]
-                </td>
-            [% END %]
-            </tr>
-            </table></li>
-            [% IF ( irregular_issues ) %]
-            <li><span class="label">Irregularity:</span> [% irregular_issues %] issues
-            </li>
-            [% END %]
-            <li><span class="label">First arrival:</span> [% firstacquidate %]
-            </li>
-        [% IF ( numberlength ) %]<li><span class="label">Number of issues:</span> [% numberlength %]</li>[% END %]
-        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %]
-        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %]
-        </ol>
-    </div>
-    </div>
-    </div>
-    <div id="subscription_numbering" style="display:none;">
-        <h3>Numbering calculation</h3>
-        <p><label>Numbering formula:</label> [% numberingmethod %]</p>
-        <table>
-            <tr>
-                <th>&nbsp;</th>
-                <th>X</th>
-                <th>Y</th>
-                <th>Z</th>
-                </tr>
-                <tr>
-                    <td>Add</td>
-                    <td>
-                        [% add1 %]
-                    </td>
-                    <td>
-                        [% add2 %]
-                    </td>
-                    <td>
-                        [% add3 %]
-                    </td>
-                </tr>
-                <tr>
-                    <td>once every</td>
-                    <td>[% every1 %]</td>
-                    <td>[% every2 %]</td>
-                    <td>[% every3 %]</td>
-                </tr>
-                <tr>
-                    <td>When more than</td>
-                    <td>[% whenmorethan1 %] [% IF ( innerloop1 ) %]<br />
-                        <i>(is [% innerloop1 %])</i>[% END %]</td>
-                    <td>[% whenmorethan2 %] [% IF ( innerloop2 ) %]<br />
-                        <i>(is [% innerloop2 %])</i>[% END %]</td>
-                    <td>[% whenmorethan3 %] [% IF ( innerloop3 ) %]<br />
-                        <i>(is [% innerloop3 %])</i>[% END %]</td>
-                </tr>
-                <tr>
-                    <td>Set back to</td>
-                    <td>[% setto1 %]</td>
-                    <td>[% setto2 %]</td>
-                    <td>[% setto3 %]</td>
-                </tr>
-                <tr>
-                    <td>
-                            Inner counter
-                    </td>
-                    <td>[% innerloop1 %]</td>
-                    <td>[% innerloop2 %]</td>
-                    <td>[% innerloop3 %]</td>
-                </tr>
-                <tr>
-                    <td>
-                            Last value
-                    </td>
-                    <td>[% lastvalue1 %]</td>
-                    <td>[% lastvalue2 %]</td>
-                    <td>[% lastvalue3 %]</td>
-                </tr>
-            </table>
-    </div>
-    <div id="subscription_issues">
-        <table>
-        <tr>
-            <th>Issue number</th>
-            <th>Planned date</th>
-            <th>Published date</th>
-            <th>Status</th>
-        </tr>
-        [% FOREACH serialslis IN serialslist %]
-            <tr>
-                <td>
-                    [% serialslis.serialseq %]
-                </td>
-                <td>
-                    [% serialslis.planneddate %]
-                </td>
-                <td>
-                    [% serialslis.publisheddate %]
-                </td>
-                <td>
-                        [% IF ( serialslis.status1 ) %]
-                            Expected
-                        [% END %]
-                        [% IF ( serialslis.status2 ) %]
-                            Arrived
-                        [% END %]
-                        [% IF ( serialslis.status3 ) %]
-                            Late
-                        [% END %]
-                        [% IF ( serialslis.status4 ) %]
-                            Missing
-                        [% END %]
-                        [% IF ( serialslis.status5 ) %]
-                            Not available
-                        [% END %]
-                        [% IF ( serialslis.status7 ) %]
-                            Claimed
-                             [% IF ( serialslis.claimdate ) %]
-                             [% serialslis.claimdate %]
-                             [% END %]
-                        [% END %]
-                </td>
-            </tr>
-        [% END %]
-        </table>
-    </div>
-    <div id="subscription_summary">
-    <div class="yui-g">
-    <div class="rows">
-        <ol>
-            <li><span class="label">Start date:</span> [% startdate %] </li>
-            <li><span class="label">End date:</span> [% enddate %]</li>
-            <li><span class="label">History start date:</span> [% histstartdate %] </li>
-            <li><span class="label">History end date:</span> [% histenddate %]</li>
-            <li><span class="label">Received issues:</span>[% recievedlist %]</li>
-            <li><span class="label">Missing issues:</span>[% missinglist %]</li>
-            <li><span class="label">Nonpublic note:</span>[% internalnotes %]</li>
-            <li><span class="label">OPAC note:</span>[% notes %]</li>
-            <li><span class="label">History staff note</span>[% librariannote %]</li>
-            <li><span class="label">History OPAC note</span>[% opacnote %]</li>
-        </ol>
-    </div>
-    </div>
-    </div>
-    </div>
-</div>
-</div>
-
-<div class="yui-b">
-[% INCLUDE 'serials-menu.inc' %]
-</div>
-</div>
-[% INCLUDE 'intranet-bottom.inc' %]
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Fri Apr 13 20:02:08 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 13 Apr 2012 14:02:08 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Offline Circ Help
Message-ID: <1334340128-1949-1-git-send-email-nengard@bywatersolutions.com>

This is missing a new file for the Firefox plugin because
I haven't documented it yet because I can't get it to work.
---
 .../en/modules/help/offline_circ/process_koc.tt    |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
index fd9af7c..1389cd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
@@ -1,6 +1,6 @@
 [% INCLUDE 'help-top.inc' %]
 
-<h1>Offline circulation file (.koc) uploader</h1>
+<h1>Offline Circulation File (.koc) Uploader</h1>
 
 <p>The offline circulation tool for Windows will generate a KOC file that you can upload into Koha once your system comes back up.</p>
 
@@ -10,6 +10,6 @@
 
 <p>When this is complete you'll see the summary of actions from when you were offline (including any errors).</p>
 
-<p><strong>See the full documentation for the offline circulation file uploader in the <a href="http://manual.koha-community.org/3.6/en/offlinecirc.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Offline Circulation File Uploader in the <a href="http://manual.koha-community.org/3.8/en/offlinecirc.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Fri Apr 13 20:03:07 2012
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 13 Apr 2012 14:03:07 -0400
Subject: [Koha-patches] [PATCH] Bug 7936: Serials Help for 3.8
Message-ID: <1334340187-2006-1-git-send-email-nengard@bywatersolutions.com>

---
 .../en/modules/help/serials/checkexpiration.tt     |    2 +-
 .../prog/en/modules/help/serials/claims.tt         |    2 +-
 .../prog/en/modules/help/serials/routing.tt        |    2 +-
 .../en/modules/help/serials/serials-collection.tt  |    2 +-
 .../prog/en/modules/help/serials/serials-edit.tt   |    2 +-
 .../prog/en/modules/help/serials/serials-home.tt   |    2 +-
 .../en/modules/help/serials/subscription-add.tt    |    2 +-
 .../en/modules/help/serials/subscription-detail.tt |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt
index ba9704d..369ba8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt
@@ -8,6 +8,6 @@
 
 <p>In your results you will see all subscriptions that will expire before the date you entered. From there you can choose to view the subscription further or renew it in one click.</P>
 
-<p><strong>See the full documentation for Checking Serial Expiration in the <a href="http://manual.koha-community.org/3.6/en/serialexpiration.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Checking Serial Expiration in the <a href="http://manual.koha-community.org/3.8/en/serialexpiration.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt
index b27f9b4..c6d8ade 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt
@@ -12,7 +12,7 @@
 
 <p>From the list of late issues you can choose which ones you want to send a claim email to by clicking the checkbox to the left of late issue, choosing the notice template to use and clicking the 'Send notification' button.</p>
 
-<p><strong>See the full documentation for Serial Claims in the <a href="http://manual.koha-community.org/3.6/en/serialclaims.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serial Claims in the <a href="http://manual.koha-community.org/3.8/en/serialclaims.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt
index 7faf405..911e239 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt
@@ -16,6 +16,6 @@
 
 <p>If RoutingListAddReserves is set to on then patrons listed in the routing list will automatically be added to the holds list for the issue.</p>
 
-<p><strong>See the full documentation for Routing Lists in the <a href="http://manual.koha-community.org/3.6/en/routinglist.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Routing Lists in the <a href="http://manual.koha-community.org/3.8/en/routinglist.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt
index 2160325..45916df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt
@@ -10,6 +10,6 @@
 
 <p>If you are adding multiple issues at once or if the latest expected issue is late, you can click the 'Generate Next' button to generate the next issue based on the subscription pattern.</p>
 
-<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.6/en/serials.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt
index f2d3464..f3f76fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt
@@ -24,6 +24,6 @@
 
 <p>Clicking this button will generate the next issue for you and mark the previously expected issue as 'Late' automatically. You can then check the 'Edit' box to the right of each issue and edit the status on multiple issues at once.</p>
 
-<p><strong>See the full documentation for Receiving a Serial in the <a href="http://manual.koha-community.org/3.6/en/receiveissues.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving a Serial in the <a href="http://manual.koha-community.org/3.8/en/receiveissues.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt
index c5a794d..d4ee4f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt
@@ -6,7 +6,7 @@
 
 <p>You can search for existing subscriptions by using the search box at the top of the page. You can search for any part of the serial title or ISSN.</p>
 
-<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.6/en/serials.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
index d16fe4b..247ded7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
@@ -83,7 +83,7 @@
 
 <p>Click 'Save Subscription' to save the information you have entered.</p>
 
-<p><strong>See the full documentation for Adding a Subscription in the <a href="http://manual.koha-community.org/3.6/en/serials.html#newsubscription">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Adding a Subscription in the <a href="http://manual.koha-community.org/3.8/en/serials.html#newsubscription">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt
index 7d23d60..fbada5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt
@@ -6,6 +6,6 @@
 
 <p>From here you can edit your subscription, renew it and/or recieve issues.</p>
 
-<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.6/en/serials.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From dpavlin at rot13.org  Sat Apr 14 11:51:41 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Sat, 14 Apr 2012 11:51:41 +0200
Subject: [Koha-patches] [PATCH] Bug 7961 - Local cover images should support
	CSV link files
Message-ID: <1334397101-14262-1-git-send-email-dpavlin@rot13.org>

Corrent code doesn't have support for filenames which contain spaces
or commans which breaks CSV files saved from spreadsheet similar to:

  12345, "conver image, with spaces.jpg"

This patch tweaks file parsing a bit. We are always splitting line to
only two values (to support commas as part of filename) and removing
spaces only on beginning and end of filename (to cover space after
comma in CSV example above while preserving spaces in filename).

With this change only invalid character in picture filename left
are quotes (") which are commonly used to quote strings with spaces.

Also added is simple debug warn which displays number of cover image
uploaded, biblionumber and filename which is very useful when uploading
huge zip files with covers, because progress can be monitored in log.

Test scenario:

1. collect pictures with spaces and commas in name
2. dump file list into CSV file and add biblio number as first column
3. create zip with CSV file and pictures
4. verify that all pictures got uploaded and linked to biblio records
---
 tools/upload-cover-image.pl |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/upload-cover-image.pl b/tools/upload-cover-image.pl
index 7552e28..ed1fc5e 100755
--- a/tools/upload-cover-image.pl
+++ b/tools/upload-cover-image.pl
@@ -143,10 +143,13 @@ if ($fileID) {
                             $error = 'DELERR';
                         }
                         else {
-                            ( $biblionumber, $filename ) = split $delim, $line;
+                            ( $biblionumber, $filename ) = split $delim, $line, 2;
                             $biblionumber =~
                               s/[\"\r\n]//g;    # remove offensive characters
-                            $filename =~ s/[\"\r\n\s]//g;
+                            $filename =~ s/[\"\r\n]//g;
+                            $filename =~ s/^\s+//;
+                            $filename =~ s/\s+$//;
+                            warn "## $total cover image biblionumber: $biblionumber file: $filename\n";
                             my $srcimage = GD::Image->new("$dir/$filename");
                             if ( defined $srcimage ) {
                                 $total++;
-- 
1.7.2.5


From Katrin.Fischer.83 at web.de  Sat Apr 14 13:16:16 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sat, 14 Apr 2012 13:16:16 +0200
Subject: [Koha-patches] [PATCH] Bug 5795 - Missing ReservesControlBranch
	system pref in database installer
Message-ID: <1334402176-8166-1-git-send-email-Katrin.Fischer.83@web.de>

sysprefs.sql file was missing ReservesControlBranch.

To test:
1) Create a new installation and check sysprefs.sql loads correctly.
2) Check ReservesControlBranch shows up correctly in the sys pref editor.
3) Check sys pref can be edited and new value saves correctly.
---
 installer/data/mysql/sysprefs.sql |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 7a3731c..2fd8b65 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -362,3 +362,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('
 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('AutoResumeSuspendedHolds',  '1', NULL ,  'Allow suspended holds to be automatically resumed by a set date.',  'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacStarRatings','all',NULL,'disable|all|details','Choice');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo');
+INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice');
\ No newline at end of file
-- 
1.7.5.4


From f.demians at tamil.fr  Sat Apr 14 15:06:29 2012
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Sat, 14 Apr 2012 15:06:29 +0200
Subject: [Koha-patches] [PATCH] Bug 7963 Parallel HTTP requests when
	checking URLs
Message-ID: <1334408789-12055-1-git-send-email-f.demians@tamil.fr>

Current script check-url.pl checks URL found in 856$u by sending HTTP
requests, one by one. I propose a new script which send multiple
requests simultaneously.

This script is based on AnyEvent and AnyEvent::HTTP CPAN modules.

See doc: perldoc checkurl
---
 misc/cronjobs/checkurl |  190 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 190 insertions(+), 0 deletions(-)
 create mode 100755 misc/cronjobs/checkurl

diff --git a/misc/cronjobs/checkurl b/misc/cronjobs/checkurl
new file mode 100755
index 0000000..639d6ee
--- /dev/null
+++ b/misc/cronjobs/checkurl
@@ -0,0 +1,190 @@
+#!/usr/bin/perl
+
+# Copyright 2012 Tamil s.a.r.l.
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use 5.010;
+use utf8;
+use strict;
+use warnings;
+use Pod::Usage;
+use Getopt::Long;
+use C4::Context;
+use C4::Biblio;
+use AnyEvent;
+use AnyEvent::HTTP;
+
+my ($verbose, $help, $html) = (0, 0, 0);
+my ($host, $host_pro)       = ('', '');
+my ($timeout, $maxconn)     = (10, 200);
+my $uriedit                 = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=";
+GetOptions( 
+    'verbose'       => \$verbose,
+    'html'          => \$html,
+    'help'          => \$help,
+    'host=s'        => \$host,
+    'host-pro=s'    => \$host_pro,
+    'timeout=i'     => \$timeout,
+    'maxconn=i'     => \$maxconn,
+);
+
+
+sub usage {
+    pod2usage( -verbose => 2 );
+    exit;
+} 
+
+
+sub bibediturl {
+    my $biblionumber = shift;
+    my $html = "<a href=\"$host_pro$uriedit$biblionumber\">$biblionumber</a>";
+    return $html;
+}
+
+
+# Check all URLs from all current Koha biblio records
+
+sub check_all_url {
+    my $sth = C4::Context->dbh->prepare( 
+        "SELECT biblionumber FROM biblioitems WHERE url <> ''" );
+    $sth->execute;
+    if ( $html ) {
+        print <<EOS;
+<html>
+<body>
+<table>
+EOS
+    }
+
+    my $countconn = 0;
+    my $cv = AnyEvent->condvar;
+    my $idle = AnyEvent->idle(
+        cb => sub {
+            return if $countconn > $maxconn;
+            while ( my ($biblionumber) = $sth->fetchrow ) {
+                my $record = GetMarcBiblio( $biblionumber ); 
+                next unless $record->field('856');
+                foreach my $field ( $record->field('856') ) {
+                    my $url = $field->subfield('u');
+                    next unless $url; 
+                    $url = "$host/$url" unless $url =~ /^http/;
+                    $countconn++;
+                    http_request(
+                        HEAD => $url,
+                        headers => { 'user-agent' => 'Mozilla/5.0 (compatible; U; Koha checkurl)' },
+                        timeout => $timeout,
+                        sub {
+                            my ($body, $hdr) = @_;
+                            #say "HEAD found $url";
+                            $countconn--;
+                            if ( $hdr->{Status} !~ /^2/ || $verbose) { # OK
+                                print $html
+                                      ? "<tr>\n<td><a href=\"" .
+                                        $host_pro . $uriedit . $biblionumber.
+                                        "\">$biblionumber</a>" .
+                                        "</td>\n<td>" . $url . "</td>\n<td>" . 
+                                        "$hdr->{Status} $hdr->{Reason}</td>\n</tr>\n\n"
+                                      : "$biblionumber\t" . $url . "\t" .
+                                        "$hdr->{Status} $hdr->{Reason} \n";
+                            }
+                        }
+                    );
+                }
+                return;
+            }
+            $cv->send;
+        }
+    );
+    $cv->recv;
+
+    print "</table>\n</body>\n</html>\n" if $html;
+}
+
+
+# BEGIN
+
+usage() if $help;          
+
+if ( $html && !$host_pro ) {
+    if ( $host ) {
+        $host_pro = $host;
+    }
+    else {
+        print "Error: host-pro parameter or host must be provided in html mode\n";
+        exit;
+    }
+}
+
+check_all_url(); 
+
+
+=head1 NAME
+
+checkurl - Check URLs from 856$u field.
+
+=head1 USAGE
+
+=over
+
+=item checkurl [--verbose|--help] [--host=http://default.tld] 
+
+Scan all URLs found in 856$u of bib records and display if resources are
+available or not. HTTP requests are sent in parallel for efficiency.
+
+=back
+
+=head1 PARAMETERS
+
+=over
+
+=item B<--host=http://default.tld>
+
+Server host used when URL doesn't have one, ie doesn't begin with 'http:'. 
+For example, if --host=http://www.mylib.com, then when 856$u contains 
+'img/image.jpg', the url checked is: http://www.mylib.com/image.jpg'.
+
+=item B<--verbose|-v>
+
+Outputs both successful and failed URLs.
+
+=item B<--html>
+
+Formats output in HTML. The result can be redirected to a file
+accessible by http. This way, it's possible to link directly to biblio
+record in edit mode. With this parameter B<--host-pro> is required.
+
+=item B<--host-pro=http://koha-pro.tld>
+
+Server host used to link to biblio record editing page.
+
+=item B<--timeout=10>
+
+Timeout for fetching URLs. By default 10 seconds.
+
+=item B<--maxconn=1000>
+
+Number of simulaneous HTTP requests. By default 200 connexions.
+
+=item B<--help|-h>
+
+Print this help page.
+
+=back
+
+=cut
+
+
-- 
1.7.8


From Katrin.Fischer.83 at web.de  Sat Apr 14 17:54:22 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sat, 14 Apr 2012 17:54:22 +0200
Subject: [Koha-patches] [PATCH] Bug 7833 - unique holiday link broken
Message-ID: <1334418862-14765-1-git-send-email-Katrin.Fischer.83@web.de>

As Nicole stated on the bug the branchcode was missing from the links.

To test:
- add unique holidays to calendar for different branches
- click on link and check that the date is opened in the right calendar
---
 .../prog/en/modules/tools/holidays.tt              |    4 +-
 tools/holidays.pl                                  |   26 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index ef204d2..6e50425 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -438,7 +438,7 @@
 <tbody>
   [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %]
   <tr>
-  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% EXCEPTION_HOLIDAYS_LOO.branch %]&amp;calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE %]">[% EXCEPTION_HOLIDAYS_LOO.DATE %]</a></td>
+  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&amp;calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE %]">[% EXCEPTION_HOLIDAYS_LOO.DATE %]</a></td>
   <td>[% EXCEPTION_HOLIDAYS_LOO.TITLE %]</td>
   <td>[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION %]</td> 
   </tr>
@@ -512,7 +512,7 @@
 <tbody>
     [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %]
 <tr>
-  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% HOLIDAYS_LOO.branch %]&amp;calendardate=[% HOLIDAYS_LOO.DATE %]">[% HOLIDAYS_LOO.DATE %]</a></td>
+  <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&amp;calendardate=[% HOLIDAYS_LOO.DATE %]">[% HOLIDAYS_LOO.DATE %]</a></td>
   <td>[% HOLIDAYS_LOO.TITLE %]</td>
   <td>[% HOLIDAYS_LOO.DESCRIPTION %]</td>
 </tr>
diff --git a/tools/holidays.pl b/tools/holidays.pl
index b3912eb..d5ace27 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -138,18 +138,20 @@ foreach my $yearMonthDay (keys %$single_holidays) {
     push @holidays, \%holiday;
 }
 
-$template->param(WEEK_DAYS_LOOP => \@week_days,
-        branchloop => \@branchloop, 
-        HOLIDAYS_LOOP => \@holidays,
-        EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays,
-        DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays,
-        calendardate => $calendardate,
-        keydate => $keydate,
-        branchcodes => $branchcodes,
-        branch => $branch,
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-        branchname => $branchname
-  );
+$template->param(
+    WEEK_DAYS_LOOP           => \@week_days,
+    branchloop               => \@branchloop,
+    HOLIDAYS_LOOP            => \@holidays,
+    EXCEPTION_HOLIDAYS_LOOP  => \@exception_holidays,
+    DAY_MONTH_HOLIDAYS_LOOP  => \@day_month_holidays,
+    calendardate             => $calendardate,
+    keydate                  => $keydate,
+    branchcodes              => $branchcodes,
+    branch                   => $branch,
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+    branchname               => $branchname,
+    branch                   => $branch,
+);
 
 # Shows the template with the real values replaced
 output_html_with_http_headers $input, $cookie, $template->output;
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Sat Apr 14 20:35:41 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sat, 14 Apr 2012 20:35:41 +0200
Subject: [Koha-patches] [PATCH 1/2] Bug 3969: Budget search in acquisition
	doesn't work (string changes)
Message-ID: <1334428542-19660-1-git-send-email-Katrin.Fischer.83@web.de>

String changes:
- Correcting tab name from "Search budgets" to "Seach funds"
- Changing search option from "Name" to "Fund code"
---
 .../prog/en/includes/budgets-admin-search.inc      |   50 ++++++++-----------
 1 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
index a1cdc22..17a2f72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
@@ -44,36 +44,28 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 });
  //]]>
  </script>  [% END %][% END %]
+ 
 <div id="header_search">
-	<div id="budgets_search" class="residentsearch">
-    <p class="tip">Search budgets:</p>
+    <div id="budgets_search" class="residentsearch">
+        <p class="tip">Search funds:</p>
+        <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
+            <label for="filter_budgetname">Fund code: </label><input type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname %]" />
+            <label for="filter_budgetbranch">Library: </label>
+            <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
+                <option value=""></option>
+                    [% FOREACH branchloo IN branchloop %]
+                        [% IF ( branchloo.selected ) %]
+                        <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
+                        [% ELSE %]
+                        <option value="[% branchloo.value %]" >[% branchloo.branchname %]</option>
+                        [% END %]
+                    [% END %]
+            </select>         
+          <input type="hidden"  name="budget_period_id" value="[% budget_period_id %]" /> 
+          <input type="submit" class="submit" name="filter" value="Submit" />
+        </form>
+    </div>
 
-	<form action="/cgi-bin/koha/admin/aqbudgets.pl" method="post">
-
-
-
-      <label for="filter_budgetname">Name: </label><input type="text" name="filter_budgetname" id="filter_budgetname" size="20" value="[% filter_budgetname %]" />
-
-
-      <label for="filter_budgetbranch">Library: </label>
-
-       <select name="filter_budgetbranch" id="filter_budgetbranch" style="width:10em;">
-
-        <option value=""></option>
-            [% FOREACH branchloo IN branchloop %]
-                [% IF ( branchloo.selected ) %]
-                <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
-                [% ELSE %]
-                <option value="[% branchloo.value %]" >[% branchloo.branchname %]</option>
-                [% END %]
-            [% END %]     
-       </select>         
-
-      <input type="hidden"  name="budget_period_id" value="[% budget_period_id %]" /> 
-      <input type="submit" class="submit" name="filter" value="Submit" />
-</form>
-
-	</div>
 	[% IF ( CAN_user_circulate ) %]
 	<div id="circ_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter patron card number or partial name:</p>
@@ -107,7 +99,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 		</form>
 	</div>[% END %]
 			<ul>
-            <li><a href="/cgi-bin/koha/admin/aqbudgets.pl#budgets_search">Search budgets</a></li>
+            <li><a href="/cgi-bin/koha/admin/aqbudgets.pl#budgets_search">Search funds</a></li>
             [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Sat Apr 14 20:35:42 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sat, 14 Apr 2012 20:35:42 +0200
Subject: [Koha-patches] [PATCH 2/2] Bug 3969: Budget search in acquisition
	does't work (search)
In-Reply-To: <1334428542-19660-1-git-send-email-Katrin.Fischer.83@web.de>
References: <1334428542-19660-1-git-send-email-Katrin.Fischer.83@web.de>
Message-ID: <1334428542-19660-2-git-send-email-Katrin.Fischer.83@web.de>

Search term was never evaluated.
Patch makes sure input param is correctly stored in the variable
and changes comparison to be case insensitive.

To test:
- Check search for fund codes (case insensitive) works
- Check search for fund code in combination with library works

The budgets to be shown can depend on your permissions.
Testing with with a superlibrarian should bring up all funds.

Also fixes warns in the logs that appeared when viewing the funds
for a budget without funds.
---
 admin/aqbudgets.pl |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index db99759..d644892 100755
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -74,9 +74,10 @@ my $budget_hash               = $input->Vars;
 my $budget_id                 = $$budget_hash{budget_id};
 my $budget_permission         = $input->param('budget_permission');
 my $filter_budgetbranch       = $input->param('filter_budgetbranch');
+my $filter_budgetname         = $input->param('filter_budgetname');
 #filtering non budget keys
 delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash;
-my $filter_budgetname         = $input->param('filter_budgetname');
+
 $template->param(
     notree => ($filter_budgetbranch or $show_mine)
 );
@@ -271,9 +272,10 @@ if ($op eq 'add_form') {
         }    # ...SUPER_LIB END
 
         # if a budget search doesnt match, next
-        if ($filter_budgetname ) {
-            next unless  $budget->{budget_code}  =~ m/$filter_budgetname/  ||
-            $budget->{name}  =~ m/$filter_budgetname/ ;
+        if ($filter_budgetname) {
+            next
+              unless $budget->{budget_code} =~ m/$filter_budgetname/i
+                  || $budget->{name} =~ m/$filter_budgetname/i;
         }
         if ($filter_budgetbranch ) {
             next unless  $budget->{budget_branchcode}  =~ m/$filter_budgetbranch/;
@@ -325,12 +327,21 @@ if ($op eq 'add_form') {
         $budget_period_total =
           $num->format_price( $period->{budget_period_total} );
     }
+
+    if ($period_alloc_total) {
+        $period_alloc_total = $num->format_price($period_alloc_total);
+    }
+
+    if ($base_spent_total) {
+        $base_spent_total = $num->format_price($base_spent_total);
+    }
+
     $template->param(
         else                   => 1,
         budget                 => \@loop,
         budget_period_total    => $budget_period_total,
-        period_alloc_total     => $num->format_price($period_alloc_total),
-        base_spent_total       => $num->format_price($base_spent_total),
+        period_alloc_total     => $period_alloc_total,
+        base_spent_total       => $base_spent_total,
         branchloop             => \@branchloop2,
     );
 
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Sun Apr 15 00:11:39 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sun, 15 Apr 2012 00:11:39 +0200
Subject: [Koha-patches] [PATCH] Bug 3337 - RSS link is not correct for
	searches without results
Message-ID: <1334441499-10613-1-git-send-email-Katrin.Fischer.83@web.de>

RSS links for searches without results didn't have the search terms.

To test:
- Search for something with results and check RSS link
- Search for something with no results and check RSS link

In both cases your search should show up in the link.
---
 opac/opac-search.pl |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 176bc12..5f3ad86 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -737,7 +737,13 @@ for (my $i=0;$i<@servers;$i++) {
         }
         # no hits
         else {
-            $template->param(searchdesc => 1,query_desc => $query_desc,limit_desc => $limit_desc);
+            $template->param(
+                searchdesc => 1,
+                query_desc => $query_desc,
+                limit_desc => $limit_desc,
+                query_cgi  => $query_cgi,
+                limit_cgi  => $limit_cgi
+            );
         }
     } # end of the if local
     # asynchronously search the authority server
-- 
1.7.5.4


From Katrin.Fischer.83 at web.de  Sun Apr 15 11:09:14 2012
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sun, 15 Apr 2012 11:09:14 +0200
Subject: [Koha-patches] [PATCH] Bug 7733 - HidePatronName not working on
	moredetail
Message-ID: <1334480954-6164-1-git-send-email-Katrin.Fischer.83@web.de>

Patch implements HidePatronName system preference for 'Checkout status'
on moredetail (tab items from staff detail page).

Also adds some new 'if' statements, so 'Serial enumeration' and 'Paid for?' are
only shown when they are not empty.

Silences warns in the logs.

To test:
- Toggle system preference for an issued item and check name/cardnumber
are displayed correctly.
- Check serial enumeration and Paid for? show when not empty.
---
 catalogue/moredetail.pl                            |   12 ++++++++
 .../prog/en/modules/catalogue/moredetail.tt        |   28 +++++++++++++++----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 9d5465b..ca7d13c 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -62,6 +62,8 @@ if($query->cookie("holdfor")){
     );
 }
 
+my $hidepatronname = C4::Context->preference("HidePatronName");
+
 # get variables
 
 my $biblionumber=$query->param('biblionumber');
@@ -172,6 +174,15 @@ foreach my $item (@items){
     } else {
         $item->{'issue'}= 0;
     }
+
+    unless ($hidepatronname) {
+        if ( $item->{'borrowernumber'} ) {
+            my $curr_borrower = GetMember('borrowernumber' => $item->{'borrowernumber'} );
+            $item->{borrowerfirstname} = $curr_borrower->{'firstname'};
+            $item->{borrowersurname} = $curr_borrower->{'surname'};
+        }
+    }
+
 }
 $template->param(count => $data->{'count'},
 	subscriptionsnumber => $subscriptionsnumber,
@@ -188,6 +199,7 @@ $template->param(
     itemnumber          => $itemnumber,
     z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)),
     subtitle            => $subtitle,
+    hidepatronname      => $hidepatronname,
 );
 $template->param(ONLY_ONE => 1) if ( $itemnumber && $showncount != @items );
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index dce6872..d4efe7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -69,7 +69,23 @@
 
             <ol class="bibliodetails">
             <li><span class="label">Current location:</span> [% ITEM_DAT.holdingbranchname %]&nbsp;</li>
-            <li><span class="label">Checkout status:</span> [% IF ( ITEM_DAT.issue ) %]Checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ITEM_DAT.borrowernumber %]">[% ITEM_DAT.cardnumber %]</a>[% IF ( ITEM_DAT.lastreneweddate ) %], Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %][% END %], Due back on [% ITEM_DAT.datedue | $KohaDates %][% ELSE %]Not checked out [% END %]</li>
+            <li><span class="label">Checkout status:</span> 
+            [% IF ( ITEM_DAT.issue ) %]Checked out to
+                [% IF ( hidepatronname ) %]
+                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ITEM_DAT.borrowernumber %]">[% ITEM_DAT.cardnumber %]</a>,
+                    [% ELSE %]
+                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ITEM_DAT.borrowernumber %]">[% ITEM_DAT.borrowerfirstname %] [% ITEM_DAT.borrowersurname %]</a>,
+                [% END %]
+                [% IF ( ITEM_DAT.lastreneweddate ) %]
+                    Last renewed [% ITEM_DAT.lastreneweddate | $KohaDates %],
+                [% END %]
+                [% IF ( ITEM_DAT.datedue ) %]
+                    Due back on [% ITEM_DAT.datedue | $KohaDates %]
+                [% ELSE %]
+                    Not checked out 
+                [% END %]
+            [% END %]
+            </li>
             <li><span class="label">Current renewals:</span> [% ITEM_DAT.renewals %]&nbsp;</li>
             [% IF ( ITEM_DAT.itemlostloop ) %]
                 <li><span class="label">Lost status:</span>
@@ -183,14 +199,14 @@
 
                 <li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues %][% ELSE %]0[% END %]  (<a href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=[% ITEM_DAT.biblionumber %]&amp;bi=[% ITEM_DAT.biblioitemnumber %]&amp;itm=[% ITEM_DAT.itemnumber %]">View item's checkout history</a>)</li>
 
-                <li><span class="label">Last seen:</span> [% ITEM_DAT.datelastseen | $KohaDates %]&nbsp;</li>
-                <li><span class="label">Last borrowed:</span> [% ITEM_DAT.datelastborrowed | $KohaDates %]&nbsp;</li>
+                <li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %]&nbsp;</li>
+                <li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %]&nbsp;</li>
                 [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower0 %]">[% ITEM_DAT.card0 %]</a>&nbsp;</li>[% END %]
                 [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 %]">[% ITEM_DAT.card1 %]</a>&nbsp;</li>[% END %]
                 [% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 %]">[% ITEM_DAT.card2 %]</a>&nbsp;</li>[% END %]
-                <li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>
-            <li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>
-            <li><span class="label">Public note:</span>
+                [% IF ( ITEM_DAT.paidfor ) %]<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor %]&nbsp;</li>[% END %]
+                [% IF ( ITEM_DAT.enumchron ) %]<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron %]&nbsp;</li>[% END %]
+                <li><span class="label">Public note:</span>
                 [% IF ( CAN_user_editcatalogue_edit_items ) %]
                 <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="[% ITEM_DAT.biblionumber %]" />
                     <input type="hidden" name="biblioitemnumber" value="[% ITEM_DAT.biblioitemnumber %]" /><input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]" />
-- 
1.7.5.4


From oleonard at myacpl.org  Sun Apr 15 22:48:50 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Sun, 15 Apr 2012 16:48:50 -0400
Subject: [Koha-patches] [PATCH] Bug 7962 - Cart missing from result lists
Message-ID: <1334522930-2955-1-git-send-email-oleonard@myacpl.org>

Removing duplicate inclusion of jQuery on the results page
which was added with the star ratings feature. Koha already
uses jQuery by default.

I have also made the inclusion of ratings JS and CSS dependent
on ratings being turned on.
---
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 2c12d44..49303a6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -7,9 +7,8 @@
 [% END %]
 [% INCLUDE 'doc-head-close.inc' %]
 <link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS Feed" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" />
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/jquery/jquery.js"></script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/jquery/plugins/jquery.rating.js"></script>
-<link rel="stylesheet" type="text/css" href="/opac-tmpl/prog/en/css/jquery.rating.css" />
+[% IF ( OpacStarRatings == 'all' ) %]<script type="text/javascript" src="/opac-tmpl/prog/en/lib/jquery/plugins/jquery.rating.js"></script>
+<link rel="stylesheet" type="text/css" href="/opac-tmpl/prog/en/css/jquery.rating.css" />[% END %]
 
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 [% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
-- 
1.7.2.5


From amit.gupta at osslabs.biz  Tue Apr 17 13:39:22 2012
From: amit.gupta at osslabs.biz (Amit Gupta)
Date: Tue, 17 Apr 2012 17:09:22 +0530
Subject: [Koha-patches] [PATCH] Bug 7970 - Holds not working in OPAC
Message-ID: <1334662762-14327-1-git-send-email-amit.gupta@osslabs.biz>

To test:
- create circulation rules for branch only for example (Midway branch).
- No need to set default circulation rules.
---
 C4/Reserves.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 930d524..b302362 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -391,14 +391,15 @@ sub GetReservesFromBorrowernumber {
 sub CanBookBeReserved{
     my ($borrowernumber, $biblionumber) = @_;
 
-    my @items = get_itemnumbers_of($biblionumber);
+    my $items = &get_itemnumbers_of($biblionumber);
     #get items linked via host records
     my @hostitems = get_hostitemnumbers_of($biblionumber);
     if (@hostitems){
-	push (@items, at hostitems);
+        push (@hostitems,$items);
     }
 
-    foreach my $item (@items){
+    my %itemhash = %$items;
+        foreach my $item (keys %itemhash) {
         return 1 if CanItemBeReserved($borrowernumber, $item);
     }
     return 0;
-- 
1.6.4.2


From amit.gupta at osslabs.biz  Tue Apr 17 13:41:40 2012
From: amit.gupta at osslabs.biz (Amit Gupta)
Date: Tue, 17 Apr 2012 17:11:40 +0530
Subject: [Koha-patches] [PATCH] Bug 7970 - Holds not working in OPAC
Message-ID: <1334662900-16374-1-git-send-email-amit.gupta@osslabs.biz>

To test:
- create circulation rules for branch only for example (Midway branch).
- No need to set default circulation rules.
---
 C4/Reserves.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 930d524..b302362 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -391,14 +391,15 @@ sub GetReservesFromBorrowernumber {
 sub CanBookBeReserved{
     my ($borrowernumber, $biblionumber) = @_;
 
-    my @items = get_itemnumbers_of($biblionumber);
+    my $items = &get_itemnumbers_of($biblionumber);
     #get items linked via host records
     my @hostitems = get_hostitemnumbers_of($biblionumber);
     if (@hostitems){
-	push (@items, at hostitems);
+        push (@hostitems,$items);
     }
 
-    foreach my $item (@items){
+    my %itemhash = %$items;
+        foreach my $item (keys %itemhash) {
         return 1 if CanItemBeReserved($borrowernumber, $item);
     }
     return 0;
-- 
1.6.4.2


From oleonard at myacpl.org  Tue Apr 17 15:32:45 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 17 Apr 2012 09:32:45 -0400
Subject: [Koha-patches] [PATCH] Bug 7500 - Use CSS Sprites for faster page
	loading
Message-ID: <1334669565-8752-1-git-send-email-oleonard@myacpl.org>

This patch moves *most* small interface icons and
the Koha log into a single 10K sprite image. CSS
is used to position the sprite correctly for each
icon instance.

Not covered by this patch: XSLT icons, star ratings
icons, table sort icons (the latter which I don't
think can be done using this technique).

A follow-up patch should remove the individual images
which have been replaced by the sprite.
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |  240 ++++++++++----------
 .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |    2 +-
 koha-tmpl/opac-tmpl/prog/images/sprite.png         |  Bin 0 -> 10105 bytes
 3 files changed, 124 insertions(+), 118 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/sprite.png

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index c10e08d..2c1ac74 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -176,7 +176,8 @@ h1#library {
 
 
 h1#libraryname {
-	background:transparent url(../../images/koha-logo.gif) no-repeat scroll 0%;
+	background-image: url("../../images/sprite.png");
+	background-position: -10px -9px;
 	border: 0;
 	float : left !important;
 	margin:0;
@@ -426,11 +427,13 @@ a .term {
 }
 
 #action a.print {
-	background-image:url(../../images/print.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -253px;
 }
 
 #action a#furthersearches {
-	background : transparent url(../../images/menu-arrow.gif) no-repeat right center;
+	background-image: url("../../images/sprite.png");
+	background-position: 106px -362px;
 	border : 1px solid #F3F3F3;
 	margin-left : 5px;
 	padding : 2px 26px 2px 10px;
@@ -446,15 +449,18 @@ a .term {
 
 #action a.reserve,
 .searchresults a.reserve {
-	background-image:url(../../images/placereserve.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -211px;
 }
 
 #action a.addtoshelf, #toolbar a.addtoshelf {
-	background-image:url(../../images/addtoshelf.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -292px;
 }
 
 #action a.addtocart, #toolbar a.addtocart {
-	background-image:url(../../images/cart2.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -332px;
 }
 
 #action a.cartRemove, .actions a.cartRemove {
@@ -465,7 +471,8 @@ a .term {
 }
 
 #action a.incart {
-	background-image:url(../../images/cart2.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -332px;
 	color : #666;
 }
 
@@ -524,100 +531,102 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
 
 
 #toolbar a.print {
-	background: transparent url(../../images/print-small.png) 10px 50% no-repeat;
+	background-image: url("../../images/sprite.png");
+	background-position : 0px -490px;
 	text-decoration : none;
 	padding-left : 30px;
 }
 
 #toolbar a.brief {
-	background: transparent url(../../images/brief.gif) 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : -2px -935px;
 	text-decoration : none;
 	padding-left : 27px;
 }
 
 #toolbar a.detail {
-	background: transparent url(../../images/detail.gif) 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : -2px -965px;
 	text-decoration : none;
 	padding-left : 27px;
 }
 
 #toolbar a.download {
-	background : transparent url("../../images/download.png") 7px 50% no-repeat;
-	padding-left : 24px;
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -415px;
+	padding-left : 28px;
 	text-decoration : none;
 }
 
 #toolbar a.editshelf {
-	background : transparent url("../../images/shelf-edit.gif") 12px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -415px;
 	padding-left : 26px;
 	text-decoration : none;
 }
 
 #toolbar a.empty {
-	background: transparent url(../../images/empty-small.png) 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -665px;
 	text-decoration : none;
-	padding-left : 21px;
+	padding-left : 30px;
 }
 
 #toolbar a.hide {
-	background: transparent url(../../images/close.gif) 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position: -3px -881px;
 	text-decoration : none;
 	padding-left : 26px;
 }
 
 #toolbar a.hold,
 #selections-toolbar a.hold {
-	background: transparent url(../../images/place-hold-small.png) 5px 50% no-repeat;
+	background-image: url("../../images/sprite.png");
+	background-position : -5px -520px;
 	text-decoration : none;
 	padding-left : 23px;
 }
 
 #selections-toolbar a.hold.disabled {
-	background: transparent url(../../images/place-hold-small-disabled.png) 5px 50% no-repeat;
+	background-image: url("../../images/sprite.png");
+	background-position : -5px -688px;
 }
 
-#toolbar a.newshelf {
-	background : transparent url("../../images/shelf-new.gif") 5px 50% no-repeat;
-	padding-left : 23px;
-	text-decoration : none;
-}
-
-#selections-toolbar a.removeitems {
-	background: transparent url(../../images/shelf-delete.gif) 11px 50% no-repeat;
+#selections-toolbar a.removeitems,
+#selections-toolbar a.deleteshelf {
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -757px;
 	text-decoration : none;
 	padding-left : 25px;
 }
 
 
-#selections-toolbar a.removeitems.disabled {
-	background: transparent url(../../images/shelf-delete-disabled.gif) 11px 50% no-repeat;
+#selections-toolbar a.removeitems.disabled,
+#selections-toolbar a.deleteshelf.disabled {
+	background-image: url("../../images/sprite.png");
+	background-position : 2px -779px;
 }
 
 #toolbar a.send,
 a.send {
-	background: transparent url(../../images/send.png) 2px 50% no-repeat;
+	background-image: url("../../images/sprite.png");
+	background-position : 2px -453px;
 	text-decoration : none;
 	padding-left : 28px;
 }
 
 #toolbar a.new {
-	background : transparent url("../../images/new.gif") 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : -4px -989px;
+	background-repeat : no-repeat;
 	padding-left : 23px;
 	text-decoration : none;
 }
 
-#toolbar input.download {
-	background : transparent url("../../images/download.png") 7px 50% no-repeat;
-	border : 0;
-	color : #006699;
-	cursor : pointer;
-	padding-left : 24px;
-	text-decoration : none;
-}
-
 #toolbar input.editshelf,
 input.editshelf {
-	background : transparent url("../../images/shelf-edit.gif") 10px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -799px;
 	border : 0;
 	color : #006699;
 	cursor : pointer;
@@ -627,37 +636,36 @@ input.editshelf {
 }
 
 #toolbar input.newshelf,
+#toolbar a.newshelf,
 a.newshelf {
-	background : transparent url("../../images/shelf-new.gif") center left no-repeat;
+	background-image: url("../../images/sprite.png"); /* add to list icon */
+	background-position: -4px -831px;
 	border : 0;
 	color : #006699;
 	cursor : pointer;
 	font-size : 100%;
 	margin: 0 0.5em;
-	padding-left : 15px;
+	padding-left : 23px;
 	text-decoration : none;
 }
 
 a.newshelf.disabled {
-	background : transparent url("../../images/shelf-new-disabled.gif") center left no-repeat;
+	background-image: url("../../images/sprite.png"); /* add to list icon */
+	background-position: -4px -858px;
 }
 
 #toolbar input.deleteshelf,
-input.deleteshelf,
-a.deleteshelf {
-	background : transparent url("../../images/shelf-delete.gif") 7px 50% no-repeat;
+input.deleteshelf {
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -752px;
 	border : 0;
 	color : #006699;
 	cursor : pointer;
 	font-size : 100%;
-	padding-left : 20px;
+	padding-left : 25px;
 	text-decoration : none;
 }
 
-a.deleteshelf.disabled {
-	background : transparent url("../../images/shelf-delete-disabled.gif") 7px 50% no-repeat;
-}
-
 #toolbar input.deleteshelf:hover {
 	color: #990033;
 }
@@ -676,15 +684,19 @@ input.deleteshelf:active {
 
 #tagsel_span input.submit,
 #tagsel_tag {
-	background-image: url(../../images/tags-small.png);
-	background-position : 7px center;
+	background-image : url("../../images/sprite.png"); /* tag icon */
+	background-position : 7px -707px;
 	background-repeat : no-repeat;
 	padding-left : 25px;
 	text-decoration: none;
 }
 
+#tagsel_tag {
+	background-position : -1px -710px;
+}
+
 #tagsel_tag.disabled {
-	background-image: url(../../images/tags-small-disabled.png);
+	background-position : -1px -734px;
 }
 
 #tagslist li { display : inline; }
@@ -699,17 +711,15 @@ input.deleteshelf:active {
 }
 
 .addto a.addtocart {
-	background-image:url(../../images/cart2.gif);
-	background-position : 9px -3px;
-	background-repeat : no-repeat;
+  background-image: url("../../images/sprite.png"); /* cart icon */
+  background-position: -5px -332px;
 	text-decoration : none;
 	padding-left : 33px;
 }
 
 #placehold input.submit {
-	background-image:url(../../images/placereserve.gif);
-	background-position : 9px center;
-	background-repeat : no-repeat;
+	background-image: url("../../images/sprite.png"); /* place hold icon */
+	background-position: -1px -207px;
 	text-decoration : none;
 	padding-left : 23px;
 }
@@ -725,7 +735,8 @@ input.deleteshelf:active {
 	cursor : pointer;
 }
 .searchresults a.highlight_toggle {
-	background : transparent url(../../images/highlight.gif) -4px center no-repeat;
+	background-image: url("../../images/sprite.png"); /* place hold icon */
+	background-position: -11px -908px;
 	display: none;
 	font-weight: normal;
 	padding : 0 10px 0 21px;
@@ -1403,18 +1414,21 @@ padding-left : .4em;
 }
 
 .actions a.hold {
-	background : url("../../images/placehold-small.gif") center left no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : -10px -609px;
 	padding-left : 16px;
 }
 
 .actions a.addtocart {
-	background : url("../../images/cart-small.gif") center left no-repeat;
-	padding-left : 13px;
+	background-image : url("../../images/sprite.png");
+	background-position : -10px -639px;
+	padding-left : 15px;
 	display : none;
 }
 
 .actions a.addtoshelf {
-	background : url("../../images/addtolist-small.gif") center left no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position: -10px -94px;
 	padding-left : 13px;
 }
 
@@ -1573,8 +1587,8 @@ ul#i18nMenu li ul li {
 
 
 ul#i18nMenu li.more a {
-	background-image:url(../../images/more-up-arrow.gif);
-	background-position:right center;
+	background-image : url("../../images/sprite.png");
+	background-position : 37px -1007px;
 	background-repeat:no-repeat;
 	padding-right: 1.3em;
 }
@@ -1729,16 +1743,6 @@ div#menu li.active a:hover {
 	padding : 2px;
 }
 
-#further {
-	text-align : left;
-	font-size : 95%;
-	padding : 3px 3px .5em 1em;
-}
-
-#further ul li {
-	list-style-image : url("../../images/further-bullet.gif");
-}
-
 #amazonreviews h4 {
 	font-size : 90%;
 	margin : 0;
@@ -1787,14 +1791,14 @@ span.starMT {
 
 #listsmenulink {
 	background : #9FBFFF;
-	background: url("../../images/list.gif"),-moz-linear-gradient(top, #d7e5ff 0%, #b1cbff 50%, #9fbfff 100%); /* FF3.6+ */
-	background: url("../../images/list.gif"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#d7e5ff), color-stop(50%,#b1cbff), color-stop(100%,#9fbfff)); /* Chrome,Safari4+ */
-	background: url("../../images/list.gif"),-webkit-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* Chrome10+,Safari5.1+ */
-	background: url("../../images/list.gif"),-o-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* Opera 11.10+ */
-	background: url("../../images/list.gif"),-ms-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* IE10+ */
-	background: url("../../images/list.gif"),linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* W3C */
+	background: url("../../images/sprite.png"),-moz-linear-gradient(top, #d7e5ff 0%, #b1cbff 50%, #9fbfff 100%); /* FF3.6+ */
+	background: url("../../images/sprite.png"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#d7e5ff), color-stop(50%,#b1cbff), color-stop(100%,#9fbfff)); /* Chrome,Safari4+ */
+	background: url("../../images/sprite.png"),-webkit-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* Chrome10+,Safari5.1+ */
+	background: url("../../images/sprite.png"),-o-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* Opera 11.10+ */
+	background: url("../../images/sprite.png"),-ms-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* IE10+ */
+	background: url("../../images/sprite.png"),linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d7e5ff', endColorstr='#9fbfff',GradientType=0 ); /* IE6-9 */
-	background-position: 85% 46%;
+	background-position: 40px -354px,top left;
 	background-repeat: no-repeat;
 	border: 1px solid #629DCF;
 	color : #006699;
@@ -1803,27 +1807,27 @@ span.starMT {
 
 #listsmenulink:hover {
 	background-color : #b8d0e6;
-	background: url("../../images/list.gif"),-moz-linear-gradient(top, #e2ecf5 0%, #c3d8ea 50%, #b8d0e6 100%); /* FF3.6+ */
-	background: url("../../images/list.gif"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#e2ecf5), color-stop(50%,#c3d8ea), color-stop(100%,#b8d0e6)); /* Chrome,Safari4+ */
-	background: url("../../images/list.gif"),-webkit-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* Chrome10+,Safari5.1+ */
-	background: url("../../images/list.gif"),-o-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* Opera 11.10+ */
-	background: url("../../images/list.gif"),-ms-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* IE10+ */
-	background: url("../../images/list.gif"),linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* W3C */
+	background: url("../../images/sprite.png"),-moz-linear-gradient(top, #e2ecf5 0%, #c3d8ea 50%, #b8d0e6 100%); /* FF3.6+ */
+	background: url("../../images/sprite.png"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#e2ecf5), color-stop(50%,#c3d8ea), color-stop(100%,#b8d0e6)); /* Chrome,Safari4+ */
+	background: url("../../images/sprite.png"),-webkit-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* Chrome10+,Safari5.1+ */
+	background: url("../../images/sprite.png"),-o-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* Opera 11.10+ */
+	background: url("../../images/sprite.png"),-ms-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* IE10+ */
+	background: url("../../images/sprite.png"),linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e2ecf5', endColorstr='#b8d0e6',GradientType=0 ); /* IE6-9 */
 	background-repeat: no-repeat;
-	background-position: 85% 46%;
+	background-position: 40px -354px,top left;
 }
 
 #cartmenulink {
 	background: #98CB58; /* Old browsers */
-	background: url("../../images/cart.gif"),-moz-linear-gradient(top, #d5eaba 0%, #b7db8a 50%, #98cb59 100%); /* FF3.6+ */
-	background: url("../../images/cart.gif"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#d5eaba), color-stop(50%,#b7db8a), color-stop(100%,#98cb59)); /* Chrome,Safari4+ */
-	background: url("../../images/cart.gif"),-webkit-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* Chrome10+,Safari5.1+ */
-	background: url("../../images/cart.gif"),-o-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* Opera 11.10+ */
-	background: url("../../images/cart.gif"),-ms-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* IE10+ */
-	background: url("../../images/cart.gif"),linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* W3C */
+	background: url("../../images/sprite.png"),-moz-linear-gradient(top, #d5eaba 0%, #b7db8a 50%, #98cb59 100%); /* FF3.6+ */
+	background: url("../../images/sprite.png"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#d5eaba), color-stop(50%,#b7db8a), color-stop(100%,#98cb59)); /* Chrome,Safari4+ */
+	background: url("../../images/sprite.png"),-webkit-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* Chrome10+,Safari5.1+ */
+	background: url("../../images/sprite.png"),-o-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* Opera 11.10+ */
+	background: url("../../images/sprite.png"),-ms-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* IE10+ */
+	background: url("../../images/sprite.png"),linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d5eaba', endColorstr='#98cb59',GradientType=0 ); /* IE6-9 */
-	background-position: 15% 46%;
+	background-position: -5px -323px, left top;
 	background-repeat: no-repeat;
 	border: 1px solid #5EA28C;
 	color : #336600;
@@ -1832,15 +1836,15 @@ span.starMT {
 
 #cartmenulink:hover {
 	background-color : #BFDE96;
-	background: url("../../images/cart.gif"),-moz-linear-gradient(top, #e5f1d4 0%, #cbe4aa 50%, #c0de98 100%); /* FF3.6+ */
-	background: url("../../images/cart.gif"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#e5f1d4), color-stop(50%,#cbe4aa), color-stop(100%,#c0de98)); /* Chrome,Safari4+ */
-	background: url("../../images/cart.gif"),-webkit-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* Chrome10+,Safari5.1+ */
-	background: url("../../images/cart.gif"),-o-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* Opera 11.10+ */
-	background: url("../../images/cart.gif"),-ms-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* IE10+ */
-	background: url("../../images/cart.gif"),linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* W3C */
+	background: url("../../images/sprite.png"),-moz-linear-gradient(top, #e5f1d4 0%, #cbe4aa 50%, #c0de98 100%); /* FF3.6+ */
+	background: url("../../images/sprite.png"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#e5f1d4), color-stop(50%,#cbe4aa), color-stop(100%,#c0de98)); /* Chrome,Safari4+ */
+	background: url("../../images/sprite.png"),-webkit-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* Chrome10+,Safari5.1+ */
+	background: url("../../images/sprite.png"),-o-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* Opera 11.10+ */
+	background: url("../../images/sprite.png"),-ms-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* IE10+ */
+	background: url("../../images/sprite.png"),linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5f1d4', endColorstr='#c0de98',GradientType=0 ); /* IE6-9 */
 	background-repeat: no-repeat;
-	background-position: 15% 46%;
+	background-position: -5px -323px, left top;
 }
 
 /* IE 6 & 7  don't do multiple backgrounds, so remove extra padding */
@@ -1937,28 +1941,29 @@ span.view {
 }
 
 a#MARCview, span#MARCview, a#MARCviewPop, a#ISBDview, span#ISBDview, a#Normalview, a#Briefhistory, span#Normalview, a#Fullhistory, span#Fullhistory, span#Briefhistory {
-	background-position : 5px 3px;
 	background-repeat : no-repeat;
 	font-size : 87%;
 	font-weight : normal;
 	padding : .2em .5em;
+	padding-left : 21px;
 	text-decoration: none;
 }
 
 a#MARCview, span#MARCview {
-	background-image : url(../../images/marc.gif);
-	padding-left : 17px;
+	background-image: url("../../images/sprite.png");
+	background-position: -5px -93px;
 }
 a#MARCviewPop, span#MARCviewPop {
-    background-image : url(../../images/marc.gif);
-    padding-left : 17px;
+	background-image: url("../../images/sprite.png");
+	background-position: -5px -93px;
 }
 a#ISBDview, span#ISBDview {
-	background-image : url(../../images/isbd.gif);
-	padding-left : 20px;
+	background-image: url("../../images/sprite.png");
+	background-position: -5px -122px;
 }
 a#Normalview, span#Normalview {
-	background-image : url(../../images/normal.gif);
+	background-image: url("../../images/sprite.png");
+	background-position: -5px -64px;
 	padding-left : 15px;
 }
 
@@ -2153,7 +2158,6 @@ div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px;
 }
 
 #renewcontrols a {
-	background-position : 3px center;
 	background-repeat : no-repeat;
 	text-decoration:none;
 	padding : .1em .4em;
@@ -2161,11 +2165,13 @@ div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px;
 }
 
 #renewselected_link {
-	background-image : url(../../images/check.png);
+	background-image : url("../../images/sprite.png");
+	background-position : -5px -1055px;
 }
 
 #renewall_link {
-	background-image : url(../../images/checks.png);
+	background-image : url("../../images/sprite.png");
+	background-position : -8px -1034px;
 }
 
 div.koha_url {
@@ -2277,7 +2283,7 @@ a.koha_url {
 }
 
 .nav_results .l_Results a {
-    background:#E1E1E1 url("../../images/ico_b_results.gif") 14px 13px no-repeat;
+    background:#E1E1E1 url("../../images/sprite.png") no-repeat 0px -571px;
     color:#006699;
     display:block;
     padding:8px 28px;
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
index 66f372f..71ba2e7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
@@ -148,7 +148,7 @@ $.tablesorter.addParser({
             </form>[% END %]
         <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
             <input type="hidden" name="op" value="delete_confirm" />
-            <div><span class="checkall"><a href="#" id="CheckAll">Select all</a></span>
+            <div id="toolbar"><span class="checkall"><a href="#" id="CheckAll">Select all</a></span>
         <span class="clearall"><a href="#" id="CheckNone">Clear all</a></span> | [% IF ( loggedinusername ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% ELSE %][% IF ( AnonSuggestions ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% END %][% END %]
 </div>
 			<table id="suggestt" class="checkboxed">
diff --git a/koha-tmpl/opac-tmpl/prog/images/sprite.png b/koha-tmpl/opac-tmpl/prog/images/sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3d54bedee2e548ea833a2839c6e714661b97e4e
GIT binary patch
literal 10105
zcmd^FXIN9&);=jDfC+*MQZ*n|MH7l3poS<8C at NJE3ki{cf*6_#781G+WB?l|GKh^q
zM;W{5XlN3O0s at L6N&p#((j~Mccb^lz_j{gip8MQ8qkca=e!waFoW1v2?|Rp}*5QcD
z`X7jjnu-tv5uF at Yxq-jQ5QJSIj{!$J9d9{-KUjbJb at mW+U0@}5v>TjjggbbJyYFFz
z?_-4eLH0ZL`1+BYb~F6_-250jB10<t>>vmOxj1_`EZp|f;NalfkK*3mUebocw*|r@
zM~)bK9eMphJTxZJbLDQ~6@`X|&fk)<h at Ku56}2JewyUdab*E(O)~$i*f`bPSn)#jb
z^73LZ7%d;CI)}uR9jAIm#KJyt->7&o<9I_u!`yWTlarHoCSOZPNN{#`j*N^P5J^6a
zNP0&k#$HDs2_<U|70 at E`+!F3D*qXBG=<h3nvy3(-+^gvv_9ooEeY?(jQID(Y?&AXM
zUD;NF*@I(J-3^DsPE~B&xN&vlufE62n^qVt_DQo0II|-3!r?P_DLYPh9K2u~d`>Er
z>bb>O1m{bo)j`K9tbV+``*@|kM_gtmE9jUY__!eCWCg^^3_ej6o>6Jw5zk_ok4{MX
zhQ_AElKp3 at K21m_#Zq%t=I&#HgW1)w=W8aX#7Fb$>RLX28k-#aG~P8Ne$?D{qM(uN
zd!ns>s(nCgx;=GlLOjonYv37g>XXX5@|<(2xo=c5F)<+)i*xV4E^FwD&UxC_J#xE6
zT5WFr^SxJs7u~%BqMl*NzJ2 at Ber@>u+53cxH5BHFjGHfiEq*s8mbP{cH?<AC?ih%U
zj?RDF($YCNIy&0<;ghtQm3XN(Dyw=@EV*9tuKHE)yN=?ZbiuvK_CI=`8+gQZ4~xmn
z6BOSQZ+k=|BO~qo;<I;}b|e>f_lts#Ro*BQ?%A`aYgjxvIr+Gzv$3^rXlQ6)R6IO9
zJU%|&Jt7u~ME#=@Q=hcRtg7x|$>@Z1bW&1S-4PfVD0H0D)-MhU3hL+`VYAuBo03G6
z(&D;5k}p206OL at l^}hJ9IqhcS#FWIu`$v8ExVC|*$w7WxTwH1?P5J at 4^!pnF&x8vP
zn)~|tcsySFz!b&zxS?mfXhI_GU>R*n{4_4vajG&Xy*xcVeUVSPXhJHQl=O=vT|-kb
zF)?ieVgrv at GUM3jxCH!s8m%+*Oz7<FG~SeG#yokks72T>Hu6gJNh_O}l1_*vlT*_6
z{;By}l5OH^bvH!ox<u=_#w_+d9v&VJ5Mqn2`2;~IDBNwmJ2?IS`~$g*@CFd1H|(^^
z-edo3-?0@*5EY^j49g*GZB8hG3K8f3r9)wuvzKqhX{Wlt1uLhzJJdN)aeGE<cXu{j
z*?e2vavn;al*Jo-x_&S&R&!e1z3bN<U4rE8W5tIK#jYx5mN<rhsfD4=F0n>tU7zBQ
z?EArrRl46$CA{j|lddjwO;kD!N8+%p4MSp#=5sQ8v}QDa?9NnKRZG#;Jwe?q)L#m2
z7uXtx%s9Qp&V7b3{cLvjgCqqpdqd4?pLA`EGSy3`{Y>W(ly~dlYeOShwB)*1+1Xbw
z7|_8&JJqG at o$u~{#(CeLL#WB1>p749EbPv7KFx&C@@JU&zuhY{*E#8YCo*bO*?j=3
zs{BWQJ_O#VJ+mR{DJ8q$4Z-=;+9b--ihA>u(&sb4LaZ;%xU$9WGHu5xQB>5E8O$LE
zJ)IORcw0S1&7?`kooITBX?MOTvefFAc?xO2tV-`)%$oO7>rqQ<vd-~BeXaX(Tj#jl
z(AQEwz_7P}q%OoMQwgOwLN#S~cJ|Gp`;Sq-sAo3LZQtzqs`Wn3)h%&9TE{f>jX5rF
zp{lOpbJh0ELo2Lp&g0G(pyf$~a>#tz-U6cDist&8M2{p+uW6pCFeTfP+CS-kV6-^!
zH;)Z9-FnL=kF8=|j8x-aJ?q_?`PNV`y+=c-T0f8s8(uxBa!nHUgBJ1GJg4kqg+kq#
zZmk-`MKcd+EnC2_JbdM{zmqpcu)AJ(gpgMNUG;N#y{Ka#2E~DB`<$DCw1c^7MSS0g
zU!_u$>=Sx=V$a>J7W3RNi(R~h1`wI!zU##Vtx7BD{GkIJCG1V#Wn6`s=I=0A<w9mm
zZiw|IoZF3k`=j<kRWCeJ&2uV5*5v7n6Umdp%tdM)huMmXYZ6ab8DwX-D7(jSZ_FfL
zQAFllc+KlH(PU%29g}v0nYv&%eKh9OEiw7J)CYatKA$lfGqpLUHcZ1j5KM$&#mDGS
zeXS{F=7pAW7cJfU6`uB{HngBZM!dbeVrERgP`P2X$K9eN0+#^1*g|R5KUVijO{@9I
z(XFl2m6}-(r={w&KX_MvbM8hR)Pkm<doM5Zv!*+lF#_$DU6~T9M%kR)C{KmX+2S&u
z*x9n|Ti$V8H>}5pX{MSP2#z^9meI5p&dSxja~s;isya8Wy!{hq+LaP7Z(Rr#*O#%n
zBY)!s)jsv4oPPb9ks$qM-A{%OmlG2I7*);AF4r{(o?fj`<QTuh=uWa&x&ofY5HqK<
zHC=V1|Dxe|)hmJai&j-C at W~n2_6YuK&Z8>2T4G6yCeP7~v@=N6h6*vPakpRhC)(gn
zPvbDQkFU_jz4EC at y2M*t at M|HOMQIp6B~&obPOD}9#`++YqF at UgGaO@9Y^|j|d5qec
zF<LSctA9GbSh<WQUtPC=KB#z<Atkf(XxpGQmHgz7KdM+G8_@`KxmUYnu0;w|wb;cF
za%+8~xxIh-dPSmg`Pf|C#vd5uAB^Vtohj9z9+)|e?yz0{!s~Ts<N5%b03aP&&~$58
z()dl%`$5I%{Rb4ZJNW}gf0J7>V-f9!d4p2U2MNh*-t^OUZbd1giEy6+n&V#F-GY^p
z$rtns4EPPz9_)-s(aEuSq3*=1^Oq~Fv&*@0krFxkg4ufX$%<C=#X9qO*x%Dm5$6Zf
zNDj|tIkLyEb^U_B`0k`wy#ho*txkKD;*$8ru)S`A<J$|i<TCuUjc3M at JT+4@2Ck1d
zPaB$@srfMzw-#H^kfY?KesHb~_>`F780Ewc-Sc!I-Oh7EO3?>*6jpil%v at 8IjlNX-
z>2_xg=3MiQpD<KaS23*(@BLYGTkXy2n^vCKw-562W1{%8J#zQa3}TdGch#&>VT<NP
z&1VH8QT--%*5iuW*S3cga_i at +B^X=AGSh})9QV5gk==6UnQWaCbD?&H{u1q=tmyp<
z?<_X~US48*uJcW=W0k<GInA+VP=f<$dc-<FD2qIpA!92k-}^AGL)}4MoeDCJayrwC
zzs>O^DjXyN-K7avt`wvOYQBVQfZbEI-Dj!ZX8L=Sem*UEBq2>QBSyar-uHHI=DKwc
zF<mfFLY)t94>>&8_Uq@<Y9A*<Lqn(W&x2Qcdpi at 7@U_TZ*8uw0^Z>~z$NoKd_M0A(
zs(DgquNVZ+`Sum5+oHizKaOD at Na8U~pYZaeWL|WG?Dp;U$JuAkiU;`-vcc~xIG;!V
zp*nl|j+b*u92Z*&)p#j#xwvagb`9sLK=__cWKDssR8W?*20wm^_{GIWqN1X*Z7ZEj
zhSR-%xn1=B;m&i3KPfG<2 at mMwTO+O<erAJ4Uu|4LOop>-1?94Zg{6fh*K1{axom{3
z#H}_pExmHCx(pT_E705zZ-1IAsvP?A%y2W8{iyk%)!p%rn0CZ(2IRl2T>fjpqpVhr
zrSTznI|cCsfk_%h#SE~U<!PM26z0YQr!~~?PT>KjPH<4 at 02f%A;7)+ue%r$WkrGY-
zP+dw+ikc7Bk;G8`B$R;Uc8RH{OD7=_J|6|nOGrH;DY85kyr%bt9LQIFl~^K$qkqPC
zG~~Y%oD7>MTDY!$;M`(%^4;mP2%JCwmqg}6d at 0ytTnptbW+t$DDW}<VWFHZ5o6VDE
zd|M8R4d{cRpb?O-0m1OWJbP#XUHcN>zI at j<A~j6}=SX6H5A<F9^7maoKv+{Bodi%s
zPTbCz{fiQxtpYYlAV<+?exx@;fDhDhu6zV>s=y`|d5Bi#?Nut>Zv at 1E4Q@GsFh}vy
z0|3D!ls})qL9iGPECuw4&1Ew<TyyMYkA}{KP2;Wge{CB1ADOsa<1eKElyQEy>g&UD
zPM!ye6LW`+O35Y0!Q8=ACq5i|5k^|=F9C2Sjqn~DHBsI!$F#wq(Y`-~`l*iKcmps|
z@}Nc%lNy^nvJY%o7+TFC^nh0>m2*z5t#3i{z at MeRxR;cXXK!GLxz6V6td#mr2X-d+
z2vFLJIAE^Ed+6_xHU7iIM2o0yd4TBwJEuh?$HtaW;k;RUzI#}9pi`29?UKo;WbS1n
zf<`U8Zy>CGUm8Yt{HYJ->+o`Uevvb(&=!7D=e&8C;jHf36)<5GGC!m#x1a##j`Is$
z$jX}mI>_4XZD#EEaJ0QxH)jr}Qx>TgRh7NGy*Det5R)&VJbNaXbqG92%s0e-KZ5>W
zyrR3*5QW7x{L|HfI*Z!i@#&wlWn4N3-vl%FXMXm40sHqW>H*RRo<`1EXOJ2u<MT1$
zAN7FI9-~7!Tj8=)+njwW0}YDrHT>_czIxOh9Ll(`;yP#Z<jL?$1S~E(C8|<?k`7p$
zfM-$|Zqnygm%<GLgLG|IUkO^9nU(c|59c(OTqmFT!$&00YQPz~ww(f%N9G5A;1RN5
z-&atsO`E-FYFg<v1RAu^WHSOGLw2X{2cNmiq8i3xCpqwYQni`#7-W>DM+8hif2{-Y
z9UjwNx>^N=Bv~L_wY0h%0+uYqz`YKzy-jwT?3A6`k1p0G$#l!nwl=-K(lXVSBMUS?
zU%GXtplT<#Rc#ancUr*Pe4;%s9Y4%sU6N2!<UpjQGsi;1YC1am<l69`UtAp{x0KFa
zX5`O7NGiV;^L4 at b_mNJrC?|Zd)`UTnAZNx~;!+X-xTP)Qol&${BBzg=e;VMSj1r$k
zC%deSf)!F3CCslAhpleRvUP!}XI8oTd(%fJMayaea^PJGc#N06{x6?DN4tHo!cX4T
zW0cRjl1vW3FqUJI=ExM{?dfr?oIP~-K}TL>5eh$qh(a1KbySWjkM74C0}`vv$v6II
zgnxT6M!xevsl&_&AR~kjzMsW^;ty;P;ixZZzP10_&iZ>Y5Z!38?DO+ at lX5RF*GfgU
zXpQ((=HmMK$C`_uEvJ?!14BNn?yku9oVY^0k~M-4I0wht;;`3e&YXE*B}%Tx7(L={
z?!v-bueg7BnZNzB7`bV<t66YH_v}Lby{6uO6H at 1{$E&*_k}Kcc%M14$&M$>(G4WN$
z0wI`79C^Yvw2i at X$p}IosViB*cC{uUA$RfB at X#6S?zVH*n=G)kL=e&NCVbblT9eF7
z%!zjZFi*E9cv3HSDAmSE;ks!$_L2YngG)am;3!T?8^?4WhuabXE}r=BO`@{e*^#FZ
zAA^u2F+cTRY6=!&I8OoGTUA7=ZCzlA*!erYbuI93G^czc1w|**WnqWqh?s;dSXnnx
zj2>qb#?098jUDA!c8rkkFbl-A_3G8QINUSXM;#fQz{r<FLpU=c;3`biMn!f0RU+6>
zJ_5I|m@)rDQUbIq;=p<ZpozZ?nAVub<se=-XZ-|Ez{9JSsbRzk%4=TCY30CqKaZ!;
z`UV6|Ui at 1q5!NsX)lebgs|e88{rioO0G>t at ta#4d<u1eDZ~`k6oVDK5rLY&%sR^nr
zewQ|ZUJJ^TUHuRmw-DyXwVV7}5rY3$6ULY~7+1{wv!1;2N!>K=6(tx&jjz83;NyBS
zS|&$7z9p`b at oh-;@_ at y`?;s at 2YnOnQ6*WedfCN0D2_8)<Dlw;CLzp|L^VOS&k;AO)
z&Q31e#MfPVDY7Kj;i=Y=g}ZQEl<ZQ%&noCKdpcD{?!wuss&Ycq0>Fs at E~-&qV*?g>
zN(*4s7U4w!R)6be!B13$N#EwGI*7nVMj1TG{}@8dFF6YHh0aE}XVO#P3palnVWs+Y
z#E0@}W&<KPOF2EqQJPQ!8cqetd3gcxT}ZP;-6iY!CRf)wD<t4LQc*VVyL%e1)DRJk
zWN at 0Ze(Bwi_9v(?P}`pCG|X{tGF+b}SVD!v^VU^jxMFiI3f5%jW=946sAghfLQI9l
z)p_h3>&sJ8SlZ^>KwnoWfR0W^20w|5hN(b3EG&#X#~MV7pzanPi!*~kZ1B|D#zraN
zG(sU6Tt1>FLHBOcCj1i&9t<d>kbQH&2Pa~FC>(8HGY_X~hpAdrM}F!-%$urxJ~tOF
zo77Ja^Lc#{Lu+ at _{oBAo{H|9%Mm3vZPzbG^z;8qka%BxdTb4nS1JXLw^nlBouLKBL
zO~SBYL850M at DrG`R5u`cI0^MigHC26<%lDXF*q`UE%bw|R6&J0v?%*pao*2Hmx!&|
zda%fJcJ*lBopp6p!Tf=UPQv6w?C{WV<12*efK%Q^Hv28Hv>a6Wtii`4%OcCle!TnT
zJlY^LBSYWd{g?4OcTy-jNfa1^KrUE)JGlThZ20q8J0$Il^nLto`0g_$1nIvX=#69y
zjdQ1g^hoP{tERTydI at _cLd7CAIC=j2-(QEW|D5pEd9HL1b+Sy&d)T)=>TZsZ6*GGY
zc?YVl(rwsqI(Ou$95nD+WGpxs-TE9RK-)_XA0CVt-&G_lnwCBZ&TX+_2#@Uj?6u^v
z!U(M;SGO1~M`B;UT;2yoBWYU06Ww5D6wyEHr8LeLMe%hyRRunlwp7s~G(3wPgPs#i
zk%Of-wGTTwr(l66kXe>H9v1EAUlW4sw*t@?PjMg21oT;3PiQj5$g(@U;jW#yu2k+?
za}YWw&+tPm==T*s2G(iE$VwJX52P8JUkI*#)d*)>v*_Lya6_iVG#euX5#Y-gs{PD`
zTYi*Q_SzRzxFxI3zUPPJnI>&aXcY&!RDdN2Ol5r`HlYBI53l6!*bNghA#V~_jOjQD
zx=f{<GE>ZpBN%xSZq{AGg|!^GJLuU0M8cn=<1bz%<UM`I4SI at DG{N}kJ5-hx1b-(z
zD;UuBdI=D4lxc^z4nVlF)xw+u^Zml%bqI7oC-e`5-3mG`A=qM^G{<-~fQMcHJrD|a
zLFX>iB*AatF>Y}~zy+ZuU0WFd3zR>%zh(K8LWAefjE4YnT;=;w5pdc{p%Jcvq!i!+
z-&OW5kEX8#4kBxtr=ACejYZyS-7hy~kLK80Dx!eBcg;cr+cz2m0rk~dk&Pzz;3?M^
z$-yc?aS>QvR!o%~783~{6Z75K0RQi2ZQV;!7r at 5>E at xw=0YQ1WwG&fB&4!O-duDBg
zWy0lFxLuQv$ggkH+Xs1aExrj6uQJ87+1uNu03m5O41K8~RnUWfB~U+r<-h;wiWZjq
zjsv$1U3A*5;K at k14j0q|Kd1$kuRQKOKZKVE#tJMB1`pFhH3z2zFxO%D7?o at cdalO)
zQ#f)Ra5d|k6-NOUUSIQ*6!@;;tqh91B-HucmPlOS8pwlMNX at xslOLxAZiKr`uEV at J
skCi7S*gsdpW8g0vb}bUPHY7lslWuwseI%g4|IR^94(nH4qtRpj0T~h7umAu6

literal 0
HcmV?d00001

-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr 17 17:01:09 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 17 Apr 2012 11:01:09 -0400
Subject: [Koha-patches] [PATCH] Bug 5184 - Upgrade jQuery to the latest
	version
Message-ID: <CAO4qe2MvuUbS9CZuAp0BYiaJE4t0OH-y7VH9tLuO5eSekfH6Cw@mail.gmail.com>

Upgrade jQuery in the OPAC.

To test: Try any JavaScript-dependent interaction
you can think of in the OPAC and watch for errors.

Patch attached because it contains long lines.

  -- Owen

-- 
Web Developer
Athens County Public Libraries
http://www.myacpl.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5184-Upgrade-jQuery-to-the-latest-version.patch
Type: application/octet-stream
Size: 152979 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20120417/262dee2d/attachment-0001.obj>

From dpavlin at rot13.org  Wed Apr 18 16:24:06 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Wed, 18 Apr 2012 16:24:06 +0200
Subject: [Koha-patches] [PATCH] Bug 7500 - Use CSS Sprites for faster page
	loading
Message-ID: <1334759046-28121-1-git-send-email-dpavlin@rot13.org>

From: Owen Leonard <oleonard at myacpl.org>

This patch moves *most* small interface icons and
the Koha log into a single 10K sprite image. CSS
is used to position the sprite correctly for each
icon instance.

Not covered by this patch: XSLT icons, star ratings
icons, table sort icons (the latter which I don't
think can be done using this technique).

A follow-up patch should remove the individual images
which have been replaced by the sprite.

Signed-off-by: Dobrica Pavlinusic <dpavlin at rot13.org>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |  273 +++++++++++---------
 .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |    2 +-
 koha-tmpl/opac-tmpl/prog/images/sprite.png         |  Bin 0 -> 7511 bytes
 3 files changed, 157 insertions(+), 118 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/sprite.png

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index c10e08d..651564d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -426,11 +426,15 @@ a .term {
 }
 
 #action a.print {
-	background-image:url(../../images/print.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -186px;
+  background-repeat: no-repeat;
 }
 
 #action a#furthersearches {
-	background : transparent url(../../images/menu-arrow.gif) no-repeat right center;
+	background-image: url("../../images/sprite.png");
+	background-position: 106px -295px;
+	background-repeat: no-repeat;
 	border : 1px solid #F3F3F3;
 	margin-left : 5px;
 	padding : 2px 26px 2px 10px;
@@ -446,15 +450,21 @@ a .term {
 
 #action a.reserve,
 .searchresults a.reserve {
-	background-image:url(../../images/placereserve.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -144px;
+  background-repeat: no-repeat;
 }
 
 #action a.addtoshelf, #toolbar a.addtoshelf {
-	background-image:url(../../images/addtoshelf.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -225px;
+  background-repeat: no-repeat;
 }
 
 #action a.addtocart, #toolbar a.addtocart {
-	background-image:url(../../images/cart2.gif);
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -265px;
+  background-repeat: no-repeat;
 }
 
 #action a.cartRemove, .actions a.cartRemove {
@@ -465,8 +475,10 @@ a .term {
 }
 
 #action a.incart {
-	background-image:url(../../images/cart2.gif);
-	color : #666;
+  background-image: url("../../images/sprite.png");
+  background-position: -5px -265px;
+  background-repeat: no-repeat;
+  color : #666;
 }
 
 /* toolbar buttons */
@@ -524,100 +536,115 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e0e0e0', end
 
 
 #toolbar a.print {
-	background: transparent url(../../images/print-small.png) 10px 50% no-repeat;
+	background-image: url("../../images/sprite.png");
+	background-position : 0px -423px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 30px;
 }
 
 #toolbar a.brief {
-	background: transparent url(../../images/brief.gif) 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : -2px -868px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 27px;
 }
 
 #toolbar a.detail {
-	background: transparent url(../../images/detail.gif) 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : -2px -898px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 27px;
 }
 
 #toolbar a.download {
-	background : transparent url("../../images/download.png") 7px 50% no-repeat;
-	padding-left : 24px;
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -348px;
+	background-repeat: no-repeat;
+	padding-left : 28px;
 	text-decoration : none;
 }
 
 #toolbar a.editshelf {
-	background : transparent url("../../images/shelf-edit.gif") 12px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -348px;
+	background-repeat: no-repeat;
 	padding-left : 26px;
 	text-decoration : none;
 }
 
 #toolbar a.empty {
-	background: transparent url(../../images/empty-small.png) 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -598px;
+	background-repeat: no-repeat;
 	text-decoration : none;
-	padding-left : 21px;
+	padding-left : 30px;
 }
 
 #toolbar a.hide {
-	background: transparent url(../../images/close.gif) 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position: -3px -814px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 26px;
 }
 
 #toolbar a.hold,
 #selections-toolbar a.hold {
-	background: transparent url(../../images/place-hold-small.png) 5px 50% no-repeat;
+	background-image: url("../../images/sprite.png");
+	background-position : -5px -453px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 23px;
 }
 
 #selections-toolbar a.hold.disabled {
-	background: transparent url(../../images/place-hold-small-disabled.png) 5px 50% no-repeat;
-}
-
-#toolbar a.newshelf {
-	background : transparent url("../../images/shelf-new.gif") 5px 50% no-repeat;
-	padding-left : 23px;
-	text-decoration : none;
+	background-image: url("../../images/sprite.png");
+	background-position : -5px -621px;
+	background-repeat: no-repeat;
 }
 
-#selections-toolbar a.removeitems {
-	background: transparent url(../../images/shelf-delete.gif) 11px 50% no-repeat;
+#selections-toolbar a.removeitems,
+#selections-toolbar a.deleteshelf {
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -690px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 25px;
 }
 
 
-#selections-toolbar a.removeitems.disabled {
-	background: transparent url(../../images/shelf-delete-disabled.gif) 11px 50% no-repeat;
+#selections-toolbar a.removeitems.disabled,
+#selections-toolbar a.deleteshelf.disabled {
+	background-image: url("../../images/sprite.png");
+	background-position : 2px -712px;
+	background-repeat: no-repeat;
 }
 
 #toolbar a.send,
 a.send {
-	background: transparent url(../../images/send.png) 2px 50% no-repeat;
+	background-image: url("../../images/sprite.png");
+	background-position : 2px -386px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 28px;
 }
 
 #toolbar a.new {
-	background : transparent url("../../images/new.gif") 5px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : -4px -922px;
+	background-repeat : no-repeat;
 	padding-left : 23px;
 	text-decoration : none;
 }
 
-#toolbar input.download {
-	background : transparent url("../../images/download.png") 7px 50% no-repeat;
-	border : 0;
-	color : #006699;
-	cursor : pointer;
-	padding-left : 24px;
-	text-decoration : none;
-}
-
 #toolbar input.editshelf,
 input.editshelf {
-	background : transparent url("../../images/shelf-edit.gif") 10px 50% no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -732px;
+	background-repeat: no-repeat;
 	border : 0;
 	color : #006699;
 	cursor : pointer;
@@ -627,37 +654,39 @@ input.editshelf {
 }
 
 #toolbar input.newshelf,
+#toolbar a.newshelf,
 a.newshelf {
-	background : transparent url("../../images/shelf-new.gif") center left no-repeat;
+	background-image: url("../../images/sprite.png"); /* add to list icon */
+	background-position: -4px -864px;
+	background-repeat: no-repeat;
 	border : 0;
 	color : #006699;
 	cursor : pointer;
 	font-size : 100%;
 	margin: 0 0.5em;
-	padding-left : 15px;
+	padding-left : 23px;
 	text-decoration : none;
 }
 
 a.newshelf.disabled {
-	background : transparent url("../../images/shelf-new-disabled.gif") center left no-repeat;
+	background-image: url("../../images/sprite.png"); /* add to list icon */
+	background-position: -4px -791px;
+	background-repeat: no-repeat;
 }
 
 #toolbar input.deleteshelf,
-input.deleteshelf,
-a.deleteshelf {
-	background : transparent url("../../images/shelf-delete.gif") 7px 50% no-repeat;
+input.deleteshelf {
+	background-image : url("../../images/sprite.png");
+	background-position : 2px -685px;
+	background-repeat: no-repeat;
 	border : 0;
 	color : #006699;
 	cursor : pointer;
 	font-size : 100%;
-	padding-left : 20px;
+	padding-left : 25px;
 	text-decoration : none;
 }
 
-a.deleteshelf.disabled {
-	background : transparent url("../../images/shelf-delete-disabled.gif") 7px 50% no-repeat;
-}
-
 #toolbar input.deleteshelf:hover {
 	color: #990033;
 }
@@ -676,15 +705,19 @@ input.deleteshelf:active {
 
 #tagsel_span input.submit,
 #tagsel_tag {
-	background-image: url(../../images/tags-small.png);
-	background-position : 7px center;
+	background-image : url("../../images/sprite.png"); /* tag icon */
+	background-position : 7px -640px;
 	background-repeat : no-repeat;
 	padding-left : 25px;
 	text-decoration: none;
 }
 
+#tagsel_tag {
+	background-position : -1px -643px;
+}
+
 #tagsel_tag.disabled {
-	background-image: url(../../images/tags-small-disabled.png);
+	background-position : -1px -667px;
 }
 
 #tagslist li { display : inline; }
@@ -699,17 +732,17 @@ input.deleteshelf:active {
 }
 
 .addto a.addtocart {
-	background-image:url(../../images/cart2.gif);
-	background-position : 9px -3px;
-	background-repeat : no-repeat;
+  background-image: url("../../images/sprite.png"); /* cart icon */
+  background-position: -5px -265px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 33px;
 }
 
 #placehold input.submit {
-	background-image:url(../../images/placereserve.gif);
-	background-position : 9px center;
-	background-repeat : no-repeat;
+	background-image: url("../../images/sprite.png"); /* place hold icon */
+	background-position: -1px -140px;
+	background-repeat: no-repeat;
 	text-decoration : none;
 	padding-left : 23px;
 }
@@ -725,7 +758,9 @@ input.deleteshelf:active {
 	cursor : pointer;
 }
 .searchresults a.highlight_toggle {
-	background : transparent url(../../images/highlight.gif) -4px center no-repeat;
+	background-image: url("../../images/sprite.png"); /* place hold icon */
+	background-position: -11px -841px;
+	background-repeat: no-repeat;
 	display: none;
 	font-weight: normal;
 	padding : 0 10px 0 21px;
@@ -1403,18 +1438,24 @@ padding-left : .4em;
 }
 
 .actions a.hold {
-	background : url("../../images/placehold-small.gif") center left no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position : -10px -542px;
+	background-repeat: no-repeat;
 	padding-left : 16px;
 }
 
 .actions a.addtocart {
-	background : url("../../images/cart-small.gif") center left no-repeat;
-	padding-left : 13px;
+	background-image : url("../../images/sprite.png");
+	background-position : -10px -572px;
+	background-repeat: no-repeat;
+	padding-left : 15px;
 	display : none;
 }
 
 .actions a.addtoshelf {
-	background : url("../../images/addtolist-small.gif") center left no-repeat;
+	background-image : url("../../images/sprite.png");
+	background-position: -10px -27px;
+	background-repeat: no-repeat;
 	padding-left : 13px;
 }
 
@@ -1573,8 +1614,8 @@ ul#i18nMenu li ul li {
 
 
 ul#i18nMenu li.more a {
-	background-image:url(../../images/more-up-arrow.gif);
-	background-position:right center;
+	background-image : url("../../images/sprite.png");
+	background-position : 37px -940px;
 	background-repeat:no-repeat;
 	padding-right: 1.3em;
 }
@@ -1729,16 +1770,6 @@ div#menu li.active a:hover {
 	padding : 2px;
 }
 
-#further {
-	text-align : left;
-	font-size : 95%;
-	padding : 3px 3px .5em 1em;
-}
-
-#further ul li {
-	list-style-image : url("../../images/further-bullet.gif");
-}
-
 #amazonreviews h4 {
 	font-size : 90%;
 	margin : 0;
@@ -1787,14 +1818,14 @@ span.starMT {
 
 #listsmenulink {
 	background : #9FBFFF;
-	background: url("../../images/list.gif"),-moz-linear-gradient(top, #d7e5ff 0%, #b1cbff 50%, #9fbfff 100%); /* FF3.6+ */
-	background: url("../../images/list.gif"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#d7e5ff), color-stop(50%,#b1cbff), color-stop(100%,#9fbfff)); /* Chrome,Safari4+ */
-	background: url("../../images/list.gif"),-webkit-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* Chrome10+,Safari5.1+ */
-	background: url("../../images/list.gif"),-o-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* Opera 11.10+ */
-	background: url("../../images/list.gif"),-ms-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* IE10+ */
-	background: url("../../images/list.gif"),linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* W3C */
+	background: url("../../images/sprite.png"),-moz-linear-gradient(top, #d7e5ff 0%, #b1cbff 50%, #9fbfff 100%); /* FF3.6+ */
+	background: url("../../images/sprite.png"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#d7e5ff), color-stop(50%,#b1cbff), color-stop(100%,#9fbfff)); /* Chrome,Safari4+ */
+	background: url("../../images/sprite.png"),-webkit-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* Chrome10+,Safari5.1+ */
+	background: url("../../images/sprite.png"),-o-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* Opera 11.10+ */
+	background: url("../../images/sprite.png"),-ms-linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* IE10+ */
+	background: url("../../images/sprite.png"),linear-gradient(top, #d7e5ff 0%,#b1cbff 50%,#9fbfff 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d7e5ff', endColorstr='#9fbfff',GradientType=0 ); /* IE6-9 */
-	background-position: 85% 46%;
+	background-position: 40px -287px,top left;
 	background-repeat: no-repeat;
 	border: 1px solid #629DCF;
 	color : #006699;
@@ -1803,27 +1834,27 @@ span.starMT {
 
 #listsmenulink:hover {
 	background-color : #b8d0e6;
-	background: url("../../images/list.gif"),-moz-linear-gradient(top, #e2ecf5 0%, #c3d8ea 50%, #b8d0e6 100%); /* FF3.6+ */
-	background: url("../../images/list.gif"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#e2ecf5), color-stop(50%,#c3d8ea), color-stop(100%,#b8d0e6)); /* Chrome,Safari4+ */
-	background: url("../../images/list.gif"),-webkit-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* Chrome10+,Safari5.1+ */
-	background: url("../../images/list.gif"),-o-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* Opera 11.10+ */
-	background: url("../../images/list.gif"),-ms-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* IE10+ */
-	background: url("../../images/list.gif"),linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* W3C */
+	background: url("../../images/sprite.png"),-moz-linear-gradient(top, #e2ecf5 0%, #c3d8ea 50%, #b8d0e6 100%); /* FF3.6+ */
+	background: url("../../images/sprite.png"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#e2ecf5), color-stop(50%,#c3d8ea), color-stop(100%,#b8d0e6)); /* Chrome,Safari4+ */
+	background: url("../../images/sprite.png"),-webkit-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* Chrome10+,Safari5.1+ */
+	background: url("../../images/sprite.png"),-o-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* Opera 11.10+ */
+	background: url("../../images/sprite.png"),-ms-linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* IE10+ */
+	background: url("../../images/sprite.png"),linear-gradient(top, #e2ecf5 0%,#c3d8ea 50%,#b8d0e6 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e2ecf5', endColorstr='#b8d0e6',GradientType=0 ); /* IE6-9 */
 	background-repeat: no-repeat;
-	background-position: 85% 46%;
+	background-position: 40px -287px,top left;
 }
 
 #cartmenulink {
 	background: #98CB58; /* Old browsers */
-	background: url("../../images/cart.gif"),-moz-linear-gradient(top, #d5eaba 0%, #b7db8a 50%, #98cb59 100%); /* FF3.6+ */
-	background: url("../../images/cart.gif"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#d5eaba), color-stop(50%,#b7db8a), color-stop(100%,#98cb59)); /* Chrome,Safari4+ */
-	background: url("../../images/cart.gif"),-webkit-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* Chrome10+,Safari5.1+ */
-	background: url("../../images/cart.gif"),-o-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* Opera 11.10+ */
-	background: url("../../images/cart.gif"),-ms-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* IE10+ */
-	background: url("../../images/cart.gif"),linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* W3C */
+	background: url("../../images/sprite.png"),-moz-linear-gradient(top, #d5eaba 0%, #b7db8a 50%, #98cb59 100%); /* FF3.6+ */
+	background: url("../../images/sprite.png"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#d5eaba), color-stop(50%,#b7db8a), color-stop(100%,#98cb59)); /* Chrome,Safari4+ */
+	background: url("../../images/sprite.png"),-webkit-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* Chrome10+,Safari5.1+ */
+	background: url("../../images/sprite.png"),-o-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* Opera 11.10+ */
+	background: url("../../images/sprite.png"),-ms-linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* IE10+ */
+	background: url("../../images/sprite.png"),linear-gradient(top, #d5eaba 0%,#b7db8a 50%,#98cb59 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d5eaba', endColorstr='#98cb59',GradientType=0 ); /* IE6-9 */
-	background-position: 15% 46%;
+	background-position: -5px -256px, left top;
 	background-repeat: no-repeat;
 	border: 1px solid #5EA28C;
 	color : #336600;
@@ -1832,15 +1863,15 @@ span.starMT {
 
 #cartmenulink:hover {
 	background-color : #BFDE96;
-	background: url("../../images/cart.gif"),-moz-linear-gradient(top, #e5f1d4 0%, #cbe4aa 50%, #c0de98 100%); /* FF3.6+ */
-	background: url("../../images/cart.gif"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#e5f1d4), color-stop(50%,#cbe4aa), color-stop(100%,#c0de98)); /* Chrome,Safari4+ */
-	background: url("../../images/cart.gif"),-webkit-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* Chrome10+,Safari5.1+ */
-	background: url("../../images/cart.gif"),-o-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* Opera 11.10+ */
-	background: url("../../images/cart.gif"),-ms-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* IE10+ */
-	background: url("../../images/cart.gif"),linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* W3C */
+	background: url("../../images/sprite.png"),-moz-linear-gradient(top, #e5f1d4 0%, #cbe4aa 50%, #c0de98 100%); /* FF3.6+ */
+	background: url("../../images/sprite.png"),-webkit-gradient(linear, left top, left bottom, color-stop(0%,#e5f1d4), color-stop(50%,#cbe4aa), color-stop(100%,#c0de98)); /* Chrome,Safari4+ */
+	background: url("../../images/sprite.png"),-webkit-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* Chrome10+,Safari5.1+ */
+	background: url("../../images/sprite.png"),-o-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* Opera 11.10+ */
+	background: url("../../images/sprite.png"),-ms-linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* IE10+ */
+	background: url("../../images/sprite.png"),linear-gradient(top, #e5f1d4 0%,#cbe4aa 50%,#c0de98 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5f1d4', endColorstr='#c0de98',GradientType=0 ); /* IE6-9 */
 	background-repeat: no-repeat;
-	background-position: 15% 46%;
+	background-position: -5px -256px, left top;
 }
 
 /* IE 6 & 7  don't do multiple backgrounds, so remove extra padding */
@@ -1937,28 +1968,33 @@ span.view {
 }
 
 a#MARCview, span#MARCview, a#MARCviewPop, a#ISBDview, span#ISBDview, a#Normalview, a#Briefhistory, span#Normalview, a#Fullhistory, span#Fullhistory, span#Briefhistory {
-	background-position : 5px 3px;
 	background-repeat : no-repeat;
 	font-size : 87%;
 	font-weight : normal;
 	padding : .2em .5em;
+	padding-left : 21px;
 	text-decoration: none;
 }
 
 a#MARCview, span#MARCview {
-	background-image : url(../../images/marc.gif);
-	padding-left : 17px;
+	background-image: url("../../images/sprite.png");
+	background-position: -5px -26px;
+	background-repeat: no-repeat;
 }
 a#MARCviewPop, span#MARCviewPop {
-    background-image : url(../../images/marc.gif);
-    padding-left : 17px;
+	background-image: url("../../images/sprite.png");
+	background-position: -5px -26px;
+	background-repeat: no-repeat;
 }
 a#ISBDview, span#ISBDview {
-	background-image : url(../../images/isbd.gif);
-	padding-left : 20px;
+	background-image: url("../../images/sprite.png");
+	background-position: -5px -55px;
+	background-repeat: no-repeat;
 }
 a#Normalview, span#Normalview {
-	background-image : url(../../images/normal.gif);
+	background-image: url("../../images/sprite.png");
+	background-position: -7px 3px;
+	background-repeat: no-repeat;
 	padding-left : 15px;
 }
 
@@ -2153,7 +2189,6 @@ div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px;
 }
 
 #renewcontrols a {
-	background-position : 3px center;
 	background-repeat : no-repeat;
 	text-decoration:none;
 	padding : .1em .4em;
@@ -2161,11 +2196,15 @@ div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px;
 }
 
 #renewselected_link {
-	background-image : url(../../images/check.png);
+	background-image : url("../../images/sprite.png");
+	background-position : -5px -988px;
+	background-repeat: no-repeat;
 }
 
 #renewall_link {
-	background-image : url(../../images/checks.png);
+	background-image : url("../../images/sprite.png");
+	background-position : -8px -964px;
+	background-repeat: no-repeat;
 }
 
 div.koha_url {
@@ -2277,7 +2316,7 @@ a.koha_url {
 }
 
 .nav_results .l_Results a {
-    background:#E1E1E1 url("../../images/ico_b_results.gif") 14px 13px no-repeat;
+    background:#E1E1E1 url("../../images/sprite.png") no-repeat 0px -504px;
     color:#006699;
     display:block;
     padding:8px 28px;
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
index 66f372f..71ba2e7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
@@ -148,7 +148,7 @@ $.tablesorter.addParser({
             </form>[% END %]
         <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
             <input type="hidden" name="op" value="delete_confirm" />
-            <div><span class="checkall"><a href="#" id="CheckAll">Select all</a></span>
+            <div id="toolbar"><span class="checkall"><a href="#" id="CheckAll">Select all</a></span>
         <span class="clearall"><a href="#" id="CheckNone">Clear all</a></span> | [% IF ( loggedinusername ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% ELSE %][% IF ( AnonSuggestions ) %]<a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>[% END %][% END %]
 </div>
 			<table id="suggestt" class="checkboxed">
diff --git a/koha-tmpl/opac-tmpl/prog/images/sprite.png b/koha-tmpl/opac-tmpl/prog/images/sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..797c0f5f920cda8a033752889ce78dd46adae2fa
GIT binary patch
literal 7511
zcmd^Ed010d-o7Cbq9BHW(x50w1Vjo50)kd+Kv9q_EV3_2SZq|lA}WhY0%2ba0YqFF
zKu~nVS_K!{(SW#1MMP~?te~O-$|@j`<olgqozIT*%<~BTHTi>_d+xb6zx93Jb4X)2
zt)4z@<}?h$rrX)BbcOFZ7>0jI#KTC^aDFO$5!P8bT4C6aS1qQbzk+LxC>yURw}{ZF
zZLG);%qlp79YV1SW33Bu4Pgbx{BSK~DZBw=IJn#N3`x2MB%K2iJ+Jiht&%l6PFQcL
za7{k<jbFAiui7*HpUcDdzvvUs^GL3)uI~3ys;a8GZE4iu@|ETKB8v at 0y~9!lgW=%d
zKxM>xcz7&e=dFsVWanM^ZTURktl9;EIp*K*TOL`qbKe=0;CzFCUGCe<z6~#-xh9x}
zAC*d_T8`T-GOD%R`Gtj{SZE>5g*P}N2 at N&XaZl3oN*fhR-;PL3LklU+J57QMT3(O6
z>=Qrj5w~@Z8ME^Z0|e(Ew#{|ry&05<#bWNEhmnzyBO at a^Ym*EE1>3i8ziDdPF(B^f
zmn;k^sBV#N+qP|CaKYo(Vw0f!!NI}!_;~5f&@r*pI4IwQop0d3%g}$<n?doYSn{H?
zNynZ4s$cxav%0>%zQ-LyPrJpVqoWVH#Idol3s`wC`^9rzco7j1J%eJZ^Uj;?l7WGN
z;LN(r%*<B<Vv~@9)^72J4I6rUdpB;}I5afW-{1fE^;l<T=eu|B^nJ6w at y$w3PHwfG
z)7CAHi;L?Xlo$r)yy}<q4NLs|{02v)gQF5o=JB?kvCQ)G+HQRRQXf8_FYUsNm_j3F
z?#P%#P;WijE4ukYGT$d7=hWRzn>Oirro!iT>i~<z^3ARt8kKS~j?ec_^UW6Z4@;i*
zjOnaRHeu&&-n=<GJG-Z+r=z2T>Ky-jm)O8ByScgf&6_t&CNm}`M*1u?ARr*P;Cgy`
z`rCIBUteFJ>{@$!`<H!V^E^`$5)zC8g>60J);D73gesv>sOOzN-z$yg!qr`yG~XxF
zh?&zpB-ycJhnJVv(1>(sL^3ogadUH9z!W+sR7XcgxA#c`b1sdJNhK1Ao at a{g+T^F*
zWAnUHM#PdONsaXI{pGbSXK%H`=Ruc*%HZC;d-v_&ZJJ9$R#uiVJ8xmo?$&O}H@=zr
zz8S`>+^DFil#~<$zbuN=4vN!Gic@^wJ4yGT*pQjSX0uyfi*?)++k3^G17a<w?fO3O
zR3^=tYsAVOd?%4gZ$bsG4huboVK^+x)yWMm|Cc|Q+mM0|hLLaEt+aBFe!w2y^)*Hy
z;S-Kb!Ra+&IKFn+ at u_m{<HJg=jwi)hmAh!uNp#z$aC!N#*Yd00ui9^ZahRNFl5R%F
zsCM`3&Evj`_B?2dCy<0y2daNQ5a+5oe#_olp5X3vsAT+BQqrznN%2&4%jC%nb1p`s
zz`F@$IJs0V%&7?Ei4-|7V<mkig-b-w;5eVPh!tv;=RhRU$=)P$RXGA_y*eS(TH*av
zBc?MxcXQ#QMc*awpNf+s&Q**(7;MeOtQ!*Uy?IknNTP5Vr=Ao{v$y~AAuZWMJO+M}
zO#FniKI&sU4 at EFn7`4a}A37e-s8tm?IW867kwx{G9MNv1^P1b?_M)ZBh6Wy;`^ne@
zOctJ}tta40mF~0HD1+kMoV1*@si_(of#Z+(JePAHI-{sRzF6W$AjEZM6y5D!rl<<e
zXumo^rzp88yLl)p^3!kx(ie46o#Ri$PC>x;g$v54{HY|m*YuPd5(OfqYwN{eDa!a^
zu;DY){)w1=^d at 55nxs>hTq-VNiDU+et`xnwHlB;s<t^f4L<Oig%jpy at xu;zug%T8n
zL*+e*<YH{mKKz$9>_3(Np(=SLt|erZTG=~eny3#(D}3<!&@{i5n=@;mZ*XS}Z0At8
z#^vS`t2}NwL^dP5;x!Z6hAny(eq!nSu9DYemEu|<ygd4pFIT`H1^Ykw^wA=s^G^!b
z+rTaFO;!qZX0=l=I>u64wwH8(^gCpsp6l5U8KM=>g6zBmbl9(>TDDP+NRjWlH1q8D
z_-P2doEnh3vNhxr1y_v!yda*{gs1AslL;*UwZbyYN?E<q<>1BqLNjv}#~COQ0pT2L
zl$wJ*n8hVC>bX%VIK>v}#fS`x;u&CXoxyAguivsc7EL!jma|K^u3HR<*eXm`H$q9D
z`REyb%_s4&HUC~C1_8+=CD|uJ^h}=UH5c2=0;g at 2Cjm+So5P>TGNarg%sLm6<<8O2
z&~OL$tS!c9`d?GHjpZ*41i8M(tHWzgFMimLodeg58p at AMUExPJqGKiYr>@kCNZ$$+
zN%WUZqn5W0JlvL at o4Yx1>Adl&W4*nM`e|)|kTq3if0L7gz!A+C>2Z4i8CUqYs1z!Y
z=zCbl4<*;*h!iCbONByGS67kmm)*9)6++?2sZ9GKjPr>&39B at S#dhzLX1z$$Z4k;r
zwodIZ>ng%L8P|z|CLv9%f at J4=&<s4g)zAvYAqZH at a^`ISu;boAe<qb)KX#T;e!CzQ
zx#Rw7V?%xgk`ej`SbfB`K;nY(7WD;-{JXZ2y=7O0vuDjdSh^<%b;G4i%5(lPTT?F?
zLUc09^Zwyq5BmFGm8p=*yghsLrqr*om0h*mHkm>Ew!LA65Q<8hbJu&ux`w at 5UYyn!
zf>%_#&G=eF5>Fc`i8|Er6VMGGJNB7xB0jA1Evo}65qOG2Rw#&1sn|z=yLLV;+7}7L
zQd0-bCy1zj>ABb3{C&oeBM;TxEY1Q-QSD6Qmy#|iC1mxt%9y;NHYfa2|K;n~)A25+
zffa>O7qT1=XE`n-bth-YuA|Qyk_~>UPC{2aCKUaosHe|}LSxx&dw at FY{GE#Pmpuj;
zmm}JYNb2+dc0os%R=p2hK47tK)a~A_zVddT7O1PTpntNrM6oYip{+!B_ugN^$$4wO
zA%IVWNZ4xygEZSDh>`FTH&KzskvvyaxHT?tW^2^S at wevW<QU|POPa^abQB0Y=5?1n
zvM65g%Ri~FGlkz>yKM at z#K}8y7kMN?QC$-B0X+|9K4PFrYz<t*Ad(e&O(%9N?rx<)
zj`#8$jcoP>uUx%OWCLE7-w7JIFB&*;g!gdm at MTT#Yxkn;g<FHSX0A8;4vUx#wnaW=
zu8v)DVh6K&Z(`8f^%ck?3+0Y5ZWw-_)4P_wb*u(FipS2A!D(S<!=j at tg*yO0C|+N#
z$@u{(r3l9GN6Qv>JiY_8%%>T$j{lfe^G*$lylloRypE$ojjX4=w;7!1eH^yFM%9i8
zNmlxUGc7MFYJWNjYSX<yi$hrB<832C<<St7BhsA7GR6H0$T7ft^+%9tt@`=Sc0`?g
zAF}Y76sa%@W778qpQvtO)f_d7JwoahgvAyB(~SsDqW*nq^7ksAu;*x%GMO?Jsv*5f
z`D|8(0Tfk5lWK%Rb786h*mbpOiQy8hDD_gZtl9zsD10<++q5L(*w@~^2Wyl;#x@?P
zOl<oKY1jz(^M&?VA8hAqSMqEC;TgM4*+{4CzMCyWa at ut7rRm7H53%H*CaF3iQD>ch
zdDCJ at _VI8V6%a5EEqWktCzNnw3$@}NK-y)MoYGbBYU(=tZ*vs2W00t_t<ZY_x6I3F
zix$&y at UwPTk%9l(X{J}{s?qp=?IQk`pG>Wxk|!i1k4F8#;rw7i8i&OiwY at Xe$k2iI
zx{W}f*G(~!Lpe1%PRF$U{GLD*_%#1^*LF`2kM_0~3aX%5v^f|09{FA9>+ at Sq;-<@>
z|6(7U%sjtg at 9O3@%e4gYg+a at c)>d4d?chYoz<5j^5|;c2bm<m?X3#KD8Bys1dTXl%
zQWqa?r;2)z&?N6fo8pTR6HK3sZubtvnt at _u)AJo1ZSsNd)i}(;_Gi5DLx?$7b}8WP
zpD}}xsJu5l?@|8#{f{!V2>`muc%8U^96c&{23fxQoPMp)%F4>LRSx3PZc_a0=A+_<
zP2YjURJhUp=+W5Nc1w_>#@5rl`;Zi;kt+UwDSReBQ0 at BrFA@n*%i0_&m1?|79)5gd
z^lW1BOl2@|>y7KzOMjQOZvusj_HedMMMXu-OeMsBGgnbSysPve?3w5>h;7r2If<zu
zdNT3k at 9R5yVQ`BfI&>*fJ4fNJw}gTE(2H9K$BnTMH1zLC7`LbJjwvsCiR|dceqF-d
zVwseRM<@sZp9qNX=VvvgLpGH-hLs%Kr6An>xakI?AOsqnc22ooYE}zrd;82Yao-(=
zb093dnH%Whga*yIfls at -{xX>fcV){mFBXgsKCG8xL9i$9NQvA;&0QgghD;Wv#p;Ib
z$wWHy<&}9uNe)neB>MM-S8GdtRQO#V;v+~y3PTs|G71r91k*mA<W1_<gWR-X%{@vl
z6pvl(&%;}P=oN3 at rYZn_0;Q>$m*#OyC7O$jwQXV-T=KhA at 6omT^fbiRx6ano=>A+&
zWVIW at tIfGaxyHX&X(dE($k*OMqn7-#l-f!-Dbv;w{ts(Tf0ZggdfhHINQZQ+;*pGl
zY at 1HqZ;&tD@^?i0sq|vllYM55u>MX=xD|thnpszwkz at VF=}@1xE7}Xq1iG8SyR~QJ
z$#WgG0e<$j3RGiA$jtCF$@16D)ZX*-%dLsor>xNCz^q_}^6HhSYEPPVEDmI1Pzu%v
zzW6`~6YeX^GL{Jxmy%_$IaLXf3Uzcw9b{Wx^W-2&7j3--Nr?OwaRdhLK!zt~Paz6r
zGrLV4%(+72UEoBzS=X at Z*)BjGwuqLIHyug_XQRGWnTTp<&m^?kN+wPb_{~V4o&(CN
zndYhL4+lhyGINtEcze28+tt-%z$k;~i&2VMwi`-OywnTkA^~*hg3B-9;%~d^6VWMM
z++fNLn9Z)k>w?r!idH-%6J?kGN|XPh(a$IXx-vSFS`1pUF|tB_FC1BwJZD59z!9tf
z8w?doJ0Z17oMuhbKaqNn$*U!ZYf_--cz>Ooh;5kyL~<$%;irwQfdlpC1{cR=F;-s%
ze?>$MFf3D`fyZ^Ap$eG_te2;<@LLLfHX6#!4F;o_d?hG1g8n3w+XoOUv3<e%b5m=*
z``67|R~0}&&{nUWOUs}_X2zFZ`TVprmQ~+I(6QEMmOoT3S+FG`#Km3Klq=Pdup=`J
zE*oQzqSvcT;mg?XcorKn#TxdVbtw|yTuEIG9o$a%@K`DOX+LZMOqgZzYH%cEQrvN8
z6*^1G<7ZM4T`=w}US$NE3Hkj;NI;yaxIp<asTM_q32%g$d at Bfj4gVR%>};G?9=B#D
F{2w4>zwZD5

literal 0
HcmV?d00001

-- 
1.7.2.5


From adrien.saurat at biblibre.com  Wed Apr 18 17:16:56 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Wed, 18 Apr 2012 17:16:56 +0200
Subject: [Koha-patches] [PATCH] Bug 7979: New design for staff interface
Message-ID: <1334762216-7997-1-git-send-email-adrien.saurat@biblibre.com>

Many modifications, see bugzilla for more informations.
---
 koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css   |  196 +++++++++++++++
 .../intranet-tmpl/prog/en/css/staff-global.css     |  100 +++++---
 .../prog/en/includes/acquisitions-search.inc       |    5 +-
 .../prog/en/includes/authorities-search.inc        |    4 +-
 .../intranet-tmpl/prog/en/includes/cat-search.inc  |    5 +-
 .../prog/en/includes/cataloging-search.inc         |    4 +-
 .../intranet-tmpl/prog/en/includes/circ-search.inc |    6 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |   20 +-
 .../intranet-tmpl/prog/en/includes/home-search.inc |    6 +-
 .../prog/en/includes/patron-search.inc             |    5 +-
 .../prog/en/includes/serials-search.inc            |    5 +-
 .../prog/en/lib/jquery/plugins/ui.tabs.css         |    4 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   18 ++
 .../intranet-tmpl/prog/en/modules/intranet-main.tt |  260 +++++++++++---------
 .../prog/img/background_koha_logo.png              |  Bin 0 -> 8540 bytes
 .../intranet-tmpl/prog/img/header_gradient.png     |  Bin 0 -> 203 bytes
 .../intranet-tmpl/prog/img/icon_acquisitions.png   |  Bin 0 -> 1257 bytes
 .../intranet-tmpl/prog/img/icon_administration.png |  Bin 0 -> 2669 bytes
 .../intranet-tmpl/prog/img/icon_authorities.png    |  Bin 0 -> 1721 bytes
 .../intranet-tmpl/prog/img/icon_cataloging.png     |  Bin 0 -> 1172 bytes
 .../intranet-tmpl/prog/img/icon_circulation.png    |  Bin 0 -> 888 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_koha.png     |  Bin 0 -> 1682 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_lists.png    |  Bin 0 -> 881 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png  |  Bin 0 -> 1951 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_reports.png  |  Bin 0 -> 1774 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_search.png   |  Bin 0 -> 2129 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_serials.png  |  Bin 0 -> 1245 bytes
 koha-tmpl/intranet-tmpl/prog/img/icon_tools.png    |  Bin 0 -> 1529 bytes
 28 files changed, 456 insertions(+), 182 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/background_koha_logo.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/header_gradient.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_administration.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_authorities.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_cataloging.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_circulation.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_koha.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_lists.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_reports.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_search.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_serials.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_tools.png

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
new file mode 100644
index 0000000..b1a1bfc
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
@@ -0,0 +1,196 @@
+/* 
+ * This file contains CSS styles used only on the front page of Koha
+ * 
+ * COLORS
+ * Navbar (light blue)  : #e6f0f2
+ * Links (dark blue)    : #004d99
+ * Links, hover (green) : #85ca11
+ * Module buttons background (very light blue) : #f4f8f9
+ * These colors are used in staff-global.css too
+ * 
+ */
+
+#area-content {
+    /* Contains the news + both columns of links + pending box + userblock box */
+    float: left;
+    background-image:url('/intranet-tmpl/prog/img/background_koha_logo.png');
+    background-repeat:no-repeat;
+    background-position:left top;
+    padding-top: 12px;
+}
+
+
+/* ==== NEWS - Start ==== */
+#area-news {
+    /* Displayed if news are available */
+    width: 300px;
+    float: left;
+    border: 1px solid #EEEEEE;
+    margin: .2em;
+    border-radius: 6px;
+}
+
+#area-news h3 {
+    /* Title section for the news block : transparency to let the koha logo appear */
+    background-color: #EEEEEE;
+    filter:alpha(opacity=50);   /* for IE */
+    -moz-opacity: 0.5;          /* for Firefox before 0.9 */
+	opacity: 0.5;
+    padding : .3em; margin: 0;
+}
+
+.newsitem {
+    /* Block for one News entry */
+    padding: 3px;
+    margin: .3em;
+    border-bottom: 1px solid #EEE;
+    background-color : #ffffff;
+    border-radius: 6px;
+    }
+
+.newsfooter {
+    /* Footer containing the publication date and edition links for an News entry */
+    font-size: 80%; color: #808080;
+} 
+
+#area-nonews {
+    /* Displayed if no news are available, to keep the structure intact */
+    width: 300px;
+    float: left;
+}
+/* ==== NEWS - End ==== */
+
+
+/* ==== MODULE LINKS - Start ==== */
+#area-lists {
+    /* Contains the two links columns */
+    margin-left: 20px;
+    float: left;
+}
+
+#area-list-left {
+    /* Left column for links */
+    width: 352px;
+    float: left;
+}
+#area-list-right {
+    /* Right column for links */
+    margin-left: 20px;
+    float: left;
+    width: 352px;
+}
+
+ul.biglinks-list {
+    /* List containing the module links */
+    padding: 0px;
+}
+
+ul.biglinks-list li {
+    /* Standard attributes for the list elements */
+    list-style-type:none;
+}
+
+ul.biglinks-list li a.icon_general {
+    /* Class used for each module link */
+    display: block;
+    float: left;
+    
+    width:295px;
+    height: 46px;
+    margin-bottom: 14px;
+    padding-left:53px;
+    padding-top:5px;
+    
+    border: solid 2px #e6f0f2;
+    border-radius: 6px;
+    
+    text-decoration: none;
+    font-family: verdana, arial;
+    font-weight: bold;
+    font-size: large;
+    color: #000000;
+    
+    background-color:#f4f8f9;
+    background-repeat:no-repeat;
+}
+
+ul.biglinks-list li a:hover.icon_general {
+    /* Class used for each module link hover state */
+    background-position:0 -46px;
+    color: #85ca11;
+    border-color: #85ca11;
+}
+
+/* CSS Sprites
+ * Each image contains the normal and the hover state of the icon
+ * The hover part starts at 46px below the top:
+ * 
+ *  46px
+ * -------
+ * |     |
+ * |  N  | 46px \
+ * |     |       |
+ * -------        > 92px
+ * |     |       |
+ * |  H  | 46px /
+ * |     |
+ * -------
+ * 
+ */
+
+/* Classes used for each individual module link */
+ul.biglinks-list li a.icon_circulation {background-image:url('/intranet-tmpl/prog/img/icon_circulation.png')}
+ul.biglinks-list li a.icon_patrons {background-image:url('/intranet-tmpl/prog/img/icon_patrons.png')}
+ul.biglinks-list li a.icon_search {background-image:url('/intranet-tmpl/prog/img/icon_search.png')}
+ul.biglinks-list li a.icon_lists {background-image:url('/intranet-tmpl/prog/img/icon_lists.png')}
+ul.biglinks-list li a.icon_cataloging {background-image:url('/intranet-tmpl/prog/img/icon_cataloging.png')}
+ul.biglinks-list li a.icon_authorities {background-image:url('/intranet-tmpl/prog/img/icon_authorities.png')}
+
+ul.biglinks-list li a.icon_serials {background-image:url('/intranet-tmpl/prog/img/icon_serials.png')}
+ul.biglinks-list li a.icon_acquisitions {background-image:url('/intranet-tmpl/prog/img/icon_acquisitions.png')}
+ul.biglinks-list li a.icon_reports {background-image:url('/intranet-tmpl/prog/img/icon_reports.png')}
+ul.biglinks-list li a.icon_administration {background-image:url('/intranet-tmpl/prog/img/icon_administration.png')}
+ul.biglinks-list li a.icon_tools {background-image:url('/intranet-tmpl/prog/img/icon_tools.png')}
+ul.biglinks-list li a.icon_koha {background-image:url('/intranet-tmpl/prog/img/icon_koha.png')}
+/* ==== MODULE LINKS - End ==== */
+
+
+/* ==== PENDING - Start ==== */
+#area-pending {
+    /* Block containing links to pending tags, comments and suggestions */
+    width: 100%;
+    border: solid 1px #e6f0f2;
+    border-radius: 6px;
+    clear: left;
+}
+
+.pending-info {
+    /* For the div containing a "pending" link (useful to preserve width of area-pending box width) */
+    margin-top: 2px;
+    margin-bottom: 2px;
+    margin-left: 8px;
+}
+
+.pending-number-link {
+    /* Style for the "pending" links : the number of pending items appear bigger */
+    font-weight: bold;
+    font-size: 1.1em;
+}
+/* ==== PENDING - End ==== */
+
+
+/* ==== USERBLOCK - Start ==== */
+#area-userblock {
+    /* Appears if the "IntranetmainUserblock" system preference is defined */
+    margin-top: 10px;
+    width: 100%;
+    border: solid 1px #e6f0f2;
+    border-radius: 6px;
+    clear: left;
+}
+
+.user-info {
+    /* For the div containing the information (useful to preserve width of area-userblock box width) */
+    margin: 8px;
+}
+/* ==== USERBLOCK - End ==== */
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 ef01648..c867f77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1,8 +1,25 @@
 @import url("../lib/yui/reset-fonts-grids.css");
 @import url("../lib/yui/skin.css");
 
-a, a:link, a:visited, a:active {
-	color : #0000CC;
+input:focus{
+    border-color:#85ca11;
+    border-style:solid;
+    border-radius: 4px;
+}
+
+li.active a {
+    /* Color of active vertical tab on page like circulation.pl */
+    color:#000000;
+}
+
+a, a:link, a:visited {
+	color : #004d99;
+    text-decoration: none;
+}
+
+a:hover, a:active {
+    color : #85ca11;
+    text-decoration: none;
 }
 
 .yui-button,.yui-button a:link,.yui-button a:visited {
@@ -13,9 +30,6 @@ a.yuimenuitemlabel {
         color: #000000;
 }
 
-a:hover {
-	color : #669ACC;
-}
 
 a.overdue,
 .overdue,
@@ -164,9 +178,19 @@ ol li {
 }
 
 #header {
-	background-color : #F3F3F3;
-	border-bottom : 1px solid #E8E8E8;
-	line-height : 2em;
+    background-color : #e6f0f2;
+    line-height : 2em;
+}
+
+#header a.toplinks {
+    #color: #ffffff;
+    font-weight: bold;
+}
+
+.gradient {
+    background-image:url('/intranet-tmpl/prog/img/header_gradient.png');
+    display: inline-block;
+    width:100%;
 }
 
 .clearfix:after {
@@ -177,7 +201,9 @@ ol li {
     visibility: hidden;
 }
 
-.clearfix {display: inline-block;}
+.clearfix {
+    display: inline-block;
+}
 
 /* Hides from IE-mac \*/
 * html .clearfix {height: 1%;}
@@ -318,25 +344,30 @@ span.problem {
 }
 
 fieldset {
-	border : 2px solid #EEEEEE;
 	margin : 1em 1em 1em 0;
 	padding : 1em;
+    background-color:#f4f8f9;
+    border:2px solid #b9d8d9;
+    border-radius:5px;
 }
 
 legend {
 	font-size : 123.1%;
 	font-weight : bold;
-	margin : 0 0 0 -1em;
-	padding : 0;
+    border:2px solid #b9d8d9;
+    background-color:#ffffff;
+    border-radius:3px;
+    text-align:right;
+    padding: 0.2em 0.5em;
 }
 
 #breadcrumbs {
-	background-color : #F3F3F3;
-	border-bottom : 1px solid #E8E8E8;
-	clear : both;
-	font-size : 90%;
-	padding :.2em .5em .4em 10px;
-	margin : 0;
+    background-color : #f4f8f9;
+    border-bottom : 2px solid #e6f0f2;
+    clear : both;
+    font-size : 90%;
+    padding :.2em .5em .4em 10px;
+    margin : 0;
 }
 
 #header+#breadcrumbs {
@@ -375,7 +406,7 @@ div#header_search ul.link-tabs li.off a {
 
 div#header_search div.residentsearch {
 	border : 0;
-	border-bottom : 1px solid #FF9900;
+	border-bottom : 1px solid #85ca11;
 	padding : 0 0 .2em 0;
 }
 
@@ -458,7 +489,7 @@ div.patroninfo {
 }
 
 div.patroninfo h5 {
-	border-right :  1px solid #000;
+    border-right:1px solid #b9d8d9;
 	margin-bottom : 0;
 	padding-left : -.5em;
 	padding-top : .3em;
@@ -467,7 +498,7 @@ div.patroninfo h5 {
 
 div.patroninfo ul {
 	border : 0;
-	border-right : 1px solid #000;
+    border-right:1px solid #b9d8d9;
 	border-bottom : 0;
 	border-top : 0;
 	padding : 0;
@@ -556,7 +587,7 @@ div.yui-b fieldset.brief fieldset legend {
 
 fieldset.rows {  
 border-width : 1px;
-border-bottom : 1px solid #666;
+border:2px solid #b9d8d9;
 float : left;
 font-size : 90%;
 clear : left;
@@ -666,6 +697,7 @@ fieldset.rows label.yesno {
 fieldset.action, div.action {
 	clear : both;
 	float : none;
+    background-color:#ffffff;
 	border : none;
 	margin : 0;
 	padding : 1em 0 .3em 0;
@@ -740,7 +772,7 @@ fieldset.rows .inputnote {
 }
 
 .ui-tabs-nav a, .ui-tabs-nav a span, .ui-tabs-nav span.a {
-   background : none;
+    background : none;
 	display : block;
 	padding: .2em .5em .25em .5em;
 }
@@ -750,14 +782,15 @@ fieldset.rows .inputnote {
 }
 
 .ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav .ui-tabs-selected span.a {
-	background-color : #FFFFCC;
-	border-top: 1px solid #FFFFCC;
-	border-right: 1px solid #FF9900;
-	border-bottom: 1px solid #FF9900;
-	border-left: 1px solid #FFCC66;
+	border-top: 1px solid #e6f0f2;
+	border-right: 1px solid #85ca11;
+	border-bottom: 1px solid #85ca11;
+	border-left: 1px solid #85ca11;
 	font-weight : bold;
 	text-align : center;
 	text-decoration : none;
+    border-radius: 0px 0px 4px 4px;
+    color : #000000;
 
 }
 
@@ -766,11 +799,11 @@ fieldset.rows .inputnote {
 }
 
 .ui-tabs-nav .ui-tabs-selected a:hover {
-	color : #0000CC;
+	color : #000000;
 }
 
 .ui-tabs-nav li.ui-tabs-selected {
-	background-color : #FFFFCC;
+	/* background-color : #FFFFCC; */
 }
 
 .ui-tabs-nav .ui-tabs-selected a, .ui-tabs-nav a:hover, .ui-tabs-nav a:focus, .ui-tabs-nav a:active, .ui-tabs-nav span.a {
@@ -1299,7 +1332,7 @@ a:hover .term {
 }
 
 div#menu {
-	border-right: 1px solid #000;
+    border-right:1px solid #b9d8d9;
 	margin-right: .5em;
 	padding-top: 1em;
 	padding-bottom: 2em;
@@ -1324,7 +1357,7 @@ div#menu li a {
 	border-top-left-radius: 5px;
 	-moz-border-bottom-left-radius: 5px;
 	border-bottom-left-radius: 5px;
-	border: 1px solid #000;
+    border:1px solid #b9d8d9;
 	font-size: 111%;
 	margin: .5em 0;
 	padding: .4em .3em;
@@ -1871,7 +1904,8 @@ span.permissiondesc {
 	border: 0;
 	padding: 5;
 	font-size: 11pt;
-	color: darkblue;
+    color: #000000;
+    font-style: italic;
 }
 
 .labeledmarc-value {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index 8ee72ec..cc796fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Acquisitions Resident Search Box -->
 <div id="header_search">
 <div id="supplier_search" class="residentsearch">
@@ -27,5 +27,6 @@
             <li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Vendor search</a></li>
             <li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders search</a></li>
 			</ul>	
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Acquisitions Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
index 0814922..9a2f9c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -1,3 +1,4 @@
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
 <!-- Begin Authorities Resident Search Box -->
 <div id="header_search" class="residentsearch">
@@ -97,5 +98,6 @@
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#main_heading">Search main heading</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl#all_headings">Search all headings</a></li>
     </ul>
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Authorities Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 7696eff..13a24fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Catalogue Resident Search Box -->
 [% IF ( CAN_user_circulate ) %][% IF ( CircAutocompl ) %]<script type="text/javascript">
 //<![CDATA[
@@ -93,5 +93,6 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-selected"><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Catalogue Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index 9f93f3d..aa2fccd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -2,6 +2,7 @@
 	$("input[name=q]:eq(0)").focus();
 });</script>
 
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Cataloging Resident Search Box -->
 <div id="header_search">
 <div id="addbooks_search" class="residentsearch">
@@ -16,5 +17,6 @@
             <li><a href="/cgi-bin/koha/catalogue/search.pl#addbooks_search">Cataloging search</a></li>
             [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
 			</ul>	
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Cataloging Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index dc99b90..56b24bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Circulation Resident Search Box -->
 
 <div id="header_search">
@@ -26,6 +26,6 @@
     [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
-</div>
-
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Circulation Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 539c466..4783523 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -3,15 +3,15 @@
     <div id="header" class="clearfix">
         <div id="toplevelnav">
             <ul id="toplevelmenu">
-                [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
-                [% IF ( CAN_user_borrowers ) %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
-                [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
+                [% IF ( CAN_user_circulate ) %]<li><a class="toplinks" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
+                [% IF ( CAN_user_borrowers ) %]<li><a class="toplinks" href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
+                [% IF ( CAN_user_catalogue ) %]<li><a class="toplinks" href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
                 [% IF ( intranetbookbag ) %]
-                    <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
+                    <li><a class="toplinks" href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
                 [% END %]
                 [% IntranetNav %]
                 <li class="more">
-                    <a id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
+                    <a class="toplinks" id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
                     <div id="moremenu">
                         <div class="bd">
                             <ul>
@@ -59,10 +59,10 @@
             </strong>
             [% IF ( IndependantBranches ) %]
                 [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
-                    (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>)
+                    ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
                 [% END %]
             [% ELSE %]
-                (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>)
+                ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
             [% END %]
         |
         [% END %]
@@ -71,13 +71,13 @@
                 [% loggedinusername %]
             </span>
             [% IF ( intranetbookbag ) %]
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log out</a>) |
+            ( <a class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log out</a> ) |
             [% ELSE %]
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log out</a>) |
+            ( <a class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log out</a> ) |
             [% END %]
         [% ELSE %]
             You are not logged in |
         [% END %]
-        <a href="/cgi-bin/koha/help.pl" id="helper" onclick="var link=window.open('','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); link.location='/cgi-bin/koha/help.pl'; return false;">[ ? ]</a>
+        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper" onclick="var link=window.open('','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); link.location='/cgi-bin/koha/help.pl'; return false;">[ ? ]</a>
     </div>
 </div>	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
index bf04636..8ea46f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Main page Resident Search Box -->
 
 <div id="header_search">
@@ -35,6 +35,6 @@
     [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 </ul>
 
-</div>
-
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Main page Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 9f30bfe..8bc7627 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Patrons Resident Search Box -->
 [% IF ( CAN_user_circulate ) %][% IF ( CircAutocompl ) %]<script type="text/javascript">
 //<![CDATA[
@@ -130,7 +130,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <script type="text/javascript">//<![CDATA[
 $(document).ready(function() {
     [% IF ( advsearch ) %]$("#filteraction_on").toggle();
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index b71b0ee..546ab56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -1,4 +1,4 @@
-
+<div class="gradient">
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Serials Resident Search Box -->
 <div id="header_search">
 	<div id="subscription_search" class="residentsearch">
@@ -21,5 +21,6 @@
             [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the catalog</a></li>[% END %]
 			</ul>	
-</div>
+</div><!-- /header_search -->
+</div><!-- /gradient -->
 <!-- End Serials Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/ui.tabs.css b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/ui.tabs.css
index 34bd5fb..8c8cf37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/ui.tabs.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/ui.tabs.css
@@ -68,7 +68,7 @@
 .ui-tabs-panel {
     border: 1px solid #E8E8E8;
 	padding : 1em;
-    background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
+    #background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
 }
 
 /* Additional IE specific bug fixes... */
@@ -77,4 +77,4 @@
 }
 *:first-child+html .ui-tabs-nav  { /* auto clear @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */
     display: inline-block;
-}
\ No newline at end of file
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 34ee031..c6506af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -342,6 +342,24 @@
                   <a rel="license" href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-ShareAlike 2.5 License</a>
                   by the Bridge Consortium of Carleton College and St. Olaf College.</li>
               </ul>
+            
+            <h2>The Noun Project icons</h2>
+                <ul>
+                    <li>All images come from <a href="http://thenounproject.com/">The Noun Project</a> collection</li>
+                    <li>
+                        Circulation ("fair-trade") symbol by Edward Boatman ; Patrons
+                        ("children's library") symbol by Edward Boatman, Saul Tannenbaum,
+                        Stephen Kennedy, Nikki Snow, Brooke Hamilton ; Search ("magnifying
+                        glass") symbol by Philipp Suess ; Lists ("folder") symbol by Jack
+                        Biesek, Gladys Brenner, Margaret Faye, Healther Merrifield, Kate
+                        Keating, Wendy Olmstead, Todd Pierce, Jamie Cowgill, Jim Bolek ;
+                        Cataloging ("price tag") symbol by the Noun Project ; Authorities
+                        ("link") symbol by Matthew Exton ; Serials ("newspaper") symbol by John
+                        Caserta ; Acquisitions ("present") symbol by David Goodger ; Reports
+                        ("pie chart") symbol by Scott Lewis ; Administration ("gears") symbol by
+                        Jeremy Minnick ; Tools ("wrench") symbol by National Park Service
+                    </li>
+                </ul>
 
             <h2>jQuery Star Rating Plugin</h2>
               <p>jQuery Star Rating Plugin v3.14 by <a href="http://www.fyneworks.com/">Fyneworks.com</a> is licensed under the <a target="_blank" href="http://en.wikipedia.org/wiki/MIT_License">MIT License</a> and the <a target="_blank" href="http://creativecommons.org/licenses/GPL/2.0/">GPL License</a>.</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index 9ff683e..a0e7bea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -1,135 +1,153 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha staff client</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<style type="text/css"> #koha-news { border: 1px solid #EEEEEE; margin: .2em;} #koha-news h3 {background-color: #EEEEEE; padding : .3em; margin: 0;} .newsitem {margin: .3em; border-bottom: 1px solid #EEE;} .newsitem:last-child {border-bottom : 0;} .newsfooter {font-size: 80%; color: #CCCCCC;} </style>
+<style type="text/css"> </style>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/mainpage.css" />
 </head>
 <body id="main_intranet-main" class="main">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'home-search.inc' %]
 
-<div id="breadcrumbs">Home</div>
-
-<div id="doc3" class="yui-t3">
-<div id="bd">
-<div id="yui-main"><div class="yui-b"><div class="yui-g">
-
-<h1>Welcome to Koha</h1>
-
-    <div class="yui-u first">
-    <!-- START - CIRCULATION -->
-    [% IF ( CAN_user_circulate ) %]
-    <h3><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></h3>
-    <ul>
-        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
-    </ul>
-    [% END %]
-    <!-- END - CIRCULATION -->
-
-    <!-- START - PATRONS -->
-    [% IF ( CAN_user_borrowers ) %]
-        <h3><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></h3>
-    [% END %]
-    <!-- END - PATRONS -->
-
-    <!-- START - ADVANCED SEARCH -->
-    [% IF ( CAN_user_catalogue ) %]
-        <h3><a href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a></h3>
-    [% END %]
-    <!-- END - ADVANCED SEARCH -->
-    
-    <!-- START - LISTS -->
-    <h3><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></h3>
-    <!-- END - LISTS -->
-
-    <!-- START - CATALOGING -->
-    [% IF ( CAN_user_catalogue || CAN_user_editcatalogue || CAN_user_editauthorities ) %]
-        <h3><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></h3>
-        <ul>
-        [% IF ( CAN_user_catalogue || CAN_user_editcatalogue ) %]
-                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a></li>
-        [% END %]
-        [% IF ( CAN_user_editauthorities ) %]
-                <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-        [% END %]
-        </ul>
-    [% END %]
-    <!-- END - CATALOGING -->
-    </div>
-
-    <div class="yui-u">
-    <!-- START - SERIALS -->
-    [% IF ( CAN_user_serials ) %]
-        <h3><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></h3>
-    [% END %]
-    [% IF ( CAN_user_acquisition ) %]
-        <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3>
-        [% IF ( pendingsuggestions ) %]
-            <ul>
-                <li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions pending approval</a>: <span class="holdcount"><a href="/cgi-bin/koha/suggestion/suggestion.pl">[% pendingsuggestions %]</a></span></li>
-            </ul>
-        [% END %]
-    [% END %]
-    <!-- END - SERIALS -->
-
-    <!-- START - REPORTS -->
-    [% IF ( CAN_user_reports ) %]
-        <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></h3>
-    [% END %]
-    <!-- END - REPORTS -->
-
-    <!-- START - ADMINISTRATION -->
-    [% IF ( CAN_user_parameters ) %]
-        <h3><a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
-        <ul>
-            <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li>
-        </ul>
-        [% END %]
-    [% IF ( CAN_user_tools ) %] 
-        <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3>
-        [% IF ( CAN_user_tools_moderate_comments && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) %]
-            <ul>
-                [% IF ( CAN_user_tools_moderate_comments && pendingcomments ) %]
-                    <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval</a>: <span class="holdcount"><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">[% pendingcomments %]</a></span></li>
-                [% END %]
-                [% IF ( CAN_user_tools_moderate_tags && pendingtags ) %]
-                    <li><a href="/cgi-bin/koha/tags/review.pl">Tags pending approval</a>: <span class="holdcount"><a href="/cgi-bin/koha/tags/review.pl">[% pendingtags %]</a></span></li>
-                [% END %]
-            </ul>
-        [% END %]
-    [% END %]
-    <!-- END - ADMINISTRATION -->
-
-    <!-- START - ABOUT -->
-    <h3><a href="/cgi-bin/koha/about.pl">About Koha</a></h3>
-    <!-- END - ABOUT -->
-    </div>
-    </div>
-        [% IF ( IntranetmainUserblock ) %]
-            <div id="mainuserblock" class="yui-g">
-            [% IntranetmainUserblock %]
-            </div>[% ELSE %]&nbsp;
-        [% END %]
-    </div><!-- /yui-bd -->
-    </div><!-- /yui-main -->
+<div id="breadcrumbs" >Home</div>
+<div style="clear: both"></div>
+<div id="area-content">
     [% IF ( koha_news_count ) %]
-        <div class="yui-b">
-            <div id="koha-news">
-                <h3>News</h3>
-                [% FOREACH koha_new IN koha_news %]
-                    <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
-                        <p>[% koha_new.new %]</p>
-                        <p class="newsfooter"> Posted on [% koha_new.newdate %]
-                            [% IF ( CAN_user_tools ) %]
-                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
-                            [% END %]
-                        </p>
-                    </div>
-                [% END %]
-            </div><!-- /koha-news -->
-        </div>
+        <div id="area-news">
+            <h3><span="news_title">News</span></h3>
+            [% FOREACH koha_new IN koha_news %]
+                <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
+                    <p>[% koha_new.new %]</p>
+                    <p class="newsfooter"> Posted on [% koha_new.newdate %]
+                        [% IF ( CAN_user_tools ) %]
+                            <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
+                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=[% koha_new.idnew %]">Delete</a>
+                             | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a>
+                        [% END %]
+                    </p>
+                </div>
+            [% END %]
+        </div><!-- /koha-news -->
+    [% ELSE %]
+        <div id="area-nonews">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
     [% END %]
+        <div id="area-lists">
+            <div id="area-list-left">
+                <ul class="biglinks-list">
+                    [% IF ( CAN_user_circulate ) %]
+                    <li>
+                        <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
+                        </a>
+                    </li>
+                    [% END %]
+                    
+                    [% IF ( CAN_user_borrowers ) %]
+                    <li>
+                        <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
+                    </li>
+                    [% END %]
+                    
+                    [% IF ( CAN_user_catalogue ) %]
+                    <li>
+                        <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl">Advanced Search</a>
+                    </li>
+                    [% END %]
+                    
+                    <li>
+                        <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a>
+                    </li>
+                    
+                    [% IF ( CAN_user_catalogue || CAN_user_editcatalogue ) %]
+                    <li>
+                        <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
+                    </li>
+                    [% END %]
+                    
+                    [% IF ( CAN_user_editauthorities ) %]
+                    <li>
+                        <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
+                    </li>
+                    [% END %]
+                </ul>
+            </div><!-- /area-list-left --> 
+            
+            <div id="area-list-right">
+                <ul class="biglinks-list">
+                    [% IF ( CAN_user_serials ) %]
+                    <li>
+                        <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
+                        <span class="biglink"></span>
+                    </li>
+                    [% END %]
+                    
+                    [% IF ( CAN_user_acquisition ) %]
+                    <li>
+                        <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
+                        <span class="biglink"></span>
+                    </li>
+                    [% END %]
+                    
+                    [% IF ( CAN_user_reports ) %]
+                    <li>
+                        <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
+                    </li>
+                    [% END %]
+                    
+                    [% IF ( CAN_user_parameters ) %]
+                    <li>
+                        <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha Administration</a>
+                    </li>
+                    [% END %]
+                    
+                    [% IF ( CAN_user_tools ) %] 
+                    <li>
+                        <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
+                    </li>
+                    [% END %]
+                    
+                    <li>
+                        <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl">About Koha</a>
+                    </li>
+                </ul>
+            </div><!-- /area-list-right -->
 
+            [% IF ( CAN_user_tools_moderate_comments ) && ( pendingsuggestions || pendingcomments || pendingtags ) %]
+                <div id="area-pending">
+                    [% IF ( pendingsuggestions ) %]
+                    <div class="pending-info">
+                        <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions pending approval:
+                        <span class="pending-number-link">[% pendingsuggestions %]</span></a>
+                    </div>
+                    [% END %]
+                    
+                    [% IF ( pendingcomments ) %]
+                    <div class="pending-info">
+                        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments pending approval: 
+                        <span class="pending-number-link">[% pendingcomments %]</span></a>
+                    </div>
+                    [% END %]
+                    
+                    [% IF ( pendingtags ) %]
+                    <div class="pending-info">
+                        <a href="/cgi-bin/koha/tags/review.pl">Tags pending approval:
+                        <span class="pending-number-link">[% pendingtags %]</span></a>
+                    </div>
+                    [% END %]
+                </div>
+            [% END %]
 
-</div>
+            [% IF ( IntranetmainUserblock ) %]
+            <div id="area-userblock">
+                <div class="user-info">
+                    [% IntranetmainUserblock %]
+                </div>
+            </div>
+            [% END %]
+        
+            <div style="height: 30px">
+                <!-- Without this white space the end of the page can be hidden by the language selector -->
+                &nbsp;
+            </div>
+        </div><!-- /area-lists -->
 
+<!-- the main div is closed in intranet-bottom.inc -->
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/img/background_koha_logo.png b/koha-tmpl/intranet-tmpl/prog/img/background_koha_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..45567ef32a19974f56cda9d14b13401512a82702
GIT binary patch
literal 8540
zcmYj%2|U!@_y5d at DKzp}CTlgN5K}Z|7a1BmV_(KnmS+;#$Ck(=qSO>(gkr{)eTi(%
zSBYe)iHT&4gsd~Rl1jfj&-efP|NrxP&GI?-+;iXOoO{nb_uRQ at V|9M7ptK+a0 at -Vd
z!{Q+js3mxp>=po&tuSUX_}UeA&eVQ4c*X7ZNd?b)f^jZkfd2#U4Lzrr7X^q?;l|G4
zc31quN#3Ep5E6-mCI$tBUGxt2MPCW^&s))zhCmKNOtFUcQ4g0VqCeG)wEtQC5cJjx
z6a0^{RcWG0a<J<S0ox<Se5P{8GVr+WwNuBfd>?Cyl09FTCJP82J6mDbSVpBL-h13A
z9T_Ga+4OzqcgWT6E3DYb7o?VI&YU!BsAoEUY31ime9dCjMo<+ef)Fs^TI&Tx*_mnu
z?T(WgeWjf~{IQtc$x5ECO0o~kHnTf=KQvA|Sg}^5wlYMPm~l8!Bo;aA1}{%Dvy;3Z
z>W&x{*%Gd$1WFUj{y<r?gqBHdoP<549 at iJ5!&datTU230eSqpjA%hwb_%m50cSGZ#
z-Hi)-nJ!d^6 at kcAw7Zua)k1jyVXjq;TYWYIrLVmTq2|lO_1T22)`+|HWf&dhnHCAI
zs#hS8wa1fB|0^NtlXh>JJw*<T&%XuZ26<(N$j)c4ClES>zB|LElFb^7 at EJO=9>}0}
zdN^~F?#N2MEa&44M!{+6i)l)aj%cUv?#|j&Z5IlwOcK5*wFtpiWllebekkh7+;%>&
z72UT=WE$RhO!hOU$vW|6z#|(6QR>N)kQ(AgORn;Oq?uNy>=v3k#B{;>1*_Fok){k6
z5B_FswEN;S;Lzs=$w~uULH5JU>B~Gau0bKDP$VC+<RxqDvwsez6N8j*La2*n`3X^F
z|72az-qBrDK^@+Lc3*wi)Cu*Vjd>~cxX=yhQ(x6^#FY05dJFB1pF){XA5BVzxp~Ll
zsQshk+P(JShsqN18F_q8kGe7=x4&mjLz#z4isqw}HcF=9b{0LS&F`Lx6&_`@-K|Vg
zF{O>|>zLoVNtdZ=NWJx1m7d-qL~@4b;@+<d;Iv}cX7)J@)gh>rr55wj9c9baOO+aO
zfA$6M-}YCSXgtl;Viz+FC4q(|G4EIJCoBUY``sW*UkIAx+Pljz0ZKD1lHFo|ExP)P
zmfws`99XEe&C`EhnVUInp6L0wOFZ{)2lfW5)3L;!a{69q+~HtoZEJ)iS^8t<g*m95
z@&E;=)tT~nY&@&7A$53E$1dZKx0FF4k!jGk8b<G_3QNVjd_lj#N`CJA(7m~CznK<V
zL>9i}n{P}tbllaM_AXyRnka3mr7xk$7gYrW-}u<w7W}Hkx`KhZ8yZfxPOt=mF{7&V
zZB{b;RWzQkTe=~0T0p#6y!@oG$+|52ZAhX0;Q=)>tsujY<TwZ55LGpisB+R&T1dVP
zXfW04l-N>Iwjisk3dJ3s(R_-wBW4)(t$MNTz4&?D8|q$@A^8^X*9A9s7D?h<D33 at w
zP+LHndRk#kCHoo2{M5X5K%%5qvl1q&l_5r?x+G>!-%kuvWWvPBtI_$SDSw9o1DZ=c
zOIhXYxn!jaQzCQ|R&umMzQOzTzcvN!4qJ%oEZVMqdoE4P_BrR>36?9a$JdL%=`wPV
zbw51tSJ_G9OWn|{<-BV0Y-&t$^qJb*5t5=VU-Z2KIb8(b1I~vBM0q>`66}i(vf$~^
z=E at 6QxI_t#Fu?BtmYiEId;}M^yQ6D(w;h$`_~^RBT?|9^?LS?^pZ|l})HpCY+{XP`
zk0>M0LSmAC7}@8bEbD~1W9lMhWWU0r;<Jmu%Do1XHkI6+9(6<s+3x^gxqU`Rv$ipb
zNY(1_ at ZN!pGPToFg_lLy(X3>xVtL%*0V2TUdhtxHrxcul3lr?%|7QpiSwDzE(Q=H`
zKF0ZECjCv-Y8oo;5+~mGhs55F*>@Xrj2s%L!Bt(9Md4e|LS&+lH_-aGF%RyBev;OF
zrJa&$e?iadr!C?U<Ke-XtvGhLS2XYkK3C-SnxExREIz}U4-IA3fibe&u8ihQoM!9-
zG}s_ES&1R>=gg9f110%lqH3j4YVYXMSX))FSN at 5C%xMthi1|j?R}0UCpXphanxC54
zl4PF*ATE5)f6-pvfV>VCBoqm=ehMTXl@}<OA+%h(s}T`O%?*u1cc1G56KKU%bTsg-
zMnpBnF5|fE((?Lcfb7Cbep2USJ6dk&L;i=tmoMcTV=qlfDD_0Zqm4?<#CHEJiV$`A
zRFKr(atiQ#f^AvzG}pNz^`$$%C8i)W?hMzB?E>NvHJiDL{xmuy<aU-}p at oJ&ydh|Z
zE%{aw?>V~7pteN+9$_BBQkmQ60Y~d0y9^zuzsuY{^2a=Q<qDxCwgmY!5<qpA(fkjv
zA*QRIF0&o&ecZgEIsMB#U706eZJScmT#retc`P$(>~nH_lgZ3?Tr at j1)1pz^9Dxue
zJ}iZ~4Qv!SX8HAn*rnN)r1qZldsx(50 at QtC6PKYi4&0An-Vzc6B&F)inn1a8Sm|Z{
zj$^w^htmLN`2 at +&`^ce}wI)u;cv6&l_9h;#3`@lYSj4K8y`zn_>9KXbhFORz4Q0Ro
zUH^_|S~om?l&6ye(^5;{zryp(Q!tVn49?TbkrJB5>IFip1s`IK*3)szfm$OcD6ZN)
zkO1eDePkvjlseWzo5E+b at s&D*4$N4vUS}1qje-f?7qXWJA2;HmKPDn$N9kB5S?_Xe
z0-nvU9rHPR*@6gzzwZ$|f<h at ozXs1(Vu`GV;W#I)H|lf)CiY2fp>ThTW?3rkrX$$i
zn!bnxcv9$7bQ2!f``OZg%vK&yD4aL$pzFc~n?Umh4b?wKPrd;b3U at 3vp%lWHb%;Z#
z{BNHXuGzdf1}2vb-vhokZvLX=LARc^;OVX_mo#{8Hd0e{@=n9asYD)Xjil{qM{YSS
z?n9yU7Oj4jIMT-4w$_8ed_jq+L<Z6vX?x<bF1&~oCAXIO1IUxNA~VIw+b)%ufRIhy
znHKe6IW}0vsVd(3Tpv!Cd)W|fJs2!wy!9JMfaR}O_I)8?X~$<#sEDS&(}G-qhh`G5
zJU*{rOl2+DQVbwxFoOqC>i3PmU!w4)0D&#$IENIKGEg<4c=Gwl6nJ8(p6O=qzhoC@
zPRk^Qy^6meN}lR3Zdv~NuI>&d7J01`v$CF+ddthj%d$4NfFq(i$!<rXik*?K+`(X_
ze1-CJTE<wjdc>`3)M&-pg`6QJ6#m9)HW<vvt1u+r8cX%Lcz`Hxy6Rn#iW936y4X6S
zIMbrXE$*{Eg2LzbBuX4VF~Cwac at FomnZJp}Ry40 at mdyPG@r4{26+=7BYtw){aftj&
z6vSoAk;4N<Ho&^Ey0m&=>>$XJ+sLXhR=CoB2Dh#lo=#3}G(XK-m53;UM31DXn*A7V
zy+K0G3HuWNgGb*pTDdfxmO5<kjJLjx>l9N`aWYx)o4=~)uM`g0VX5do8Q_Qq{Q7px
zRV?;W+3@@ioww8XP>i6NOus9(h^k&RD$wa8F6;{1(@Z-%6-TJTtX-E=>XAq|3msBb
zxR;8%O0au{3-bhiV(cxx4JMYgz>ctPLn97_+C1$)OrHH|3sfMfoZY~IrK;YoxIRxa
z`Af9CrtQ2GF at B#!Nox3;Uyn_IfkzUaL!M;Hn_{V*EBhm<&(11ah|U-M=R9Z{qfaJ`
z9KQ*S=oy_up7j86o0=!^FLr1(UxBB~5mEAXYxG<4Y#z^Gq=5sCn6vJt!lGoqug?J{
zd9K6_QPJ|YL=%d%ZyN5yrV|i4XBStXgktz!y at L^fReU^5z*3d`I(Z(`?jBfb==qC>
zWZU(ht*c--EJV^mhq0up9w+8HfWz)$SLB*dVu9yGUH)Fl1m<<m{tUaDnkv4M7exIb
z*{E8R+Kc^e<wW^;NA*T3?v#Z-FBphiR+~KuCa}f~F08Qb)jm<;4H{2B2_;EsNl|jQ
zrMBMWUgyA1rdX`B7i0ce37GBo-Qsvb{7~&P+x=kaxLu+?tNB;6mMiZX=9GG}5`-%+
zOY^Yq_<qK%FY~~bG>rOFS|LYJ>P`Ig-)|sPSq(mq3wh^30N$A*<TM9U%X#r}V};N8
zC~!(`TL at 2d8!~Nx at okr5{QwGuk0lw}QYe)4)cz%oP3G*YSB6+D#mknMmfG8IPeGyh
zY`{-pwjb|n!~C$NC|O at m@Do%S{D=pu7xpiGdN%pmV}`hB?${)9C)vyn>*L2`fR<s5
zu>y~V{{18aAP}C!t1-eYSEn?14D%C9gq-JGnJga2>b$Mnysk0-UsoVgDgh9w*3B`<
zmHaI}9_Mhi+Zvq5R9^nC<o{*zfqX#!_?P3$$|m~L(=Q?pV7U8kmo6dx<^C_4|HtiQ
z`OSzYj}f$v{-is0f(OpLExf{$$CzF6zl>CCp at cUj+cX}w5Dk at QTrQR;uG>=UG at RG{
z-v2ez#=IK4Z{Fh(=o#I`0oi|PY$E9OWzT!70YjP+N}bG;0pa!5pAh*KQi9|uAozS0
z-CsCw%p-T5*pB8gQMv2!9#kMF5uRwi9sL-PcA?kMy38RVo=(9Y&rjF`hwy-IM;_z0
z#d}sV#L3ld^tReZlgK9+W9s5|0VRnispjV?B%YXtd+>Vz1oVSffWvSP_G13U9-j9v
zpgECk0ia3v$Z1ycxWLu>fY^G8U9JVhQ`_Rt^ydK$8O9=yfeUey at e72gs2q(7(3T#r
zxg_)8_^D(SUuZXmE$X#`xu!3uB2u}#f8}ab%ge%s*cwstyMDfS%u=2M<wYLfFS(Y8
zn>D&qHCNWrx~|MUV9SQeSgdV+svkVWfFfg&E7IQvlm~Jr1l{@E$A7j8v at qL(zqces
zAy=U2m8+^CwO3Am at Kq>rAh9$<rx?fg%PUjk2?qK7JR8MUkKvyuw0t<j=x-MivAHbR
z^!LTG%;|diQTmfu&zfBY-hbIpJ#Osiig_`+o8vk;-5PFw`oX7-O+B!6b&Tbw<ch3N
z_rf9r&yk;Dd&jY;i=-x!_p~kIZ4-GmOFUqXu<KX7#>BEPrz?UUL9c at -^)w|;BsBBM
zNSTO9Js_9NzTF|u!qUpWNztW}s`EZ5DD~V<oQU-d_*f!Z-f!L^^jvBN5~wop!vJOl
zAKXBHy8N&-1fNk*q)Xy+)W|rD&vr{VEifkXw|b!RKzhRagoYa~&#>9dww%VjwHmcT
zG5gO^miKeIc8cYx^Myo~$S;lV$y)(cFB)%?yydxe>{5`-Bv?b+iq<myq~|MsoU at c8
zdhpBg#r3ptMHWvI?uCB3d#o=E9B0Y#6C%3Bw^A%A_LMvLIIHMeq^Zxj9x5Z?e1f$t
zXnVAlx&5=6G!^J8Tej!@`p?7 at e4d-={yM~Aeoog2J*Z>t7pC@<vUPb4`O0b6vO(I9
zgTWXsfBJbz+S!h^Pp4;E_HZN8dNhm|z8JC})*~EyL^cjUGhoa$bew(im at q4O5?TZK
zR+=N1I^697j!bW~o%2m7cVLq+#5&q%@uYeS>-Uu&s_ZobHS?(SkRzgsE450Na%N%B
zVBO$U($rDF(#pEF5ox8hvO7*fm2fOF$hS98wd8`H-t#@9uiCh13BR9F$aq|x{lq(Q
z>q|FpjVpEhylsBbh0?<(6N?mJRT3yK+PDd%DZYeK=X86Yhi3Vdq=BoHX1+gD1jXe`
z*%+g~5Cyj8qs*T(SU+wor%ULK{@0fClu|yK@{?_^+qjQN-XykH+ErI<h5fdo*efT>
zcSvj$G7<zIt&%V^%V=cAE)Vm%p?f%qS-w*H5OzrB>@)G=H)cC<+^J|J8sc%Tj#Z8u
z8~l#`gzrv#qB78v_`6-G=EKzo>bWe}(i&K2V7{?y>Ai9-dnbwr4AeO~J>IR-6hLU{
z5aI}YdmKeK^syI#`a4E&mCe?zyaG5~&m?5sT>IL%mh1>RAE<+ at 4pxM|?yWapuc04r
z7kZE#=RObNbS2XRAXOR%i_0!wLd;~(IwX8YyL*0Cqg at 0nP&dfOdhCr5neL2+ETt!y
zKgg&i(iHPv#xXgjThNMw_?@vd;i8S6qYvy&hy{qtbA*<fe=gpHfb*Rg*UaD)QtD-h
zL!s9&LsuZ`3CTN1${TxhVdCD#rL;ToSiiOBtmMTC{nv`L=v0#THO_U%8gd^f;J}~m
zLaSw<Hc9=OR_d3D@^geOi(Er&$!9`K%ICT_Z>kz_ffHsoe?lz%a~SRWMr)Q1qTa8f
zbs_E0t@{y@<+SN`p*y#yu}Rspx9Nk^g2&X!q$z}#TiOi2u_Of^7v_FUhKk`7M`6~g
zE4otqU$$}m*_&TqAByf81Lyubi$1 at zXLZw_e97|6{VVq-X-bei at YN+k=~l$;^my}i
z15TIqaZ8jsuw69WLtJLvlr&+`Z4FT^FJ$O~AQe7iiWT at m*g^+Cia at AsZnBu~E}pU@
z7KpT8ku}8Lm?CTma-$bzFMRf9{}WOe-pXi)j&`?kw_3VVh37BQ`I(1&maG;hUg$X5
zWzFicmn9Ri0wb}?f!2*w_Yb#b_B>LsbfBD%MaG|E9zh-cx(r_rT9j2k^S~uy*oPJ^
z#(f<E7nRB)O{uV*0bTNFu|-Zh=KGV- at +fke9Bwtbz45~Yom6Gj=|hYkYU5tKe*~q#
zMeE)QGP=}Ov$>;{m*Y(N4ud=Miz=CO&i?v1T9Ypi+j*l-f5{ML at h`tY1%@1aG(Pij
zZk&~@qsphEGLXLih59OL`ZHmRkL$1~i?8TOJmHe!ERZAA?*Hiy>gKKg91=gEW2*CT
zmavr<k?Nc9qFv}(BLam#!|Cd{70oYO-VeL9*0Q8d7X>F4<qe6nu}sXkb&Q)%p4+Ro
zN2mADnqp)c at _q7+OdRw6Ly-DekUl(tgf3G)x`T}(o+x+WP*zDJI8Mc|F9VeuKi*OY
zo9skLQ3OP)Z^WRg0B=t;bNVIHJ)6K#sS9d0s=(01z{*K%s0`~h*b#VmN$!HFvgQ1}
z_mzCT2A%dj`G at T(423ypSfvrpb7fa&pxgy@(0+?mHuJ}2?rx{-3?Zsl`=t-yI{m;E
zephP3aP^3jYB`1$fNnq>Jf+<aLPA7pc^M#7V;3(o#|G#cl|~llX-fHw at uQC=h0gX;
z5z7<uj&49K%JSXfya0RG;=WV1L^I_41slDqtr_2a(WW#d0x0MFb~iSX*S7&p1iqX=
z=<)m8J`)9Mg`hC1U8=#~-ld(Q5_*&LSk3%9004IUnmc#g;QRkEvuj;YUWCBtKUm4@
zl}5tnfV9no2nbaAOy91ol5i(gWYX81uy&#6PZ4U0fRI&PFzyP8>(YLC5-8>%P5h|c
z-S)P3D9ZsnDO>7 at zz)<Q)Kqw!X72|@S;=ldsyUEK8^Q$slGrMWNVNqTKfy2>LuyG=
zqKo^A0cfXkOb-Xf>B?muGNCattrk?nbtbjXr}Xn7Y7w>|+X&Cq{~%j<5p0Uh|9!^y
zg=l#_jmXGok=dd~q=L#U?Fkc--Gq22TDXS(6ew4u0<2bXx{5FS<;ZXx>9rwGZ)PLn
zttdPSIqQ<52=bQJOO}fex!`QlRNUe|Ups)KiYWJJMjncIim>GeqmEFRP}dc6UZF3g
z?E3%dp!&^;9lW^D0r+8VW9403Mnr~WYz?pI`Y#PRFF&vV_R!$!h*V`TXgY6DJP8VS
zO(~-Q5nq1*nF|LwU9x~5jEM{kkb9IIze3P_t^HCH=wZhz{dffA7yHT!d;`Wr14SsR
ziKWgdf9G1qB6lv!U2x}3sw+UQx)bEQYs&s(0PDavAlFBpyYf`ES4|8MO!`8udV!LZ
z>Y6X7>q?c;Es(yoV(r$~e(`T*M(h>>V*kqWi~hEW4i7y)<RT=gQagAM|15L*5?yv<
z%SX!U8+wT-*Og{MVMvTW?oxRn7tXeQJr58bkE}<${fh(a4BGFN%rRn=&Y!P)HNE!A
zma^i^>FQ)2sw7gC2(<^4`)wy6vOaP}2n-_=)Ex!|f&_M6YnvzOA)+{4zD&afgTt1@
zHqxUm*^$S}{l|dtCVWOif{5$f-z}cd6ql4Tpi1M|c*5Q)Bh2X81iiLzmw#9Q_07Qf
z=<RNzJ at 6)|=G%e;0`bZB;*JE95a7-~z}AOBKPyl==hbU5qk;6;N~7T{GrNyp at 6#)o
zhoqM#+jfSB!ov$o8qNAbPNg01eB<IzEUSq|vi#+W20 at +CpwBk;&9F1)^U%$*lPM8$
zT<^tw5v2^-ek4Al)wZ=00X<WTcxMxqs0R{Aa0#K4HS5KMfs*wC$8CTr>xqc#)jpqe
zmEIPd9FcnT?ekwrF7l%Sn#0<ux`$?3{tAY<o(OY37LDvA$`vWuQ<9?boS{23S<*>M
z6us!Yf;EiUFvzfZ4rc|(6`6u|mzMTX6*e`qIPy#*X*XALao^sEv$bJP-?yc*&B9KK
z)%1a~(&OU`k)V8J`{};Yi?Q*x;G~Gu5?dl-Hc_E-Qe5-cOiPh*4%%F+bH64FfRmdi
zXui<Kij`yFr~K~~2JZP)OS<#umSJCr9=nHrzp4Q<d?N7<n0U%Sx1+}`6F%TAMhY?A
z9NLkNu69UNc0~4#RynY3PlYTVw4?#s*wgmZ>IJ*@*;*IdW0SS&qv<QW`wr at Bpg?Xl
z2FenC_%L+%_jLt3 at 9fX_S;<0`Mwonnp0u$_X@>bPRK!Hv=g>6anqAshnKBGK>}p|6
ztk_+A#vgaz95g7)BXDIW&#xlAPH?VgV~!_+t{-4`Hh+A)ooH^CQB!u(`Uy=|1Qrjg
z^vkFHM;;0;bv^~iQB at lYW)tuk&-pww>29+ykm^}gD&iM6zA67XT3ZUVh}}I3QnXWx
z2Lp at 9v+QbF?&fjGF{<p at nh~;Jc4!<TSQJd<-+WO?f(>!o52AuW-f#}O<;y9$VS$=y
z5ewGh;ulr+lFssOU(Nw3)cGG^JU8gvo#51GbpM1C3j)*U`c`x4 at 95P`7gx4?T336&
zHqH%{p<6ud;v6xR5(zI7JxgWbKQ1?B;WJ`w-M#F*Ggd&7CgIlvW+Uhfr)Mb0E~v3j
zvd?x1{r1SZlFV9m?tzWF`V()CCkD0)Ik~}!U>5EJ-T5Zbt9P%#^x+S|nc3-cNWig~
zE#b6o)Hl9HZF?>C?%nHmn1-zeG_8L!rx)l|nSWMa?G>N-k^eNyzc1u;T0Y_|q|!&W
z)H0|@v0tVtDLmOM45!qS4)uIDb>-1$%GcqN2Y}I+ZNNV0<vXnz7$#Q>ZVZkt9wZbo
zWbu8gFAOTTFdyvP9rVFD(!YC7*`aS$fzG0jD>*)U5K6#>Ot%(nNS(@>y&F?FFtMv&
z{>8jJe2{-fMsvK4+q-{ItCm&3jkU at 2o#P0Xy)CEfbO_yXh0mk1W_RN=dY~NXbs`6D
z1-BAFZ=m}Rtp7lQn?cE1iP}@OeAY{&N+X)EtsKe8+G2(*n9LX1$}e_{*nHBU#CSdc
zhr=gp|A5M!-R0FfiQ3b(@mX{Cjc1{pb#&YdZQO@)%=ygFUs_!0MOnS|!~jLXjb?GD
zEzZ}g6D*EnRY%9m!o8Jzm3mV{dlPOeK0TSe8h!UddfEXuxM<dFFFxZ6)tTM2N1ocU
zXB&|wv-p5EnjJM&_y$zgI|W)(>d_!`1<7-e99Hn-kYD&&foh0{j~rFxI5c3hle)75
zX=k- at ofZ$S?b3_YFJi&he)37zo9D(0M at jhoF2k6EtXU%XdIW-){DXchL9QL#F{Y4d
z#2Al)J2p!u<ucEFox>ELj_M6*r&?GZ9=HegI-6Vjus6sF$nukm)-;#uD>lChJ$?3h
z3Oog8$_sK>zY at 0$GiL0$*-*NRKlx)UB<cZa>L=5XdQEvi5QH(Sx<_4t;AHT$8XC!z
z&KW44kLCwyKZMgXc&I5tmm4bKcM4n{J<goI2IVvZTF7y(Jg4hUWl}E}!>D8$(r+>k
zQ6;Se&e(gODKw#6yc?=}{j<K+e8G6a)efPvAjg}rA!eBNtwPv}jpuA0JT$9&I6eUY
z=qmGWz&dYVXsu3;8DB=QJ6Or5s*-R&Hgae8M<cC at on!4}yqi9JSJZE__kNmbLJ`1c
zJb`$^Bbx_Nv>#%@Ai)4vo_N))5`a#guJ(7p_|Z1xmP&9VX-aMJBwjD8q%L!sBHm`v
z$<Ry_o(*9;vrk!$d$^bsGb+JtSUvrGqIL1iHihk;R=(B5H1zrP-wQ)2u3XyferkL*
zP4P`wRZ^-PL9a%X(?z4dGI+FAX|XVcW?!WrRknDCYbXJbpa+VhA_-3v##$smUVppd
z`~3&AHbka--)gkDlmBF*pTKme9M_l)DrCh>Z>onqWiPl-I>e3k(pgkd{btS<qHA>!
zOpLRO7?*Q0r<wG*gn_Dt#+PyI%Ll(jN=W2pn>9QJS3R(wuvmz-TE=^9SmOPJ6EVo@
zX2juv$BfG at nbUSkX<?pTV$+%t&5$jL?m)uid&_xs;Vi#&PzEej9GXZNdlj<qMVc+n
z7Uy(%-fqCXD95-d&V+>xc!56*4DkL7u!Tu`vaAEEfn_&a`h50F+f=b$MgJPqzSWpw
z)-V(E{`&{mIA0CCATX~C{~a<}y5GTrdYp~t&+<#5%KAf3z*q*hMJI~KzQ?mf+%4(|
zYsvH(S0b*Wgt1hcIepgFVp4<FlG?bZw#2tY>eJp|u$I)KBQ;=wH{3o#C}w1KZ%E=;
zK3yM5=r?Zt>0(S92%u+flD~{lLeo!YmGqZ2hfg#l`a_;rZ&8+hN+<>`=boJ!`f>l)
pQc#+I8!~=Ip|h~~dZzaFpIfxsn%7L@(|}?SQ)4S^^*OKW{{s?~E4=^!

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/header_gradient.png b/koha-tmpl/intranet-tmpl/prog/img/header_gradient.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac002d46f90d821bf6e371dee4f33c919579a390
GIT binary patch
literal 203
zcmeAS at N?(olHy`uVBq!ia0vp^j6fX4!3HENV{G<<1d4;)ofy`glX(f`uqAoByD<C*
z!3BGlPX>x`7I;J!1GQfVVMZs7*%d%R_7YEDSN1zBJbb$1`z7bD0}6S2x;TbNT<)D<
z$albigW31r|8wU;%L>e0md at BvXk?}QVb5)GhIj_0<y~PD>S8oc#5IH+2*_OWv}~P=
qa;nw$nSPc*Gj-DA|6P7=Zg<ZxrQ=uO{MSHZ89ZJ6T-G at yGywoGheG54

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png b/koha-tmpl/intranet-tmpl/prog/img/icon_acquisitions.png
new file mode 100644
index 0000000000000000000000000000000000000000..4035fc7cc06c2b2809e0eba816a2723b5e1bd99b
GIT binary patch
literal 1257
zcmV<F1Qz>=P)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H11ZGJ@K~#90?V4X`990yDzu!!fBHE_ekRW1dDd|H4DGj<1RPZGV
z`Vwqk6qG_KVz7dRRGLH)Ey<<^5yTfkkcyaUf=~#3Nc*D2hGs)30jWa46rrS=Khlt*
zW_OMcJ26YF<Zh-;x at LZG+1WeiaK3xz&g_}HM`lJj%G+pw^(q06TbmbL(s4<XlBOkn
zEotW+Y<5ffQqqK^tCC)b8W%HLcLPoUIpBTZ7%&M;1N)0?nt_|Z1n?Tr5Bv!njTAc~
z_*I~%==)Y+G#r2*wn^Yy;Qk`Jejpnqc16SsRtL-%UA+ZKM}RB9;jnuz&}3$dMSk<Z
zwn&j9&iIGGPe8+}{s9V0V*(ghb*=%J0#0t^QrQ7q18xHyfFJfB1T1U^!#+Q>xgGjE
zykX!WP(3gbLXH8?0V!ZHY^ktsEVLN`>Z8V07~ENs8i5uHk5a$rvlVCy&2EK#0C`r{
z^I70R*cTLij+)ukl0eom!>_Zl4DMEY<v*YCdqvKVLrG_V2OZ7l%<MquHw--B=r?U<
z&pTO`utcVCzx2~Ze!rFAH|5H+d6TS-QUV^g67aZ{fXA%_JZ?EBS(3KlKG49-ZiRl;
zfJ*gSlV>wzhv$HY9L;CUtTptzNa5|@MK{dsSr@}n-trrPe{A;ri*6PjHv!d-e%oDP
z%J$|=z~fc|9=8(kxRrp%t+E9#+a#-OXFLIqTM2mFO2Fe*0v at -b{v}TDc<Q)}mkg^1
z?~+vn$GV&6uNT|&jc?x_n3plwBe>7RyWNk at 4Md3>X~r|z)Cr6Xvh&D0C9FX?F85|@
z_OC$KG at JRO276@osll*}(>>#<qfuf<nsI|eW}NCu&vyg7_g&p5xvKn#;IqL&H3QhL
zn$w2;xMfS#GadV;7Xf;*DP%eXe6%6pK%FQ3T|M!}<G(JP%+?<9u`Abhr49oawpX6l
zv<wa4iFvaiQuRc%n^SyY*sFaL)eXyCZ>49y2ZjQyJ;2(5q0UEUepo)=H&NYS0WTZg
zS5ZPo0yk4XkPq_yWF}kNF*qn6z@#BTv!L0eA%MX_`I&5ON09d?5xL5MkE6tnoR7bA
zX={CDWyR;9r@*piWODi7o5~9RXMm+#en*AxJt@%%N`swWTFSln_G1gb#0s9dT-#_q
zEd+S-%*XHo;VYmOtx-K;oHdUNo{>ic7ATKL5acxaX3I=T)e|M(oPi%aEz<`Gmd7k(
z^$z%*Z#>Z^qs<C~C^#C(vvvygUCt`oS2yPw&ty|)%(;3(b6x4#0|33_sbS2mdO|SW
znVxg1o^S>?qXoI{j|VIJ<Hi#>?vI;seQm3P$~MVLz~fc|9=8(kxRrp%t+EAo{>fi5
z?V~Di8|WWiuzcuy?EKv~x9W)^zqR!L&klRDsdMI7Js~vHm7Z+{=p9R4G`Uqz2yS$x
z=k9X#gwd$=WQU?juGJHkR8QQyO2Fe*0v@*#@VJ$L$E~tWvdVVG6Y#iIw%~sOAnF%k
TcUp1a00000NkvXXu0mjfs+>t#

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_administration.png b/koha-tmpl/intranet-tmpl/prog/img/icon_administration.png
new file mode 100644
index 0000000000000000000000000000000000000000..88198e15b60e0490d7065ecc6136287e2da599cc
GIT binary patch
literal 2669
zcmV-z3X=7SP)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H13F=8iK~#90?V5dXRmB;`f6oawLBPNbA0j$}A1&G{btH*mv9=)E
zR;$%<YOFKbN?Wat?X=Yaf-Mt)VA1*o9c>ZETB=sms>OC>9HU}IxCr&5K#?M?UuYo-
zNJNvH^Y)Lu!E;Z}{Y-AGGkIptAG`bR?sN9M`|h6IM`p&S5#A?Fpjh-1?`!lEF9edF
zkmO5hmJ~0hjgk|WR3 at n+lsz605C;wk*h*4)KJAv2c#7~Nz$!_HNUD%@A#iZOtWHv;
zqytm7k4qYqvvD&k*#j&AEcNUF-U+0G&u-vffpin#Wox_CuCgLU1mGZGbOyUh;D|u_
z88h><wp_{)PmTIbM33 at +fzF8hRe*A}+ZR#glu-I%U at CAoPzU@X^#WZu4j7oL(UK5P
zO}67CT?AAIie3O-1<nTkh>Iv+0vZE0LxG=4s*#k*wMyeEz<or!$9I88Lbmn5xf$$V
z>T6fY6pK4?ktK)?z&M~I!hT4m4oXG530Mof9m+of7$K<&+~NdG2Q~q*fZYec7U0QD
z9jKK1aY>cHyL>#^+JK93ld>Hc0Xzs?4onPGtv0h4v$kCfaY>bCwkIP0e&8_Nh(BOv
zFG*SoTpBRj2iy*9$Hng-r0R5Gy_p4HA{qrwx-q~XQk@?kDjS9K)2 at m28qO6TC3@mz
zdRl;^b8;zwbZx59t`0T>gHvS#fonnp9tY+XNV at CU3RLtK@sYSmlNPRkH#2m86YynV
zZz}yLa5JzgWVaVs3S5!;k_KGYYa^Z_zqo)=dkr`lw{l*Wa<fx$p|UMt_m$9Bot+n#
z0*PN(;3rQ4Kf~=3KLlEFo2}OZHlHnKk;^-(NIDXD5w|4w1ox!cIR-ap=9$?Cg*K9r
zxTLYboxn!i0&yu&6JfdwScx0GV}S`d`rHSMGqd*!C7Z at C3-KAi^*QR#1-1d_<9zo8
z+>0(Ddb!>VTwrD|7fX0QviS3Ivit81z+Jed{YSVR-(PS`bzOx0Hd5iUH=b<7S7agm
z0q`~4USxEjj(}T%UjvDVIyrw3 at _jOHvdru(TzI-8qIe513AoM7b_D7e at Tb)1|20(S
z0Nh&8E6BP#G_!=6{Sf#lRJ0eU0LDgC+kp#%QGe=-B%LZr#gGk?%O`$sCjGOw17F9D
z{FsodJce7SR+HJ)HkHg(Lf9Hg$8hfO5U^g-cO+d2+>84PYk-rowAbSi&q_S??|2Vz
zW<>F2IKRCL_w#!iZbB}`g~M!ESvb`Yw=8ko16~0>m!plnIKq2y6LwUD&FjDd+yZqh
zFw at KuMRIn?;oEa5Zd)3BI)N#@6$W$0 at f7jFz#Az7>v4bNZ3PnlRd18dNjydVbl~(r
z`WU(|F4>+}>BWU7Z{itVW at -kKt+*q!aQ<1nO}yCSiO+}9O~4Q{8)jyw;KE`TI)LFt
z_LCV!j`$s<kLX3A@}a=LfoFjeO5x+h9#0&OJ0F>XJB2#h%=U$B;%3%T^oZu-Pz>?^
z2lU^%^)>p5_ci*7_ci*7_ccDX#0Pv5oz7oZ^@NORh*s}I|Hzq>TMOPAlzhaOFIU;3
zt?B9s`6=~;5%&jrhXhL0urWXNL`nB5i?*s_PfPqkVFy{V?A*$cyLRqrjh`puZn~}%
z#r%#=Ej%FUS+cxynXp0a-k@{lOnfWr32sS=HzwjsK;LsId)JUDT8OX**hxx=Ab7gH
zre*3JG7Aw(>MEw7dO`<fAPph)gqfbnMjHBHTiduceiPD9B8qkbRfGr6c&@&-<x7yA
zSn0!|ypVcA5Bug#HMrYMb at -O9o)E{~y!z0b>WPw!c*C0EmEHgw>-kI&EDIF9VAx9G
z4K?drhNsD%ai-y|2K)JbE8|*E-pVq(H?FC9Z%6kYN)*Rqp8W=&x^TX*-(otazIN9)
zQ(5a4tg9MizP~B$09VZO@#p#SUk1Jq)kle3B{~+Hm388!t0xRL$jhLfus&8#n5+pb
zLOo$e;M<6X)kCYmEl!wC_dC1@^@M$L>WPLm!z*K+rKu-`cQNwoFxm}9V0sXb%Lxb%
zJm0ULd17ntt0x-P46mGX;;wG$i3N$O`wb2=qiF#4z>M0Kmm1f`mm;O9CnUSwe71us
zQFrx3eNA&t^+Z9$7j76iCYkKK0XPqAQhiO!-}k at F^9PQK#bR&KHQ|k|9kngvV~Kdz
zolw4LmFG>GHF4+WY({ze`22MvYLm&%e*oVG27>Ot@#WEj0UDk at d|<3Rb_szfWw0f-
zE`D8sqydJR at 2?1N%!(%Nm3{O&?!u}I<J;TYpKnZ5y%`(4dmqNapuMnv`q-1WV`+fL
zgl++vLru3~c9+4Gxch!U_g;0Bg)hv~P>`!MCaM<WI>-%Ut4Wu5W at RQ#>lonOQJzeG
zrhRbh>R4O6g|1sU-=@@`*wO^<tIGGM)z>!9&((ZE3y_Jw$?_yFjuQ5)Ni)DdIF__+
zhCYnFKWaSccpGsPfHdH(t}3&ucdo_VROdwA#OJ*@>`2eN+w-+gp$zQCz$IG+WgQF6
zY>}j6Fk0Hn%HJ%oO(2V_%-;|n>m|7pyp6uuCdn=ZMXD!ctTbVWW3k-oiH?qradS?7
zzenncj3cfN)tNXA>@>HHh`O58T=2J<r}Hr@$Gk`JZ2 at 8l%AlU`xuB<{vl0iZ&UTM#
za3gT2;Hze~%oE$q>~cKS;oJ8S_l2swUS3gNef5MLZBgy at 9&t|xkU8M&lXwcVr7>bB
ze7yD4pBE&mZZVHjK<nJg at 5kt?C%jv*5-20ROa=AT&1ZRdwWzy#!e9%gNrKzb_seFT
z at -wO@8lE50H|mL*H9Hga)y>`16N0 at at1xv}Pn4-FrJnG+sV8Ew*rElA_^Hry^+dia
z=k`##*5DaTQx|R+Ip*VR$$Wny at Hps;5$$}-(9?~H_{O5x29RGI7h5sL2XbPb&)Ft>
zD49&IZ%o8zA`QmklM!QuEjLrPg{sFRo|SmRn&FiLWQ(N;^@O-g=vFgbCE3})5Sgu_
z%zMf at bEqfObM-_<;tj})dGXa`RZrND1=A4;eD)x3hILw`dO~QwdP1h(_mp_nP1gLx
z at VUaS?O`9jZ~nAvYg?b{VLNHaIyoyUV%OtDzwW12%*LtN@`hx$^fqb8LHz0oJK8*7
z(>-5j%&uuZVODi>qu=ROyTv6>n9k^p at E1l=|D279VN=12`UBsM at d{#cdMA8iR&Dc&
zVo64!sN)Gk>FNp5R9;a&q`szkSbc4CgnGhyT|H40ahcL0jTuXWo2N35D}et1tML4j
zX4SU*u4gp6qo^Y|AODx0^bV#ez_>xl!4C(^XH0C~ef at L8jxXklBwzHaC;A%w#QPeb
bTH^l$i0=zUqKc`I00000NkvXXu0mjfGi(>%

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_authorities.png b/koha-tmpl/intranet-tmpl/prog/img/icon_authorities.png
new file mode 100644
index 0000000000000000000000000000000000000000..6376bf156b5e0b6fac9b260ece175a2a2f8152ef
GIT binary patch
literal 1721
zcmV;q21fabP)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H11~y4VK~#90?V4X~6h$1zKfk at ZQY{q91<?diqGAvYQCo;Xf)X&n
z2jxZOftWxIuf`X&#iTZ3tN7rf25m_+8WLjyKB$R`C>ld4K{Qs3hCh`D0gp;a3-<2z
z=fj?QJ2$txchuFA{U)2-?)-i;pWB<=nYsCjsxlSj{MP{WDglpM33%K}z~fc|9=8(k
zxHV<L(@_IOBn2!6+JL)&CQH}^a1uBM>{r!OB9Z}~25zj<-WYHg7y!Ok)nX(dRSi6V
z8NjQh2DFBw2<!l|z#?EMLe5yJtr?+QA<%0|cd!;<^T+`kfa$>Ah&d;LHFbdln=TW$
z{BVIsfop*?HRNro#wWIggoxY#d{^owHk~cOm~wzQRdW6SRs%DEzKA&&fIC$6WJQVP
zP7ClUmEZm- at DPv<>0T|sI_!OV7-+EMWJ`4)wd8yX-VF}yD!^Jx@@}9p<XQLzI0!rs
zECe#ZE=yex2h`J8YRk-78wI?}NcuIxUEXHoTm-HHnoC`zylh)YUD;Bb<vGupakc at d
z)i~d&syRzsx!R2L&s6oIs*d8lNrGa1Dz&xKxO}%6X9G8b4hA(;lKEx#lzrYE5^Iy$
zW+d<_AshH1<2>-EEosm=Usv||;gDFH%r;FXE4W$lMiI$|G-Up?t3;$(M6Lqv4~g}u
z)YeAhawPBp<9sgACnAjj?U^tQc=MD3umta|GYA|3J`aFy#2cLE8bt>xf+u4DDuE7L
za)$7_O-qDVU`+$iWDWW4z<J;kU|PhSzce{Rew~x7Gr)Ct6DhZbyt*e at lR2&3i#K)M
zfH#%B9N_w=wPo<NEF^~T77bavhqG8CaO8!AwU65rap_h7P5>{dYF<R<0V{x;fcbb2
zv8lS2Zjr(NZ at Qv}{3)RXJZ>f6aVr6jTM2mFO2Fe*0v@*#@VJ$L$E^fBZYAJxD*=yN
zQx-h3d*a=9CH2$%mc=5{rlNN#V)+YBCqy}^4#zS@*}r93?$nM$lF7NVo_2*BQKzCk
zLB~)zjOxHG!z156^2j9p1-JdHIWr2=irY~h2d<9xH34uH`W!8E6y1hvoV5EM%A$~*
zafCP1f26i-S$_6H-QYcg*)^!Xf%k`Hy*dXxnQuz(&Wsn{M=SP(Y#K)7iO$yC$JGL=
zg7*w&H=){REv#J%vOYuVi#&yIslEeY&`En|Yp&l~WCMTUaLWx+kdUnuwQP$>pnF0c
zR!fnYNcjy3%(<Xxy<_X0BNbaImWNZsDa`Iy)P(*~M7Q7;zv@^zT6K&3#V=>IXoIX&
zM|zAtJxyHR$xk1-x$8E)wmheIpgD_^TCOVFfm_RpW;g|>A7nN7?{LK(?-`uE7Ucuq
zMP*NZeCGPD`;K3-!S)Ph*Qn~tg5(uGa at 2V%oBHi|&TV;1;W1xTqU*M{j_k43)4gv&
zW9I7fyAWejS9q|q_1uT$mn`pbU22 at 477Fdvpi40;1(txe3i_-{@yOW3y!3=CoAC^0
zWeievr at HID<Cla&JLqX&fh)_**a~n}@tFh^*%{O|yqHS&#8dbDa<OY!Zd48TgeBIe
zj-{hHMSSiF6%98bh~ZRl&`|e;sNWGG@{fDM5x;xFjJ3&Z(`52url=~rim~DE2K33l
zbHs04aP=SegsT5RGh=Ns+ccTL)>TA(6$`qtcc3}YJt2k(L10z)fo$_DUteG0o-kug
z^$s*=1@*ZnL?w!QLJaqW%vI8T-TM|)bx&yJbI{P>=#Hj_Qw7n~5=FLw3 at RJ}sp_8S
z-nXDpN%w*H-4l*hxF;+lr%3O?*`Fx7$|$Hh0Cf*ZLuRbyXW)8&Rs0~XcFKf){>;6<
zk5mH=7=RFDZ%5m?@Bs+w81hxxHN|;x!`u@!PZO#R`I9xtI*XH9g6pmT-G%3QxqJmo
zvZ}rgJ6m)8h&+I2pb66)wD at +uDfI#HINntDax{#{1J$4*<UQWmn)^6Ck-8n>HDElj
zDdqmmcwxXTI)_9H3l(0+ZmbE?IKpe`iPY^ub8)D_gb-=zCT_t|PGp_mU)p at P=C>cn
z&daBCg`;|ti_8b9a8LYeOSk{4uACu%swe at ETM2mFO2Fe*0v@*#@VNCSY%2Mgkg!t5
P00000NkvXXu0mjf{I)L&

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_cataloging.png b/koha-tmpl/intranet-tmpl/prog/img/icon_cataloging.png
new file mode 100644
index 0000000000000000000000000000000000000000..a85214a9809e6897b8052385b399b4f1743fff8e
GIT binary patch
literal 1172
zcmV;F1Z(?=P)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H11QAI@K~#90?b^MM8$}q$@$WNtG!)o at qu@`71kL#+h!jXDz7#Y_
z at GnGkNYG&U(jeiBMM;;Gya=Rpi0XVr%G~+xTKXV?gsk(X;w8Bm3ft1%WnX4zXU2Bq
zpR~n#XT2Ydp53))MvO76V$`Amu35ul=jDfs$fk%q6cLlLB_h%eiM<qKOyLG>0uKRG
zuq8m-<~yryKG9L}zR}U}A<!4`t*CGh=-~J)xDRwtd=@+p@;7h~cpLZ}_`?D}@r`$Z
z- at nrKj%Ck##k;^iywdiq5 at j<1nm*tzul$d%?0;0^+&VB6k*33SFUO(B{{_AU-UIFe
ze-*S3((^KdUW$mk_ at VzKK*tz!>~eBesXTS}SZ7`~4X3j+N~O)TM|?fYi^`_q<*Bj&
z{8?Fi{=p^27dMEH-}VBZ;akgwx38%s!<W00r})V-;7h-;7J$F*1-=0M_uk+$d@~aM
zN!s<D2ZYS at H%5o)4I47wWdSN}gzfpqz-wMhB?A62Q1kXw$-y@~;&ahn;TP~{q0!#q
z9`IJ^An*!!YjiO948L6hUkV)*UIJel9UN|fcS1*j=ir^u(cm-ub>Ii!3Gg);Z$#TI
zbzEf?^77BREnC*`*jdA4XAO^?m4$EGHvH<5Y`*ep{U<~|$!PM_h}zk0j*mRqa%0uw
z7HEK)7`@*=-iosHqY!S1o+lbU7hV!QPZWG6+z~xbO^n_jjJ8 at 8Y`IB=S47WK)97I+
zd at 9@ndY)kT^is)3|6^c)@D3th0Dl%-qo(m+HmU!B_C~Mg{VjUXYn^>M-?=w><Bq{R
zu((#DP&?h$c;w)GA?4qkhF>o2D)p=7nRSic?;q8xFF?QnZbUAvo)CRrYW0MO8v4My
zl*)ey_l=RC75W2%d<MK(^16vJy0hC(oE9K}8{Aha;TO7kLPQM*hjpjb6RB_`YKKU8
zt<- at FJ{7*(93Mr+Z<O!(%%@6Jyy03|eBlsW|9Gn{M(+c)s=i_k6GY$YHImc9rZ!`T
zgV9z?qlYXJ-s%O^ZH-3?)ge;ZVAR3hNqsx7nf06V0zULivK7AcF!QWz_L;6?3majg
zpR1d9-yQ#U^-$^GDzl#7AyUt)4c$vS<TS3*ZH-69=s0Bq at 27p}JRr2&PL8ACC4Kco
zrID=Qc*EhdbNMFike4~2{!zUtqK5dqVGV~H8{Gb~ahCcB_BMGnIIK6cQV00J7ofr8
zplA0+a-y`pg)ph~MHXoAJX+hmk({V=-EqcSq9MRAvopQ~8a&qc)$E<rw=wDf!?nW3
zCD9OYV87Q$P7#ZmcR)kn8Hqx?BN`%1rDWnOpdr#6P_L1k>gVdFz>mQ12>oY9c3jaA
m at a7Dim7R54!((S<;r|1GEY`Cq#&b3R0000<MNUMnLSTaXv_3rm

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_circulation.png b/koha-tmpl/intranet-tmpl/prog/img/icon_circulation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c28e88ab78d3b1bd67a4c983de3b73bedf1246b1
GIT binary patch
literal 888
zcmeAS at N?(olHy`uVBq!ia0vp^dO#e*!3HD+gWLZCDVAa<&kznEsNqQI0P;BtJR*yM
z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}CUp-wM
zLn`LHon`MW<0#QS|9(}hl&PoojgA(Ft{1VQ2bG#yJ6c_~oGtfwXTx!*QZ4t at mbQ*o
zwr&R&=4GEuniL!_vE)o%A at A_rw=n%cMSWRmeoUfV#lszQ#plW9wa?r;|4h$qkAllg
z;YYi7A45fI+jcAoxs#K^>1pYieIP=*R%vpkslz3K0G4^z_U%&6R7&iRHLjLkefZ2P
zF$1O?re_Pnq$^EUc^m6x_PpXrPd<C#Yey~5>hIF_Yo?wyp8LowM#y}#t?_IYIi~lG
zn^}$sxv%9rJ?U2ilY#Ts#5g8Cp>GxjoB0c+qPqS|YkXy at OgMVRF4j>mP^o)+sFM_{
zS_7-`Z^@PF>vk;BTwuR1F8Eht`T at -i98=D|alhQR<F)z*uiw|dewMDda6(!1cb`=W
z!{r0}mZW<2|C65(_OY1d%avD5y5F_TPlPW>Nt^#Vc2Cz2wt^zvrKi6z9Nv2Vbx5oE
z?6M=Z7PkWrSZrW>vgq5AR9XHrIz3k>vwd7W;aliZ#kf1B#Gs8wpL at 7hDSi6=u{HmD
zQKE#H at vEBS4Dz=%MO&xkXFuP*yN$&)z|>Z8-;9?Ak-Y`wWgjfUsun%$*?(`BwGdmF
zNLA6pCc`yL{y#G>Wx6gr|Nc8U;V_j6yT7<haHvvBF6*%L^Kao?q8^vh|DEgRW6#!I
zcVBk4p8C5lAkpy#&jdl8nVL7hxFoQ*HZK0QMBQuZxj4-e-fKkI`f93}7VNofn{})u
za!0_Kd0W(N1Mj_ at rxdd2CFjXsYp2aK*dh at Ta4x;x)Yt!r`1+FdO2^hKOEnrNcrJYQ
zd8hsT*SsD__buj=J+Os!Tl~5b-Tf;|?jHKm^1^azUU-!fM`+bdYcDn1#7(>$LcabU
z*P7=pSI at b-z{I-Zj*0EWuBQcc%d=%Je^%h|`gwf+_C;ToIMwj6uK)0|v*hv7STyum
ZT>CY at LbU&u7GN%6 at O1TaS?83{1OOCXkG%i@

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_koha.png b/koha-tmpl/intranet-tmpl/prog/img/icon_koha.png
new file mode 100644
index 0000000000000000000000000000000000000000..d69a62c4dfbec252bf6f0c034ce07ad5dccf3d0f
GIT binary patch
literal 1682
zcmV;D25tF?P)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H11`kO at K~#90?V4|BRb?E<KfiPDhM6**ZVk#Z8A?G0+iojJET|yJ
zv<Q2nuL7aW7fI at zicWNs41^G(tzbgEaQQ;%Re|V8lXjc-2Wmz*n}OPLZknX-p7ZO)
zy)#|+-t(Muo_l1lFFY{z{GQ+W?Addkf9ETz%0!fNw*kUx5<G5ASny;ilZ!|Vuo9>T
z9tGwBXMmGH8t7EjYoU^>s`Uai0Q-TPfEFpg14}|Z!!mFguoKAm0FN*2cMTj^0DK=1
z`1bNn?BGBhFc<+^fl**_Y~a8mU?d{+Sot;<a9}=g)e`hrsWW+Y=y_a3rT|^Qw6Hk}
z=uM-j2)+Fwc6)lPoG;l>0hX5tdaT at MeW-{?CD0zUT|hnV7Z7HQuLCMVv<sqIzkopC
zB2opc35{c}j9);|9^U}m8;&KA{_zVi2G8yE-im}{uIqjQL3(@za8G!aK(g24z_JJ+
zLFEfBxp}#GkVrLfp7>5o531_9VgaTgO9I43)qo!~n8PfM2opqKn*^DHH%0&nDkE^;
z!?K7>1*!{F9|Mk)-H#6gRb>A=b!LnObNb6*L-h!EZh)=>JAm3EZRP;)5qxtsKyJc_
zygLM5ye;t+;MoAX$Q8hi0O0Gboq))0?8l&uPAB8qFUIWD|2HtxG_T3aIX1pKRQ04m
z{2fx&ZlKd3bf2nTHqC1So&h{yuW8ae`q-ylfe(TtGy(4e4y$T^ki_G3)~Eh}s-6y#
z&;<Mx at Jo=Sc{HU+-6cZo at lC+{fuDjV9;Z~1y49+BF>pr1nIToA&hcq0zzOotBwayg
zDdXud_wa(JZs1i4+_>hTw-tcC2+S at uc)`_->^^1`*a9rb{Vqv%+5f5lbU*M|SZHH#
zgFo!xZBXaP9s~+4G)JTKv~BQNz-JU+Auj+eK$(qa8l8YlB_g#zQ*M|{&6Pf~7f6Rx
zb=2CkY=XzB3H#M;5<G5Ag2$~%@VGSz9=A&Bp4gqPt{IigO3|!)LSdf384o!rqUrMT
z^3Hb`UI^u$D9Mt)vu8$wh_eoOg{(25kOmaq-jo{pBIq-$g17fd*`Pafn+O|#glRj4
zj!mhdRY9I*4SdIURSQJj{bKN`FF%Q_ZEm=<$2i;ucx&&BIy~n~V0MHw89|@hn7Z6;
z5*&F}Y3r$6gy$R~8Z<ysvlpdCiqzw6Jyr7+w->Q!L~y+N=K5jZtG>`Z-g5NeDW14p
zR-pkrF>+6Y1}~d7vM2P5SVW4vWD*x at sI;bMEeG8nxS^@MvYO_`i$!m at 0{3{!iHb_l
zlDa1xGWOjQ$z-DB?g`gXyY7j$Q`4&?2KR)B*mX~6CK-!+Lh$T;%io=@t^tX~J>hwd
zJ at -TgH#YZ#gWBtHMPqYMs8|{*E#FM92A+ycWGE%^t6z)}czLosR`<lF)FnIa2^Eda
zJs~#T6N1F&o)Am!iI(2`r<S4l-4n_&9FC)m2n>T(DH6#&kx?;nPxyi-MsGYc?(}#A
z;eE$(JDci8e#_Hj`_A;NIik7-VVxQ7EuGtv8v5BJ&==fEdUN at 219=rsmo_(EK2oer
z?&VtFny&m2_yj07fe~ddm~B^m$G9kSb3b0i at t*O6zFp0!p-%;U0dNh%ugOiX!!)-q
zxJq_>i)e?*k!rj)rY?7 at Xs1EwzNV*#ExIQ>$pD_~X?XX9>-f4SJW1GfPpBh(pocd<
zF&x at GQSKzp7ONNGz~+WQyY7hu?kT~E<eqTd(W34Nb<6C#Cz={Y`c<R3CtSxV=$=qy
zwcq(NpA1$`RY&B9LbWZ3PYw|gU7Np#&o`wmg*tQ_E%~087${U%o}RI6XS#Ap{#udN
zp31GjlmDwh{=6xf&<7L4>j{xU3qxD)>_+vxW1!nTNp@{+7(Cr_RFY-WD;DC(E|BN*
zG&}1$yu77;DD)7tbLrVrc at Vkfzx{*kJz}93vU}9YytcLe%3o2QY2}NAka<H%UIShS
z9>^c17ZvBDDracNs`}_=1gjVOyG~Zrx}MX7N}b$tPiUWr(>_av4%q-6)1-SMZcT#6
ctqBYMFPts*_?=ZkQvd(}07*qoM6N<$f~STUDgXcg

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_lists.png b/koha-tmpl/intranet-tmpl/prog/img/icon_lists.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f612e5d24455bce909463fdff98e68da1590795
GIT binary patch
literal 881
zcmV-%1CIQOP)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H10`5sfK~#90?V3SLR8bg)pKnG3X%QJhZbAqW7lJ~LMF~QSplzF$
z{)QG7iMTP57A;%2bSwRUz+DzmR at g#Uf(vV-lTg^EnR(j?<;*m5&fGg^yu*3mz;L;9
zc;@ik at 6NsFHA!TVT&D$EC5ne8v*JC~2h1!Fi~+rlbL>mnPu0o=Nv8&|4#;DafxFf7
zw0qPml{=olJqJv;ux5#{>OO8}tu*!>;7dZ6U0_~P#p&!irQ%a2X^;C!N~M#yHiX))
zQpEwV0vtNd*9Xi1*IWf!rb($h^u5}F+q7OP57H`?Z!N4vke=SGRJ at V22UyzkR&&-a
zPG`JU+{}i7amUjIY)Ja*ZRLQo_=)rmer0fMW`mM`dYd)Dr&PxAuif*&RnPA at k^041
zhgCECm2?hCFaA9cLVPrZISRlj at vL-}ni9>5cnwiJG*LV>T_v9S?YSM)y8%rBBPXBV
z26XYFMqJVsu+;$<FS at G6GeHy&O%xAJ6c3G$_zrN~E|DgDu0Bxne!LN8HUwNw&&Qc<
zNk2}x#0}cOMDfr>@z6x^&_waj)I2P&tyzBe%7w8qd8f_NUf7?VECx?c)ZFryK3rM{
z`2-Ov$nHHU6knyQ)|fh_;w24`lW95)86WDbc)$O at E@Q`(EIm;XyQRX>`~q(2iFCG7
z#EAaB{b~s_=-KT5#C2Y}oPVaeilG$K6UK^=Q+mQ=eV`ezwx=f=ic7XUH&J}<GvU*Z
z{jaUU>ttHZX;><jlXrR||2s?~F7<uR$2X4li0O&{<F(?8n*+l+%1-GC$wbLE=58K#
zHa)SpIWU}4**QI72zqq<?9IU7?5%^&r6*2S+B-c_I#<eOdcv^PrT6`b(i1XP=O(^~
zO-~3$llB;k>4`Hy6c0 at l4^3BzXEQyKm!`@&8v)2$hSC#{3P&+L(N3axXrg#%qIhV!
zUp!w?$I=r at nx0sGcX6m}x!~!E5^OI_7Grv%qeSu0WLEqSsteeo><&9s00000NkvXX
Hu0mjfA6b*W

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png b/koha-tmpl/intranet-tmpl/prog/img/icon_patrons.png
new file mode 100644
index 0000000000000000000000000000000000000000..23676dbd78824dab551ffcd9ef28002b393d6181
GIT binary patch
literal 1951
zcmV;Q2VnS#P)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H12OLR6K~#90?VDk2TUQmwf9J(^tEFjXCv^R=O=<@lAb~1n&OX4(
z_yCO1uoe+%LtCd-Qzw`<38 at s4R763GN1>lK1|phh#8?L^Q$n+~VSHGa;KSlYtAdnv
zrA;-MSXmQ$Z5N<+?8ArmyuG^i^LzHS*QohRN3!2L_ncp@@4fH(`b1Qf<tXc;2B=mm
z;EmP_ctIkvLqraX$iEyrEFwEh=RsAC7|;$J1+<JE1=@|}GYCHB0bQ`Ms|p<G at c~`1
z9uqlDjq$J7$+xUbfp^r&x2&%D<#4)AzGY<!{BWIo%j=q64ju4 at K7hnYYD~`KeH(DQ
zbLn+pR8<cc&0`w8Q3{z1CL+zi2H+N8qjPx<I1QXp)kR~;42<nK at H^lgDo at UL9N+jy
zGC2VOz6MPCfGuZ}P7G-XIIs#hQUh?Y9RXI=6&#2FFBya`*h at g9F5o~I7<UrAg1zMZ
z1~^{@=y|8 at HYb)kvBUKMf7q3HqG;%B0S*8u57?CBv&B6$fC-n+!}S0^Q3|}or}AZB
z7<kvQVdq-O-Yfz?VH6x_F6zCK;6-hkfF>V)6GgF`{V at 669j@`|_kmP3r>eQ2?R at 77
zFjVIFuvg9k-vL_uwl5K{#ffp&6?d*4V|;`wC){`q;NvCYjno7D4j at yMC<nAw0p04f
zb;rs8cNhnE5<XUx?2Q_F{Eebmj|FNUFxgsQ7Ffdm3Rd-I343#P*oid at tThe}Y<9-@
zB0iVH0DnMXIb3vdY_1s`*bba5F^TE{?zWS__Nu^v{t^KTb_)0^5UK$<<it4Tk*7Zp
zIItSH;1RH3=YXFBcj9ATjlGY*(`j?gNBj%G>LB0(yy+vb+uj290h>z1+vMDPD`3nw
z%XNrX?>rJPiQ8s at y^hV+5a*F<CucV>Q$ylvZ3gJ}Vyk#OAtDyA)%mz at a@mbQ9$0WJ
z<$7H(fVLuwxn5hq+rU3vb`1N(EAPow3H)l+HGj<9aIJthS}Wj<)(Uu|wQRwS9_#}=
zk&Nz8<g%Yq1Rd>-rw^FSW9*SXIK8$#ln*^CaCfQu3KL7#(gOn>7v at dmGd5JhxzID^
zpaBH#4(CG8n964ad}ykz2jQNIj>0`dQ*AvaavA{_QQs92L43VrW~fMjiijY-9$L1`
zp&4)uP!SQt*F#3YRmFEjL=ayu8C%B_Q?ap%D~s}nzRuKE6Zwpd at odx5LuwzVm6XCn
zwrS}hQ~8X4SzdOJ{6@>@CTsu9`sPd~vq8~Y1ZyLJlAjagbR-fvv-`7Wja5(7+~Yq^
zw#W12cPnfbSnuVla8}?|3v2%m;`7N`@>U5hl9-BiA$$+`LY2AyjPldI&h!xo4iOmq
zsZ+A*VmdmCeYR~vM_Z!lZI6CjF9m572z+o>BBA%Aqat(##`BOWN0!#4w+(z+Gk)9n
zUdM;0B^+9ez92%Ez@(~vL*O~=!}p-NAn=?MV^V~!&|>t3;b{pQ2Vc<WPO&Q=P`K3J
znI7$pr|xfwrq_wm4Kjj|E*n5dgN%sM-4ac&>y4-G at 9#{HDqON}vt>b}JN@$bUJh0H
zZmH|e*nAOqad=w7sa))fIZMAO_R%y7V at -MaeJqrEW!LSR^^xP3#=!T_tZxQxtK_$<
zL$kokz{`gY$+rP|dIA+9+_ryaeY2nS-WPc0zq%&qt|lPx<+<$NJU!)mRY at dcbJ#V7
zfc{&NAB8hb&+hr$xr@~R{^YM8Ysp4(4+#20kQ<!KXZqr)jh+o1`R+$WUj6W$+#v9D
zHj+CSh}NZSBzI8YX%}=+4sZDew=DSuaM|P%=-M|OYxNtWpncP^R^f_gLDtFPkH at cL
zZ^!&=itaADJoEjI)Oo)#3Ub=axUVU?ySHQhHNP<eO}VAKHG*&)yVhjf!rB$2{pE?R
zUD(AoIfUa&d21v{dtZ}tC>h-h)=oitfa`!i_Qg|WPpyI|k&I0MUjhE3$RWu8sz08t
zIMzLv!^Bi{J7Vn><P-MqrghbIf<6fHU?SP}cQpTaUuXK)<($j*cw#EnkMMYzcBc^@
z&Ay-h)4*N2R1M|eq=dq2qF+LJ3cGCkN-2B$I#WZw!3QTdtPVGye;2z_%}evZAyJ<1
z?M(lr^1fQ+iK*!4Rk#oPzqQ&c#J`wbY+W~S*O~wM0tb;q^7<1Xw^j)3)<0DEt*AcV
z7f&B^-$*2*n^fdJQSJq9_8(GD_Ql`(WT_4*Gsabs*pnzf3jltzD0 at KmBwmjl7uACR
zD)KFmPf2xOw4N;YDSECdL&;dT1w#s-sUmIF68Kvl`upRl at v=UZmcv2BiX^Y!s#vb-
ziTq6<H=<7Ugs>oJ3S>cH0b~L4PW6P<2HGaj2HK`b40Wm}1Pk<Sus*1s5c0<|@%P3C
lSgD at 4y0ik`Xf0dt{{uTYzpv_j5#Rs-002ovPDHLkV1k5us)qmo

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_reports.png b/koha-tmpl/intranet-tmpl/prog/img/icon_reports.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5725c2ba8470cd2f38d094c8b46bbf0abc10c90
GIT binary patch
literal 1774
zcmV<K1`+v*P)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H125U(~K~#90?V4+d6=fL5f6ttATor5g?5bHR5?a;<nwQNasIc@?
zqDE^`eG!U^ASz1Kvh9?*f=G!$DpC+en1mHXHzJ`zc2ApKC~7e at yyWWYnx@w7nR)s!
zyW81wX7<cGGkb&m!~5a9 at 4V0RJ9B$4^A}ZRD9RdWfUp_{?{5uR at MK>G7m;g#*+4VU
ztg07c3$CiM6<}1s at 81B;D?b7&fr*iGMFgD%)B~RaM?2wO%4<Jc0Nzz>U>7i{- at t(s
z at FeiF57fQ@;9cb+uokfT6dYIt{8|FW1iY(!2#kpx9QW<BB_Ko?a0Pw<Dq{l&%78rv
z0Aaxu_!3A(1_z|`GMXfh0<OTeIKbD2NE{Vhf!jiZ0}F6pTLS_9Jtf{Wo<qKf2(X!f
zn-a_f?(6LUKd|M%jj`jH>A~I_{lHiE0f?y<ipW^M#v*VLnSy(%23kpAp<kod8NaLV
zSd4YOUxOF;9eoI5s_A|WUf`2rOnfwAf8X_jSHqPNljZA9U>@!WY$_Z0%CAv62a5kI
zME(Uvgh<q-!@yKkbt1$lDKGFAV0^^5Zvqb$!iz{PFx4<t*J#|(v$lAsKR~!)y0E-K
z-mnc!ix8`&<Xi>#C?@b8 at VNK+$06f12AQig`CYRRS^?}75ldbAWw`58Qx!j?9%p<G
z at ttw6Gd~je#IXO;K+{^_$RL7ufU!Zr>-qpZEc`El7ZSi2;KU$-f6R0R^jIH(o4_~V
zvl8kJJc0WL7%2E0Fe~h0xq{;Tzc|bGyj+FwuZCJI=LMY3|NDY*7aO>&0RAo9f$FkI
z;GF>{0Q+Nx?f{+*l0P(fCwv+3TIanN75We`KP<Enc-|kl4%izK_)p+zV008{RV|*@
z29=0Z<IX*n0CVwQEVKci<KDNsRrOM+goXLTg7*j_QUOc`uEKpDE&(mLgV;e;wIe4f
z%ozvxKxoK*bsGlnZw-U at w}!#{Tf^Y}tv+>6tZOL0My%xQggDK~5oOKK%s3I7dm`2$
z|CRldM?E$FNcSXaLpJ>z$hF<c;3t$_j%~gD-2B#KQF28B-}r5MmaVcJVYVnY024u8
zUQ=`W1sA;XEKu&z)e(3n;mE3$^G=7_LpQ!vb~H)qlvX at 0Di4EH3%E1wZt1N7!dMCq
z<Se~=LpELCQFC^E9cJ6oMi1x4hN?xaPWmTNc?GC8>Fc9WATOn|>Gw0gj2~mtF%WnL
zvFfu`TO3P2rI+tA5wtjUG51Yoe|crl4kf|29+a|FW5sSopNPg*LduL0$;5j*nj{tE
z at Dku6=iAbI5V<D~wo+2Kz12={4RUO+;2W|P&jX8Np$aPDk@{@<wo- at rg0E|=SOD^3
ztWW{vAX_p>uP4=~QN$8!z}yo8GgFOebN9shY~{eaCnS`6LI;I=BGYtvaQDRe1L-L;
zNZb=iO$K*Qh%JN0Js~Ov?g^Da<epFy_k<IhdqN_+C&a`(A+fn9k|ghJmyUUsWA2`C
zMC at G33GSZQkgbgDp6IA)n`$~uHB}LKeYUDa(MawIMc&NSoO!4aetlzAttD#Yo=`<4
zVeMNzr?rQBqUcsp^f(c1AA+t(W-H0mNH_e(@5-l%B;GY%ZwcV&N#Kh7>Y|5JmE&Q7
zd*;&>$!z7$t~tl5+2?*&_p6$*6z7k^IxqWPZ0?Dk at T$2B<)PdYBE{~BB5=#GKM2X`
zoiq==?)F3fbX+K3iYdGk0DRTFvrR;Iuk}zwcx_MEUl&$-PqIXJM&R at g85UmnwQkP2
z*1~E}@Q%@`&7dvOaSIvD;YIOW%6Wp<RiFG at kW37$#UMuT+Sp#xw%x16cZD<UaN7<Q
zK8uC6Kmp-xOL)|81oj25tyMdh)O$gj<Am;#pes_@^y>iL at bcQKxoro0`<L1~T=(s`
z>6Y4G025;&?kOkPo~T%P%c=7KnSED}Opg9*2g0~idt!N4y_W)QdTz>&pU^>WFK}~w
z%;XT(teJaeQ<%<ycWbvEl(O?}>CM2SxbC4SIxH&pufFN@{;&azx0&mk#$KoD)T1ml
zO{Q=Hl})+C$Zd6Vj$JhEpRdsS<Mj<y)hfCS(Ip`M?g^m{<#W)FN9D%s&foZtqFBC2
zWWG;VShh?~*m9NNOi-~d2~LYG$rIBLwH~ak9d=K2Ysh|e8wT%h4O#I20Dq;kes`^Z
QasU7T07*qoM6N<$g7v*ozyJUM

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_search.png b/koha-tmpl/intranet-tmpl/prog/img/icon_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..16a0b6adaa181f3616de348d410bb7998cb7fdeb
GIT binary patch
literal 2129
zcmV-X2(I^uP)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H12hK@EK~#90?V4+B99J2JpKrYDOWfMA9Ve-(LL96 at E7HbsZO62h
z(vt9_DiTIWjgTT5p;AO^N-31u30hVpv0H>l(>8 at lTq+U}L`{JPPzz35A`!<<?4*v=
zKtt0~6=G8FIu~D(-JOpgvtG}xXV-i8M)E6-e0=82cb=X7X3sfuUQt!9Mj7)BkggWM
z^R25E+?7gW5h(>)fi*y5`0sVV31BdM45;c`S>~KARZZ#u+JLtKP2%_kusGS+=^V)b
zF9Mzd%p{?wj}L%*as at 7le#b?m4)_c3F<bQ|-~ccL90$$<tAGaJ4xl9_%x+bEFoh&Y
zP6_U`0Iv~!7khyfb9_UafYF%i?#)}O03EiDP2g)_eM3p4*D~N$+x6#w+MI&}^}x8T
z<6S8ShH9)dnvStAAK)+AI(!ExPb)ZlJ|<<_vIQP*0BW_BA6C`z6dxS`RCPb_CtKC+
z>BMo;EN~H7iZ!SJgn)w?_R(uAugNf0L{4|S!B#$%?%lR&$X3oN_^r0`U>5o~ZY!@8
zk%}zDbOgU(D_3Tr4?Ac8n9M><M{xUB+n9wu?5Q`bs(~!TbOe7B>!Ad=UPP8>*oPhb
zScb78ngy<^lfXZ1RrjSEJUk7)*H)E{XU0;Tfnz%}gT at qaQ<?+N6Sg=L%rVc&#>iO;
zyk+aO4=73zx)})CVtg~_Lw>m9wOF}6-SKO{$|Rv<XNZRZBQM}#fG3HbYg_^z0^D)h
zuK at lSbIla+39Q-XsdUpWRqztvIcBeZrhoz9$AAae54;!CMzLmxp9Q{dt9u7nnp1Gw
z2e=D3;{cZE_!UrtwIYf=*9Vm496Stv4e$)$PXKF%)8TV5>GLm#wl8Lq_X*dW at gyQE
zum+aZz;fUu)`)vTRWCZUuLWLa_Ih*=uvt}uDMMuQNuT2zE5mvgV(<KZpg3o#k|lTp
zE8Sw at UjY^sEV%6hJnsPiH=v@>!3|)q1N;C`Q?TG+co*<H2l$h~@`42q!<U5fI~M+J
z;G+c#9)@2O&hJ?Ge*-rbEO;2cBAnk&Q-)Oq3m%5A28JErM}b>n+ZW7^gsS?0^;r3B
zS2a-UbU{HKzzx8=%-r$E3OZF{;Onv0r;o;Klh!1w5L7TZo~jnW^Q{H&d}{$b-&z3A
zw^DLXcwet8b(f8`Vi;>gwNb_Ho{&M*95l_Mfvsyl%(;6a=^?+nzq(D~X9)FkwN>PW
zpxgY0XSIJUW5PI^6Wn|3`bEX&RJWoXSo{0Q>OZ19(An%ekP%@VB?RBrzqrm2BicQo
zTtYY?%8;lWH_@|duu9MdRPI1#yC=Gud|7u-Bmfub9;iB~ur5-A9F&mx<;U0h-;Ecr
z`)JiBRoRKP002Odja!;Vf0Hd}NC3X0zp4X~UDJIlJhY|B|D07!tQ|*|EyK9-OOOrW
zst?5#xVf|8;<+qwJO3Q^3|7`7(i5o=p4rmm+no$FKv&DiNFZo#1RV)iEzy8$cjmY=
zas)R+t|zcw8vvXsE-vm&HL$1kyiY8TizSgSboW=crA6tWI0KMI+!G29f9saBY3=8C
zHu?9f+T0V8L-&OD at 7G4TCrV0+GjvbLjC(?IXhLwiiX%J00;kfw+mRS*Mz+{ha|kYI
z#64kZ<~zYgK%?9f-Xk at +aZi{w_k>91?uk%&l+7b>oy(US_k>YoWYs-k1Z*Y*k>Rg2
z=Eyx!dZjGNJ at JEqr5U*=OfhD_RdeT_c%=3HNo2-75hQqDy1~7#*OdwyaZiY3&pqMz
zJFX@#MauBKZGB5_N+-DMn)6=Z<KcfNC8)2Y6URx8;K7N??_+JW0+bkr`SX4Iq$riZ
z+m9}37Uj|D|5ascqRCmRas>CRJ2R!GY{uFt2BGEjimJc%99_IJnV{WAt2T+6e+H&M
zY+tb1w=)~S(@HoW-_c+FB*M3CRpTl=UMv2eIQ=^G^i{108S<<MciXBji(#zRP-p`p
z51JvPJsV5Agy2t~mXeEORXb50AbRz48DtpMV;K5h)VLM25%@@S1RYW2e$YBWo(fl<
z2?PRbJ)gSxznp<jYg_-~y9_aYie)HBGBCe}U<XCT^=g`ZQ74rnWufvrA8CC*?ZGIi
z*ArWt#|{R{U8{g+fkX>n1^ywb?VZiOFLpLx7?nV11k0l`BcWx|HL=Hwr2Tp%trz=N
zF4KS*s|8(->Pan<A@@|#iN|g~H_JWIJ#=lY2HY<@tVj0*#{HW;>r!`5<ZVadM~81H
zn{-X=1#OQ(cqvfs+vvGjucQ($uUjcz#BdK(?E<1!{VKc~l(KeD;|CMT#+sKspzQ<I
z&kNiiQ++64$~~Tz(F=|j#b{pM9R{2HU&Zol+12JY=<V*Ws7WTqynuU9GcfM|63XwR
z&**K4>y2b)r1QF6`1ENhxiD7s2T?u~bwW9<Ze72n!T(;oYv=Vfb4R^i4oX=&a4718
zP%l9_)ZJfuW4vn%VuRLuq^81c&<lE7^cfuq8M5KKjlSX7YYGA!z<ao|+U+WO1Ndaj
zDIX?xcD4B4v{x3)j)bT6ybsg89%QzA!Z2sKCkh4}tapwIpGJv1l%jm6t7)t^wr#<r
zid{W}mGz-e(QgIW+toDsL#H+c37(7!DpgX^0(ic4)q?*Y84|sevA$Ws00000NkvXX
Hu0mjfHmc at 4

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_serials.png b/koha-tmpl/intranet-tmpl/prog/img/icon_serials.png
new file mode 100644
index 0000000000000000000000000000000000000000..1904585b402a65b730d4cef87694df12527bd09b
GIT binary patch
literal 1245
zcmV<31S0#1P)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H11X@W%K~#90?V8_fQ)e8;pYLhXAsxD$B7*2v%GlUIVVGp>%3XRP
z&Rse1W`BW~n at t8Pu8|eSuDp<WGlv5~Q09dU3awCDmQ2{4UdYzDA%mp}m2R%{B##$4
z)->lm>3fp5Z%(`Ofsm8;eb4tiJ$=uw<Rc`p6>$a~pjVRMwn>89CJAnvl+GX#nF4Td
zle2V%<dOEzTEPM20US0Tr+0LNx3g+IML21MOy{V<mr1_Te;z$V<R*X*RDIj$;1rSj
zigB-6$Px+FRCzOM5fRxJQcIT=lGP|Hblcct0KfXnuLBtAGIkEYYf(1b!8ZUtj<Q0x
z;4>tT1AvIkqWkIaDuB at _8}48s>I(h*d)FXYG*KrC+vltj6%jcFV6UR<Hpx38k^=C#
zX1QsS(>eo9OqE5n4&+X1ZQJ-%v(~==>;xzIeZMt&!NgQ40@$zUx<T at Xe(Q%}Vyeso
z*rjOy#X#*)OiYy-6G5V4VyavL at P?x6BFS(2tsjPosd5^?u%f+gpmr!Gf>)uwkUcd}
zI}{VauK{>V(f%cXuMN~!V&dTZaDyQpfG;%5&FOB}#KCz0>RaB2Bp;FV&^iu`q6+T$
z?di6*=gUtN<4*z at Q?!2vVAHOus^EY4LE0Y-o-hC0IhdsJy{UuhZ19`^J}xbG;Kkiv
z*-orAcKh!uogJz at K9APZ&JF;V0PF!EeqUuX(y0)Uj{v;qf4m#$@BAr6L`KoN&)BJ`
z_a6Wozr6_7U(}9~ytQrw$-oQ1Q2>AXAqV+t064447}(=$f3k=R-~?J1mvI<+KGlQ(
z?g6+?a$YqcG<e+EvJcBiaN8uoZIcAIO%mKTNpRaF!EKWSw~f}rL8<IcK?ZA26mqp5
z><LNiiKv*fCknZmHG85|c5gzqyFF2=xc?t}V(Q1yeN8rd{`z7y-B>wu=&?C_g1$W=
z8`u+`a1M_2Y)_<`X at m9zF;mRfjsrlc;?APW>5#xxVej^YgXUoDiDJH%*b}<+y~igj
znNuPXuqTAPJ&~*5IX5e*^vfA7d!h+v`m=1+j)dR{7D)!|3C|JVo)}Ak%Ubq?L)x<^
zCbIRdX-|~OZiqc0HwyWs7~2!%yhzZVXs{7)d!q1eeQVkilV$gcDC`MwcyS_IkFPzE
zP7j at Ku6hA`LWU&X_QaEys#PqH1ukT7|GxMXhx)A^PXBxSpUgFkEC=j~2P1C0?TJFR
zwt+pd=s_}C_C!;}o;`8?u6w}oByh`{9(Epn^3Gq6&b)8go}j{>pu(OQB2J3KvCj5J
z!yAk};fS6+QOMTfWls<o2SmPF*xzPPh+TU^e0zcs?TN`s=8~lTUb810(waR{`pJD^
zPl$#+aiP3(l#+^-Jwf1DF;`n>Pbh!Ozfg9MQg|7VJ)57gD@{<&7xGJIJ3B%pgmVkK
z+~L&F35st|(4IX(fI{A*IM<80rNo|y1xaw*B*ATy1h>sIE<c7=n~imo00000NkvXX
Hu0mjfh;2*Q

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/icon_tools.png b/koha-tmpl/intranet-tmpl/prog/img/icon_tools.png
new file mode 100644
index 0000000000000000000000000000000000000000..a62de0923ff571ea737e1bb53835fdc7e1040e35
GIT binary patch
literal 1529
zcmV<V1qS+wP)<h;3K|Lk000e1NJLTq001rk003MF1^@s65mSf#00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ at H11$Ie9K~#90?V4YRRCN@`Kj+S at qAS|Yq at _k$t`BVphC7=N<wJ<j
zL#dmPmSD1wJ>-K#q${#+y1SuNXb)izn-xN}V2UpZ(wZ3I%&zv5ER+vYQiSf5|InS8
zdwQ5nr#pANcV>R~?g;aR3p2m-yXSnkdw%!s at 6K0LmHScFL<3Z+I(XQsgL_FtnnmRG
zd&E0L<PpF5LID?%#lUIc at q0{L2n_m#4;)-XrUEB`hkQ(L29Ej38^#rX1&Eh1f3b+n
z^O_U}__Gz9v)pS!7~s)@&yTuI5RnM*M8Qx^fZr<kyiP<0L}c2310oU!jsq_i%(K0c
zM!hB&(1_#v8lXi)Rs&OjBfxx*bBZ((-~cT^YP|kbN6ZEednFA6JY8aZdWrEvs`|56
z(lC1bS{ZYH1m5&BF${3edoqv#`hgXydev7}RSon2jsjZZxCZP4=9Qf{VCZE))&)2R
z>;z_1oI611*}xwz&^LfpRp$=~ItrX}fgS^v8L1Hv_`VW7y~$XO0H8OPfIeWfj$!Df
z<o`EuLZ1dEnXDz_1*?{b%mIeR7iFO?0j;X~r;$SAGV%Ztk;%X}6hq$z+D$_PW?BU}
zh<jhZW_k at 7>v3R93Fv)6L01h<ey8I0WE=#dL4sGjI7MUukOX3m&_(i#@p46peX63x
zIllEeN-^|J@{jXCp at H&S1rYLg5VyWw8)SP_)#E^S3FtjxL6;2<w3FWxI-$P>tT4fS
zFHR9zM1E`4=m=c^5~^BiZyAVuEza?GA4e&Mz7DJm8yb9oi%1ms8hFeRQecDn*pUY!
zAAS8Y?u+r=Fnij0_-U0FT*i(8U52h*Me+mwz2o}`uwMPH>Y(JKRVI<&iv33Z-N)RC
zY>~2Whqb2quWn(h4j#7Z;9;u{9=7V>UV88BjON~<cuDs}UozgY=S;k|+!MX2rp0#7
zIt^OVJ)xE^%!&^Bg%2FOdwA|tkP{%@?g^neYiVt`CmM3M%63omoNKB9_k^WoyC<xS
zRRbmjz5DC6*zWF$fdPr2cij^zS_|NM$33CKy53~dK==7scia<w$?5T5=ErK#Jz>cR
zg?kl|H4QhiEq%$Et1YrqRH8>f=l}mCop|?zDkD-n+ at g|8<q%i*L=LM4+!Ge*5`TDC
z_k=2kcC=lYc=tp!r)9Y(vMROVp0F*S?g`cYOk;FK*V9*gxhF#Cap@=><hqFT+fn<2
z?N6mImXkNo*AqRdre%VB2Sgkp8<ky=h<^CalF@%E$sHJY at 9@moYUj=hJnRVF6xCO^
zwWW_#lRuCi?>;F}?A%u_&>2OauNE2t0-w|vdmk5vrwE(3C(@@()G*#EeW|96iuAjL
zKIu%1ZZcKJ=oRld6JM&x$1b5CGL7lYCTkhH9qu_dbB<Vg7?|t`U1}h at rn5!IOw|HI
zSNx-2WpXx~b#+guSnY2o{xa^KFamxx9XkNhRvghcwzpnRnyBGa)!@BD at hyUGaE=SI
zzcZ0OSZ)4NstSDf(1XiS-Rm3|I5~D>^sQ=gd#U2v;qKuF7Ff1b?4D3AW+K_vt|eD%
z&ppw7e%7>zZMnNAL{|k34HbclG~CR7q3~pJh>p%g`X>Wio+=x>Cl%X?vZ^Sc?CoqF
z{n7}P50wSpmuhMkbcajmc&07A)ew^}`3B!L99yKw=j4qxg}Pwfw%2u`p05;4$`^QF
za(X;sySOKm>p5iQ)@S~%J at -WSNr@s2uI>pD-LNC!y(14op5W2O*h`8&R~(Vu+Y)Kd
z_a8yY6Wl^w-4mUO(OP#;NRfLYW6OG&SQCIJ_*moUXM*epeplpE&05R-zWWGLb at xQr
fs)L8E`xg9Prj?aSE0>>p00000NkvXXu0mjfnYGRy

literal 0
HcmV?d00001

-- 
1.7.4.1


From oleonard at myacpl.org  Wed Apr 18 21:17:53 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 18 Apr 2012 15:17:53 -0400
Subject: [Koha-patches] [PATCH] Bug 7980 - Group search results tag input
	with other actions
Message-ID: <1334776673-28789-1-git-send-email-oleonard@myacpl.org>

This patch hides the tag input form in OPAC search results when
TagsInputOnList is turned on. An "Add tag" is added to the
"Actions" line. Clicking the link un-hides the tag input form.
A "Cancel" link hides it again.

The patch also moves the display of ratings to the bottom of
the list so that existing tags are grouped with the other
title details which are prefixed with a label ("Type:",
"Availability", etc.).

To test, enable the TagsInputOnList system preference. Do a search
and try adding tags from the search results list.
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   32 +++++++-
 .../opac-tmpl/prog/en/modules/opac-results.tt      |   75 ++++++++++++-------
 .../opac-tmpl/prog/images/tag-small-disabled.png   |  Bin 0 -> 317 bytes
 koha-tmpl/opac-tmpl/prog/images/tag-small.png      |  Bin 0 -> 347 bytes
 4 files changed, 75 insertions(+), 32 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/tag-small-disabled.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/tag-small.png

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index c10e08d..44b8a08 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -689,6 +689,30 @@ input.deleteshelf:active {
 
 #tagslist li { display : inline; }
 
+a.tag_results_add {
+	background-image: url(../../images/tag-small.png);
+	background-position : -1px center;
+	background-repeat : no-repeat;
+	padding-left : 13px;
+	text-decoration: none;
+}
+
+#login4tags {
+	background-image: url(../../images/tag-small-disabled.png);
+	background-position : -1px center;
+	background-repeat : no-repeat;
+	padding-left : 13px;
+	text-decoration: none;
+	margin-left: 1em;
+}
+
+.tag_results_input {
+    background-color: #EEE;
+    display: none;
+    margin-left: 1em;
+    padding: 0.3em;
+}
+
 #placehold input.submit:hover,
 #tagsel_span input.submit:hover {
 	color: #990033;
@@ -1372,6 +1396,10 @@ padding-left : .4em;
 	font-size : 100%;
 }
 
+.results_summary.actions {
+    margin-top : .5em;
+}
+
 .m880 {
     display:block; 
     text-align:right; 
@@ -1385,10 +1413,6 @@ padding-left : .4em;
 	color: #707070;
 }
 
-#login4tags {
-	margin-top : .3em;
-}
-
 .results_summary .label {
 	color: #202020;
 }
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
index 2c12d44..9d34040 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
@@ -224,6 +224,24 @@ $(document).ready(function(){
                 tagAdded();
                 return false;
             });
+
+            $(".tag_results_add").click(function(){
+                var thisid = $(this).attr("id");
+                thisid = thisid.replace("tag_add","");
+                $(this).hide();
+                $("#tagform"+thisid).show();
+                $("#newtag"+thisid).focus();
+                return false;
+            })
+
+            $(".cancel_tag_add").click(function(){
+                var thisid = $(this).attr("id");
+                thisid = thisid.replace("cancel","");
+                $(this).parent().hide();
+                $("#tag_add"+thisid).show();
+                return false;
+            })
+
         [% ELSE %]
             $("#tagsel_tag").click(function(){
                 window.location = "/cgi-bin/koha/opac-user.pl";
@@ -504,6 +522,23 @@ $(document).ready(function(){
                     </span>
                 [% END %]
 
+                [% IF ( LibraryThingForLibrariesID ) %]<div class="ltfl_reviews"></div>[% END %]
+                [% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %]
+                                [% IF ( TagsShowOnList ) %]
+                                [% IF ( SEARCH_RESULT.TagLoop.size ) %]
+                                        <div class="results_summary"><span class="label">Tags:</span>
+                                        <ul style="display: inline; list-style: none;">[% FOREACH TagLoo IN SEARCH_RESULT.TagLoop %]<li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&amp;q=[% TagLoo.term |url %]">[% TagLoo.term %]</a> <span class="weight">([% TagLoo.weight_total %])</span></li>
+                                            [% END %]
+                                        </ul>
+                                   [% END %]
+                                    [% IF ( SEARCH_RESULT.TagLoop.size ) %]
+                                    </div>[% END %]
+                                [% END %]
+                                [% END %][% END %]
+                [% IF ( SEARCH_RESULT.searchhighlightblob ) %]<span class="results_summary"><span class="label">Match:</span> [% SEARCH_RESULT.searchhighlightblob %]</span>[% END %]
+
+
+
 
                 [% IF ( OpacStarRatings == 'all' ) %]
                 <div class="results_summary">
@@ -529,35 +564,8 @@ $(document).ready(function(){
                 </div>
                 [% END %]
 
-
-                [% IF ( LibraryThingForLibrariesID ) %]<div class="ltfl_reviews"></div>[% END %]
-                [% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %]
-                                [% IF ( TagsShowOnList ) %]
-                                [% IF ( SEARCH_RESULT.TagLoop.size ) %]
-                                        <div class="results_summary"><span class="label">Tags:</span>
-                                        <ul style="display: inline; list-style: none;">[% FOREACH TagLoo IN SEARCH_RESULT.TagLoop %]<li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=[% TagLoo.term |url %]&amp;q=[% TagLoo.term |url %]">[% TagLoo.term %]</a> <span class="weight">([% TagLoo.weight_total %])</span></li>
-                                            [% END %]
-                                        </ul>
-                                   [% END %]
-                                [% IF ( TagsInputOnList ) %]
-                                    [% IF ( loggedinusername ) %]
-                    <span class="label">New tag:</span>
-                                        <input name="newtag[% SEARCH_RESULT.biblionumber %]" id="newtag[% SEARCH_RESULT.biblionumber %]" maxlength="100" />
-                                        <input name="tagbutton" class="tagbutton" title="[% SEARCH_RESULT.biblionumber %]" type="submit" value="Add" />
-                                    <span id="newtag[% SEARCH_RESULT.biblionumber %]_status" class="tagstatus" style="display:none;">
-                                        Tag status here.
-                                    </span>
-                                       [% ELSIF ( loop.first ) %]<span class="tagstatus" id="login4tags">Log in to add tags.</span>
-                                    [% END %]
-                                [% END %]
-                                    [% IF ( SEARCH_RESULT.TagLoop.size ) %]
-                                    </div>[% END %]
-                                [% END %]
-                                [% END %][% END %]
-                [% IF ( SEARCH_RESULT.searchhighlightblob ) %]<span class="results_summary"><span class="label">Match:</span> [% SEARCH_RESULT.searchhighlightblob %]</span>[% END %]
-
 <span class="results_summary actions"><span class="label">Actions:</span>
-                                [% IF ( RequestOnOpac ) %]
+                [% IF ( RequestOnOpac ) %]
                     [% UNLESS ( SEARCH_RESULT.norequests ) %]
                         [% IF ( opacuserlogin ) %]
                             [% IF ( AllowOnShelfHolds ) %]
@@ -571,6 +579,17 @@ $(document).ready(function(){
                     [% END %]
                 [% END %]
 
+                [% IF ( TagsInputOnList ) %]
+                    [% IF ( loggedinusername ) %]
+                        <a class="tag_results_add" id="tag_add[% SEARCH_RESULT.biblionumber %]" href="#">Add tag</a>
+                        <span id="tagform[% SEARCH_RESULT.biblionumber %]" class="tag_results_input"><label for="newtag[% SEARCH_RESULT.biblionumber %]">New tag(s):</label><input name="newtag[% SEARCH_RESULT.biblionumber %]" id="newtag[% SEARCH_RESULT.biblionumber %]" maxlength="100" />
+                        <input name="tagbutton" class="tagbutton" title="[% SEARCH_RESULT.biblionumber %]" type="submit" value="Add" /> <a class="cancel_tag_add" id="cancel[% SEARCH_RESULT.biblionumber %]" href="#">Cancel</a>
+                        <span id="newtag[% SEARCH_RESULT.biblionumber %]_status" class="tagstatus" style="display:none;">
+                        Tag status here.
+                        </span></span>
+                    [% ELSIF ( loop.first ) %]<span id="login4tags">Log in to add tags.</span>
+                    [% END %]
+                [% END %]
 
                 [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( virtualshelves ) %]<a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]'); return false;">Save to Lists</a>
                 [% END %][% END %][% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/images/tag-small-disabled.png b/koha-tmpl/opac-tmpl/prog/images/tag-small-disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..4976cb023a97e18b400777336cff68ca7c955f7a
GIT binary patch
literal 317
zcmeAS at N?(olHy`uVBq!ia0vp^+(695!3-or^+GlRDVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5XYyx~jTq`RpzkmP!=g*&S- at et?
z*EcseH#IeV{ra`Dv$Lh8rMkNM_wV0-|NgD2s`~fuUq?qrPft%xP0g=gzyAOKzi~$8
zTA(>1B|(0{KrT99 at b`Z%2$WCvba4!+xRoRzCYC19#?ZjPba77rp96y-2RB#IN6x03
z42&!yNe>@BPG;Q5$i$&?_So4YN4S;%nQNv5dw6i1VB}EfFsn;TbE`{iU}%y$c>df8
rMIHeMgUzfgEG<A~$JiJf7?>I61hc)l?8A8*XeEQEtDnm{r-UW|oH~M7

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/images/tag-small.png b/koha-tmpl/opac-tmpl/prog/images/tag-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e8b39e51d138604f299d044fdb0ce91b470cdf9
GIT binary patch
literal 347
zcmeAS at N?(olHy`uVBq!ia0vp^+(695!3-or^+GlRDVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5X0t0+PTowH5-hKP`;?rNfgh`Ly
z|1n6K`r`9n&8Qy3<f*D5E%LrK|NsBjjOu>>?VnO$gKliUUczLR;1>1p4)ySMo!I_I
zAO0F7PyPM(zfxf1*I)mDiocn*e*hXTT at vIM4CLYf4C*G_ra)zxo-U3d6}OTmOq%p)
zQWHZ1LlQ$G8;7()gT#^_Dk?iv59Bm3FmV-jb$4?&-C$s3nItx8$`lc{OF(AWsdJ}K
zoKRL}6>t#9{gdP4qZ9-bHEoKV;_ASq(6As!(=d!rvw@*$qa%aD0R~$s&hjJdZAXEY
OGI+ZBxvX<aXaWG?l8yxc

literal 0
HcmV?d00001

-- 
1.7.5.4


From srdjan at catalyst.net.nz  Thu Apr 19 06:35:48 2012
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 19 Apr 2012 16:35:48 +1200
Subject: [Koha-patches] [PATCH] bug_7398: Replaced
	OPACDisplayRequestPriority syspref with OPACShowHoldQueueDetails
In-Reply-To: <bug 7398>
References: <bug 7398>
Message-ID: <1334810148-24288-1-git-send-email-srdjan@catalyst.net.nz>

New syspref is Choice, options being:
- None
- Priority only
- Holds number only
- Holds number and priority

Show holds count on OPAC detail
---
 admin/systempreferences.pl                         |    2 +-
 installer/data/mysql/sysprefs.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl             |   15 +++++
 .../prog/en/modules/admin/preferences/opac.pref    |   10 ++-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   31 ++++++++++
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |   34 +++++++----
 opac/opac-detail.pl                                |   24 ++++++++
 opac/opac-reserve.pl                               |   60 +++++++++++---------
 opac/opac-user.pl                                  |   11 ++-
 9 files changed, 139 insertions(+), 50 deletions(-)

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index f4069ae..ebc52de 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -348,7 +348,7 @@ $tabsysprefs{OPACViewOthersSuggestions}  = "OPAC";
 $tabsysprefs{URLLinkText}                = "OPAC";
 $tabsysprefs{OPACSearchForTitleIn}       = "OPAC";
 $tabsysprefs{OPACShelfBrowser}           = "OPAC";
-$tabsysprefs{OPACDisplayRequestPriority} = "OPAC";
+$tabsysprefs{OPACShowHoldQueueDetails}   = "OPAC";
 $tabsysprefs{OPACAllowHoldDateInFuture}  = "OPAC";
 $tabsysprefs{OPACPatronDetails}  = "OPAC";
 $tabsysprefs{OPACFinesTab}  = "OPAC";
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 7a3731c..65b428d 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -233,7 +233,7 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
 INSERT INTO `systempreferences` (variable,value,options,explanation,type)  VALUES ('CurrencyFormat','US','US|FR','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\'  in \'FR\' or \'360,000.00\'  in \'US\'.','Choice');
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('AcqCreateItem','ordering','ordering|receiving|cataloguing','Define when the item is created : when ordering, when receiving, or in cataloguing module','Choice');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowRenewalLimitOverride', '0', 'if ON, allows renewal limits to be overridden on the circulation screen',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('OPACDisplayRequestPriority','0','','Show patrons the priority level on holds in the OPAC','YesNo');
+INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('OPACShowHoldQueueDetails','none','none|priority|holds|holds_priority','Show holds details in OPAC','Choice');
 INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'UseBranchTransferLimits', '0', '', 'If ON, Koha will will use the rules defined in branch_transfer_limits to decide if an item transfer should be allowed.', 'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowHoldPolicyOverride', '0', 'Allow staff to override hold policies when placing holds',NULL,'YesNo');
 INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'BranchTransferLimitsType', 'ccode', 'itemtype|ccode', 'When using branch transfer limits, choose whether to limit by itemtype or collection code.', 'Choice');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 6e7ca1b..d4b0b9e 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5199,6 +5199,21 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
 }
 
 
+
+
+$DBversion = "3.07.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("UPDATE systempreferences SET
+                variable = 'OPACShowHoldQueueDetails',
+                value = CASE value WHEN '1' THEN 'priority' ELSE 'none' END,
+                options = 'none|priority|holds|holds_priority',
+                explanation = 'Show holds details in OPAC',
+                type = 'Choice'
+              WHERE variable = 'OPACDisplayRequestPriority'");
+    print "Upgrade to $DBversion done (Changed system preference OPACDisplayRequestPriority -> OPACShowHoldQueueDetails)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index eb74d81..3bd2441 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -79,11 +79,13 @@ OPAC:
                   no: "Don't include"
             - "COinS / OpenURL / Z39.88 in OPAC search results.  <br/>Warning: Enabling this feature will slow OPAC search response times."
         -
-            - pref: OPACDisplayRequestPriority
+            - pref: OPACShowHoldQueueDetails
               choices:
-                  yes: Show
-                  no: "Don't show"
-            - patrons the priority level of their holds in the OPAC.
+                  none: "Don't show any hold details"
+                  priority: "Show priority level"
+                  holds: "Show holds"
+                  holds_priority: "Show holds and their priority level"
+            - to patrons in the OPAC.
         -
             - pref: OPACShowCheckoutName
               default: 0
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index cc59fb2..5bbcdb7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -718,6 +718,11 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             <th id="item_status">Status</th>
             [% IF ( itemdata_itemnotes ) %]<th id="item_notes">Notes</th>[% END %]
             <th id="item_datedue">Date due</th>
+        [% IF holds_count.defined %]
+            <th>Item holds</th>
+        [% ELSIF show_priority %]
+            <th>Item hold queue priority</th>
+        [% END %]
         </tr></thead>
 	    <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
 	    <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
@@ -742,10 +747,36 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 		<td>[% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
 		[% IF ( itemdata_itemnotes ) %]<td>[% ITEM_RESULT.itemnotes %]</td>[% END %]
 		<td>[% ITEM_RESULT.datedue | $KohaDates %]</td>
+        [% IF holds_count.defined || show_priority %]
+		<td>
+            [% IF holds_count.defined %] [% ITEM_RESULT.holds_count %] [% END %]
+            [% IF ITEM_RESULT.priority %]
+                [% IF holds_count.defined %]
+                (priority [% ITEM_RESULT.priority %])
+                [% ELSE %]
+                [% ITEM_RESULT.priority %]
+                [% END %]
+            [% END %]
+                </td>
+        [% END %]
 	    </tr>
 	    [% END %]</tbody>
 	</table>
     [% END %]
+    [% IF holds_count.defined || priority %]
+	<div id="bib_holds">
+        [% IF holds_count.defined %]
+        Total holds: [% holds_count %]
+        [% END %]
+        [% IF priority %]
+            [% IF holds_count.defined %]
+            (priority [% priority %])
+            [% ELSE %]
+            Overall queue priority: [% priority %]
+            [% END %]
+        [% END %]
+        </div>
+    [% END %]
 [% ELSE %]
     [% IF ( ALTERNATEHOLDINGS ) %]
     [% FOREACH ALTERNATEHOLDING IN ALTERNATEHOLDINGS %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index a78bc68..48c5deb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -242,7 +242,11 @@
                   [% UNLESS ( item_level_itypes ) %]
                     <th>Item type</th>
                   [% END %]
-                  [% IF ( showpriority ) %]
+                  [% IF showholds && showpriority %]
+                  <th>Holds and priority</th>
+                  [% ELSIF showholds %]
+                  <th>Holds</th>
+                  [% ELSIF showpriority %]
                   <th>Priority</th>
                   [% END %]
 		  [% IF ( reserve_in_future ) %]
@@ -297,19 +301,23 @@
                         [% END %]
 
                     </td>
-                    [% IF ( bibitemloo.holdable ) %][% UNLESS ( item_level_itypes ) %]
-                                          <td>
-                                            [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
-                                [% bibitemloo.description %]
-                                          </td>
-                                        [% END %][% END %]
                     [% IF ( bibitemloo.holdable ) %]
-                    [% IF ( showpriority ) %]
-                    <td>
-                    [% bibitemloo.rank %] out of [% bibitemloo.reservecount %]
-                    </td>[% END %][% END %]
-		    [% IF ( reserve_in_future ) %]
-		    [% IF ( bibitemloo.holdable ) %]<td>
+		    <!-- HOLDABLE -->
+                        [% UNLESS ( item_level_itypes ) %]
+                        <td>
+                            [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
+                            [% bibitemloo.description %]
+                        </td>
+                        [% END %]
+                        [% IF showholds || showpriority %]
+                        <td>
+                        [% IF showpriority %] [% bibitemloo.rank %] [% END ]
+                        [% IF showholds && showpriority %] out of [% END %]
+                        [% IF showholds %] [% bibitemloo.reservecount %] [% END %]
+                        </td>
+                        [% END %]
+		        [% IF ( reserve_in_future ) %]
+                        <td>
               <input name="reserve_date_[% bibitemloo.biblionumber %]" id="reserve_date_[% bibitemloo.biblionumber %]" size="10">
               <script language="JavaScript" type="text/javascript">
               //<![CDATA[
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index afc9498..09d7f0f 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -486,10 +486,34 @@ if ($dat->{'count'} >= 50 && !$viewallitems) {
 
 my $biblio_authorised_value_images = C4::Items::get_authorised_value_images( C4::Biblio::get_biblio_authorised_values( $biblionumber, $record ) );
 
+my (%item_reserves, %priority);
+my ($show_holds_count, $show_priority);
+for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
+    m/holds/o and $show_holds_count = 1;
+    m/priority/ and $show_priority = 1;
+}
+my $has_hold;
+if ( $show_holds_count || $show_priority) {
+    my ($reserve_count,$reserves) = GetReservesFromBiblionumber($biblionumber);
+    $template->param( holds_count  => $reserve_count ) if $show_holds_count;
+    foreach (@$reserves) {
+        $item_reserves{ $_->{itemnumber} }++ if $_->{itemnumber};
+        if ($show_priority && $_->{borrowernumber} == $borrowernumber) {
+            $has_hold = 1;
+            $_->{itemnumber} 
+                ? ($priority{ $_->{itemnumber} } = $_->{priority})
+                : ($template->param( priority => $_->{priority} ));
+        }
+    }
+}
+$template->param( show_priority => $has_hold ) ;
+
 my $norequests = 1;
 my $branches = GetBranches();
 my %itemfields;
 for my $itm (@items) {
+    $itm->{holds_count} = $item_reserves{ $itm->{itemnumber} };
+    $itm->{priority} = $priority{ $itm->{itemnumber} };
     $norequests = 0
        if ( (not $itm->{'wthdrawn'} )
          && (not $itm->{'itemlost'} )
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 4e4d440..3844bc1 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -47,7 +47,13 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         debug           => 1,
     }
 );
-my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
+
+my ($show_holds_count, $show_priority);
+for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
+    m/holds/o and $show_holds_count = 1;
+    m/priority/ and $show_priority = 1;
+}
+
 sub get_out ($$$) {
 	output_html_with_http_headers(shift,shift,shift); # $query, $cookie, $template->output;
 	exit;
@@ -113,12 +119,8 @@ $template->param( choose_branch => $OPACChooseBranch);
 #
 #
 
-# Hash of biblionumber to biblio/biblioitems record.
-my %biblioDataHash;
-
-# Hash of itemnumber to item info.
-my %itemInfoHash;
-
+my %biblioDataHash; # Hash of biblionumber to biblio/biblioitems record.
+my %itemInfoHash; # Hash of itemnumber to item info.
 foreach my $biblioNumber (@biblionumbers) {
 
     my $biblioData = GetBiblioData($biblioNumber);
@@ -128,33 +130,36 @@ foreach my $biblioNumber (@biblionumbers) {
 
     my $marcrecord= GetMarcBiblio($biblioNumber);
 
-	# flag indicating existence of at least one item linked via a host record
-	my $hostitemsflag;
-	# adding items linked via host biblios
-	my @hostitemInfos = GetHostItemsInfo($marcrecord);
-	if (@hostitemInfos){
-		$hostitemsflag =1;
-	        push (@itemInfos, at hostitemInfos);
-	}
-
-
+    # flag indicating existence of at least one item linked via a host record
+    my $hostitemsflag;
+    # adding items linked via host biblios
+    my @hostitemInfos = GetHostItemsInfo($marcrecord);
+    if (@hostitemInfos){
+        $hostitemsflag =1;
+        push (@itemInfos, at hostitemInfos);
+    }
 
     $biblioData->{itemInfos} = \@itemInfos;
     foreach my $itemInfo (@itemInfos) {
         $itemInfoHash{$itemInfo->{itemnumber}} = $itemInfo;
     }
 
-    # Compute the priority rank.
-    my ( $rank, $reserves ) = GetReservesFromBiblionumber($biblioNumber,1);
-    $biblioData->{reservecount} = $rank;
-    foreach my $res (@$reserves) {
-        my $found = $res->{'found'};
-        if ( $found && ($found eq 'W') ) {
-            $rank--;
+    if ($show_holds_count) {
+        # Compute the priority rank.
+        my ( $rank, $reserves ) = GetReservesFromBiblionumber($biblioNumber,1);
+        $biblioData->{reservecount} = 1; # new reserve
+        foreach my $res (@$reserves) {
+            my $found = $res->{'found'};
+            if ( $found && ($found eq 'W') ) {
+                $rank--;
+            }
+            else {
+                $biblioData->{reservecount}++;
+            }
         }
+        $rank++;
+        $biblioData->{rank} = $rank;
     }
-    $rank++;
-    $biblioData->{rank} = $rank;
 }
 
 #
@@ -528,7 +533,8 @@ $template->param(itemtable_colspan => $itemTableColspan);
 
 # display infos
 $template->param(bibitemloop => $biblioLoop);
-$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;
+$template->param( showholds=>$show_holds_count);
+$template->param( showpriority=>$show_priority);
 # can set reserve date in future
 if (
     C4::Context->preference( 'AllowHoldDateInFuture' ) &&
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index a9a6305..aba6877 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -65,7 +65,10 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
+my $show_priority;
+for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
+    m/priority/ and $show_priority = 1;
+}
 my $patronupdate = $query->param('patronupdate');
 my $canrenew = 1;
 
@@ -260,8 +263,8 @@ foreach my $res (@reserves) {
     $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
     my $biblioData = GetBiblioData($res->{'biblionumber'});
     $res->{'reserves_title'} = $biblioData->{'title'};
-    if ($OPACDisplayRequestPriority) {
-        $res->{'priority'} = '' if $res->{'priority'} eq '0';
+    if ($show_priority) {
+        $res->{'priority'} ||= '';
     }
     $res->{'suspend_until'} = C4::Dates->new( $res->{'suspend_until'}, "iso")->output("syspref") if ( $res->{'suspend_until'} );
 }
@@ -271,7 +274,7 @@ foreach my $res (@reserves) {
 
 $template->param( RESERVES       => \@reserves );
 $template->param( reserves_count => $#reserves+1 );
-$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;
+$template->param( showpriority=>$show_priority );
 
 my @waiting;
 my $wcount = 0;
-- 
1.7.5.4


From magnus at enger.priv.no  Thu Apr 19 10:15:40 2012
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu, 19 Apr 2012 10:15:40 +0200
Subject: [Koha-patches] [PATCH] Bug 7982 - Typo in moremember-receipt.tt
Message-ID: <1334823340-1678-1-git-send-email-magnus@enger.priv.no>

Changes "Checked uut today" to "Checked out today".

To test:
Um, just looking at the patch should be enough, I think?
---
 .../prog/en/modules/members/moremember-receipt.tt  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
index 512f6d9..71fdc35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
@@ -23,7 +23,7 @@ Checked out to [% firstname %] [% surname %] <br />
 [% todaysdate %]<br />
 
 [% IF ( quickslip ) %]
-<h4>Checked uut today</h4>
+<h4>Checked out today</h4>
 [% FOREACH issueloo IN issueloop %]
 [% IF ( issueloo.red ) %][% ELSE %]
 [% IF ( issueloo.today ) %]
-- 
1.7.2.5


From dpavlin at rot13.org  Thu Apr 19 16:44:25 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Thu, 19 Apr 2012 16:44:25 +0200
Subject: [Koha-patches] [PATCH] Bug 7213 - simple /svc/ HTTP example
Message-ID: <1334846665-28488-1-git-send-email-dpavlin@rot13.org>

Simple command-line client which can authorize itself to Koha,
get MARC XML record based on biblio number and update record

This script can also be used as module using require "koha-svc.pl"
from other scripts which can implement MARC XML creation or parsing.

This is follow up version which now uses Content-type: text/xml
header when using POST method to be in sync with documentation at
http://wiki.koha-community.org/wiki/Koha_/svc/_HTTP_API
---
 misc/migration_tools/koha-svc.pl |  132 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 132 insertions(+), 0 deletions(-)
 create mode 100755 misc/migration_tools/koha-svc.pl

diff --git a/misc/migration_tools/koha-svc.pl b/misc/migration_tools/koha-svc.pl
new file mode 100755
index 0000000..9009e35
--- /dev/null
+++ b/misc/migration_tools/koha-svc.pl
@@ -0,0 +1,132 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+
+use LWP::UserAgent;
+use File::Slurp;
+
+if ( $#ARGV >= 3 && ! caller ) { # process command-line params only if not called as module!
+	my ( $url, $user, $password, $biblionumber, $file ) = @ARGV;
+
+	my $svc = Koha::SVC->new(
+		url => $url,
+		user => $user,
+		password => $password,
+		debug => $ENV{DEBUG},
+	);
+
+	if ( ! $file ) {
+		my $marcxml = $svc->get( $biblionumber );
+		my $file = "bib-$biblionumber.xml";
+		write_file $file , $marcxml;
+		print "saved $file ", -s $file, " bytes\n";
+		print $marcxml;
+	} else {
+		print "update $biblionumber from $file\n";
+		$svc->post( $biblionumber, scalar read_file($file) );
+	}
+
+	exit 0;
+}
+
+package Koha::SVC;
+use warnings;
+use strict;
+
+=head1 NAME
+
+Koha::SVC
+
+=head1 DESCRIPTION
+
+Call Koha's C</svc/> API to fetch/update records
+
+This script can be used from other scripts as C<Koha::SVC> module or run
+directly using syntax:
+
+  koha-svc.pl http://koha-dev:8080/cgi-bin/koha/svc svc-user svc-password $biblionumber [bib-42.xml]
+
+If called without last argument (MARCXML filename) it will fetch C<$biblionumber> from Koha and create
+C<bib-$biblionumber.xml> file from it. When called with xml filename, it will update record in Koha.
+
+This script is intentionally separate from Koha itself and dependencies which Koha has under
+assumption that you might want to run it on another machine (or create custom script which mungles
+Koha's records from other machine without bringing all Koha dependencies with it).
+
+=head1 USAGE
+
+This same script can be used as module (as it defines T<Koha::SVC> package) using
+
+  require "koha-svc.pl"
+
+at begining of script. Rest of API is described below. Example of it's usage is at beginning of this script.
+
+=head2 new
+
+  my $svc = Koha::SVC->new(
+	url => 'http://koha-dev:8080/cgi-bin/koha/svc',
+	user => 'svc-user',
+	password => 'svc-password',
+	debug => 0,
+  );
+
+URL must point to Koha's B<intranet> address and port.
+
+Specified user must have C<editcatalogue> permission.
+
+=cut
+
+sub new {
+	my $class = shift;
+	my $self = {@_};
+	bless $self, $class;
+
+	my $url = $self->{url} || die "no url found";
+	my $user = $self->{user} || die "no user specified";
+	my $password = $self->{password} || die "no password";
+
+	my $ua = LWP::UserAgent->new();
+	$ua->cookie_jar({});
+	my $resp = $ua->post( "$url/authentication", {userid =>$user, password => $password} );
+	die $resp->status_line unless $resp->is_success;
+
+	warn "# $user $url = ", $resp->decoded_content, "\n" if $self->{debug};
+
+	$self->{ua} = $ua;
+
+	return $self;
+}
+
+=head2 get
+
+  my $marcxml = $svc->get( $biblionumber );
+
+=cut
+
+sub get {
+	my ($self,$biblionumber) = @_;
+
+	my $url = $self->{url};
+	warn "# get $url/bib/$biblionumber\n" if $self->{debug};
+	my $resp = $self->{ua}->get( "$url/bib/$biblionumber" );
+	die $resp->status_line unless $resp->is_success;
+	return $resp->decoded_content;
+}
+
+=head2 port
+
+  my $marcxml = $svc->post( $biblionumber, $marcxml );
+
+=cut
+
+sub post {
+	my ($self,$biblionumber,$marcxml) = @_;
+	my $url = $self->{url};
+	warn "# post $url/bib/$biblionumber\n" if $self->{debug};
+	my $resp = $self->{ua}->post( "$url/bib/$biblionumber", { POSTDATA => $marcxml } );
+	die $resp->status_line unless $resp->is_success;
+	return $resp->decoded_content;
+}
+
+1;
-- 
1.7.2.5


From dpavlin at rot13.org  Thu Apr 19 16:48:42 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Thu, 19 Apr 2012 16:48:42 +0200
Subject: [Koha-patches] [PATCH] Bug 7213 - simple /svc/ HTTP example
Message-ID: <1334846922-28880-1-git-send-email-dpavlin@rot13.org>

Simple command-line client which can authorize itself to Koha,
get MARC XML record based on biblio number and update record

This script can also be used as module using require "koha-svc.pl"
from other scripts which can implement MARC XML creation or parsing.

This is follow up version which now uses Content-type: text/xml
header when using POST method to be in sync with documentation at
http://wiki.koha-community.org/wiki/Koha_/svc/_HTTP_API
---
 misc/migration_tools/koha-svc.pl |  132 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 132 insertions(+), 0 deletions(-)
 create mode 100755 misc/migration_tools/koha-svc.pl

diff --git a/misc/migration_tools/koha-svc.pl b/misc/migration_tools/koha-svc.pl
new file mode 100755
index 0000000..7368b2d
--- /dev/null
+++ b/misc/migration_tools/koha-svc.pl
@@ -0,0 +1,132 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+
+use LWP::UserAgent;
+use File::Slurp;
+
+if ( $#ARGV >= 3 && ! caller ) { # process command-line params only if not called as module!
+	my ( $url, $user, $password, $biblionumber, $file ) = @ARGV;
+
+	my $svc = Koha::SVC->new(
+		url      => $url,
+		user     => $user,
+		password => $password,
+		debug    => $ENV{DEBUG},
+	);
+
+	if ( ! $file ) {
+		my $marcxml = $svc->get( $biblionumber );
+		my $file = "bib-$biblionumber.xml";
+		write_file $file , $marcxml;
+		print "saved $file ", -s $file, " bytes\n";
+		print $marcxml;
+	} else {
+		print "update $biblionumber from $file\n";
+		$svc->post( $biblionumber, scalar read_file($file) );
+	}
+
+	exit 0;
+}
+
+package Koha::SVC;
+use warnings;
+use strict;
+
+=head1 NAME
+
+Koha::SVC
+
+=head1 DESCRIPTION
+
+Call Koha's C</svc/> API to fetch/update records
+
+This script can be used from other scripts as C<Koha::SVC> module or run
+directly using syntax:
+
+  koha-svc.pl http://koha-dev:8080/cgi-bin/koha/svc svc-user svc-password $biblionumber [bib-42.xml]
+
+If called without last argument (MARCXML filename) it will fetch C<$biblionumber> from Koha and create
+C<bib-$biblionumber.xml> file from it. When called with xml filename, it will update record in Koha.
+
+This script is intentionally separate from Koha itself and dependencies which Koha has under
+assumption that you might want to run it on another machine (or create custom script which mungles
+Koha's records from other machine without bringing all Koha dependencies with it).
+
+=head1 USAGE
+
+This same script can be used as module (as it defines T<Koha::SVC> package) using
+
+  require "koha-svc.pl"
+
+at begining of script. Rest of API is described below. Example of it's usage is at beginning of this script.
+
+=head2 new
+
+  my $svc = Koha::SVC->new(
+	url      => 'http://koha-dev:8080/cgi-bin/koha/svc',
+	user     => 'svc-user',
+	password => 'svc-password',
+	debug    => 0,
+  );
+
+URL must point to Koha's B<intranet> address and port.
+
+Specified user must have C<editcatalogue> permission.
+
+=cut
+
+sub new {
+	my $class = shift;
+	my $self = {@_};
+	bless $self, $class;
+
+	my $url = $self->{url} || die "no url found";
+	my $user = $self->{user} || die "no user specified";
+	my $password = $self->{password} || die "no password";
+
+	my $ua = LWP::UserAgent->new();
+	$ua->cookie_jar({});
+	my $resp = $ua->post( "$url/authentication", {userid =>$user, password => $password} );
+	die $resp->status_line unless $resp->is_success;
+
+	warn "# $user $url = ", $resp->decoded_content, "\n" if $self->{debug};
+
+	$self->{ua} = $ua;
+
+	return $self;
+}
+
+=head2 get
+
+  my $marcxml = $svc->get( $biblionumber );
+
+=cut
+
+sub get {
+	my ($self,$biblionumber) = @_;
+
+	my $url = $self->{url};
+	warn "# get $url/bib/$biblionumber\n" if $self->{debug};
+	my $resp = $self->{ua}->get( "$url/bib/$biblionumber" );
+	die $resp->status_line unless $resp->is_success;
+	return $resp->decoded_content;
+}
+
+=head2 post
+
+  my $marcxml = $svc->post( $biblionumber, $marcxml );
+
+=cut
+
+sub post {
+	my ($self,$biblionumber,$marcxml) = @_;
+	my $url = $self->{url};
+	warn "# post $url/bib/$biblionumber\n" if $self->{debug};
+	my $resp = $self->{ua}->post( "$url/bib/$biblionumber", 'Content_type' => 'text/xml', Content => $marcxml );
+	die $resp->status_line unless $resp->is_success;
+	return $resp->decoded_content;
+}
+
+1;
-- 
1.7.2.5


From dpavlin at rot13.org  Thu Apr 19 16:50:15 2012
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Thu, 19 Apr 2012 16:50:15 +0200
Subject: [Koha-patches] [PATCH] Bug 7213 - simple /svc/ HTTP example
In-Reply-To: <1334846922-28880-1-git-send-email-dpavlin@rot13.org>
References: <1334846922-28880-1-git-send-email-dpavlin@rot13.org>
Message-ID: <20120419145015.GA19194@rot13.org>

On Thu, Apr 19, 2012 at 04:48:42PM +0200, Dobrica Pavlinusic wrote:
> Simple command-line client which can authorize itself to Koha,
> get MARC XML record based on biblio number and update record
> 
> This script can also be used as module using require "koha-svc.pl"
> from other scripts which can implement MARC XML creation or parsing.
> 
> This is follow up version which now uses Content-type: text/xml
> header when using POST method to be in sync with documentation at
> http://wiki.koha-community.org/wiki/Koha_/svc/_HTTP_API

Sorry for spamming list, last patch didn't include changed code, just
commit message :-\

> ---
>  misc/migration_tools/koha-svc.pl |  132 ++++++++++++++++++++++++++++++++++++++
>  1 files changed, 132 insertions(+), 0 deletions(-)
>  create mode 100755 misc/migration_tools/koha-svc.pl
> 
> diff --git a/misc/migration_tools/koha-svc.pl b/misc/migration_tools/koha-svc.pl
> new file mode 100755
> index 0000000..7368b2d
> --- /dev/null
> +++ b/misc/migration_tools/koha-svc.pl
> @@ -0,0 +1,132 @@
> +#!/usr/bin/perl
> +
> +use warnings;
> +use strict;
> +
> +use LWP::UserAgent;
> +use File::Slurp;
> +
> +if ( $#ARGV >= 3 && ! caller ) { # process command-line params only if not called as module!
> +	my ( $url, $user, $password, $biblionumber, $file ) = @ARGV;
> +
> +	my $svc = Koha::SVC->new(
> +		url      => $url,
> +		user     => $user,
> +		password => $password,
> +		debug    => $ENV{DEBUG},
> +	);
> +
> +	if ( ! $file ) {
> +		my $marcxml = $svc->get( $biblionumber );
> +		my $file = "bib-$biblionumber.xml";
> +		write_file $file , $marcxml;
> +		print "saved $file ", -s $file, " bytes\n";
> +		print $marcxml;
> +	} else {
> +		print "update $biblionumber from $file\n";
> +		$svc->post( $biblionumber, scalar read_file($file) );
> +	}
> +
> +	exit 0;
> +}
> +
> +package Koha::SVC;
> +use warnings;
> +use strict;
> +
> +=head1 NAME
> +
> +Koha::SVC
> +
> +=head1 DESCRIPTION
> +
> +Call Koha's C</svc/> API to fetch/update records
> +
> +This script can be used from other scripts as C<Koha::SVC> module or run
> +directly using syntax:
> +
> +  koha-svc.pl http://koha-dev:8080/cgi-bin/koha/svc svc-user svc-password $biblionumber [bib-42.xml]
> +
> +If called without last argument (MARCXML filename) it will fetch C<$biblionumber> from Koha and create
> +C<bib-$biblionumber.xml> file from it. When called with xml filename, it will update record in Koha.
> +
> +This script is intentionally separate from Koha itself and dependencies which Koha has under
> +assumption that you might want to run it on another machine (or create custom script which mungles
> +Koha's records from other machine without bringing all Koha dependencies with it).
> +
> +=head1 USAGE
> +
> +This same script can be used as module (as it defines T<Koha::SVC> package) using
> +
> +  require "koha-svc.pl"
> +
> +at begining of script. Rest of API is described below. Example of it's usage is at beginning of this script.
> +
> +=head2 new
> +
> +  my $svc = Koha::SVC->new(
> +	url      => 'http://koha-dev:8080/cgi-bin/koha/svc',
> +	user     => 'svc-user',
> +	password => 'svc-password',
> +	debug    => 0,
> +  );
> +
> +URL must point to Koha's B<intranet> address and port.
> +
> +Specified user must have C<editcatalogue> permission.
> +
> +=cut
> +
> +sub new {
> +	my $class = shift;
> +	my $self = {@_};
> +	bless $self, $class;
> +
> +	my $url = $self->{url} || die "no url found";
> +	my $user = $self->{user} || die "no user specified";
> +	my $password = $self->{password} || die "no password";
> +
> +	my $ua = LWP::UserAgent->new();
> +	$ua->cookie_jar({});
> +	my $resp = $ua->post( "$url/authentication", {userid =>$user, password => $password} );
> +	die $resp->status_line unless $resp->is_success;
> +
> +	warn "# $user $url = ", $resp->decoded_content, "\n" if $self->{debug};
> +
> +	$self->{ua} = $ua;
> +
> +	return $self;
> +}
> +
> +=head2 get
> +
> +  my $marcxml = $svc->get( $biblionumber );
> +
> +=cut
> +
> +sub get {
> +	my ($self,$biblionumber) = @_;
> +
> +	my $url = $self->{url};
> +	warn "# get $url/bib/$biblionumber\n" if $self->{debug};
> +	my $resp = $self->{ua}->get( "$url/bib/$biblionumber" );
> +	die $resp->status_line unless $resp->is_success;
> +	return $resp->decoded_content;
> +}
> +
> +=head2 post
> +
> +  my $marcxml = $svc->post( $biblionumber, $marcxml );
> +
> +=cut
> +
> +sub post {
> +	my ($self,$biblionumber,$marcxml) = @_;
> +	my $url = $self->{url};
> +	warn "# post $url/bib/$biblionumber\n" if $self->{debug};
> +	my $resp = $self->{ua}->post( "$url/bib/$biblionumber", 'Content_type' => 'text/xml', Content => $marcxml );
> +	die $resp->status_line unless $resp->is_success;
> +	return $resp->decoded_content;
> +}
> +
> +1;
> -- 
> 1.7.2.5

-- 
Dobrica Pavlinusic               2share!2flame            dpavlin at rot13.org
Unix addict. Internet consultant.             http://www.rot13.org/~dpavlin

From magnus at enger.priv.no  Thu Apr 19 21:29:41 2012
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu, 19 Apr 2012 21:29:41 +0200
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_7984_-_Fix_the_upload=5F?=
	=?utf-8?q?local=5Fcover=5Fimages_permission?=
Message-ID: <1334863781-7623-1-git-send-email-magnus@enger.priv.no>

upload_local_cover_images is needed to use the new, cool local covers
feature

This patch
- adds upload_local_cover_images to
  installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
  from whch it was missing, making it impossible to use the local
  covers feature in an nb-NO installation
- translates the text of the preference for de-DE (thanks to cait,
  drojf and mveron for the translation)
---
 .../data/mysql/de-DE/mandatory/userpermissions.sql |    2 +-
 .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql
index 2302273..c14f0fd 100644
--- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql
+++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql
@@ -36,7 +36,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'manage_csv_profiles', 'CSV-Profile f?r Export verwalten'),
    (13, 'moderate_tags', 'Von Benutzern vergebene Tags moderieren'),
    (13, 'rotating_collections', 'Wandernde Sammlungen verwalten'),
-   (13, 'upload_local_cover_images', 'Upload local cover images'),
+   (13, 'upload_local_cover_images', 'Eigene Coverbilder hochladen'),
    (15, 'check_expiration', 'Ablauf eines Abonnements pr?fen'),
    (15, 'claim_serials', 'Fehlende Hefte reklamieren'),
    (15, 'create_subscription', 'Neues Abonnement anlegen'),
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
index 24f081e..2897c4e 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
@@ -57,6 +57,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'manage_csv_profiles', 'Administrere CSV eksportprofiler'),
    (13, 'moderate_tags', 'Behandle tagger fra l?nere'),
    (13, 'rotating_collections', 'Administrere roterende samlinger'),
+   (13, 'upload_local_cover_images', 'Laste opp lokale omslagsbilder'),
    (15, 'check_expiration', 'Sjekke utl?psdato for et periodikum'),
    (15, 'claim_serials', 'Purre manglende tidsskrifthefter'),
    (15, 'create_subscription', 'Opprette abonnementer'),
-- 
1.7.5.4


From chrisc at catalyst.net.nz  Thu Apr 19 23:55:02 2012
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 20 Apr 2012 09:55:02 +1200
Subject: [Koha-patches] [PATCH] Bug 6931 : Only update frameworks for the
	correct marcflavour
Message-ID: <1334872502-24078-1-git-send-email-chrisc@catalyst.net.nz>

---
 installer/data/mysql/updatedatabase.pl |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index e140ff3..40819c6 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3974,20 +3974,25 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 }
 
 $DBversion = "3.03.00.015";
-if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
-    my $sth = $dbh->prepare("INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, 
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    if ( C4::Context->preference("marcflavour") eq "MARC21" ) {
+        my $sth = $dbh->prepare(
+"INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, 
                              `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`)
-                             VALUES ( ?, '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 6, '', '', '', 0, -5, '', '', '', NULL)");
-    $sth->execute('648');
-    $sth->execute('654');
-    $sth->execute('655');
-    $sth->execute('656');
-    $sth->execute('657');
-    $sth->execute('658');
-    $sth->execute('662');
-    $sth->finish;
-    print "Upgrade to $DBversion done (Bug 5619: Add subfield 9 to marc21 648,654,655,656,657,658,662)\n";
-    SetVersion ($DBversion);
+                             VALUES ( ?, '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 6, '', '', '', 0, -5, '', '', '', NULL)"
+        );
+        $sth->execute('648');
+        $sth->execute('654');
+        $sth->execute('655');
+        $sth->execute('656');
+        $sth->execute('657');
+        $sth->execute('658');
+        $sth->execute('662');
+        $sth->finish;
+        print
+"Upgrade to $DBversion done (Bug 5619: Add subfield 9 to marc21 648,654,655,656,657,658,662)\n";
+    }
+    SetVersion($DBversion);
 }
 
 $DBversion = '3.03.00.016';
-- 
1.7.5.4


From marc at msys.ch  Fri Apr 20 00:04:04 2012
From: marc at msys.ch (Marc Balmer)
Date: Fri, 20 Apr 2012 00:04:04 +0200
Subject: [Koha-patches] [PATCH] Bug 6931 : Only update frameworks for
	the correct marcflavour
In-Reply-To: <1334872502-24078-1-git-send-email-chrisc@catalyst.net.nz>
References: <1334872502-24078-1-git-send-email-chrisc@catalyst.net.nz>
Message-ID: <180D9FCF-DFDE-40E8-9B23-73F8DB98A540@msys.ch>





Am 19.04.2012 um 23:55 schrieb Chris Cormack <chrisc at catalyst.net.nz>:

> ---
> installer/data/mysql/updatedatabase.pl |   31 ++++++++++++++++++-------------
> 1 files changed, 18 insertions(+), 13 deletions(-)
> 
> diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
> index e140ff3..40819c6 100755
> --- a/installer/data/mysql/updatedatabase.pl
> +++ b/installer/data/mysql/updatedatabase.pl
> @@ -3974,20 +3974,25 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
> }
> 
> $DBversion = "3.03.00.015";
> -if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
> -    my $sth = $dbh->prepare("INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, 
> +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
> +    if ( C4::Context->preference("marcflavour") eq "MARC21" ) {
> +        my $sth = $dbh->prepare(
> +"INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, 
>                              `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`)


this patch looks nice, but please remove the unnecessary MySQLisms. It is really not needed to use backticks here.

> -                             VALUES ( ?, '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 6, '', '', '', 0, -5, '', '', '', NULL)");
> -    $sth->execute('648');
> -    $sth->execute('654');
> -    $sth->execute('655');
> -    $sth->execute('656');
> -    $sth->execute('657');
> -    $sth->execute('658');
> -    $sth->execute('662');
> -    $sth->finish;
> -    print "Upgrade to $DBversion done (Bug 5619: Add subfield 9 to marc21 648,654,655,656,657,658,662)\n";
> -    SetVersion ($DBversion);
> +                             VALUES ( ?, '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 6, '', '', '', 0, -5, '', '', '', NULL)"
> +        );
> +        $sth->execute('648');
> +        $sth->execute('654');
> +        $sth->execute('655');
> +        $sth->execute('656');
> +        $sth->execute('657');
> +        $sth->execute('658');
> +        $sth->execute('662');
> +        $sth->finish;
> +        print
> +"Upgrade to $DBversion done (Bug 5619: Add subfield 9 to marc21 648,654,655,656,657,658,662)\n";
> +    }
> +    SetVersion($DBversion);
> }
> 
> $DBversion = '3.03.00.016';
> -- 
> 1.7.5.4
> 
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

From chrisc at catalyst.net.nz  Fri Apr 20 00:29:18 2012
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 20 Apr 2012 10:29:18 +1200
Subject: [Koha-patches] [PATCH] Bug 6931 : Only update frameworks for
 the correct marcflavour
In-Reply-To: <180D9FCF-DFDE-40E8-9B23-73F8DB98A540@msys.ch>
References: <1334872502-24078-1-git-send-email-chrisc@catalyst.net.nz>
	<180D9FCF-DFDE-40E8-9B23-73F8DB98A540@msys.ch>
Message-ID: <20120419222918.GL11642@rorohiko.wgtn.cat-it.co.nz>

* Marc Balmer (marc at msys.ch) wrote:
> 
> 
> 
> this patch looks nice, but please remove the unnecessary MySQLisms. It is really not needed to use backticks here.
> 
This patch adds an if, and reformats the code, it makes no other
changes other than that.

You are welcome to send a patch to remove the backticks, as a follow
up. 

Chris

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20120420/7e530038/attachment.pgp>

From colin.campbell at ptfs-europe.com  Fri Apr 20 13:36:57 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 20 Apr 2012 12:36:57 +0100
Subject: [Koha-patches] [PATCH] Bug 7987 Fix typo in circulation template
Message-ID: <1334921817-10586-1-git-send-email-colin.campbell@ptfs-europe.com>

li was not properly closed after loss of a character
---
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index e79cef1..a30234d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -269,7 +269,7 @@ function refocus(calendar) {
 [% END %]
 
 [% IF ( PATRON_CANT ) %]
-    <li>This patron can't check out this item per library circulation policy</i>
+    <li>This patron can't check out this item per library circulation policy</li>
 [% END %]
 
 [% IF ( NOT_FOR_LOAN_FORCING ) %]
-- 
1.7.7.6


From wizzyrea at gmail.com  Mon Apr 23 22:26:47 2012
From: wizzyrea at gmail.com (Liz Rea)
Date: Mon, 23 Apr 2012 15:26:47 -0500
Subject: [Koha-patches] [PATCH] Bug 7998 - CSS fixes for new interface adds
	slight transparency for news so logo shows through on
	mainpage.. Fixes purple header gradient in Chrome-based
	browsers. remove list from returns.tt options so checkboxes
	do not have bullets. fix missing gradient class on
	returns.tt. fix background color of div.action from white to
	the proper blue. - note: for memberentry.tt the edit links
	will need an additional look. reverse colors of menu div -
	blue for inactive, grey for active.
Message-ID: <1335212807-19663-1-git-send-email-wizzyrea@gmail.com>

---
 koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css   |   10 ++++--
 .../intranet-tmpl/prog/en/css/staff-global.css     |   39 +++++++++++---------
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   13 +++----
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
index f2f8922..6c7ca1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css
@@ -31,9 +31,9 @@
 #area-news h3 {
     /* Title section for the news block : transparency to let the koha logo appear */
     background-color: #EEEEEE;
-    filter:alpha(opacity=50);   /* for IE */
-    -moz-opacity: 0.5;          /* for Firefox before 0.9 */
-    opacity: 0.5;
+    filter:alpha(opacity=70);   /* for IE */
+    -moz-opacity: 0.7;          /* for Firefox before 0.9 */
+    opacity: 0.7;
     padding : .3em; margin: 0;
 }
 
@@ -44,6 +44,10 @@
     border-bottom: 1px solid #EEE;
     background-color : #ffffff;
     border-radius: 6px;
+    filter:alpha(opacity=75);
+    -moz-opacity: 0.75;
+    opacity: .75;
+    font-weight: 600;
     }
 
 .newsfooter {
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 68523d7..b293161 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -202,7 +202,7 @@ ol li {
         linear,
         left top,
         left bottom,
-        color-stop(0.1, rgb(212,214,255)),
+        color-stop(0.1, rgb(230, 240, 242)),
         color-stop(0.99, rgb(255,255,255))
     );
     display: inline-block;
@@ -712,7 +712,7 @@ fieldset.rows label.yesno {
 fieldset.action, div.action {
 	clear : both;
 	float : none;
-    background-color:#ffffff;
+    background-color:#F4F8F9;
 	border : none;
 	margin : 0;
 	padding : 1em 0 .3em 0;
@@ -1362,14 +1362,15 @@ div#menu {
 div#menu li a {
 	text-decoration: none;
 	display: block;
-	background: #eeeeee; /* Old browsers */
-	background: -moz-linear-gradient(left, #eeeeee 0%, #eeeeee 96%, #e6e6e6 97%, #cccccc 99%, #c1c1c1 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#eeeeee), color-stop(96%,#eeeeee), color-stop(97%,#e6e6e6), color-stop(99%,#cccccc), color-stop(100%,#c1c1c1)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* Opera11.10+ */
-	background: -ms-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* IE10+ */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#c1c1c1',GradientType=1 ); /* IE6-9 */
-	background: linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* W3C */
+	
+		background: #e8f0f6; /* Old browsers */
+	background: -moz-linear-gradient(left, #e8f0f6 0%, #e8f0f6 96%, #c1c1c1 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e8f0f6), color-stop(96%,#e8f0f6), color-stop(100%,#c1c1c1)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e8f0f6', endColorstr='#c1c1c1',GradientType=1 ); /* IE6-9 */
+	background: linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* W3C */
 	-moz-border-top-left-radius: 5px;
 	border-top-left-radius: 5px;
 	-moz-border-bottom-left-radius: 5px;
@@ -1382,14 +1383,16 @@ div#menu li a {
 }
 
 div#menu li a:hover {
-	background: #e8f0f6; /* Old browsers */
-	background: -moz-linear-gradient(left, #e8f0f6 0%, #e8f0f6 96%, #c1c1c1 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e8f0f6), color-stop(96%,#e8f0f6), color-stop(100%,#c1c1c1)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* Opera11.10+ */
-	background: -ms-linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* IE10+ */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e8f0f6', endColorstr='#c1c1c1',GradientType=1 ); /* IE6-9 */
-	background: linear-gradient(left, #e8f0f6 0%,#e8f0f6 96%,#c1c1c1 100%); /* W3C */
+	
+	
+	background: #eeeeee; /* Old browsers */
+	background: -moz-linear-gradient(left, #eeeeee 0%, #eeeeee 96%, #e6e6e6 97%, #cccccc 99%, #c1c1c1 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#eeeeee), color-stop(96%,#eeeeee), color-stop(97%,#e6e6e6), color-stop(99%,#cccccc), color-stop(100%,#c1c1c1)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#c1c1c1',GradientType=1 ); /* IE6-9 */
+	background: linear-gradient(left, #eeeeee 0%,#eeeeee 96%,#e6e6e6 97%,#cccccc 99%,#c1c1c1 100%); /* W3C */
 }
 
 div#menu li.active a:hover {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index cebcb09..d5e1b98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -43,8 +43,10 @@ function Dopop(link) {
 </script>
 </head>
 <body id="circ_returns" class="circ">
+<div id="header" class="gradient">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'checkin-search.inc' %]
+</div>
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
 
@@ -379,27 +381,24 @@ function Dopop(link) {
             <div class="yui-u">
             <fieldset id="checkin_options">
                 <legend>Options</legend>
-
-                <ul>
                     [% IF ( overduecharges ) %]
-                    <li>
+                    <p>
                         [% IF ( exemptfine ) %]
                         <input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" checked="checked" />
                         [% ELSE %]
                         <input type="checkbox" id="exemptcheck" name="exemptfine" value="exemptfine" />
                         [% END %]
                         <label for="exemptcheck">Forgive overdue charges</label>
-                    </li>
+                    </p>
                     [% END %] <!-- overduecharges -->
-                    <li>
+                    <p>
                         [% IF ( dropboxmode ) %]
                         <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" checked="checked" />
                         [% ELSE %]
                         <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" />
                         [% END %]
                         <label for="dropboxcheck">Dropbox mode</label>
-                    </li>
-                </ul>
+                    </p>
             </fieldset>
         </div>
     </form>
-- 
1.7.2.5


From robin at catalyst.net.nz  Tue Apr 24 07:02:11 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Tue, 24 Apr 2012 17:02:11 +1200
Subject: [Koha-patches] [PATCH] Bug 8001: improve styling potential of the
	tag list
Message-ID: <1335243731-5062-1-git-send-email-robin@catalyst.net.nz>

This adds the class name "tagterm" to the terms in the list of a user's
tags in the OPAC, allowing them to be seperately styled.
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
index e93e00a..86bf41c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt
@@ -112,7 +112,7 @@
 		<thead><tr><th>Term</th><th>Title</th><th>Date Added</th><th>Delete</th>
 		</tr></thead>
 	<tbody>[% FOREACH MY_TAG IN MY_TAGS %]
-		<tr><td><a href="/cgi-bin/koha/opac-search.pl?tag=[% MY_TAG.term |url %]&amp;q=[% MY_TAG.term |url %]">
+		<tr><td class="tagterm"><a href="/cgi-bin/koha/opac-search.pl?tag=[% MY_TAG.term |url %]&amp;q=[% MY_TAG.term |url %]">
 				[% MY_TAG.term |html %]</a>
 			</td>
 			<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% MY_TAG.biblionumber %]">
-- 
1.7.5.4


From colin.campbell at ptfs-europe.com  Tue Apr 24 15:34:46 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 24 Apr 2012 14:34:46 +0100
Subject: [Koha-patches] [PATCH] Fix typo in patch for bug 7849
Message-ID: <1335274486-12579-1-git-send-email-colin.campbell@ptfs-europe.com>

$type declared twice effectively throwing away the returned value
---
 C4/Circulation.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index b7e08f2..3742ec7 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1616,7 +1616,7 @@ sub AddReturn {
         if ($borrowernumber) {
         if($issue->{'overdue'}){
                 my ( $amount, $type, $daycounttotal ) = C4::Overdues::CalcFine( $item, $borrower->{categorycode},$branch, $datedue, $today );
-                my $type ||= q{};
+                $type ||= q{};
         if ( $amount > 0 && ( C4::Context->preference('finesMode') eq 'production' )) {
           C4::Overdues::UpdateFine(
               $issue->{itemnumber},
-- 
1.7.7.6


From oleonard at myacpl.org  Tue Apr 24 17:25:26 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 24 Apr 2012 11:25:26 -0400
Subject: [Koha-patches] [PATCH] Bug 8002 - Can't add patron attribute type
	in newer installation
Message-ID: <1335281126-11076-1-git-send-email-oleonard@myacpl.org>

Correcting patron_attributes_types definition in kohastructure.sql
to allow NULL entries for category_code, matching the definition
specified in updatedatabase.pl.

To test: Back up your Koha database, drop it, and recreate it.
Load the staff interface and go through the web installer. After
recreating the database enable ExtendedPatronAttributes and
try adding a new patron attribute type with no patron category
specified. The operation should be successful.
---
 installer/data/mysql/kohastructure.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index a210293..488a4f0 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -286,7 +286,7 @@ CREATE TABLE `borrower_attribute_types` ( -- definitions for custom patron field
   `staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff client (1 for yes, 0 for no)
   `authorised_value_category` varchar(10) default NULL, -- foreign key from authorised_values that links this custom field to an authorized value category
   `display_checkout` tinyint(1) NOT NULL default 0,-- defines if this field displays in checkout screens
-  `category_code` VARCHAR(1) NOT NULL DEFAULT '',-- defines a category for an attribute_type
+  `category_code` VARCHAR(1) NULL DEFAULT NULL,-- defines a category for an attribute_type
   `class` VARCHAR(255) NOT NULL DEFAULT '',-- defines a class for an attribute_type
   PRIMARY KEY  (`code`),
   KEY `auth_val_cat_idx` (`authorised_value_category`)
-- 
1.7.5.4


From oleonard at myacpl.org  Tue Apr 24 17:47:18 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 24 Apr 2012 11:47:18 -0400
Subject: [Koha-patches] [PATCH] Bug 8002 [REVISED] Can't add patron
	attribute type in newer installation
Message-ID: <1335282438-11960-1-git-send-email-oleonard@myacpl.org>

Correcting patron_attributes_types definition in kohastructure.sql
to allow NULL entries for category_code, matching the definition
specified in updatedatabase.pl. Adds an entry to updatedatabase.pl
to correct existing installations with the incorrect table structure.

After running the updated updatedatabase.pl the category_code
column in borrower_attribute_types should show that it allows
NULL entries. Adding a new patron attribute type with no
patron category specified should work correctly.

To test the update to kohastructure.sql: Back up your Koha
database, drop it, and recreate it. Load the staff interface
and go through the web installer. After recreating the database
enable ExtendedPatronAttributes and try adding a new patron
attribute type with no patron category specified. The operation
should be successful.
---
 installer/data/mysql/kohastructure.sql |    2 +-
 installer/data/mysql/updatedatabase.pl |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index a210293..488a4f0 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -286,7 +286,7 @@ CREATE TABLE `borrower_attribute_types` ( -- definitions for custom patron field
   `staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff client (1 for yes, 0 for no)
   `authorised_value_category` varchar(10) default NULL, -- foreign key from authorised_values that links this custom field to an authorized value category
   `display_checkout` tinyint(1) NOT NULL default 0,-- defines if this field displays in checkout screens
-  `category_code` VARCHAR(1) NOT NULL DEFAULT '',-- defines a category for an attribute_type
+  `category_code` VARCHAR(1) NULL DEFAULT NULL,-- defines a category for an attribute_type
   `class` VARCHAR(255) NOT NULL DEFAULT '',-- defines a class for an attribute_type
   PRIMARY KEY  (`code`),
   KEY `auth_val_cat_idx` (`authorised_value_category`)
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 84f0437..dd3483f 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5212,6 +5212,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.08.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("ALTER TABLE borrower_attribute_types CHANGE category_code category_code VARCHAR( 1 ) NULL DEFAULT NULL");
+    print "Upgrade to $DBversion done. (Bug 8002: Update patron attribute types table to allow NULL category_code)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
-- 
1.7.5.4


From magnus at enger.priv.no  Wed Apr 25 14:31:43 2012
From: magnus at enger.priv.no (Magnus Enger)
Date: Wed, 25 Apr 2012 14:31:43 +0200
Subject: [Koha-patches] [PATCH] Bug 8008 - Fix typo in man page for
	koha-create
Message-ID: <1335357103-1714-1-git-send-email-magnus@enger.priv.no>

Line 121 had "/etc/koha/koha-site.conf" instead of "/etc/koha/koha-sites.conf"

To test:
I don't think this needs any actual testing, just read the patch and check
that it looks sensible...
---
 debian/docs/koha-create.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index ec1e426..26559c9 100644
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -118,7 +118,7 @@
     <para>The Unix user has logins disabled.  The password for MySQL is generated randomly, and printed to the terminal.</para>
     <para>The instance name is used as the domain name (ServerName)  for  Apache. The public catalogue (OPAC), for library customers, is on port 80.  The staff client interface is configured similarly, depending on the settings in <filename>/etc/koha/koha-sites.conf</filename> or alternate config file.</para>
     <para>After  the  Koha  instance  is created, it is ready to be used, but the librarian needs to log in via the intranet and configure things.</para>
-    <para>Several configuration variables are available for adjusting this behavior. The variables are put into <filename>/etc/koha/koha-site.conf</filename>. The following variables are obeyed:</para>
+    <para>Several configuration variables are available for adjusting this behavior. The variables are put into <filename>/etc/koha/koha-sites.conf</filename>. The following variables are obeyed:</para>
     
     <variablelist>
     
-- 
1.7.2.5


From julian.maurice at biblibre.com  Thu Apr 26 17:41:45 2012
From: julian.maurice at biblibre.com (julian.maurice at biblibre.com)
Date: Thu, 26 Apr 2012 17:41:45 +0200
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_7295=3A_More_granular_pe?=
	=?utf-8?q?rmissions_for_baskets?=
Message-ID: <1335454905-29174-1-git-send-email-julian.maurice@biblibre.com>

From: Julian Maurice <julian.maurice at biblibre.com>

Add branch info to baskets
Add a list of borrowers that are allowed to manage a basket (one list
for each basket).
Add a new subpermission: acquisition => order_manage_all

If user is superlibrarian, or if he has permission acquisition = 1
(GranularPermissions = OFF), or subpermission acquisition =>
order_manage_all (GranularPermissions = ON). He's authorised to manage
all baskets.

Depending on syspref AcqViewBaskets:
  'all': user can manage all baskets
  'branch': user can manage baskets of his branch (the basket branch is
            taken into account, not the branch of the basket's creator).
            If basket branch is not defined, all user can manage this
            basket.
  'user': user can manage baskets he created, and baskets he's in their
          user list

There are unit tests in t/Acquisition/CanUserManageBasket.t, which
require Test::MockModule

You can edit basket's branch and users list in basket modification page
(acqui/basket.pl)
---
 C4/Acquisition.pm                                  |  149 +++++++++++++-
 acqui/aqbasketuser_search.pl                       |   77 ++++++++
 acqui/basket.pl                                    |   63 +++++-
 acqui/booksellers.pl                               |   26 +--
 .../data/mysql/de-DE/mandatory/userpermissions.sql |    1 +
 .../data/mysql/en/mandatory/userpermissions.sql    |    1 +
 .../data/mysql/es-ES/mandatory/userpermissions.sql |    1 +
 .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |    1 +
 .../data/mysql/it-IT/necessari/userpermissions.sql |    1 +
 installer/data/mysql/kohastructure.sql             |   15 ++
 .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql |    1 +
 .../data/mysql/pl-PL/mandatory/userpermissions.sql |    1 +
 .../ru-RU/mandatory/permissions_and_user_flags.sql |    1 +
 .../uk-UA/mandatory/permissions_and_user_flags.sql |    1 +
 installer/data/mysql/updatedatabase.pl             |   34 ++++
 .../prog/en/modules/acqui/aqbasketuser_search.tt   |   79 ++++++++
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   83 +++++++-
 .../en/modules/admin/preferences/acquisitions.pref |    2 +-
 t/Acquisition/CanUserManageBasket.t                |  204 ++++++++++++++++++++
 19 files changed, 708 insertions(+), 33 deletions(-)
 create mode 100755 acqui/aqbasketuser_search.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/aqbasketuser_search.tt
 create mode 100644 t/Acquisition/CanUserManageBasket.t

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index e881a16..62732a3 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -46,6 +46,9 @@ BEGIN {
         &GetBasketsByBookseller &GetBasketsByBasketgroup
         &GetBasketsInfosByBookseller
 
+        &GetBasketUsers &ModBasketUsers
+        &CanUserManageBasket
+
         &ModBasketHeader
 
         &ModBasketgroup &NewBasketgroup &DelBasketgroup &GetBasketgroup &CloseBasketgroup
@@ -146,8 +149,7 @@ sub GetBasket {
     my $dbh        = C4::Context->dbh;
     my $query = "
         SELECT  aqbasket.*,
-                concat( b.firstname,' ',b.surname) AS authorisedbyname,
-                b.branchcode AS branch
+                concat( b.firstname,' ',b.surname) AS authorisedbyname
         FROM    aqbasket
         LEFT JOIN borrowers b ON aqbasket.authorisedby=b.borrowernumber
         WHERE basketno=?
@@ -497,6 +499,149 @@ sub GetBasketsInfosByBookseller {
     return $sth->fetchall_arrayref({});
 }
 
+=head3 GetBasketUsers
+
+    $basketusers_ids = &GetBasketUsers($basketno);
+
+Returns a list of all borrowernumbers that are in basket users list
+
+=cut
+
+sub GetBasketUsers {
+    my $basketno = shift;
+
+    return unless $basketno;
+
+    my $query = qq{
+        SELECT borrowernumber
+        FROM aqbasketusers
+        WHERE basketno = ?
+    };
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($basketno);
+    my $results = $sth->fetchall_arrayref( {} );
+    $sth->finish();
+
+    my @borrowernumbers;
+    foreach (@$results) {
+        push @borrowernumbers, $_->{'borrowernumber'};
+    }
+
+    return @borrowernumbers;
+}
+
+=head3 ModBasketUsers
+
+    my @basketusers_ids = (1, 2, 3);
+    &ModBasketUsers($basketno, @basketusers_ids);
+
+Delete all users from basket users list, and add users in C<@basketusers_ids>
+to this users list.
+
+=cut
+
+sub ModBasketUsers {
+    my ($basketno, @basketusers_ids) = @_;
+
+    return unless $basketno;
+
+    my $dbh = C4::Context->dbh;
+    my $query = qq{
+        DELETE FROM aqbasketusers
+        WHERE basketno = ?
+    };
+    my $sth = $dbh->prepare($query);
+    $sth->execute($basketno);
+    $sth->finish();
+
+    $query = qq{
+        INSERT INTO aqbasketusers (basketno, borrowernumber)
+        VALUES (?, ?)
+    };
+    $sth = $dbh->prepare($query);
+    foreach my $basketuser_id (@basketusers_ids) {
+        $sth->execute($basketno, $basketuser_id);
+    }
+}
+
+=head3 CanUserManageBasket
+
+    my $bool = CanUserManageBasket($borrower, $basket[, $userflags]);
+    my $bool = CanUserManageBasket($borrowernumber, $basketno[, $userflags]);
+
+Check if a borrower can manage a basket, according to system preference
+AcqViewBaskets, user permissions and basket properties (creator, users list,
+branch).
+
+First parameter can be either a borrowernumber or a hashref as returned by
+C4::Members::GetMember.
+
+Second parameter can be either a basketno or a hashref as returned by
+C4::Acquisition::GetBasket.
+
+The third parameter is optional. If given, it should be a hashref as returned
+by C4::Auth::getuserflags. If not, getuserflags is called.
+
+If user is authorised to manage basket, returns 1.
+Otherwise returns 0.
+
+=cut
+
+sub CanUserManageBasket {
+    my ($borrower, $basket, $userflags) = @_;
+
+    if (!ref $borrower) {
+        $borrower = C4::Members::GetMember(borrowernumber => $borrower);
+    }
+    if (!ref $basket) {
+        $basket = GetBasket($basket);
+    }
+
+    return 0 unless ($basket and $borrower);
+
+    my $borrowernumber = $borrower->{borrowernumber};
+    my $basketno = $basket->{basketno};
+
+    my $AcqViewBaskets = C4::Context->preference('AcqViewBaskets');
+
+    if (!defined $userflags) {
+        my $dbh = C4::Context->dbh;
+        my $sth = $dbh->prepare("SELECT flags FROM borrowers WHERE borrowernumber = ?");
+        $sth->execute($borrowernumber);
+        my ($flags) = $sth->fetchrow_array;
+        $sth->finish;
+
+        $userflags = C4::Auth::getuserflags($flags, $borrower->{userid}, $dbh);
+    }
+
+    unless ($userflags->{superlibrarian}
+    || (ref $userflags->{acquisition} && $userflags->{acquisition}->{order_manage_all})
+    || (!ref $userflags->{acquisition} && $userflags->{acquisition}))
+    {
+        if (not exists $userflags->{acquisition}) {
+            return 0;
+        }
+
+        if ( (ref $userflags->{acquisition} && !$userflags->{acquisition}->{order_manage})
+        || (!ref $userflags->{acquisition} && !$userflags->{acquisition}) ) {
+            return 0;
+        }
+
+        if ($AcqViewBaskets eq 'user'
+        && $basket->{authorisedby} != $borrowernumber
+        && grep($borrowernumber, GetBasketUsers($basketno)) == 0) {
+            return 0;
+        }
+
+        if ($AcqViewBaskets eq 'branch' && defined $basket->{branch}
+        && $basket->{branch} ne $borrower->{branchcode}) {
+            return 0;
+        }
+    }
+
+    return 1;
+}
 
 #------------------------------------------------------------#
 
diff --git a/acqui/aqbasketuser_search.pl b/acqui/aqbasketuser_search.pl
new file mode 100755
index 0000000..512c10a
--- /dev/null
+++ b/acqui/aqbasketuser_search.pl
@@ -0,0 +1,77 @@
+#!/usr/bin/perl
+
+# script to find a basket user
+
+# Copyright 2012 BibLibre SARL
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Members;
+
+my $input = new CGI;
+
+my $dbh = C4::Context->dbh;
+
+my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
+    {   template_name   => "acqui/aqbasketuser_search.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => 'order_manage' },
+    }
+);
+
+my $q = $input->param('q') || '';
+my $op = $input->param('op') || '';
+
+if( $op eq "do_search" ) {
+    my $results = C4::Members::Search( $q, "surname");
+
+    my @users_loop;
+    my $nresults = 0;
+    foreach my $res (@$results) {
+        my $perms = haspermission( $res->{userid} );
+        my $subperms = get_user_subpermissions( $res->{userid} );
+
+        if( $perms->{superlibrarian} == 1
+         || $perms->{acquisition} == 1
+         || $subperms->{acquisition}->{'order_manage'} ) {
+            my %row = (
+                borrowernumber  => $res->{borrowernumber},
+                cardnumber      => $res->{cardnumber},
+                surname         => $res->{surname},
+                firstname       => $res->{firstname},
+                categorycode    => $res->{categorycode},
+                branchcode      => $res->{branchcode},
+            );
+            push( @users_loop, \%row );
+            $nresults ++;
+        }
+    }
+
+    $template->param(
+        q           => $q,
+        nresults    => $nresults,
+        users_loop  => \@users_loop,
+    );
+}
+
+output_html_with_http_headers( $input, $cookie, $template->output );
diff --git a/acqui/basket.pl b/acqui/basket.pl
index de66891..45351d7 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -28,6 +28,7 @@ use C4::Output;
 use CGI;
 use C4::Acquisition;
 use C4::Budgets;
+use C4::Branch;
 use C4::Bookseller qw( GetBookSellerFromId);
 use C4::Debug;
 use C4::Biblio;
@@ -68,7 +69,7 @@ my $query        = new CGI;
 my $basketno     = $query->param('basketno');
 my $booksellerid = $query->param('booksellerid');
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {
         template_name   => "acqui/basket.tmpl",
         query           => $query,
@@ -80,13 +81,25 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 my $basket = GetBasket($basketno);
+$booksellerid = $basket->{booksellerid} unless $booksellerid;
+my ($bookseller) = GetBookSellerFromId($booksellerid);
+
+unless (CanUserManageBasket($loggedinuser, $basket, $userflags)) {
+    $template->param(
+        cannot_manage_basket => 1,
+        basketno => $basketno,
+        basketname => $basket->{basketname},
+        booksellerid => $booksellerid,
+        name => $bookseller->{name}
+    );
+    output_html_with_http_headers $query, $cookie, $template->output;
+    exit;
+}
 
 # FIXME : what about the "discount" percentage?
 # FIXME : the query->param('booksellerid') below is probably useless. The bookseller is always known from the basket
 # if no booksellerid in parameter, get it from basket
 # warn "=>".$basket->{booksellerid};
-$booksellerid = $basket->{booksellerid} unless $booksellerid;
-my ($bookseller) = GetBookSellerFromId($booksellerid);
 my $op = $query->param('op');
 if (!defined $op) {
     $op = q{};
@@ -181,6 +194,21 @@ if ( $op eq 'delete_confirm' ) {
     $basket->{closedate} = undef;
     ModBasket($basket);
     print $query->redirect('/cgi-bin/koha/acqui/basket.pl?basketno='.$basket->{'basketno'})
+} elsif ( $op eq 'mod_users' ) {
+    my $basketusers_ids = $query->param('basketusers_ids');
+    my @basketusers = split( /:/, $basketusers_ids );
+    ModBasketUsers($basketno, @basketusers);
+    print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
+    exit;
+} elsif ( $op eq 'mod_branch' ) {
+    my $branch = $query->param('branch');
+    $branch = undef if(defined $branch and $branch eq '');
+    ModBasket({
+        basketno => $basket->{basketno},
+        branch   => $branch
+    });
+    print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
+    exit;
 } else {
     # get librarian branch...
     if ( C4::Context->preference("IndependantBranches") ) {
@@ -196,6 +224,17 @@ if ( $op eq 'delete_confirm' ) {
             }
         }
     }
+    # get branches
+    my $branches = C4::Branch::GetBranches;
+    my @branches_loop;
+    foreach my $branch (sort keys %$branches) {
+        push @branches_loop, {
+            branchcode => $branch,
+            branchname => $branches->{$branch}->{branchname},
+            selected => (defined $basket->{branch} and $branch eq $basket->{branch}) ? 1 : 0
+        };
+    }
+
 #if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups
     my $basketgroups;
     my $member = GetMember(borrowernumber => $loggedinuser);
@@ -231,6 +270,13 @@ if ( $op eq 'delete_confirm' ) {
       "loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
       $basket->{creationdate}, $basket->{authorisedby};
 
+    my @basketusers_ids = GetBasketUsers($basketno);
+    my @basketusers;
+    foreach my $basketuser_id (@basketusers_ids) {
+        my $basketuser = GetMember(borrowernumber => $basketuser_id);
+        push @basketusers, $basketuser if $basketuser;
+    }
+
 	#to get active currency
 	my $cur = GetCurrency();
 
@@ -324,7 +370,7 @@ if ( $op eq 'delete_confirm' ) {
         push @books_loop, \%line;
     }
 
-my $total_est_gste;
+    my $total_est_gste;
     my $total_est_gsti;
     my $gist_est;
     if ($gist){                                                    # if we have GST
@@ -343,9 +389,9 @@ my $total_est_gste;
        }
        $gist_est = $gist_rrp - ( $gist_rrp * $discount );
     } else {
-    $total_rrp_gsti = $total_rrp;
-    $total_est_gsti = $total_rrp_est;
-}
+        $total_rrp_gsti = $total_rrp;
+        $total_est_gsti = $total_rrp_est;
+    }
 
     my $contract = &GetContract($basket->{contractnumber});
     my @orders = GetOrders($basketno);
@@ -373,9 +419,12 @@ my $total_est_gste;
         basketbooksellernote => $basket->{booksellernote},
         basketcontractno     => $basket->{contractnumber},
         basketcontractname   => $contract->{contractname},
+        branches_loop        => \@branches_loop,
         creationdate         => $basket->{creationdate},
         authorisedby         => $basket->{authorisedby},
         authorisedbyname     => $basket->{authorisedbyname},
+        basketusers_ids      => join(':', @basketusers_ids),
+        basketusers          => \@basketusers,
         closedate            => $basket->{closedate},
         estimateddeliverydate=> $estimateddeliverydate,
         active               => $bookseller->{'active'},
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 5a1c248..37a7bd2 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -56,13 +56,13 @@ use C4::Biblio;
 use C4::Output;
 use CGI;
 
-use C4::Acquisition qw/ GetBasketsInfosByBookseller /;
+use C4::Acquisition qw/ GetBasketsInfosByBookseller CanUserManageBasket /;
 use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
 use C4::Members qw/GetMember/;
 use C4::Context;
 
 my $query = CGI->new;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {   template_name   => 'acqui/booksellers.tmpl',
         query           => $query,
         type            => 'intranet',
@@ -96,11 +96,6 @@ if ($loggedinuser) {
     $uid = GetMember( borrowernumber => $loggedinuser )->{userid};
 }
 
-my $userenv = C4::Context::userenv;
-my $viewbaskets = C4::Context->preference('AcqViewBaskets');
-
-my $userbranch = $userenv->{branch};
-
 #build result page
 my $loop_suppliers = [];
 
@@ -110,21 +105,8 @@ for my $vendor (@suppliers) {
     my $loop_basket = [];
 
     for my $basket ( @{$baskets} ) {
-        my $authorisedby = $basket->{authorisedby};
-        my $basketbranch = ''; # set a blank branch to start with
-        my $member = GetMember( borrowernumber => $authorisedby );
-        if ( $member ) {
-           $basketbranch = $member->{branchcode};
-        }
-
-        if ($userenv->{'flags'} & 1 || #user is superlibrarian
-               (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and
-                   ($viewbaskets eq 'all' || #user is allowed to see all baskets
-                   ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch
-                   ($basket->{authorisedby} &&  $viewbaskets eq 'user' && $authorisedby == $loggedinuser) #user created this basket
-                   ) 
-                ) 
-           ) { 
+        if (CanUserManageBasket($loggedinuser, $basket, $userflags)) {
+            my $member = GetMember( borrowernumber => $basket->{authorisedby} );
             foreach (qw(total_items total_biblios expected_items)) {
                 $basket->{$_} ||= 0;
             }
diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql
index 2302273..13e5f24 100644
--- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql
+++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql
@@ -13,6 +13,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Konten ver?ndern (keine neuen anlegen, aber bestehende ?ndern)'),
    (11, 'planning_manage', 'Etatplanung verwalten'),
    (11, 'order_manage', 'Bestellungen verwalten'),
+   (11, 'order_manage_all', 'Manage all orders & baskets'),
    (11, 'group_manage', 'Bestellgruppen vewalten'),
    (11, 'order_receive', 'Lieferungen verwalten'),
    (11, 'budget_add_del', 'Konten hinzuf?gen/?ndern, aber bestehende nicht ?ndern'),
diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql
index 873089a..c4c87c2 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -13,6 +13,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Modify budget (can''t create lines, but can modify existing ones)'),
    (11, 'planning_manage', 'Manage budget plannings'),
    (11, 'order_manage', 'Manage orders & basket'),
+   (11, 'order_manage_all', 'Manage all orders & baskets'),
    (11, 'group_manage', 'Manage orders & basketgroups'),
    (11, 'order_receive', 'Manage orders & basket'),
    (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'),
diff --git a/installer/data/mysql/es-ES/mandatory/userpermissions.sql b/installer/data/mysql/es-ES/mandatory/userpermissions.sql
index ec61ea0..62d0ee0 100644
--- a/installer/data/mysql/es-ES/mandatory/userpermissions.sql
+++ b/installer/data/mysql/es-ES/mandatory/userpermissions.sql
@@ -13,6 +13,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Modify budget (can''t create lines, but can modify existing ones)'),
    (11, 'planning_manage', 'Manage budget plannings'),
    (11, 'order_manage', 'Manage orders & basket'),
+   (11, 'order_manage_all', 'Manage all orders & baskets'),
    (11, 'group_manage', 'Manage orders & basketgroups'),
    (11, 'order_receive', 'Manage orders & basket'),
    (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'),
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
index faaaf39..24d5219 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
@@ -28,6 +28,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Modifier les budgets (impossible de cr?er les lignes, mais possible de modifier celles qui existent'),
    (11, 'planning_manage', 'G?rer de la planification des budgets'),
    (11, 'order_manage', 'G?rer les commandes et les paniers'),
+   (11, 'order_manage_all', 'G?rer toutes les commandes et panier'),
    (11, 'group_manage', 'G?rer les commandes et les bons de commande'),
    (11, 'order_receive', 'G?rer les r?ceptions'),
    (11, 'budget_add_del', 'Ajouter et supprimer les budgets (mais pas modifier)'),
diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql
index 9a064a0..eb0e90c 100644
--- a/installer/data/mysql/it-IT/necessari/userpermissions.sql
+++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql
@@ -15,6 +15,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Modifica budget (non li crea ma modifica gli esistenti)'),
    (11, 'planning_manage', 'Intervieni sulla pianificazione dei budgets'),
    (11, 'order_manage', 'Gestisci ordini e raccoglitori'),
+   (11, 'order_manage_all', 'Manage all orders & baskets'),
    (11, 'group_manage', 'Gestisci ordini e raccoglitori raggruppati'),
    (11, 'order_receive', 'Gestisci arrivi'),
    (11, 'budget_add_del', 'Aggiungi e cancella budgets (senza modificarli)'),
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index a210293..de0037a 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2559,6 +2559,7 @@ CREATE TABLE `aqbasket` (
   `authorisedby` varchar(10) default NULL,
   `booksellerinvoicenumber` mediumtext,
   `basketgroupid` int(11),
+  branch varchar(10) default NULL,
   PRIMARY KEY  (`basketno`),
   KEY `booksellerid` (`booksellerid`),
   KEY `basketgroupid` (`basketgroupid`),
@@ -2566,6 +2567,20 @@ CREATE TABLE `aqbasket` (
   CONSTRAINT `aqbasket_ibfk_1` FOREIGN KEY (`booksellerid`) REFERENCES `aqbooksellers` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `aqbasket_ibfk_2` FOREIGN KEY (`contractnumber`) REFERENCES `aqcontract` (`contractnumber`),
   CONSTRAINT `aqbasket_ibfk_3` FOREIGN KEY (`basketgroupid`) REFERENCES `aqbasketgroups` (`id`) ON UPDATE CASCADE
+  CONSTRAINT aqbasket_ibfk_4 FOREIGN KEY (branch) REFERENCES branches (branchcode) ON UPDATE CASCADE ON DELETE SET NULL,
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table aqbasketusers
+--
+
+DROP TABLE IF EXISTS aqbasketusers;
+CREATE TABLE aqbasketusers (
+  basketno int(11) NOT NULL,
+  borrowernumber int(11) NOT NULL,
+  PRIMARY KEY (basketno,borrowernumber),
+  CONSTRAINT aqbasketusers_ibfk_1 FOREIGN KEY (basketno) REFERENCES aqbasket (basketno) ON UPDATE CASCADE ON DELETE CASCADE,
+  CONSTRAINT aqbasketusers_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON UPDATE CASCADE ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
index 24f081e..f2feece 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
@@ -34,6 +34,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Endre budsjetter (kan ikke legge til kontolinjer, men endre eksisterende)'),
    (11, 'planning_manage', 'Administrere budsjettplaner'),
    (11, 'order_manage', 'Administrere bestillinger og kurver'),
+   (11, 'order_manage_all', 'Manage all orders & baskets'),
    (11, 'group_manage', 'Administrere bestillinger og kurv-grupper'),
    (11, 'order_receive', 'Administrere bestillinger og kurver'),
    (11, 'budget_add_del', 'Legge til og slette budsjetter (men ikke endre budsjetter)'),
diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
index f16a14d..59b9ab4 100644
--- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
+++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
@@ -13,6 +13,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Modify budget (can''t create lines, but can modify existing ones)'),
    (11, 'planning_manage', 'Manage budget plannings'),
    (11, 'order_manage', 'Manage orders & basket'),
+   (11, 'order_manage_all', 'Manage all orders & baskets'),
    (11, 'group_manage', 'Manage orders & basketgroups'),
    (11, 'order_receive', 'Manage orders & basket'),
    (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'),
diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
index 760b810..15f8c7b 100644
--- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
+++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
@@ -37,6 +37,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Modify budget (can''t create lines, but can modify existing ones)'),
    (11, 'planning_manage', 'Manage budget plannings'),
    (11, 'order_manage', 'Manage orders & basket'),
+   (11, 'order_manage_all', 'Manage all orders & baskets'),
    (11, 'group_manage', 'Manage orders & basketgroups'),
    (11, 'order_receive', 'Manage orders & basket'),
    (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'),
diff --git a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
index 8739379..4b0115a 100644
--- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
+++ b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
@@ -37,6 +37,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (11, 'budget_modify', 'Modify budget (can''t create lines, but can modify existing ones)'),
    (11, 'planning_manage', 'Manage budget plannings'),
    (11, 'order_manage', 'Manage orders & basket'),
+   (11, 'order_manage_all', 'Manage all orders & baskets'),
    (11, 'group_manage', 'Manage orders & basketgroups'),
    (11, 'order_receive', 'Manage orders & basket'),
    (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 84f0437..6edd988 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5212,6 +5212,40 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("
+        ALTER TABLE aqbasket ADD branch varchar(10) default NULL
+    ");
+    $dbh->do("
+        ALTER TABLE aqbasket
+        ADD CONSTRAINT aqbasket_ibfk_4 FOREIGN KEY (branch)
+            REFERENCES branches (branchcode)
+            ON UPDATE CASCADE ON DELETE SET NULL
+    ");
+    $dbh->do("
+        DROP TABLE IF EXISTS aqbasketusers
+    ");
+    $dbh->do("
+        CREATE TABLE aqbasketusers (
+            basketno int(11) NOT NULL,
+            borrowernumber int(11) NOT NULL,
+            PRIMARY KEY (basketno,borrowernumber),
+            CONSTRAINT aqbasketusers_ibfk_1 FOREIGN KEY (basketno) REFERENCES aqbasket (basketno) ON DELETE CASCADE ON UPDATE CASCADE,
+            CONSTRAINT aqbasketusers_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+    ");
+    $dbh->do("
+        INSERT INTO permissions (module_bit, code, description)
+        VALUES (11, 'order_manage_all', 'Manage all orders & baskets')
+    ");
+
+    print "Upgrade to $DBversion done (Add branch and users list to baskets. "
+        . "New permission order_manage_all)\n";
+    SetVersion($DBversion);
+}
+
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/aqbasketuser_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/aqbasketuser_search.tt
new file mode 100644
index 0000000..9b7f52b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/aqbasketuser_search.tt
@@ -0,0 +1,79 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Basket User Search</title>
+[% INCLUDE 'doc-head-close.inc' %]
+
+<style type="text/css">
+    #custom-doc {
+        width:44.46em;
+        *width:43.39em;
+        min-width:578px;
+        margin:auto;
+        text-align:left;
+    }
+</style>
+
+<script type="text/javascript">
+//<![CDATA[
+    // modify parent window owner element
+    function add_user(borrowernumber, borrowername) {
+        var p = window.opener;
+        if(p.add_basket_user(borrowernumber, borrowername) < 0) {
+            alert(_("Borrower '" + borrowername + "' is already in the list."));
+        }
+    }
+//]]>
+</script>
+
+</head>
+<body>
+<div id="custom-doc" class="yui-t7">
+  <div id="bd">
+    <div class="yui-g">
+
+      <h3>Search for Basket User</h3>
+      <form action="/cgi-bin/koha/acqui/aqbasketuser_search.pl" method="post">
+        <fieldset>
+          <input type="hidden" name="op" id="op" value="do_search" />
+          <input type="text" name="q" id="q" value="[% q %]" class="focus" />
+          <input type="submit" class="button" value="Search" />
+        </fieldset>
+        <div class="hint">Only staff with superlibrarian or acquisitions permissions (or order_manage permission if granular permissions are enabled) are returned in the search results</div>
+      </form>
+
+[% IF (q) %]
+    <p>Searched for <span class="ex">[% q %]</span>, [% nresults %] patron(s) found.</p>
+[% END %]
+[% IF ( users_loop ) %]
+    <table>
+      <thead>
+        <tr>
+            <th>Cardnumber</th>
+            <th>Name</th>
+            <th>Branch</th>
+            <th>Categorycode</th>
+            <th>Select?</th>
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH user IN users_loop %]
+          [% IF ( user.toggle ) %]
+            <tr>
+          [% ELSE %]
+            <tr class="highlight">
+          [% END %]
+                <td>[% user.cardnumber %]</td>
+                <td>[% user.surname %], [% user.firstname %]</td>
+                <td>[% user.branchcode %]</td>
+                <td>[% user.categorycode %]</td>
+                <td>
+                    <a style="cursor:pointer" onclick="add_user('[% user.borrowernumber %]', '[% user.firstname %] [% user.surname %]');">Add</a>
+                </td>
+            </tr>
+        [% END %]
+    </table>
+[% END %]
+
+<div id="closewindow"><a href="#" class="close">Close</a></div>
+</div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 0cf7ff6..01eef9f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -68,6 +68,43 @@
 </script>
 [% END %]
 [% END %]
+<script type="text/javascript">
+//<![CDATA[
+    function basketUserSearchPopup(f) {
+        window.open(
+            "/cgi-bin/koha/acqui/aqbasketuser_search.pl",
+            'BasketUserSearchPopup',
+            'width=740,height=450,toolbar=no,'
+         );
+    }
+
+    function add_basket_user(borrowernumber, borrowername) {
+        var ids = $("#basketusers_ids").val();
+        if(ids.length > 0) {
+            ids = ids.split(':');
+        } else {
+            ids = new Array;
+        }
+        if (ids.indexOf(borrowernumber) < 0) {
+            ids.push(borrowernumber);
+            $("#basketusers_ids").val(ids.join(':'));
+            var li = '<li id="user_'+borrowernumber+'">'+borrowername
+                + ' [<a style="cursor:pointer" onclick="del_basket_user('+borrowernumber+');">'
+                + _('Delete user') + '</a>]</li>';
+            $("#basketusers_names").append(li);
+            return 0;
+        }
+        return -1;
+    }
+
+    function del_basket_user(borrowernumber) {
+      $("#user_"+borrowernumber).remove();
+      var ids = $("#basketusers_ids").val().split(':');
+      ids.splice(ids.indexOf(borrowernumber.toString()), 1);
+      $("#basketusers_ids").val(ids.join(':'));
+    }
+//]]>
+</script>
 <style type="text/css">
 .sortmsg {font-size: 80%;}
 </style>
@@ -83,6 +120,11 @@
 
 <div id="bd">
     <div id="yui-main">
+    [% IF (cannot_manage_basket) %]
+        <div class="yui-b">
+            <p class="error">You are not authorised to manage this basket.</p>
+        </div>
+    [% ELSE %]
     <div class="yui-b">
         [% UNLESS ( confirm_close ) %]
         [% UNLESS ( selectbasketg ) %]
@@ -178,7 +220,45 @@
                 [% IF ( basketcontractno ) %]
                     <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno %]&amp;booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>
                 [% END %]
-                [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span>  [% authorisedbyname %]</li>[% END %]
+                [% IF ( authorisedbyname ) %]<li><span class="label">Created by:</span>  [% authorisedbyname %]</li>[% END %]
+                <li>
+                    <form action="" method="post">
+                        <span class="label">Managed by:</span>
+                        <div style="float:left">
+                            <ul id="basketusers_names" style="padding-left:0">
+                              [% FOREACH user IN basketusers %]
+                                <li id="user_[% user.borrowernumber %]">
+                                    [% user.firstname %] [% user.surname %]
+                                    [<a onclick="del_basket_user([% user.borrowernumber %]);" style="cursor:pointer">Delete user</a>]
+                                </li>
+                              [% END %]
+                            </ul>
+                            <input type="hidden" id="basketno" name="basketno" value="[% basketno %]" />
+                            <input type="hidden" id="basketusers_ids" name="basketusers_ids" value="[% basketusers_ids %]" />
+                            <input type="hidden" id="op" name="op" value="mod_users" />
+                            <input type="button" id="add_user" onclick="basketUserSearchPopup();" value="Add user" />
+                            <input type="submit" value="Save changes" />
+                        </div>
+                    </form>
+                </li>
+                <li>
+                    <form action="" method="post">
+                        <span class="label">Branch:</span>
+                        <select id="branch" name="branch">
+                            <option value="">No branch</option>
+                            [% FOREACH branch IN branches_loop %]
+                                [% IF (branch.selected) %]
+                                    <option selected="selected" value="[% branch.branchcode %]"> [% branch.branchname %]</option>
+                                [% ELSE %]
+                                    <option value="[% branch.branchcode %]"> [% branch.branchname %]</option>
+                                [% END %]
+                            [% END %]
+                        </select>
+                        <input type="hidden" id="basketno" name="basketno" value="[% basketno %]" />
+                        <input type="hidden" id="op" name="op" value="mod_branch" />
+                        <input type="submit" value="Save" />
+                    </form>
+                </li>
                 [% IF ( creationdate ) %]<li><span class="label">Opened on:</span>  [% creationdate | $KohaDates %]</li>[% END %]
                 [% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>[% END %]
                 [% IF ( estimateddeliverydate ) %]<li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates  %]</li>[% END %]
@@ -418,6 +498,7 @@
         </div>
     [% END %]
 </div>
+[% END %][%# IF (cannot_manage_basket) %]
 </div>
 <div class="yui-b">
 [% INCLUDE 'acquisitions-menu.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index cf8fcf0..7023c1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -22,7 +22,7 @@ Acquisitions:
         - Show baskets
         - pref: AcqViewBaskets
           choices:
-              user: created by staff member.
+              user: created or managed by staff member.
               branch: from staff member's library.
               all: in system, regardless of owner.
     -
diff --git a/t/Acquisition/CanUserManageBasket.t b/t/Acquisition/CanUserManageBasket.t
new file mode 100644
index 0000000..e1855c3
--- /dev/null
+++ b/t/Acquisition/CanUserManageBasket.t
@@ -0,0 +1,204 @@
+#!/usr/bin/perl
+
+use Modern::Perl;
+use Test::MockModule;
+use Test::More tests => 42;
+
+use C4::Acquisition;
+
+my $C4_Acquisition_module = new Test::MockModule('C4::Acquisition');
+$C4_Acquisition_module->mock('GetBasketUsers', \&Mock_GetBasketUsers);
+my $C4_Context_module = new Test::MockModule('C4::Context');
+$C4_Context_module->mock('preference', \&Mock_preference);
+
+my $AcqViewBaskets;
+my %basketusers = (
+    1 => [],
+    2 => [1, 2],
+    3 => [],
+    4 => [1, 2],
+);
+
+# Borrowers
+my $borrower1 = {
+    borrowernumber => 1,
+    branchcode => 'B1',
+};
+
+my $borrower2 = {
+    borrowernumber => 2,
+    branchcode => 'B2',
+};
+
+# Baskets
+my $basket1 = {
+    basketno => 1,
+    authorisedby => 1
+};
+
+my $basket2 = {
+    basketno => 2,
+    authorisedby => 2,
+};
+
+my $basket3 = {
+    basketno => 3,
+    authorisedby => 3,
+    branch => 'B1'
+};
+
+my $basket4 = {
+    basketno => 4,
+    authorisedby => 4,
+    branch => 'B1'
+};
+
+
+my $flags = {
+    acquisition => {
+        order_manage => 1
+    }
+};
+
+#################
+# Start testing #
+#################
+
+# ----------------------
+# AcqViewBaskets = 'all'
+# ----------------------
+
+$AcqViewBaskets = 'all';
+
+# Simple cases where user can't manage basket
+ok( not CanUserManageBasket($borrower1, $basket1, {}) );
+ok( not CanUserManageBasket($borrower1, $basket1, {
+    acquisition => 0
+}) );
+ok( not CanUserManageBasket($borrower1, $basket1, {
+    acquisition => {
+        order_manage => 0
+    }
+}) );
+
+# Simple cases where user can manage basket
+ok( CanUserManageBasket($borrower1, $basket1, {
+    superlibrarian => 1
+}) );
+ok( CanUserManageBasket($borrower1, $basket1, {
+    acquisition => 1
+}) );
+ok( CanUserManageBasket($borrower1, $basket1, {
+    acquisition => {
+        order_manage_all => 1
+    }
+}) );
+
+ok( CanUserManageBasket($borrower1, $basket1, $flags) );
+ok( CanUserManageBasket($borrower1, $basket2, $flags) );
+ok( CanUserManageBasket($borrower1, $basket3, $flags) );
+ok( CanUserManageBasket($borrower1, $basket4, $flags) );
+ok( CanUserManageBasket($borrower2, $basket1, $flags) );
+ok( CanUserManageBasket($borrower2, $basket2, $flags) );
+ok( CanUserManageBasket($borrower2, $basket3, $flags) );
+ok( CanUserManageBasket($borrower2, $basket4, $flags) );
+
+# -------------------------
+# AcqViewBaskets = 'branch'
+# -------------------------
+
+$AcqViewBaskets = 'branch';
+
+# Simple cases where user can't manage basket
+ok( not CanUserManageBasket($borrower1, $basket1, {}) );
+ok( not CanUserManageBasket($borrower1, $basket1, {
+    acquisition => 0
+}) );
+ok( not CanUserManageBasket($borrower1, $basket1, {
+    acquisition => {
+        order_manage => 0
+    }
+}) );
+
+# Simple cases where user can manage basket
+ok( CanUserManageBasket($borrower1, $basket1, {
+    superlibrarian => 1
+}) );
+ok( CanUserManageBasket($borrower1, $basket1, {
+    acquisition => 1
+}) );
+ok( CanUserManageBasket($borrower1, $basket1, {
+    acquisition => {
+        order_manage_all => 1
+    }
+}) );
+
+ok( CanUserManageBasket($borrower1, $basket1, $flags) );
+ok( CanUserManageBasket($borrower1, $basket2, $flags) );
+ok( CanUserManageBasket($borrower1, $basket3, $flags) );
+ok( CanUserManageBasket($borrower1, $basket4, $flags) );
+ok( CanUserManageBasket($borrower2, $basket1, $flags) );
+ok( CanUserManageBasket($borrower2, $basket2, $flags) );
+# borrower2 is not on the same branch as basket3 and basket4
+ok( not CanUserManageBasket($borrower2, $basket3, $flags) );
+ok( not CanUserManageBasket($borrower2, $basket4, $flags) );
+
+# -----------------------
+# AcqViewBaskets = 'user'
+# -----------------------
+
+$AcqViewBaskets = 'user';
+
+# Simple cases where user can't manage basket
+ok( not CanUserManageBasket($borrower1, $basket1, {}) );
+ok( not CanUserManageBasket($borrower1, $basket1, {
+    acquisition => 0
+}) );
+ok( not CanUserManageBasket($borrower1, $basket1, {
+    acquisition => {
+        order_manage => 0
+    }
+}) );
+
+# Simple cases where user can manage basket
+ok( CanUserManageBasket($borrower1, $basket1, {
+    superlibrarian => 1
+}) );
+ok( CanUserManageBasket($borrower1, $basket1, {
+    acquisition => 1
+}) );
+ok( CanUserManageBasket($borrower1, $basket1, {
+    acquisition => {
+        order_manage_all => 1
+    }
+}) );
+
+ok( CanUserManageBasket($borrower1, $basket1, $flags) );
+ok( CanUserManageBasket($borrower1, $basket2, $flags) );
+# basket3 is not managed or created by borrower1
+ok( not CanUserManageBasket($borrower1, $basket3, $flags) );
+ok( CanUserManageBasket($borrower1, $basket4, $flags) );
+# basket 1 is not managed or created by borrower2
+ok( not CanUserManageBasket($borrower2, $basket1, $flags) );
+ok( CanUserManageBasket($borrower2, $basket2, $flags) );
+# basket 3 is not managed or created by borrower2
+ok( not CanUserManageBasket($borrower2, $basket3, $flags) );
+ok( CanUserManageBasket($borrower2, $basket4, $flags) );
+
+
+# Mocked subs
+
+# C4::Acquisition::GetBasketUsers
+sub Mock_GetBasketUsers {
+    my ($basketno) = @_;
+
+    return @{ $basketusers{$basketno} };
+}
+
+# C4::Context->preference
+sub Mock_preference {
+    my ($self, $variable) = @_;
+    if (lc($variable) eq 'acqviewbaskets') {
+        return $AcqViewBaskets;
+    }
+}
-- 
1.7.10


From oleonard at myacpl.org  Fri Apr 27 15:06:08 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 27 Apr 2012 09:06:08 -0400
Subject: [Koha-patches] [PATCH] Bug 8014 - On the patron entry form hide
	"restricted until" field if "Restricted: No" is checked
Message-ID: <1335531968-19938-1-git-send-email-oleonard@myacpl.org>

This patch adds JavaScript to automatically hide the "Restricted
unil" form field on the patron entry form if "Restricted: No" is
selected. If "Restricted: Yes" is chosen the "Until:" field
is shown and focus is given to it.

The patch also adds a note, "(optional)" after the "Until:" field
to make it clearer that a date is not required.

To test, open a patron record and try moving the selection
between "Restricted: No" and "Restricted: Yes." Confirm that
the "Until:" field is shown and hidden as expected. Confirm
that the restricted flag is correctly set or unset upon save,
including setting the flag with or without a date.
---
 koha-tmpl/intranet-tmpl/prog/en/js/members.js      |   16 ++++++++
 .../prog/en/modules/members/memberentrygen.tt      |   38 ++++++++++----------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/members.js b/koha-tmpl/intranet-tmpl/prog/en/js/members.js
index 3ed6195..cdc1442 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/members.js
@@ -167,3 +167,19 @@ function Dopopguarantor(link) {
 
 	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
 }
+
+$(document).ready(function(){
+    if($("#yesdebarred").is(":checked")){
+        $("#debarreduntil").show();
+    } else {
+        $("#debarreduntil").hide();
+    }
+    $("#yesdebarred,#nodebarred").change(function(){
+        if($("#yesdebarred").is(":checked")){
+            $("#debarreduntil").show();
+            $("#datedebarred").focus();
+        } else {
+            $("#debarreduntil").hide();
+        }
+    });
+});
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index bc1f07c..d7e3060 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1344,25 +1344,25 @@
                 <label for="nodebarred">No </label>
                 <input type="radio" id="nodebarred" name="debarred" value="0" checked="checked"/>
 				[% END %]
-				
-				<br />
-				<label for="datedebarred" class="radio">until:</label> 
-				[% IF opduplicate %]
-				    <input type="text" name="datedebarred" id="datedebarred" class="debarred" value="[% datedebarred %]" onclick="this.value=''" />
-				[% ELSE %]
-				    <input type="text" name="datedebarred" id="datedebarred" class="debarred" value="[% datedebarred %]" />
-				[% END %]
-				<img src="[% themelang %]/lib/calendar/cal.gif" id="debarred_button" alt="Show Calendar" />
-		         <script language="JavaScript" type="text/javascript">
-		            Calendar.setup(
-		            {
-		                inputField : "datedebarred",
-		                ifFormat : "[% DHTMLcalendar_dateformat %]",
-		                button : "debarred_button"
-		            }
-		            );
-		        </script>
-		        <br />
+
+                <span id="debarreduntil"><label for="datedebarred" class="inline">Until:</label>
+                                [% IF opduplicate %]
+                                    <input type="text" name="datedebarred" id="datedebarred" class="debarred" value="[% datedebarred %]" onclick="this.value=''" />
+                                [% ELSE %]
+                                    <input type="text" name="datedebarred" id="datedebarred" class="debarred" value="[% datedebarred %]" />
+                                [% END %]
+                                <img src="[% themelang %]/lib/calendar/cal.gif" id="debarred_button" alt="Show Calendar" />
+                                 <script language="JavaScript" type="text/javascript">
+                                    Calendar.setup(
+                                    {
+                                        inputField : "datedebarred",
+                                        ifFormat : "[% DHTMLcalendar_dateformat %]",
+                                       button : "debarred_button"
+                                    }
+                                    );
+                                </script> <span class="hint">(optional)</span> </span>
+                </li>
+                <li>
 		        <label for="debarredcomment" class="radio">Comment:</label>
 			       [% IF ( opduplicate ) %] 
 			           <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
-- 
1.7.5.4


From colin.campbell at ptfs-europe.com  Fri Apr 27 19:41:13 2012
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 27 Apr 2012 18:41:13 +0100
Subject: [Koha-patches] [PATCH] Bug 8017 reduce manipulation of GetAllIssues
	return
Message-ID: <1335548473-12279-1-git-send-email-colin.campbell@ptfs-europe.com>

GetAllIssues can produce large lists
For performance purposes:
Dont loop over the list without cause
Dont do expensive processing in the loop
Dont needlessly copy the array
Do display formatting in the template
Dont extract the barcode list unless we are producing it
Reduce db calls by using the data to hand

Make the table in the template a bit more readable
where everything was stuffed into one line
---
 C4/Members.pm                                      |   19 +---
 .../prog/en/modules/members/readingrec.tt          |   37 +++++---
 .../prog/en/modules/opac-readingrecord.tt          |   71 ++++++++++----
 members/readingrec.pl                              |  102 ++++++++------------
 opac/opac-readingrecord.pl                         |   76 +++++++--------
 5 files changed, 158 insertions(+), 147 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index 6161ac9..11f7c28 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1073,10 +1073,9 @@ C<items> tables of the Koha database.
 sub GetAllIssues {
     my ( $borrowernumber, $order, $limit ) = @_;
 
-    #FIXME: sanity-check order and limit
-    my $dbh   = C4::Context->dbh;
+    my $dbh = C4::Context->dbh;
     my $query =
-  "SELECT *, issues.timestamp as issuestimestamp, issues.renewals AS renewals,items.renewals AS totalrenewals,items.timestamp AS itemstimestamp 
+'SELECT *, issues.timestamp as issuestimestamp, issues.renewals AS renewals,items.renewals AS totalrenewals,items.timestamp AS itemstimestamp 
   FROM issues 
   LEFT JOIN items on items.itemnumber=issues.itemnumber
   LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber
@@ -1089,20 +1088,14 @@ sub GetAllIssues {
   LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber
   LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber
   WHERE borrowernumber=? AND old_issues.itemnumber IS NOT NULL
-  order by $order";
-    if ( $limit != 0 ) {
+  order by ' . $order;
+    if ($limit) {
         $query .= " limit $limit";
     }
 
     my $sth = $dbh->prepare($query);
-    $sth->execute($borrowernumber, $borrowernumber);
-    my @result;
-    my $i = 0;
-    while ( my $data = $sth->fetchrow_hashref ) {
-        push @result, $data;
-    }
-
-    return \@result;
+    $sth->execute( $borrowernumber, $borrowernumber );
+    return $sth->fetchall_arrayref( {} );
 }
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index f90d7a8..acf0e8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Circulation History for [% INCLUDE 'patron-title.inc' %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -26,7 +27,7 @@
 	<div class="yui-b">
 [% INCLUDE 'circ-toolbar.inc' %]
 <h1>Circulation history</h1>
-[% IF ( loop_reading ) %]
+[% IF loop_reading %]
 <form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
 
 <div id="pagertable_readingrec">
@@ -46,29 +47,37 @@
     <th>Date due</th>
     <th>Return date</th>
 </thead>
-[% FOREACH loop_readin IN loop_reading %]
-    [% IF ( loop_readin.returndate ) %]<tr>[% ELSE %]<tr class="onissue">[% END %]
+[% FOREACH issue IN loop_reading %]
+    [% IF  issue.returndate  %]<tr>[% ELSE %]<tr class="onissue">[% END %]
         <td>
-            [% loop_readin.issuestimestamp %]
+            [% issue.issuestimestamp | $KohaDates %]
         </td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_readin.biblionumber %]">[% loop_readin.title |html %]</a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber %]">[% issue.title |html %]</a></td>
 
-        <td>[% loop_readin.author %]</td>
+        <td>[% issue.author %]</td>
 
-        <td>[% loop_readin.classification %]</td>
+        <td>
+            [% IF issue.classification %]
+                [% issue.classification %]
+            [% ELSE %]
+                [% issue.itemcallnumber %]
+            [% END %]
+       </td>
 
-        <td>[% loop_readin.barcode %]</td>
+        <td>[% issue.barcode %]</td>
 
             <td>
-        [% loop_readin.renewals %]</td>
+        [% issue.renewals %]</td>
             <td>
-        [% loop_readin.issuedate %]</td>
+        [% issue.issuedate | $KohaDates %]</td>
             <td>
-        [% loop_readin.issuingbranch %]</td>
-			<td>[% IF ( loop_readin.date_due ) %][% loop_readin.date_due %][% ELSE %]&nbsp;[% END %]</td>
+        [% issue.issuingbranch %]</td>
+			<td>[% IF issue.date_due %]
+                    [% issue.date_due | $KohaDates %]
+                [% ELSE %]&nbsp;[% END %]</td>
             <td>
-        [% IF ( loop_readin.returndate ) %]
-            [% loop_readin.returndate %]
+        [% IF  issue.returndate %]
+            [% issue.returndate | $KohaDates %]
         [% ELSE %]
             Checked Out
         [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
index 5f3f39c..12af181 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt
@@ -26,7 +26,7 @@ $(document).ready(function(){
 <!--CONTENT-->
 <h3><a href="/cgi-bin/koha/opac-user.pl">[% firstname %] [% surname %]'s account</a> <img src="[% themelang %]../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Checkout history</h3>
 
-[% UNLESS ( count ) %]
+[% IF READING_RECORD.size() == 0 %]
 You have never borrowed anything from this library.
 [% ELSE %]
 <div id="opac-user-readingrec" class="toptabs">
@@ -61,30 +61,67 @@ You have never borrowed anything from this library.
 <th>Date</th>
 </tr>
 
-[% FOREACH READING_RECOR IN READING_RECORD %]
+[% FOREACH issue IN READING_RECORD %]
 
-[% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
+[% IF  loop.even  %]<tr class="highlight">[% ELSE %]<tr>[% END %]
 <td>
-[% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( READING_RECOR.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% READING_RECOR.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% READING_RECOR.normalized_isbn %].01.THUMBZZZ.jpg" alt="Cover Image" /></a>[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
+[% IF  OPACAmazonEnabled %]
+    [% IF  OPACAmazonCoverImages %]
+        [% IF  issue.normalized_isbn %]
+            <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% issue.normalized_isbn %].01.THUMBZZZ.jpg" alt="Cover Image" /></a>
+        [% ELSE %]
+             <span class="no-image">No cover image available</span>
+        [% END %]
+    [% END %]
+[% END %]
 
-    [% IF ( GoogleJackets ) %][% IF ( READING_RECOR.normalized_isbn ) %]<div style="block" title="[% READING_RECOR.biblionumber |url %]" class="[% READING_RECOR.normalized_isbn %]" id="gbs-thumbnail[% loop.count %]"></div>[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
+[% IF GoogleJackets %]
+    [% IF  issue.normalized_isbn %]
+        <div style="block" title="[% issue.biblionumber |url %]" class="[% issue.normalized_isbn %]" id="gbs-thumbnail[% loop.count %]"></div>
+    [% ELSE %]
+       <span class="no-image">No cover image available</span>
+    [% END %]
+[% END %]
 
-    [% IF ( BakerTaylorEnabled ) %][% IF ( READING_RECOR.normalized_isbn ) %]<a href="https://[% BakerTaylorBookstoreURL |html %][% READING_RECOR.normalized_isbn %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL |html %][% READING_RECOR.normalized_isbn %]" /></a>[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
+[% IF BakerTaylorEnabled %]
+    [% IF issue.normalized_isbn %]
+      <a href="https://[% BakerTaylorBookstoreURL |html %][% issue.normalized_isbn %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL |html %][% issue.normalized_isbn %]" /></a>
+    [% ELSE %]
+       <span class="no-image">No cover image available</span>
+    [% END %]
+[% END %]
 
-	[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %]
-	<img src="https://secure.syndetics.com/index.aspx?isbn=[% READING_RECOR.normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% READING_RECOR.normalized_upc %]&amp;oclc=[% READING_RECOR.normalized_oclc %]" alt="" class="thumbnail" />
-	[% ELSE %]
-	<img src="http://www.syndetics.com/index.aspx?isbn=[% READING_RECOR.normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% READING_RECOR.normalized_upc %]&amp;oclc=[% READING_RECOR.normalized_oclc %]" alt="" class="thumbnail" />[% END %][% END %][% END %]
+[% IF SyndeticsEnabled %]
+    [% IF SyndeticsCoverImages %]
+        [% IF  using_https  %]
+<img src="https://secure.syndetics.com/index.aspx?isbn=[% issue.normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% issue.normalized_upc %]&amp;oclc=[% issue.normalized_oclc %]" alt="" class="thumbnail" />
+       [% ELSE %]
+<img src="http://www.syndetics.com/index.aspx?isbn=[% issue.normalized_isbn %]/SC.GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% issue.normalized_upc %]&amp;oclc=[% issue.normalized_oclc %]" alt="" class="thumbnail" />
+       [% END %]
+    [% END %]
+[% END %]
 </td>
-<td>[% IF ( READING_RECOR.BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% READING_RECOR.biblionumber |url %]">[% READING_RECOR.title |html %] [% IF ( READING_RECOR.subtitle ) %][% FOREACH subtitl IN READING_RECOR.subtitle %][% subtitl.subfield %][% END %][% END %]</a>[% ELSE %]
-[% IF ( READING_RECOR.BiblioDefaultViewisbd ) %]<a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% READING_RECOR.biblionumber |url %]">[% READING_RECOR.title |html %] [% IF ( READING_RECOR.subtitle ) %][% FOREACH subtitl IN READING_RECOR.subtitle %][% subtitl.subfield %][% END %][% END %]</a>[% ELSE %]
-<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% READING_RECOR.biblionumber |url %]">[% READING_RECOR.title |html %] [% IF ( READING_RECOR.subtitle ) %][% FOREACH subtitl IN READING_RECOR.subtitle %][% subtitl.subfield %][% END %][% END %]</a>[% END %][% END %]
+<td>
+[% IF  issue.BiblioDefaultViewmarc %]
+     <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF  issue.subtitle  %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
+[% ELSIF issue.BiblioDefaultViewisbd %]
+     <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
+[% ELSE %]
+     <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title |html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
+[% END %]
                     <span class="item-details">
-                        [% READING_RECOR.author %]
+                        [% issue.author %]
                     </span></td>
-<td>[% UNLESS ( noItemTypeImages ) %][% IF ( READING_RECOR.imageurl ) %]<img src="[% READING_RECOR.imageurl %]" alt="" />[% END %][% END %] [% READING_RECOR.description %]</td>
-<td>[% READING_RECOR.itemcallnumber %]</td>
-<td>[% IF ( READING_RECOR.returndate ) %][% READING_RECOR.returndate | $KohaDates %][% ELSE %]<em>(Checked out)</em>[% END %]</td>
+<td>
+[% UNLESS ( noItemTypeImages ) %][% IF ( issue.imageurl ) %]<img src="[% issue.imageurl %]" alt="" />[% END %][% END %] [% issue.description %]</td>
+<td>[% issue.itemcallnumber %]</td>
+<td>
+[% IF issue.returndate %]
+    [% issue.returndate | $KohaDates %]
+[% ELSE %]
+    <em>(Checked out)</em>
+[% END %]
+</td>
 </tr>
 
 [% END %]
diff --git a/members/readingrec.pl b/members/readingrec.pl
index 2645eda..d1cf5cf 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -28,7 +28,7 @@ use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Members;
-use C4::Branch;
+use C4::Branch qw(GetBranches);
 use List::MoreUtils qw/any uniq/;
 use Koha::DateUtils;
 
@@ -62,43 +62,29 @@ if ($input->param('borrowernumber')) {
 
 my $order = 'date_due desc';
 my $limit = 0;
-my ( $issues ) = GetAllIssues($borrowernumber,$order,$limit);
-
-my @loop_reading;
-my @barcodes;
-my $today = C4::Dates->new();
-$today = $today->output("iso");
-
-foreach my $issue (@{$issues}){
- 	my %line;
- 	$line{issuestimestamp} = format_date($issue->{'issuestimestamp'});
-	$line{biblionumber}    = $issue->{'biblionumber'};
-	$line{title}           = $issue->{'title'};
-	$line{author}          = $issue->{'author'};
-	$line{classification}  = $issue->{'classification'} || $issue->{'itemcallnumber'};
-	$line{date_due}        = format_sqldatetime($issue->{date_due});
-	$line{returndate}      = format_sqldatetime($issue->{returndate});
-	$line{issuedate}       = format_sqldatetime($issue->{issuedate});
-	$line{issuingbranch}   = GetBranchName($issue->{'branchcode'});
-	$line{renewals}        = $issue->{'renewals'};
-	$line{barcode}         = $issue->{'barcode'};
-	$line{volumeddesc}     = $issue->{'volumeddesc'};
-	push(@loop_reading,\%line);
-    if (($input->param('op') eq 'export_barcodes') and ($today eq $issue->{'returndate'})) {
-        push( @barcodes, $issue->{'barcode'} );
-    }
+my $issues = GetAllIssues($borrowernumber,$order,$limit);
+
+my $branches = GetBranches();
+foreach my $issue ( @{$issues} ) {
+    $issue->{issuingbranch} = $branches->{ $issue->{branchcode} }->{branchname};
 }
 
-if ($input->param('op') eq 'export_barcodes') {
-    my $borrowercardnumber = GetMember( borrowernumber => $borrowernumber )->{'cardnumber'} ;
+#   barcode export
+if ( $input->param('op') eq 'export_barcodes' ) {
+    my $today = C4::Dates->new();
+    $today = $today->output('iso');
+    my @barcodes =
+      map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
+    my $borrowercardnumber =
+      GetMember( borrowernumber => $borrowernumber )->{'cardnumber'};
     my $delimiter = "\n";
-    binmode( STDOUT, ":encoding(UTF-8)");
+    binmode( STDOUT, ":encoding(UTF-8)" );
     print $input->header(
         -type       => 'application/octet-stream',
         -charset    => 'utf-8',
         -attachment => "$today-$borrowercardnumber-checkinexport.txt"
     );
-    my $content = join($delimiter, uniq(@barcodes));
+    my $content = join $delimiter, uniq(@barcodes);
     print $content;
     exit;
 }
@@ -115,6 +101,7 @@ if (! $limit){
 	$limit = 'full';
 }
 
+
 my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
 $template->param( picture => 1 ) if $picture;
 
@@ -127,36 +114,31 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
 }
 
 $template->param(
-						readingrecordview => 1,
-						biblionumber => $data->{'biblionumber'},
-						title => $data->{'title'},
-						initials => $data->{'initials'},
-						surname => $data->{'surname'},
-						othernames => $data->{'othernames'},
-						borrowernumber => $borrowernumber,
-						limit => $limit,
-						firstname => $data->{'firstname'},
-						cardnumber => $data->{'cardnumber'},
-					    categorycode => $data->{'categorycode'},
-					    category_type => $data->{'category_type'},
-					   # category_description => $data->{'description'},
-					    categoryname	=> $data->{'description'},
-					    address => $data->{'address'},
-						address2 => $data->{'address2'},
-					    city => $data->{'city'},
-					    state => $data->{'state'},
-						zipcode => $data->{'zipcode'},
-						country => $data->{'country'},
-						phone => $data->{'phone'},
-						email => $data->{'email'},
-			   			branchcode => $data->{'branchcode'},
-			   			is_child        => ($data->{'category_type'} eq 'C'),
-			   			branchname => GetBranchName($data->{'branchcode'}),
-						showfulllink => (scalar @loop_reading > 50),					
-						loop_reading => \@loop_reading,
-						activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+    readingrecordview => 1,
+    title             => $data->{title},
+    initials          => $data->{initials},
+    surname           => $data->{surname},
+    othernames        => $data->{othernames},
+    borrowernumber    => $borrowernumber,
+    firstname         => $data->{firstname},
+    cardnumber        => $data->{cardnumber},
+    categorycode      => $data->{categorycode},
+    category_type     => $data->{category_type},
+    categoryname      => $data->{description},
+    address           => $data->{address},
+    address2          => $data->{address2},
+    city              => $data->{city},
+    state             => $data->{state},
+    zipcode           => $data->{zipcode},
+    country           => $data->{country},
+    phone             => $data->{phone},
+    email             => $data->{email},
+    branchcode        => $data->{branchcode},
+    is_child          => ( $data->{category_type} eq 'C' ),
+    branchname        => $branches->{ $data->{branchcode} }->{branchname},
+    loop_reading      => $issues,
+    activeBorrowerRelationship =>
+      ( C4::Context->preference('borrowerRelationship') ne '' ),
 );
 output_html_with_http_headers $input, $cookie, $template->output;
 
-
-
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 04c3293..b72c9d3 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -27,8 +27,10 @@ use C4::Biblio;
 use C4::Circulation;
 use C4::Members;
 use Koha::DateUtils;
+use MARC::Record;
 
 use C4::Output;
+use C4::Charset qw(StripNonXmlChars);
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -50,55 +52,44 @@ $template->param(%{$borr});
 my $itemtypes = GetItemTypes();
 
 # get the record
-my $order  = $query->param('order') || '';
-if ( $order eq '' ) {
-    $order = "date_due desc";
-    $template->param( orderbydate => 1 );
-}
-
+my $order = $query->param('order') || '';
 if ( $order eq 'title' ) {
     $template->param( orderbytitle => 1 );
 }
-
-if ( $order eq 'author' ) {
+elsif ( $order eq 'author' ) {
     $template->param( orderbyauthor => 1 );
 }
-
-my $limit = $query->param('limit') || 50;
-if ( $limit eq 'full' ) {
-    $limit = 0;
-}
 else {
-    $limit = 50;
+    $order = "date_due desc";
+    $template->param( orderbydate => 1 );
 }
 
-my ( $issues ) = GetAllIssues( $borrowernumber, $order, $limit );
-
-
-my @loop_reading;
-
-foreach my $issue (@{$issues} ) {
-    my %line;
-	
-    my $record = GetMarcBiblio($issue->{'biblionumber'});
-
-	# XISBN Stuff
-	my $isbn               = GetNormalizedISBN($issue->{'isbn'});
-	$line{normalized_isbn} = $isbn;
-    $line{biblionumber}    = $issue->{'biblionumber'};
-    $line{title}           = $issue->{'title'};
-    $line{author}          = $issue->{'author'};
-    $line{itemcallnumber}  = $issue->{'itemcallnumber'};
-    $line{date_due}        = $issue->{'date_due'};
-    $line{returndate}      = $issue->{'returndate'};
-    $line{volumeddesc}     = $issue->{'volumeddesc'};
-    $issue->{'itemtype'}   = C4::Context->preference('item-level_itypes') ? $issue->{'itype'} : $issue->{'itemtype'};
-    if($issue->{'itemtype'}) {
-        $line{'description'}   = $itemtypes->{ $issue->{'itemtype'} }->{'description'};
-        $line{imageurl}        = getitemtypeimagelocation( 'opac', $itemtypes->{ $issue->{'itemtype'}  }->{'imageurl'} );
+
+my $limit = $query->param('limit');
+$limit = ( $limit eq 'full' ) ? 0 : 50;
+
+my $issues = GetAllIssues( $borrowernumber, $order, $limit );
+
+my $itype_attribute =
+  ( C4::Context->preference('item-level_itypes') ) ? 'itype' : 'itemtype';
+
+foreach my $issue ( @{$issues} ) {
+    $issue->{normalized_isbn} = GetNormalizedISBN( $issue->{isbn} );
+    if ( $issue->{$itype_attribute} ) {
+        $issue->{description} =
+          $itemtypes->{ $issue->{$itype_attribute} }->{description};
+        $issue->{imageurl} =
+          getitemtypeimagelocation( 'opac',
+            $itemtypes->{ $issue->{$itype_attribute} }->{imageurl} );
+    }
+    if ( $issue->{marcxml} ) {
+        my $marcxml = StripNonXmlChars( $issue->{marcxml} );
+        my $marc_rec =
+          MARC::Record::new_from_xml( $marcxml, 'utf8',
+            C4::Context->preference('marcflavour') );
+        $issue->{subtitle} =
+          GetRecordValue( 'subtitle', $marc_rec, $issue->{frameworkcode} );
     }
-    push( @loop_reading, \%line );
-    $line{subtitle} = GetRecordValue('subtitle', $record, GetFrameworkCode($issue->{'biblionumber'}));
 }
 
 if (C4::Context->preference('BakerTaylorEnabled')) {
@@ -125,11 +116,10 @@ for(qw(AmazonCoverImages GoogleJackets)) {	# BakerTaylorEnabled handled above
 }
 
 $template->param(
-    READING_RECORD => \@loop_reading,
+    READING_RECORD => $issues,
     limit          => $limit,
     showfulllink   => 1,
-	readingrecview => 1,
-	count          => scalar @loop_reading,
+    readingrecview => 1,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
-- 
1.7.7.6


From cnighswonger at foundations.edu  Fri Apr 27 21:26:04 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 27 Apr 2012 15:26:04 -0400
Subject: [Koha-patches] [PATCH 1/7] Upgrading DataTables library to 1.9.1
Message-ID: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>

Previous versions of the DataTables library did not support listeners
for custom DataTabels events. These listeners are necessary to the
"add quote" feature of the QOD editor.

http://bugs.koha-community.org/show_bug.cgi?id=7977
---
 .../en/lib/jquery/plugins/jquery.dataTables.min.js |  279 ++++++++++----------
 1 files changed, 141 insertions(+), 138 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
index 771c00b..044af05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
@@ -1,10 +1,10 @@
 /*
  * File:        jquery.dataTables.min.js
- * Version:     1.8.1
+ * Version:     1.9.1
  * Author:      Allan Jardine (www.sprymedia.co.uk)
  * Info:        www.datatables.net
  *
- * Copyright 2008-2010 Allan Jardine, all rights reserved.
+ * Copyright 2008-2012 Allan Jardine, all rights reserved.
  *
  * This source file is free software, under either the GPL v2 license or a
  * BSD style license, available at:
@@ -15,139 +15,142 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
  */
-(function(i,wa,p){i.fn.dataTableSettings=[];var D=i.fn.dataTableSettings;i.fn.dataTableExt={};var o=i.fn.dataTableExt;o.sVersion="1.8.1";o.sErrMode="alert";o.iApiIndex=0;o.oApi={};o.afnFiltering=[];o.aoFeatures=[];o.ofnSearch={};o.afnSortData=[];o.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
-sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
-sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};o.oJUIClasses={sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",
-sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",
-sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last ui-corner-tr ui-corner-br",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",
-sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollWrapper:"dataTables_scroll",
-sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};o.oPagination={two_button:{fnInit:function(g,l,r){var s,w,y;if(g.bJUI){s=p.createElement("a");w=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;w.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;
-s.appendChild(y)}else{s=p.createElement("div");w=p.createElement("div")}s.className=g.oClasses.sPagePrevDisabled;w.className=g.oClasses.sPageNextDisabled;s.title=g.oLanguage.oPaginate.sPrevious;w.title=g.oLanguage.oPaginate.sNext;l.appendChild(s);l.appendChild(w);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(s).bind("selectstart.DT",function(){return false});i(w).bind("selectstart.DT",function(){return false});
-if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_previous");w.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l=g.aanFeatures.p,r=0,s=l.length;r<s;r++)if(l[r].childNodes.length!==0){l[r].childNodes[0].className=g._iDisplayStart===0?g.oClasses.sPagePrevDisabled:g.oClasses.sPagePrevEnabled;l[r].childNodes[1].className=g.fnDisplayEnd()==g.fnRecordsDisplay()?g.oClasses.sPageNextDisabled:
-g.oClasses.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(g,l,r){var s=p.createElement("span"),w=p.createElement("span"),y=p.createElement("span"),G=p.createElement("span"),x=p.createElement("span");s.innerHTML=g.oLanguage.oPaginate.sFirst;w.innerHTML=g.oLanguage.oPaginate.sPrevious;G.innerHTML=g.oLanguage.oPaginate.sNext;x.innerHTML=g.oLanguage.oPaginate.sLast;var v=g.oClasses;s.className=v.sPageButton+" "+v.sPageFirst;w.className=v.sPageButton+" "+v.sPagePrevious;G.className=
-v.sPageButton+" "+v.sPageNext;x.className=v.sPageButton+" "+v.sPageLast;l.appendChild(s);l.appendChild(w);l.appendChild(y);l.appendChild(G);l.appendChild(x);i(s).bind("click.DT",function(){g.oApi._fnPageChange(g,"first")&&r(g)});i(w).bind("click.DT",function(){g.oApi._fnPageChange(g,"previous")&&r(g)});i(G).bind("click.DT",function(){g.oApi._fnPageChange(g,"next")&&r(g)});i(x).bind("click.DT",function(){g.oApi._fnPageChange(g,"last")&&r(g)});i("span",l).bind("mousedown.DT",function(){return false}).bind("selectstart.DT",
-function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");s.setAttribute("id",g.sTableId+"_first");w.setAttribute("id",g.sTableId+"_previous");G.setAttribute("id",g.sTableId+"_next");x.setAttribute("id",g.sTableId+"_last")}},fnUpdate:function(g,l){if(g.aanFeatures.p){var r=o.oPagination.iFullNumbersShowPages,s=Math.floor(r/2),w=Math.ceil(g.fnRecordsDisplay()/g._iDisplayLength),y=Math.ceil(g._iDisplayStart/g._iDisplayLength)+1,G=
-"",x,v=g.oClasses;if(w<r){s=1;x=w}else if(y<=s){s=1;x=r}else if(y>=w-s){s=w-r+1;x=w}else{s=y-Math.ceil(r/2)+1;x=s+r-1}for(r=s;r<=x;r++)G+=y!=r?'<span class="'+v.sPageButton+'">'+r+"</span>":'<span class="'+v.sPageButtonActive+'">'+r+"</span>";x=g.aanFeatures.p;var z,Y=function(L){g._iDisplayStart=(this.innerHTML*1-1)*g._iDisplayLength;l(g);L.preventDefault()},V=function(){return false};r=0;for(s=x.length;r<s;r++)if(x[r].childNodes.length!==0){z=i("span:eq(2)",x[r]);z.html(G);i("span",z).bind("click.DT",
-Y).bind("mousedown.DT",V).bind("selectstart.DT",V);z=x[r].getElementsByTagName("span");z=[z[0],z[1],z[z.length-2],z[z.length-1]];i(z).removeClass(v.sPageButton+" "+v.sPageButtonActive+" "+v.sPageButtonStaticDisabled);if(y==1){z[0].className+=" "+v.sPageButtonStaticDisabled;z[1].className+=" "+v.sPageButtonStaticDisabled}else{z[0].className+=" "+v.sPageButton;z[1].className+=" "+v.sPageButton}if(w===0||y==w||g._iDisplayLength==-1){z[2].className+=" "+v.sPageButtonStaticDisabled;z[3].className+=" "+
-v.sPageButtonStaticDisabled}else{z[2].className+=" "+v.sPageButton;z[3].className+=" "+v.sPageButton}}}}}};o.oSort={"string-asc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?-1:g>l?1:0},"string-desc":function(g,l){if(typeof g!="string")g="";if(typeof l!="string")l="";g=g.toLowerCase();l=l.toLowerCase();return g<l?1:g>l?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<
-l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?1:g>l?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return l-
-g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};o.aTypes=[function(g){if(typeof g=="number")return"numeric";else if(typeof g!="string")return null;var l,r=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var s=1;s<g.length;s++){l=g.charAt(s);if("0123456789.".indexOf(l)==-1)return null;if(l=="."){if(r)return null;r=true}}return"numeric"},function(g){var l=Date.parse(g);
-if(l!==null&&!isNaN(l)||typeof g=="string"&&g.length===0)return"date";return null},function(g){if(typeof g=="string"&&g.indexOf("<")!=-1&&g.indexOf(">")!=-1)return"html";return null}];o.fnVersionCheck=function(g){var l=function(x,v){for(;x.length<v;)x+="0";return x},r=o.sVersion.split(".");g=g.split(".");for(var s="",w="",y=0,G=g.length;y<G;y++){s+=l(r[y],3);w+=l(g[y],3)}return parseInt(s,10)>=parseInt(w,10)};o._oExternConfig={iNextUnique:0};i.fn.dataTable=function(g){function l(){this.fnRecordsTotal=
-function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false||this._iDisplayLength==-1?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd};this.sInstance=
-this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false,bDeferRender:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,bInfinite:false,iLoadGap:100,iBarWidth:0,bAutoCss:true};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",
-sLoadingRecords:"Loading...",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"},fnInfoCallback:null};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.aoHeader=[];this.aoFooter=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false,
-bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.sDestroyWidth=0;this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];this.fnInitComplete=this.fnPreDrawCallback=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.bInitialised=this.bDeferLoading=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button";
-this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.fnCookieCallback=null;this.aoStateSave=[];this.aoStateLoad=[];this.sAjaxSource=this.oLoadedState=null;this.sAjaxDataProp="aaData";this.bAjaxDataGet=true;this.jqXHR=null;this.fnServerData=function(a,b,c,d){d.jqXHR=i.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(f,e){e=="parsererror"&&alert("DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})};
-this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d<b;d++){if(d%3===0&&d!==0)c=","+c;c=a[b-d-1]+c}}return c};this.aLengthMenu=[10,25,50,100];this.bDrawing=this.iDraw=0;this.iDrawError=-1;this._iDisplayLength=10;this._iDisplayStart=0;this._iDisplayEnd=10;this._iRecordsDisplay=this._iRecordsTotal=0;this.bJUI=false;this.oClasses=o.oStdClasses;this.bSortCellsTop=this.bSorted=this.bFiltered=false;this.oInit=null}function r(a){return function(){var b=
-[A(this[o.iApiIndex])].concat(Array.prototype.slice.call(arguments));return o.oApi[a].apply(this,b)}}function s(a){var b,c,d=a.iInitDisplayStart;if(a.bInitialised===false)setTimeout(function(){s(a)},200);else{xa(a);V(a);L(a,a.aoHeader);a.nTFoot&&L(a,a.aoFooter);K(a,true);a.oFeatures.bAutoWidth&&ea(a);b=0;for(c=a.aoColumns.length;b<c;b++)if(a.aoColumns[b].sWidth!==null)a.aoColumns[b].nTh.style.width=u(a.aoColumns[b].sWidth);if(a.oFeatures.bSort)R(a);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);
-else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}if(a.sAjaxSource!==null&&!a.oFeatures.bServerSide)a.fnServerData.call(a.oInstance,a.sAjaxSource,[],function(f){var e=f;if(a.sAjaxDataProp!=="")e=Z(a.sAjaxDataProp)(f);for(b=0;b<e.length;b++)v(a,e[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)R(a);else{a.aiDisplay=a.aiDisplayMaster.slice();E(a);C(a)}K(a,false);w(a,f)},a);else if(!a.oFeatures.bServerSide){K(a,false);w(a)}}}function w(a,b){a._bInitComplete=true;if(typeof a.fnInitComplete=="function")typeof b!=
-"undefined"?a.fnInitComplete.call(a.oInstance,a,b):a.fnInitComplete.call(a.oInstance,a)}function y(a,b,c){n(a.oLanguage,b,"sProcessing");n(a.oLanguage,b,"sLengthMenu");n(a.oLanguage,b,"sEmptyTable");n(a.oLanguage,b,"sLoadingRecords");n(a.oLanguage,b,"sZeroRecords");n(a.oLanguage,b,"sInfo");n(a.oLanguage,b,"sInfoEmpty");n(a.oLanguage,b,"sInfoFiltered");n(a.oLanguage,b,"sInfoPostFix");n(a.oLanguage,b,"sSearch");if(typeof b.oPaginate!="undefined"){n(a.oLanguage.oPaginate,b.oPaginate,"sFirst");n(a.oLanguage.oPaginate,
-b.oPaginate,"sPrevious");n(a.oLanguage.oPaginate,b.oPaginate,"sNext");n(a.oLanguage.oPaginate,b.oPaginate,"sLast")}typeof b.sEmptyTable=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sEmptyTable");typeof b.sLoadingRecords=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sLoadingRecords");c&&s(a)}function G(a,b){var c=a.aoColumns.length;b={sType:null,_bAutoType:true,bVisible:true,bSearchable:true,bSortable:true,asSorting:["asc","desc"],
-sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,sTitle:b?b.innerHTML:"",sName:"",sWidth:null,sWidthOrig:null,sClass:null,fnRender:null,bUseRendered:true,iDataSort:c,mDataProp:c,fnGetData:null,fnSetData:null,sSortDataType:"std",sDefaultContent:null,sContentPadding:"",nTh:b?b:p.createElement("th"),nTf:null};a.aoColumns.push(b);if(typeof a.aoPreSearchCols[c]=="undefined"||a.aoPreSearchCols[c]===null)a.aoPreSearchCols[c]={sSearch:"",bRegex:false,bSmart:true};else{if(typeof a.aoPreSearchCols[c].bRegex==
-"undefined")a.aoPreSearchCols[c].bRegex=true;if(typeof a.aoPreSearchCols[c].bSmart=="undefined")a.aoPreSearchCols[c].bSmart=true}x(a,c,null)}function x(a,b,c){b=a.aoColumns[b];if(typeof c!="undefined"&&c!==null){if(typeof c.sType!="undefined"){b.sType=c.sType;b._bAutoType=false}n(b,c,"bVisible");n(b,c,"bSearchable");n(b,c,"bSortable");n(b,c,"sTitle");n(b,c,"sName");n(b,c,"sWidth");n(b,c,"sWidth","sWidthOrig");n(b,c,"sClass");n(b,c,"fnRender");n(b,c,"bUseRendered");n(b,c,"iDataSort");n(b,c,"mDataProp");
-n(b,c,"asSorting");n(b,c,"sSortDataType");n(b,c,"sDefaultContent");n(b,c,"sContentPadding")}b.fnGetData=Z(b.mDataProp);b.fnSetData=ya(b.mDataProp);if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortable;b.sSortingClassJUI=a.oClasses.sSortJUI}else if(i.inArray("asc",
-b.asSorting)!=-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function v(a,b){var c;c=typeof b.length=="number"?b.slice():i.extend(true,{},b);b=a.aoData.length;var d={nTr:null,_iId:a.iNextId++,_aData:c,_anHidden:[],_sRowStripe:""};a.aoData.push(d);for(var f,
-e=0,h=a.aoColumns.length;e<h;e++){c=a.aoColumns[e];typeof c.fnRender=="function"&&c.bUseRendered&&c.mDataProp!==null&&N(a,b,e,c.fnRender({iDataRow:b,iDataColumn:e,aData:d._aData,oSettings:a}));if(c._bAutoType&&c.sType!="string"){f=H(a,b,e,"type");if(f!==null&&f!==""){f=fa(f);if(c.sType===null)c.sType=f;else if(c.sType!=f)c.sType="string"}}}a.aiDisplayMaster.push(b);a.oFeatures.bDeferRender||z(a,b);return b}function z(a,b){var c=a.aoData[b],d;if(c.nTr===null){c.nTr=p.createElement("tr");typeof c._aData.DT_RowId!=
-"undefined"&&c.nTr.setAttribute("id",c._aData.DT_RowId);typeof c._aData.DT_RowClass!="undefined"&&i(c.nTr).addClass(c._aData.DT_RowClass);for(var f=0,e=a.aoColumns.length;f<e;f++){var h=a.aoColumns[f];d=p.createElement("td");d.innerHTML=typeof h.fnRender=="function"&&(!h.bUseRendered||h.mDataProp===null)?h.fnRender({iDataRow:b,iDataColumn:f,aData:c._aData,oSettings:a}):H(a,b,f,"display");if(h.sClass!==null)d.className=h.sClass;if(h.bVisible){c.nTr.appendChild(d);c._anHidden[f]=null}else c._anHidden[f]=
-d}}}function Y(a){var b,c,d,f,e,h,j,k,m;if(a.bDeferLoading||a.sAjaxSource===null){j=a.nTBody.childNodes;b=0;for(c=j.length;b<c;b++)if(j[b].nodeName.toUpperCase()=="TR"){k=a.aoData.length;a.aoData.push({nTr:j[b],_iId:a.iNextId++,_aData:[],_anHidden:[],_sRowStripe:""});a.aiDisplayMaster.push(k);h=j[b].childNodes;d=e=0;for(f=h.length;d<f;d++){m=h[d].nodeName.toUpperCase();if(m=="TD"||m=="TH"){N(a,k,e,i.trim(h[d].innerHTML));e++}}}}j=$(a);h=[];b=0;for(c=j.length;b<c;b++){d=0;for(f=j[b].childNodes.length;d<
-f;d++){e=j[b].childNodes[d];m=e.nodeName.toUpperCase();if(m=="TD"||m=="TH")h.push(e)}}h.length!=j.length*a.aoColumns.length&&J(a,1,"Unexpected number of TD elements. Expected "+j.length*a.aoColumns.length+" and got "+h.length+". DataTables does not support rowspan / colspan in the table body, and there must be one cell for each row/column combination.");d=0;for(f=a.aoColumns.length;d<f;d++){if(a.aoColumns[d].sTitle===null)a.aoColumns[d].sTitle=a.aoColumns[d].nTh.innerHTML;j=a.aoColumns[d]._bAutoType;
-m=typeof a.aoColumns[d].fnRender=="function";e=a.aoColumns[d].sClass!==null;k=a.aoColumns[d].bVisible;var t,q;if(j||m||e||!k){b=0;for(c=a.aoData.length;b<c;b++){t=h[b*f+d];if(j&&a.aoColumns[d].sType!="string"){q=H(a,b,d,"type");if(q!==""){q=fa(q);if(a.aoColumns[d].sType===null)a.aoColumns[d].sType=q;else if(a.aoColumns[d].sType!=q)a.aoColumns[d].sType="string"}}if(m){q=a.aoColumns[d].fnRender({iDataRow:b,iDataColumn:d,aData:a.aoData[b]._aData,oSettings:a});t.innerHTML=q;a.aoColumns[d].bUseRendered&&
-N(a,b,d,q)}if(e)t.className+=" "+a.aoColumns[d].sClass;if(k)a.aoData[b]._anHidden[d]=null;else{a.aoData[b]._anHidden[d]=t;t.parentNode.removeChild(t)}}}}}function V(a){var b,c,d;a.nTHead.getElementsByTagName("tr");if(a.nTHead.getElementsByTagName("th").length!==0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}}else{var f=p.createElement("tr");b=0;
-for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);f.appendChild(c)}i(a.nTHead).html("")[0].appendChild(f);W(a.aoHeader,a.nTHead)}if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;f=p.createElement("div");f.className=a.oClasses.sSortJUIWrapper;i(c).contents().appendTo(f);var e=p.createElement("span");e.className=a.oClasses.sSortIcon;f.appendChild(e);c.appendChild(f)}}d=function(){this.onselectstart=
-function(){return false};return false};if(a.oFeatures.bSort)for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable!==false){ga(a,a.aoColumns[b].nTh,b);i(a.aoColumns[b].nTh).bind("mousedown.DT",d)}else i(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);a.oClasses.sFooterTH!==""&&i(">tr>th",a.nTFoot).addClass(a.oClasses.sFooterTH);if(a.nTFoot!==null){c=S(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)if(typeof c[b]!="undefined")a.aoColumns[b].nTf=c[b]}}function L(a,b,c){var d,f,
-e,h=[],j=[],k=a.aoColumns.length;if(typeof c=="undefined")c=false;d=0;for(f=b.length;d<f;d++){h[d]=b[d].slice();h[d].nTr=b[d].nTr;for(e=k-1;e>=0;e--)!a.aoColumns[e].bVisible&&!c&&h[d].splice(e,1);j.push([])}d=0;for(f=h.length;d<f;d++){if(h[d].nTr){a=0;for(e=h[d].nTr.childNodes.length;a<e;a++)h[d].nTr.removeChild(h[d].nTr.childNodes[0])}e=0;for(b=h[d].length;e<b;e++){k=c=1;if(typeof j[d][e]=="undefined"){h[d].nTr.appendChild(h[d][e].cell);for(j[d][e]=1;typeof h[d+c]!="undefined"&&h[d][e].cell==h[d+
-c][e].cell;){j[d+c][e]=1;c++}for(;typeof h[d][e+k]!="undefined"&&h[d][e].cell==h[d][e+k].cell;){for(a=0;a<c;a++)j[d+a][e+k]=1;k++}h[d][e].cell.setAttribute("rowspan",c);h[d][e].cell.setAttribute("colspan",k)}}}}function C(a){var b,c,d=[],f=0,e=false;b=a.asStripClasses.length;c=a.aoOpenRows.length;if(!(a.fnPreDrawCallback!==null&&a.fnPreDrawCallback.call(a.oInstance,a)===false)){a.bDrawing=true;if(typeof a.iInitDisplayStart!="undefined"&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?
-a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;E(a)}if(a.bDeferLoading){a.bDeferLoading=false;a.iDraw++}else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!za(a))return}else a.iDraw++;if(a.aiDisplay.length!==0){var h=a._iDisplayStart,j=a._iDisplayEnd;if(a.oFeatures.bServerSide){h=0;j=a.aoData.length}for(h=h;h<j;h++){var k=a.aoData[a.aiDisplay[h]];k.nTr===null&&z(a,a.aiDisplay[h]);var m=k.nTr;if(b!==0){var t=a.asStripClasses[f%b];if(k._sRowStripe!=
-t){i(m).removeClass(k._sRowStripe).addClass(t);k._sRowStripe=t}}if(typeof a.fnRowCallback=="function"){m=a.fnRowCallback.call(a.oInstance,m,a.aoData[a.aiDisplay[h]]._aData,f,h);if(!m&&!e){J(a,0,"A node was not returned by fnRowCallback");e=true}}d.push(m);f++;if(c!==0)for(k=0;k<c;k++)m==a.aoOpenRows[k].nParent&&d.push(a.aoOpenRows[k].nTr)}}else{d[0]=p.createElement("tr");if(typeof a.asStripClasses[0]!="undefined")d[0].className=a.asStripClasses[0];e=a.oLanguage.sZeroRecords.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()));
-if(a.iDraw==1&&a.sAjaxSource!==null&&!a.oFeatures.bServerSide)e=a.oLanguage.sLoadingRecords;else if(typeof a.oLanguage.sEmptyTable!="undefined"&&a.fnRecordsTotal()===0)e=a.oLanguage.sEmptyTable;b=p.createElement("td");b.setAttribute("valign","top");b.colSpan=X(a);b.className=a.oClasses.sRowEmpty;b.innerHTML=e;d[f].appendChild(b)}typeof a.fnHeaderCallback=="function"&&a.fnHeaderCallback.call(a.oInstance,i(">tr",a.nTHead)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback==
-"function"&&a.fnFooterCallback.call(a.oInstance,i(">tr",a.nTFoot)[0],aa(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f=p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered){c=a.nTBody.childNodes;for(b=c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b])}b=0;for(c=d.length;b<c;b++)f.appendChild(d[b]);a.nTBody.appendChild(f);e!==null&&e.appendChild(a.nTBody)}for(b=a.aoDrawCallback.length-
-1;b>=0;b--)a.aoDrawCallback[b].fn.call(a.oInstance,a);a.bSorted=false;a.bFiltered=false;a.bDrawing=false;if(a.oFeatures.bServerSide){K(a,false);typeof a._bInitComplete=="undefined"&&w(a)}}}function ba(a){if(a.oFeatures.bSort)R(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)M(a,a.oPreviousSearch);else{E(a);C(a)}}function za(a){if(a.bAjaxDataGet){K(a,true);var b=a.aoColumns.length,c=[],d,f;a.iDraw++;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:ha(a)});
-c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==false?a._iDisplayLength:-1});for(f=0;f<b;f++){d=a.aoColumns[f].mDataProp;c.push({name:"mDataProp_"+f,value:typeof d=="function"?"function":d})}if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++){c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch});c.push({name:"bRegex_"+
-f,value:a.aoPreSearchCols[f].bRegex});c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}}if(a.oFeatures.bSort!==false){d=a.aaSortingFixed!==null?a.aaSortingFixed.length:0;var e=a.aaSorting.length;c.push({name:"iSortingCols",value:d+e});for(f=0;f<d;f++){c.push({name:"iSortCol_"+f,value:a.aaSortingFixed[f][0]});c.push({name:"sSortDir_"+f,value:a.aaSortingFixed[f][1]})}for(f=0;f<e;f++){c.push({name:"iSortCol_"+(f+d),value:a.aaSorting[f][0]});c.push({name:"sSortDir_"+(f+d),value:a.aaSorting[f][1]})}for(f=
-0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(h){Aa(a,h)},a);return false}else return true}function Aa(a,b){if(typeof b.sEcho!="undefined")if(b.sEcho*1<a.iDraw)return;else a.iDraw=b.sEcho*1;if(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))ia(a);a._iRecordsTotal=b.iTotalRecords;a._iRecordsDisplay=b.iTotalDisplayRecords;var c=ha(a);if(c=typeof b.sColumns!="undefined"&&c!==""&&b.sColumns!=c)var d=
-Ba(a,b.sColumns);b=Z(a.sAjaxDataProp)(b);for(var f=0,e=b.length;f<e;f++)if(c){for(var h=[],j=0,k=a.aoColumns.length;j<k;j++)h.push(b[f][d[j]]);v(a,h)}else v(a,b[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;C(a);a.bAjaxDataGet=true;K(a,false)}function xa(a){var b=p.createElement("div");a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=p.createElement("div");a.nTableWrapper.className=a.oClasses.sWrapper;a.sTableId!==""&&a.nTableWrapper.setAttribute("id",a.sTableId+"_wrapper");
-a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),f,e,h,j,k,m,t,q=0;q<d.length;q++){e=0;h=d[q];if(h=="<"){j=p.createElement("div");k=d[q+1];if(k=="'"||k=='"'){m="";for(t=2;d[q+t]!=k;){m+=d[q+t];t++}if(m=="H")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(m=="F")m="fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";if(m.indexOf(".")!=-1){k=m.split(".");j.setAttribute("id",k[0].substr(1,
-k[0].length-1));j.className=k[1]}else if(m.charAt(0)=="#")j.setAttribute("id",m.substr(1,m.length-1));else j.className=m;q+=t}c.appendChild(j);c=j}else if(h==">")c=c.parentNode;else if(h=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=Ca(a);e=1}else if(h=="f"&&a.oFeatures.bFilter){f=Da(a);e=1}else if(h=="r"&&a.oFeatures.bProcessing){f=Ea(a);e=1}else if(h=="t"){f=Fa(a);e=1}else if(h=="i"&&a.oFeatures.bInfo){f=Ga(a);e=1}else if(h=="p"&&a.oFeatures.bPaginate){f=Ha(a);e=1}else if(o.aoFeatures.length!==
-0){j=o.aoFeatures;t=0;for(k=j.length;t<k;t++)if(h==j[t].cFeature){if(f=j[t].fnInit(a))e=1;break}}if(e==1&&f!==null){if(typeof a.aanFeatures[h]!="object")a.aanFeatures[h]=[];a.aanFeatures[h].push(f);c.appendChild(f)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function Fa(a){if(a.oScroll.sX===""&&a.oScroll.sY==="")return a.nTable;var b=p.createElement("div"),c=p.createElement("div"),d=p.createElement("div"),f=p.createElement("div"),e=p.createElement("div"),h=p.createElement("div"),j=a.nTable.cloneNode(false),
-k=a.nTable.cloneNode(false),m=a.nTable.getElementsByTagName("thead")[0],t=a.nTable.getElementsByTagName("tfoot").length===0?null:a.nTable.getElementsByTagName("tfoot")[0],q=typeof g.bJQueryUI!="undefined"&&g.bJQueryUI?o.oJUIClasses:o.oStdClasses;c.appendChild(d);e.appendChild(h);f.appendChild(a.nTable);b.appendChild(c);b.appendChild(f);d.appendChild(j);j.appendChild(m);if(t!==null){b.appendChild(e);h.appendChild(k);k.appendChild(t)}b.className=q.sScrollWrapper;c.className=q.sScrollHead;d.className=
-q.sScrollHeadInner;f.className=q.sScrollBody;e.className=q.sScrollFoot;h.className=q.sScrollFootInner;if(a.oScroll.bAutoCss){c.style.overflow="hidden";c.style.position="relative";e.style.overflow="hidden";f.style.overflow="auto"}c.style.border="0";c.style.width="100%";e.style.border="0";d.style.width="150%";j.removeAttribute("id");j.style.marginLeft="0";a.nTable.style.marginLeft="0";if(t!==null){k.removeAttribute("id");k.style.marginLeft="0"}d=i(">caption",a.nTable);h=0;for(k=d.length;h<k;h++)j.appendChild(d[h]);
-if(a.oScroll.sX!==""){c.style.width=u(a.oScroll.sX);f.style.width=u(a.oScroll.sX);if(t!==null)e.style.width=u(a.oScroll.sX);i(f).scroll(function(){c.scrollLeft=this.scrollLeft;if(t!==null)e.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!=="")f.style.height=u(a.oScroll.sY);a.aoDrawCallback.push({fn:Ia,sName:"scrolling"});a.oScroll.bInfinite&&i(f).scroll(function(){if(!a.bDrawing)if(i(this).scrollTop()+i(this).height()>i(a.nTable).height()-a.oScroll.iLoadGap)if(a.fnDisplayEnd()<a.fnRecordsDisplay()){ja(a,
-"next");E(a);C(a)}});a.nScrollHead=c;a.nScrollFoot=e;return b}function Ia(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,f,e,h,j,k,m,t,q,I=[];h=a.nTable.getElementsByTagName("thead");h.length>0&&a.nTable.removeChild(h[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}h=a.nTHead.cloneNode(true);a.nTable.insertBefore(h,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);
-a.nTable.insertBefore(k,a.nTable.childNodes[1])}if(a.oScroll.sX===""){d.style.width="100%";b.parentNode.style.width="100%"}var O=S(a,h);f=0;for(e=O.length;f<e;f++){t=Ja(a,f);O[f].style.width=a.aoColumns[t].sWidth}a.nTFoot!==null&&P(function(B){B.style.width=""},k.getElementsByTagName("tr"));f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(i.browser.msie&&i.browser.version<=7)a.nTable.style.width=u(i(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!==
-"")a.nTable.style.width=u(a.oScroll.sXInner);else if(f==i(d).width()&&i(d).height()<i(a.nTable).height()){a.nTable.style.width=u(f-a.oScroll.iBarWidth);if(i(a.nTable).outerWidth()>f-a.oScroll.iBarWidth)a.nTable.style.width=u(f)}else a.nTable.style.width=u(f);f=i(a.nTable).outerWidth();if(a.oScroll.sX===""){d.style.width=u(f+a.oScroll.iBarWidth);b.parentNode.style.width=u(f+a.oScroll.iBarWidth)}e=a.nTHead.getElementsByTagName("tr");h=h.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop=
-"0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},h,e);i(h).height(0);if(a.nTFoot!==null){j=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");P(function(B,F){m=B.style;m.paddingTop="0";m.paddingBottom="0";m.borderTopWidth="0";m.borderBottomWidth="0";m.height=0;q=i(B).width();F.style.width=u(q);I.push(q)},j,k);i(j).height(0)}P(function(B){B.innerHTML="";B.style.width=u(I.shift())},h);a.nTFoot!==null&&P(function(B){B.innerHTML=
-"";B.style.width=u(I.shift())},j);if(i(a.nTable).outerWidth()<f)if(a.oScroll.sX==="")J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you enable x-scrolling or increase the width the table has in which to be drawn");else a.oScroll.sXInner!==""&&J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you increase the sScrollXInner property to allow it to draw in a larger area, or simply remove that parameter to allow automatic calculation");
-if(a.oScroll.sY==="")if(i.browser.msie&&i.browser.version<=7)d.style.height=u(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=u(a.oScroll.sY);j=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=u(i(a.nTable).height()+j)}j=i(a.nTable).outerWidth();c.style.width=u(j);b.style.width=u(j+a.oScroll.iBarWidth);if(a.nTFoot!==null){b=a.nScrollFoot.getElementsByTagName("div")[0];
-c=b.getElementsByTagName("table")[0];b.style.width=u(a.nTable.offsetWidth+a.oScroll.iBarWidth);c.style.width=u(a.nTable.offsetWidth)}if(a.bSorted||a.bFiltered)d.scrollTop=0}function ca(a){if(a.oFeatures.bAutoWidth===false)return false;ea(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function Da(a){var b=a.oLanguage.sSearch;b=b.indexOf("_INPUT_")!==-1?b.replace("_INPUT_",'<input type="text" />'):b===""?'<input type="text" />':b+' <input type="text" />';
-var c=p.createElement("div");c.className=a.oClasses.sFilter;c.innerHTML="<label>"+b+"</label>";a.sTableId!==""&&typeof a.aanFeatures.f=="undefined"&&c.setAttribute("id",a.sTableId+"_filter");b=i("input",c);b.val(a.oPreviousSearch.sSearch.replace('"',"&quot;"));b.bind("keyup.DT",function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f<e;f++)d[f]!=this.parentNode&&i("input",d[f]).val(this.value);this.value!=a.oPreviousSearch.sSearch&&M(a,{sSearch:this.value,bRegex:a.oPreviousSearch.bRegex,bSmart:a.oPreviousSearch.bSmart})});
-b.bind("keypress.DT",function(d){if(d.keyCode==13)return false});return c}function M(a,b,c){Ka(a,b.sSearch,c,b.bRegex,b.bSmart);for(b=0;b<a.aoPreSearchCols.length;b++)La(a,a.aoPreSearchCols[b].sSearch,b,a.aoPreSearchCols[b].bRegex,a.aoPreSearchCols[b].bSmart);o.afnFiltering.length!==0&&Ma(a);a.bFiltered=true;a._iDisplayStart=0;E(a);C(a);ka(a,0)}function Ma(a){for(var b=o.afnFiltering,c=0,d=b.length;c<d;c++)for(var f=0,e=0,h=a.aiDisplay.length;e<h;e++){var j=a.aiDisplay[e-f];if(!b[c](a,da(a,j,"filter"),
-j)){a.aiDisplay.splice(e-f,1);f++}}}function La(a,b,c,d,f){if(b!==""){var e=0;b=la(b,d,f);for(d=a.aiDisplay.length-1;d>=0;d--){f=ma(H(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d,1);e++}}}}function Ka(a,b,c,d,f){var e=la(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(o.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||a.oPreviousSearch.sSearch.length>
-b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);ka(a,1);for(c=0;c<a.aiDisplayMaster.length;c++)e.test(a.asDataSearch[c])&&a.aiDisplay.push(a.aiDisplayMaster[c])}else{var h=0;for(c=0;c<a.asDataSearch.length;c++)if(!e.test(a.asDataSearch[c])){a.aiDisplay.splice(c-h,1);h++}}a.oPreviousSearch.sSearch=b;a.oPreviousSearch.bRegex=d;a.oPreviousSearch.bSmart=f}function ka(a,b){a.asDataSearch.splice(0,a.asDataSearch.length);b=typeof b!="undefined"&&b==1?a.aiDisplayMaster:
-a.aiDisplay;for(var c=0,d=b.length;c<d;c++)a.asDataSearch[c]=na(a,da(a,b[c],"filter"))}function na(a,b){var c="";if(typeof a.__nTmpFilter=="undefined")a.__nTmpFilter=p.createElement("div");for(var d=a.__nTmpFilter,f=0,e=a.aoColumns.length;f<e;f++)if(a.aoColumns[f].bSearchable)c+=ma(b[f],a.aoColumns[f].sType)+"  ";if(c.indexOf("&")!==-1){d.innerHTML=c;c=d.textContent?d.textContent:d.innerText;c=c.replace(/\n/g," ").replace(/\r/g,"")}return c}function la(a,b,c){if(c){a=b?a.split(" "):oa(a).split(" ");
-a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,"i")}else{a=b?a:oa(a);return new RegExp(a,"i")}}function ma(a,b){if(typeof o.ofnSearch[b]=="function")return o.ofnSearch[b](a);else if(b=="html")return a.replace(/\n/g," ").replace(/<.*?>/g,"");else if(typeof a=="string")return a.replace(/\n/g," ");else if(a===null)return"";return a}function R(a,b){var c,d,f,e,h=[],j=[],k=o.oSort;d=a.aoData;var m=a.aoColumns;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||a.aaSortingFixed!==null)){h=a.aaSortingFixed!==
-null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<h.length;c++){var t=h[c][0];f=pa(a,t);e=a.aoColumns[t].sSortDataType;if(typeof o.afnSortData[e]!="undefined"){var q=o.afnSortData[e](a,t,f);f=0;for(e=d.length;f<e;f++)N(a,f,t,q[f])}}c=0;for(d=a.aiDisplayMaster.length;c<d;c++)j[a.aiDisplayMaster[c]]=c;var I=h.length;a.aiDisplayMaster.sort(function(O,B){var F,qa;for(c=0;c<I;c++){F=m[h[c][0]].iDataSort;qa=m[F].sType;F=k[(qa?qa:"string")+"-"+h[c][1]](H(a,O,F,"sort"),H(a,B,F,"sort"));
-if(F!==0)return F}return k["numeric-asc"](j[O],j[B])})}if((typeof b=="undefined"||b)&&!a.oFeatures.bDeferRender)T(a);a.bSorted=true;if(a.oFeatures.bFilter)M(a,a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;E(a);C(a)}}function ga(a,b,c,d){i(b).bind("click.DT",function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var h,j;if(f.shiftKey){for(var k=false,m=0;m<a.aaSorting.length;m++)if(a.aaSorting[m][0]==c){k=true;h=a.aaSorting[m][0];j=a.aaSorting[m][2]+
-1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")a.aaSorting.splice(m,1);else{a.aaSorting[m][1]=a.aoColumns[h].asSorting[j];a.aaSorting[m][2]=j}break}k===false&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){h=a.aaSorting[0][0];j=a.aaSorting[0][2]+1;if(typeof a.aoColumns[h].asSorting[j]=="undefined")j=0;a.aaSorting[0][1]=a.aoColumns[h].asSorting[j];a.aaSorting[0][2]=j}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],
-0])}R(a)};if(a.oFeatures.bProcessing){K(a,true);setTimeout(function(){e();a.oFeatures.bServerSide||K(a,false)},0)}else e();typeof d=="function"&&d(a)}})}function T(a){var b,c,d,f,e,h=a.aoColumns.length,j=a.oClasses;for(b=0;b<h;b++)a.aoColumns[b].bSortable&&i(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);f=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){e=a.aoColumns[b].sSortingClass;
-d=-1;for(c=0;c<f.length;c++)if(f[c][0]==b){e=f[c][1]=="asc"?j.sSortAsc:j.sSortDesc;d=c;break}i(a.aoColumns[b].nTh).addClass(e);if(a.bJUI){c=i("span",a.aoColumns[b].nTh);c.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:f[d][1]=="asc"?j.sSortJUIAsc:j.sSortJUIDesc)}}else i(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);e=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=
-Q(a);if(a.oFeatures.bDeferRender)i(d).removeClass(e+"1 "+e+"2 "+e+"3");else if(d.length>=h)for(b=0;b<h;b++)if(d[b].className.indexOf(e+"1")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"1",""))}else if(d[b].className.indexOf(e+"2")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(e+"2",""))}else if(d[b].className.indexOf(e+"3")!=-1){c=0;for(a=d.length/h;c<a;c++)d[h*c+b].className=i.trim(d[h*c+b].className.replace(" "+
-e+"3",""))}j=1;var k;for(b=0;b<f.length;b++){k=parseInt(f[b][0],10);c=0;for(a=d.length/h;c<a;c++)d[h*c+k].className+=" "+e+j;j<3&&j++}}}function Ha(a){if(a.oScroll.bInfinite)return null;var b=p.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;o.oPagination[a.sPaginationType].fnInit(a,b,function(c){E(c);C(c)});typeof a.aanFeatures.p=="undefined"&&a.aoDrawCallback.push({fn:function(c){o.oPagination[c.sPaginationType].fnUpdate(c,function(d){E(d);C(d)})},sName:"pagination"});return b}
-function ja(a,b){var c=a._iDisplayStart;if(b=="first")a._iDisplayStart=0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=
-0;else J(a,0,"Unknown paging action: "+b);return c!=a._iDisplayStart}function Ga(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Na,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b}function Na(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=a._iDisplayStart+1,c=a.fnDisplayEnd(),d=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),e=a.fnFormatNumber(b),h=a.fnFormatNumber(c),j=
-a.fnFormatNumber(d),k=a.fnFormatNumber(f);if(a.oScroll.bInfinite)e=a.fnFormatNumber(1);e=a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()===0?a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",j)+a.oLanguage.sInfoPostFix:a.fnRecordsDisplay()==a.fnRecordsTotal()?a.oLanguage.sInfo.replace("_START_",e).replace("_END_",h).replace("_TOTAL_",k)+a.oLanguage.sInfoPostFix:a.oLanguage.sInfo.replace("_START_",
-e).replace("_END_",h).replace("_TOTAL_",k)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix;if(a.oLanguage.fnInfoCallback!==null)e=a.oLanguage.fnInfoCallback(a,b,c,d,f,e);a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)i(a[b]).html(e)}}function Ca(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+(a.sTableId===""?"":'name="'+a.sTableId+'_length"')+">",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]==
-"object"){c=0;for(d=a.aLengthMenu[0].length;c<d;c++)b+='<option value="'+a.aLengthMenu[0][c]+'">'+a.aLengthMenu[1][c]+"</option>"}else{c=0;for(d=a.aLengthMenu.length;c<d;c++)b+='<option value="'+a.aLengthMenu[c]+'">'+a.aLengthMenu[c]+"</option>"}b+="</select>";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+"_length");f.className=a.oClasses.sLength;f.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";i('select option[value="'+
-a._iDisplayLength+'"]',f).attr("selected",true);i("select",f).bind("change.DT",function(){var e=i(this).val(),h=a.aanFeatures.l;c=0;for(d=h.length;c<d;c++)h[c]!=this.parentNode&&i("select",h[c]).val(e);a._iDisplayLength=parseInt(e,10);E(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=0}if(a._iDisplayLength==-1)a._iDisplayStart=0;C(a)});return f}function Ea(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.r==
-"undefined"&&b.setAttribute("id",a.sTableId+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function K(a,b){if(a.oFeatures.bProcessing){a=a.aanFeatures.r;for(var c=0,d=a.length;c<d;c++)a[c].style.visibility=b?"visible":"hidden"}}function Ja(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(c==b)return d}return null}function pa(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===
-true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function U(a,b){var c,d;c=a._iDisplayStart;for(d=a._iDisplayEnd;c<d;c++)if(a.aoData[a.aiDisplay[c]].nTr==b)return a.aiDisplay[c];c=0;for(d=a.aoData.length;c<d;c++)if(a.aoData[c].nTr==b)return c;return null}function X(a){for(var b=0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===true&&b++;return b}function E(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||
-a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Oa(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=u(a);b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ea(a){var b=0,c,d=0,f=a.aoColumns.length,e,h=i("th",a.nTHead);for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d++;if(a.aoColumns[e].sWidth!==null){c=Oa(a.aoColumns[e].sWidthOrig,a.nTable.parentNode);if(c!==
-null)a.aoColumns[e].sWidth=u(c);b++}}if(f==h.length&&b===0&&d==f&&a.oScroll.sX===""&&a.oScroll.sY==="")for(e=0;e<a.aoColumns.length;e++){c=i(h[e]).width();if(c!==null)a.aoColumns[e].sWidth=u(c)}else{b=a.nTable.cloneNode(false);e=a.nTHead.cloneNode(true);d=p.createElement("tbody");c=p.createElement("tr");b.removeAttribute("id");b.appendChild(e);if(a.nTFoot!==null){b.appendChild(a.nTFoot.cloneNode(true));P(function(k){k.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(d);d.appendChild(c);
-d=i("thead th",b);if(d.length===0)d=i("tbody tr:eq(0)>td",b);h=S(a,e);for(e=d=0;e<f;e++){var j=a.aoColumns[e];if(j.bVisible&&j.sWidthOrig!==null&&j.sWidthOrig!=="")h[e-d].style.width=u(j.sWidthOrig);else if(j.bVisible)h[e-d].style.width="";else d++}for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d=Pa(a,e);if(d!==null){d=d.cloneNode(true);if(a.aoColumns[e].sContentPadding!=="")d.innerHTML+=a.aoColumns[e].sContentPadding;c.appendChild(d)}}f=a.nTable.parentNode;f.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!==
-"")b.style.width=u(a.oScroll.sXInner);else if(a.oScroll.sX!==""){b.style.width="";if(i(b).width()<f.offsetWidth)b.style.width=u(f.offsetWidth)}else if(a.oScroll.sY!=="")b.style.width=u(f.offsetWidth);b.style.visibility="hidden";Qa(a,b);f=i("tbody tr:eq(0)",b).children();if(f.length===0)f=S(a,i("thead",b)[0]);if(a.oScroll.sX!==""){for(e=d=c=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c+=a.aoColumns[e].sWidthOrig===null?i(f[d]).outerWidth():parseInt(a.aoColumns[e].sWidth.replace("px",""),
-10)+(i(f[d]).outerWidth()-i(f[d]).width());d++}b.style.width=u(c);a.nTable.style.width=u(c)}for(e=d=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){c=i(f[d]).width();if(c!==null&&c>0)a.aoColumns[e].sWidth=u(c);d++}a.nTable.style.width=u(i(b).outerWidth());b.parentNode.removeChild(b)}}function Qa(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==""){i(b).width();b.style.width=u(i(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=u(i(b).outerWidth())}function Pa(a,b){var c=
-Ra(a,b);if(c<0)return null;if(a.aoData[c].nTr===null){var d=p.createElement("td");d.innerHTML=H(a,c,b,"");return d}return Q(a,c)[b]}function Ra(a,b){for(var c=-1,d=-1,f=0;f<a.aoData.length;f++){var e=H(a,f,b,"display")+"";e=e.replace(/<.*?>/g,"");if(e.length>c){c=e.length;d=f}}return d}function u(a){if(a===null)return"0px";if(typeof a=="number"){if(a<0)return"0px";return a+"px"}var b=a.charCodeAt(a.length-1);if(b<48||b>57)return a;return a+"px"}function Va(a,b){if(a.length!=b.length)return 1;for(var c=
-0;c<a.length;c++)if(a[c]!=b[c])return 2;return 0}function fa(a){for(var b=o.aTypes,c=b.length,d=0;d<c;d++){var f=b[d](a);if(f!==null)return f}return"string"}function A(a){for(var b=0;b<D.length;b++)if(D[b].nTable==a)return D[b];return null}function aa(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function $(a){for(var b=[],c=0,d=a.aoData.length;c<d;c++)a.aoData[c].nTr!==null&&b.push(a.aoData[c].nTr);return b}function Q(a,b){var c=[],d,f,e,h,j;f=0;var k=a.aoData.length;
-if(typeof b!="undefined"){f=b;k=b+1}for(f=f;f<k;f++){j=a.aoData[f];if(j.nTr!==null){b=[];e=0;for(h=j.nTr.childNodes.length;e<h;e++){d=j.nTr.childNodes[e].nodeName.toLowerCase();if(d=="td"||d=="th")b.push(j.nTr.childNodes[e])}e=d=0;for(h=a.aoColumns.length;e<h;e++)if(a.aoColumns[e].bVisible)c.push(b[e-d]);else{c.push(j._anHidden[e]);d++}}}return c}function oa(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)","g"),"\\$1")}function ra(a,b){for(var c=-1,d=
-0,f=a.length;d<f;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function Ba(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d<f;d++)for(var e=0;e<f;e++)if(a.aoColumns[d].sName==b[e]){c.push(e);break}return c}function ha(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function J(a,b,c){a=a.sTableId===""?"DataTables warning: "+c:"DataTables warning (table id = '"+a.sTableId+"'): "+c;if(b===0)if(o.sErrMode==
-"alert")alert(a);else throw a;else typeof console!="undefined"&&typeof console.log!="undefined"&&console.log(a)}function ia(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,a.aiDisplayMaster.length);a.aiDisplay.splice(0,a.aiDisplay.length);E(a)}function sa(a){if(!(!a.oFeatures.bStateSave||typeof a.bDestroying!="undefined")){var b,c,d,f="{";f+='"iCreate":'+(new Date).getTime()+",";f+='"iStart":'+(a.oScroll.bInfinite?0:a._iDisplayStart)+",";f+='"iEnd":'+(a.oScroll.bInfinite?a._iDisplayLength:
-a._iDisplayEnd)+",";f+='"iLength":'+a._iDisplayLength+",";f+='"sFilter":"'+encodeURIComponent(a.oPreviousSearch.sSearch)+'",';f+='"sFilterEsc":'+!a.oPreviousSearch.bRegex+",";f+='"aaSorting":[ ';for(b=0;b<a.aaSorting.length;b++)f+="["+a.aaSorting[b][0]+',"'+a.aaSorting[b][1]+'"],';f=f.substring(0,f.length-1);f+="],";f+='"aaSearchCols":[ ';for(b=0;b<a.aoPreSearchCols.length;b++)f+='["'+encodeURIComponent(a.aoPreSearchCols[b].sSearch)+'",'+!a.aoPreSearchCols[b].bRegex+"],";f=f.substring(0,f.length-
-1);f+="],";f+='"abVisCols":[ ';for(b=0;b<a.aoColumns.length;b++)f+=a.aoColumns[b].bVisible+",";f=f.substring(0,f.length-1);f+="]";b=0;for(c=a.aoStateSave.length;b<c;b++){d=a.aoStateSave[b].fn(a,f);if(d!=="")f=d}f+="}";Sa(a.sCookiePrefix+a.sInstance,f,a.iCookieDuration,a.sCookiePrefix,a.fnCookieCallback)}}function Ta(a,b){if(a.oFeatures.bStateSave){var c,d,f;d=ta(a.sCookiePrefix+a.sInstance);if(d!==null&&d!==""){try{c=typeof i.parseJSON=="function"?i.parseJSON(d.replace(/'/g,'"')):eval("("+d+")")}catch(e){return}d=
-0;for(f=a.aoStateLoad.length;d<f;d++)if(!a.aoStateLoad[d].fn(a,c))return;a.oLoadedState=i.extend(true,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.oPreviousSearch.sSearch=decodeURIComponent(c.sFilter);a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();if(typeof c.sFilterEsc!="undefined")a.oPreviousSearch.bRegex=!c.sFilterEsc;if(typeof c.aaSearchCols!="undefined")for(d=0;d<c.aaSearchCols.length;d++)a.aoPreSearchCols[d]=
-{sSearch:decodeURIComponent(c.aaSearchCols[d][0]),bRegex:!c.aaSearchCols[d][1]};if(typeof c.abVisCols!="undefined"){b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}}}}}function Sa(a,b,c,d,f){var e=new Date;e.setTime(e.getTime()+c*1E3);c=wa.location.pathname.split("/");a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();var h;if(f!==null){h=typeof i.parseJSON=="function"?i.parseJSON(b):eval("("+b+")");b=f(a,h,e.toGMTString(),
-c.join("/")+"/")}else b=a+"="+encodeURIComponent(b)+"; expires="+e.toGMTString()+"; path="+c.join("/")+"/";f="";e=9999999999999;if((ta(a)!==null?p.cookie.length:b.length+p.cookie.length)+10>4096){a=p.cookie.split(";");for(var j=0,k=a.length;j<k;j++)if(a[j].indexOf(d)!=-1){var m=a[j].split("=");try{h=eval("("+decodeURIComponent(m[1])+")")}catch(t){continue}if(typeof h.iCreate!="undefined"&&h.iCreate<e){f=m[0];e=h.iCreate}}if(f!=="")p.cookie=f+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+
-"/"}p.cookie=b}function ta(a){var b=wa.location.pathname.split("/");a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=p.cookie.split(";");for(var c=0;c<b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function W(a,b){b=b.getElementsByTagName("tr");var c,d,f,e,h,j,k,m,t=function(O,B,F){for(;typeof O[B][F]!="undefined";)F++;return F};a.splice(0,a.length);d=0;for(j=b.length;d<
-j;d++)a.push([]);d=0;for(j=b.length;d<j;d++){f=0;for(k=b[d].childNodes.length;f<k;f++){c=b[d].childNodes[f];if(c.nodeName.toUpperCase()=="TD"||c.nodeName.toUpperCase()=="TH"){var q=c.getAttribute("colspan")*1,I=c.getAttribute("rowspan")*1;q=!q||q===0||q===1?1:q;I=!I||I===0||I===1?1:I;m=t(a,d,0);for(h=0;h<q;h++)for(e=0;e<I;e++){a[d+e][m+h]={cell:c,unique:q==1?true:false};a[d+e].nTr=b[d]}}}}}function S(a,b,c){var d=[];if(typeof c=="undefined"){c=a.aoHeader;if(typeof b!="undefined"){c=[];W(c,b)}}b=0;
-for(var f=c.length;b<f;b++)for(var e=0,h=c[b].length;e<h;e++)if(c[b][e].unique&&(typeof d[e]=="undefined"||!a.bSortCellsTop))d[e]=c[b][e].cell;return d}function Ua(){var a=p.createElement("p"),b=a.style;b.width="100%";b.height="200px";var c=p.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.overflow="hidden";c.appendChild(a);p.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;if(b==a)a=
-c.clientWidth;p.body.removeChild(c);return b-a}function P(a,b,c){for(var d=0,f=b.length;d<f;d++)for(var e=0,h=b[d].childNodes.length;e<h;e++)if(b[d].childNodes[e].nodeType==1)typeof c!="undefined"?a(b[d].childNodes[e],c[d].childNodes[e]):a(b[d].childNodes[e])}function n(a,b,c,d){if(typeof d=="undefined")d=c;if(typeof b[c]!="undefined")a[d]=b[c]}function da(a,b,c){for(var d=[],f=0,e=a.aoColumns.length;f<e;f++)d.push(H(a,b,f,c));return d}function H(a,b,c,d){var f=a.aoColumns[c];if((c=f.fnGetData(a.aoData[b]._aData))===
-undefined){if(a.iDrawError!=a.iDraw&&f.sDefaultContent===null){J(a,0,"Requested unknown parameter '"+f.mDataProp+"' from the data source for row "+b);a.iDrawError=a.iDraw}return f.sDefaultContent}if(c===null&&f.sDefaultContent!==null)c=f.sDefaultContent;if(d=="display"&&c===null)return"";return c}function N(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function Z(a){if(a===null)return function(){return null};else if(typeof a=="function")return function(c){return a(c)};else if(typeof a==
-"string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c){return c[b[0]][b[1]]}:b.length==3?function(c){return c[b[0]][b[1]][b[2]]}:function(c){for(var d=0,f=b.length;d<f;d++)c=c[b[d]];return c}}else return function(c){return c[a]}}function ya(a){if(a===null)return function(){};else if(typeof a=="function")return function(c,d){return a(c,d)};else if(typeof a=="string"&&a.indexOf(".")!=-1){var b=a.split(".");return b.length==2?function(c,d){c[b[0]][b[1]]=d}:b.length==3?function(c,
-d){c[b[0]][b[1]][b[2]]=d}:function(c,d){for(var f=0,e=b.length-1;f<e;f++)c=c[b[f]];c[b[b.length-1]]=d}}else return function(c,d){c[a]=d}}this.oApi={};this.fnDraw=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined"&&a===false){E(b);C(b)}else ba(b)};this.fnFilter=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);if(e.oFeatures.bFilter){if(typeof c=="undefined")c=false;if(typeof d=="undefined")d=true;if(typeof f=="undefined")f=true;if(typeof b=="undefined"||b===null){M(e,{sSearch:a,bRegex:c,
-bSmart:d},1);if(f&&typeof e.aanFeatures.f!="undefined"){b=e.aanFeatures.f;c=0;for(d=b.length;c<d;c++)i("input",b[c]).val(a)}}else{e.aoPreSearchCols[b].sSearch=a;e.aoPreSearchCols[b].bRegex=c;e.aoPreSearchCols[b].bSmart=d;M(e,e.oPreviousSearch,1)}}};this.fnSettings=function(){return A(this[o.iApiIndex])};this.fnVersionCheck=o.fnVersionCheck;this.fnSort=function(a){var b=A(this[o.iApiIndex]);b.aaSorting=a;R(b)};this.fnSortListener=function(a,b,c){ga(A(this[o.iApiIndex]),a,b,c)};this.fnAddData=function(a,
-b){if(a.length===0)return[];var c=[],d,f=A(this[o.iApiIndex]);if(typeof a[0]=="object")for(var e=0;e<a.length;e++){d=v(f,a[e]);if(d==-1)return c;c.push(d)}else{d=v(f,a);if(d==-1)return c;c.push(d)}f.aiDisplay=f.aiDisplayMaster.slice();if(typeof b=="undefined"||b)ba(f);return c};this.fnDeleteRow=function(a,b,c){var d=A(this[o.iApiIndex]);a=typeof a=="object"?U(d,a):a;var f=d.aoData.splice(a,1),e=i.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,1);ra(d.aiDisplayMaster,a);ra(d.aiDisplay,a);typeof b==
-"function"&&b.call(this,d,f);if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){E(d);C(d)}return f};this.fnClearTable=function(a){var b=A(this[o.iApiIndex]);ia(b);if(typeof a=="undefined"||a)C(b)};this.fnOpen=function(a,b,c){var d=A(this[o.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;e.colSpan=X(d);if(typeof b.jquery!="undefined"||typeof b==
-"object")e.appendChild(b);else e.innerHTML=b;b=i("tr",d.nTBody);i.inArray(a,b)!=-1&&i(f).insertAfter(a);d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=A(this[o.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnGetData=function(a,b){var c=A(this[o.iApiIndex]);if(typeof a!="undefined"){a=typeof a=="object"?U(c,a):a;if(typeof b!=
-"undefined")return H(c,a,b,"");return typeof c.aoData[a]!="undefined"?c.aoData[a]._aData:null}return aa(c)};this.fnGetNodes=function(a){var b=A(this[o.iApiIndex]);if(typeof a!="undefined")return typeof b.aoData[a]!="undefined"?b.aoData[a].nTr:null;return $(b)};this.fnGetPosition=function(a){var b=A(this[o.iApiIndex]),c=a.nodeName.toUpperCase();if(c=="TR")return U(b,a);else if(c=="TD"||c=="TH"){c=U(b,a.parentNode);for(var d=Q(b,c),f=0;f<b.aoColumns.length;f++)if(d[f]==a)return[c,pa(b,f),f]}return null};
-this.fnUpdate=function(a,b,c,d,f){var e=A(this[o.iApiIndex]);b=typeof b=="object"?U(e,b):b;if(i.isArray(a)&&typeof a=="object"){e.aoData[b]._aData=a.slice();for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else if(typeof a=="object"){e.aoData[b]._aData=i.extend(true,{},a);for(c=0;c<e.aoColumns.length;c++)this.fnUpdate(H(e,b,c),b,c,false,false)}else{a=a;N(e,b,c,a);if(e.aoColumns[c].fnRender!==null){a=e.aoColumns[c].fnRender({iDataRow:b,iDataColumn:c,aData:e.aoData[b]._aData,
-oSettings:e});e.aoColumns[c].bUseRendered&&N(e,b,c,a)}if(e.aoData[b].nTr!==null)Q(e,b)[c].innerHTML=a}c=i.inArray(b,e.aiDisplay);e.asDataSearch[c]=na(e,da(e,b,"filter"));if(typeof f=="undefined"||f)ca(e);if(typeof d=="undefined"||d)ba(e);return 0};this.fnSetColumnVis=function(a,b,c){var d=A(this[o.iApiIndex]),f,e;e=d.aoColumns.length;var h,j;if(d.aoColumns[a].bVisible!=b){if(b){for(f=j=0;f<a;f++)d.aoColumns[f].bVisible&&j++;j=j>=X(d);if(!j)for(f=a;f<e;f++)if(d.aoColumns[f].bVisible){h=f;break}f=0;
-for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null)j?d.aoData[f].nTr.appendChild(d.aoData[f]._anHidden[a]):d.aoData[f].nTr.insertBefore(d.aoData[f]._anHidden[a],Q(d,f)[h])}else{f=0;for(e=d.aoData.length;f<e;f++)if(d.aoData[f].nTr!==null){h=Q(d,f)[a];d.aoData[f]._anHidden[a]=h;h.parentNode.removeChild(h)}}d.aoColumns[a].bVisible=b;L(d,d.aoHeader);d.nTFoot&&L(d,d.aoFooter);f=0;for(e=d.aoOpenRows.length;f<e;f++)d.aoOpenRows[f].nTr.colSpan=X(d);if(typeof c=="undefined"||c){ca(d);C(d)}sa(d)}};this.fnPageChange=
-function(a,b){var c=A(this[o.iApiIndex]);ja(c,a);E(c);if(typeof b=="undefined"||b)C(c)};this.fnDestroy=function(){var a=A(this[o.iApiIndex]),b=a.nTableWrapper.parentNode,c=a.nTBody,d,f;a.bDestroying=true;d=0;for(f=a.aoColumns.length;d<f;d++)a.aoColumns[d].bVisible===false&&this.fnSetColumnVis(d,true);i(a.nTableWrapper).find("*").andSelf().unbind(".DT");i("tbody>tr>td."+a.oClasses.sRowEmpty,a.nTable).parent().remove();if(a.nTable!=a.nTHead.parentNode){i(">thead",a.nTable).remove();a.nTable.appendChild(a.nTHead)}if(a.nTFoot&&
-a.nTable!=a.nTFoot.parentNode){i(">tfoot",a.nTable).remove();a.nTable.appendChild(a.nTFoot)}a.nTable.parentNode.removeChild(a.nTable);i(a.nTableWrapper).remove();a.aaSorting=[];a.aaSortingFixed=[];T(a);i($(a)).removeClass(a.asStripClasses.join(" "));if(a.bJUI){i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oJUIClasses.sSortableAsc,o.oJUIClasses.sSortableDesc,o.oJUIClasses.sSortableNone].join(" "));i("th span."+o.oJUIClasses.sSortIcon,a.nTHead).remove();i("th",a.nTHead).each(function(){var e=
-i("div."+o.oJUIClasses.sSortJUIWrapper,this),h=e.contents();i(this).append(h);e.remove()})}else i("th",a.nTHead).removeClass([o.oStdClasses.sSortable,o.oStdClasses.sSortableAsc,o.oStdClasses.sSortableDesc,o.oStdClasses.sSortableNone].join(" "));a.nTableReinsertBefore?b.insertBefore(a.nTable,a.nTableReinsertBefore):b.appendChild(a.nTable);d=0;for(f=a.aoData.length;d<f;d++)a.aoData[d].nTr!==null&&c.appendChild(a.aoData[d].nTr);if(a.oFeatures.bAutoWidth===true)a.nTable.style.width=u(a.sDestroyWidth);
-i(">tr:even",c).addClass(a.asDestoryStrips[0]);i(">tr:odd",c).addClass(a.asDestoryStrips[1]);d=0;for(f=D.length;d<f;d++)D[d]==a&&D.splice(d,1);a=null};this.fnAdjustColumnSizing=function(a){var b=A(this[o.iApiIndex]);ca(b);if(typeof a=="undefined"||a)this.fnDraw(false);else if(b.oScroll.sX!==""||b.oScroll.sY!=="")this.oApi._fnScrollDraw(b)};for(var ua in o.oApi)if(ua)this[ua]=r(ua);this.oApi._fnExternApiFunc=r;this.oApi._fnInitalise=s;this.oApi._fnInitComplete=w;this.oApi._fnLanguageProcess=y;this.oApi._fnAddColumn=
-G;this.oApi._fnColumnOptions=x;this.oApi._fnAddData=v;this.oApi._fnCreateTr=z;this.oApi._fnGatherData=Y;this.oApi._fnBuildHead=V;this.oApi._fnDrawHead=L;this.oApi._fnDraw=C;this.oApi._fnReDraw=ba;this.oApi._fnAjaxUpdate=za;this.oApi._fnAjaxUpdateDraw=Aa;this.oApi._fnAddOptionsHtml=xa;this.oApi._fnFeatureHtmlTable=Fa;this.oApi._fnScrollDraw=Ia;this.oApi._fnAjustColumnSizing=ca;this.oApi._fnFeatureHtmlFilter=Da;this.oApi._fnFilterComplete=M;this.oApi._fnFilterCustom=Ma;this.oApi._fnFilterColumn=La;
-this.oApi._fnFilter=Ka;this.oApi._fnBuildSearchArray=ka;this.oApi._fnBuildSearchRow=na;this.oApi._fnFilterCreateSearch=la;this.oApi._fnDataToSearch=ma;this.oApi._fnSort=R;this.oApi._fnSortAttachListener=ga;this.oApi._fnSortingClasses=T;this.oApi._fnFeatureHtmlPaginate=Ha;this.oApi._fnPageChange=ja;this.oApi._fnFeatureHtmlInfo=Ga;this.oApi._fnUpdateInfo=Na;this.oApi._fnFeatureHtmlLength=Ca;this.oApi._fnFeatureHtmlProcessing=Ea;this.oApi._fnProcessingDisplay=K;this.oApi._fnVisibleToColumnIndex=Ja;this.oApi._fnColumnIndexToVisible=
-pa;this.oApi._fnNodeToDataIndex=U;this.oApi._fnVisbleColumns=X;this.oApi._fnCalculateEnd=E;this.oApi._fnConvertToWidth=Oa;this.oApi._fnCalculateColumnWidths=ea;this.oApi._fnScrollingWidthAdjust=Qa;this.oApi._fnGetWidestNode=Pa;this.oApi._fnGetMaxLenString=Ra;this.oApi._fnStringToCss=u;this.oApi._fnArrayCmp=Va;this.oApi._fnDetectType=fa;this.oApi._fnSettingsFromNode=A;this.oApi._fnGetDataMaster=aa;this.oApi._fnGetTrNodes=$;this.oApi._fnGetTdNodes=Q;this.oApi._fnEscapeRegex=oa;this.oApi._fnDeleteIndex=
-ra;this.oApi._fnReOrderIndex=Ba;this.oApi._fnColumnOrdering=ha;this.oApi._fnLog=J;this.oApi._fnClearTable=ia;this.oApi._fnSaveState=sa;this.oApi._fnLoadState=Ta;this.oApi._fnCreateCookie=Sa;this.oApi._fnReadCookie=ta;this.oApi._fnDetectHeader=W;this.oApi._fnGetUniqueThs=S;this.oApi._fnScrollBarWidth=Ua;this.oApi._fnApplyToChildren=P;this.oApi._fnMap=n;this.oApi._fnGetRowData=da;this.oApi._fnGetCellData=H;this.oApi._fnSetCellData=N;this.oApi._fnGetObjectDataFn=Z;this.oApi._fnSetObjectDataFn=ya;var va=
-this;return this.each(function(){var a=0,b,c,d,f;a=0;for(b=D.length;a<b;a++){if(D[a].nTable==this)if(typeof g=="undefined"||typeof g.bRetrieve!="undefined"&&g.bRetrieve===true)return D[a].oInstance;else if(typeof g.bDestroy!="undefined"&&g.bDestroy===true){D[a].oInstance.fnDestroy();break}else{J(D[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, please pass either no arguments to the dataTable() function, or set bRetrieve to true. Alternatively, to destory the old table and create a new one, set bDestroy to true (note that a lot of changes to the configuration can be made through the API which is usually much faster).");
-return}if(D[a].sTableId!==""&&D[a].sTableId==this.getAttribute("id")){D.splice(a,1);break}}var e=new l;D.push(e);var h=false,j=false;a=this.getAttribute("id");if(a!==null){e.sTableId=a;e.sInstance=a}else e.sInstance=o._oExternConfig.iNextUnique++;if(this.nodeName.toLowerCase()!="table")J(e,0,"Attempted to initialise DataTables on a node which is not a table: "+this.nodeName);else{e.nTable=this;e.oInstance=va.length==1?va:i(this).dataTable();e.oApi=va.oApi;e.sDestroyWidth=i(this).width();if(typeof g!=
-"undefined"&&g!==null){e.oInit=g;n(e.oFeatures,g,"bPaginate");n(e.oFeatures,g,"bLengthChange");n(e.oFeatures,g,"bFilter");n(e.oFeatures,g,"bSort");n(e.oFeatures,g,"bInfo");n(e.oFeatures,g,"bProcessing");n(e.oFeatures,g,"bAutoWidth");n(e.oFeatures,g,"bSortClasses");n(e.oFeatures,g,"bServerSide");n(e.oFeatures,g,"bDeferRender");n(e.oScroll,g,"sScrollX","sX");n(e.oScroll,g,"sScrollXInner","sXInner");n(e.oScroll,g,"sScrollY","sY");n(e.oScroll,g,"bScrollCollapse","bCollapse");n(e.oScroll,g,"bScrollInfinite",
-"bInfinite");n(e.oScroll,g,"iScrollLoadGap","iLoadGap");n(e.oScroll,g,"bScrollAutoCss","bAutoCss");n(e,g,"asStripClasses");n(e,g,"fnPreDrawCallback");n(e,g,"fnRowCallback");n(e,g,"fnHeaderCallback");n(e,g,"fnFooterCallback");n(e,g,"fnCookieCallback");n(e,g,"fnInitComplete");n(e,g,"fnServerData");n(e,g,"fnFormatNumber");n(e,g,"aaSorting");n(e,g,"aaSortingFixed");n(e,g,"aLengthMenu");n(e,g,"sPaginationType");n(e,g,"sAjaxSource");n(e,g,"sAjaxDataProp");n(e,g,"iCookieDuration");n(e,g,"sCookiePrefix");
-n(e,g,"sDom");n(e,g,"bSortCellsTop");n(e,g,"oSearch","oPreviousSearch");n(e,g,"aoSearchCols","aoPreSearchCols");n(e,g,"iDisplayLength","_iDisplayLength");n(e,g,"bJQueryUI","bJUI");n(e.oLanguage,g,"fnInfoCallback");typeof g.fnDrawCallback=="function"&&e.aoDrawCallback.push({fn:g.fnDrawCallback,sName:"user"});typeof g.fnStateSaveCallback=="function"&&e.aoStateSave.push({fn:g.fnStateSaveCallback,sName:"user"});typeof g.fnStateLoadCallback=="function"&&e.aoStateLoad.push({fn:g.fnStateLoadCallback,sName:"user"});
-if(e.oFeatures.bServerSide&&e.oFeatures.bSort&&e.oFeatures.bSortClasses)e.aoDrawCallback.push({fn:T,sName:"server_side_sort_classes"});else e.oFeatures.bDeferRender&&e.aoDrawCallback.push({fn:T,sName:"defer_sort_classes"});if(typeof g.bJQueryUI!="undefined"&&g.bJQueryUI){e.oClasses=o.oJUIClasses;if(typeof g.sDom=="undefined")e.sDom='<"H"lfr>t<"F"ip>'}if(e.oScroll.sX!==""||e.oScroll.sY!=="")e.oScroll.iBarWidth=Ua();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=
-g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Ta(e,g);e.aoDrawCallback.push({fn:sa,sName:"state_save"})}if(typeof g.iDeferLoading!="undefined"){e.bDeferLoading=true;e._iRecordsTotal=g.iDeferLoading;e._iRecordsDisplay=g.iDeferLoading}if(typeof g.aaData!="undefined")j=true;if(typeof g!="undefined"&&typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!="undefined"&&g.oLanguage.sUrl!==
-""){e.oLanguage.sUrl=g.oLanguage.sUrl;i.getJSON(e.oLanguage.sUrl,null,function(t){y(e,t,true)});h=true}else y(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"){e.asStripClasses.push(e.oClasses.sStripOdd);e.asStripClasses.push(e.oClasses.sStripEven)}c=false;d=i(">tbody>tr",this);a=0;for(b=e.asStripClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(e.asStripClasses[a])){c=true;break}if(c){e.asDestoryStrips=["",""];if(i(d[0]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[0]+=
-e.oClasses.sStripOdd+" ";if(i(d[0]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[0]+=e.oClasses.sStripEven;if(i(d[1]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[1]+=e.oClasses.sStripOdd+" ";if(i(d[1]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[1]+=e.oClasses.sStripEven;d.removeClass(e.asStripClasses.join(" "))}c=[];var k;a=this.getElementsByTagName("thead");if(a.length!==0){W(e.aoHeader,a[0]);c=S(e)}if(typeof g.aoColumns=="undefined"){k=[];a=0;for(b=c.length;a<b;a++)k.push(null)}else k=
-g.aoColumns;a=0;for(b=k.length;a<b;a++){if(typeof g.saved_aoColumns!="undefined"&&g.saved_aoColumns.length==b){if(k[a]===null)k[a]={};k[a].bVisible=g.saved_aoColumns[a].bVisible}G(e,c?c[a]:null)}if(typeof g.aoColumnDefs!="undefined")for(a=g.aoColumnDefs.length-1;a>=0;a--){var m=g.aoColumnDefs[a].aTargets;i.isArray(m)||J(e,1,"aTargets must be an array of targets, not a "+typeof m);c=0;for(d=m.length;c<d;c++)if(typeof m[c]=="number"&&m[c]>=0){for(;e.aoColumns.length<=m[c];)G(e);x(e,m[c],g.aoColumnDefs[a])}else if(typeof m[c]==
-"number"&&m[c]<0)x(e,e.aoColumns.length+m[c],g.aoColumnDefs[a]);else if(typeof m[c]=="string"){b=0;for(f=e.aoColumns.length;b<f;b++)if(m[c]=="_all"||i(e.aoColumns[b].nTh).hasClass(m[c]))x(e,b,g.aoColumnDefs[a])}}if(typeof k!="undefined"){a=0;for(b=k.length;a<b;a++)x(e,a,k[a])}a=0;for(b=e.aaSorting.length;a<b;a++){if(e.aaSorting[a][0]>=e.aoColumns.length)e.aaSorting[a][0]=0;k=e.aoColumns[e.aaSorting[a][0]];if(typeof e.aaSorting[a][2]=="undefined")e.aaSorting[a][2]=0;if(typeof g.aaSorting=="undefined"&&
-typeof e.saved_aaSorting=="undefined")e.aaSorting[a][1]=k.asSorting[0];c=0;for(d=k.asSorting.length;c<d;c++)if(e.aaSorting[a][1]==k.asSorting[c]){e.aaSorting[a][2]=c;break}}T(e);a=i(">thead",this);if(a.length===0){a=[p.createElement("thead")];this.appendChild(a[0])}e.nTHead=a[0];a=i(">tbody",this);if(a.length===0){a=[p.createElement("tbody")];this.appendChild(a[0])}e.nTBody=a[0];a=i(">tfoot",this);if(a.length>0){e.nTFoot=a[0];W(e.aoFooter,e.nTFoot)}if(j)for(a=0;a<g.aaData.length;a++)v(e,g.aaData[a]);
-else Y(e);e.aiDisplay=e.aiDisplayMaster.slice();e.bInitialised=true;h===false&&s(e)}})}})(jQuery,window,document);
+(function(i,ha,t,p){var l=function(h){function n(a,b){var c=l.defaults.columns,d=a.aoColumns.length;b=i.extend({},l.models.oColumn,c,{sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,nTh:b?b:t.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mDataProp:c.mDataProp?c.oDefaults:d});a.aoColumns.push(b);if(a.aoPreSearchCols[d]===p||a.aoPreSearchCols[d]===null)a.aoPreSearchCols[d]=i.extend({},l.models.oSearch);else{b=a.aoPreSearchCols[d];
+if(b.bRegex===p)b.bRegex=true;if(b.bSmart===p)b.bSmart=true;if(b.bCaseInsensitive===p)b.bCaseInsensitive=true}q(a,d,null)}function q(a,b,c){b=a.aoColumns[b];if(c!==p&&c!==null){if(c.sType!==p){b.sType=c.sType;b._bAutoType=false}i.extend(b,c);r(b,c,"sWidth","sWidthOrig");if(c.iDataSort!==p)b.aDataSort=[c.iDataSort];r(b,c,"aDataSort")}b.fnGetData=ia(b.mDataProp);b.fnSetData=Ha(b.mDataProp);if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==
+-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(b.bSortable||i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortable;b.sSortingClassJUI=a.oClasses.sSortJUI}else if(i.inArray("asc",b.asSorting)!=-1&&i.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(i.inArray("asc",b.asSorting)==-1&&i.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;
+b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function o(a){if(a.oFeatures.bAutoWidth===false)return false;pa(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function v(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(c==b)return d}return null}function x(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function C(a){for(var b=
+0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===true&&b++;return b}function D(a){for(var b=l.ext.aTypes,c=b.length,d=0;d<c;d++){var e=b[d](a);if(e!==null)return e}return"string"}function G(a,b){b=b.split(",");for(var c=[],d=0,e=a.aoColumns.length;d<e;d++)for(var f=0;f<e;f++)if(a.aoColumns[d].sName==b[f]){c.push(f);break}return c}function F(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function S(a,b,c,d){var e,f,
+g,j,m;if(b)for(e=b.length-1;e>=0;e--){var k=b[e].aTargets;i.isArray(k)||M(a,1,"aTargets must be an array of targets, not a "+typeof k);f=0;for(g=k.length;f<g;f++)if(typeof k[f]==="number"&&k[f]>=0){for(;a.aoColumns.length<=k[f];)n(a);d(k[f],b[e])}else if(typeof k[f]==="number"&&k[f]<0)d(a.aoColumns.length+k[f],b[e]);else if(typeof k[f]==="string"){j=0;for(m=a.aoColumns.length;j<m;j++)if(k[f]=="_all"||i(a.aoColumns[j].nTh).hasClass(k[f]))d(j,b[e])}}if(c){e=0;for(a=c.length;e<a;e++)d(e,c[e])}}function P(a,
+b){var c;c=i.isArray(b)?b.slice():i.extend(true,{},b);b=a.aoData.length;var d=i.extend(true,{},l.models.oRow);d._aData=c;a.aoData.push(d);var e;d=0;for(var f=a.aoColumns.length;d<f;d++){c=a.aoColumns[d];typeof c.fnRender==="function"&&c.bUseRendered&&c.mDataProp!==null?R(a,b,d,ba(a,b,d)):R(a,b,d,E(a,b,d));if(c._bAutoType&&c.sType!="string"){e=E(a,b,d,"type");if(e!==null&&e!==""){e=D(e);if(c.sType===null)c.sType=e;else if(c.sType!=e&&c.sType!="html")c.sType="string"}}}a.aiDisplayMaster.push(b);a.oFeatures.bDeferRender||
+qa(a,b);return b}function ja(a){var b,c,d,e,f,g,j,m,k;if(a.bDeferLoading||a.sAjaxSource===null){j=a.nTBody.childNodes;b=0;for(c=j.length;b<c;b++)if(j[b].nodeName.toUpperCase()=="TR"){m=a.aoData.length;j[b]._DT_RowIndex=m;a.aoData.push(i.extend(true,{},l.models.oRow,{nTr:j[b]}));a.aiDisplayMaster.push(m);g=j[b].childNodes;d=f=0;for(e=g.length;d<e;d++){k=g[d].nodeName.toUpperCase();if(k=="TD"||k=="TH"){R(a,m,f,i.trim(g[d].innerHTML));f++}}}}j=ca(a);g=[];b=0;for(c=j.length;b<c;b++){d=0;for(e=j[b].childNodes.length;d<
+e;d++){f=j[b].childNodes[d];k=f.nodeName.toUpperCase();if(k=="TD"||k=="TH")g.push(f)}}e=0;for(j=a.aoColumns.length;e<j;e++){k=a.aoColumns[e];if(k.sTitle===null)k.sTitle=k.nTh.innerHTML;f=k._bAutoType;m=typeof k.fnRender==="function";var y=k.sClass!==null,u=k.bVisible,w,z;if(f||m||y||!u){b=0;for(c=a.aoData.length;b<c;b++){d=a.aoData[b];w=g[b*j+e];if(f&&k.sType!="string"){z=E(a,b,e,"type");if(z!==""){z=D(z);if(k.sType===null)k.sType=z;else if(k.sType!=z&&k.sType!="html")k.sType="string"}}if(typeof k.mDataProp===
+"function")w.innerHTML=E(a,b,e,"display");if(m){z=ba(a,b,e);w.innerHTML=z;k.bUseRendered&&R(a,b,e,z)}if(y)w.className+=" "+k.sClass;if(u)d._anHidden[e]=null;else{d._anHidden[e]=w;w.parentNode.removeChild(w)}k.fnCreatedCell&&k.fnCreatedCell.call(a.oInstance,w,E(a,b,e,"display"),d._aData,b,e)}}}if(a.aoRowCreatedCallback.length!==0){b=0;for(c=a.aoData.length;b<c;b++){d=a.aoData[b];L(a,"aoRowCreatedCallback",null,[d.nTr,d._aData,b])}}}function N(a,b){return b._DT_RowIndex!==p?b._DT_RowIndex:null}function ra(a,
+b,c){b=T(a,b);var d=0;for(a=a.aoColumns.length;d<a;d++)if(b[d]===c)return d;return-1}function ka(a,b,c){for(var d=[],e=0,f=a.aoColumns.length;e<f;e++)d.push(E(a,b,e,c));return d}function E(a,b,c,d){var e=a.aoColumns[c];if((c=e.fnGetData(a.aoData[b]._aData,d))===p){if(a.iDrawError!=a.iDraw&&e.sDefaultContent===null){M(a,0,"Requested unknown parameter "+(typeof e.mDataProp=="function"?"{mDataprop function}":"'"+e.mDataProp+"'")+" from the data source for row "+b);a.iDrawError=a.iDraw}return e.sDefaultContent}if(c===
+null&&e.sDefaultContent!==null)c=e.sDefaultContent;else if(typeof c==="function")return c();if(d=="display"&&c===null)return"";return c}function R(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d)}function ia(a){if(a===null)return function(){return null};else if(typeof a==="function")return function(c,d){return a(c,d)};else if(typeof a==="string"&&a.indexOf(".")!=-1){var b=a.split(".");return function(c){for(var d=0,e=b.length;d<e;d++){c=c[b[d]];if(c===p)return p}return c}}else return function(c){return c[a]}}
+function Ha(a){if(a===null)return function(){};else if(typeof a==="function")return function(c,d){a(c,"set",d)};else if(typeof a==="string"&&a.indexOf(".")!=-1){var b=a.split(".");return function(c,d){for(var e=0,f=b.length-1;e<f;e++){c=c[b[e]];if(c===p)return}c[b[b.length-1]]=d}}else return function(c,d){c[a]=d}}function la(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function sa(a){a.aoData.splice(0,a.aoData.length);a.aiDisplayMaster.splice(0,a.aiDisplayMaster.length);
+a.aiDisplay.splice(0,a.aiDisplay.length);J(a)}function ta(a,b){for(var c=-1,d=0,e=a.length;d<e;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function ba(a,b,c){var d=a.aoColumns[c];return d.fnRender({iDataRow:b,iDataColumn:c,oSettings:a,aData:a.aoData[b]._aData,mDataProp:d.mDataProp},E(a,b,c,"display"))}function qa(a,b){var c=a.aoData[b],d;if(c.nTr===null){c.nTr=t.createElement("tr");c.nTr._DT_RowIndex=b;if(c._aData.DT_RowId)c.nTr.id=c._aData.DT_RowId;c._aData.DT_RowClass&&i(c.nTr).addClass(c._aData.DT_RowClass);
+for(var e=0,f=a.aoColumns.length;e<f;e++){var g=a.aoColumns[e];d=t.createElement(g.sCellType);d.innerHTML=typeof g.fnRender==="function"&&(!g.bUseRendered||g.mDataProp===null)?ba(a,b,e):E(a,b,e,"display");if(g.sClass!==null)d.className=g.sClass;if(g.bVisible){c.nTr.appendChild(d);c._anHidden[e]=null}else c._anHidden[e]=d;g.fnCreatedCell&&g.fnCreatedCell.call(a.oInstance,d,E(a,b,e,"display"),c._aData,b,e)}L(a,"aoRowCreatedCallback",null,[c.nTr,c._aData,b])}}function Ia(a){var b,c,d;if(a.nTHead.getElementsByTagName("th").length!==
+0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.setAttribute("role","columnheader");if(a.aoColumns[b].bSortable){c.setAttribute("tabindex",a.iTabIndex);c.setAttribute("aria-controls",a.sTableId)}a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}}else{var e=t.createElement("tr");b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;c.setAttribute("tabindex",
+"0");a.aoColumns[b].sClass!==null&&i(c).addClass(a.aoColumns[b].sClass);e.appendChild(c)}i(a.nTHead).html("")[0].appendChild(e);da(a.aoHeader,a.nTHead)}i(a.nTHead).children("tr").attr("role","row");if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;e=t.createElement("div");e.className=a.oClasses.sSortJUIWrapper;i(c).contents().appendTo(e);var f=t.createElement("span");f.className=a.oClasses.sSortIcon;e.appendChild(f);c.appendChild(e)}}if(a.oFeatures.bSort)for(b=0;b<a.aoColumns.length;b++)a.aoColumns[b].bSortable!==
+false?ua(a,a.aoColumns[b].nTh,b):i(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);a.oClasses.sFooterTH!==""&&i(a.nTFoot).children("tr").children("th").addClass(a.oClasses.sFooterTH);if(a.nTFoot!==null){c=W(a,null,a.aoFooter);b=0;for(d=a.aoColumns.length;b<d;b++)if(c[b]){a.aoColumns[b].nTf=c[b];a.aoColumns[b].sClass&&i(c[b]).addClass(a.aoColumns[b].sClass)}}}function ea(a,b,c){var d,e,f,g=[],j=[],m=a.aoColumns.length,k;if(c===p)c=false;d=0;for(e=b.length;d<e;d++){g[d]=b[d].slice();g[d].nTr=
+b[d].nTr;for(f=m-1;f>=0;f--)!a.aoColumns[f].bVisible&&!c&&g[d].splice(f,1);j.push([])}d=0;for(e=g.length;d<e;d++){if(a=g[d].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=g[d].length;f<b;f++){k=m=1;if(j[d][f]===p){a.appendChild(g[d][f].cell);for(j[d][f]=1;g[d+m]!==p&&g[d][f].cell==g[d+m][f].cell;){j[d+m][f]=1;m++}for(;g[d][f+k]!==p&&g[d][f].cell==g[d][f+k].cell;){for(c=0;c<m;c++)j[d+c][f+k]=1;k++}g[d][f].cell.rowSpan=m;g[d][f].cell.colSpan=k}}}}function H(a){var b,c,d=[],e=0,f=a.asStripeClasses.length;
+b=a.aoOpenRows.length;c=L(a,"aoPreDrawCallback","preDraw",[a]);if(i.inArray(false,c)!==-1)O(a,false);else{a.bDrawing=true;if(a.iInitDisplayStart!==p&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;J(a)}if(a.bDeferLoading){a.bDeferLoading=false;a.iDraw++}else if(a.oFeatures.bServerSide){if(!a.bDestroying&&!Ja(a))return}else a.iDraw++;if(a.aiDisplay.length!==0){var g=a._iDisplayStart;
+c=a._iDisplayEnd;if(a.oFeatures.bServerSide){g=0;c=a.aoData.length}for(g=g;g<c;g++){var j=a.aoData[a.aiDisplay[g]];j.nTr===null&&qa(a,a.aiDisplay[g]);var m=j.nTr;if(f!==0){var k=a.asStripeClasses[e%f];if(j._sRowStripe!=k){i(m).removeClass(j._sRowStripe).addClass(k);j._sRowStripe=k}}L(a,"aoRowCallback",null,[m,a.aoData[a.aiDisplay[g]]._aData,e,g]);d.push(m);e++;if(b!==0)for(j=0;j<b;j++)if(m==a.aoOpenRows[j].nParent){d.push(a.aoOpenRows[j].nTr);break}}}else{d[0]=t.createElement("tr");if(a.asStripeClasses[0])d[0].className=
+a.asStripeClasses[0];b=a.oLanguage;f=b.sZeroRecords;if(a.iDraw==1&&a.sAjaxSource!==null&&!a.oFeatures.bServerSide)f=b.sLoadingRecords;else if(b.sEmptyTable&&a.fnRecordsTotal()===0)f=b.sEmptyTable;b=t.createElement("td");b.setAttribute("valign","top");b.colSpan=C(a);b.className=a.oClasses.sRowEmpty;b.innerHTML=va(a,f);d[e].appendChild(b)}L(a,"aoHeaderCallback","header",[i(a.nTHead).children("tr")[0],la(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay]);L(a,"aoFooterCallback","footer",[i(a.nTFoot).children("tr")[0],
+la(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay]);e=t.createDocumentFragment();b=t.createDocumentFragment();if(a.nTBody){f=a.nTBody.parentNode;b.appendChild(a.nTBody);if(!a.oScroll.bInfinite||!a._bInitComplete||a.bSorted||a.bFiltered)for(;b=a.nTBody.firstChild;)a.nTBody.removeChild(b);b=0;for(c=d.length;b<c;b++)e.appendChild(d[b]);a.nTBody.appendChild(e);f!==null&&f.appendChild(a.nTBody)}L(a,"aoDrawCallback","draw",[a]);a.bSorted=false;a.bFiltered=false;a.bDrawing=false;if(a.oFeatures.bServerSide){O(a,
+false);a._bInitComplete||ma(a)}}}function na(a){if(a.oFeatures.bSort)X(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)U(a,a.oPreviousSearch);else{J(a);H(a)}}function Ka(a){var b=i("<div></div>")[0];a.nTable.parentNode.insertBefore(b,a.nTable);a.nTableWrapper=i('<div id="'+a.sTableId+'_wrapper" class="'+a.oClasses.sWrapper+'" role="grid"></div>')[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var c=a.nTableWrapper,d=a.sDom.split(""),e,f,g,j,m,k,y,u=0;u<d.length;u++){f=0;g=d[u];if(g=="<"){j=i("<div></div>")[0];
+m=d[u+1];if(m=="'"||m=='"'){k="";for(y=2;d[u+y]!=m;){k+=d[u+y];y++}if(k=="H")k="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(k=="F")k="fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";if(k.indexOf(".")!=-1){m=k.split(".");j.id=m[0].substr(1,m[0].length-1);j.className=m[1]}else if(k.charAt(0)=="#")j.id=k.substr(1,k.length-1);else j.className=k;u+=y}c.appendChild(j);c=j}else if(g==">")c=c.parentNode;else if(g=="l"&&
+a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){e=La(a);f=1}else if(g=="f"&&a.oFeatures.bFilter){e=Ma(a);f=1}else if(g=="r"&&a.oFeatures.bProcessing){e=Na(a);f=1}else if(g=="t"){e=Oa(a);f=1}else if(g=="i"&&a.oFeatures.bInfo){e=Pa(a);f=1}else if(g=="p"&&a.oFeatures.bPaginate){e=Qa(a);f=1}else if(l.ext.aoFeatures.length!==0){j=l.ext.aoFeatures;y=0;for(m=j.length;y<m;y++)if(g==j[y].cFeature){if(e=j[y].fnInit(a))f=1;break}}if(f==1&&e!==null){if(typeof a.aanFeatures[g]!=="object")a.aanFeatures[g]=[];
+a.aanFeatures[g].push(e);c.appendChild(e)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function da(a,b){b=i(b).children("tr");var c,d,e,f,g,j,m,k,y=function(z,Y,B){for(;z[Y][B];)B++;return B};a.splice(0,a.length);d=0;for(j=b.length;d<j;d++)a.push([]);d=0;for(j=b.length;d<j;d++){e=0;for(m=b[d].childNodes.length;e<m;e++){c=b[d].childNodes[e];if(c.nodeName.toUpperCase()=="TD"||c.nodeName.toUpperCase()=="TH"){var u=c.getAttribute("colspan")*1,w=c.getAttribute("rowspan")*1;u=!u||u===0||u===1?1:u;w=!w||
+w===0||w===1?1:w;k=y(a,d,0);for(g=0;g<u;g++)for(f=0;f<w;f++){a[d+f][k+g]={cell:c,unique:u==1?true:false};a[d+f].nTr=b[d]}}}}}function W(a,b,c){var d=[];if(!c){c=a.aoHeader;if(b){c=[];da(c,b)}}b=0;for(var e=c.length;b<e;b++)for(var f=0,g=c[b].length;f<g;f++)if(c[b][f].unique&&(!d[f]||!a.bSortCellsTop))d[f]=c[b][f].cell;return d}function Ja(a){if(a.bAjaxDataGet){a.iDraw++;O(a,true);var b=Ra(a);wa(a,b);a.fnServerData.call(a.oInstance,a.sAjaxSource,b,function(c){Sa(a,c)},a);return false}else return true}
+function Ra(a){var b=a.aoColumns.length,c=[],d,e,f,g;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:F(a)});c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==false?a._iDisplayLength:-1});for(f=0;f<b;f++){d=a.aoColumns[f].mDataProp;c.push({name:"mDataProp_"+f,value:typeof d==="function"?"function":d})}if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});
+c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(f=0;f<b;f++){c.push({name:"sSearch_"+f,value:a.aoPreSearchCols[f].sSearch});c.push({name:"bRegex_"+f,value:a.aoPreSearchCols[f].bRegex});c.push({name:"bSearchable_"+f,value:a.aoColumns[f].bSearchable})}}if(a.oFeatures.bSort!==false){var j=0;d=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(f=0;f<d.length;f++){e=a.aoColumns[d[f][0]].aDataSort;for(g=0;g<e.length;g++){c.push({name:"iSortCol_"+j,value:e[g]});
+c.push({name:"sSortDir_"+j,value:d[f][1]});j++}}c.push({name:"iSortingCols",value:j});for(f=0;f<b;f++)c.push({name:"bSortable_"+f,value:a.aoColumns[f].bSortable})}return c}function wa(a,b){L(a,"aoServerParams","serverParams",[b])}function Sa(a,b){if(b.sEcho!==p)if(b.sEcho*1<a.iDraw)return;else a.iDraw=b.sEcho*1;if(!a.oScroll.bInfinite||a.oScroll.bInfinite&&(a.bSorted||a.bFiltered))sa(a);a._iRecordsTotal=parseInt(b.iTotalRecords,10);a._iRecordsDisplay=parseInt(b.iTotalDisplayRecords,10);var c=F(a);
+c=b.sColumns!==p&&c!==""&&b.sColumns!=c;var d;if(c)d=G(a,b.sColumns);b=ia(a.sAjaxDataProp)(b);for(var e=0,f=b.length;e<f;e++)if(c){for(var g=[],j=0,m=a.aoColumns.length;j<m;j++)g.push(b[e][d[j]]);P(a,g)}else P(a,b[e]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;H(a);a.bAjaxDataGet=true;O(a,false)}function Ma(a){var b=a.oPreviousSearch,c=a.oLanguage.sSearch;c=c.indexOf("_INPUT_")!==-1?c.replace("_INPUT_",'<input type="text" />'):c===""?'<input type="text" />':c+' <input type="text" />';
+var d=t.createElement("div");d.className=a.oClasses.sFilter;d.innerHTML="<label>"+c+"</label>";if(!a.aanFeatures.f)d.id=a.sTableId+"_filter";c=i('input[type="text"]',d);d._DT_Input=c[0];c.val(b.sSearch.replace('"',"&quot;"));c.bind("keyup.DT",function(){for(var e=a.aanFeatures.f,f=this.value===""?"":this.value,g=0,j=e.length;g<j;g++)e[g]!=i(this).parents("div.dataTables_filter")[0]&&i(e[g]._DT_Input).val(f);f!=b.sSearch&&U(a,{sSearch:f,bRegex:b.bRegex,bSmart:b.bSmart,bCaseInsensitive:b.bCaseInsensitive})});
+c.attr("aria-controls",a.sTableId).bind("keypress.DT",function(e){if(e.keyCode==13)return false});return d}function U(a,b,c){var d=a.oPreviousSearch,e=a.aoPreSearchCols,f=function(g){d.sSearch=g.sSearch;d.bRegex=g.bRegex;d.bSmart=g.bSmart;d.bCaseInsensitive=g.bCaseInsensitive};if(a.oFeatures.bServerSide)f(b);else{Ta(a,b.sSearch,c,b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<a.aoPreSearchCols.length;b++)Ua(a,e[b].sSearch,b,e[b].bRegex,e[b].bSmart,e[b].bCaseInsensitive);Va(a)}a.bFiltered=true;
+i(a.oInstance).trigger("filter",a);a._iDisplayStart=0;J(a);H(a);xa(a,0)}function Va(a){for(var b=l.ext.afnFiltering,c=0,d=b.length;c<d;c++)for(var e=0,f=0,g=a.aiDisplay.length;f<g;f++){var j=a.aiDisplay[f-e];if(!b[c](a,ka(a,j,"filter"),j)){a.aiDisplay.splice(f-e,1);e++}}}function Ua(a,b,c,d,e,f){if(b!==""){var g=0;b=ya(b,d,e,f);for(d=a.aiDisplay.length-1;d>=0;d--){e=za(E(a,a.aiDisplay[d],c,"filter"),a.aoColumns[c].sType);if(!b.test(e)){a.aiDisplay.splice(d,1);g++}}}}function Ta(a,b,c,d,e,f){d=ya(b,
+d,e,f);e=a.oPreviousSearch;c||(c=0);if(l.ext.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||e.sSearch.length>b.length||c==1||b.indexOf(e.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);xa(a,1);for(b=0;b<a.aiDisplayMaster.length;b++)d.test(a.asDataSearch[b])&&a.aiDisplay.push(a.aiDisplayMaster[b])}else for(b=c=0;b<a.asDataSearch.length;b++)if(!d.test(a.asDataSearch[b])){a.aiDisplay.splice(b-
+c,1);c++}}function xa(a,b){if(!a.oFeatures.bServerSide){a.asDataSearch.splice(0,a.asDataSearch.length);b=b&&b===1?a.aiDisplayMaster:a.aiDisplay;for(var c=0,d=b.length;c<d;c++)a.asDataSearch[c]=Aa(a,ka(a,b[c],"filter"))}}function Aa(a,b){var c="";if(a.__nTmpFilter===p)a.__nTmpFilter=t.createElement("div");for(var d=a.__nTmpFilter,e=0,f=a.aoColumns.length;e<f;e++)if(a.aoColumns[e].bSearchable)c+=za(b[e],a.aoColumns[e].sType)+"  ";if(c.indexOf("&")!==-1){d.innerHTML=c;c=d.textContent?d.textContent:d.innerText;
+c=c.replace(/\n/g," ").replace(/\r/g,"")}return c}function ya(a,b,c,d){if(c){a=b?a.split(" "):Ba(a).split(" ");a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,d?"i":"")}else{a=b?a:Ba(a);return new RegExp(a,d?"i":"")}}function za(a,b){if(typeof l.ext.ofnSearch[b]==="function")return l.ext.ofnSearch[b](a);else if(a===null)return"";else if(b=="html")return a.replace(/[\r\n]/g," ").replace(/<.*?>/g,"");else if(typeof a==="string")return a.replace(/[\r\n]/g," ");return a}function Ba(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)",
+"g"),"\\$1")}function Pa(a){var b=t.createElement("div");b.className=a.oClasses.sInfo;if(!a.aanFeatures.i){a.aoDrawCallback.push({fn:Wa,sName:"information"});b.id=a.sTableId+"_info"}a.nTable.setAttribute("aria-describedby",a.sTableId+"_info");return b}function Wa(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=a.oLanguage,c=a._iDisplayStart+1,d=a.fnDisplayEnd(),e=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),g;g=f===0&&f==e?b.sInfoEmpty:f===0?b.sInfoEmpty+" "+b.sInfoFiltered:f==e?b.sInfo:
+b.sInfo+" "+b.sInfoFiltered;g+=b.sInfoPostFix;g=va(a,g);if(b.fnInfoCallback!==null)g=b.fnInfoCallback.call(a.oInstance,a,c,d,e,f,g);a=a.aanFeatures.i;b=0;for(c=a.length;b<c;b++)i(a[b]).html(g)}}function va(a,b){var c=a.fnFormatNumber(a._iDisplayStart+1),d=a.fnDisplayEnd();d=a.fnFormatNumber(d);var e=a.fnRecordsDisplay();e=a.fnFormatNumber(e);var f=a.fnRecordsTotal();f=a.fnFormatNumber(f);if(a.oScroll.bInfinite)c=a.fnFormatNumber(1);return b.replace("_START_",c).replace("_END_",d).replace("_TOTAL_",
+e).replace("_MAX_",f)}function oa(a){var b,c,d=a.iInitDisplayStart;if(a.bInitialised===false)setTimeout(function(){oa(a)},200);else{Ka(a);Ia(a);ea(a,a.aoHeader);a.nTFoot&&ea(a,a.aoFooter);O(a,true);a.oFeatures.bAutoWidth&&pa(a);b=0;for(c=a.aoColumns.length;b<c;b++)if(a.aoColumns[b].sWidth!==null)a.aoColumns[b].nTh.style.width=s(a.aoColumns[b].sWidth);if(a.oFeatures.bSort)X(a);else if(a.oFeatures.bFilter)U(a,a.oPreviousSearch);else{a.aiDisplay=a.aiDisplayMaster.slice();J(a);H(a)}if(a.sAjaxSource!==
+null&&!a.oFeatures.bServerSide){c=[];wa(a,c);a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(e){var f=a.sAjaxDataProp!==""?ia(a.sAjaxDataProp)(e):e;for(b=0;b<f.length;b++)P(a,f[b]);a.iInitDisplayStart=d;if(a.oFeatures.bSort)X(a);else{a.aiDisplay=a.aiDisplayMaster.slice();J(a);H(a)}O(a,false);ma(a,e)},a)}else if(!a.oFeatures.bServerSide){O(a,false);ma(a)}}}function ma(a,b){a._bInitComplete=true;L(a,"aoInitComplete","init",[a,b])}function Ca(a){var b=l.defaults.oLanguage;!a.sEmptyTable&&a.sZeroRecords&&
+b.sEmptyTable==="No data available in table"&&r(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&a.sZeroRecords&&b.sLoadingRecords==="Loading..."&&r(a,a,"sZeroRecords","sLoadingRecords")}function La(a){if(a.oScroll.bInfinite)return null;var b='<select size="1" '+('name="'+a.sTableId+'_length"')+">",c,d,e=a.aLengthMenu;if(e.length==2&&typeof e[0]==="object"&&typeof e[1]==="object"){c=0;for(d=e[0].length;c<d;c++)b+='<option value="'+e[0][c]+'">'+e[1][c]+"</option>"}else{c=0;for(d=e.length;c<d;c++)b+=
+'<option value="'+e[c]+'">'+e[c]+"</option>"}b+="</select>";e=t.createElement("div");if(!a.aanFeatures.l)e.id=a.sTableId+"_length";e.className=a.oClasses.sLength;e.innerHTML="<label>"+a.oLanguage.sLengthMenu.replace("_MENU_",b)+"</label>";i('select option[value="'+a._iDisplayLength+'"]',e).attr("selected",true);i("select",e).bind("change.DT",function(){var f=i(this).val(),g=a.aanFeatures.l;c=0;for(d=g.length;c<d;c++)g[c]!=this.parentNode&&i("select",g[c]).val(f);a._iDisplayLength=parseInt(f,10);J(a);
+if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=0}if(a._iDisplayLength==-1)a._iDisplayStart=0;H(a)});i("select",e).attr("aria-controls",a.sTableId);return e}function J(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Qa(a){if(a.oScroll.bInfinite)return null;
+var b=t.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;l.ext.oPagination[a.sPaginationType].fnInit(a,b,function(c){J(c);H(c)});a.aanFeatures.p||a.aoDrawCallback.push({fn:function(c){l.ext.oPagination[c.sPaginationType].fnUpdate(c,function(d){J(d);H(d)})},sName:"pagination"});return b}function Da(a,b){var c=a._iDisplayStart;if(typeof b==="number"){a._iDisplayStart=b*a._iDisplayLength;if(a._iDisplayStart>a.fnRecordsDisplay())a._iDisplayStart=0}else if(b=="first")a._iDisplayStart=
+0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=0;else M(a,0,"Unknown paging action: "+
+b);i(a.oInstance).trigger("page",a);return c!=a._iDisplayStart}function Na(a){var b=t.createElement("div");if(!a.aanFeatures.r)b.id=a.sTableId+"_processing";b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function O(a,b){if(a.oFeatures.bProcessing)for(var c=a.aanFeatures.r,d=0,e=c.length;d<e;d++)c[d].style.visibility=b?"visible":"hidden";i(a.oInstance).trigger("processing",[a,b])}function Oa(a){if(a.oScroll.sX===""&&a.oScroll.sY===
+"")return a.nTable;var b=t.createElement("div"),c=t.createElement("div"),d=t.createElement("div"),e=t.createElement("div"),f=t.createElement("div"),g=t.createElement("div"),j=a.nTable.cloneNode(false),m=a.nTable.cloneNode(false),k=a.nTable.getElementsByTagName("thead")[0],y=a.nTable.getElementsByTagName("tfoot").length===0?null:a.nTable.getElementsByTagName("tfoot")[0],u=a.oClasses;c.appendChild(d);f.appendChild(g);e.appendChild(a.nTable);b.appendChild(c);b.appendChild(e);d.appendChild(j);j.appendChild(k);
+if(y!==null){b.appendChild(f);g.appendChild(m);m.appendChild(y)}b.className=u.sScrollWrapper;c.className=u.sScrollHead;d.className=u.sScrollHeadInner;e.className=u.sScrollBody;f.className=u.sScrollFoot;g.className=u.sScrollFootInner;if(a.oScroll.bAutoCss){c.style.overflow="hidden";c.style.position="relative";f.style.overflow="hidden";e.style.overflow="auto"}c.style.border="0";c.style.width="100%";f.style.border="0";d.style.width=a.oScroll.sXInner!==""?a.oScroll.sXInner:"100%";j.removeAttribute("id");
+j.style.marginLeft="0";a.nTable.style.marginLeft="0";if(y!==null){m.removeAttribute("id");m.style.marginLeft="0"}d=i(a.nTable).children("caption");if(d.length>0){d=d[0];if(d._captionSide==="top")j.appendChild(d);else d._captionSide==="bottom"&&y&&m.appendChild(d)}if(a.oScroll.sX!==""){c.style.width=s(a.oScroll.sX);e.style.width=s(a.oScroll.sX);if(y!==null)f.style.width=s(a.oScroll.sX);i(e).scroll(function(){c.scrollLeft=this.scrollLeft;if(y!==null)f.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!==
+"")e.style.height=s(a.oScroll.sY);a.aoDrawCallback.push({fn:Xa,sName:"scrolling"});a.oScroll.bInfinite&&i(e).scroll(function(){if(!a.bDrawing&&i(this).scrollTop()!==0)if(i(this).scrollTop()+i(this).height()>i(a.nTable).height()-a.oScroll.iLoadGap)if(a.fnDisplayEnd()<a.fnRecordsDisplay()){Da(a,"next");J(a);H(a)}});a.nScrollHead=c;a.nScrollFoot=f;return b}function Xa(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,e,f,g,j,m,k,y,u,w=[],
+z=a.nTFoot!==null?a.nScrollFoot.getElementsByTagName("div")[0]:null,Y=a.nTFoot!==null?z.getElementsByTagName("table")[0]:null,B=i.browser.msie&&i.browser.version<=7;i(a.nTable).children("thead, tfoot").remove();g=i(a.nTHead).clone()[0];a.nTable.insertBefore(g,a.nTable.childNodes[0]);if(a.nTFoot!==null){m=i(a.nTFoot).clone()[0];a.nTable.insertBefore(m,a.nTable.childNodes[1])}if(a.oScroll.sX===""){d.style.width="100%";b.parentNode.style.width="100%"}var fa=W(a,g);e=0;for(f=fa.length;e<f;e++){y=v(a,
+e);fa[e].style.width=a.aoColumns[y].sWidth}a.nTFoot!==null&&V(function(I){I.style.width=""},m.getElementsByTagName("tr"));if(a.oScroll.bCollapse&&a.oScroll.sY!=="")d.style.height=d.offsetHeight+a.nTHead.offsetHeight+"px";e=i(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(B&&(i("tbody",d).height()>d.offsetHeight||i(d).css("overflow-y")=="scroll"))a.nTable.style.width=s(i(a.nTable).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!=="")a.nTable.style.width=s(a.oScroll.sXInner);
+else if(e==i(d).width()&&i(d).height()<i(a.nTable).height()){a.nTable.style.width=s(e-a.oScroll.iBarWidth);if(i(a.nTable).outerWidth()>e-a.oScroll.iBarWidth)a.nTable.style.width=s(e)}else a.nTable.style.width=s(e);e=i(a.nTable).outerWidth();f=a.nTHead.getElementsByTagName("tr");g=g.getElementsByTagName("tr");V(function(I,Q){k=I.style;k.paddingTop="0";k.paddingBottom="0";k.borderTopWidth="0";k.borderBottomWidth="0";k.height=0;u=i(I).width();Q.style.width=s(u);w.push(u)},g,f);i(g).height(0);if(a.nTFoot!==
+null){j=m.getElementsByTagName("tr");m=a.nTFoot.getElementsByTagName("tr");V(function(I,Q){k=I.style;k.paddingTop="0";k.paddingBottom="0";k.borderTopWidth="0";k.borderBottomWidth="0";k.height=0;u=i(I).width();Q.style.width=s(u);w.push(u)},j,m);i(j).height(0)}V(function(I){I.innerHTML="";I.style.width=s(w.shift())},g);a.nTFoot!==null&&V(function(I){I.innerHTML="";I.style.width=s(w.shift())},j);if(i(a.nTable).outerWidth()<e){j=d.scrollHeight>d.offsetHeight||i(d).css("overflow-y")=="scroll"?e+a.oScroll.iBarWidth:
+e;if(B&&(d.scrollHeight>d.offsetHeight||i(d).css("overflow-y")=="scroll"))a.nTable.style.width=s(j-a.oScroll.iBarWidth);d.style.width=s(j);b.parentNode.style.width=s(j);if(a.nTFoot!==null)z.parentNode.style.width=s(j);if(a.oScroll.sX==="")M(a,1,"The table cannot fit into the current element which will cause column misalignment. The table has been drawn at its minimum possible width.");else a.oScroll.sXInner!==""&&M(a,1,"The table cannot fit into the current element which will cause column misalignment. Increase the sScrollXInner value or remove it to allow automatic calculation")}else{d.style.width=
+s("100%");b.parentNode.style.width=s("100%");if(a.nTFoot!==null)z.parentNode.style.width=s("100%")}if(a.oScroll.sY==="")if(B)d.style.height=s(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=s(a.oScroll.sY);B=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=s(a.nTable.offsetHeight+B)}B=i(a.nTable).outerWidth();c.style.width=s(B);b.style.width=s(B);c=i(a.nTable).height()>
+d.clientHeight||i(d).css("overflow-y")=="scroll";b.style.paddingRight=c?a.oScroll.iBarWidth+"px":"0px";if(a.nTFoot!==null){Y.style.width=s(B);z.style.width=s(B);z.style.paddingRight=c?a.oScroll.iBarWidth+"px":"0px"}i(d).scroll();if(a.bSorted||a.bFiltered)d.scrollTop=0}function V(a,b,c){for(var d=0,e=b.length;d<e;d++)for(var f=0,g=b[d].childNodes.length;f<g;f++)if(b[d].childNodes[f].nodeType==1)c?a(b[d].childNodes[f],c[d].childNodes[f]):a(b[d].childNodes[f])}function Ya(a,b){if(!a||a===null||a==="")return 0;
+b||(b=t.getElementsByTagName("body")[0]);var c=t.createElement("div");c.style.width=s(a);b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function pa(a){var b=0,c,d=0,e=a.aoColumns.length,f,g=i("th",a.nTHead),j=a.nTable.getAttribute("width");for(f=0;f<e;f++)if(a.aoColumns[f].bVisible){d++;if(a.aoColumns[f].sWidth!==null){c=Ya(a.aoColumns[f].sWidthOrig,a.nTable.parentNode);if(c!==null)a.aoColumns[f].sWidth=s(c);b++}}if(e==g.length&&b===0&&d==e&&a.oScroll.sX===""&&a.oScroll.sY==="")for(f=
+0;f<a.aoColumns.length;f++){c=i(g[f]).width();if(c!==null)a.aoColumns[f].sWidth=s(c)}else{b=a.nTable.cloneNode(false);f=a.nTHead.cloneNode(true);d=t.createElement("tbody");c=t.createElement("tr");b.removeAttribute("id");b.appendChild(f);if(a.nTFoot!==null){b.appendChild(a.nTFoot.cloneNode(true));V(function(k){k.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(d);d.appendChild(c);d=i("thead th",b);if(d.length===0)d=i("tbody tr:eq(0)>td",b);g=W(a,f);for(f=d=0;f<e;f++){var m=a.aoColumns[f];
+if(m.bVisible&&m.sWidthOrig!==null&&m.sWidthOrig!=="")g[f-d].style.width=s(m.sWidthOrig);else if(m.bVisible)g[f-d].style.width="";else d++}for(f=0;f<e;f++)if(a.aoColumns[f].bVisible){d=Za(a,f);if(d!==null){d=d.cloneNode(true);if(a.aoColumns[f].sContentPadding!=="")d.innerHTML+=a.aoColumns[f].sContentPadding;c.appendChild(d)}}e=a.nTable.parentNode;e.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!=="")b.style.width=s(a.oScroll.sXInner);else if(a.oScroll.sX!==""){b.style.width="";if(i(b).width()<
+e.offsetWidth)b.style.width=s(e.offsetWidth)}else if(a.oScroll.sY!=="")b.style.width=s(e.offsetWidth);else if(j)b.style.width=s(j);b.style.visibility="hidden";$a(a,b);e=i("tbody tr:eq(0)",b).children();if(e.length===0)e=W(a,i("thead",b)[0]);if(a.oScroll.sX!==""){for(f=d=c=0;f<a.aoColumns.length;f++)if(a.aoColumns[f].bVisible){c+=a.aoColumns[f].sWidthOrig===null?i(e[d]).outerWidth():parseInt(a.aoColumns[f].sWidth.replace("px",""),10)+(i(e[d]).outerWidth()-i(e[d]).width());d++}b.style.width=s(c);a.nTable.style.width=
+s(c)}for(f=d=0;f<a.aoColumns.length;f++)if(a.aoColumns[f].bVisible){c=i(e[d]).width();if(c!==null&&c>0)a.aoColumns[f].sWidth=s(c);d++}e=i(b).css("width");a.nTable.style.width=e.indexOf("%")!==-1?e:s(i(b).outerWidth());b.parentNode.removeChild(b)}if(j)a.nTable.style.width=s(j)}function $a(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==""){i(b).width();b.style.width=s(i(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=s(i(b).outerWidth())}function Za(a,b){var c=ab(a,b);if(c<0)return null;
+if(a.aoData[c].nTr===null){var d=t.createElement("td");d.innerHTML=E(a,c,b,"");return d}return T(a,c)[b]}function ab(a,b){for(var c=-1,d=-1,e=0;e<a.aoData.length;e++){var f=E(a,e,b,"display")+"";f=f.replace(/<.*?>/g,"");if(f.length>c){c=f.length;d=e}}return d}function s(a){if(a===null)return"0px";if(typeof a=="number"){if(a<0)return"0px";return a+"px"}var b=a.charCodeAt(a.length-1);if(b<48||b>57)return a;return a+"px"}function bb(){var a=t.createElement("p"),b=a.style;b.width="100%";b.height="200px";
+b.padding="0px";var c=t.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.padding="0px";b.overflow="hidden";c.appendChild(a);t.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;if(b==a)a=c.clientWidth;t.body.removeChild(c);return b-a}function X(a,b){var c,d,e,f,g,j,m=[],k=[],y=l.ext.oSort,u=a.aoData,w=a.aoColumns,z=a.oLanguage.oAria;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||
+a.aaSortingFixed!==null)){m=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(c=0;c<m.length;c++){d=m[c][0];e=x(a,d);f=a.aoColumns[d].sSortDataType;if(l.ext.afnSortData[f]){g=l.ext.afnSortData[f].call(a.oInstance,a,d,e);if(g.length===u.length){e=0;for(f=u.length;e<f;e++)R(a,e,d,g[e])}else M(a,0,"Returned data sort array (col "+d+") is the wrong length")}}c=0;for(d=a.aiDisplayMaster.length;c<d;c++)k[a.aiDisplayMaster[c]]=c;var Y=m.length,B;c=0;for(d=u.length;c<d;c++)for(e=
+0;e<Y;e++){B=w[m[e][0]].aDataSort;g=0;for(j=B.length;g<j;g++){f=w[B[g]].sType;f=y[(f?f:"string")+"-pre"];u[c]._aSortData[B[g]]=f?f(E(a,c,B[g],"sort")):E(a,c,B[g],"sort")}}a.aiDisplayMaster.sort(function(fa,I){var Q,Z,cb,$,ga;for(Q=0;Q<Y;Q++){ga=w[m[Q][0]].aDataSort;Z=0;for(cb=ga.length;Z<cb;Z++){$=w[ga[Z]].sType;$=y[($?$:"string")+"-"+m[Q][1]](u[fa]._aSortData[ga[Z]],u[I]._aSortData[ga[Z]]);if($!==0)return $}}return y["numeric-asc"](k[fa],k[I])})}if((b===p||b)&&!a.oFeatures.bDeferRender)aa(a);c=0;
+for(d=a.aoColumns.length;c<d;c++){e=w[c].sTitle.replace(/<.*?>/g,"");b=w[c].nTh;b.removeAttribute("aria-sort");b.removeAttribute("aria-label");if(w[c].bSortable)if(m.length>0&&m[0][0]==c){b.setAttribute("aria-sort",m[0][1]=="asc"?"ascending":"descending");b.setAttribute("aria-label",e+((w[c].asSorting[m[0][2]+1]?w[c].asSorting[m[0][2]+1]:w[c].asSorting[0])=="asc"?z.sSortAscending:z.sSortDescending))}else b.setAttribute("aria-label",e+(w[c].asSorting[0]=="asc"?z.sSortAscending:z.sSortDescending));
+else b.setAttribute("aria-label",e)}a.bSorted=true;i(a.oInstance).trigger("sort",a);if(a.oFeatures.bFilter)U(a,a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;J(a);H(a)}}function ua(a,b,c,d){db(b,{},function(e){if(a.aoColumns[c].bSortable!==false){var f=function(){var g,j;if(e.shiftKey){for(var m=false,k=0;k<a.aaSorting.length;k++)if(a.aaSorting[k][0]==c){m=true;g=a.aaSorting[k][0];j=a.aaSorting[k][2]+1;if(a.aoColumns[g].asSorting[j]){a.aaSorting[k][1]=a.aoColumns[g].asSorting[j];
+a.aaSorting[k][2]=j}else a.aaSorting.splice(k,1);break}m===false&&a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){g=a.aaSorting[0][0];j=a.aaSorting[0][2]+1;a.aoColumns[g].asSorting[j]||(j=0);a.aaSorting[0][1]=a.aoColumns[g].asSorting[j];a.aaSorting[0][2]=j}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}X(a)};if(a.oFeatures.bProcessing){O(a,true);setTimeout(function(){f();a.oFeatures.bServerSide||
+O(a,false)},0)}else f();typeof d=="function"&&d(a)}})}function aa(a){var b,c,d,e,f,g=a.aoColumns.length,j=a.oClasses;for(b=0;b<g;b++)a.aoColumns[b].bSortable&&i(a.aoColumns[b].nTh).removeClass(j.sSortAsc+" "+j.sSortDesc+" "+a.aoColumns[b].sSortingClass);e=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){f=a.aoColumns[b].sSortingClass;d=-1;for(c=0;c<e.length;c++)if(e[c][0]==b){f=e[c][1]=="asc"?j.sSortAsc:
+j.sSortDesc;d=c;break}i(a.aoColumns[b].nTh).addClass(f);if(a.bJUI){c=i("span."+j.sSortIcon,a.aoColumns[b].nTh);c.removeClass(j.sSortJUIAsc+" "+j.sSortJUIDesc+" "+j.sSortJUI+" "+j.sSortJUIAscAllowed+" "+j.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:e[d][1]=="asc"?j.sSortJUIAsc:j.sSortJUIDesc)}}else i(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);f=j.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=T(a);if(a.oFeatures.bDeferRender)i(d).removeClass(f+
+"1 "+f+"2 "+f+"3");else if(d.length>=g)for(b=0;b<g;b++)if(d[b].className.indexOf(f+"1")!=-1){c=0;for(a=d.length/g;c<a;c++)d[g*c+b].className=i.trim(d[g*c+b].className.replace(f+"1",""))}else if(d[b].className.indexOf(f+"2")!=-1){c=0;for(a=d.length/g;c<a;c++)d[g*c+b].className=i.trim(d[g*c+b].className.replace(f+"2",""))}else if(d[b].className.indexOf(f+"3")!=-1){c=0;for(a=d.length/g;c<a;c++)d[g*c+b].className=i.trim(d[g*c+b].className.replace(" "+f+"3",""))}j=1;var m;for(b=0;b<e.length;b++){m=parseInt(e[b][0],
+10);c=0;for(a=d.length/g;c<a;c++)d[g*c+m].className+=" "+f+j;j<3&&j++}}}function Ea(a){if(!(!a.oFeatures.bStateSave||a.bDestroying)){var b,c;b=a.oScroll.bInfinite;var d={iCreate:(new Date).getTime(),iStart:b?0:a._iDisplayStart,iEnd:b?a._iDisplayLength:a._iDisplayEnd,iLength:a._iDisplayLength,aaSorting:i.extend(true,[],a.aaSorting),oSearch:i.extend(true,{},a.oPreviousSearch),aoSearchCols:i.extend(true,[],a.aoPreSearchCols),abVisCols:[]};b=0;for(c=a.aoColumns.length;b<c;b++)d.abVisCols.push(a.aoColumns[b].bVisible);
+L(a,"aoStateSaveParams","stateSaveParams",[a,d]);a.fnStateSave.call(a.oInstance,a,d)}}function eb(a,b){if(a.oFeatures.bStateSave){var c=a.fnStateLoad.call(a.oInstance,a);if(c){var d=L(a,"aoStateLoadParams","stateLoadParams",[a,c]);if(i.inArray(false,d)===-1){a.oLoadedState=i.extend(true,{},c);a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();i.extend(a.oPreviousSearch,c.oSearch);
+i.extend(true,a.aoPreSearchCols,c.aoSearchCols);b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}L(a,"aoStateLoaded","stateLoaded",[a,c])}}}}function jb(a,b,c,d,e){var f=new Date;f.setTime(f.getTime()+c*1E3);c=ha.location.pathname.split("/");a=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();var g;if(e!==null){g=typeof i.parseJSON==="function"?i.parseJSON(b):eval("("+b+")");b=e(a,g,f.toGMTString(),c.join("/")+"/")}else b=a+
+"="+encodeURIComponent(b)+"; expires="+f.toGMTString()+"; path="+c.join("/")+"/";e="";f=9999999999999;if((fb(a)!==null?t.cookie.length:b.length+t.cookie.length)+10>4096){a=t.cookie.split(";");for(var j=0,m=a.length;j<m;j++)if(a[j].indexOf(d)!=-1){var k=a[j].split("=");try{g=eval("("+decodeURIComponent(k[1])+")")}catch(y){continue}if(g.iCreate&&g.iCreate<f){e=k[0];f=g.iCreate}}if(e!=="")t.cookie=e+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+"/"}t.cookie=b}function fb(a){var b=ha.location.pathname.split("/");
+a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=t.cookie.split(";");for(var c=0;c<b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function A(a){for(var b=0;b<l.settings.length;b++)if(l.settings[b].nTable===a)return l.settings[b];return null}function ca(a){var b=[];a=a.aoData;for(var c=0,d=a.length;c<d;c++)a[c].nTr!==null&&b.push(a[c].nTr);return b}function T(a,b){var c=
+[],d,e,f,g,j;e=0;var m=a.aoData.length;if(b!==p){e=b;m=b+1}for(e=e;e<m;e++){j=a.aoData[e];if(j.nTr!==null){b=[];f=0;for(g=j.nTr.childNodes.length;f<g;f++){d=j.nTr.childNodes[f].nodeName.toLowerCase();if(d=="td"||d=="th")b.push(j.nTr.childNodes[f])}f=d=0;for(g=a.aoColumns.length;f<g;f++)if(a.aoColumns[f].bVisible)c.push(b[f-d]);else{c.push(j._anHidden[f]);d++}}}return c}function M(a,b,c){a=a===null?"DataTables warning: "+c:"DataTables warning (table id = '"+a.sTableId+"'): "+c;if(b===0)if(l.ext.sErrMode==
+"alert")alert(a);else throw new Error(a);else ha.console&&console.log&&console.log(a)}function r(a,b,c,d){if(d===p)d=c;if(b[c]!==p)a[d]=b[c]}function gb(a,b){for(var c in b)if(b.hasOwnProperty(c))if(typeof h[c]==="object"&&i.isArray(b[c])===false)i.extend(true,a[c],b[c]);else a[c]=b[c];return a}function db(a,b,c){i(a).bind("click.DT",b,function(d){a.blur();c(d)}).bind("keypress.DT",b,function(d){d.which===13&&c(d)}).bind("selectstart.DT",function(){return false})}function K(a,b,c,d){c&&a[b].push({fn:c,
+sName:d})}function L(a,b,c,d){b=a[b];for(var e=[],f=b.length-1;f>=0;f--)e.push(b[f].fn.apply(a.oInstance,d));c!==null&&i(a.oInstance).trigger(c,d);return e}function hb(a){return function(){var b=[A(this[l.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return l.ext.oApi[a].apply(this,b)}}var ib=ha.JSON?JSON.stringify:function(a){var b=typeof a;if(b!=="object"||a===null){if(b==="string")a='"'+a+'"';return a+""}var c,d,e=[],f=i.isArray(a);for(c in a){d=a[c];b=typeof d;if(b==="string")d=
+'"'+d+'"';else if(b==="object"&&d!==null)d=ib(d);e.push((f?"":'"'+c+'":')+d)}return(f?"[":"{")+e+(f?"]":"}")};this.$=function(a,b){var c,d=[],e=A(this[l.ext.iApiIndex]);b||(b={});b=i.extend({},{filter:"none",order:"current",page:"all"},b);if(b.page=="current"){b=e._iDisplayStart;for(c=e.fnDisplayEnd();b<c;b++)d.push(e.aoData[e.aiDisplay[b]].nTr)}else if(b.order=="current"&&b.filter=="none"){b=0;for(c=e.aiDisplayMaster.length;b<c;b++)d.push(e.aoData[e.aiDisplayMaster[b]].nTr)}else if(b.order=="current"&&
+b.filter=="applied"){b=0;for(c=e.aiDisplay.length;b<c;b++)d.push(e.aoData[e.aiDisplay[b]].nTr)}else if(b.order=="original"&&b.filter=="none"){b=0;for(c=e.aoData.length;b<c;b++)d.push(e.aoData[b].nTr)}else if(b.order=="original"&&b.filter=="applied"){b=0;for(c=e.aoData.length;b<c;b++)i.inArray(b,e.aiDisplay)!==-1&&d.push(e.aoData[b].nTr)}else M(e,1,"Unknown selection options");e=i(d);d=e.filter(a);a=e.find(a);return i([].concat(i.makeArray(d),i.makeArray(a)))};this._=function(a,b){var c=[],d=this.$(a,
+b);a=0;for(b=d.length;a<b;a++)c.push(this.fnGetData(d[a]));return c};this.fnAddData=function(a,b){if(a.length===0)return[];var c=[],d,e=A(this[l.ext.iApiIndex]);if(typeof a[0]==="object"&&a[0]!==null)for(var f=0;f<a.length;f++){d=P(e,a[f]);if(d==-1)return c;c.push(d)}else{d=P(e,a);if(d==-1)return c;c.push(d)}e.aiDisplay=e.aiDisplayMaster.slice();if(b===p||b)na(e);return c};this.fnAdjustColumnSizing=function(a){var b=A(this[l.ext.iApiIndex]);o(b);if(a===p||a)this.fnDraw(false);else if(b.oScroll.sX!==
+""||b.oScroll.sY!=="")this.oApi._fnScrollDraw(b)};this.fnClearTable=function(a){var b=A(this[l.ext.iApiIndex]);sa(b);if(a===p||a)H(b)};this.fnClose=function(a){for(var b=A(this[l.ext.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnDeleteRow=function(a,b,c){var d=A(this[l.ext.iApiIndex]),e,f;a=typeof a==="object"?N(d,a):a;var g=d.aoData.splice(a,1);e=0;
+for(f=d.aoData.length;e<f;e++)if(d.aoData[e].nTr!==null)d.aoData[e].nTr._DT_RowIndex=e;e=i.inArray(a,d.aiDisplay);d.asDataSearch.splice(e,1);ta(d.aiDisplayMaster,a);ta(d.aiDisplay,a);typeof b==="function"&&b.call(this,d,g);if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(c===p||c){J(d);H(d)}return g};this.fnDestroy=function(a){var b=A(this[l.ext.iApiIndex]),c=b.nTableWrapper.parentNode,d=b.nTBody,e,f;a=a===p?false:true;b.bDestroying=
+true;L(b,"aoDestroyCallback","destroy",[b]);e=0;for(f=b.aoColumns.length;e<f;e++)b.aoColumns[e].bVisible===false&&this.fnSetColumnVis(e,true);i(b.nTableWrapper).find("*").andSelf().unbind(".DT");i("tbody>tr>td."+b.oClasses.sRowEmpty,b.nTable).parent().remove();if(b.nTable!=b.nTHead.parentNode){i(b.nTable).children("thead").remove();b.nTable.appendChild(b.nTHead)}if(b.nTFoot&&b.nTable!=b.nTFoot.parentNode){i(b.nTable).children("tfoot").remove();b.nTable.appendChild(b.nTFoot)}b.nTable.parentNode.removeChild(b.nTable);
+i(b.nTableWrapper).remove();b.aaSorting=[];b.aaSortingFixed=[];aa(b);i(ca(b)).removeClass(b.asStripeClasses.join(" "));i("th, td",b.nTHead).removeClass([b.oClasses.sSortable,b.oClasses.sSortableAsc,b.oClasses.sSortableDesc,b.oClasses.sSortableNone].join(" "));if(b.bJUI){i("th span."+b.oClasses.sSortIcon+", td span."+b.oClasses.sSortIcon,b.nTHead).remove();i("th, td",b.nTHead).each(function(){var g=i("div."+b.oClasses.sSortJUIWrapper,this),j=g.contents();i(this).append(j);g.remove()})}if(!a&&b.nTableReinsertBefore)c.insertBefore(b.nTable,
+b.nTableReinsertBefore);else a||c.appendChild(b.nTable);e=0;for(f=b.aoData.length;e<f;e++)b.aoData[e].nTr!==null&&d.appendChild(b.aoData[e].nTr);if(b.oFeatures.bAutoWidth===true)b.nTable.style.width=s(b.sDestroyWidth);i(d).children("tr:even").addClass(b.asDestroyStripes[0]);i(d).children("tr:odd").addClass(b.asDestroyStripes[1]);e=0;for(f=l.settings.length;e<f;e++)l.settings[e]==b&&l.settings.splice(e,1);b=null};this.fnDraw=function(a){var b=A(this[l.ext.iApiIndex]);if(a===false){J(b);H(b)}else na(b)};
+this.fnFilter=function(a,b,c,d,e,f){var g=A(this[l.ext.iApiIndex]);if(g.oFeatures.bFilter){if(c===p||c===null)c=false;if(d===p||d===null)d=true;if(e===p||e===null)e=true;if(f===p||f===null)f=true;if(b===p||b===null){U(g,{sSearch:a+"",bRegex:c,bSmart:d,bCaseInsensitive:f},1);if(e&&g.aanFeatures.f){b=g.aanFeatures.f;c=0;for(d=b.length;c<d;c++)i(b[c]._DT_Input).val(a)}}else{i.extend(g.aoPreSearchCols[b],{sSearch:a+"",bRegex:c,bSmart:d,bCaseInsensitive:f});U(g,g.oPreviousSearch,1)}}};this.fnGetData=function(a,
+b){var c=A(this[l.ext.iApiIndex]);if(a!==p){var d=a;if(typeof a==="object"){var e=a.nodeName.toLowerCase();if(e==="tr")d=N(c,a);else if(e==="td"){d=N(c,a.parentNode);b=ra(c,d,a)}}if(b!==p)return E(c,d,b,"");return c.aoData[d]!==p?c.aoData[d]._aData:null}return la(c)};this.fnGetNodes=function(a){var b=A(this[l.ext.iApiIndex]);if(a!==p)return b.aoData[a]!==p?b.aoData[a].nTr:null;return ca(b)};this.fnGetPosition=function(a){var b=A(this[l.ext.iApiIndex]),c=a.nodeName.toUpperCase();if(c=="TR")return N(b,
+a);else if(c=="TD"||c=="TH"){c=N(b,a.parentNode);a=ra(b,c,a);return[c,x(b,a),a]}return null};this.fnIsOpen=function(a){for(var b=A(this[l.ext.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a)return true;return false};this.fnOpen=function(a,b,c){var d=A(this[l.ext.iApiIndex]),e=ca(d);if(i.inArray(a,e)!==-1){this.fnClose(a);e=t.createElement("tr");var f=t.createElement("td");e.appendChild(f);f.className=c;f.colSpan=C(d);if(typeof b==="string")f.innerHTML=b;else i(f).html(b);b=
+i("tr",d.nTBody);i.inArray(a,b)!=-1&&i(e).insertAfter(a);d.aoOpenRows.push({nTr:e,nParent:a});return e}};this.fnPageChange=function(a,b){var c=A(this[l.ext.iApiIndex]);Da(c,a);J(c);if(b===p||b)H(c)};this.fnSetColumnVis=function(a,b,c){var d=A(this[l.ext.iApiIndex]),e,f,g=d.aoColumns,j=d.aoData,m,k;if(g[a].bVisible!=b){if(b){for(e=f=0;e<a;e++)g[e].bVisible&&f++;k=f>=C(d);if(!k)for(e=a;e<g.length;e++)if(g[e].bVisible){m=e;break}e=0;for(f=j.length;e<f;e++)if(j[e].nTr!==null)k?j[e].nTr.appendChild(j[e]._anHidden[a]):
+j[e].nTr.insertBefore(j[e]._anHidden[a],T(d,e)[m])}else{e=0;for(f=j.length;e<f;e++)if(j[e].nTr!==null){m=T(d,e)[a];j[e]._anHidden[a]=m;m.parentNode.removeChild(m)}}g[a].bVisible=b;ea(d,d.aoHeader);d.nTFoot&&ea(d,d.aoFooter);e=0;for(f=d.aoOpenRows.length;e<f;e++)d.aoOpenRows[e].nTr.colSpan=C(d);if(c===p||c){o(d);H(d)}Ea(d)}};this.fnSettings=function(){return A(this[l.ext.iApiIndex])};this.fnSort=function(a){var b=A(this[l.ext.iApiIndex]);b.aaSorting=a;X(b)};this.fnSortListener=function(a,b,c){ua(A(this[l.ext.iApiIndex]),
+a,b,c)};this.fnUpdate=function(a,b,c,d,e){var f=A(this[l.ext.iApiIndex]);b=typeof b==="object"?N(f,b):b;if(f.__fnUpdateDeep===p&&i.isArray(a)&&typeof a==="object"){f.aoData[b]._aData=a.slice();f.__fnUpdateDeep=true;for(c=0;c<f.aoColumns.length;c++)this.fnUpdate(E(f,b,c),b,c,false,false);f.__fnUpdateDeep=p}else if(f.__fnUpdateDeep===p&&a!==null&&typeof a==="object"){f.aoData[b]._aData=i.extend(true,{},a);f.__fnUpdateDeep=true;for(c=0;c<f.aoColumns.length;c++)this.fnUpdate(E(f,b,c),b,c,false,false);
+f.__fnUpdateDeep=p}else{R(f,b,c,a);a=E(f,b,c,"display");var g=f.aoColumns[c];if(g.fnRender!==null){a=ba(f,b,c);g.bUseRendered&&R(f,b,c,a)}if(f.aoData[b].nTr!==null)T(f,b)[c].innerHTML=a}c=i.inArray(b,f.aiDisplay);f.asDataSearch[c]=Aa(f,ka(f,b,"filter"));if(e===p||e)o(f);if(d===p||d)na(f);return 0};this.fnVersionCheck=l.ext.fnVersionCheck;this.oApi={_fnExternApiFunc:hb,_fnInitialise:oa,_fnInitComplete:ma,_fnLanguageCompat:Ca,_fnAddColumn:n,_fnColumnOptions:q,_fnAddData:P,_fnCreateTr:qa,_fnGatherData:ja,
+_fnBuildHead:Ia,_fnDrawHead:ea,_fnDraw:H,_fnReDraw:na,_fnAjaxUpdate:Ja,_fnAjaxParameters:Ra,_fnAjaxUpdateDraw:Sa,_fnServerParams:wa,_fnAddOptionsHtml:Ka,_fnFeatureHtmlTable:Oa,_fnScrollDraw:Xa,_fnAdjustColumnSizing:o,_fnFeatureHtmlFilter:Ma,_fnFilterComplete:U,_fnFilterCustom:Va,_fnFilterColumn:Ua,_fnFilter:Ta,_fnBuildSearchArray:xa,_fnBuildSearchRow:Aa,_fnFilterCreateSearch:ya,_fnDataToSearch:za,_fnSort:X,_fnSortAttachListener:ua,_fnSortingClasses:aa,_fnFeatureHtmlPaginate:Qa,_fnPageChange:Da,_fnFeatureHtmlInfo:Pa,
+_fnUpdateInfo:Wa,_fnFeatureHtmlLength:La,_fnFeatureHtmlProcessing:Na,_fnProcessingDisplay:O,_fnVisibleToColumnIndex:v,_fnColumnIndexToVisible:x,_fnNodeToDataIndex:N,_fnVisbleColumns:C,_fnCalculateEnd:J,_fnConvertToWidth:Ya,_fnCalculateColumnWidths:pa,_fnScrollingWidthAdjust:$a,_fnGetWidestNode:Za,_fnGetMaxLenString:ab,_fnStringToCss:s,_fnDetectType:D,_fnSettingsFromNode:A,_fnGetDataMaster:la,_fnGetTrNodes:ca,_fnGetTdNodes:T,_fnEscapeRegex:Ba,_fnDeleteIndex:ta,_fnReOrderIndex:G,_fnColumnOrdering:F,
+_fnLog:M,_fnClearTable:sa,_fnSaveState:Ea,_fnLoadState:eb,_fnCreateCookie:jb,_fnReadCookie:fb,_fnDetectHeader:da,_fnGetUniqueThs:W,_fnScrollBarWidth:bb,_fnApplyToChildren:V,_fnMap:r,_fnGetRowData:ka,_fnGetCellData:E,_fnSetCellData:R,_fnGetObjectDataFn:ia,_fnSetObjectDataFn:Ha,_fnApplyColumnDefs:S,_fnBindAction:db,_fnExtend:gb,_fnCallbackReg:K,_fnCallbackFire:L,_fnJsonString:ib,_fnRender:ba,_fnNodeToColumnIndex:ra,_fnInfoMacros:va};i.extend(l.ext.oApi,this.oApi);for(var Fa in l.ext.oApi)if(Fa)this[Fa]=
+hb(Fa);var Ga=this;return this.each(function(){var a=0,b,c,d;c=this.getAttribute("id");var e=false,f=false;if(this.nodeName.toLowerCase()!="table")M(null,0,"Attempted to initialise DataTables on a node which is not a table: "+this.nodeName);else{a=0;for(b=l.settings.length;a<b;a++){if(l.settings[a].nTable==this)if(h===p||h.bRetrieve)return l.settings[a].oInstance;else if(h.bDestroy){l.settings[a].oInstance.fnDestroy();break}else{M(l.settings[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, pass no arguments or see the docs for bRetrieve and bDestroy");
+return}if(l.settings[a].sTableId==this.id){l.settings.splice(a,1);break}}if(c===null||c==="")this.id=c="DataTables_Table_"+l.ext._oExternConfig.iNextUnique++;var g=i.extend(true,{},l.models.oSettings,{nTable:this,oApi:Ga.oApi,oInit:h,sDestroyWidth:i(this).width(),sInstance:c,sTableId:c});l.settings.push(g);g.oInstance=Ga.length===1?Ga:i(this).dataTable();h||(h={});h.oLanguage&&Ca(h.oLanguage);h=gb(i.extend(true,{},l.defaults),h);r(g.oFeatures,h,"bPaginate");r(g.oFeatures,h,"bLengthChange");r(g.oFeatures,
+h,"bFilter");r(g.oFeatures,h,"bSort");r(g.oFeatures,h,"bInfo");r(g.oFeatures,h,"bProcessing");r(g.oFeatures,h,"bAutoWidth");r(g.oFeatures,h,"bSortClasses");r(g.oFeatures,h,"bServerSide");r(g.oFeatures,h,"bDeferRender");r(g.oScroll,h,"sScrollX","sX");r(g.oScroll,h,"sScrollXInner","sXInner");r(g.oScroll,h,"sScrollY","sY");r(g.oScroll,h,"bScrollCollapse","bCollapse");r(g.oScroll,h,"bScrollInfinite","bInfinite");r(g.oScroll,h,"iScrollLoadGap","iLoadGap");r(g.oScroll,h,"bScrollAutoCss","bAutoCss");r(g,
+h,"asStripeClasses");r(g,h,"asStripClasses","asStripeClasses");r(g,h,"fnServerData");r(g,h,"fnFormatNumber");r(g,h,"sServerMethod");r(g,h,"aaSorting");r(g,h,"aaSortingFixed");r(g,h,"aLengthMenu");r(g,h,"sPaginationType");r(g,h,"sAjaxSource");r(g,h,"sAjaxDataProp");r(g,h,"iCookieDuration");r(g,h,"sCookiePrefix");r(g,h,"sDom");r(g,h,"bSortCellsTop");r(g,h,"iTabIndex");r(g,h,"oSearch","oPreviousSearch");r(g,h,"aoSearchCols","aoPreSearchCols");r(g,h,"iDisplayLength","_iDisplayLength");r(g,h,"bJQueryUI",
+"bJUI");r(g,h,"fnCookieCallback");r(g,h,"fnStateLoad");r(g,h,"fnStateSave");r(g.oLanguage,h,"fnInfoCallback");K(g,"aoDrawCallback",h.fnDrawCallback,"user");K(g,"aoServerParams",h.fnServerParams,"user");K(g,"aoStateSaveParams",h.fnStateSaveParams,"user");K(g,"aoStateLoadParams",h.fnStateLoadParams,"user");K(g,"aoStateLoaded",h.fnStateLoaded,"user");K(g,"aoRowCallback",h.fnRowCallback,"user");K(g,"aoRowCreatedCallback",h.fnCreatedRow,"user");K(g,"aoHeaderCallback",h.fnHeaderCallback,"user");K(g,"aoFooterCallback",
+h.fnFooterCallback,"user");K(g,"aoInitComplete",h.fnInitComplete,"user");K(g,"aoPreDrawCallback",h.fnPreDrawCallback,"user");if(g.oFeatures.bServerSide&&g.oFeatures.bSort&&g.oFeatures.bSortClasses)K(g,"aoDrawCallback",aa,"server_side_sort_classes");else g.oFeatures.bDeferRender&&K(g,"aoDrawCallback",aa,"defer_sort_classes");if(h.bJQueryUI){i.extend(g.oClasses,l.ext.oJUIClasses);if(h.sDom===l.defaults.sDom&&l.defaults.sDom==="lfrtip")g.sDom='<"H"lfr>t<"F"ip>'}else i.extend(g.oClasses,l.ext.oStdClasses);
+i(this).addClass(g.oClasses.sTable);if(g.oScroll.sX!==""||g.oScroll.sY!=="")g.oScroll.iBarWidth=bb();if(g.iInitDisplayStart===p){g.iInitDisplayStart=h.iDisplayStart;g._iDisplayStart=h.iDisplayStart}if(h.bStateSave){g.oFeatures.bStateSave=true;eb(g,h);K(g,"aoDrawCallback",Ea,"state_save")}if(h.iDeferLoading!==null){g.bDeferLoading=true;a=i.isArray(h.iDeferLoading);g._iRecordsDisplay=a?h.iDeferLoading[0]:h.iDeferLoading;g._iRecordsTotal=a?h.iDeferLoading[1]:h.iDeferLoading}if(h.aaData!==null)f=true;
+if(h.oLanguage.sUrl!==""){g.oLanguage.sUrl=h.oLanguage.sUrl;i.getJSON(g.oLanguage.sUrl,null,function(m){Ca(m);i.extend(true,g.oLanguage,h.oLanguage,m);oa(g)});e=true}else i.extend(true,g.oLanguage,h.oLanguage);if(h.asStripeClasses===null)g.asStripeClasses=[g.oClasses.sStripeOdd,g.oClasses.sStripeEven];c=false;d=i(this).children("tbody").children("tr");a=0;for(b=g.asStripeClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(g.asStripeClasses[a])){c=true;break}if(c){g.asDestroyStripes=["",""];if(i(d[0]).hasClass(g.oClasses.sStripeOdd))g.asDestroyStripes[0]+=
+g.oClasses.sStripeOdd+" ";if(i(d[0]).hasClass(g.oClasses.sStripeEven))g.asDestroyStripes[0]+=g.oClasses.sStripeEven;if(i(d[1]).hasClass(g.oClasses.sStripeOdd))g.asDestroyStripes[1]+=g.oClasses.sStripeOdd+" ";if(i(d[1]).hasClass(g.oClasses.sStripeEven))g.asDestroyStripes[1]+=g.oClasses.sStripeEven;d.removeClass(g.asStripeClasses.join(" "))}c=[];a=this.getElementsByTagName("thead");if(a.length!==0){da(g.aoHeader,a[0]);c=W(g)}if(h.aoColumns===null){d=[];a=0;for(b=c.length;a<b;a++)d.push(null)}else d=
+h.aoColumns;a=0;for(b=d.length;a<b;a++){if(h.saved_aoColumns!==p&&h.saved_aoColumns.length==b){if(d[a]===null)d[a]={};d[a].bVisible=h.saved_aoColumns[a].bVisible}n(g,c?c[a]:null)}S(g,h.aoColumnDefs,d,function(m,k){q(g,m,k)});a=0;for(b=g.aaSorting.length;a<b;a++){if(g.aaSorting[a][0]>=g.aoColumns.length)g.aaSorting[a][0]=0;var j=g.aoColumns[g.aaSorting[a][0]];if(g.aaSorting[a][2]===p)g.aaSorting[a][2]=0;if(h.aaSorting===p&&g.saved_aaSorting===p)g.aaSorting[a][1]=j.asSorting[0];c=0;for(d=j.asSorting.length;c<
+d;c++)if(g.aaSorting[a][1]==j.asSorting[c]){g.aaSorting[a][2]=c;break}}aa(g);a=i(this).children("caption").each(function(){this._captionSide=i(this).css("caption-side")});b=i(this).children("thead");if(b.length===0){b=[t.createElement("thead")];this.appendChild(b[0])}g.nTHead=b[0];b=i(this).children("tbody");if(b.length===0){b=[t.createElement("tbody")];this.appendChild(b[0])}g.nTBody=b[0];g.nTBody.setAttribute("role","alert");g.nTBody.setAttribute("aria-live","polite");g.nTBody.setAttribute("aria-relevant",
+"all");b=i(this).children("tfoot");if(b.length===0&&a.length>0&&(g.oScroll.sX!==""||g.oScroll.sY!=="")){b=[t.createElement("tfoot")];this.appendChild(b[0])}if(b.length>0){g.nTFoot=b[0];da(g.aoFooter,g.nTFoot)}if(f)for(a=0;a<h.aaData.length;a++)P(g,h.aaData[a]);else ja(g);g.aiDisplay=g.aiDisplayMaster.slice();g.bInitialised=true;e===false&&oa(g)}})};l.fnVersionCheck=function(h){var n=function(D,G){for(;D.length<G;)D+="0";return D},q=l.ext.sVersion.split(".");h=h.split(".");for(var o="",v="",x=0,C=
+h.length;x<C;x++){o+=n(q[x],3);v+=n(h[x],3)}return parseInt(o,10)>=parseInt(v,10)};l.fnIsDataTable=function(h){for(var n=l.settings,q=0;q<n.length;q++)if(n[q].nTable===h||n[q].nScrollHead===h||n[q].nScrollFoot===h)return true;return false};l.fnTables=function(h){var n=[];jQuery.each(l.settings,function(q,o){if(!h||h===true&&i(o.nTable).is(":visible"))n.push(o.nTable)});return n};l.version="1.9.1";l.settings=[];l.models={};l.models.ext={afnFiltering:[],afnSortData:[],aoFeatures:[],aTypes:[],fnVersionCheck:l.fnVersionCheck,
+iApiIndex:0,ofnSearch:{},oApi:{},oStdClasses:{},oJUIClasses:{},oPagination:{},oSort:{},sVersion:l.version,sErrMode:"alert",_oExternConfig:{iNextUnique:0}};l.models.oSearch={bCaseInsensitive:true,sSearch:"",bRegex:false,bSmart:true};l.models.oRow={nTr:null,_aData:[],_aSortData:[],_anHidden:[],_sRowStripe:""};l.models.oColumn={aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bUseRendered:null,bVisible:null,_bAutoType:true,fnCreatedCell:null,fnGetData:null,fnRender:null,fnSetData:null,mDataProp:null,
+nTh:null,nTf:null,sClass:null,sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};l.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:true,bDeferRender:false,bDestroy:false,bFilter:true,bInfo:true,bJQueryUI:false,bLengthChange:true,bPaginate:true,bProcessing:false,
+bRetrieve:false,bScrollAutoCss:true,bScrollCollapse:false,bScrollInfinite:false,bServerSide:false,bSort:true,bSortCellsTop:false,bSortClasses:true,bStateSave:false,fnCookieCallback:null,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(h){if(h<1E3)return h;var n=h+"";h=n.split("");var q="";n=n.length;for(var o=0;o<n;o++){if(o%3===0&&o!==0)q=this.oLanguage.sInfoThousands+q;q=h[n-o-1]+q}return q},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,
+fnRowCallback:null,fnServerData:function(h,n,q,o){o.jqXHR=i.ajax({url:h,data:n,success:function(v){i(o.oInstance).trigger("xhr",o);q(v)},dataType:"json",cache:false,type:o.sServerMethod,error:function(v,x){x=="parsererror"&&o.oApi._fnLog(o,0,"DataTables warning: JSON data from server could not be parsed. This is caused by a JSON formatting error.")}})},fnServerParams:null,fnStateLoad:function(h){h=this.oApi._fnReadCookie(h.sCookiePrefix+h.sInstance);var n;try{n=typeof i.parseJSON==="function"?i.parseJSON(h):
+eval("("+h+")")}catch(q){n=null}return n},fnStateLoadParams:null,fnStateLoaded:null,fnStateSave:function(h,n){this.oApi._fnCreateCookie(h.sCookiePrefix+h.sInstance,this.oApi._fnJsonString(n),h.iCookieDuration,h.sCookiePrefix,h.fnCookieCallback)},fnStateSaveParams:null,iCookieDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iScrollLoadGap:100,iTabIndex:0,oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},
+oPaginate:{sFirst:"First",sLast:"Last",sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sInfoThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sUrl:"",sZeroRecords:"No matching records found"},oSearch:i.extend({},l.models.oSearch),sAjaxDataProp:"aaData",
+sAjaxSource:null,sCookiePrefix:"SpryMedia_DataTables_",sDom:"lfrtip",sPaginationType:"two_button",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET"};l.defaults.columns={aDataSort:null,asSorting:["asc","desc"],bSearchable:true,bSortable:true,bUseRendered:true,bVisible:true,fnCreatedCell:null,fnRender:null,iDataSort:-1,mDataProp:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};l.models.oSettings={oFeatures:{bAutoWidth:null,
+bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortClasses:null,bStateSave:null},oScroll:{bAutoCss:null,bCollapse:null,bInfinite:null,iBarWidth:0,iLoadGap:null,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aoColumns:[],aoHeader:[],aoFooter:[],asDataSearch:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:null,asStripeClasses:null,
+asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:false,bInitialised:false,aoOpenRows:[],sDom:null,sPaginationType:"two_button",iCookieDuration:0,sCookiePrefix:"",fnCookieCallback:null,aoStateSave:[],aoStateLoad:[],oLoadedState:null,
+sAjaxSource:null,sAjaxDataProp:null,bAjaxDataGet:true,jqXHR:null,fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:false,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iDisplayEnd:10,_iRecordsTotal:0,_iRecordsDisplay:0,bJUI:null,oClasses:{},bFiltered:false,bSorted:false,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsTotal,10):this.aiDisplayMaster.length},
+fnRecordsDisplay:function(){return this.oFeatures.bServerSide?parseInt(this._iRecordsDisplay,10):this.aiDisplay.length},fnDisplayEnd:function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false||this._iDisplayLength==-1?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iRecordsDisplay):this._iDisplayEnd},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null};l.ext=i.extend(true,{},l.models.ext);i.extend(l.ext.oStdClasses,
+{sTable:"dataTable",sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",sPageButtonStaticDisabled:"paginate_button paginate_button_disabled",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",
+sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",
+sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""});i.extend(l.ext.oJUIClasses,l.ext.oStdClasses,{sPagePrevEnabled:"fg-button ui-button ui-state-default ui-corner-left",sPagePrevDisabled:"fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",sPageNextEnabled:"fg-button ui-button ui-state-default ui-corner-right",
+sPageNextDisabled:"fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"fg-button ui-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-button ui-state-default ui-state-disabled",sPageFirst:"first ui-corner-tl ui-corner-bl",sPageLast:"last ui-corner-tr ui-corner-br",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",
+sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",
+sScrollHead:"dataTables_scrollHead ui-state-default",sScrollFoot:"dataTables_scrollFoot ui-state-default",sFooterTH:"ui-state-default"});i.extend(l.ext.oPagination,{two_button:{fnInit:function(h,n,q){var o=h.oLanguage.oPaginate,v=function(C){h.oApi._fnPageChange(h,C.data.action)&&q(h)};o=!h.bJUI?'<a class="'+h.oClasses.sPagePrevDisabled+'" tabindex="'+h.iTabIndex+'" role="button">'+o.sPrevious+'</a><a class="'+h.oClasses.sPageNextDisabled+'" tabindex="'+h.iTabIndex+'" role="button">'+o.sNext+"</a>":
+'<a class="'+h.oClasses.sPagePrevDisabled+'" tabindex="'+h.iTabIndex+'" role="button"><span class="'+h.oClasses.sPageJUIPrev+'"></span></a><a class="'+h.oClasses.sPageNextDisabled+'" tabindex="'+h.iTabIndex+'" role="button"><span class="'+h.oClasses.sPageJUINext+'"></span></a>';i(n).append(o);var x=i("a",n);o=x[0];x=x[1];h.oApi._fnBindAction(o,{action:"previous"},v);h.oApi._fnBindAction(x,{action:"next"},v);if(!h.aanFeatures.p){n.id=h.sTableId+"_paginate";o.id=h.sTableId+"_previous";x.id=h.sTableId+
+"_next";o.setAttribute("aria-controls",h.sTableId);x.setAttribute("aria-controls",h.sTableId)}},fnUpdate:function(h){if(h.aanFeatures.p)for(var n=h.oClasses,q=h.aanFeatures.p,o=0,v=q.length;o<v;o++)if(q[o].childNodes.length!==0){q[o].childNodes[0].className=h._iDisplayStart===0?n.sPagePrevDisabled:n.sPagePrevEnabled;q[o].childNodes[1].className=h.fnDisplayEnd()==h.fnRecordsDisplay()?n.sPageNextDisabled:n.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(h,n,q){var o=h.oLanguage.oPaginate,
+v=h.oClasses,x=function(G){h.oApi._fnPageChange(h,G.data.action)&&q(h)};i(n).append('<a  tabindex="'+h.iTabIndex+'" class="'+v.sPageButton+" "+v.sPageFirst+'">'+o.sFirst+'</a><a  tabindex="'+h.iTabIndex+'" class="'+v.sPageButton+" "+v.sPagePrevious+'">'+o.sPrevious+'</a><span></span><a tabindex="'+h.iTabIndex+'" class="'+v.sPageButton+" "+v.sPageNext+'">'+o.sNext+'</a><a tabindex="'+h.iTabIndex+'" class="'+v.sPageButton+" "+v.sPageLast+'">'+o.sLast+"</a>");var C=i("a",n);o=C[0];v=C[1];var D=C[2];
+C=C[3];h.oApi._fnBindAction(o,{action:"first"},x);h.oApi._fnBindAction(v,{action:"previous"},x);h.oApi._fnBindAction(D,{action:"next"},x);h.oApi._fnBindAction(C,{action:"last"},x);if(!h.aanFeatures.p){n.id=h.sTableId+"_paginate";o.id=h.sTableId+"_first";v.id=h.sTableId+"_previous";D.id=h.sTableId+"_next";C.id=h.sTableId+"_last"}},fnUpdate:function(h,n){if(h.aanFeatures.p){var q=l.ext.oPagination.iFullNumbersShowPages,o=Math.floor(q/2),v=Math.ceil(h.fnRecordsDisplay()/h._iDisplayLength),x=Math.ceil(h._iDisplayStart/
+h._iDisplayLength)+1,C="",D,G=h.oClasses,F,S=h.aanFeatures.p,P=function(ja){h.oApi._fnBindAction(this,{page:ja+D-1},function(N){h.oApi._fnPageChange(h,N.data.page);n(h);N.preventDefault()})};if(h._iDisplayLength===-1)x=o=D=1;else if(v<q){D=1;o=v}else if(x<=o){D=1;o=q}else if(x>=v-o){D=v-q+1;o=v}else{D=x-Math.ceil(q/2)+1;o=D+q-1}for(q=D;q<=o;q++)C+=x!==q?'<a tabindex="'+h.iTabIndex+'" class="'+G.sPageButton+'">'+h.fnFormatNumber(q)+"</a>":'<a tabindex="'+h.iTabIndex+'" class="'+G.sPageButtonActive+
+'">'+h.fnFormatNumber(q)+"</a>";q=0;for(o=S.length;q<o;q++)if(S[q].childNodes.length!==0){i("span:eq(0)",S[q]).html(C).children("a").each(P);F=S[q].getElementsByTagName("a");F=[F[0],F[1],F[F.length-2],F[F.length-1]];i(F).removeClass(G.sPageButton+" "+G.sPageButtonActive+" "+G.sPageButtonStaticDisabled);i([F[0],F[1]]).addClass(x==1?G.sPageButtonStaticDisabled:G.sPageButton);i([F[2],F[3]]).addClass(v===0||x===v||h._iDisplayLength===-1?G.sPageButtonStaticDisabled:G.sPageButton)}}}}});i.extend(l.ext.oSort,
+{"string-pre":function(h){if(typeof h!="string")h=h!==null&&h.toString?h.toString():"";return h.toLowerCase()},"string-asc":function(h,n){return h<n?-1:h>n?1:0},"string-desc":function(h,n){return h<n?1:h>n?-1:0},"html-pre":function(h){return h.replace(/<.*?>/g,"").toLowerCase()},"html-asc":function(h,n){return h<n?-1:h>n?1:0},"html-desc":function(h,n){return h<n?1:h>n?-1:0},"date-pre":function(h){h=Date.parse(h);if(isNaN(h)||h==="")h=Date.parse("01/01/1970 00:00:00");return h},"date-asc":function(h,
+n){return h-n},"date-desc":function(h,n){return n-h},"numeric-pre":function(h){return h=="-"||h===""?0:h*1},"numeric-asc":function(h,n){return h-n},"numeric-desc":function(h,n){return n-h}});i.extend(l.ext.aTypes,[function(h){if(typeof h==="number")return"numeric";else if(typeof h!=="string")return null;var n,q=false;n=h.charAt(0);if("0123456789-".indexOf(n)==-1)return null;for(var o=1;o<h.length;o++){n=h.charAt(o);if("0123456789.".indexOf(n)==-1)return null;if(n=="."){if(q)return null;q=true}}return"numeric"},
+function(h){var n=Date.parse(h);if(n!==null&&!isNaN(n)||typeof h==="string"&&h.length===0)return"date";return null},function(h){if(typeof h==="string"&&h.indexOf("<")!=-1&&h.indexOf(">")!=-1)return"html";return null}]);i.fn.DataTable=l;i.fn.dataTable=l;i.fn.dataTableSettings=l.settings;i.fn.dataTableExt=l.ext})(jQuery,window,document,undefined);
-- 
1.7.0.4


From cnighswonger at foundations.edu  Fri Apr 27 21:26:05 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 27 Apr 2012 15:26:05 -0400
Subject: [Koha-patches] [PATCH 2/7] Updating datatables.css to reflect
	changes from v1.8.1 to v1.9.1
In-Reply-To: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
References: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
Message-ID: <1335554770-15052-2-git-send-email-cnighswonger@foundations.edu>

---
 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css |   22 ++++++++++----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
index e7b11bd..ba7e233 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
@@ -68,8 +68,8 @@ div.dataTables_paginate {
     padding : 0;
 }
 
-.paging_full_numbers span.paginate_button,
-.paging_full_numbers span.paginate_active {
+.paging_full_numbers a.paginate_button,
+.paging_full_numbers a.paginate_active {
     border-right : 1px solid #AAA;
     border-left : 1px solid #FFF;
     display : block;
@@ -79,48 +79,48 @@ div.dataTables_paginate {
     cursor: pointer;
 }
 
-.paging_full_numbers span.paginate_button {
+.paging_full_numbers a.paginate_button {
     color : #0000CC;
 }
-.paging_full_numbers span.paginate_button.first {
+.paging_full_numbers a.paginate_button.first {
     background-image : url('../../img/first.png');
     background-repeat: no-repeat;
     background-position : 2px center;
     padding-left : 2em;
 }
-.paging_full_numbers span.paginate_button.previous {
+.paging_full_numbers a.paginate_button.previous {
     background-image : url('../../img/prev.png');
     background-repeat: no-repeat;
     background-position : 2px center;
     padding-left : 2em;
 }
-.paging_full_numbers span.paginate_button.next {
+.paging_full_numbers a.paginate_button.next {
     background-image : url('../../img/next.png');
     background-repeat: no-repeat;
     background-position : right center;
     padding-right : 2em;
 }
-.paging_full_numbers span.paginate_button.last {
+.paging_full_numbers a.paginate_button.last {
     background-image : url('../../img/last.png');
     background-repeat: no-repeat;
     background-position : right center;
     border-right : 1px solid #686868;
     padding-right : 2em;
 }
-div.bottom.pager .paging_full_numbers span.paginate_button.last {
+div.bottom.pager .paging_full_numbers a.paginate_button.last {
     border-right-width : 0;
 }
-.paging_full_numbers span.paginate_active {
+.paging_full_numbers a.paginate_active {
     background-color : #FFFFEA;
     color : #000;
     font-weight: bold;
 }
 
-.paging_full_numbers span.paginate_button:hover {
+.paging_full_numbers a.paginate_button:hover {
     background-color: #FFC;
 }
 
-.paging_full_numbers span.paginate_button.paginate_button_disabled {
+.paging_full_numbers a.paginate_button.paginate_button_disabled {
     color : #666;
 }
 
-- 
1.7.0.4


From cnighswonger at foundations.edu  Fri Apr 27 21:26:06 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 27 Apr 2012 15:26:06 -0400
Subject: [Koha-patches] [PATCH 3/7] Adding jEditable minified version
In-Reply-To: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
References: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
Message-ID: <1335554770-15052-3-git-send-email-cnighswonger@foundations.edu>

jEditable is necessary to create DataTables with editable fields
---
 .../prog/en/js/jquery.jeditable.mini.js            |   38 ++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/jquery.jeditable.mini.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/jquery.jeditable.mini.js b/koha-tmpl/intranet-tmpl/prog/en/js/jquery.jeditable.mini.js
new file mode 100644
index 0000000..ef885f0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/jquery.jeditable.mini.js
@@ -0,0 +1,38 @@
+
+(function($){$.fn.editable=function(target,options){if('disable'==target){$(this).data('disabled.editable',true);return;}
+if('enable'==target){$(this).data('disabled.editable',false);return;}
+if('destroy'==target){$(this).unbind($(this).data('event.editable')).removeData('disabled.editable').removeData('event.editable');return;}
+var settings=$.extend({},$.fn.editable.defaults,{target:target},options);var plugin=$.editable.types[settings.type].plugin||function(){};var submit=$.editable.types[settings.type].submit||function(){};var buttons=$.editable.types[settings.type].buttons||$.editable.types['defaults'].buttons;var content=$.editable.types[settings.type].content||$.editable.types['defaults'].content;var element=$.editable.types[settings.type].element||$.editable.types['defaults'].element;var reset=$.editable.types[settings.type].reset||$.editable.types['defaults'].reset;var callback=settings.callback||function(){};var onedit=settings.onedit||function(){};var onsubmit=settings.onsubmit||function(){};var onreset=settings.onreset||function(){};var onerror=settings.onerror||reset;if(settings.tooltip){$(this).attr('title',settings.tooltip);}
+settings.autowidth='auto'==settings.width;settings.autoheight='auto'==settings.height;return this.each(function(){var self=this;var savedwidth=$(self).width();var savedheight=$(self).height();$(this).data('event.editable',settings.event);if(!$.trim($(this).html())){$(this).html(settings.placeholder);}
+$(this).bind(settings.event,function(e){if(true===$(this).data('disabled.editable')){return;}
+if(self.editing){return;}
+if(false===onedit.apply(this,[settings,self])){return;}
+e.preventDefault();e.stopPropagation();if(settings.tooltip){$(self).removeAttr('title');}
+if(0==$(self).width()){settings.width=savedwidth;settings.height=savedheight;}else{if(settings.width!='none'){settings.width=settings.autowidth?$(self).width():settings.width;}
+if(settings.height!='none'){settings.height=settings.autoheight?$(self).height():settings.height;}}
+if($(this).html().toLowerCase().replace(/(;|")/g,'')==settings.placeholder.toLowerCase().replace(/(;|")/g,'')){$(this).html('');}
+self.editing=true;self.revert=$(self).html();$(self).html('');var form=$('<form />');if(settings.cssclass){if('inherit'==settings.cssclass){form.attr('class',$(self).attr('class'));}else{form.attr('class',settings.cssclass);}}
+if(settings.style){if('inherit'==settings.style){form.attr('style',$(self).attr('style'));form.css('display',$(self).css('display'));}else{form.attr('style',settings.style);}}
+var input=element.apply(form,[settings,self]);var input_content;if(settings.loadurl){var t=setTimeout(function(){input.disabled=true;content.apply(form,[settings.loadtext,settings,self]);},100);var loaddata={};loaddata[settings.id]=self.id;if($.isFunction(settings.loaddata)){$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings]));}else{$.extend(loaddata,settings.loaddata);}
+$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:false,success:function(result){window.clearTimeout(t);input_content=result;input.disabled=false;}});}else if(settings.data){input_content=settings.data;if($.isFunction(settings.data)){input_content=settings.data.apply(self,[self.revert,settings]);}}else{input_content=self.revert;}
+content.apply(form,[input_content,settings,self]);input.attr('name',settings.name);buttons.apply(form,[settings,self]);$(self).append(form);plugin.apply(form,[settings,self]);$(':input:visible:enabled:first',form).focus();if(settings.select){input.select();}
+input.keydown(function(e){if(e.keyCode==27){e.preventDefault();reset.apply(form,[settings,self]);}});var t;if('cancel'==settings.onblur){input.blur(function(e){t=setTimeout(function(){reset.apply(form,[settings,self]);},500);});}else if('submit'==settings.onblur){input.blur(function(e){t=setTimeout(function(){form.submit();},200);});}else if($.isFunction(settings.onblur)){input.blur(function(e){settings.onblur.apply(self,[input.val(),settings]);});}else{input.blur(function(e){});}
+form.submit(function(e){if(t){clearTimeout(t);}
+e.preventDefault();if(false!==onsubmit.apply(form,[settings,self])){if(false!==submit.apply(form,[settings,self])){if($.isFunction(settings.target)){var str=settings.target.apply(self,[input.val(),settings]);$(self).html(str);self.editing=false;callback.apply(self,[self.innerHTML,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}}else{var submitdata={};submitdata[settings.name]=input.val();submitdata[settings.id]=self.id;if($.isFunction(settings.submitdata)){$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings]));}else{$.extend(submitdata,settings.submitdata);}
+if('PUT'==settings.method){submitdata['_method']='put';}
+$(self).html(settings.indicator);var ajaxoptions={type:'POST',data:submitdata,dataType:'html',url:settings.target,success:function(result,status){if(ajaxoptions.dataType=='html'){$(self).html(result);}
+self.editing=false;callback.apply(self,[result,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr]);}};$.extend(ajaxoptions,settings.ajaxoptions);$.ajax(ajaxoptions);}}}
+$(self).attr('title',settings.tooltip);return false;});});this.reset=function(form){if(this.editing){if(false!==onreset.apply(form,[settings,self])){$(self).html(self.revert);self.editing=false;if(!$.trim($(self).html())){$(self).html(settings.placeholder);}
+if(settings.tooltip){$(self).attr('title',settings.tooltip);}}}};});};$.editable={types:{defaults:{element:function(settings,original){var input=$('<input type="hidden"></input>');$(this).append(input);return(input);},content:function(string,settings,original){$(':input:first',this).val(string);},reset:function(settings,original){original.reset(this);},buttons:function(settings,original){var form=this;if(settings.submit){if(settings.submit.match(/>$/)){var submit=$(settings.submit).click(function(){if(submit.attr("type")!="submit"){form.submit();}});}else{var submit=$('<button type="submit" />');submit.html(settings.submit);}
+$(this).append(submit);}
+if(settings.cancel){if(settings.cancel.match(/>$/)){var cancel=$(settings.cancel);}else{var cancel=$('<button type="cancel" />');cancel.html(settings.cancel);}
+$(this).append(cancel);$(cancel).click(function(event){if($.isFunction($.editable.types[settings.type].reset)){var reset=$.editable.types[settings.type].reset;}else{var reset=$.editable.types['defaults'].reset;}
+reset.apply(form,[settings,original]);return false;});}}},text:{element:function(settings,original){var input=$('<input />');if(settings.width!='none'){input.width(settings.width);}
+if(settings.height!='none'){input.height(settings.height);}
+input.attr('autocomplete','off');$(this).append(input);return(input);}},textarea:{element:function(settings,original){var textarea=$('<textarea />');if(settings.rows){textarea.attr('rows',settings.rows);}else if(settings.height!="none"){textarea.height(settings.height);}
+if(settings.cols){textarea.attr('cols',settings.cols);}else if(settings.width!="none"){textarea.width(settings.width);}
+$(this).append(textarea);return(textarea);}},select:{element:function(settings,original){var select=$('<select />');$(this).append(select);return(select);},content:function(data,settings,original){if(String==data.constructor){eval('var json = '+data);}else{var json=data;}
+for(var key in json){if(!json.hasOwnProperty(key)){continue;}
+if('selected'==key){continue;}
+var option=$('<option />').val(key).append(json[key]);$('select',this).append(option);}
+$('select',this).children().each(function(){if($(this).val()==json['selected']||$(this).text()==$.trim(original.revert)){$(this).attr('selected','selected');}});}}},addInputType:function(name,input){$.editable.types[name]=input;}};$.fn.editable.defaults={name:'value',id:'id',type:'text',width:'auto',height:'auto',event:'click.editable',onblur:'cancel',loadtype:'GET',loadtext:'Loading...',placeholder:'Click to edit',loaddata:{},submitdata:{},ajaxoptions:{}};})(jQuery);
\ No newline at end of file
-- 
1.7.0.4


From cnighswonger at foundations.edu  Fri Apr 27 21:26:07 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 27 Apr 2012 15:26:07 -0400
Subject: [Koha-patches] [PATCH 4/7] Adding DateTime::Format::MySQL as a core
	dependency
In-Reply-To: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
References: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
Message-ID: <1335554770-15052-4-git-send-email-cnighswonger@foundations.edu>

---
 C4/Installer/PerlDependencies.pm |    5 +++++
 debian/control                   |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index ae01208..8dcfd76 100644
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -209,6 +209,11 @@ our $PERL_DEPS = {
         'required' => '1',
         'min_ver'  => '0.04'
     },
+    'DateTime::Format::MySQL' => {
+        'usage'    => 'Core',
+        'required' => '1',
+        'min_ver'  => '0.04'
+    },
     'DateTime::Set' => {
         'usage'    => 'Core',
         'required' => '1',
diff --git a/debian/control b/debian/control
index 322d921..bf4d3e0 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: libcgi-session-driver-memcached-perl,
  libdatetime-event-ical-perl,
  libdatetime-format-dateparse-perl,
  libdatetime-format-ical-perl,
+ libdatetime-format-mysql-perl,
  libdatetime-perl,
  libdatetime-set-perl,
  libdatetime-timezone-perl,
-- 
1.7.0.4


From cnighswonger at foundations.edu  Fri Apr 27 21:26:08 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 27 Apr 2012 15:26:08 -0400
Subject: [Koha-patches] [PATCH 5/7] Beginning work on Quote-of-the-day
	(QOTD) Feature for OPAC
In-Reply-To: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
References: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
Message-ID: <1335554770-15052-5-git-send-email-cnighswonger@foundations.edu>

This feature will add the option of displaying a select quote
for the day on the OPAC homepage. It will include the addition
of a QOTD editor in the tools section of the staff interface
which will allow the addition, editing, and deletion of quotes.
A single system preference will enable/disable the display of
the QOTD on the OPAC homepage. A new granular permission will
also be added to conrol user access to the QOTD editor tool.

Possible extentions to this would be code to allow alternate
quote selection algorithms to be added to vary how the currently
displayed quote is selected from the table of quotes.

This patch is a squash of the following work:

Adding quotes table to kohastructure.sql and updatedatabase.pl

Note: This patch is intended for a MySQL based installation only.
That means that it includes backticks because that is what is required
at this point in history to install Koha correctly on a MySQL based
installation.

Feel free to port this over to the Pg stuff in the data/Pg directory.

Adding system preference to control display of QOTD on OPAC main page

Adding sample quote data

These quotes are taken from various US presidents. I'm not sure these
are applicable to the rest of the world, so I'm leaving it to translators
and others to add sample quote data for other languages.

Adding edit_quotes user permissions

Squash with other db related patches in this series

Adding quotes editor pages to tools

Adding QOTD editor link to tools homepage

Integration of DataTables into QOTD Editor

This includes only the table generation; jEditable to be added
next to allow quote adding and editing directly in the table.

Impleminting jEditable into the quote editor

Adding delete and add option to editor

Fixing OPAC display so the QOTD div does not show if no quote is returned

Also removing useless code from tools/quotes.pl

Adding spans around QOTD foo in opac-main.tt

Also fixing quote selection logic to accomodate the possibility of
a single quote in the db a litte better.

Changing timestamp column header to a more user-friendly 'Last Displayed'

Fixing bug in quote selection logic

This bug caused a situation where when the table had only a single
quote with an id greater than 1 in it, no quote would be selected.

Overriding the default empty table message supplied by datatables-strings.inc

NOTE: Someone needs to verify that this local string is translatable.
---
 C4/Koha.pm                                         |   80 +++++++++-
 .../data/mysql/de-DE/mandatory/userpermissions.sql |    1 +
 .../data/mysql/en/mandatory/userpermissions.sql    |    1 +
 installer/data/mysql/en/optional/sample_quotes.sql |   34 ++++
 installer/data/mysql/en/optional/sample_quotes.txt |    1 +
 .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |    1 +
 .../data/mysql/it-IT/necessari/userpermissions.sql |    1 +
 installer/data/mysql/kohastructure.sql             |   13 ++
 .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql |    1 +
 .../data/mysql/pl-PL/mandatory/userpermissions.sql |    1 +
 .../ru-RU/mandatory/permissions_and_user_flags.sql |    1 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 .../uk-UA/mandatory/permissions_and_user_flags.sql |    1 +
 installer/data/mysql/updatedatabase.pl             |   23 +++
 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css |   23 ++-
 .../intranet-tmpl/prog/en/includes/tools-menu.inc  |    3 +
 .../prog/en/modules/admin/preferences/opac.pref    |    8 +-
 .../intranet-tmpl/prog/en/modules/tools/quotes.tt  |  185 ++++++++++++++++++++
 .../prog/en/modules/tools/tools-home.tt            |    4 +
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   23 +++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt   |    4 +
 opac/opac-main.pl                                  |    9 +-
 tools/quotes.pl                                    |   44 +++++
 tools/quotes/quotes_ajax.pl                        |  116 ++++++++++++
 24 files changed, 571 insertions(+), 8 deletions(-)
 create mode 100644 installer/data/mysql/en/optional/sample_quotes.sql
 create mode 100644 installer/data/mysql/en/optional/sample_quotes.txt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
 create mode 100755 tools/quotes.pl
 create mode 100755 tools/quotes/quotes_ajax.pl

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 0192989..36c158e 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -22,10 +22,15 @@ package C4::Koha;
 
 use strict;
 #use warnings; FIXME - Bug 2505
+
 use C4::Context;
+
 use Memoize;
+use DateTime;
+use DateTime::Format::MySQL;
+use autouse 'Data::Dumper' => qw(Dumper);
 
-use vars qw($VERSION @ISA @EXPORT $DEBUG);
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $DEBUG);
 
 BEGIN {
 	$VERSION = 3.01;
@@ -67,6 +72,7 @@ BEGIN {
 		$DEBUG
 	);
 	$DEBUG = 0;
+ at EXPORT_OK = qw( GetDailyQuote );
 }
 
 # expensive functions
@@ -1298,6 +1304,78 @@ sub GetNormalizedOCLCNumber {
     }
 }
 
+=head2 GetDailyQuote($opts)
+
+Takes a hashref of options
+
+Currently supported options are:
+
+'id'        An exact quote id
+'random'    Select a random quote
+noop        When no option is passed in, this sub will return the quote timestamped for the current day
+
+The function returns an anonymous hash following this format:
+
+        {
+          'source' => 'source-of-quote',
+          'timestamp' => 'timestamp-value',
+          'text' => 'text-of-quote',
+          'id' => 'quote-id'
+        };
+
+=cut
+
+# This is definitely a candidate for some sort of caching once we finally settle caching/persistence issues...
+# at least for default option
+
+sub GetDailyQuote {
+    my %opts = @_;
+    my $dbh = C4::Context->dbh;
+    my $query = '';
+    my $sth = undef;
+    my $quote = undef;
+    if ($opts{'id'}) {
+        $query = 'SELECT * FROM quotes WHERE id = ?';
+        $sth = $dbh->prepare($query);
+        $sth->execute($opts{'id'});
+        $quote = $sth->fetchrow_hashref();
+    }
+    elsif ($opts{'random'}) {
+        # Fall through... we also return a random quote as a catch-all if all else fails
+    }
+    else {
+        $query = 'SELECT * FROM quotes WHERE timestamp LIKE CONCAT(CURRENT_DATE,\'%\') ORDER BY timestamp LIMIT 0,1';
+        $sth = $dbh->prepare($query);
+        $sth->execute();
+        $quote = $sth->fetchrow_hashref();
+    }
+    unless ($quote) {        # if there are not matches, choose a random quote
+        # get a list of all available quote ids
+        $sth = C4::Context->dbh->prepare('SELECT count(*) FROM quotes;');
+        $sth->execute;
+        my $range = ($sth->fetchrow_array)[0];
+        if ($range > 1) {
+            # chose a random id within that range if there is more than one quote
+            my $id = int(rand($range));
+            # grab it
+            $query = 'SELECT * FROM quotes WHERE id = ?;';
+            $sth = C4::Context->dbh->prepare($query);
+            $sth->execute($id);
+        }
+        else {
+            $query = 'SELECT * FROM quotes;';
+            $sth = C4::Context->dbh->prepare($query);
+            $sth->execute();
+        }
+        $quote = $sth->fetchrow_hashref();
+        # update the timestamp for that quote
+        $query = 'UPDATE quotes SET timestamp = ? WHERE id = ?';
+        $sth = C4::Context->dbh->prepare($query);
+        $sth->execute(DateTime::Format::MySQL->format_datetime(DateTime->now), $quote->{'id'});
+    }
+    return $quote;
+}
+
 sub _normalize_match_point {
     my $match_point = shift;
     (my $normalized_match_point) = $match_point =~ /([\d-]*[X]*)/;
diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql
index 2302273..da3a663 100644
--- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql
+++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql
@@ -22,6 +22,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'moderate_comments', 'Benutzerkommentare moderieren'),
    (13, 'edit_notices', 'Benachrichtigungen verwalten'),
    (13, 'edit_notice_status_triggers', 'Mahntrigger f?r ?berf?llige Medien verwalten'),
+   (13, 'edit_quotes', 'Edit quotes for quote-of-the-day feature'),
    (13, 'view_system_logs', 'Logs durchsuchen/einsehen'),
    (13, 'inventory', 'Inventur durchf?hren'),
    (13, 'stage_marc_import', 'MARC-Datens?tze zwischenspeichern'),
diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql
index 873089a..130d380 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -22,6 +22,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'moderate_comments', 'Moderate patron comments'),
    (13, 'edit_notices', 'Define notices'),
    (13, 'edit_notice_status_triggers', 'Set notice/status triggers for overdue items'),
+   (13, 'edit_quotes', 'Edit quotes for quote-of-the-day feature'),
    (13, 'view_system_logs', 'Browse the system logs'),
    (13, 'inventory', 'Perform inventory (stocktaking) of your catalog'),
    (13, 'stage_marc_import', 'Stage MARC records into the reservoir'),
diff --git a/installer/data/mysql/en/optional/sample_quotes.sql b/installer/data/mysql/en/optional/sample_quotes.sql
new file mode 100644
index 0000000..9a14e32
--- /dev/null
+++ b/installer/data/mysql/en/optional/sample_quotes.sql
@@ -0,0 +1,34 @@
+/*!40000 ALTER TABLE `quotes` DISABLE KEYS */;
+INSERT INTO `quotes` VALUES
+(1,'George Washington','To be prepared for war is one of the most effectual means of preserving peace.','0000-00-00 00:00:00'),
+(2,'Thomas Jefferson','When angry, count ten, before you speak; if very angry, an hundred.','0000-00-00 00:00:00'),
+(3,'Abraham Lincoln','Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.','2012-04-12 20:30:59'),
+(4,'Abraham Lincoln','I have always found that mercy bears richer fruits than strict justice.','0000-00-00 00:00:00'),
+(5,'Andrew Johnson','I feel incompetent to perform duties...which have been so unexpectedly thrown upon me.','0000-00-00 00:00:00'),
+(6,'Rutherford B. Hayes','He serves his party best who serves his country best.','0000-00-00 00:00:00'),
+(7,'Theodore Roosevelt','No President has ever enjoyed himself as much as I?','0000-00-00 00:00:00'),
+(8,'Theodore Roosevelt','Speak softly and carry a big stick.','0000-00-00 00:00:00'),
+(9,'William H. Taft','I have come to the conclusion that the major part of the president is to increase the gate receipts of expositions and fairs and bring tourists to town.','0000-00-00 00:00:00'),
+(11,'Woodrow Wilson','You cannot become thorough Americans if you think of yourselves in groups. America does not consist of groups. A man who thinks of himself as belonging to a particular national group in America has not yet become an American.','0000-00-00 00:00:00'),
+(12,'Calvin Coolidge','If you don\'t say anything, you won\'t be called on to repeat it.','0000-00-00 00:00:00'),
+(13,'Calvin Coolidge','Four fifths of all our troubles in this life would disappear if we would only sit down and keep still.','0000-00-00 00:00:00'),
+(14,'Herbert Hoover','The slogan of progress is changing from the full dinner pail to the full garage.','0000-00-00 00:00:00'),
+(15,'Franklin D. Roosevelt','Let me assert my firm belief that the only thing we have to fear is fear itself.','0000-00-00 00:00:00'),
+(16,'Harry S. Truman','If you can\'t stand the heat, get out of the kitchen.','0000-00-00 00:00:00'),
+(17,'Harry S. Truman','The atom bomb was no great decision. It was merely another powerful weapon in the arsenal of righteousness.','0000-00-00 00:00:00'),
+(18,'Harry S. Truman','The buck stops here.','0000-00-00 00:00:00'),
+(19,'Dwight D. Eisenhower','History does not long entrust the care of freedom to the weak or the timid.','0000-00-00 00:00:00'),
+(20,'John F. Kennedy','My fellow Americans, ask not what your country can do for you; ask what you can do for your country.','0000-00-00 00:00:00'),
+(22,'John F. Kennedy','I do not think it altogether inappropriate to introduce myself to this audience. I am the man who accompanied Jacqueline Kennedy to Paris, and I have enjoyed it.','0000-00-00 00:00:00'),
+(23,'Lyndon B. Johnson','The Great Society is a place where every child can find knowledge to enrich his mind and to enlarge his talents. It is a place where the city of man serves not only the needs of the body and the demands of commerce but the desire for beauty and the hunger for community. It is a place where men are more concerned with the quality of their goals than the quantity of their goods.','0000-00-00 00:00:00'),
+(24,'Richard Nixon','People have got to know whether or not their president is a crook. Well, I\'m not a crook.','0000-00-00 00:00:00'),
+(25,'Richard Nixon','When the President does it, that means that it is not illegal.','0000-00-00 00:00:00'),
+(26,'Gerald R. Ford','Our Long national nightmare is over.','2012-04-18 19:42:14'),
+(27,'Gerald R. Ford','Our constitution works. Our great republic is a government of laws, not of men.','0000-00-00 00:00:00'),
+(28,'Jimmy Carter','A strong nation, like a strong person, can afford to be gentle, firm, thoughtful, and restrained. It can afford to extend a helping hand to others. It\'s a weak nation, like a weak person, that must behave with bluster and boasting and rashness and other signs of insecurity.','0000-00-00 00:00:00'),
+(30,'Ronald Reagan','It is not my intention to do away with government. It is rather to make it work -work with us, not over us; stand by our side, not ride on our back. Government can and must provide opportunity, not smother it; foster productivity, not stifle it. This Administration\'s objective will be a healthy, vigorous, growing economy.','0000-00-00 00:00:00'),
+(31,'Ronald Reagan','Each generation goes further than the generation preceding it because it stands on the shoulders of that generation. You will have opportunities beyond anything we\'ve ever known.','0000-00-00 00:00:00'),
+(32,'George H. W. Bush??','We have ...drawn a line in the sand.','0000-00-00 00:00:00'),
+(33,'George W. Bush','If America shows weakness and uncertainty, the world will drift toward tragedy. That will not happen on my watch.','0000-00-00 00:00:00'),
+(34,'George W. Bush','Every nation in every region now has a decision to make. Either you are with us, or you are with the terrorists.','0000-00-00 00:00:00');
+/*!40000 ALTER TABLE `quotes` ENABLE KEYS */;
diff --git a/installer/data/mysql/en/optional/sample_quotes.txt b/installer/data/mysql/en/optional/sample_quotes.txt
new file mode 100644
index 0000000..b8b2c2d
--- /dev/null
+++ b/installer/data/mysql/en/optional/sample_quotes.txt
@@ -0,0 +1 @@
+Sample Quotes
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
index faaaf39..43f9197 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
@@ -12,6 +12,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'moderate_comments', 'Mod?rer les commentaires des adh?rents'),
    (13, 'edit_notices', 'D?finir les notifications'),
    (13, 'edit_notice_status_triggers', 'D?finir les d?clencheurs de notification de retard'),
+   (13, 'edit_quotes', 'Edit quotes for quote-of-the-day feature'),
    (13, 'view_system_logs', 'Parcourir les journaux de l''activit? du syst?me'),
    (13, 'inventory', 'R?aliser les t?ches de r?colement'),
    (13, 'stage_marc_import', 'Importer des notices MARC dans le r?servoir'),
diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql
index 9a064a0..2b9aa00 100644
--- a/installer/data/mysql/it-IT/necessari/userpermissions.sql
+++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql
@@ -24,6 +24,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'moderate_comments', 'Modera i commenti degli utenti'),
    (13, 'edit_notices', 'Definisci le notifiche'),
    (13, 'edit_notice_status_triggers', 'Imposta il messaggio o lo stato delle notifiche per le copie in ritardo'),
+   (13, 'edit_quotes', 'Edit quotes for quote-of-the-day feature'),
    (13, 'view_system_logs', 'Scorri i log di sistema'),
    (13, 'inventory', 'Lavora sugli inventari (stocktaking) del tuo catalogo'),
    (13, 'stage_marc_import', 'Opera sui Record MARC presenti nella zona di lavoro'),
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index a210293..f8bec6e 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2829,6 +2829,19 @@ CREATE TABLE ratings (
     CONSTRAINT ratings_ibfk_2 FOREIGN KEY (biblionumber) REFERENCES biblio (biblionumber) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+--
+-- Table structure for table `quotes`
+--
+
+DROP TABLE IF EXISTS quotes;
+CREATE TABLE `quotes` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `source` varchar(45) DEFAULT NULL,
+  `text` mediumtext NOT NULL,
+  `timestamp` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
index 24f081e..3d5dcbf 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
@@ -43,6 +43,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'moderate_comments', 'Behandle kommentarer fra l?nere'),
    (13, 'edit_notices', 'Definere meldinger'),
    (13, 'edit_notice_status_triggers', 'Definere utl?sere for meldinger og statusenderinger for for sent leverte dokumenter'),
+   (13, 'edit_quotes', 'Edit quotes for quote-of-the-day feature'),
    (13, 'view_system_logs', 'Se Koha sine logger'),
    (13, 'inventory', 'Foreta varetelling'),
    (13, 'stage_marc_import', 'Importere MARC-poster til br?nnen'),
diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
index f16a14d..78056f6 100644
--- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
+++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql
@@ -22,6 +22,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'moderate_comments', 'Moderate patron comments'),
    (13, 'edit_notices', 'Define notices'),
    (13, 'edit_notice_status_triggers', 'Set notice/status triggers for overdue items'),
+   (13, 'edit_quotes', 'Edit quotes for quote-of-the-day feature'),
    (13, 'view_system_logs', 'Przegl?danie log?w systemowych'),
    (13, 'inventory', 'Perform inventory (stocktaking) of your catalog'),
    (13, 'stage_marc_import', 'Stage MARC records into the reservoir'),
diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
index 760b810..ddafa7f 100644
--- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
+++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
@@ -46,6 +46,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'moderate_comments',           '??????????? ???????????? ?? ???????????'),
    (13, 'edit_notices',                '??????????? ?????????'),
    (13, 'edit_notice_status_triggers', '????????? ????????? ?????????/???????? ??? ???????????? ???????????'),
+   (13, 'edit_quotes',                 'Edit quotes for quote-of-the-day feature'),
    (13, 'view_system_logs',            '???????? ?????????? ???????'),
    (13, 'inventory',                   '?????????? ??????????????(???????) ?????? ????????'),
    (13, 'stage_marc_import',           '????????? ????-??????? ? ?????????'),
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 49debd2..58a896d 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -95,6 +95,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserjs','','Define custom javascript for inclusion in OPAC','70|10','Textarea');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserlogin',1,'Enable or disable display of user login features',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QuoteOfTheDay',0,'Enable or disable display of Quote of the Day on the OPAC home page',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('patronimages',0,'Enable patron images for the Staff Client',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACpatronimages',0,'Enable patron images in the OPAC',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('printcirculationslips',1,'If ON, enable printing circulation receipts','','YesNo');
diff --git a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
index 8739379..8dfb0be 100644
--- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
+++ b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
@@ -46,6 +46,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'moderate_comments',           '??????????? ?????????? ??? ????????????'),
    (13, 'edit_notices',                '?????????? ???????????'),
    (13, 'edit_notice_status_triggers', '???????????? ???????? ???????????/???????? ??? ???????????? ???????????'),
+   (13, 'edit_quotes', 'Edit quotes for quote-of-the-day feature'),
    (13, 'view_system_logs',            '???????? ?????????? ???????'),
    (13, 'inventory',                   '?????????? ??????????????(???????) ?????? ????????'),
    (13, 'stage_marc_import',           '????????? ????-??????? ? ???????'),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 84f0437..a444f51 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5212,6 +5212,29 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.09.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    unless (TableExists('quotes')) {
+        $dbh->do( qq{
+            CREATE TABLE `quotes` (
+              `id` int(11) NOT NULL AUTO_INCREMENT,
+              `source` varchar(45) DEFAULT NULL,
+              `text` mediumtext NOT NULL,
+              `timestamp` datetime NOT NULL,
+              PRIMARY KEY (`id`)
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8
+        });
+    }
+    $dbh->do( qq{
+        INSERT IGNORE INTO permissions VALUES (13, "edit_quotes","Edit quotes for quote-of-the-day feature");
+    });
+    $dbh->do( qq{
+        INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QuoteOfTheDay',0,'Enable or disable display of Quote of the Day on the OPAC home page',NULL,'YesNo');
+    });
+    print "Upgrade to $DBversion done (Adding Quote of the Day Option.)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
index ba7e233..2a78678 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
@@ -85,25 +85,25 @@ div.dataTables_paginate {
 .paging_full_numbers a.paginate_button.first {
     background-image : url('../../img/first.png');
     background-repeat: no-repeat;
-    background-position : 2px center;
+    background-position : 1% center;
     padding-left : 2em;
 }
 .paging_full_numbers a.paginate_button.previous {
     background-image : url('../../img/prev.png');
     background-repeat: no-repeat;
-    background-position : 2px center;
+    background-position : 1% center;
     padding-left : 2em;
 }
 .paging_full_numbers a.paginate_button.next {
     background-image : url('../../img/next.png');
     background-repeat: no-repeat;
-    background-position : right center;
+    background-position : 96% center;
     padding-right : 2em;
 }
 .paging_full_numbers a.paginate_button.last {
     background-image : url('../../img/last.png');
     background-repeat: no-repeat;
-    background-position : right center;
+    background-position : 96% center;
     border-right : 1px solid #686868;
     padding-right : 2em;
 }
@@ -175,6 +175,21 @@ div.dataTables_paginate.paging_four_button {
     cursor: pointer;
 }
 
+.dataTables_processing {
+    background-color: white;
+    border: 1px solid #DDDDDD;
+    color: #999999;
+    font-size: 14px;
+    height: 30px;
+    left: 50%;
+    margin-left: -125px;
+    margin-top: -15px;
+    padding: 14px 0 2px;
+    position: fixed;
+    text-align: center;
+    top: 50%;
+    width: 250px;
+}
 
 /*
 table.display {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index 5b6c7cd..168ac19 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -91,4 +91,7 @@
     [% IF ( CAN_user_tools_schedule_tasks ) %]
 	<li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li>
     [% END %]
+    [% IF ( CAN_user_tools_edit_quotes ) %]
+	<li><a href="/cgi-bin/koha/tools/quotes.pl">Quote Editor</a></li>
+    [% END %]
 </ul></div></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index eb74d81..89d3c42 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -330,7 +330,13 @@ OPAC:
                   yes: Enable
                   no: Disable
             - browsing and paging search results from the OPAC detail page.
-
+        -
+            - pref: QuoteOfTheDay
+              default: 0
+              choices:
+                  yes: Enable
+                  no: Disable
+            - Quote of the Day display on OPAC home page
     Policy:
         -
             - pref: singleBranchMode
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
new file mode 100644
index 0000000..49df31d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
@@ -0,0 +1,185 @@
+    [% INCLUDE 'doc-head-open.inc' %]
+    <title>Koha &rsaquo; Tools &rsaquo; Quote Editor</title>
+    [% INCLUDE 'doc-head-close.inc' %]
+    <link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/datatables.css" />
+    <script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+    [% INCLUDE 'datatables-strings.inc' %]
+    </script>
+    <script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script>
+    <script type="text/javascript" src="/intranet-tmpl/prog/en/js/jquery.jeditable.mini.js"></script>
+    <script type="text/javascript">
+    //<![CDATA[
+    var oTable; /* oTable needs to be global */
+    var sEmptyTable = _('No quotes available. Please use the \"Add Quote\" button to add a quote.'); /* override the default message in datatables-strings.inc */
+    $(document).ready(function() {
+        oTable = $("#quotes_editor").dataTable({
+                    "bAutoWidth"        : false,
+                    "bProcessing"       : true,
+                    "bServerSide"       : true,
+                    "bPaginate"         : true,
+                    "sPaginationType"   : "full_numbers",
+                    "sAjaxSource"       : "/cgi-bin/koha/tools/quotes/quotes_ajax.pl",
+                    "aoColumns"         : [
+                                            { "sWidth": "3%"  },
+                                            { "sWidth": "12%" },
+                                            { "sWidth": "65%" },
+                                            { "sWidth": "10%" },
+                                            { "sWidth": "10%" },
+                                          ],
+                   "sDom"               : '<"add_quote">frtip',
+                   "oLanguage"          : {
+                                            "sEmptyTable": sEmptyTable,
+                                          },
+                   "fnPreDrawCallback": function(oSettings) {
+                        return true;
+                    },
+                    "fnRowCallback": function( nRow, aData, iDisplayIndex ) {
+                        noEditFields = [0,3,4]; /* id, timestamp, action */
+                        quoteID = $('td', nRow)[0].innerHTML;
+                        /* console.log('Quote ID: '+quoteID); */
+                        /* do foo on various cells in the current row */
+                        $('td:eq(1)', nRow).attr("id", quoteID); /* we use the id attribute to carry the quote id */
+                        $('td:eq(2)', nRow).attr("id", quoteID);
+                        $('td:eq(4)', nRow).html('<input type="button" class="delete" value="Delete" onclick="fnClickDeleteRow('+quoteID+');" />');
+                        /* apply no_edit id to noEditFields */
+                        for (i=0; i<noEditFields.length; i++) {
+                            $('td', nRow)[noEditFields[i]].setAttribute("id","no_edit");
+                        }
+                        return nRow;
+                    },
+                   "fnDrawCallback": function(oSettings) {
+                        /* Apply the jEditable handlers to the table on all fields w/o the no_edit id */
+                        $('#quotes_editor tbody td[id!="no_edit"]').editable( "/cgi-bin/koha/tools/quotes/quotes_ajax.pl", {
+                            "callback"      : function( sValue, y ) {
+                                                  oTable.fnDraw(false); /* no filter/sort or we lose our pagination */
+                                              },
+                            "submitdata"    : function ( value, settings ) {
+                                                  return {
+                                                      "column"        : oTable.fnGetPosition( this )[2],
+                                                      "action"        : "edit",
+                                                  };
+                                              },
+                            "height"        : "14px",
+                            "placeholder"   : "Saving data...",
+                        });
+                   },
+        });
+        $("div.add_quote").html('<input type="button" class="add_quote_button" value="Add Quote" style="float: right;" onclick="fnClickAddRow();"/>');
+    });
+
+        function fnClickAddQuote() {
+            var quoteSource = $('#quoteSource').val();
+            var quoteText = $('#quoteText').val()
+            /* If passed a quote source, add the quote to the db */
+            if (quoteSource && quoteText) {
+                $.ajax({
+                    url: "/cgi-bin/koha/tools/quotes/quotes_ajax.pl",
+                    type: "POST",
+                    data: {
+                            "source"    : quoteSource,
+                            "text"      : quoteText,
+                            "action"    : "add",
+                    },
+                    success: function(){oTable.fnDraw(false)}
+                });
+            }
+            else {
+                alert('Please supply both the text and source of the quote before saving.');
+            }
+        }
+
+        function fnClickAddRow() {
+            /* This adds a row to the datatable */
+            var lastID = $('#quotes_editor tbody tr:last td:first').text(); /* grab the last quote id to validate add request */
+            if (lastID !== '--') {
+                $('#quotes_editor').one('draw', function (){
+                    var tbody = document.getElementById('quotes_editor');
+                    var lastRow = tbody.rows.length;
+                    var row = tbody.insertRow(lastRow);
+                    var currentRow = lastRow+1;
+                    row.innerHTML ='<td id="no_edit">--</td><td><input id="quoteSource" type="text" style="height:14px; width:99%" /></td><td><input id="quoteText" type="text" style="height:14px; width:99%" /></td><td id="no_edit">--</td><td id="no_edit"><input type="button" class="delete" value="Delete" disable="disable"/><input type="button" class="save" value="Save" onclick="fnClickAddQuote();"/><input type="button" class="cancel" value="Cancel" onclick="fnClickDeleteRow();"/></td>';
+                    if (currentRow % 2 == 0) {
+                        row.className="odd";
+                    }
+                    else {
+                        row.className="even";
+                    }
+                });
+                oTable.fnPageChange('last', true);
+            }
+            else {
+                alert('You must either save or cancel your current addition before adding another.');
+            }
+        }
+
+        function fnClickDeleteRow(quoteID) {
+            //console.log('Quote ID: '+quoteID);
+            if (quoteID) {
+                /* Delete the row from the db */
+                if (confirm('Are you sure you wish to delete quote '+quoteID+'?')) {
+                    $.ajax({
+                        url: "/cgi-bin/koha/tools/quotes/quotes_ajax.pl",
+                        type: "POST",
+                        data: {
+                                "id"        : quoteID,
+                                "action"    : "delete",
+                        },
+                    /* On a successful delete, redraw the table */
+                    success: function(){oTable.fnDraw(false)}
+                    });
+                }
+                else {
+                    return;
+                }
+            }
+            else {
+                /* Delete the row from the table */
+                if (confirm('Your quote will not be saved! Do you wish to continue?')) {
+                    $('#quotes_editor tbody tr:last').remove();
+                }
+                else {
+                    return;
+                }
+            }
+        }
+    //]]>
+    </script>
+</head>
+<body id="tools_quotes" class="tools">
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Quote Editor</div>
+
+<div id="doc3" class="yui-t2">
+    <div id="bd">
+        <div id="yui-main">
+            <div class="yui-b">
+                <table id="quotes_editor" style="float: left; width: 100%">
+                <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>Source</th>
+                        <th>Text</th>
+                        <th>Last Displayed</th>
+                        <th>Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- tbody content is generated by DataTables -->
+                    <tr>
+                        <td></td>
+                        <td></td>
+                        <td>Loading data...</td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                </tbody>
+                </table>
+            </div>
+        </div>
+    <div class="yui-b noprint">
+        [% INCLUDE 'tools-menu.inc' %]
+    </div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index 469236b..c78f17d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -87,6 +87,10 @@
     <dd>Schedule tasks to run</dd>
     [% END %]
 	
+    [% IF ( CAN_user_tools_edit_quotes ) %]
+    <dt><a href="/cgi-bin/koha/tools/quotes.pl">Edit Quotes for QOD Feature</a></dt>
+    <dd>Quote editor for Quote-of-the-day feature in OPAC</dd>
+    [% END %]
 
 </dl>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index c10e08d..275d18d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -2366,6 +2366,29 @@ span.sep {
 	text-shadow: 1px 1px 0 #FFF;
 }
 
+#daily-quote {
+    /*border-top : 1px solid #000000;*/
+    border : 1px solid #000000;
+    margin-top: 2px;
+    margin-bottom: 10px;
+    margin-left: 2px;
+    margin-right: 2px;
+    width: 300px;
+    text-align: center;
+    font-family: "Georgia","Palatino","Times New Roman",sans-serif;
+}
+
+#daily-quote h1 {
+    font-size: 18px;
+    font-weight: normal;
+    margin: 0;
+}
+
+#daily-quote div {
+    font-size: 12px;
+    margin: 5px;
+}
+
 /* ## BABELTHEQUE ##?*/
 /* Uncomment if babeltheque configuration no contains these lines */
 /*
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
index d2d68c5..a97b578 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
@@ -35,6 +35,10 @@
 </div>
 [% END %]
 
+	[% IF ( display_daily_quote && daily_quote ) %]
+    <div id="daily-quote" class="container"><h1>Quote of the Day</h1><div><span id="daily-quote-text">[% daily_quote.text %]</span> ~ <span id="daily-quote-source">[% daily_quote.source %]</span></div></div>
+[% END %]
+
 	[% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock" class="container">[% OpacMainUserBlock %]</div>[% END %]
 
 </div>
diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index 5d6c2e1..78ee2e2 100755
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -23,6 +23,7 @@ use C4::Auth;    # get_template_and_user
 use C4::Output;
 use C4::NewsChannels;    # get_opac_news
 use C4::Languages qw(getTranslatedLanguages accept_language);
+use C4::Koha qw( GetDailyQuote );
 
 my $input = new CGI;
 my $dbh   = C4::Context->dbh;
@@ -50,9 +51,13 @@ my ($theme, $news_lang) = C4::Templates::themelanguage(C4::Context->config('opac
 my $all_koha_news   = &GetNewsToDisplay($news_lang);
 my $koha_news_count = scalar @$all_koha_news;
 
+my $quote = GetDailyQuote();   # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
+
 $template->param(
-    koha_news       => $all_koha_news,
-    koha_news_count => $koha_news_count
+    koha_news           => $all_koha_news,
+    koha_news_count     => $koha_news_count,
+    display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
+    daily_quote         => $quote,
 );
 
 # If GoogleIndicTransliteration system preference is On Set paramter to load Google's javascript in OPAC search screens
diff --git a/tools/quotes.pl b/tools/quotes.pl
new file mode 100755
index 0000000..e12f4bf
--- /dev/null
+++ b/tools/quotes.pl
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+
+# Copyright 2012 Foundations Bible College Inc.
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+
+use CGI;
+use autouse 'Data::Dumper' => qw(Dumper);
+
+use C4::Auth;
+use C4::Koha;
+use C4::Context;
+use C4::Output;
+
+my $cgi = new CGI;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "tools/quotes.tt",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { tools => 'edit_quotes' },
+        debug           => 1,
+    }
+);
+
+output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/tools/quotes/quotes_ajax.pl b/tools/quotes/quotes_ajax.pl
new file mode 100755
index 0000000..4b3e031
--- /dev/null
+++ b/tools/quotes/quotes_ajax.pl
@@ -0,0 +1,116 @@
+#!/usr/bin/perl
+
+# Copyright 2012 Foundations Bible College Inc.
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+
+use CGI;
+use JSON;
+use autouse 'Data::Dumper' => qw(Dumper);
+
+use C4::Auth;
+use C4::Context;
+
+my $cgi = CGI->new;
+my $dbh = C4::Context->dbh;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { tools => 'edit_quotes' },
+        debug           => 1,
+    }
+);
+
+# NOTE: This is a collection of ajax functions for use with tools/quotes.pl
+
+my $params = $cgi->Vars; # NOTE: Multivalue parameters NOT allowed!!
+
+print $cgi->header('application/json');
+
+if ($params->{'action'} eq 'add') {
+    #warn Dumper($params); #XXX
+    my $sth = $dbh->prepare('INSERT INTO quotes (source, text) VALUES (?, ?);');
+    $sth->execute($params->{'source'}, $params->{'text'});
+    if ($sth->err) {
+        warn sprintf('Database returned the following error: %s', $sth->errstr);
+        exit 0;
+    }
+    exit 1;
+}
+elsif ($params->{'action'} eq 'edit') {
+    #warn Dumper($params); #XXX
+    my $editable_columns = [qw(source text)]; # pay attention to element order; these columns match the quotes table columns
+    my $sth = $dbh->prepare("UPDATE quotes SET $editable_columns->[$params->{'column'}-1]  = ? WHERE id = ?;");
+    $sth->execute($params->{'value'}, $params->{'id'});
+    if ($sth->err) {
+        warn sprintf('Database returned the following error: %s', $sth->errstr);
+        exit 0;
+    }
+    exit 1;
+}
+elsif ($params->{'action'} eq 'delete') {
+    #warn Dumper($params); #XXX
+    my $sth = $dbh->prepare("DELETE FROM quotes WHERE id = ?;");
+    $sth->execute($params->{'id'});
+    if ($sth->err) {
+        warn sprintf('Database returned the following error: %s', $sth->errstr);
+        exit 0;
+    }
+    exit 1;
+}
+else {
+    #warn Dumper($params); #XXX
+
+    my $aaData = [];
+    my $iTotalRecords = '';
+    my $sth = '';
+
+    # FIXME: the use of "Action" in the SELECTs below is a hack to supply the fifth column; there should be a nicer way todo this...
+    if (my $filter = $params->{'sSearch'}) {
+        # This seems a bit brute force and ungraceful, but it provides a very general, simple search on all fields
+        my $like = " id LIKE \"%$filter%\" OR source LIKE \"%$filter%\" OR text LIKE \"%$filter%\" OR timestamp LIKE \"%$filter%\"";
+        $iTotalRecords = $dbh->selectrow_array("SELECT count(*) FROM quotes WHERE $like;");
+        $sth = $dbh->prepare("SELECT *, \"Action\" FROM quotes WHERE $like LIMIT ?, ?;");
+    }
+    else {
+        $iTotalRecords = $dbh->selectrow_array('SELECT count(*) FROM quotes;');
+        $sth = $dbh->prepare('SELECT *, "Action" FROM quotes LIMIT ?, ?;');
+    }
+
+    $sth->execute($params->{'iDisplayStart'}, $params->{'iDisplayLength'});
+    if ($sth->err) {
+        warn sprintf('Database returned the following error: %s', $sth->errstr);
+        exit 0;
+    }
+
+    $aaData = $sth->fetchall_arrayref;
+    my $iTotalDisplayRecords = $iTotalRecords; # no filtering happening here
+
+
+    print to_json({
+                    iTotalRecords       =>  $iTotalRecords,
+                    iTotalDisplayRecords=>  $iTotalDisplayRecords,
+                    sEcho               =>  $params->{'sEcho'},
+                    aaData              =>  $aaData,
+                  });
+}
-- 
1.7.0.4


From cnighswonger at foundations.edu  Fri Apr 27 21:26:09 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 27 Apr 2012 15:26:09 -0400
Subject: [Koha-patches] [PATCH 6/7] Beginning work on QOTD uploader
In-Reply-To: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
References: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
Message-ID: <1335554770-15052-6-git-send-email-cnighswonger@foundations.edu>

This series will add a DataTable's based upload/editor with which
to upload csv files containing quotes to be used by the QOTD
feature.

The file should be formatted thusly:

"source","text-of-quote"
"source","text-of-quote"
...

Note: This work serves as a good example of potential improvements
in all other "editor" and file upload areas of Koha.

This patch is a squash of the following work:

Adding code to parse CSV file contents and push it into a DataTable

Adding in jEditable to enable table editing

Adding ajax to post data back to the server to be saved

Fixing edit and adding delete functionality

Adding some missing css as well as server feedback on save

Fixing a bug which limited the number of quotes which could be uploaded

Also fixing a minor bug with fnCSVToArray and doing some style cleanup.
---
 koha-tmpl/intranet-tmpl/prog/en/css/uploader.css   |   38 +++
 .../prog/en/modules/tools/quotes-upload.tt         |  300 ++++++++++++++++++++
 .../intranet-tmpl/prog/en/modules/tools/quotes.tt  |   10 +-
 koha-tmpl/intranet-tmpl/prog/img/x_alt_16x16.png   |  Bin 0 -> 215 bytes
 tools/quotes-upload.pl                             |   44 +++
 tools/quotes/quotes-upload_ajax.pl                 |   68 +++++
 6 files changed, 455 insertions(+), 5 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/uploader.css
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/x_alt_16x16.png
 create mode 100755 tools/quotes-upload.pl
 create mode 100755 tools/quotes/quotes-upload_ajax.pl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css b/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css
new file mode 100644
index 0000000..eca87b9
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css
@@ -0,0 +1,38 @@
+#progress_bar {
+  margin: 10px 0;
+  padding: 3px;
+  border: 1px solid #000;
+  font-size: 14px;
+  clear: both;
+  opacity: 0;
+  -moz-transition: opacity 1s linear;
+  -o-transition: opacity 1s linear;
+  -webkit-transition: opacity 1s linear;
+}
+#progress_bar.loading {
+  opacity: 1.0;
+}
+#progress_bar .percent {
+  background-color: #99ccff;
+  height: auto;
+  width: 0;
+}
+#server_response {
+    background-color: white;
+    background-image: url("../../img/x_alt_16x16.png");
+    background-repeat: no-repeat;
+    background-origin: padding-box;
+    background-position: right top;
+    border: 1px solid #DDDDDD;
+    color: #999999;
+    font-size: 14px;
+    height: 30px;
+    left: 50%;
+    margin-left: -125px;
+    margin-top: -15px;
+    padding: 14px 0 2px;
+    position: fixed;
+    text-align: center;
+    top: 50%;
+    width: 250px;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
new file mode 100644
index 0000000..05fac8b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
@@ -0,0 +1,300 @@
+    [% INCLUDE 'doc-head-open.inc' %]
+    <title>Koha &rsaquo; Tools &rsaquo; Quote Uploader</title>
+    [% INCLUDE 'doc-head-close.inc' %]
+    <link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/uploader.css" />
+    <link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/datatables.css" />
+    <script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+    [% INCLUDE 'datatables-strings.inc' %]
+    </script>
+    <script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script>
+    <script type="text/javascript" src="/intranet-tmpl/prog/en/js/jquery.jeditable.mini.js"></script>
+    <script type="text/javascript">
+    //<![CDATA[
+    var oTable; //DataTable object
+    $(document).ready(function() {
+
+    // Credits:
+    // FileReader() code copied and hacked from:
+    // http://www.html5rocks.com/en/tutorials/file/dndfiles/
+    // fnCSVToArray() gratefully borrowed from:
+    // http://www.bennadel.com/blog/1504-Ask-Ben-Parsing-CSV-Strings-With-Javascript-Exec-Regular-Expression-Command.htm
+
+    var reader;
+    var progress = document.querySelector('.percent');
+    $("#server_response").hide();
+
+    function fnAbortRead() {
+        reader.abort();
+    }
+
+    function fnErrorHandler(evt) {
+        switch(evt.target.error.code) {
+            case evt.target.error.NOT_FOUND_ERR:
+                alert('File Not Found!');
+                break;
+            case evt.target.error.NOT_READABLE_ERR:
+                alert('File is not readable');
+                break;
+            case evt.target.error.ABORT_ERR:
+                break; // noop
+            default:
+                alert('An error occurred reading this file.');
+        };
+    }
+
+    function fnUpdateProgress(evt) {
+        // evt is an ProgressEvent.
+        if (evt.lengthComputable) {
+            var percentLoaded = Math.round((evt.loaded / evt.total) * 100);
+            // Increase the progress bar length.
+            if (percentLoaded < 100) {
+                progress.style.width = percentLoaded + '%';
+                progress.textContent = percentLoaded + '%';
+            }
+        }
+    }
+
+    function fnCSVToArray( strData, strDelimiter ){
+        // This will parse a delimited string into an array of
+        // arrays. The default delimiter is the comma, but this
+        // can be overriden in the second argument.
+
+        // Check to see if the delimiter is defined. If not,
+        // then default to comma.
+        strDelimiter = (strDelimiter || ",");
+
+        // Create a regular expression to parse the CSV values.
+        var objPattern = new RegExp(
+        (
+            // Delimiters.
+            "(\\" + strDelimiter + "|\\r?\\n|\\r|^)" +
+            // Quoted fields.
+            "(?:\"([^\"]*(?:\"\"[^\"]*)*)\"|" +
+            // Standard fields.
+            "([^\"\\" + strDelimiter + "\\r\\n]*))"
+        ),
+            "gi"
+        );
+
+        // Create an array to hold our data. Give the array
+        // a default empty first row.
+        var arrData = [[]];
+
+        // Create an array to hold our individual pattern
+        // matching groups.
+        var arrMatches = null;
+
+        // Keep looping over the regular expression matches
+        // until we can no longer find a match.
+        while (arrMatches = objPattern.exec( strData )){
+
+            // Get the delimiter that was found.
+            var strMatchedDelimiter = arrMatches[ 1 ];
+
+            // Check to see if the given delimiter has a length
+            // (is not the start of string) and if it matches
+            // field delimiter. If it does not, then we know
+            // that this delimiter is a row delimiter.
+            if ( strMatchedDelimiter.length && (strMatchedDelimiter != strDelimiter) ){
+                // Since we have reached a new row of data,
+                // add an empty row to our data array.
+                // Note: if there is not more data, we will have to remove this row later
+                arrData.push( [] );
+            }
+
+            // Now that we have our delimiter out of the way,
+            // let's check to see which kind of value we
+            // captured (quoted or unquoted).
+            if (arrMatches[ 2 ]){
+                // We found a quoted value. When we capture
+                // this value, unescape any double quotes.
+                var strMatchedValue = arrMatches[ 2 ].replace(
+                new RegExp( "\"\"", "g" ),
+                    "\""
+                );
+            } else if (arrMatches[3]){
+                // We found a non-quoted value.
+                var strMatchedValue = arrMatches[ 3 ];
+            } else {
+                // There is no more valid data so remove the row we added earlier
+                // Is there a better way? Perhaps a look-ahead regexp?
+                arrData.splice(arrData.length-1, 1);
+            }
+
+            // Now that we have our value string, let's add
+            // it to the data array.
+            arrData[ arrData.length - 1 ].push( strMatchedValue );
+        }
+
+        // Return the parsed data.
+        return( arrData );
+    }
+
+    function fnDataTable(aaData) {
+        for(var i=0; i<aaData.length; i++) {
+            aaData[i].push('Delete'); //this is hackish FIXME
+        }
+        document.getElementById('quotes_editor').style.visibility="visible";
+        document.getElementById('file_uploader').style.visibility="hidden";
+        oTable = $('#quotes_editor').dataTable( {
+            "bAutoWidth"        : false,
+            "bPaginate"         : true,
+            "bSort"             : false,
+            "sPaginationType"   : "full_numbers",
+            "sDom"              : '<"save_quotes">frtip',
+            "aaData"            : aaData,
+            "aoColumns"         : [
+                {
+                    "sTitle"  : "Source",
+                    "sWidth"  : "15%",
+                },
+                {
+                    "sTitle"  : "Quote",
+                    "sWidth"  : "75%",
+                },
+                {
+                    "sTitle"  : "Actions",
+                    "sWidth"  : "10%",
+                },
+            ],
+           "fnPreDrawCallback": function(oSettings) {
+                return true;
+            },
+            "fnRowCallback": function( nRow, aData, iDisplayIndex ) {
+                noEditFields = [2]; /* action */
+                /* console.log('Quote ID: '+quoteID); */
+                /* do foo on various cells in the current row */
+                $('td:eq(2)', nRow).html('<input type="button" class="delete" value="Delete" onclick="fnClickDeleteRow(this.parentNode);" />');
+                /* apply no_edit id to noEditFields */
+                for (i=0; i<noEditFields.length; i++) {
+                    $('td', nRow)[noEditFields[i]].setAttribute("id","no_edit");
+                }
+                return nRow;
+            },
+           "fnDrawCallback": function(oSettings) {
+                /* Apply the jEditable handlers to the table on all fields w/o the no_edit id */
+                $('#quotes_editor tbody td[id!="no_edit"]').editable( function(value, settings) {
+                        var cellPosition = oTable.fnGetPosition( this );
+                        oTable.fnUpdate(value, cellPosition[0], cellPosition[1], false, false);
+                        return(value);
+                    },
+                    {
+                    "callback"      : function( sValue, y ) {
+                                          oTable.fnDraw(false); /* no filter/sort or we lose our pagination */
+                                      },
+                    "height"        : "14px",
+                });
+                $("div.save_quotes").html('<input type="button" class="add_quote_button" value="Save Quotes" style="float: right;" onclick="fnGetData(document.getElementById(\'quotes_editor\'));"/>');
+           },
+        });
+    }
+
+    function fnHandleFileSelect(evt) {
+        // Reset progress indicator on new file selection.
+        progress.style.width = '0%';
+        progress.textContent = '0%';
+
+        reader = new FileReader();
+        reader.onerror = fnErrorHandler;
+        reader.onprogress = fnUpdateProgress;
+        reader.onabort = function(e) {
+            alert('File read cancelled');
+        };
+        reader.onloadstart = function(e) {
+            document.getElementById('progress_bar').className = 'loading';
+        };
+        reader.onload = function(e) {
+            // Ensure that the progress bar displays 100% at the end.
+            progress.style.width = '100%';
+            progress.textContent = '100%';
+            setTimeout("document.getElementById('progress_bar').className='';", 2000);
+            quotes = fnCSVToArray(e.target.result, ',');
+            fnDataTable(quotes);
+        }
+        // Read in the image file as a text string.
+        reader.readAsText(evt.target.files[0]);
+    }
+
+    document.getElementById('files').addEventListener('change', fnHandleFileSelect, false);
+
+    });
+
+    function fnGetData(element) {
+        var jqXHR = $.ajax({
+            url         : "/cgi-bin/koha/tools/quotes/quotes-upload_ajax.pl",
+            type        : "POST",
+            contentType : "application/x-www-form-urlencoded", // we must claim this mimetype or CGI will not decode the URL encoding
+            dataType    : "json",
+            data        : {
+                            "quote"     : JSON.stringify(oTable.fnGetData()),
+                            "action"    : "add",
+                          },
+            success     : function(){
+                            var response = JSON.parse(jqXHR.responseText);
+                            if (response.success) {
+                                $("#server_response").text(response.records+' quotes saved.');
+                            }
+                            else {
+                                $("#server_response").text('An error has occurred. '+response.records+' quotes saved. Please ask your administrator to check the server log for more details.');
+                            }
+                            $("#server_response").fadeIn(200);
+                          },
+        });
+    }
+
+    function fnClickDeleteRow(td) {
+        oTable.fnDeleteRow(oTable.fnGetPosition(td)[0]);
+    }
+
+    function fnResetUpload() {
+        $('#server_response').fadeOut(200);
+        window.location.reload(true);   // is this the best route?
+    }
+
+    //]]>
+    </script>
+</head>
+<body id="tools_quotes" class="tools">
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Quote Uploader</div>
+
+<div id="doc3" class="yui-t2">
+    <div id="bd">
+        <div id="yui-main">
+            <div class="yui-b">
+
+                <div id="file_uploader" style="float: left; width: 100%; visibility:visible;">
+                    <input type="file" id="files" name="file" />
+                    <button onclick="fnAbortRead();">Cancel Upload</button>
+                    <div id="progress_bar"><div class="percent">0%</div></div>
+                </div>
+                <div id="server_response" onclick='fnResetUpload()'>Server Response</div>
+                <table id="quotes_editor" style="float: left; width: 100%; visibility:hidden;">
+                <thead>
+                    <tr>
+                        <th>Source</th>
+                        <th>Text</th>
+                        <th>Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- tbody content is generated by DataTables -->
+                    <tr>
+                        <td></td>
+                        <td>Loading data...</td>
+                        <td></td>
+                    </tr>
+                </tbody>
+                </table>
+
+
+
+            </div>
+        </div>
+    <div class="yui-b noprint">
+        [% INCLUDE 'tools-menu.inc' %]
+    </div>
+</div>
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
index 49df31d..a5c87e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
@@ -1,12 +1,12 @@
     [% INCLUDE 'doc-head-open.inc' %]
     <title>Koha &rsaquo; Tools &rsaquo; Quote Editor</title>
     [% INCLUDE 'doc-head-close.inc' %]
-    <link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/datatables.css" />
-    <script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+    <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
     [% INCLUDE 'datatables-strings.inc' %]
     </script>
-    <script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script>
-    <script type="text/javascript" src="/intranet-tmpl/prog/en/js/jquery.jeditable.mini.js"></script>
+    <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+    <script type="text/javascript" src="[% themelang %]/js/jquery.jeditable.mini.js"></script>
     <script type="text/javascript">
     //<![CDATA[
     var oTable; /* oTable needs to be global */
@@ -64,7 +64,7 @@
                         });
                    },
         });
-        $("div.add_quote").html('<input type="button" class="add_quote_button" value="Add Quote" style="float: right;" onclick="fnClickAddRow();"/>');
+        $("div.add_quote").html('<input type="button" class="add_quote_button" value="Add Quote" style="float: right;" onclick="fnClickAddRow();"/><input type="button" class="import_quote_button" value="Import Quotes" style="float: right;" onclick="parent.location=\'quotes-upload.pl\'"/>');
     });
 
         function fnClickAddQuote() {
diff --git a/koha-tmpl/intranet-tmpl/prog/img/x_alt_16x16.png b/koha-tmpl/intranet-tmpl/prog/img/x_alt_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..a99310e42eb61377703e8a2564fb7c88191ccb3e
GIT binary patch
literal 215
zcmeAS at N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XDm`5sLn>}1B^+Skbl4-`@qh8dzX6tW92h&!CtvL7JMVlo
zDWlH6B~7BPKkr1PkcskcmUrnTm!&skWE^<pRWRet at kIi66Cxg%CU8cqIp^(Qq{7(l
zohY$fUiiWyvDH>;Y+4LmdmRcDf at FF{)Kylgq;?q#- at GZQaDc&4dBx&a%xew<9l_w~
L>gTe~DWM4fy}3+!

literal 0
HcmV?d00001

diff --git a/tools/quotes-upload.pl b/tools/quotes-upload.pl
new file mode 100755
index 0000000..7db61ce
--- /dev/null
+++ b/tools/quotes-upload.pl
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+
+# Copyright 2012 Foundations Bible College Inc.
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+
+use CGI;
+use autouse 'Data::Dumper' => qw(Dumper);
+
+use C4::Auth;
+use C4::Koha;
+use C4::Context;
+use C4::Output;
+
+my $cgi = new CGI;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "tools/quotes-upload.tt",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { tools => 'edit_quotes' },
+        debug           => 1,
+    }
+);
+
+output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/tools/quotes/quotes-upload_ajax.pl b/tools/quotes/quotes-upload_ajax.pl
new file mode 100755
index 0000000..f1c3746
--- /dev/null
+++ b/tools/quotes/quotes-upload_ajax.pl
@@ -0,0 +1,68 @@
+#!/usr/bin/perl
+
+# Copyright 2012 Foundations Bible College Inc.
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+
+use CGI;
+use JSON;
+use autouse 'Data::Dumper' => qw(Dumper);
+
+use C4::Auth;
+use C4::Koha;
+use C4::Context;
+use C4::Output;
+
+my $cgi = new CGI;
+my $dbh = C4::Context->dbh;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { tools => 'edit_quotes' },
+        debug           => 1,
+    }
+);
+
+my $success = 'true';
+
+my $quotes = decode_json($cgi->param('quote'));
+my $action = $cgi->param('action');
+
+my $sth = $dbh->prepare('INSERT INTO quotes (source, text) VALUES (?, ?);');
+
+my $insert_count = 0;
+
+foreach my $quote (@$quotes) {
+    $insert_count++ if $sth->execute($quote->[0], $quote->[1]);
+    if ($sth->err) {
+        warn sprintf('Database returned the following error: %s', $sth->errstr);
+        $success = 'false';
+    }
+}
+
+print $cgi->header('application/json');
+
+print to_json({
+                success => $success,
+                records => $insert_count,
+});
-- 
1.7.0.4


From cnighswonger at foundations.edu  Fri Apr 27 21:26:10 2012
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 27 Apr 2012 15:26:10 -0400
Subject: [Koha-patches] [PATCH 7/7] Misc UI improvements to both the QOTD
	editor and uploader
In-Reply-To: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
References: <1335554770-15052-1-git-send-email-cnighswonger@foundations.edu>
Message-ID: <1335554770-15052-7-git-send-email-cnighswonger@foundations.edu>

---
 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css |    9 +++++
 koha-tmpl/intranet-tmpl/prog/en/css/uploader.css   |   19 +++++++++--
 .../prog/en/modules/tools/quotes-upload.tt         |   33 +++++++++++--------
 .../intranet-tmpl/prog/en/modules/tools/quotes.tt  |   19 ++++++++---
 4 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
index 2a78678..ad97a48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css
@@ -191,6 +191,15 @@ div.dataTables_paginate.paging_four_button {
     width: 250px;
 }
 
+.delete, .save, .cancel {
+    border-radius: 5px;
+    margin: 1px;
+}
+
+input {
+    border-radius: 5px;
+}
+
 /*
 table.display {
     width: 100%;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css b/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css
index eca87b9..e747255 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css
@@ -10,12 +10,13 @@
   -webkit-transition: opacity 1s linear;
 }
 #progress_bar.loading {
-  opacity: 1.0;
+    opacity: 1.0;
 }
 #progress_bar .percent {
-  background-color: #99ccff;
-  height: auto;
-  width: 0;
+    color: #E6F0F2;
+    background-color: #004D99;
+    height: auto;
+    width: 0;
 }
 #server_response {
     background-color: white;
@@ -36,3 +37,13 @@
     top: 50%;
     width: 250px;
 }
+
+#file_uploader {
+    position: relative;
+    top: -24px;
+}
+
+#file_upload {
+    position: relative;
+    top: -1px;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
index 05fac8b..b0a181a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt
@@ -134,14 +134,14 @@
         for(var i=0; i<aaData.length; i++) {
             aaData[i].push('Delete'); //this is hackish FIXME
         }
-        document.getElementById('quotes_editor').style.visibility="visible";
+        document.getElementById('save_quotes').style.visibility="visible";
         document.getElementById('file_uploader').style.visibility="hidden";
+        document.getElementById('quotes_editor').style.visibility="visible";
         oTable = $('#quotes_editor').dataTable( {
             "bAutoWidth"        : false,
             "bPaginate"         : true,
             "bSort"             : false,
             "sPaginationType"   : "full_numbers",
-            "sDom"              : '<"save_quotes">frtip',
             "aaData"            : aaData,
             "aoColumns"         : [
                 {
@@ -162,7 +162,6 @@
             },
             "fnRowCallback": function( nRow, aData, iDisplayIndex ) {
                 noEditFields = [2]; /* action */
-                /* console.log('Quote ID: '+quoteID); */
                 /* do foo on various cells in the current row */
                 $('td:eq(2)', nRow).html('<input type="button" class="delete" value="Delete" onclick="fnClickDeleteRow(this.parentNode);" />');
                 /* apply no_edit id to noEditFields */
@@ -184,9 +183,9 @@
                                       },
                     "height"        : "14px",
                 });
-                $("div.save_quotes").html('<input type="button" class="add_quote_button" value="Save Quotes" style="float: right;" onclick="fnGetData(document.getElementById(\'quotes_editor\'));"/>');
            },
         });
+        document.getElementById('footer').style.visibility="visible";
     }
 
     function fnHandleFileSelect(evt) {
@@ -201,13 +200,14 @@
             alert('File read cancelled');
         };
         reader.onloadstart = function(e) {
+            document.getElementById('cancel_upload').style.visibility="visible";
             document.getElementById('progress_bar').className = 'loading';
         };
         reader.onload = function(e) {
             // Ensure that the progress bar displays 100% at the end.
             progress.style.width = '100%';
             progress.textContent = '100%';
-            setTimeout("document.getElementById('progress_bar').className='';", 2000);
+            document.getElementById('cancel_upload').style.visibility="hidden";
             quotes = fnCSVToArray(e.target.result, ',');
             fnDataTable(quotes);
         }
@@ -215,7 +215,8 @@
         reader.readAsText(evt.target.files[0]);
     }
 
-    document.getElementById('files').addEventListener('change', fnHandleFileSelect, false);
+    //document.getElementById('file_upload').addEventListener('change', fnHandleFileSelect, false);
+    $('#file_upload').one('change', fnHandleFileSelect);
 
     });
 
@@ -264,11 +265,16 @@
     <div id="bd">
         <div id="yui-main">
             <div class="yui-b">
-
-                <div id="file_uploader" style="float: left; width: 100%; visibility:visible;">
-                    <input type="file" id="files" name="file" />
-                    <button onclick="fnAbortRead();">Cancel Upload</button>
-                    <div id="progress_bar"><div class="percent">0%</div></div>
+                <div id="toolbar" style="height:61px;">
+                    <div id="save_quotes" style="visibility:hidden;">
+                        <input type="button" class="add_quote_button" value="Save Quotes" style="border-radius: 5px;" onclick="fnGetData(document.getElementById(\'quotes_editor\'));"/>
+                        <span class="hint">Click on any field to edit contents</span>
+                    </div>
+                    <div id="file_uploader" class="file_uploader" style="visibility:visible;">
+                        <input id="file_upload" type="file" name="file" />
+                        <button id="cancel_upload" style="visibility:hidden;" onclick="fnAbortRead();">Cancel Upload</button>
+                        <div id="progress_bar"><div class="percent">0%</div></div>
+                    </div>
                 </div>
                 <div id="server_response" onclick='fnResetUpload()'>Server Response</div>
                 <table id="quotes_editor" style="float: left; width: 100%; visibility:hidden;">
@@ -288,9 +294,8 @@
                     </tr>
                 </tbody>
                 </table>
-
-
-
+                <fieldset id="footer" class="action" style="visibility:hidden; height:25px">
+                </fieldset>
             </div>
         </div>
     <div class="yui-b noprint">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
index a5c87e4..8e14e7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
@@ -21,12 +21,11 @@
                     "sAjaxSource"       : "/cgi-bin/koha/tools/quotes/quotes_ajax.pl",
                     "aoColumns"         : [
                                             { "sWidth": "3%"  },
-                                            { "sWidth": "12%" },
+                                            { "sWidth": "11%" },
                                             { "sWidth": "65%" },
                                             { "sWidth": "10%" },
-                                            { "sWidth": "10%" },
+                                            { "sWidth": "11%" },
                                           ],
-                   "sDom"               : '<"add_quote">frtip',
                    "oLanguage"          : {
                                             "sEmptyTable": sEmptyTable,
                                           },
@@ -64,7 +63,6 @@
                         });
                    },
         });
-        $("div.add_quote").html('<input type="button" class="add_quote_button" value="Add Quote" style="float: right;" onclick="fnClickAddRow();"/><input type="button" class="import_quote_button" value="Import Quotes" style="float: right;" onclick="parent.location=\'quotes-upload.pl\'"/>');
     });
 
         function fnClickAddQuote() {
@@ -155,7 +153,16 @@
     <div id="bd">
         <div id="yui-main">
             <div class="yui-b">
-                <table id="quotes_editor" style="float: left; width: 100%">
+                <div id="toolbar">
+                <ul class="toolbar">
+                <li>
+                    <input type="button" class="add_quote_button" value="Add Quote" style="border-radius: 5px;" onclick="fnClickAddRow();"/>
+                    <input type="button" class="import_quote_button" value="Import Quotes" style="border-radius: 5px;" onclick="parent.location='quotes-upload.pl'"/>
+                    <span class="hint" style="">Click Source or Text field to edit contents</span>
+                </li>
+                </ul>
+                </div>
+                <table id="quotes_editor" style="float: left; width: 100%;">
                 <thead>
                     <tr>
                         <th>ID</th>
@@ -176,6 +183,8 @@
                     </tr>
                 </tbody>
                 </table>
+                <fieldset id="footer" class="action" style="height:25px;">
+                </fieldset>
             </div>
         </div>
     <div class="yui-b noprint">
-- 
1.7.0.4


From robin at catalyst.net.nz  Sat Apr 28 02:28:32 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Sat, 28 Apr 2012 12:28:32 +1200
Subject: [Koha-patches] [PATCH] Bug 8020 [3.8.x/MASTER] - update changelogs
	to get to 3.8
Message-ID: <1335572912-22413-1-git-send-email-robin@catalyst.net.nz>

---
 debian/changelog |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb5fed4..ad73bdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+koha (3.6.4-1) squeeze; urgency=low
+
+  * New upstream release (3.06.04) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Wed, 07 Mar 2012 18:06:04 +1300
+
+koha (3.6.3-1) squeeze; urgency=low
+
+  * New upstream release (3.06.03) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Wed, 01 Feb 2012 17:01:36 +1300
+
+koha (3.6.2-1) squeeze; urgency=low
+
+  * New upstream release (3.06.02) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Wed, 11 Jan 2012 17:08:55 +1300
+
+koha (3.6.1-1) squeeze; urgency=high
+
+  * New upstream release (3.06.01)
+  * This is a security release, see
+    http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6628
+    http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6629
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Fri, 02 Dec 2011 15:31:47 +1300
+
+koha (3.6.0-1) squeeze; urgency=low
+
+  * New major upstream release (3.06.00) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Wed, 26 Oct 2011 15:56:46 +1300
+
 koha (3.4.5-1) squeeze; urgency=low
 
   * New upstream release (3.04.05) 
-- 
1.7.5.4


From robin at catalyst.net.nz  Sat Apr 28 02:41:25 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Sat, 28 Apr 2012 12:41:25 +1200
Subject: [Koha-patches] [PATCH] Bug 8020 - [3.8.x] Update changelog for
	3.8.0-1
Message-ID: <1335573685-22589-1-git-send-email-robin@catalyst.net.nz>

---
 debian/changelog |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad73bdb..18faf09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+koha (3.8.0-1) squeeze; urgency=low
+
+  * New major upstream release (3.08.00) 
+
+ -- Robin Sheat <robin at catalyst.net.nz>  Sat, 28 Apr 2012 12:39:17 +1200
+
 koha (3.6.4-1) squeeze; urgency=low
 
   * New upstream release (3.06.04) 
-- 
1.7.5.4


From robin at catalyst.net.nz  Sat Apr 28 03:14:40 2012
From: robin at catalyst.net.nz (Robin Sheat)
Date: Sat, 28 Apr 2012 13:14:40 +1200
Subject: [Koha-patches] [PATCH] Bug 8020 [3.8.x/MASTER] - update git build
	script to 3.9
Message-ID: <1335575680-23221-1-git-send-email-robin@catalyst.net.nz>

---
 debian/build-git-snapshot |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot
index 462d19b..b05df0d 100755
--- a/debian/build-git-snapshot
+++ b/debian/build-git-snapshot
@@ -30,7 +30,7 @@ use POSIX qw/strftime/;
 my $buildresult;
 my $distribution='squeeze-dev';
 my $git_checks='all';
-my $version='3.7-1~git';
+my $version='3.9-1~git';
 my $auto_version=1;
 my $need_help;
 my $debug;
-- 
1.7.5.4


From adrien.saurat at biblibre.com  Mon Apr 30 10:06:42 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Mon, 30 Apr 2012 10:06:42 +0200
Subject: [Koha-patches] [PATCH] Bug 8025: corrects the return of a zero
	value for authorised values
Message-ID: <1335773202-3628-1-git-send-email-adrien.saurat@biblibre.com>

---
 C4/Koha.pm |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 0192989..a028937 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1008,22 +1008,25 @@ C<$opac> If set to a true value, displays OPAC descriptions rather than normal o
 
 sub GetAuthorisedValues {
     my ($category,$selected,$opac) = @_;
-	my @results;
+    my @results;
     my $dbh      = C4::Context->dbh;
     my $query    = "SELECT * FROM authorised_values";
     $query .= " WHERE category = '" . $category . "'" if $category;
     $query .= " ORDER BY category, lib, lib_opac";
     my $sth = $dbh->prepare($query);
     $sth->execute;
-	while (my $data=$sth->fetchrow_hashref) {
-	    if ($selected && $selected eq $data->{'authorised_value'} ) {
-		    $data->{'selected'} = 1;
-	    }
-	    if ($opac && $data->{'lib_opac'}) {
-		$data->{'lib'} = $data->{'lib_opac'};
-	    }
-	    push @results, $data;
-	}
+    while (my $data=$sth->fetchrow_hashref) {
+        if ( (defined($selected)) && ($selected eq $data->{'authorised_value'}) ) {
+            $data->{'selected'} = 1;
+        }
+        else {
+            $data->{'selected'} = 0;
+        }
+        if ($opac && $data->{'lib_opac'}) {
+            $data->{'lib'} = $data->{'lib_opac'};
+        }
+        push @results, $data;
+    }
     #my $data = $sth->fetchall_arrayref({});
     return \@results; #$data;
 }
-- 
1.7.4.1


From adrien.saurat at biblibre.com  Mon Apr 30 12:15:37 2012
From: adrien.saurat at biblibre.com (Adrien Saurat)
Date: Mon, 30 Apr 2012 12:15:37 +0200
Subject: [Koha-patches] [PATCH] Bug 8207: fix param order for z3950 INSERT
Message-ID: <1335780937-4928-1-git-send-email-adrien.saurat@biblibre.com>

---
 admin/z3950servers.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index 14603f6..3bc0ef2 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -141,8 +141,8 @@ if ($op eq 'add_form') {
             $checked,
             $input->param( 'rank' ),
             $input->param( 'syntax' ),
-            $input->param( 'timeout' ),
-            $input->param( 'encoding' ) );
+            $input->param( 'encoding' ),
+            $input->param( 'timeout' ) );
 	}
 	$sth->finish;
 													# END $OP eq ADD_VALIDATE
-- 
1.7.4.1


From magnus at enger.priv.no  Mon Apr 30 13:56:23 2012
From: magnus at enger.priv.no (Magnus Enger)
Date: Mon, 30 Apr 2012 13:56:23 +0200
Subject: [Koha-patches] [PATCH] Bug 7924 - Fix handling of command line
	arguments in koha-remove
Message-ID: <1335786983-1819-1-git-send-email-magnus@enger.priv.no>

koha-remove would fail with a message like this:
Removing Koha instance --
ERROR 1396 (HY000) at line 1: Operation DROP USER failed for 'koha_--'@'%'

After fixing this, the --keep-mysql option made the script exit without doing
anything.

To test:

Alt 1
- Build package with build-git-snapshot
- Install package

Alt 2
- Replicate the changes in the patch in an existing installation

Then:
- Add instance1 and instance2
- koha-remove instance1
-- Check that script completes and the databse is gone
- koha-remove --keep-mysql instance2
-- Check that the script completes but the database is not removed
---
 debian/scripts/koha-remove |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index 09720ea..567ead8 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -20,17 +20,17 @@
 set -e
 
 args=$(getopt -l keep-mysql -o k -n $0 -- "$@")
-set -- $args
+eval set -- $args
 while [ ! -z "$1" ]
 do
     case "$1" in
-         -k|--keep-mysql) keepmysql=1; exit;;
+         -k|--keep-mysql) keepmysql=1; shift;;
+         --) shift; break;;
           *) break;;
     esac
     shift
 done
 
-
 for name in "$@"
 do
     echo "Removing Koha instance $name"
-- 
1.7.2.5


From oleonard at myacpl.org  Mon Apr 30 14:53:18 2012
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 30 Apr 2012 08:53:18 -0400
Subject: [Koha-patches] [PATCH] Bug 7747 - Replace YUI autocomplete with
	jQueryUI
Message-ID: <CAO4qe2MZZdU6LJnkoiMyRpEbzR3aaJ07H56z=HTGicBDXdgQpg@mail.gmail.com>

Patch attached because of long lines.

In order to facilitate a more painless process for converting
to jQueryUI I will submit separate patches for various "widgets,"
starting with Autocomplete.

This patch replaces all instances of YUI autocomplete with
a jQueryUI version. The patch includes an up-to-date version
of jQuery and jQueryUI libraries.

The patch also moves some markup in instances where it should
have been removed in favor of a different include.

To test, find the various autocomplete instances and confirm
that they are working:

 - Circulation search header autocomplete
 - Overdues patron attribute authorized value filter (must
   have patron attributes enabled, and a patron attribute
   defined which uses authorized values.
 - Authorities search plugin. Edit a MARC record and use
   an authorities plugin link to do a search for authority
   records.

Incomplete: There is a YUI autocomplete instance in a UNIMARC
plugin (unimarc_field_210c_bis.tt) which I couldn't figure out
how to test, even on a sandbox set up with UNIMARC. I could use
help with a follow-up.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-7747-Replace-YUI-autocomplete-with-jQueryUI.patch
Type: application/octet-stream
Size: 291307 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20120430/ff2a5343/attachment-0001.obj>

From kyle at bywatersolutions.com  Tue Apr 17 14:07:32 2012
From: kyle at bywatersolutions.com (Kyle M Hall)
Date: Tue, 17 Apr 2012 08:07:32 -0400
Subject: [PATCH] [SIGNED-OFF] Bug 8215 - Course Reserves
Message-ID: <mailman.68.1347313302.15477.koha-patches@lists.koha-community.org>

Adds a course reserves system for academic libraries.

The course reserves system allows libraries to create courses
and put items on reserves for those courses.

Each item with at least one reserve can have some of its attributes
modified while it is on reserve for at least one active course.
These attributes include item type, collection code, shelving location,
and holding library. If there are no active courses with this item
on reserve, it's attributes will revert to the original attributes
it had before going on reserve.

Testing Scenario:
  1) Create new authorised value categories DEPARTMENT and TERM
  2) Create a new course, add instructors to that course.
  3) Reserve items for that course, verify item attributes have changed.
  4) Disable course, verify item attributes have reverted.
  5) Enable course again, verify item attributes again.
  6) Delete course, verify item attributes again.
  7) Create two new courses, add the same item(s) to both courses.
  8) Disable one course, verify item attributes have not reverted.
  9) Disable both courses, verify item attributes have reverted.
 10) Enable one course, verify item attributes are again set to the
     new values.
 11) Edit reserve item attributes, verify.
 12) Disable all courses, edit reserve item attributes, verify
     the item itself still has its original attributes, verify
     the reserve item attributes have been updated.
 13) Verify the ability to remove instructors from a course.
 14) Verify new permissions, top level coursereserves, with
     subpermissions add_reserves and delete_reserves.

Bug 8215 - Add Course Reserves - Followup - Fix DB Updater & Makefile

Bug 8215 - Add Course Reserves - Followup - Hide disabled course reserves on catalog details page.

Bug 8215 - Add Course Reserves - Followup - One Hit Searching Bugfix

When searching courses, a search that results in a single hit will
automatically forward to the details for that course. If only a single
course has been added to the system, Koha will always forward to that
course and there will be no way to get to course-reserves.pl to add
a second course!

Fixed by testing for an actual search, rather than looking only at
the number of hits returned.

 Bug 8215 - Add Course Reserves - Followup - Prevent submitting form on 'enter'

When using the instructor search, hitting enter will attempt to submit the form.
This is unwanted behavior. Fixed by adding some jquery, such that any form field
with the class "noEnterSubmit" will but trigger a form submission. This class
can be used on any form in the librarian interface to prevent a field from triggering
a form submission via the enter key.

Bug 8215 - Course Reserves - Followup - Remove checkEnter() and reimplement with noEnterSubmit class

 Bug 8215 - Course Reserves - Followup - Fix permissions typos

Signed-off-by: wajasu <matted-34813 at mypacks.net>
---
 C4/Auth.pm                                         |    4 +-
 C4/Koha.pm                                         |   25 +-
 Koha/CourseReserves.pm                             | 1116 ++++++++++++++++++++
 Koha/Template/Plugin/AuthorisedValues.pm           |   32 +
 Koha/Template/Plugin/Branches.pm                   |   37 +
 Koha/Template/Plugin/ItemTypes.pm                  |   38 +
 Makefile.PL                                        |    1 +
 catalogue/detail.pl                                |    6 +
 course_reserves/add_items.pl                       |   94 ++
 course_reserves/course-details.pl                  |   67 ++
 course_reserves/course-reserves.pl                 |   54 +
 course_reserves/course.pl                          |   57 +
 course_reserves/mod_course.pl                      |   76 ++
 installer/data/mysql/en/mandatory/userflags.sql    |    1 +
 .../data/mysql/en/mandatory/userpermissions.sql    |    5 +-
 installer/data/mysql/kohastructure.sql             |   63 ++
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   72 ++
 .../intranet-tmpl/prog/en/css/staff-global.css     |    2 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    3 +
 .../intranet-tmpl/prog/en/includes/mainmenu.inc    |    3 +
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |   29 +-
 .../en/modules/admin/preferences/circulation.pref  |    7 +
 .../prog/en/modules/catalogue/detail.tt            |   34 +
 .../prog/en/modules/cataloguing/additem.tt         |    2 +-
 .../en/modules/course_reserves/add_items-step1.tt  |   63 ++
 .../en/modules/course_reserves/add_items-step2.tt  |  131 +++
 .../en/modules/course_reserves/course-details.tt   |  183 ++++
 .../en/modules/course_reserves/course-reserves.tt  |  104 ++
 .../prog/en/modules/course_reserves/course.tt      |  197 ++++
 .../prog/en/modules/members/mancredit.tt           |    2 +-
 .../prog/en/modules/members/maninvoice.tt          |    2 +-
 .../prog/en/modules/members/memberentrygen.tt      |    2 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    1 +
 .../prog/en/modules/opac-course-details.tt         |   63 ++
 .../prog/en/modules/opac-course-reserves.tt        |   62 ++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   32 +
 opac/opac-course-details.pl                        |   60 ++
 opac/opac-course-reserves.pl                       |   51 +
 opac/opac-detail.pl                                |    7 +
 40 files changed, 2758 insertions(+), 31 deletions(-)
 create mode 100644 Koha/CourseReserves.pm
 create mode 100644 Koha/Template/Plugin/AuthorisedValues.pm
 create mode 100644 Koha/Template/Plugin/Branches.pm
 create mode 100644 Koha/Template/Plugin/ItemTypes.pm
 create mode 100755 course_reserves/add_items.pl
 create mode 100755 course_reserves/course-details.pl
 create mode 100755 course_reserves/course-reserves.pl
 create mode 100755 course_reserves/course.pl
 create mode 100755 course_reserves/mod_course.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
 create mode 100755 opac/opac-course-details.pl
 create mode 100755 opac/opac-course-reserves.pl

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 59c9955..f04ee28 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -194,7 +194,7 @@ sub get_template_and_user {
             $template->param( CAN_user_reserveforothers => 1 );
             $template->param( CAN_user_borrow           => 1 );
             $template->param( CAN_user_editcatalogue    => 1 );
-            $template->param( CAN_user_updatecharges     => 1 );
+            $template->param( CAN_user_updatecharges    => 1 );
             $template->param( CAN_user_acquisition      => 1 );
             $template->param( CAN_user_management       => 1 );
             $template->param( CAN_user_tools            => 1 );
@@ -202,6 +202,7 @@ sub get_template_and_user {
             $template->param( CAN_user_serials          => 1 );
             $template->param( CAN_user_reports          => 1 );
             $template->param( CAN_user_staffaccess      => 1 );
+            $template->param( CAN_user_coursereserves   => 1 );
             foreach my $module (keys %$all_perms) {
                 foreach my $subperm (keys %{ $all_perms->{$module} }) {
                     $template->param( "CAN_user_${module}_${subperm}" => 1 );
@@ -330,6 +331,7 @@ sub get_template_and_user {
             using_https                  => $in->{'query'}->https() ? 1 : 0,
             noItemTypeImages             => C4::Context->preference("noItemTypeImages"),
             marcflavour                  => C4::Context->preference("marcflavour"),
+            UseCourseReserves            => C4::Context->preference("UseCourseReserves"),
     );
 
     if ( $in->{'type'} eq "intranet" ) {
diff --git a/C4/Koha.pm b/C4/Koha.pm
index 26106cf..c20a670 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -41,6 +41,7 @@ BEGIN {
 		&subfield_is_koha_internal_p
 		&GetPrinters &GetPrinter
 		&GetItemTypes &getitemtypeinfo
+		&GetItemTypesFlat
 		&GetCcodes
 		&GetSupportName &GetSupportList
 		&get_itemtypeinfos_of
@@ -256,6 +257,15 @@ sub GetItemTypes {
     return ( \%itemtypes );
 }
 
+sub GetItemTypesFlat {
+    my $dbh   = C4::Context->dbh;
+    my $query = "SELECT * FROM itemtypes ORDER BY description";
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+
+    return $sth->fetchall_arrayref({});
+}
+
 sub get_itemtypeinfos_of {
     my @itemtypes = @_;
 
@@ -1066,7 +1076,7 @@ sub GetAuthorisedValueCategories {
 
 =head2 GetAuthorisedValueByCode
 
-$authhorised_value = GetAuthorisedValueByCode( $category, $authvalcode );
+$authorised_value = GetAuthorisedValueByCode( $category, $authvalcode, $opac );
 
 Return the lib attribute from authorised_values from the row identified
 by the passed category and code
@@ -1074,13 +1084,18 @@ by the passed category and code
 =cut
 
 sub GetAuthorisedValueByCode {
-    my ( $category, $authvalcode ) = @_;
+    my ( $category, $authvalcode, $opac ) = @_;
 
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("SELECT lib FROM authorised_values WHERE category=? AND authorised_value =?");
+    my $sth = $dbh->prepare("SELECT lib, lib_opac FROM authorised_values WHERE category=? AND authorised_value =?");
     $sth->execute( $category, $authvalcode );
-    while ( my $data = $sth->fetchrow_hashref ) {
-        return $data->{'lib'};
+
+    my $row = $sth->fetchrow_hashref();
+
+    if ( $opac ) {
+        return $row->{'lib_opac'} || $row->{'lib'};
+    } else {
+        return $row->{'lib'};
     }
 }
 
diff --git a/Koha/CourseReserves.pm b/Koha/CourseReserves.pm
new file mode 100644
index 0000000..0046b61
--- /dev/null
+++ b/Koha/CourseReserves.pm
@@ -0,0 +1,1116 @@
+package Koha::CourseReserves;
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use Modern::Perl;
+
+require Exporter;
+
+use C4::Context;
+use C4::Items qw(GetItem ModItem);
+use C4::Biblio qw(GetBiblioFromItemNumber);
+use C4::Circulation qw(GetOpenIssue);
+
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG @FIELDS);
+
+BEGIN {
+    @ISA    = qw(Exporter);
+    @EXPORT = qw(
+      &GetCourse
+      &ModCourse
+      &GetCourses
+      &DelCourse
+
+      &GetCourseInstructors
+      &ModCourseInstructors
+
+      &GetCourseItem
+      &ModCourseItem
+
+      &GetCourseReserve
+      &ModCourseReserve
+      &GetCourseReserves
+      &DelCourseReserve
+
+      &SearchCourses
+
+      &GetItemReservesInfo
+    );
+
+    $DEBUG = 0;
+    @FIELDS = ( 'itype', 'ccode', 'holdingbranch', 'location' );
+}
+
+=head1 NAME
+
+Koha::CourseReserves - Koha course reserves module
+
+=head1 SYNOPSIS
+
+use Koha::CourseReserves;
+
+=head1 DESCRIPTION
+
+This module deals with course reserves.
+
+=head1 FUNCTIONS
+
+=head2 GetCourse
+
+    $course = GetCourse( $course_id );
+
+=cut
+
+sub GetCourse {
+    my ($course_id) = @_;
+    warn whoami() . "( $course_id )" if $DEBUG;
+
+    my $query = "SELECT * FROM courses WHERE course_id = ?";
+    my $dbh   = C4::Context->dbh;
+    my $sth   = $dbh->prepare($query);
+    $sth->execute($course_id);
+
+    my $course = $sth->fetchrow_hashref();
+
+    $query = "
+        SELECT b.* FROM course_instructors ci
+        LEFT JOIN borrowers b ON ( ci.borrowernumber = b.borrowernumber )
+        WHERE course_id =  ?
+    ";
+    $sth = $dbh->prepare($query);
+    $sth->execute($course_id);
+    $course->{'instructors'} = $sth->fetchall_arrayref( {} );
+
+    return $course;
+}
+
+=head2 ModCourse
+
+    ModCourse( [ course_id => $id ] [, course_name => $course_name ] [etc...] );
+
+=cut
+
+sub ModCourse {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $dbh = C4::Context->dbh;
+
+    my $course_id;
+    if ( defined $params{'course_id'} ) {
+        $course_id = $params{'course_id'};
+        delete $params{'course_id'};
+    }
+
+    my @query_keys;
+    my @query_values;
+
+    my $query;
+
+    $query .= ($course_id) ? ' UPDATE ' : ' INSERT ';
+    $query .= ' courses SET ';
+
+    foreach my $key ( keys %params ) {
+        push( @query_keys,   "$key=?" );
+        push( @query_values, $params{$key} );
+    }
+    $query .= join( ',', @query_keys );
+
+    if ($course_id) {
+        $query .= " WHERE course_id = ?";
+        push( @query_values, $course_id );
+    }
+
+    $dbh->do( $query, undef, @query_values );
+
+    $course_id = $course_id
+      || $dbh->last_insert_id( undef, undef, 'courses', 'course_id' );
+
+    EnableOrDisableCourseItems(
+        course_id => $course_id,
+        enabled   => $params{'enabled'}
+    );
+
+    return $course_id;
+}
+
+=head2 GetCourses
+
+  @courses = GetCourses( [ fieldname => $value ] [, fieldname2 => $value2 ] [etc...] );
+
+=cut
+
+sub GetCourses {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my @query_keys;
+    my @query_values;
+
+    my $query = "
+        SELECT courses.*
+        FROM courses
+        LEFT JOIN course_reserves ON course_reserves.course_id = courses.course_id
+        LEFT JOIN course_items ON course_items.ci_id = course_reserves.ci_id
+    ";
+
+    if ( keys %params ) {
+
+        $query .= " WHERE ";
+
+        foreach my $key ( keys %params ) {
+            push( @query_keys,   " $key LIKE ? " );
+            push( @query_values, $params{$key} );
+        }
+
+        $query .= join( ' AND ', @query_keys );
+    }
+
+    $query .= " GROUP BY courses.course_id ";
+
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@query_values);
+
+    my $courses = $sth->fetchall_arrayref( {} );
+
+    foreach my $c (@$courses) {
+        $c->{'instructors'} = GetCourseInstructors( $c->{'course_id'} );
+    }
+
+    return $courses;
+}
+
+=head2 DelCourse
+
+  DelCourse( $course_id );
+
+=cut
+
+sub DelCourse {
+    my ($course_id) = @_;
+
+    my $course_reserves = GetCourseReserves( course_id => $course_id );
+
+    foreach my $res (@$course_reserves) {
+        DelCourseReserve( cr_id => $res->{'cr_id'} );
+    }
+
+    my $query = "
+        DELETE FROM courses
+        WHERE course_id = ?
+    ";
+    C4::Context->dbh->do( $query, undef, $course_id );
+}
+
+=head2 EnableOrDisableCourseItems
+
+  EnableOrDisableCourseItems( course_id => $course_id, enabled => $enabled );
+
+  For each item on reserve for this course,
+  if the course item has no active course reserves,
+  swap the fields for the item to make it 'normal'
+  again.
+
+  enabled => 'yes' to enable course items
+  enabled => 'no' to disable course items
+
+=cut
+
+sub EnableOrDisableCourseItems {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $course_id = $params{'course_id'};
+    my $enabled   = $params{'enabled'};
+
+    my $lookfor = ( $enabled eq 'yes' ) ? 'no' : 'yes';
+
+    return unless ( $course_id && $enabled );
+    return unless ( $enabled eq 'yes' || $enabled eq 'no' );
+
+    my $course_reserves = GetCourseReserves( course_id => $course_id );
+
+    if ( $enabled eq 'yes' ) {
+        foreach my $course_reserve (@$course_reserves) {
+            if (
+                CountCourseReservesForItem(
+                    ci_id   => $course_reserve->{'ci_id'},
+                    enabled => 'yes'
+                )
+              )
+            {
+                EnableOrDisableCourseItem(
+                    ci_id   => $course_reserve->{'ci_id'},
+                    enabled => 'yes',
+                );
+            }
+        }
+    }
+    if ( $enabled eq 'no' ) {
+        foreach my $course_reserve (@$course_reserves) {
+            unless (
+                CountCourseReservesForItem(
+                    ci_id   => $course_reserve->{'ci_id'},
+                    enabled => 'yes'
+                )
+              )
+            {
+                EnableOrDisableCourseItem(
+                    ci_id   => $course_reserve->{'ci_id'},
+                    enabled => 'no',
+                );
+            }
+        }
+    }
+}
+
+=head2 EnableOrDisableCourseItem
+
+    EnableOrDisableCourseItem( ci_id => $ci_id, enabled => $enabled );
+
+    enabled => 'yes' to enable course items
+    enabled => 'no' to disable course items
+
+=cut
+
+sub EnableOrDisableCourseItem {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $ci_id   = $params{'ci_id'};
+    my $enabled = $params{'enabled'};
+
+    return unless ( $ci_id && $enabled );
+    return unless ( $enabled eq 'yes' || $enabled eq 'no' );
+
+    my $course_item = GetCourseItem( ci_id => $ci_id );
+
+    ## We don't want to 'enable' an already enabled item,
+    ## or disable and already disabled item,
+    ## as that would cause the fields to swap
+    if ( $course_item->{'enabled'} ne $enabled ) {
+        _SwapAllFields($ci_id);
+
+        my $query = "
+            UPDATE course_items
+            SET enabled = ?
+            WHERE ci_id = ?
+        ";
+
+        C4::Context->dbh->do( $query, undef, $enabled, $ci_id );
+
+    }
+
+}
+
+=head2 GetCourseInstructors
+
+    @borrowernumbers = GetCourseInstructors( $course_id );
+
+=cut
+
+sub GetCourseInstructors {
+    my ($course_id) = @_;
+    warn "Koha::CourseReserves::GetCourseInstructors( $course_id )"
+      if $DEBUG;
+
+    my $query = "
+        SELECT * FROM borrowers
+        RIGHT JOIN course_instructors ON ( course_instructors.borrowernumber = borrowers.borrowernumber )
+        WHERE course_instructors.course_id = ?
+    ";
+
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($course_id);
+
+    return $sth->fetchall_arrayref( {} );
+}
+
+=head2 ModCourseInstructors
+
+    ModCourseInstructors( mode => $mode, course_id => $course_id, [ cardnumbers => $cardnumbers ] OR [ borrowernumbers => $borrowernumbers  );
+
+    $mode can be 'replace', 'add', or 'delete'
+
+    $cardnumbers and $borrowernumbers are both references to arrays
+
+    Use either cardnumbers or borrowernumber, but not both.
+
+=cut
+
+sub ModCourseInstructors {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $course_id       = $params{'course_id'};
+    my $mode            = $params{'mode'};
+    my $cardnumbers     = $params{'cardnumbers'};
+    my $borrowernumbers = $params{'borrowernumbers'};
+
+    return unless ($course_id);
+    return
+      unless ( $mode eq 'replace'
+        || $mode eq 'add'
+        || $mode eq 'delete' );
+    return unless ( $cardnumbers || $borrowernumbers );
+    return if ( $cardnumbers && $borrowernumbers );
+
+    my @cardnumbers = @$cardnumbers if ( ref($cardnumbers) eq 'ARRAY' );
+    my @borrowernumbers = @$borrowernumbers
+      if ( ref($borrowernumbers) eq 'ARRAY' );
+
+    my $field  = (@cardnumbers) ? 'cardnumber' : 'borrowernumber';
+    my @fields = (@cardnumbers) ? @cardnumbers : @borrowernumbers;
+    my $placeholders = join( ',', ('?') x scalar @fields );
+
+    my $dbh = C4::Context->dbh;
+
+    $dbh->do( "DELETE FROM course_instructors WHERE course_id = ?",
+        undef, $course_id )
+      if ( $mode eq 'replace' );
+
+    my $query;
+
+    if ( $mode eq 'add' || $mode eq 'replace' ) {
+        $query = "
+            INSERT INTO course_instructors ( course_id, borrowernumber )
+            SELECT ?, borrowernumber
+            FROM borrowers
+            WHERE $field IN ( $placeholders )
+        ";
+    }
+    else {
+        $query = "
+            DELETE FROM course_instructors
+            WHERE course_id = ?
+            AND borrowernumber IN (
+                SELECT borrowernumber FROM borrowers WHERE $field IN ( $placeholders )
+            )
+        ";
+    }
+
+    my $sth = $dbh->prepare($query);
+
+    $sth->execute( $course_id, @fields ) if (@fields);
+}
+
+=head2 GetCourseItem {
+
+  $course_item = GetCourseItem( itemnumber => $itemnumber [, ci_id => $ci_id );
+
+=cut
+
+sub GetCourseItem {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $ci_id      = $params{'ci_id'};
+    my $itemnumber = $params{'itemnumber'};
+
+    return unless ( $itemnumber || $ci_id );
+
+    my $field = ($itemnumber) ? 'itemnumber' : 'ci_id';
+    my $value = ($itemnumber) ? $itemnumber  : $ci_id;
+
+    my $query = "SELECT * FROM course_items WHERE $field = ?";
+    my $dbh   = C4::Context->dbh;
+    my $sth   = $dbh->prepare($query);
+    $sth->execute($value);
+
+    my $course_item = $sth->fetchrow_hashref();
+
+    if ($course_item) {
+        $query = "SELECT * FROM course_reserves WHERE ci_id = ?";
+        $sth   = $dbh->prepare($query);
+        $sth->execute( $course_item->{'ci_id'} );
+        my $course_reserves = $sth->fetchall_arrayref( {} );
+
+        $course_item->{'course_reserves'} = $course_reserves
+          if ($course_reserves);
+    }
+    return $course_item;
+}
+
+=head2 ModCourseItem {
+
+  ModCourseItem( %params );
+
+  Creates or modifies an existing course item.
+
+=cut
+
+sub ModCourseItem {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $itemnumber    = $params{'itemnumber'};
+    my $itype         = $params{'itype'};
+    my $ccode         = $params{'ccode'};
+    my $holdingbranch = $params{'holdingbranch'};
+    my $location      = $params{'location'};
+
+    return unless ($itemnumber);
+
+    my $course_item = GetCourseItem( itemnumber => $itemnumber );
+
+    my $ci_id;
+
+    if ($course_item) {
+        $ci_id = $course_item->{'ci_id'};
+
+        _UpdateCourseItem(
+            ci_id       => $ci_id,
+            course_item => $course_item,
+            %params
+        );
+    }
+    else {
+        $ci_id = _AddCourseItem(%params);
+    }
+
+    return $ci_id;
+
+}
+
+=head2 _AddCourseItem
+
+    my $ci_id = _AddCourseItem( %params );
+
+=cut
+
+sub _AddCourseItem {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my ( @fields, @values );
+
+    push( @fields, 'itemnumber = ?' );
+    push( @values, $params{'itemnumber'} );
+
+    foreach (@FIELDS) {
+        if ( $params{$_} ) {
+            push( @fields, "$_ = ?" );
+            push( @values, $params{$_} );
+        }
+    }
+
+    my $query = "INSERT INTO course_items SET " . join( ',', @fields );
+    my $dbh = C4::Context->dbh;
+    $dbh->do( $query, undef, @values );
+
+    my $ci_id = $dbh->last_insert_id( undef, undef, 'course_items', 'ci_id' );
+
+    return $ci_id;
+}
+
+=head2 _UpdateCourseItem
+
+  _UpdateCourseItem( %params );
+
+=cut
+
+sub _UpdateCourseItem {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $ci_id         = $params{'ci_id'};
+    my $course_item   = $params{'course_item'};
+    my $itype         = $params{'itype'};
+    my $ccode         = $params{'ccode'};
+    my $holdingbranch = $params{'holdingbranch'};
+    my $location      = $params{'location'};
+
+    return unless ( $ci_id || $course_item );
+
+    $course_item = GetCourseItem( ci_id => $ci_id )
+      unless ($course_item);
+    $ci_id = $course_item->{'ci_id'} unless ($ci_id);
+
+    ## Revert fields that had an 'original' value, but now don't
+    ## Update the item fields to the stored values from course_items
+    ## and then set those fields in course_items to NULL
+    my @fields_to_revert;
+    foreach (@FIELDS) {
+        if ( !$params{$_} && $course_item->{$_} ) {
+            push( @fields_to_revert, $_ );
+        }
+    }
+    _RevertFields(
+        ci_id       => $ci_id,
+        fields      => \@fields_to_revert,
+        course_item => $course_item
+    ) if (@fields_to_revert);
+
+    ## Update fields that still have an original value, but it has changed
+    ## This necessitates only changing the current item values, as we still
+    ## have the original values stored in course_items
+    my %mod_params;
+    foreach (@FIELDS) {
+        if (   $params{$_}
+            && $course_item->{$_}
+            && $params{$_} ne $course_item->{$_} )
+        {
+            $mod_params{$_} = $params{$_};
+        }
+    }
+    ModItem( \%mod_params, undef, $course_item->{'itemnumber'} );
+
+    ## Update fields that didn't have an original value, but now do
+    ## We must save the original value in course_items, and also
+    ## update the item fields to the new value
+    my $item = GetItem( $course_item->{'itemnumber'} );
+    my %mod_params_new;
+    my %mod_params_old;
+    foreach (@FIELDS) {
+        if ( $params{$_} && !$course_item->{$_} ) {
+            $mod_params_new{$_} = $params{$_};
+            $mod_params_old{$_} = $item->{$_};
+        }
+    }
+    _ModStoredFields( 'ci_id' => $params{'ci_id'}, %mod_params_old );
+    ModItem( \%mod_params_new, undef, $course_item->{'itemnumber'} );
+
+}
+
+=head2 _ModStoredFields
+
+    _ModStoredFields( %params );
+
+    Updates the values for the 'original' fields in course_items
+    for a given ci_id
+
+=cut
+
+sub _ModStoredFields {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    return unless ( $params{'ci_id'} );
+
+    my ( @fields_to_update, @values_to_update );
+
+    foreach (@FIELDS) {
+        if ( $params{$_} ) {
+            push( @fields_to_update, $_ );
+            push( @values_to_update, $params{$_} );
+        }
+    }
+
+    my $query =
+        "UPDATE course_items SET "
+      . join( ',', map { "$_=?" } @fields_to_update )
+      . " WHERE ci_id = ?";
+
+    C4::Context->dbh->do( $query, undef, @values_to_update, $params{'ci_id'} )
+      if (@values_to_update);
+
+}
+
+=head2 _RevertFields
+
+    _RevertFields( ci_id => $ci_id, fields => \@fields_to_revert );
+
+=cut
+
+sub _RevertFields {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $ci_id       = $params{'ci_id'};
+    my $course_item = $params{'course_item'};
+    my $fields      = $params{'fields'};
+    my @fields      = @$fields;
+
+    return unless ($ci_id);
+
+    $course_item = GetCourseItem( ci_id => $params{'ci_id'} )
+      unless ($course_item);
+
+    my $mod_item_params;
+    my @fields_to_null;
+    foreach my $field (@fields) {
+        foreach (@FIELDS) {
+            if ( $field eq $_ && $course_item->{$_} ) {
+                $mod_item_params->{$_} = $course_item->{$_};
+                push( @fields_to_null, $_ );
+            }
+        }
+    }
+    ModItem( $mod_item_params, undef, $course_item->{'itemnumber'} );
+
+    my $query =
+        "UPDATE course_items SET "
+      . join( ',', map { "$_=NULL" } @fields_to_null )
+      . " WHERE ci_id = ?";
+
+    C4::Context->dbh->do( $query, undef, $ci_id ) if (@fields_to_null);
+}
+
+=head2 _SwapAllFields
+
+    _SwapAllFields( $ci_id );
+
+=cut
+
+sub _SwapAllFields {
+    my ($ci_id) = @_;
+    warn "Koha::CourseReserves::_SwapFields( $ci_id )" if $DEBUG;
+
+    my $course_item = GetCourseItem( ci_id => $ci_id );
+    my $item = GetItem( $course_item->{'itemnumber'} );
+
+    my %course_item_fields;
+    my %item_fields;
+    foreach (@FIELDS) {
+        if ( $course_item->{$_} ) {
+            $course_item_fields{$_} = $course_item->{$_};
+            $item_fields{$_}        = $item->{$_};
+        }
+    }
+
+    ModItem( \%course_item_fields, undef, $course_item->{'itemnumber'} );
+    _ModStoredFields( %item_fields, ci_id => $ci_id );
+}
+
+=head2 GetCourseItems {
+
+  $course_items = GetCourseItems(
+      [course_id => $course_id]
+      [, itemnumber => $itemnumber ]
+  );
+
+=cut
+
+sub GetCourseItems {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $course_id  = $params{'course_id'};
+    my $itemnumber = $params{'itemnumber'};
+
+    return unless ($course_id);
+
+    my @query_keys;
+    my @query_values;
+
+    my $query = "SELECT * FROM course_items";
+
+    if ( keys %params ) {
+
+        $query .= " WHERE ";
+
+        foreach my $key ( keys %params ) {
+            push( @query_keys,   " $key LIKE ? " );
+            push( @query_values, $params{$key} );
+        }
+
+        $query .= join( ' AND ', @query_keys );
+    }
+
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@query_values);
+
+    return $sth->fetchall_arrayref( {} );
+}
+
+=head2 DelCourseItem {
+
+  DelCourseItem( ci_id => $cr_id );
+
+=cut
+
+sub DelCourseItem {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $ci_id = $params{'ci_id'};
+
+    return unless ($ci_id);
+
+    _RevertFields( ci_id => $ci_id, fields => \@FIELDS );
+
+    my $query = "
+        DELETE FROM course_items
+        WHERE ci_id = ?
+    ";
+    C4::Context->dbh->do( $query, undef, $ci_id );
+}
+
+=head2 GetCourseReserve {
+
+  $course_item = GetCourseReserve( %params );
+
+=cut
+
+sub GetCourseReserve {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $cr_id     = $params{'cr_id'};
+    my $course_id = $params{'course_id'};
+    my $ci_id     = $params{'ci_id'};
+
+    return unless ( $cr_id || ( $course_id && $ci_id ) );
+
+    my $dbh = C4::Context->dbh;
+    my $sth;
+
+    if ($cr_id) {
+        my $query = "
+            SELECT * FROM course_reserves
+            WHERE cr_id = ?
+        ";
+        $sth = $dbh->prepare($query);
+        $sth->execute($cr_id);
+    }
+    else {
+        my $query = "
+            SELECT * FROM course_reserves
+            WHERE course_id = ? AND ci_id = ?
+        ";
+        $sth = $dbh->prepare($query);
+        $sth->execute( $course_id, $ci_id );
+    }
+
+    my $course_reserve = $sth->fetchrow_hashref();
+    return $course_reserve;
+}
+
+=head2 ModCourseReserve
+
+    $id = ModCourseReserve( %params );
+
+=cut
+
+sub ModCourseReserve {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $course_id   = $params{'course_id'};
+    my $ci_id       = $params{'ci_id'};
+    my $staff_note  = $params{'staff_note'};
+    my $public_note = $params{'public_note'};
+
+    return unless ( $course_id && $ci_id );
+
+    my $course_reserve =
+      GetCourseReserve( course_id => $course_id, ci_id => $ci_id );
+    my $cr_id;
+
+    my $dbh = C4::Context->dbh;
+
+    if ($course_reserve) {
+        $cr_id = $course_reserve->{'cr_id'};
+
+        my $query = "
+            UPDATE course_reserves
+            SET staff_note = ?, public_note = ?
+            WHERE cr_id = ?
+        ";
+        $dbh->do( $query, undef, $staff_note, $public_note, $cr_id );
+    }
+    else {
+        my $query = "
+            INSERT INTO course_reserves SET
+            course_id = ?,
+            ci_id = ?,
+            staff_note = ?,
+            public_note = ?
+        ";
+        $dbh->do( $query, undef, $course_id, $ci_id, $staff_note,
+            $public_note );
+        $cr_id =
+          $dbh->last_insert_id( undef, undef, 'course_reserves', 'cr_id' );
+    }
+
+    my $course = GetCourse($course_id);
+    EnableOrDisableCourseItem(
+        ci_id   => $params{'ci_id'},
+        enabled => $course->{'enabled'}
+    );
+
+    return $cr_id;
+}
+
+=head2 GetCourseReserves {
+
+  $course_reserves = GetCourseReserves( %params );
+
+  Required:
+      course_id OR ci_id
+  Optional:
+      include_items   => 1,
+      include_count   => 1,
+      include_courses => 1,
+
+=cut
+
+sub GetCourseReserves {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $course_id     = $params{'course_id'};
+    my $ci_id         = $params{'ci_id'};
+    my $include_items = $params{'include_items'};
+    my $include_count = $params{'include_count'};
+    my $include_courses = $params{'include_courses'};
+
+    return unless ( $course_id || $ci_id );
+
+    my $field = ($course_id) ? 'course_id' : 'ci_id';
+    my $value = ($course_id) ? $course_id  : $ci_id;
+
+    my $query = "
+        SELECT cr.*, ci.itemnumber
+        FROM course_reserves cr, course_items ci
+        WHERE cr.$field = ?
+        AND cr.ci_id = ci.ci_id
+    ";
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($value);
+
+    my $course_reserves = $sth->fetchall_arrayref( {} );
+
+    if ($include_items) {
+        foreach my $cr (@$course_reserves) {
+            $cr->{'course_item'} = GetCourseItem( ci_id => $cr->{'ci_id'} );
+            $cr->{'item'} = GetBiblioFromItemNumber( $cr->{'itemnumber'} );
+            $cr->{'issue'} = GetOpenIssue( $cr->{'itemnumber'} );
+        }
+    }
+
+    if ($include_count) {
+        foreach my $cr (@$course_reserves) {
+            $cr->{'reserves_count'} =
+              CountCourseReservesForItem( ci_id => $cr->{'ci_id'} );
+        }
+    }
+
+    if ($include_courses) {
+        foreach my $cr (@$course_reserves) {
+            $cr->{'courses'} =
+              GetCourses( itemnumber => $cr->{'itemnumber'} );
+        }
+    }
+
+    return $course_reserves;
+}
+
+=head2 DelCourseReserve {
+
+  DelCourseReserve( cr_id => $cr_id );
+
+=cut
+
+sub DelCourseReserve {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $cr_id = $params{'cr_id'};
+
+    return unless ($cr_id);
+
+    my $dbh = C4::Context->dbh;
+
+    my $course_reserve = GetCourseReserve( cr_id => $cr_id );
+
+    my $query = "
+        DELETE FROM course_reserves
+        WHERE cr_id = ?
+    ";
+    $dbh->do( $query, undef, $cr_id );
+
+    ## If there are no other course reserves for this item
+    ## delete the course_item as well
+    unless ( CountCourseReservesForItem( ci_id => $course_reserve->{'ci_id'} ) )
+    {
+        DelCourseItem( ci_id => $course_reserve->{'ci_id'} );
+    }
+
+}
+
+=head2 GetReservesInfo
+
+    my $arrayref = GetItemReservesInfo( itemnumber => $itemnumber );
+
+    For a given item, returns an arrayref of reserves hashrefs,
+    with a course hashref under the key 'course'
+
+=cut
+
+sub GetItemReservesInfo {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $itemnumber = $params{'itemnumber'};
+
+    return unless ($itemnumber);
+
+    my $course_item = GetCourseItem( itemnumber => $itemnumber );
+
+    return unless ( keys %$course_item );
+
+    my $course_reserves = GetCourseReserves( ci_id => $course_item->{'ci_id'} );
+
+    foreach my $cr (@$course_reserves) {
+        $cr->{'course'} = GetCourse( $cr->{'course_id'} );
+    }
+
+    return $course_reserves;
+}
+
+=head2 CountCourseReservesForItem
+
+    $bool = CountCourseReservesForItem( %params );
+
+    ci_id - course_item id
+    OR
+    itemnumber - course_item itemnumber
+
+    enabled = 'yes' or 'no'
+    Optional, if not supplied, counts reserves
+    for both enabled and disabled courses
+
+=cut
+
+sub CountCourseReservesForItem {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $ci_id      = $params{'ci_id'};
+    my $itemnumber = $params{'itemnumber'};
+    my $enabled    = $params{'enabled'};
+
+    return unless ( $ci_id || $itemnumber );
+
+    my $course_item =
+      GetCourseItem( ci_id => $ci_id, itemnumber => $itemnumber );
+
+    my @params = ( $course_item->{'ci_id'} );
+    push( @params, $enabled ) if ($enabled);
+
+    my $query = "
+        SELECT COUNT(*) AS count
+        FROM course_reserves cr
+        LEFT JOIN courses c ON ( c.course_id = cr.course_id )
+        WHERE ci_id = ?
+    ";
+    $query .= "AND c.enabled = ?" if ($enabled);
+
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@params);
+
+    my $row = $sth->fetchrow_hashref();
+
+    return $row->{'count'};
+}
+
+=head2 SearchCourses
+
+    my $courses = SearchCourses( term => $search_term, enabled => 'yes' );
+
+=cut
+
+sub SearchCourses {
+    my (%params) = @_;
+    warn identify_myself(%params) if $DEBUG;
+
+    my $term = $params{'term'};
+
+    my $enabled = $params{'enabled'} || '%';
+
+    my @params;
+    my $query = "SELECT c.* FROM courses c";
+
+    $query .= "
+        LEFT JOIN course_instructors ci
+            ON ( c.course_id = ci.course_id )
+        LEFT JOIN borrowers b
+            ON ( ci.borrowernumber = b.borrowernumber )
+        LEFT JOIN authorised_values av
+            ON ( c.department = av.authorised_value )
+        WHERE
+            ( av.category = 'DEPARTMENT' OR av.category = 'TERM' )
+            AND
+            (
+                department LIKE ? OR
+                course_number LIKE ? OR
+                section LIKE ? OR
+                course_name LIKE ? OR
+                term LIKE ? OR
+                public_note LIKE ? OR
+                CONCAT(surname,' ',firstname) LIKE ? OR
+                CONCAT(firstname,' ',surname) LIKE ? OR
+                lib LIKE ? OR
+                lib_opac LIKE ?
+           )
+           AND
+           c.enabled LIKE ?
+        GROUP BY c.course_id
+    ";
+
+    $term   = "%$term%";
+    @params = ($term) x 10;
+
+    $query .= " ORDER BY department, course_number, section, term, course_name ";
+
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+
+    $sth->execute(@params, $enabled);
+
+    my $courses = $sth->fetchall_arrayref( {} );
+
+    foreach my $c (@$courses) {
+        $c->{'instructors'} = GetCourseInstructors( $c->{'course_id'} );
+    }
+
+    return $courses;
+}
+
+sub whoami  { ( caller(1) )[3] }
+sub whowasi { ( caller(2) )[3] }
+
+sub stringify_params {
+    my (%params) = @_;
+
+    my $string = "\n";
+
+    foreach my $key ( keys %params ) {
+        $string .= "    $key => " . $params{$key} . "\n";
+    }
+
+    return "( $string )";
+}
+
+sub identify_myself {
+    my (%params) = @_;
+
+    return whowasi() . stringify_params(%params);
+}
+
+1;
+
+=head1 AUTHOR
+
+Kyle M Hall <kyle at bywatersolutions.com>
+
+=cut
diff --git a/Koha/Template/Plugin/AuthorisedValues.pm b/Koha/Template/Plugin/AuthorisedValues.pm
new file mode 100644
index 0000000..8ec1530
--- /dev/null
+++ b/Koha/Template/Plugin/AuthorisedValues.pm
@@ -0,0 +1,32 @@
+package Koha::Template::Plugin::AuthorisedValues;
+
+# Copyright ByWater Solutions 2012
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use Template::Plugin;
+use base qw( Template::Plugin );
+
+use C4::Koha;
+
+sub GetByCode {
+    my ( $self, $category, $code, $opac ) = @_;
+    return GetAuthorisedValueByCode( $category, $code, $opac );
+}
+
+1;
diff --git a/Koha/Template/Plugin/Branches.pm b/Koha/Template/Plugin/Branches.pm
new file mode 100644
index 0000000..ad768a5
--- /dev/null
+++ b/Koha/Template/Plugin/Branches.pm
@@ -0,0 +1,37 @@
+package Koha::Template::Plugin::Branches;
+
+# Copyright ByWater Solutions 2012
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use Template::Plugin;
+use base qw( Template::Plugin );
+
+use C4::Koha;
+
+sub GetName {
+    my ( $self, $branchcode ) = @_;
+
+    my $query = "SELECT branchname FROM branches WHERE branchcode = ?";
+    my $sth   = C4::Context->dbh->prepare($query);
+    $sth->execute($branchcode);
+    my $b = $sth->fetchrow_hashref();
+    return $b->{'branchname'};
+}
+
+1;
diff --git a/Koha/Template/Plugin/ItemTypes.pm b/Koha/Template/Plugin/ItemTypes.pm
new file mode 100644
index 0000000..60ca979
--- /dev/null
+++ b/Koha/Template/Plugin/ItemTypes.pm
@@ -0,0 +1,38 @@
+package Koha::Template::Plugin::ItemTypes;
+
+# Copyright ByWater Solutions 2012
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use Template::Plugin;
+use base qw( Template::Plugin );
+
+use C4::Koha;
+
+sub GetDescription {
+    my ( $self, $itemtype ) = @_;
+
+    my $query = "SELECT description FROM itemtypes WHERE itemtype = ?";
+    my $sth   = C4::Context->dbh->prepare($query);
+    $sth->execute($itemtype);
+    my $d = $sth->fetchrow_hashref();
+    return $d->{'description'};
+
+}
+
+1;
diff --git a/Makefile.PL b/Makefile.PL
index 46a3524..3e78aa5 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -261,6 +261,7 @@ my $target_map = {
   './changelanguage.pl'         => 'INTRANET_CGI_DIR',
   './check_sysprefs.pl'         => 'NONE',
   './circ'                      => 'INTRANET_CGI_DIR',
+  './course_reserves'           => 'INTRANET_CGI_DIR',
   './offline_circ'		=> 'INTRANET_CGI_DIR',
   './edithelp.pl'               => 'INTRANET_CGI_DIR',
   './etc'                       => { target => 'KOHA_CONF_DIR', trimdir => -1 },
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index f2ad4eb..8620f37 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -40,6 +40,7 @@ use C4::VirtualShelves;
 use C4::XSLT;
 use C4::Images;
 use Koha::DateUtils;
+use Koha::CourseReserves;
 
 # use Smart::Comments;
 
@@ -264,6 +265,11 @@ foreach my $item (@items) {
     if ($item->{'materials'} ne ''){
 	$materials_flag = 1;
     }
+
+    if ( C4::Context->preference('UseCourseReserves') ) {
+        $item->{'course_reserves'} = GetItemReservesInfo( itemnumber => $item->{'itemnumber'} );
+    }
+
     push @itemloop, $item;
 }
 
diff --git a/course_reserves/add_items.pl b/course_reserves/add_items.pl
new file mode 100755
index 0000000..e810837
--- /dev/null
+++ b/course_reserves/add_items.pl
@@ -0,0 +1,94 @@
+#!/usr/bin/perl
+
+#
+# Copyright 2012 Bywater Solutions
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+use C4::Koha;
+use C4::Biblio;
+use C4::Branch;
+
+use Koha::CourseReserves;
+
+my $cgi = new CGI;
+
+my $action    = $cgi->param('action')    || '';
+my $course_id = $cgi->param('course_id') || '';
+my $barcode   = $cgi->param('barcode')   || '';
+
+die('No course_id provided') unless ($course_id);
+
+my $item = GetBiblioFromItemNumber( undef, $barcode );
+
+my $step = ( $action eq 'lookup' && $item ) ? '2' : '1';
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "course_reserves/add_items-step$step.tmpl",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { coursereserves => 'add_reserves' },
+    }
+);
+$template->param( ERROR_BARCODE_NOT_FOUND => $barcode ) unless ( $barcode && $item && $action eq 'lookup' );
+
+$template->param( course => GetCourse($course_id) );
+
+if ( $action eq 'lookup' ) {
+    my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} );
+    my $course_reserve = GetCourseReserve(
+        course_id => $course_id,
+        ci_id     => $course_item->{'ci_id'}
+    ) if ($course_item);
+
+    $template->param(
+        item           => $item,
+        course_item    => $course_item,
+        course_reserve => $course_reserve,
+
+        ccodes    => GetAuthorisedValues('CCODE'),
+        locations => GetAuthorisedValues('LOC'),
+        itypes    => GetItemTypesFlat(),
+        branches  => GetBranchesLoop(),
+    );
+
+}
+elsif ( $action eq 'add' ) {
+    my $ci_id = ModCourseItem(
+        itemnumber    => $cgi->param('itemnumber'),
+        itype         => $cgi->param('itype'),
+        ccode         => $cgi->param('ccode'),
+        holdingbranch => $cgi->param('holdingbranch'),
+        location      => $cgi->param('location'),
+    );
+
+    my $cr_id = ModCourseReserve(
+        course_id   => $course_id,
+        ci_id       => $ci_id,
+        staff_note  => $cgi->param('staff_note'),
+        public_note => $cgi->param('public_note'),
+    );
+}
+
+output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/course_reserves/course-details.pl b/course_reserves/course-details.pl
new file mode 100755
index 0000000..e607d96
--- /dev/null
+++ b/course_reserves/course-details.pl
@@ -0,0 +1,67 @@
+#!/usr/bin/perl
+
+#
+# Copyright 2012 Bywater Solutions
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+use C4::Koha;
+
+use Koha::CourseReserves;
+
+my $cgi = new CGI;
+
+my $action = $cgi->param('action') || '';
+my $course_id = $cgi->param('course_id');
+
+my $flagsrequired;
+$flagsrequired->{coursereserves} = 'delete_reserves' if ( $action eq 'del_reserve' );
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "course_reserves/course-details.tmpl",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => $flagsrequired,
+    }
+);
+
+die("No course_id given") unless ($course_id);
+
+if ( $action eq 'del_reserve' ) {
+    DelCourseReserve( cr_id => $cgi->param('cr_id') );
+}
+
+my $course          = GetCourse($course_id);
+my $course_reserves = GetCourseReserves(
+    course_id       => $course_id,
+    include_items   => 1,
+    include_courses => 1
+);
+
+$template->param(
+    course          => $course,
+    course_reserves => $course_reserves,
+);
+
+output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/course_reserves/course-reserves.pl b/course_reserves/course-reserves.pl
new file mode 100755
index 0000000..11112c4
--- /dev/null
+++ b/course_reserves/course-reserves.pl
@@ -0,0 +1,54 @@
+#!/usr/bin/perl
+
+#
+# Copyright 2012 Bywater Solutions
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+
+use Koha::CourseReserves;
+
+my $cgi = new CGI;
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "course_reserves/course-reserves.tmpl",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => {},
+    }
+);
+
+my $search_on = $cgi->param('search_on');
+my %params;
+if ($search_on) {
+    $params{'course_name'} = "%$search_on%";
+}
+
+my $courses = GetCourses(%params);
+if ( $search_on && @$courses == 1 ) {
+    print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=" . $courses->[0]->{'course_id'});
+} else {
+    $template->param( courses => $courses );
+    output_html_with_http_headers $cgi, $cookie, $template->output;
+}
diff --git a/course_reserves/course.pl b/course_reserves/course.pl
new file mode 100755
index 0000000..5e6395c
--- /dev/null
+++ b/course_reserves/course.pl
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+
+#
+# Copyright 2012 Bywater Solutions
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+use C4::Koha;
+
+use Koha::CourseReserves;
+
+my $cgi = new CGI;
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "course_reserves/course.tmpl",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { coursereserves => 'manage_courses' },
+    }
+);
+
+my $course_id = $cgi->param('course_id');
+
+if ($course_id) {
+    my $course = GetCourse($course_id);
+    $template->param(%$course);
+}
+
+$template->param(
+    departments => GetAuthorisedValues('DEPARTMENT')
+    ,    ## TODO: use syspref instead of hard coded value.
+    terms => GetAuthorisedValues('TERM')
+    ,    ## TODO: use syspref instead of hard coded value.
+);
+
+output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/course_reserves/mod_course.pl b/course_reserves/mod_course.pl
new file mode 100755
index 0000000..25aadcd
--- /dev/null
+++ b/course_reserves/mod_course.pl
@@ -0,0 +1,76 @@
+#!/usr/bin/perl
+
+#script to modify reserves/requests
+#written 2/1/00 by chris at katipo.oc.nz
+#last update 27/1/2000 by chris at katipo.co.nz
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use CGI;
+
+use C4::Output;
+use C4::Reserves;
+use C4::Auth;
+
+use Koha::CourseReserves;
+
+my $cgi = new CGI;
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "about.tmpl",
+        query           => $cgi,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { coursereserves => 'manage_courses' },
+    }
+);
+
+my $action = $cgi->param('action');
+
+if ( $action eq 'del' ) {
+    DelCourse( $cgi->param('course_id') );
+    print $cgi->redirect("/cgi-bin/koha/course_reserves/course-reserves.pl");
+}
+else {
+    my %params;
+
+    $params{'course_id'} = $cgi->param('course_id')
+      if ( $cgi->param('course_id') );
+    $params{'department'}     = $cgi->param('department');
+    $params{'course_number'}  = $cgi->param('course_number');
+    $params{'section'}        = $cgi->param('section');
+    $params{'course_name'}    = $cgi->param('course_name');
+    $params{'term'}           = $cgi->param('term');
+    $params{'staff_note'}     = $cgi->param('staff_note');
+    $params{'public_note'}    = $cgi->param('public_note');
+    $params{'students_count'} = $cgi->param('students_count');
+    $params{'enabled'} = ( $cgi->param('enabled') eq 'on' ) ? 'yes' : 'no';
+
+    my $course_id = ModCourse(%params);
+
+    my @instructors = $cgi->param('instructors');
+    ModCourseInstructors(
+        mode        => 'replace',
+        cardnumbers => \@instructors,
+        course_id   => $course_id
+    );
+    print $cgi->redirect(
+        "/cgi-bin/koha/course_reserves/course-details.pl?course_id=$course_id");
+}
diff --git a/installer/data/mysql/en/mandatory/userflags.sql b/installer/data/mysql/en/mandatory/userflags.sql
index e9d9b2e..cc683fd 100644
--- a/installer/data/mysql/en/mandatory/userflags.sql
+++ b/installer/data/mysql/en/mandatory/userflags.sql
@@ -15,3 +15,4 @@ INSERT INTO `userflags` VALUES(14,'editauthorities','Allow to edit authorities',
 INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0);
 INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0);
 INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0);
+INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);
diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql
index 070e8f5..a0cc833 100644
--- a/installer/data/mysql/en/mandatory/userpermissions.sql
+++ b/installer/data/mysql/en/mandatory/userpermissions.sql
@@ -51,5 +51,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (15, 'renew_subscription', 'Renew a subscription'),
    (15, 'routing', 'Routing'),
    (16, 'execute_reports', 'Execute SQL reports'),
-   (16, 'create_reports', 'Create SQL Reports')
+   (16, 'create_reports', 'Create SQL Reports'),
+   (18, 'manage_courses', 'Add, edit and delete courses'),
+   (18, 'add_reserves', 'Add course reserves'),
+   (18, 'delete_reserves', 'Remove course reserves')
 ;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 91d42a2..5be5049 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -466,6 +466,69 @@ CREATE TABLE collections_tracking (
 ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;
 
 --
+-- Table structure for table `courses`
+--
+DROP TABLE IF EXISTS courses;
+CREATE TABLE `courses` (
+  `course_id` int(11) NOT NULL AUTO_INCREMENT,
+  `department` varchar(20) DEFAULT NULL,
+  `course_number` varchar(255) DEFAULT NULL,
+  `section` varchar(255) DEFAULT NULL,
+  `course_name` varchar(255) DEFAULT NULL,
+  `term` varchar(20) DEFAULT NULL,
+  `staff_note` mediumtext,
+  `public_note` mediumtext,
+  `students_count` varchar(20) DEFAULT NULL,
+  `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+   PRIMARY KEY (`course_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `course_instructors`
+--
+DROP TABLE IF EXISTS course_instructors;
+CREATE TABLE `course_instructors` (
+  `course_id` int(11) NOT NULL,
+  `borrowernumber` int(11) NOT NULL,
+  PRIMARY KEY (`course_id`,`borrowernumber`),
+  KEY `borrowernumber` (`borrowernumber`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `course_items`
+--
+DROP TABLE IF EXISTS course_items;
+CREATE TABLE `course_items` (
+  `ci_id` int(11) NOT NULL AUTO_INCREMENT,
+  `itemnumber` int(11) NOT NULL,
+  `itype` varchar(10) DEFAULT NULL,
+  `ccode` varchar(10) DEFAULT NULL,
+  `holdingbranch` varchar(10) DEFAULT NULL,
+  `location` varchar(80) DEFAULT NULL,
+  `enabled` enum('yes','no') NOT NULL DEFAULT 'no',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+   PRIMARY KEY (`ci_id`),
+   UNIQUE KEY `itemnumber` (`itemnumber`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `course_reserves`
+--
+DROP TABLE IF EXISTS course_reserves;
+CREATE TABLE `course_reserves` (
+  `cr_id` int(11) NOT NULL AUTO_INCREMENT,
+  `course_id` int(11) NOT NULL,
+  `ci_id` int(11) NOT NULL,
+  `staff_note` mediumtext,
+  `public_note` mediumtext,
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+   PRIMARY KEY (`cr_id`),
+   UNIQUE KEY `psuedo_key` (`course_id`,`ci_id`),
+   KEY `course_id` (`course_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+--
 -- Table structure for table `borrower_branch_circ_rules`
 --
 
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 35f92cc..b3f9a32 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -371,3 +371,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionMarker','','Markers for age restriction indication, e.g. FSK|PEGI|Age|',NULL,'free');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionOverride',0,'Allow staff to check out an item with age restriction.',NULL,'YesNo');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 25cd367..315afc5 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -5681,6 +5681,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     "INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free');
     ");
     print "Upgrade to $DBversion done (Adding PrefillItem and SubfieldsToUseWhenPrefill sysprefs)\n";
+    SetVersion($DBversion);
 }
 
 $DBversion = "3.09.00.036";
@@ -5696,6 +5697,77 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.09.00.XXX";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+    $dbh->do("INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('UseCourseReserves', '0', NULL, 'Enable the course reserves feature.', 'YesNo')");
+    $dbh->do("INSERT INTO userflags (bit,flag,flagdesc,defaulton) VALUES ('18','coursereserves','Course Reserves','0')");
+    $dbh->do("
+CREATE TABLE `courses` (
+  `course_id` int(11) NOT NULL AUTO_INCREMENT,
+  `department` varchar(20) DEFAULT NULL,
+  `course_number` varchar(255) DEFAULT NULL,
+  `section` varchar(255) DEFAULT NULL,
+  `course_name` varchar(255) DEFAULT NULL,
+  `term` varchar(20) DEFAULT NULL,
+  `staff_note` mediumtext,
+  `public_note` mediumtext,
+  `students_count` varchar(20) DEFAULT NULL,
+  `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+   PRIMARY KEY (`course_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+");
+
+$dbh->do("
+CREATE TABLE `course_instructors` (
+  `course_id` int(11) NOT NULL,
+  `borrowernumber` int(11) NOT NULL,
+  PRIMARY KEY (`course_id`,`borrowernumber`),
+  KEY `borrowernumber` (`borrowernumber`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+");
+
+$dbh->do("
+CREATE TABLE `course_items` (
+  `ci_id` int(11) NOT NULL AUTO_INCREMENT,
+  `itemnumber` int(11) NOT NULL,
+  `itype` varchar(10) DEFAULT NULL,
+  `ccode` varchar(10) DEFAULT NULL,
+  `holdingbranch` varchar(10) DEFAULT NULL,
+  `location` varchar(80) DEFAULT NULL,
+  `enabled` enum('yes','no') NOT NULL DEFAULT 'no',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+   PRIMARY KEY (`ci_id`),
+   UNIQUE KEY `itemnumber` (`itemnumber`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+");
+
+$dbh->do("
+CREATE TABLE `course_reserves` (
+  `cr_id` int(11) NOT NULL AUTO_INCREMENT,
+  `course_id` int(11) NOT NULL,
+  `ci_id` int(11) NOT NULL,
+  `staff_note` mediumtext,
+  `public_note` mediumtext,
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+   PRIMARY KEY (`cr_id`),
+   UNIQUE KEY `psuedo_key` (`course_id`,`ci_id`),
+   KEY `course_id` (`course_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+");
+
+$dbh->do("
+INSERT INTO permissions (module_bit, code, description) VALUES
+  (18, 'manage_courses', 'Add, edit and delete courses'),
+  (18, 'add_reserves', 'Add course reserves'),
+  (18, 'delete_reserves', 'Remove course reserves')
+;
+");
+
+    print "Upgrade to $DBversion done (Add Course Reserves ( system preference UseCourseReserves ))\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
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 afe98f7..db7d206 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -814,7 +814,7 @@ fieldset.rows .inputnote {
     visibility:visible; /* you propably don't need to change this one */
     display:block;
 }
-#newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child {
+#new_course a, #newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child {
 	padding-left : 34px;
 	background-image: url("../../img/toolbar-new.gif");
 	background-position : center left;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 3d71d45..f8679a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -28,6 +28,9 @@
                             [% IF ( CAN_user_serials ) %]
                             <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
                             [% END %]
+                            [% IF ( CAN_user_coursereserves ) %]
+                            <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a></li>
+                            [% END %]
                             [% IF ( CAN_user_reports ) %]
                             <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
                             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
index 46a412d..abbee70 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
@@ -51,6 +51,9 @@
     [% IF ( CAN_user_serials ) %]
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
     [% END %]
+    [% IF ( CAN_user_coursereserves ) %]
+        <li><a href="/cgi-bin/koha/course_reserves/course_reserves.pl">Course Reserves</a></li>
+    [% END %]
     [% IF ( CAN_user_editcatalogue ) %]
     </ul></li>
     
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 125cd52..e73cd01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -5,11 +5,20 @@ function _(s) { return s } // dummy function for gettext
 
  $(document).ready(function() {
     $('#header_search').tabs().bind('tabsshow', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); });
-	$(".close").click(function(){ window.close(); });
+
+    $(".close").click(function(){ window.close(); });
+
     if($("#header_search #checkin_search").length > 0){ $(document).bind('keydown','Alt+r',function (){ $("#header_search").tabs("select","#checkin_search"); $("#ret_barcode").focus(); }); } else { $(document).bind('keydown','Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); }
     if($("#header_search #circ_search").length > 0){ $(document).bind('keydown','Alt+u',function (){ $("#header_search").tabs("select","#circ_search"); $("#findborrower").focus(); }); } else { $(document).bind('keydown','Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); }
     if($("#header_search #catalog_search").length > 0){ $(document).bind('keydown','Alt+q',function (){ $("#header_search").tabs("select","#catalog_search"); $("#search-form").focus(); }); } else { $(document).bind('keydown','Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); }
+
     $(".focus").focus();
+
+    $('.noEnterSubmit').keypress(function(e){
+        if ( e.which == 13 ) return false;
+        //if ( e.which == 13 ) e.preventDefault();
+    });
+
  });
 
  
@@ -73,24 +82,6 @@ YAHOO.util.Event.onContentReady("changelanguage", function () {
 	});
 });
 			
-// http://jennifermadden.com/javascript/stringEnterKeyDetector.html
-function checkEnter(e){ //e is event object passed from function invocation
-	var characterCode; // literal character code will be stored in this variable
-	if(e && e.which){ //if which property of event object is supported (NN4)
-		e = e;
-		characterCode = e.which; //character code is contained in NN4's which property
-	} else {
-		e = event;
-		characterCode = e.keyCode; //character code is contained in IE's keyCode property
-	}
-
-	if(characterCode == 13){ //if generated character code is equal to ascii 13 (if enter key)
-		return false;
-	} else {
-		return true;
-	}
-}
-
 function clearHoldFor(){
 	$.cookie("holdfor",null, { path: "/", expires: 0 });
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a9ed6f7..3597c6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -448,3 +448,10 @@ Circulation:
             - and this password
             - pref: AutoSelfCheckPass
             - .
+    Course Reserves:
+        -
+            - pref: UseCourseReserves
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - course reserves
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 22f7908..4fd2ba3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -1,3 +1,18 @@
+[% USE AuthorisedValues %]
+
+[% ShowCourseReserves = 0 %]
+[% IF UseCourseReserves %]
+    [% FOREACH item IN itemloop %]
+       [% IF item.course_reserves %]
+           [% FOREACH r IN item.course_reserves %]
+               [% IF r.course.enabled == 'yes' %]
+                   [% ShowCourseReserves = 1 %]
+               [% END %]
+           [% END %]
+        [% END %]
+    [% END %]
+[% END %]
+
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Catalog &rsaquo;
   [% IF ( unknownbiblionumber ) %]
@@ -284,6 +299,7 @@ function verify_images() {
         [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]
         [% IF ( hostrecords ) %]<th>Host records</th>[% END %]
 		[% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]
+                [% IF ( ShowCourseReserves ) %]<th>Course Reserves</th>[% END %]
             </tr>
             [% FOREACH itemloo IN itemloop %]
                 <tr>
@@ -420,6 +436,24 @@ function verify_images() {
                         <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% itemloo.biblionumber %]&amp;hostitemnumber=[% itemloo.itemnumber %]">Create analytics</a></td>
                 [% END %]
 
+                [% IF ShowCourseReserves %]
+                    <td>
+                        [% IF itemloo.course_reserves %]
+                            [% FOREACH r IN itemloo.course_reserves %]
+                                [% IF r.course.enabled == 'yes' %]
+                                    <p>
+                                      <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id %]">
+                                         [% r.course.course_name %]
+                                         <!--[% IF r.course.course_number %] [% r.course.course_number %] [% END %]-->
+                                         [% IF r.course.section %] [% r.course.section %] [% END %]
+                                         [% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %]
+                                      </a>
+                                   </p>
+                               [% END %]
+                           [% END %]
+                       [% END %]
+                    </td>
+                [% END %]
                 </tr>
             [% END %]
         </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 05750b2..02c94b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -9,7 +9,7 @@ $(document).ready(function(){
             window.close();
         [% END %]
     [% END %]
-		$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
+		$("fieldset.rows input").addClass("noEnterSubmit");
 		/* Inline edit/delete links */
 		var biblionumber = $("input[name='biblionumber']").attr("value");
 		$("td").click(function(event){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
new file mode 100644
index 0000000..092bef8
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
@@ -0,0 +1,63 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Course Reserves &rsaquo; Add Items</title>
+[% INCLUDE 'doc-head-close.inc' %]
+</head>
+
+<script type="text/javascript">
+//<![CDATA[
+
+$(document).ready(function() {
+  $('#barcode').focus();
+});
+
+//]]>
+</script>
+
+<body>
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; Add Reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>
+
+<div id="doc2" class="yui-t7">
+    <div id="bd">
+        <div id="yui-main">
+            <div class="yui-b">
+                <div class="yui-g">
+                    <div class="yui-u first">
+                        [% IF ERROR_BARCODE_NOT_FOUND %]
+                            <div class="error">No item found for barcode [% ERROR_BARCODE_NOT_FOUND %]</div>
+                        [% END %]
+
+                        <form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
+                            <input type="hidden" name="course_id" value="[% course.course_id %]" />
+                            <input type="hidden" name="action" value="lookup" />
+
+                            <fieldset class="rows">
+                                <legend>Add Items: Scan Barcode</legend>
+
+                                    <p>
+
+                                    <li>
+                                        <label class="required" for="barcode">Item Barcode:</label>
+                                        <input id="barcode" name="barcode" type="text" />
+                                    </li>
+                                </ol>
+                            </fieldset>
+
+                            <fieldset class="action">
+                                <input type="submit" value="Submit" class="submit" />
+
+                                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]" class="cancel">Cancel</a>
+                            </fieldset>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
new file mode 100644
index 0000000..0ff5dca
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
@@ -0,0 +1,131 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Course Reserves &rsaquo; Add Items</title>
+[% INCLUDE 'doc-head-close.inc' %]
+
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function() {
+  $('#submit').focus();
+});
+//]]>
+</script>
+
+</head>
+
+<body>
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; Reserve <i><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]">[% item.title %]</a></i> for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>
+
+<div id="doc2" class="yui-t7">
+    <div id="bd">
+        <div id="yui-main">
+            <div class="yui-b">
+                <div class="yui-g">
+                    <div class="yui-u first">
+                        [% IF course_reserve %]<div class="warn" id="already_on_reserve_this">This course already has this item on reserve.<div>[% END %]
+                        [% IF course_item    %]<div class="warn" id="already_on_reserve">Number of courses reserving this item: [% course_item.course_reserves.size %]<div>[% END %]
+
+                        <form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
+                            <input type="hidden" name="course_id" value="[% course.course_id %]" />
+                            <input type="hidden" name="action" value="add" />
+
+                            <fieldset class="rows">
+                                <legend>Add <i>[% item.title %]</i> to <i>[% course.course_name %]</i></legend>
+                                <ol>
+                                    <li>
+                                        <label for="barcode">Barcode:</label>
+                                        <span id="barcode">[% item.barcode %]</span>
+                                        <input type="hidden" name="itemnumber" value="[% item.itemnumber %]" />
+                                    </li>
+
+                                    <li>
+                                        <label class="required" for="itype">Item Type:</label>
+                                        <select id="itype" name="itype">
+                                            <option value="">LEAVE UNCHANGED</option>
+
+                                            [% FOREACH it IN itypes %]
+                                                [% IF course_item.itype && ( ( course.enabled == 'yes' && it.itemtype == item.itype ) || ( course.enabled == 'no' && it.itemtype == course_item.itype ) ) %]
+                                                    <option value="[% it.itemtype %]" selected="selected">[% it.description %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% it.itemtype %]">[% it.description %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    </li>
+
+                                    <li>
+                                        <label class="required" for="ccode">Collection Code:</label>
+                                        <select id="ccode" name="ccode">
+                                            <option value="">LEAVE UNCHANGED</option>
+
+                                            [% FOREACH c IN ccodes %]
+                                                [% IF course_item.ccode && ( ( course.enabled == 'yes' && c.authorised_value == item.ccode ) || ( course.enabled == 'no' && c.authorised_value == course_item.ccode ) ) %]
+                                                    <option value="[% c.authorised_value %]" selected="selected">[% c.lib %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% c.authorised_value %]">[% c.lib %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    </li>
+
+                                    <li>
+                                        <label class="required" for="location">Shelving Location:</label>
+                                        <select id="location" name="location">
+                                            <option value="">LEAVE UNCHANGED</option>
+
+                                            [% FOREACH s IN locations %]
+                                                [% IF course_item.location && ( ( course.enabled == 'yes' && s.authorised_value == item.location ) || ( course.enabled == 'no' && s.authorised_value == course_item.location ) ) %]
+                                                    <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% s.authorised_value %]">[% s.lib %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    </li>
+
+                                    <li>
+                                        <label class="required" for="holdingbranch">Holding Library:</label>
+                                        <select id="holdingbranch" name="holdingbranch">
+                                            <option value="">LEAVE UNCHANGED</option>
+
+                                            [% FOREACH b IN branches %]
+                                                [% IF course_item.holdingbranch && ( ( course.enabled == 'yes' && b.value == item.holdingbranch ) || ( course.enabled == 'no' && b.value == course_item.holdingbranch ) ) %]
+                                                    <option value="[% b.value %]" selected="selected">[% b.branchname %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% b.value %]">[% b.branchname %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    </li>
+
+                                    <li>
+                                        <label for="staff_note">Staff note:</label>
+                                        <textarea name="staff_note" id="staff_note">[% course_reserve.staff_note %]</textarea>
+                                    </li>
+
+                                    <li>
+                                        <label for="public_note">Public note:</label>
+                                        <textarea name="public_note" id="public_note">[% course_reserve.public_note %]</textarea>
+                                    </li>
+
+                                </ol>
+                            </fieldset>
+
+                            <fieldset class="action">
+                                <input type="submit" id="submit" value="Save" class="submit" />
+
+                                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]" class="cancel">Cancel</a>
+                            </fieldset>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
new file mode 100644
index 0000000..6f64c3f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
@@ -0,0 +1,183 @@
+[% USE AuthorisedValues %]
+[% USE ItemTypes %]
+[% USE Branches %]
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Course Reserves &rsaquo; New Course</title>
+[% INCLUDE 'doc-head-close.inc' %]
+
+<script type="text/javascript">
+//<![CDATA[
+
+    function confirmItemDelete(){
+        return confirm( _('Are you sure you want to delete this item?');
+    }
+
+//]]>
+</script>
+
+</head>
+
+<body>
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; Course Details for <i>[% course.course_name %]</i></div>
+
+<div id="doc2" class="yui-t7">
+    <div id="bd">
+        <div id="yui-main">
+            <div id="toolbar">
+                <script type="text/javascript">
+                //<![CDATA[
+                    $(document).ready(function(){
+                        addItemsButton     = new YAHOO.widget.Button("add_items");
+                        editCourseButton   = new YAHOO.widget.Button("edit_course");
+                        deleteCourseButton = new YAHOO.widget.Button("delete_course");
+
+                        deleteCourseButton.on("click", confirmDelete );
+                    });
+
+                    function confirmDelete(p_oEvent){
+                        if ( ! confirm( _('Are you sure you want to delete this course?') ) ) {
+                            YAHOO.util.Event.stopEvent( p_oEvent );
+                        }
+                    }
+
+                //]]>
+                </script>
+                <ul class="toolbar">
+                    [% IF CAN_user_coursereserves_add_reserves %]<li><a id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]">Add Reserves</a></li>[% END %]
+                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]">Edit Course</a></li>[% END %]
+                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del">Delete Course</a></li>[% END %]
+                </ul>
+            </div><!-- /toolbar -->
+
+            <table>
+                <tr><th>Course name</th><td>[% course.course_name %]</td></tr>
+                <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
+                <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
+                <tr><th>Course number</th><td>[% course.course_number %]</td></tr>
+                <tr><th>Section</th><td>[% course.section %]</td></tr>
+                <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>[% END %]</td></tr>
+                <tr><th>Staff note</th><td>[% course.staff_note %]</td></tr>
+                <tr><th>Public note</th><td>[% course.public_note %]</td></tr>
+                <tr><th>Students count</th><td>[% course.students_count %]</td></tr>
+                <tr><th>Status</th><td>[% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</td></tr>
+            </table>
+
+            <table>
+                <thead>
+                    <tr>
+                        <th>Title</th>
+                        <th>Barcode</th>
+                        <th>Call number</th>
+                        <th>Item type</th>
+                        <th>Collection</th>
+                        <th>Location</th>
+                        <th>Library</th>
+                        <th>Staff note</th>
+                        <th>Public note</th>
+                        [% IF CAN_user_coursereserves_add_reserves %]<th>&nbsp;<!-- Edit --></th>[% END %]
+                        [% IF CAN_user_coursereserves_delete_reserves %]<th>&nbsp;<!-- Remove --></th>[% END %]
+                        <th>Other course reserves</th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                    [% FOREACH cr IN course_reserves %]
+                        <tr>
+                            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
+                            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber %]&biblionumber=[% cr.item.biblionumber %]&bi=[% cr.item.biblioitemnumber %]">[% cr.item.barcode %]</a></td>
+                            <td>[% cr.item.itemcallnumber %]</td>
+                            <td>
+                                [% IF cr.course_item.itype %]
+                                    [% IF cr.course_item.enabled == 'yes' %]
+                                        [% ItemTypes.GetDescription( cr.item.itype ) %]
+                                    [% ELSE %]
+                                        [% ItemTypes.GetDescription( cr.course_item.itype ) %]
+                                    [% END %]
+                                [% ELSE %]
+                                     <i>Unchanged</i>
+                                     ([% ItemTypes.GetDescription( cr.item.itype ) %])
+                                [% END %]
+                            </td>
+                            <td>
+                                 [% IF cr.course_item.ccode %]
+                                     [% IF cr.course_item.enabled == 'yes' %]
+                                          [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]
+                                     [% ELSE %]
+                                         [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) %]
+                                     [% END %]
+                                 [% ELSE %]
+                                     <i>Unchanged</i>
+                                     ([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %])
+                                 [% END %]
+                            </td>
+                            <td>
+                                [% IF cr.course_item.location %]
+                                     [% IF cr.course_item.enabled == 'yes' %]
+                                         [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]
+                                    [% ELSE %]
+                                        [% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) %]
+                                    [% END %]
+                                [% ELSE %]
+                                    <i>Unchanged</i>
+                                    ([% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %])
+                                [% END %]
+                            </td>
+                            <td>
+                                [% IF cr.course_item.holdingbranch %]
+                                    [% IF cr.course_item.enabled == 'yes' %]
+                                        [% Branches.GetName( cr.item.holdingbranch ) %]
+                                    [% ELSE %]
+                                        [% Branches.GetName( cr.course_item.holdingbranch ) %]
+                                    [% END %]
+                                [% ELSE %]
+                                    <i>Unchanged</i>
+                                    ([% Branches.GetName( cr.item.holdingbranch ) %])
+                                [% END %]
+                            </td>
+                            <td>[% cr.staff_note %]</td>
+                            <td>[% cr.public_note %]</td>
+
+                            [% IF CAN_user_coursereserves_add_reserves %]
+                                <td><a href="add_items.pl?course_id=[% course.course_id %]&barcode=[% cr.item.barcode %]&action=lookup">Edit</a></td>
+                            [% END %]
+
+                            [% IF CAN_user_coursereserves_delete_reserves %]
+                                <td>
+                                    [% IF cr.item.onloan %]
+                                        On Loan
+                                    [% ELSIF cr.item.itemlost %]
+                                        Item Lost
+                                    [% ELSE %]
+                                        <a href="course-details.pl?course_id=[% course.course_id %]&action=del_reserve&cr_id=[% cr.cr_id %]" onclick="return confirmItemDelete()" >Remove</a>
+                                    [% END %]
+
+                                </td>
+                            [% END %]
+
+                            <td>
+                                [% FOREACH course IN cr.courses %]
+                                    [% UNLESS cr.course_id == course.course_id %]
+                                        <p>
+                                            <a href="course-details.pl?course_id=[% course.course_id %]">
+                                                [% course.course_name %]
+                                                [% IF course.section %] [% course.section %] [% END %]
+                                                [% IF course.term %] [% AuthorisedValues.GetByCode( 'TERM', course.term ) %] [% END %]
+                                            </a>
+                                        </p>
+                                    [% END %]
+                                [% END %]
+                            </td>
+                        </tr>
+                    [% END %]
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
new file mode 100644
index 0000000..37bc264
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
@@ -0,0 +1,104 @@
+[% USE AuthorisedValues %]
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Course Reserves</title>
+[% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
+</head>
+<body id="lists_shelves" class="lists">
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a></div>
+
+<div id="doc2" class="yui-t7">
+    <div id="bd">
+        <div id="yui-main">
+            <div class="yui-b">
+                <div class="yui-g">
+
+                    <div id="toolbar">
+                        <script type="text/javascript">
+                        //<![CDATA[
+                            $(document).ready(function(){
+                                newCourseButton = new YAHOO.widget.Button("new_course");
+                            });
+                        //]]>
+                        </script>
+                        <ul class="toolbar">
+                            [% IF ( CAN_user_coursereserves_manage_courses ) %]
+                            <li><a id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New Course</a></li>
+                            [% END %]
+                        </ul>
+                    </div><!-- /toolbar -->
+
+                    <div id="search-toolbar">
+                        <script type="text/javascript">
+                        //<![CDATA[
+                            function submitSearchForm(p_oEvent){
+                                $('#search_courses_form').submit();
+                            }
+
+                            $(document).ready(function(){
+                                newCourseButton = new YAHOO.widget.Button("search_courses");
+                                newCourseButton.on("click", submitSearchForm );
+                            });
+                        //]]>
+                        </script>
+                        <ul class="toolbar">
+                            <li><form id="search_courses_form"><input type="text" name="search_on" id="search_on"></form></li>
+                            <li><a id="search_courses">Search Courses</a></li>
+                        </ul>
+                    </div><!-- /toolbar -->
+
+                    <h1>Courses</h1>
+                    <table id="course_reserves_table">
+                        <thead>
+                            <tr>
+                                <th>Name</th>
+                                <th>Dept.</th>
+                                <th>Course #</th>
+                                <th>Section</th>
+                                <th>Term</th>
+                                <th>Instructors</th>
+                                <th>Staff Note</th>
+                                <th>Public Note</th>
+                                <th># of Students</th>
+                                <th>Enabled</th>
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            [% FOREACH c IN courses %]
+                                <tr>
+                                    <td><a href="course-details.pl?course_id=[% c.course_id %]">[% c.course_name %]</a></td>
+                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) %]</td>
+                                    <td>[% c.course_number %]</td>
+                                    <td>[% c.section %]</td>
+                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) %]</td>
+                                    <td>
+                                        [% FOREACH i IN c.instructors %]
+                                            <div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>
+                                        [% END %]
+                                    </td>
+                                    <td>[% c.staff_note %]</td>
+                                    <td>[% c.public_note %]</td>
+                                    <td>[% c.students_count %]</td>
+                                    <td>
+                                        [% IF c.enabled == 'yes' %]
+                                            <img src="/intranet-tmpl/prog/img/approve.gif" />
+                                        [% ELSE %]
+                                            <img src="http://kohadev:8080/intranet-tmpl/prog/img/deny.gif" />
+                                        [% END %]
+                                    </td>
+                            [% END %]
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
new file mode 100644
index 0000000..1bf678b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
@@ -0,0 +1,197 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Course Reserves &rsaquo; [% IF course_name %] Edit [% course_name %] [% ELSE %] New Course [% END %]</title>
+[% INCLUDE 'doc-head-close.inc' %]
+
+<script type="text/javascript">
+//<![CDATA[
+
+    function Check(f) {
+        var _alertString = "";
+
+        if( ! $("#department").val() ) {
+            _alertString += _("- You must choose a department") + "\n";
+        }
+
+        if( ! $("#course_number").val() ) {
+            _alertString += _("- You must choose a course number") + "\n";
+        }
+
+        if( ! $("#course_name").val() ) {
+            _alertString += _("- You must add a course name") + "\n";
+        }
+
+        if ( _alertString.length ) {
+            var alertHeader;
+            alertHeader = _("Form not submitted because of the following problem(s)");
+            alertHeader += "\n------------------------------------------------------------------------------------\n\n";
+
+            alert( alertHeader + _alertString );
+        } else {
+            f.submit();
+        }
+    }
+
+//]]>
+</script>
+
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function(){
+    $( "#find_instructor" ).autocomplete({
+        source: "/cgi-bin/koha/circ/ysearch.pl",
+        minLength: 3,
+        select: function( event, ui ) {
+            AddInstructor( ui.item.firstname + " " + ui.item.surname, ui.item.cardnumber );
+            return false;
+        }
+    })
+    .data( "autocomplete" )._renderItem = function( ul, item ) {
+        return $( "<li></li>" )
+        .data( "item.autocomplete", item )
+        .append( "<a>" + item.surname + ", " + item.firstname + " (" + item.cardnumber + ") <small>" + item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>" )
+        .appendTo( ul );
+    };
+
+});
+
+function AddInstructor( name, cardnumber ) {
+    div = "<div id='borrower_" + cardnumber + "'>" + name + " ( <a href='#' onclick='RemoveInstructor(" + cardnumber + ");'> Remove </a> ) <input type='hidden' name='instructors' value='" + cardnumber + "' /></div>";
+    $('#instructors').append( div );
+
+    $('#find_instructor').val('').focus();
+}
+
+function RemoveInstructor( cardnumber ) {
+    $( '#borrower_' + cardnumber ).remove();
+}
+
+//]]>
+</script>
+
+</head>
+
+<body>
+
+[% INCLUDE 'header.inc' %]
+[% INCLUDE 'cat-search.inc' %]
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a> &rsaquo; [% IF course_name %] Edit <i>[% course_name %]</i> [% ELSE %] New Course [% END %]</div>
+
+<div id="doc2" class="yui-t7">
+    <div id="bd">
+        <div id="yui-main">
+            <div class="yui-b">
+                <div class="yui-g">
+                    <div class="yui-u first">
+                        <form method="post" action="/cgi-bin/koha/course_reserves/mod_course.pl">
+                            [% IF course_id %]<input type="hidden" name="course_id" value="[% course_id %]" />[% END %]
+                            <fieldset class="rows">
+                                <legend>[% IF course_id %] Edit [% ELSE %] Create [% END %] course</legend>
+                                <ol>
+                                    <li>
+                                        <label class="required" for="department">Department:</label>
+                                        <select id="department" name="department">
+                                            <option value="">Select A Department</option>
+
+                                            [% FOREACH d IN departments %]
+                                                [% IF d.authorised_value == department %]
+                                                    <option value="[% d.authorised_value %]" selected="selected">[% d.lib %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% d.authorised_value %]">[% d.lib %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    </li>
+
+                                    <li>
+                                        <label class="required" for="course_number">Course number:</label>
+                                        <input id="course_number" name="course_number" type="text" value="[% course_number %]" />
+                                    </li>
+
+                                    <li>
+                                        <label for="section">Section:</label>
+                                        <input id="section" name="section" type="text" value="[% section %]"/>
+                                    </li>
+
+                                    <li>
+                                        <label class="required" for="course_name">Course name:</label>
+                                        <input id="course_name" name="course_name" type="text" value="[% course_name %]" />
+                                    </li>
+
+                                    <li>
+                                        <label for="term">Term:</label>
+                                        <select id="term" name="term">
+                                            <option value=""></option>
+
+                                            [% FOREACH t IN terms %]
+                                                [% IF t.authorised_value == term %]
+                                                    <option value="[% t.authorised_value %]" selected="selected">[% t.lib %]</option>
+                                                [% ELSE %]
+                                                    <option value="[% t.authorised_value %]">[% t.lib %]</option>
+                                                [% END %]
+                                            [% END %]
+                                        </select>
+                                    </li>
+
+                                    <!-- TODO: Add Instructors -->
+                                    <li>
+                                        <label for="instructors">Instructors:</label>
+
+                                        <fieldset>
+                                             <div id="instructors">
+                                                 [% FOREACH i IN instructors %]
+                                                     <div id="borrower_[% i.cardnumber %]">
+                                                         [% i.surname %], [% i.firstname %] ( <a href='#' onclick='RemoveInstructor( [% i.cardnumber %] );'> Remove </a> )
+                                                         <input type='hidden' name='instructors' value='[% i.cardnumber %]' />
+                                                     </div>
+                                                 [% END %]
+                                             </div>
+
+                                        </fieldset>
+
+                                        <fieldset>
+                                            <label for="find_instructor">Instructor Search:</label>
+                                            <input autocomplete="off" id="find_instructor" type="text" style="width:150px" class="noEnterSubmit"/>
+                                            <div id="find_instructor_container"></div>
+                                        </fieldset>
+                                    <li>
+                                        <label for="staff_note">Staff note:</label>
+                                        <textarea name="staff_note" id="staff_note">[% staff_note %]</textarea>
+                                    </li>
+
+                                    <li>
+                                        <label for="public_note">Public note:</label>
+                                        <textarea name="public_note" id="public_note">[% public_note %]</textarea>
+                                    </li>
+
+                                    <li>
+                                        <label for="students_count">Number of students:</label>
+                                        <input id="students_count" name="students_count" type="text" value="[% students_count %]" />
+                                    </li>
+
+                                    <li>
+                                        <label for="enabled">Enabled?</label>
+                                        [% IF enabled == 'no' %]
+                                            <input type="checkbox" name="enabled" id="enabled" />
+                                        [% ELSE %]
+                                            <input type="checkbox" name="enabled" id="enabled" checked="checked" />
+                                        [% END %]
+                                    </li>
+                                </ol>
+                            </fieldset>
+
+                            <fieldset class="action">
+                                <input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" />
+
+                                <a href="/cgi-bin/koha/course_reserves/course-reserves.pl" class="cancel">Cancel</a>
+                            </fieldset>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
index 8b71856..6ac018c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
@@ -4,7 +4,7 @@
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
-	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
+	$("fieldset.rows input").addClass("noEnterSubmit");
 });
 //]]>
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
index 217882e..464e6fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
@@ -4,7 +4,7 @@
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
-	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
+	$("fieldset.rows input").addClass("noEnterSubmit");
 });
 //]]>
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index f4734c0..c1a64db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -6,7 +6,7 @@
 <script type="text/JavaScript">
 //<![CDATA[
     $(document).ready(function() {
-		$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
+		$("fieldset.rows input").addClass("noEnterSubmit");
         $("#guarantordelete").click(function() {
             $("#contact-details").hide().find('a').remove();
             $("#guarantorid, #contactname, #contactfirstname").each(function () { this.value = "" });
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 3f661ad..fd8cc31 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -110,6 +110,7 @@
 
 <div id="moresearches">
 <a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
+[% IF ( UseCourseReserves ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course Reserves</a>[% END %]
 [% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
 [% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a>[% END %]
 [% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
new file mode 100644
index 0000000..70ed2d1
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
@@ -0,0 +1,63 @@
+[% USE KohaDates %]
+[% USE AuthorisedValues %]
+[% USE ItemTypes %]
+[% USE Branches %]
+[% INCLUDE 'doc-head-open.inc' %]
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
+[% INCLUDE 'doc-head-close.inc' %]
+</head>
+<body id="opac-main">
+[% IF ( OpacNav ) %]<div id="doc3" class="yui-t1">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
+   <div id="bd">
+[% INCLUDE 'masthead.inc' %]
+
+<div id="doc2" class="yui-t7">
+    <div id="yui-main">
+
+        <table>
+            <tr><th>Course Name</th><td>[% course.course_name %]</td></tr>
+            <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
+            <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
+            <tr><th>Course Number</th><td>[% course.course_number %]</td></tr>
+            <tr><th>Section</th><td>[% course.section %]</td></tr>
+            <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor">[% i.firstname %] [% i.surname %]</div>[% END %]</td></tr>
+            <tr><th>Notes</th><td>[% course.public_note %]</td></tr>
+        </table>
+
+        <table>
+            <thead>
+                <tr>
+                    <th>Title</th>
+                    <th>Item type</th>
+                    <th>Location</th>
+                    <th>Collection</th>
+                    <th>Call number</th>
+                    <th>Copy</th>
+                    <th>Status</td>
+                    <th>Date due</td>
+                    <th>Notes</th>
+                </tr>
+            </thead>
+
+            <tbody>
+                [% FOREACH cr IN course_reserves %]
+                    <tr>
+                        <td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
+                        <td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>
+                        <td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>
+                        <td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
+                        <td>[% cr.item.itemcallnumber %]</td>
+                        <td>[% cr.item.copynumber %]</td>
+                        <td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
+                        <td>[% cr.issue.date_due | $KohaDates %]</td>
+                        <td>[% cr.public_note %]</td>
+                    </tr>
+                [% END %]
+            </tbody>
+        </table>
+
+    </div>
+</div>
+
+
+[% INCLUDE 'opac-bottom.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
new file mode 100644
index 0000000..98965c9
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
@@ -0,0 +1,62 @@
+[% USE AuthorisedValues %]
+
+[% INCLUDE 'doc-head-open.inc' %]
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
+[% INCLUDE 'doc-head-close.inc' %]
+</head>
+<body id="opac-main">
+[% IF ( OpacNav ) %]<div id="doc3" class="yui-t1">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
+   <div id="bd">
+[% INCLUDE 'masthead.inc' %]
+
+
+<div id="doc2" class="yui-t7">
+        <div id="yui-main">
+            <div class="yui-b">
+                <div class="yui-g">
+
+                    <div id="search-toolbar">
+                        <form id="search_courses_form">
+                            <input type="text" name="search_on" id="search_on" />
+                            <input type="submit" value="Search" />
+                        </form>
+                    </div><!-- /toolbar -->
+
+                    <h1>Courses</h1>
+                    <table id="course_reserves_table">
+                        <thead>
+                            <tr>
+                                <th>Name</th>
+                                <th>Dept.</th>
+                                <th>Course #</th>
+                                <th>Section</th>
+                                <th>Term</th>
+                                <th>Instructors</th>
+                                <th>Notes</th>
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            [% FOREACH c IN courses %]
+                                <tr>
+                                    <td><a href="opac-course-details.pl?course_id=[% c.course_id %]">[% c.course_name %]</a></td>
+                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) %]</td>
+                                    <td>[% c.course_number %]</td>
+                                    <td>[% c.section %]</td>
+                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) %]</td>
+                                    <td>
+                                      [% FOREACH i IN c.instructors %]
+                                          <div class="instructor">[% i.firstname %] [% i.surname %]</div>
+                                      [% END %]
+                                    </td>
+                                    <td>[% c.public_note %]</td>
+                            [% END %]
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+</div>
+
+
+[% INCLUDE 'opac-bottom.inc' %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 99a21b3..4043776 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -1,4 +1,18 @@
 [% USE KohaDates %]
+[% USE AuthorisedValues %]
+
+[% ShowCourseReservesHeader = 0 %]
+[% IF UseCourseReserves %]
+    [% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
+       [% IF ITEM_RESULT.course_reserves %]
+           [% FOREACH r IN ITEM_RESULT.course_reserves %]
+               [% IF r.course.enabled == 'yes' %]
+                   [% ShowCourseReservesHeader = 1 %]
+               [% END %]
+           [% END %]
+        [% END %]
+    [% END %]
+[% END %]
 
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %]
 [% INCLUDE 'doc-head-close.inc' %]
@@ -740,6 +754,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         [% ELSIF show_priority %]
             <th>Item hold queue priority</th>
         [% END %]
+            [% IF ( ShowCourseReservesHeader ) %]<th id="item_coursereserves">Course Reserves</th>[% END %]
         </tr></thead>
 	    <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
 	    <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
@@ -777,6 +792,23 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             [% END %]
                 </td>
         [% END %]
+
+        [% IF ShowCourseReservesHeader %]
+            <td>
+                [% IF ITEM_RESULT.course_reserves %]
+                    [% FOREACH r IN ITEM_RESULT.course_reserves %]
+                        <p>
+                            <a href="opac-course-details.pl?course_id=[% r.course.course_id %]">
+                                [% r.course.course_name %]
+                                <!--[% IF r.course.course_number %] [% r.course.course_number %] [% END %]-->
+                                [% IF r.course.section %] [% r.course.section %] [% END %]
+                                [% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %]
+                            </a>
+                        </p>
+                    [% END %]
+                [% END %]
+            </td>
+        [% END %]
 	    </tr>
 	    [% END %]</tbody>
 	</table>
diff --git a/opac/opac-course-details.pl b/opac/opac-course-details.pl
new file mode 100755
index 0000000..d1f00b3
--- /dev/null
+++ b/opac/opac-course-details.pl
@@ -0,0 +1,60 @@
+#!/usr/bin/perl
+
+#
+# Copyright 2012 Bywater Solutions
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+use C4::Koha;
+
+use Koha::CourseReserves;
+
+my $cgi = new CGI;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-course-details.tmpl",
+        query           => $cgi,
+        type            => "opac",
+        authnotrequired => 1,
+        debug           => 1,
+    }
+);
+
+my $action = $cgi->param('action') || '';
+my $course_id = $cgi->param('course_id');
+
+die( "No course_id given" ) unless ( $course_id );
+
+if ( $action eq 'del_reserve' ) {
+    DelCourseReserve( cr_id => $cgi->param('cr_id') );
+}
+
+my $course = GetCourse( $course_id );
+my $course_reserves = GetCourseReserves( course_id => $course_id, include_items => 1, include_count => 1 );
+
+$template->param(
+    course => $course,
+    course_reserves => $course_reserves,
+);
+
+output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/opac/opac-course-reserves.pl b/opac/opac-course-reserves.pl
new file mode 100755
index 0000000..2c434dd
--- /dev/null
+++ b/opac/opac-course-reserves.pl
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+
+#
+# Copyright 2012 Bywater Solutions
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use Modern::Perl;
+
+use CGI;
+
+use C4::Auth;
+use C4::Output;
+
+use Koha::CourseReserves;
+
+my $cgi = new CGI;
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-course-reserves.tmpl",
+        query           => $cgi,
+        type            => "opac",
+        authnotrequired => 1,
+        debug           => 1,
+    }
+);
+
+my $search_on = $cgi->param('search_on');
+
+my $courses = SearchCourses( term => $search_on, enabled => 'yes' );
+
+if ( @$courses == 1 ) {
+    print $cgi->redirect("/cgi-bin/koha/opac-course-details.pl?course_id=" . $courses->[0]->{'course_id'});
+} else {
+    $template->param( courses => $courses );
+    output_html_with_http_headers $cgi, $cookie, $template->output;
+}
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index feaa89b..55f213f 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -49,6 +49,7 @@ use MARC::Field;
 use List::MoreUtils qw/any none/;
 use C4::Images;
 use Koha::DateUtils;
+use Koha::CourseReserves;
 
 BEGIN {
 	if (C4::Context->preference('BakerTaylorEnabled')) {
@@ -965,4 +966,10 @@ if (C4::Context->preference('OpacHighlightedWords')) {
     $template->{VARS}->{query_desc} = $query->param('query_desc');
 }
 
+if ( C4::Context->preference('UseCourseReserves') ) {
+    foreach my $i ( @items ) {
+        $i->{'course_reserves'} = GetItemReservesInfo( itemnumber => $i->{'itemnumber'} );
+    }
+}
+
 output_html_with_http_headers $query, $cookie, $template->output;
-- 
1.7.11.4


------=_Part_6335_32458161.1347314090431--