From oleonard at myacpl.org  Fri May  2 20:37:05 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  2 May 2014 14:37:05 -0400
Subject: [Koha-patches] [PATCH] Bug 12106 - Capitalization: Patron
	Attributes on tools/patron import
Message-ID: <1399055825-27958-1-git-send-email-oleonard@myacpl.org>

There are three instances of incorrectly-capitalized "Patron Attributes"
on the patron import page. This patch corrects them.

To test, view the patron import page (Tools -> Import patrons). Confirm
that instances of the phrase "patron attributes" in the bottom-most
fieldset are correctly capitalized.
---
 .../prog/en/modules/tools/import_borrowers.tt      |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
index 1ed23d0..894dc2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -131,12 +131,12 @@
     </fieldset>
     [% IF ( ExtendedPatronAttributes ) %]
 	<fieldset class="rows">
-	<legend>Patron Attributes</legend>
+    <legend>Patron attributes</legend>
     <ol><li class="radio">
-        <input type="radio" id="ext_preserve_0" name="ext_preserve" value="0" checked="checked" /><label for="ext_preserve_0">Replace all Patron Attributes</label>
+        <input type="radio" id="ext_preserve_0" name="ext_preserve" value="0" checked="checked" /><label for="ext_preserve_0">Replace all patron attributes</label>
         </li>
         <li class="radio">
-        <input type="radio" id="ext_preserve_1" name="ext_preserve" value="1" /><label for="ext_preserve_1">Replace only included Patron Attributes</label>
+        <input type="radio" id="ext_preserve_1" name="ext_preserve" value="1" /><label for="ext_preserve_1">Replace only included patron attributes</label>
         </li>
     </ol>
     </fieldset>
-- 
1.7.9.5

From oleonard at myacpl.org  Mon May  5 21:33:11 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon,  5 May 2014 15:33:11 -0400
Subject: [Koha-patches] [PATCH] Bug 12147 [Alternate] Column width for
	action links on invoices too small
Message-ID: <1399318391-7192-1-git-send-email-oleonard@myacpl.org>

This alternative patch groups "action" links into a menu as was done
with Bug 11763.

This patch also converts the date column sorting configuration to use
header class instead of an index.

This patch also corrects a couple of HTML markup errors: An
improperly-closed <input> and an improperly closed <option>.

To test, view the invoices page and confirm that the "Actions" menu
button works corectly. Test the functionality of each menu options:
Details, Close, Reopen, and Delete. Confirm that sorting by billing date
still works correctly.
---
 .../prog/en/modules/acqui/invoices.tt              |   41 +++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 7bfef8c..94efdf2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -11,14 +11,10 @@
 $(document).ready(function() {
     var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
         sDom: "t",
-        bPaginate: false,
-        bInfo: false,
-        "aoColumns": [
-            null,null,null,{ "sType": "title-string" },null,null,null,null
-        ],
         aoColumnDefs: [
             { "bSortable": false, "aTargets": [1, 8] },
-            { "bVisible": false, "aTargets": [0] }
+            { "bVisible": false, "aTargets": [0] },
+            { "sType": "title-string", "aTargets" : [ "title-string" ] }
         ]
     }));
 
@@ -110,7 +106,7 @@ $(document).ready(function() {
                 <th>&nbsp;</th>
                 <th>Invoice no.</th>
                 <th>Vendor</th>
-                <th>Billing date</th>
+                <th class="title-string">Billing date</th>
                 <th>Received biblios</th>
                 <th>Received items</th>
                 <th>Status</th>
@@ -121,7 +117,7 @@ $(document).ready(function() {
               [% FOREACH invoice IN invoices %]
                 <tr data-invoiceid="[% invoice.invoiceid %]" data-booksellerid="[% invoice.booksellerid %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid %]" data-closedate="[% invoice.closedate | $KohaDates %]">
                   <td>[% invoice.is_linked_to_subscriptions %]</td>
-                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid %]"></input></td>
+                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid %]" /></td>
                   <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]">[% invoice.invoicenumber %]</a></td>
                   <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid %]">[% invoice.suppliername %]</a></td>
                   <td>
@@ -141,15 +137,23 @@ $(document).ready(function() {
                     [% END %]
                   </td>
                   <td>
-                    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]">Details</a> /
-                    [% IF invoice.closedate %]
-                      <a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Reopen</a>
-                    [% ELSE %]
-                      <a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Close</a>
-                    [% END %]
-                    [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
-                      / <a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]">Delete</a>
-                    [% END %]
+
+                      <div class="dropdown dropup">
+                          <a class="btn btn-mini dropdown-toggle" id="invoiceactions[% invoice.invoiceid %]" role="button" data-toggle="dropdown" href="#">
+                             Actions <b class="caret"></b>
+                          </a>
+                          <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid %]">
+                              <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]"><i class="icon-search"></i> Details</a></li>
+                            [% IF invoice.closedate %]
+                                <li><a href="invoice.pl?op=reopen&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="icon-refresh"></i> Reopen</a></li>
+                            [% ELSE %]
+                                <li><a href="invoice.pl?op=close&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="icon-remove-sign"></i> Close</a></li>
+                            [% END %]
+                            [% UNLESS invoice.receivedbiblios || invoice.receiveditems %]
+                                <li><a href="invoice.pl?op=delete&amp;invoiceid=[% invoice.invoiceid %]&amp;referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber %]%26supplier=[% booksellerid %]%26billingdatefrom=[% billingdatefrom %]%26billingdateto=[% billingdateto %]%26isbneanissn=[% isbneanissn %]%26title=[% title %]%26author=[% author %]%26publisher=[% publisher %]%26publicationyear=[% publicationyear %]%26branch=[% branch %]"><i class="icon-remove"></i> Delete</a></li>
+                            [% END %]
+                          </ul>
+                      </div>
                   </td>
                 </tr>
               [% END %]
@@ -179,8 +183,7 @@ $(document).ready(function() {
                             <select id="merge_shipment_budgetid" name="shipment_budget_id">
                                 <option value="">No fund</option>
                               [% FOREACH budget IN budgets_loop %]
-                                  <option value="[% budget.budget_id %]">
-                                  [% budget.budget_name %]
+                                  <option value="[% invoice.invoiceid %]">[% budget.budget_name %]
                                   </option>
                               [% END %]
                             </select></li>
-- 
1.7.9.5

From oleonard at myacpl.org  Tue May  6 17:10:31 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 May 2014 11:10:31 -0400
Subject: [Koha-patches] [PATCH] Bug 12195 - Remove duplicated plugin
	jquery.dataTables.min.js
Message-ID: <1399389031-9504-1-git-send-email-oleonard@myacpl.org>

All templates in the staff client now load the DataTables jquery plugin
through a single include file, datatables.inc, which points to a copy of
the plugin in intranet-tmpl/lib/jquery/plugins. This patch removes the
unused copy of the plugin found in intranet-tmpl/prog/en/lib/jquery/plugins.

To test, search the Koha source for references to
jquery.dataTables.min.js. There should be no files which point to the
redundant file.
---
 .../en/lib/jquery/plugins/jquery.dataTables.min.js |  156 --------------------
 1 file changed, 156 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js

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
deleted file mode 100644
index 044af05..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * File:        jquery.dataTables.min.js
- * Version:     1.9.1
- * Author:      Allan Jardine (www.sprymedia.co.uk)
- * Info:        www.datatables.net
- *
- * 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:
- *   http://datatables.net/license_gpl2
- *   http://datatables.net/license_bsd
- *
- * This source file 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 license files for details.
- */
-(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.9.5

From oleonard at myacpl.org  Tue May  6 18:56:52 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 May 2014 12:56:52 -0400
Subject: [Koha-patches] [PATCH] Bug 12199 - Move textarea-expander and
	tablednd jQuery plugins outside of language-specific directory
Message-ID: <1399395412-12290-1-git-send-email-oleonard@myacpl.org>

This patch moves the textarea-expander and tablednd jQuery plugins to
intranet-tmpl/prog/lib/jquery/plugins so that they will not be
duplicated for each set of translated templates.

To test you must have the SearchEngine system preference set to 'Solr.'
Apply the patch and test Solr search engine configuration in
Administration -> Search engine configuration. Textarea resizing should
work correctly. Table row reordering should work correctly.
---
 .../lib/jquery/plugins/jquery.textarea-expander.js |    0
 .../{prog/en => }/lib/jquery/plugins/tablednd.js   |    0
 .../en/modules/admin/searchengine/solr/indexes.tt  |    4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/plugins/jquery.textarea-expander.js (100%)
 rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/plugins/tablednd.js (100%)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.textarea-expander.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.textarea-expander.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.textarea-expander.js
rename to koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.textarea-expander.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/tablednd.js b/koha-tmpl/intranet-tmpl/lib/jquery/plugins/tablednd.js
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/tablednd.js
rename to koha-tmpl/intranet-tmpl/lib/jquery/plugins/tablednd.js
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/solr/indexes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/solr/indexes.tt
index b72a1ea..1f7c35b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/solr/indexes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/solr/indexes.tt
@@ -1,8 +1,8 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Solr config</title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/tablednd.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.textarea-expander.js"></script>
+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/tablednd.js"></script>
+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.textarea-expander.js"></script>
 <script type="text/javascript">
     function clean_line( line ) {
         $(line).find('input[type="text"]').val("");
-- 
1.7.9.5

From tomascohen at gmail.com  Fri May  9 20:26:52 2014
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri,  9 May 2014 15:26:52 -0300
Subject: [Koha-patches] [PATCH 1/3] Bug 11404: Apache 2.4 expects the sites
	definition files use the sufix '.conf'
Message-ID: <1399660014-21181-1-git-send-email-tomascohen@gmail.com>

To reproduce:
- Install the 'koha-common' package on Debian 7 or Ubuntu 13.10+
  (both known to include Apache 2.4).
- Create an instance (for example testlibrary) using the supplied commands:
 $ koha-create --create-db testlibrary
> FAIL: apache reports an error like this:
"ERROR: Site testlibrary does not exist!"

This patch adds a test on the Apache version and appends the needed ".conf" sufix
if needed.

To test:

1st step: koha-create gets fixed:

-- The hard way --
- Apply the patch, and build the koha-common package on top of this commit.
- Install the built package on an Apache 2.4 Debian-based distro (Debian 7 or Ubuntu 13.10 will work)
- Create a test instance:
 $ koha-create --create-db testlibrary
> SUCCESS: no more apache sites related error.

-- The easy way --
- Apply the patch, and copy the koha-create into an Apache 2.4 Debian-based distro
- Create a test instance using the koha-create script you just copied:
 $ ./koha-create --create-db testlibrary
> SUCCESS: no more apache sites related error.

2nd step: the rest of the touched scripts keep working as usual

koha-disable
koha-dump
koha-enable
koha-list
koha-remove
koha-restart-zebra
koha-stop-zebra
koha-start-zebra

They should all keep working. Can be tested "the easy way" too.

Then sign on the patch.

Note: there might be another issues regarding Apache 2.4 deployments like the need for

 $ a2enmod access_compat

and perhaps some directory permissions tweak, which I think should be properly
documented on the install instructions.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/scripts/koha-create        | 62 ++++++++++++++++++++++++++++++---------
 debian/scripts/koha-disable       |  6 ++--
 debian/scripts/koha-dump          |  5 ++--
 debian/scripts/koha-enable        |  6 ++--
 debian/scripts/koha-list          |  3 +-
 debian/scripts/koha-remove        |  7 +++--
 debian/scripts/koha-restart-zebra |  3 +-
 debian/scripts/koha-start-zebra   |  3 +-
 debian/scripts/koha-stop-zebra    |  3 +-
 9 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 826163c..a96cf3e 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -123,6 +123,50 @@ getinstancemysqldatabase() {
     xmlstarlet sel -t -v 'yazgfs/config/database' "/etc/koha/sites/$1/koha-conf.xml"
 }
 
+check_apache_config()
+{
+
+    # Check that mpm_itk is installed and enabled
+    if ! /usr/sbin/apachectl -M 2> /dev/null | grep -q 'mpm_itk'; then
+        # Check Apache version
+        APACHE_DISABLE_MPM_MSG=""
+        if /usr/sbin/apache2ctl -v | grep -q "Server version: Apache/2.4"; then
+            # mpm_event or mpm_worker need to be disabled first. mpm_itk depends
+            # on mpm_prefork, which is enabled if needed. See
+            # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734865
+            if /usr/sbin/apachectl -M 2> /dev/null | grep -q 'mpm_event'; then
+                APACHE_DISABLE_MPM_MSG=" sudo a2dismod mpm_event ;"
+            elif /usr/sbin/apachectl -M 2> /dev/null | grep -q 'mpm_worker'; then
+                APACHE_DISABLE_MPM_MSG=" sudo a2dismod mpm_worker ;"
+            # else mpm_prefork: a2enmod mpm_itk works
+            fi
+        # else Apache 2.2: a2enmod mpm_itk works
+        fi
+
+        cat 1>&2  <<EOM
+
+Koha requires mpm_itk to be enabled within Apache in order to run.
+Typically this can be enabled with:
+
+   $APACHE_DISABLE_MPM_MSG sudo a2enmod mpm_itk
+EOM
+
+        die
+    fi
+
+    # Check that mod_rewrite is installed and enabled.
+    if ! /usr/sbin/apachectl -M 2> /dev/null | grep -q 'rewrite_module'; then
+        cat 1>&2  <<EOM
+
+Koha requires mod_rewrite to be enabled within Apache in order to run.
+Typically this can be enabled with:
+
+    sudo a2enmod rewrite
+EOM
+        die
+    fi
+}
+
 set_biblios_indexing_mode()
 {
     local indexing_mode=$1
@@ -373,7 +417,7 @@ elif [ "$CLO_MEMCACHED_SERVERS" != "" ] || \
 
 Error: you provided memcached configuration switches but memcached is not enabled.
 Please set USE_MEMCACHED="yes" on /etc/koha/koha-sites.conf or use the
---use-memcached optio switch to enable it.
+--use-memcached option switch to enable it.
 
 EOF`
 
@@ -391,18 +435,8 @@ then
     die "This script must be run with root privileges."
 fi
 
-# Check that mod_rewrite is installed so we can bail out if it's not.
-if ! /usr/sbin/apachectl -M 2> /dev/null | grep -q 'rewrite_module'
-then
-    cat 1>&2  <<EOM
-
-Koha requires mod_rewrite to be enabled within Apache in order to run.
-Typically this can be enabled with:
-
-    sudo a2enmod rewrite
-EOM
-    die
-fi
+# Check everything is ok with Apache, die otherwise
+check_apache_config
 
 opacdomain="$OPACPREFIX$name$OPACSUFFIX$DOMAIN"
 intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN"
@@ -493,7 +527,7 @@ eof
 
     # Generate and install Apache site-available file and log dir.
     generate_config_file apache-site.conf.in \
-        "/etc/apache2/sites-available/$name"
+        "/etc/apache2/sites-available/$name.conf"
     mkdir "/var/log/koha/$name"
     chown "$username:$username" "/var/log/koha/$name"
 
diff --git a/debian/scripts/koha-disable b/debian/scripts/koha-disable
index 75e3997..91e31b6 100755
--- a/debian/scripts/koha-disable
+++ b/debian/scripts/koha-disable
@@ -34,13 +34,14 @@ warn()
 is_enabled()
 {
     local instancename=$1
+    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if ! is_instance $instancename; then
         return 1
     fi
 
     if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "/etc/apache2/sites-available/$instancename" ; then
+            "$instancefile" ; then
         return 1
     else
         return 0
@@ -63,10 +64,11 @@ is_instance()
 disable_instance()
 {
     local instancename=$1
+    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if is_enabled $instancename; then
         sed -i 's:^\s*#\(\s*Include /etc/koha/apache-shared-disable.conf\)$:\1:' \
-          "/etc/apache2/sites-available/$instancename"
+          "$instancefile"
         return 0
     else
         return 1
diff --git a/debian/scripts/koha-dump b/debian/scripts/koha-dump
index 02aeb93..fb770d4 100755
--- a/debian/scripts/koha-dump
+++ b/debian/scripts/koha-dump
@@ -54,14 +54,15 @@ mysqldump --databases --host="$mysqlhost" \
 chown "root:$name-koha" "$dbdump"
 chmod g+r "$dbdump"
 
+instancefile="$name.conf"
 
 # Dump configs, logs, etc.
 metadump="$backupdir/$name-$date.tar.gz"
 echo "* configs, logs to $metadump"
 tar -C / -czf "$metadump" \
     "etc/koha/sites/$name" \
-    "etc/apache2/sites-available/$name" \
-    "etc/apache2/sites-enabled/$name" \
+    "etc/apache2/sites-available/$instancefile" \
+    "etc/apache2/sites-enabled/$instancefile" \
     "var/lib/koha/$name" \
     "var/log/koha/$name"
 
diff --git a/debian/scripts/koha-enable b/debian/scripts/koha-enable
index c0bbfa2..b5f0cd2 100755
--- a/debian/scripts/koha-enable
+++ b/debian/scripts/koha-enable
@@ -34,13 +34,14 @@ warn()
 is_enabled()
 {
     local instancename=$1
+    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if ! is_instance $instancename; then
         return 1
     fi
 
     if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "/etc/apache2/sites-available/$instancename" ; then
+            "$instancefile" ; then
         return 1
     else
         return 0
@@ -63,10 +64,11 @@ is_instance()
 enable_instance()
 {
     local instancename=$1
+    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if ! is_enabled $instancename; then
         sed -i 's:^\(\s*Include /etc/koha/apache-shared-disable.conf\)$:#\1:' \
-            "/etc/apache2/sites-available/$instancename"
+            "$instancefile"
         return 0
     else
         return 1
diff --git a/debian/scripts/koha-list b/debian/scripts/koha-list
index 445a22a..ea8ae4b 100755
--- a/debian/scripts/koha-list
+++ b/debian/scripts/koha-list
@@ -28,9 +28,10 @@ die()
 is_enabled()
 {
     local instancename=$1
+    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if grep '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "/etc/apache2/sites-available/$instancename" > /dev/null
+            "$instancefile" > /dev/null
     then
         return 1
     else
diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index 3fa5ef1..40bb3f6 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -68,8 +68,11 @@ eof
     
     # If the daemon is not running already, we don't want to fail this loop. So bin the result code if this fails.
     koha-stop-zebra $name || /bin/true
-    [ -f "/etc/apache2/sites-available/$name" ]  && \
-        rm "/etc/apache2/sites-available/$name"
+
+    instancefile="$name.conf"
+
+    [ -f "/etc/apache2/sites-available/$instancefile" ]  && \
+        rm "/etc/apache2/sites-available/$instancefile"
     [ -f "/etc/koha/sites/$name/koha-conf.xml" ] && \
         rm "/etc/koha/sites/$name/koha-conf.xml"
     [ -f "/etc/koha/sites/$name/zebra-biblios.cfg" ] && \
diff --git a/debian/scripts/koha-restart-zebra b/debian/scripts/koha-restart-zebra
index 024251e..8b4b681 100755
--- a/debian/scripts/koha-restart-zebra
+++ b/debian/scripts/koha-restart-zebra
@@ -32,13 +32,14 @@ warn()
 is_enabled()
 {
     local instancename=$1
+    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if ! is_instance $instancename; then
         return 1
     fi
 
     if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "/etc/apache2/sites-available/$instancename" ; then
+            "$instancefile" ; then
         return 1
     else
         return 0
diff --git a/debian/scripts/koha-start-zebra b/debian/scripts/koha-start-zebra
index f63ab42..069b31a 100755
--- a/debian/scripts/koha-start-zebra
+++ b/debian/scripts/koha-start-zebra
@@ -32,13 +32,14 @@ warn()
 is_enabled()
 {
     local instancename=$1
+    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if ! is_instance $instancename; then
         return 1
     fi
 
     if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "/etc/apache2/sites-available/$instancename" ; then
+            "$instancefile" ; then
         return 1
     else
         return 0
diff --git a/debian/scripts/koha-stop-zebra b/debian/scripts/koha-stop-zebra
index e60f2b3..2c8b726 100755
--- a/debian/scripts/koha-stop-zebra
+++ b/debian/scripts/koha-stop-zebra
@@ -32,13 +32,14 @@ warn()
 is_enabled()
 {
     local instancename=$1
+    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if ! is_instance $instancename; then
         return 1
     fi
 
     if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "/etc/apache2/sites-available/$instancename" ; then
+            "$instancefile" ; then
         return 1
     else
         return 0
-- 
1.9.1


From tomascohen at gmail.com  Fri May  9 20:26:53 2014
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri,  9 May 2014 15:26:53 -0300
Subject: [Koha-patches] [PATCH 2/3] Bug 11404: koha-functions.sh introduced
	for reuse
In-Reply-To: <1399660014-21181-1-git-send-email-tomascohen@gmail.com>
References: <1399660014-21181-1-git-send-email-tomascohen@gmail.com>
Message-ID: <1399660014-21181-2-git-send-email-tomascohen@gmail.com>

As asked by Robin, a bash lib of functions is introduced with the common
functions to be reused. Most of the scripts are modified (reduced) to include
this file and the repeated functions cleaned.

No noticeable change in behaviour should be noticed.

As I've been said in #debian-mentors, it is used that files for inclusion
should be installed at the apps directory (i.e. /usr/share/koha/) so this
patch makes the install script put the file in the bin/ directory.

All koha-* scripts assume the file is there already (and fail otherwise).

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/scripts/koha-create        |  13 +++--
 debian/scripts/koha-disable       |  59 ++++++-------------
 debian/scripts/koha-dump          |  14 ++---
 debian/scripts/koha-email-disable |  39 ++-----------
 debian/scripts/koha-email-enable  |  39 ++-----------
 debian/scripts/koha-enable        |  46 ++-------------
 debian/scripts/koha-functions.sh  | 115 ++++++++++++++++++++++++++++++++++++++
 debian/scripts/koha-list          |  52 ++---------------
 debian/scripts/koha-mysql         |   9 ++-
 debian/scripts/koha-mysqlcheck    |   9 ++-
 debian/scripts/koha-rebuild-zebra |  28 ++--------
 debian/scripts/koha-remove        |  16 ++++--
 debian/scripts/koha-reset-passwd  |  11 ++--
 debian/scripts/koha-restart-zebra |  58 ++-----------------
 debian/scripts/koha-restore       |  11 ++--
 debian/scripts/koha-start-zebra   | 105 ++++++++++------------------------
 debian/scripts/koha-stop-zebra    |  93 ++++++++----------------------
 debian/scripts/koha-translate     |  14 +++--
 18 files changed, 276 insertions(+), 455 deletions(-)
 create mode 100755 debian/scripts/koha-functions.sh

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index a96cf3e..1556051 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -19,6 +19,14 @@
 
 set -e
 
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
+    exit 1
+fi
+
 usage()
 {
     local scriptname=$0
@@ -63,11 +71,6 @@ Note: the instance name cannot be longer that 11 chars.
 EOF
 }
 
-die() {
-    echo "$@" 1>&2
-    exit 1
-}
-
 # UPPER CASE VARIABLES - from configfile or default value
 # lower case variables - generated within this script
 generate_config_file() {
diff --git a/debian/scripts/koha-disable b/debian/scripts/koha-disable
index 91e31b6..762ac13 100755
--- a/debian/scripts/koha-disable
+++ b/debian/scripts/koha-disable
@@ -19,52 +19,22 @@
 
 set -e
 
-
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_enabled()
-{
-    local instancename=$1
-    local instancefile="/etc/apache2/sites-available/$instancename.conf"
-
-    if ! is_instance $instancename; then
-        return 1
-    fi
-
-    if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "$instancefile" ; then
-        return 1
-    else
-        return 0
-    fi
-}
+fi
 
-is_instance()
+disable_instance()
 {
-    local instancename=$1
+    local site=$1
+    local instancefile=$(get_apache_config_for $site)
 
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
+    if [ "$instancefile" = ""]; then
+        return 2
     fi
-}
-
-disable_instance()
-{
-    local instancename=$1
-    local instancefile="/etc/apache2/sites-available/$instancename.conf"
 
     if is_enabled $instancename; then
         sed -i 's:^\s*#\(\s*Include /etc/koha/apache-shared-disable.conf\)$:\1:' \
@@ -94,10 +64,13 @@ restart_apache="no"
 for name in "$@"
 do
     if is_instance $name ; then
-        if disable_instance $name; then
+        RET=$(disable_instance $name)
+        if [ "$RET" = 0 ]; then
             restart_apache="yes"
+        elif [ "$RET" = 2 ]; then
+            warn "Error: Apache configuration file not present for instance $name."
         else
-            warn "Instance $name already disabled."
+            warn "Warning: instance $name already disabled."
         fi
     else
         warn "Unknown instance $name."
diff --git a/debian/scripts/koha-dump b/debian/scripts/koha-dump
index fb770d4..bf4bd5f 100755
--- a/debian/scripts/koha-dump
+++ b/debian/scripts/koha-dump
@@ -19,17 +19,17 @@
 
 set -e
 
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
+    exit 1
+fi
 
 # Make sure the files we create are not accessible by anyone else.
 umask 0077
 
-
-die() {
-    echo "$@" 1>&2
-    exit 1
-}
-
-
 # Parse command line.
 [ "$#" = 1 ] || die "Usage: $0 instancename"
 name="$1"
diff --git a/debian/scripts/koha-email-disable b/debian/scripts/koha-email-disable
index 615f4f4..3d3d697 100755
--- a/debian/scripts/koha-email-disable
+++ b/debian/scripts/koha-email-disable
@@ -18,40 +18,13 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-is_email_enabled()
-{
-    local instancename=$1
-
-    if [ -e /var/lib/koha/$instancename/email.enabled ]; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 disable_email()
 {
diff --git a/debian/scripts/koha-email-enable b/debian/scripts/koha-email-enable
index a130c49..7a941c4 100755
--- a/debian/scripts/koha-email-enable
+++ b/debian/scripts/koha-email-enable
@@ -18,40 +18,13 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-is_email_enabled()
-{
-    local instancename=$1
-
-    if [ -e /var/lib/koha/$instancename/email.enabled ]; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 enable_email()
 {
diff --git a/debian/scripts/koha-enable b/debian/scripts/koha-enable
index b5f0cd2..67cbc8b 100755
--- a/debian/scripts/koha-enable
+++ b/debian/scripts/koha-enable
@@ -19,47 +19,13 @@
 
 set -e
 
-
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_enabled()
-{
-    local instancename=$1
-    local instancefile="/etc/apache2/sites-available/$instancename.conf"
-
-    if ! is_instance $instancename; then
-        return 1
-    fi
-
-    if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "$instancefile" ; then
-        return 1
-    else
-        return 0
-    fi
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 enable_instance()
 {
diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh
new file mode 100755
index 0000000..2ddfb67
--- /dev/null
+++ b/debian/scripts/koha-functions.sh
@@ -0,0 +1,115 @@
+#!/bin/sh
+#
+# koha-functions.sh -- shared library of helper functions for koha-* scripts
+# Copyright 2014 - Tomas Cohen Arazi
+#                  Universidad Nacional de Cordoba
+# 
+# This program 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 3 of the License, or
+# (at your option) any later version.
+# 
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+die()
+{
+    echo "$@" 1>&2
+    exit 1
+}
+
+warn()
+{
+    echo "$@" 1>&2
+}
+
+get_apache_config_for()
+{
+    local site=$1
+    local sitefile="/etc/apache2/sites-available/$site"
+
+    if is_instance $site; then
+        if [ -f "$sitefile.conf" ]; then
+            echo "$sitefile.conf"
+        elif [ -f "$sitefile" ]; then
+            echo "$sitefile"
+        fi
+    fi
+}
+
+is_enabled()
+{
+    local site=$1
+    local instancefile=$(get_apache_config_for $site)
+
+    if [ "$instancefile" = "" ]; then
+        return 1
+    fi
+
+    if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
+            "$instancefile" ; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+is_instance()
+{
+    local instancename=$1
+
+    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
+                         -type d -printf '%f\n'\
+          | grep -q -x "$instancename" ; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+is_email_enabled()
+{
+    local instancename=$1
+
+    if [ -e /var/lib/koha/$instancename/email.enabled ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+is_sip_enabled()
+{
+    local instancename=$1
+
+    if [ -e /etc/koha/sites/$instancename/SIPconfig.xml ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+is_zebra_running()
+{
+    local instancename=$1
+
+    if daemon --name="$instancename-koha-zebra" \
+            --user="$instancename-koha.$instancename-koha" \
+            --running ; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+get_instances()
+{
+    find /etc/koha/sites -mindepth 1 -maxdepth 1\
+                         -type d -printf '%f\n' | sort
+}
diff --git a/debian/scripts/koha-list b/debian/scripts/koha-list
index ea8ae4b..848494b 100755
--- a/debian/scripts/koha-list
+++ b/debian/scripts/koha-list
@@ -19,53 +19,13 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-is_enabled()
-{
-    local instancename=$1
-    local instancefile="/etc/apache2/sites-available/$instancename.conf"
-
-    if grep '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "$instancefile" > /dev/null
-    then
-        return 1
-    else
-        return 0
-    fi
-}
-
-is_email_enabled()
-{
-    local instancename=$1
-
-    if [ -e /var/lib/koha/$instancename/email.enabled ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-is_sip_enabled()
-{
-    local instancename=$1
-
-    if [ -e /etc/koha/sites/$instancename/SIPconfig.xml ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-get_instances()
-{
-    find /etc/koha/sites -mindepth 1 -maxdepth 1\
-                         -type d -printf '%f\n' | sort
-}
+fi
 
 show_instances()
 {
diff --git a/debian/scripts/koha-mysql b/debian/scripts/koha-mysql
index fb3fba9..d1f9576 100755
--- a/debian/scripts/koha-mysql
+++ b/debian/scripts/koha-mysql
@@ -21,10 +21,13 @@ set -e
 
 umask 0077
 
-die() {
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
+fi
 
 [ "$#" = 1 ] || die "Usage: $0 instancename"
 name="$1"
diff --git a/debian/scripts/koha-mysqlcheck b/debian/scripts/koha-mysqlcheck
index 5a5286b..d3b8363 100755
--- a/debian/scripts/koha-mysqlcheck
+++ b/debian/scripts/koha-mysqlcheck
@@ -21,10 +21,13 @@ set -e
 
 umask 0077
 
-die() {
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
+fi
 
 # Parse command line.
 if [ $# -lt 1 ]; then
diff --git a/debian/scripts/koha-rebuild-zebra b/debian/scripts/koha-rebuild-zebra
index 6464958..f8267c5 100755
--- a/debian/scripts/koha-rebuild-zebra
+++ b/debian/scripts/koha-rebuild-zebra
@@ -19,29 +19,13 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 toggle_biblios_only()
 {
diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index 40bb3f6..38c6c85 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -19,6 +19,14 @@
 
 set -e
 
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
+    exit 1
+fi
+
 args=$(getopt -l keep-mysql -o k -n $0 -- "$@")
 eval set -- $args
 while [ ! -z "$1" ]
@@ -35,7 +43,7 @@ NAMES="$@"
 
 SITECONFDIR="/etc/koha/sites"
 # There has to be a better way of excluding '.' from find. But this works.
-INSTANCES=`cd $SITECONFDIR && find . -type d -printf " %f" |sed s/\ .\ //`
+INSTANCES=$(get_instances)
 
 if [ -z $NAMES ] ; then
     echo "Please specify a Koha instance name. Your choices are:"
@@ -69,10 +77,10 @@ eof
     # If the daemon is not running already, we don't want to fail this loop. So bin the result code if this fails.
     koha-stop-zebra $name || /bin/true
 
-    instancefile="$name.conf"
+    instancefile=$(get_apache_config_for $name)
 
-    [ -f "/etc/apache2/sites-available/$instancefile" ]  && \
-        rm "/etc/apache2/sites-available/$instancefile"
+    [ -f "$instancefile" ]  && \
+        rm "$instancefile"
     [ -f "/etc/koha/sites/$name/koha-conf.xml" ] && \
         rm "/etc/koha/sites/$name/koha-conf.xml"
     [ -f "/etc/koha/sites/$name/zebra-biblios.cfg" ] && \
diff --git a/debian/scripts/koha-reset-passwd b/debian/scripts/koha-reset-passwd
index fd4a60e..317e2bc 100755
--- a/debian/scripts/koha-reset-passwd
+++ b/debian/scripts/koha-reset-passwd
@@ -19,12 +19,13 @@
 
 set -e
 
-
-die() {
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
+fi
 
 pwdigest() {
     echo -n "$1" |
diff --git a/debian/scripts/koha-restart-zebra b/debian/scripts/koha-restart-zebra
index 8b4b681..1c8ace9 100755
--- a/debian/scripts/koha-restart-zebra
+++ b/debian/scripts/koha-restart-zebra
@@ -18,59 +18,13 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_enabled()
-{
-    local instancename=$1
-    local instancefile="/etc/apache2/sites-available/$instancename.conf"
-
-    if ! is_instance $instancename; then
-        return 1
-    fi
-
-    if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "$instancefile" ; then
-        return 1
-    else
-        return 0
-    fi
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-is_zebra_running()
-{
-    local instancename=$1
-
-    if daemon --name="$instancename-koha-zebra" \
-            --user="$instancename-koha.$instancename-koha" \
-            --running ; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 restart_zebra_instance()
 {
diff --git a/debian/scripts/koha-restore b/debian/scripts/koha-restore
index caf4c7d..e8ec053 100755
--- a/debian/scripts/koha-restore
+++ b/debian/scripts/koha-restore
@@ -19,12 +19,13 @@
 
 set -e
 
-
-die() {
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
+fi
 
 # Parse command line.
 [ "$#" = 2 ] || die "Usage: $0 sqldump configdump"
diff --git a/debian/scripts/koha-start-zebra b/debian/scripts/koha-start-zebra
index 069b31a..7d25b81 100755
--- a/debian/scripts/koha-start-zebra
+++ b/debian/scripts/koha-start-zebra
@@ -18,90 +18,41 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_enabled()
-{
-    local instancename=$1
-    local instancefile="/etc/apache2/sites-available/$instancename.conf"
-
-    if ! is_instance $instancename; then
-        return 1
-    fi
-
-    if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "$instancefile" ; then
-        return 1
-    else
-        return 0
-    fi
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-is_zebra_running()
-{
-    local instancename=$1
-
-    if daemon --name="$instancename-koha-zebra" \
-            --user="$instancename-koha.$instancename-koha" \
-            --running ; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 start_zebra_instance()
 {
     local instancename=$1
 
-    if is_enabled $instancename; then
-        echo "Starting Zebra server for $instancename"
-        touch "/var/log/koha/$instancename/zebra-error.log" \
-            "/var/log/koha/$instancename/zebra.log" \
-            "/var/log/koha/$instancename/zebra-output.log"
-        chown "$instancename-koha:$instancename-koha" \
-            "/var/log/koha/$instancename/zebra-error.log" \
-            "/var/log/koha/$instancename/zebra.log" \
-            "/var/log/koha/$instancename/zebra-output.log"
-        daemon \
-            --name="$instancename-koha-zebra" \
-            --errlog="/var/log/koha/$instancename/zebra-error.log" \
-            --stdout="/var/log/koha/$instancename/zebra.log" \
-            --output="/var/log/koha/$instancename/zebra-output.log" \
-            --verbose=1 \
-            --respawn \
-            --delay=30 \
-            --user="$instancename-koha.$instancename-koha" \
-            -- \
-            zebrasrv \
-            -v none,fatal,warn \
-            -f "/etc/koha/sites/$instancename/koha-conf.xml" && \
-        return 0
-    else
+    echo "Starting Zebra server for $instancename"
+    touch "/var/log/koha/$instancename/zebra-error.log" \
+        "/var/log/koha/$instancename/zebra.log" \
+        "/var/log/koha/$instancename/zebra-output.log"
+    chown "$instancename-koha:$instancename-koha" \
+        "/var/log/koha/$instancename/zebra-error.log" \
+        "/var/log/koha/$instancename/zebra.log" \
+        "/var/log/koha/$instancename/zebra-output.log"
+    daemon \
+        --name="$instancename-koha-zebra" \
+        --errlog="/var/log/koha/$instancename/zebra-error.log" \
+        --stdout="/var/log/koha/$instancename/zebra.log" \
+        --output="/var/log/koha/$instancename/zebra-output.log" \
+        --verbose=1 \
+        --respawn \
+        --delay=30 \
+        --user="$instancename-koha.$instancename-koha" \
+        -- \
+        zebrasrv \
+        -v none,fatal,warn \
+        -f "/etc/koha/sites/$instancename/koha-conf.xml" && \
+        return 0 || \
         return 1
-    fi
 }
 
 usage()
diff --git a/debian/scripts/koha-stop-zebra b/debian/scripts/koha-stop-zebra
index 2c8b726..cf5084d 100755
--- a/debian/scripts/koha-stop-zebra
+++ b/debian/scripts/koha-stop-zebra
@@ -18,84 +18,35 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_enabled()
-{
-    local instancename=$1
-    local instancefile="/etc/apache2/sites-available/$instancename.conf"
-
-    if ! is_instance $instancename; then
-        return 1
-    fi
-
-    if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "$instancefile" ; then
-        return 1
-    else
-        return 0
-    fi
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-is_zebra_running()
-{
-    local instancename=$1
-
-    if daemon --name="$instancename-koha-zebra" \
-            --user="$instancename-koha.$instancename-koha" \
-            --running ; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 stop_zebra_instance()
 {
     local instancename=$1
 
-    if is_zebra_running $instancename; then
-        echo "Stopping Zebra server for $instancename"
-        daemon \
-            --name="$instancename-koha-zebra" \
-            --errlog="/var/log/koha/$instancename/zebra-error.log" \
-            --stdout="/var/log/koha/$instancename/zebra.log" \
-            --output="/var/log/koha/$instancename/zebra-output.log" \
-            --verbose=1 \
-            --respawn \
-            --delay=30 \
-            --user="$instancename-koha.$instancename-koha" \
-            --stop \
-            -- \
-            zebrasrv \
-            -v none,fatal,warn \
-            -f "/etc/koha/sites/$instancename/koha-conf.xml" && \
-        return 0
-    else
+    echo "Stopping Zebra server for $instancename"
+    daemon \
+        --name="$instancename-koha-zebra" \
+        --errlog="/var/log/koha/$instancename/zebra-error.log" \
+        --stdout="/var/log/koha/$instancename/zebra.log" \
+        --output="/var/log/koha/$instancename/zebra-output.log" \
+        --verbose=1 \
+        --respawn \
+        --delay=30 \
+        --user="$instancename-koha.$instancename-koha" \
+        --stop \
+        -- \
+        zebrasrv \
+        -v none,fatal,warn \
+        -f "/etc/koha/sites/$instancename/koha-conf.xml" && \
+        return 0 || \
         return 1
-    fi
 }
 
 usage()
diff --git a/debian/scripts/koha-translate b/debian/scripts/koha-translate
index 0164a72..16ae5cf 100755
--- a/debian/scripts/koha-translate
+++ b/debian/scripts/koha-translate
@@ -20,6 +20,14 @@
 
 set -e
 
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
+    exit 1
+fi
+
 usage()
 {
     local scriptname=$(basename $0)
@@ -50,12 +58,6 @@ $scriptname --help|-h
 EOF
 }
 
-die()
-{
-    echo "$@" 1>&2
-    exit 1
-}
-
 list()
 {
     all=$1
-- 
1.9.1


From tomascohen at gmail.com  Fri May  9 20:26:54 2014
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri,  9 May 2014 15:26:54 -0300
Subject: [Koha-patches] [PATCH 3/3] Bug 11404: Make the install process
	aware of the changes
In-Reply-To: <1399660014-21181-1-git-send-email-tomascohen@gmail.com>
References: <1399660014-21181-1-git-send-email-tomascohen@gmail.com>
Message-ID: <1399660014-21181-3-git-send-email-tomascohen@gmail.com>

This patch makes the install scripts take care of the new file
and prompt for user confirmation on the apache file renaming step.

Both prompt and the renaming actions depend on the fact that there
are instances with their files missing the .conf appendix.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/koha-common.config    |  2 ++
 debian/koha-common.install   |  1 +
 debian/koha-common.postinst  | 49 ++++++++++++++++++++++++++++++++++++++++++++
 debian/koha-common.templates |  8 ++++++++
 4 files changed, 60 insertions(+)

diff --git a/debian/koha-common.config b/debian/koha-common.config
index 3f97df9..0504da2 100755
--- a/debian/koha-common.config
+++ b/debian/koha-common.config
@@ -42,5 +42,7 @@ fi
 
 db_input medium koha-common/automatically-update-translations || true
 
+db_input high koha-common/rename-apache-vhost-files || true
+
 db_go || true
 
diff --git a/debian/koha-common.install b/debian/koha-common.install
index e215bde..90a06d9 100644
--- a/debian/koha-common.install
+++ b/debian/koha-common.install
@@ -7,6 +7,7 @@ debian/koha-post-install-setup              usr/sbin
 debian/unavailable.html                     usr/share/koha/intranet/htdocs
 debian/unavailable.html                     usr/share/koha/opac/htdocs
 debian/templates/*                          etc/koha
+debian/scripts/koha-functions.sh            usr/share/koha/bin
 debian/scripts/koha-create                  usr/sbin
 debian/scripts/koha-create-dirs             usr/sbin
 debian/scripts/koha-disable                 usr/sbin
diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst
index f22bcb0..1912659 100644
--- a/debian/koha-common.postinst
+++ b/debian/koha-common.postinst
@@ -78,6 +78,55 @@ EOF
     fi
 fi
 
+# Check if we need to rename the Apache vhost files
+RENAME_APACHE_FILES="no"
+for vhost in $(koha-list); do
+    if [ -f "/etc/apache2/sites-available/$vhost" ] && \
+       [ ! -f "/etc/apache2/sites-available/$vhost.conf" ]; then
+       RENAME_APACHE_FILES="yes"
+       break # at least one, trigger renaming
+    fi
+done
+
+if [ "$RENAME_APACHE_FILES" = "yes" ]; then
+    # If the user agreed we now rename their Apache files
+    db_get koha-common/rename-apache-vhost-files
+    if [ "$RET" = "false" ]; then
+        # We're not renaming the files, just print a warning
+        cat <<EOF >&2
+Warning: you have chosen not to migrate your Apache virtual hosts files to the
+Apache 2.4 naming schema. You can do it manually by running this for each
+Koha instance:
+
+    $ sudo a2dissite instance
+    $ sudo mv /etc/apache2/sites-available/instance \
+              /etc/apache2/sites-available/instance.conf
+    $ sudo a2ensite instance
+EOF
+    else
+        # We have to rename the Apache files
+        for site in $(koha-list); do
+            ENABLE_VHOST="yes"
+            if [ -f "/etc/apache2/sites-available/$site" ] && \
+               [ ! -f "/etc/apache2/sites-available/$site.conf" ]; then
+                if ! a2dissite $site > /dev/null 2>&1; then
+                    echo "Warning: problem disabling $site in Apache" >&2
+                    ENABLE_VHOST="no"
+                fi
+                # Rename the vhost definition files
+                mv "/etc/apache2/sites-available/$site" \
+                   "/etc/apache2/sites-available/$site.conf"
+
+                if [ "$ENABLE_VHOST" = "yes" ]; then
+                    if ! a2ensite $site > /dev/null 2>&1; then
+                        echo "Warning: problem enabling $site in Apache" >&2
+                    fi
+                fi
+            fi
+        done
+    fi
+fi
+
 db_stop
 
 exit 0
diff --git a/debian/koha-common.templates b/debian/koha-common.templates
index 5576fe8..a6e86d2 100644
--- a/debian/koha-common.templates
+++ b/debian/koha-common.templates
@@ -15,3 +15,11 @@ Default: true
 Description: automatically update translations
   When Koha is upgraded, any existing translated templates can be regenerated
   to keep everything in sync. Select "yes" if you want this.
+
+Template: koha-common/rename-apache-vhost-files
+Type: boolean
+Default: true
+Description: Rename the Apache virtual hosts files for Koha instances?
+ When Koha is upgraded, the Apache's virtual host definition files can be
+ renamed to match the needs of the newer Apache 2.4. Previously defined
+ Koha instances will get their Apache files appended '.conf'.
-- 
1.9.1


From nengard at bywatersolutions.com  Tue May 13 14:25:31 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 13 May 2014 07:25:31 -0500
Subject: [Koha-patches] [PATCH] [BUG 12244] Koha 3.16 Circ Help Updates
Message-ID: <1399983931-1668-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the check in help (the only change for 3.16).

To test:
* Visit Circulation > Check in
* Click Help
* Confirm that help text is right
---
 .../prog/en/modules/help/circ/returns.tt           |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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 b580b7d..b5c6312 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
@@ -23,6 +23,8 @@
 
 <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>
 
+<p>If you have the SpecifyReturnDate preference set to 'Allow' you will be able to arbitrarily set the return date from below the check in box.</p>
+
 <h3>Check In Messages</h3>
 
 <p>There are several messages that can appear when checking items in:</p>
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue May 13 14:39:47 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 13 May 2014 07:39:47 -0500
Subject: [Koha-patches] [PATCH] [BUG 12244] Update Patron help files for 3.16
Message-ID: <1399984787-1802-1-git-send-email-nengard@bywatersolutions.com>

This updates the patron help file and adds a missing help file.

To test:

* Go to a patron record
* Click help and confirm text is correct
* Go to patron's purchase suggestions
* Click help and confirm that help file is there and correct
---
 .../prog/en/modules/help/members/moremember.tt     |   14 ++++++++++++++
 .../modules/help/members/purchase-suggestions.tt   |   13 +++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/purchase-suggestions.tt

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 22f2646..8884d76 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
@@ -25,6 +25,12 @@
 
 <p>The patron's complete accounting history will appear on the Fines tab. Contrary to its name, the Fines tab does not just show fine data, it also shows membership fees, rental fees, reserve fees and any other charge you may have for patrons.</p>
 
+<h2>Routing Lists</h2>
+
+<p>A list of all of the serial routing lists the patron belongs to will be accessible via the 'Routing Lists' tab on the patron record.</p>
+
+<p>On this tab you will be able to see and edit all of the routing lists that this patron is on.</p>
+
 <h2>Circulation History</h2>
 
 <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>
@@ -56,6 +62,14 @@
 
 <p>All files that are uploaded will appear above a form where additional files can be uploaded from.</p>
 
+<h2>Purchase Suggestions</h2>
+
+<p>If the patron has made any purchase suggestions you will see a purchase suggestions tab on the patron record.</p>
+
+<p>From here you can see all suggestions made by the patron and their status, you can also create a purchase suggestion on the patron's behalf by clicking the 'New purchase suggestion' button at the top.</p>
+
+<p>Learn more about Purchase suggestions in the Acquisitions chapter of the manual.</p>
+
 <h2>Editing Patrons</h2>
 
 <p>Patrons in Koha can be edited using one of many edit buttons.</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/purchase-suggestions.tt
new file mode 100644
index 0000000..76e2da4
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/purchase-suggestions.tt
@@ -0,0 +1,13 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Patron's Purchase Suggestions</h1>
+
+<p>If the patron has made any purchase suggestions you will see a purchase suggestions tab on the patron record.</p>
+
+<p>From here you can see all suggestions made by the patron and their status, you can also create a purchase suggestion on the patron's behalf by clicking the 'New purchase suggestion' button at the top.</p>
+
+<p>Learn more about Purchase suggestions in the Acquisitions chapter of the manual.</p>
+
+<p><strong>See the full documentation for the Patron's Purchase Suggestions in the <a href="http://manual.koha-community.org/[% helpVersion %]/en/patroninformation.html#patronsuggestions">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 May 13 14:47:13 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 13 May 2014 07:47:13 -0500
Subject: [Koha-patches] [PATCH] [BUG 12244] Update cataloging help for 3.16
Message-ID: <1399985233-1906-1-git-send-email-nengard@bywatersolutions.com>

This patch adds a bit to the addbiblio help file.

To test:

* Go to Cataloging
* Click add new
* Click help
* Confirm help is there and correct
---
 .../prog/en/modules/help/cataloguing/addbiblio.tt  |    1 +
 1 files changed, 1 insertions(+), 0 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 57f3b80..8e194c2 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
@@ -37,6 +37,7 @@
 
 <ul>
 	<li>To expand a collapsed tag click on the tag description</li>
+	<li>If you would rather not see the MARC tag numbers you can change the value in your hide_marc system preference or each user can check the box next to 'Show tags' at the top of the editor.</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
 <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>
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue May 13 14:53:40 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 13 May 2014 07:53:40 -0500
Subject: [Koha-patches] [PATCH] [BUG 12244] Update Search Help for 3.16
Message-ID: <1399985620-1993-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the search help file.

To test:

* Visit Search
* Click help
* Confirm help is there and correct
---
 .../prog/en/modules/help/catalogue/search.tt       |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

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 65950bf..b852810 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
@@ -2,7 +2,13 @@
 
 <h1>Searching</h1>
 
-<p>To see more search options click [More Options] at the bottom of the page. This will allow for more advanced boolean searching.</p>
+<p>Visit Administration > Global System Preference > Searching to control the settings for the Koha search.</p>
+
+<h2>Some tips</h2>
+
+<p>Use the AdvancedSearchTypes preference to control which tabs show for limiting to Item Type, Collection Code and/or Shelving location.</p>
+
+<p>Use the AdvancedSearchLanguages preference to control which languages appear in the language pull down filter.</p>
 
 <h2>Searching Subtypes on the Staff Client</h2>
 
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue May 13 15:21:26 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 13 May 2014 08:21:26 -0500
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_=5BBUG_12244=5D_Update_Notic?=
	=?utf-8?q?es_Help_Files?=
Message-ID: <1399987286-2193-1-git-send-email-nengard@bywatersolutions.com>

Updates the 2 notices help files with new info.

To test:

* Visit Tools > Notices & Slips
* Click help and confirm it's there and right
* Visit Tools > Overdue notices/status triggers
* Click help and confirm it's there and right
---
 .../prog/en/modules/help/tools/letter.tt           |  248 +++++++++++++++-----
 .../prog/en/modules/help/tools/overduerules.tt     |    6 +-
 2 files changed, 200 insertions(+), 54 deletions(-)

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 18d90a1..312b852 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
@@ -10,62 +10,82 @@
 
 <h3>Adding Notices & Slips</h3>
 
-<p>To add a new notice or slip
+<p>To add a new notice or slip</p>
 
 <ul>
 	<li>Click 'New Notice'</li>
-    <li>Choose which library this notice or slip is for</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>The Code is limited to 20 characters
+<ul>
+	<li style="color: #990000;">Important: When working with the overdue notices you want each notice at each branch to have a unique code. Think about using the branch code in front of the notice code for each branch.</li>
+</ul>
+</li>
+	<li>Use the name field to expand on your Code
+<ul>
+	<li style="background-color: #ffe599;">Tip: With overdue notices, be sure to put your branch name in the description as well so that it will be visible when setting up your triggers.</li>
+</ul>
+</li>
+	<li>Next you can customize the notice for every possible delivery method
+<ul>
+	<li>Every notice should have an Email template set for it</li>
+	<li>Next, you can set up a Feed template</li>
+	<li>If you're using the TalkingTechItivaPhoneNotification service you can set up a Phone notification</li>
+	<li>If you plan on printing this notice you can set the Print template next</li>
+	<li>If you have enabled SMS notices with the SMSSendDriver preference you can set the text for your SMS notices next</li>
+</ul>
+</li>
+	<li>Each notice offers you the same options
+<ul>
+	<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: 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>
+	<li><span 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.</span>
 <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>
+	<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;&lt;items.fine&gt;&gt; Due date: &lt;&lt;issues.date_due&gt;&gt; &lt;/item&gt;</li>
+	<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;&lt;items.fine&gt;&gt; Due date:
+&lt;&lt;issues.date_due&gt;&gt; &lt;/item&gt;</li>
 </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>
+	<li style="background-color: #ffe599;">Tip: To add today's date you can use the &lt;&lt;today&gt;&gt; syntax</li>
+</ul>
+</li>
 </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>
 
-<h4>Overdue Notice Markup</h4>
+<h5>Overdue Notice Markup</h5>
 
 <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>
-</ul>
-</li>
-</ul>
+<p>These tags are &lt;item&gt; and &lt;/item&gt; which should enclose all fields from the biblio, biblioitems, and items tables.</p>
 
-<p>An example of using these two tags in a notice template might be like:</p>
+<p>An example of using these tags in a notice template might be like:</p>
 
-<pre>The following item(s) is/are currently overdue:
+<p>The following item(s) is/are currently overdue:</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;&lt;items.fine&gt;&gt; &lt;/item&gt;</pre>
+<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;&lt;items.fine&gt;&gt;&lt;/item&gt;</p>
 
 <p>Which, assuming two items were overdue, would result in a notice like:</p>
 
-<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>
+<p>The following item(s) is/are currently overdue:</p>
 
-<h3>Existing Notices & Slips</h3>
+<p>   "A Short History of Western Civilization" by Harrison, John B, 909.09821 H2451, Barcode: 08030003 Fine: 3.50<br />
+   "History of Western Civilization" by Hayes, Carlton Joseph Huntley, 909.09821 H3261 v.1, Barcode: 08030004 Fine: 3.50</p>
+   
+<h4>Existing Notices &amp; Slips</h4>
 
 <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
 <ul>
@@ -75,78 +95,200 @@
 	<li>ACQCLAIM (Acquisition Claim)
 <ul>
 	<li>Used in the claim acquisition module</li>
-    <li><em>Get there:</em> More &gt; Acquisitions &gt; Late issues</li>
+	<li><em>Get there:</em> More &gt; Acquisitions &gt; Late issues</li>
+</ul>
+</li>
+	<li>CHECKIN
+<ul>
+	<li>This notice is sent as the 'Check in' notice for all items that are checked in</li>
+	<li>This notice is used if two criteria are met:
+<ol>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The patron has requested to receive this notice
+<ul>
+	<li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
+	<li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
+</ul>
+</li>
+</ol>
+</li>
+</ul>
+</li>
+	<li>CHECKOUT
+<ul>
+	<li>This notice is sent as the 'Check out' notice for all items that are checked out</li>
+	<li>This notice is used if two criteria are met:
+<ol>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The patron has requested to receive this notice
+<ul>
+	<li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
+	<li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
+</ul>
+</li>
+</ol>
+</li>
+</ul>
+</li>
+	<li>DUE
+<ul>
+	<li>This notice is sent as the 'Item due' for an item is due</li>
+	<li>This notice is used if two criteria are met:
+<ol>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The patron has requested to receive this notice
+<ul>
+	<li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
+	<li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
+</ul>
+</li>
+</ol>
+</li>
+</ul>
+</li>
+	<li>DUEDGST
+<ul>
+	<li>This notice is sent as the 'Item due' for all items that are due</li>
+	<li>This notice is used if two criteria are met:
+<ol>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The patron has requested to receive this notice as a digest
+<ul>
+	<li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
+	<li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
+</ul>
+</li>
+</ol>
+</li>
 </ul>
 </li>
 	<li>HOLD (Hold Available for Pickup)
 <ul>
 	<li>This notice is used if two criteria are met:
 <ol>
-    <li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
 	<li>The patron has requested to receive this notice
 <ul>
-    <li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
-    <li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
+	<li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
+	<li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
 </ul>
 </li>
 </ol>
 </li>
-    <li>When this notice references the branches table it is referring to the pickup library information.</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 library information.</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>See a Sample Overdue Notice</li>
-    <li>Requires that you set Overdue Notice/Status Triggers</li>
+	<li>Requires that you set Overdue Notice/Status Triggers</li>
+</ul>
+</li>
+	<li>PREDUE
+<ul>
+	<li>This notice is sent as the 'Advanced notice' for an item is due</li>
+	<li>This notice is used if two criteria are met:
+<ol>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The patron has requested to receive this notice
+<ul>
+	<li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
+	<li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
+</ul>
+</li>
+</ol>
+</li>
+</ul>
+</li>
+	<li>PREDUEDGST
+<ul>
+	<li>This notice is sent as the 'Advanced notice' for all items that are due</li>
+	<li>This notice is used if two criteria are met:
+<ol>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The patron has requested to receive this notice as a digest
+<ul>
+	<li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
+	<li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
+</ul>
+</li>
+</ol>
+</li>
+</ul>
+</li>
+	<li>RENEWAL
+<ul>
+	<li>This notice is sent as the 'Check out' notice for all items that are renewed</li>
+	<li>This notice is used if three criteria are met:
+<ol>
+	<li>The EnhancedMessagingPreferences is set to 'Allow'</li>
+	<li>The RenewalSendNotice preference is set to 'Send'</li>
+	<li>The patron has requested to receive the checkout notice
+<ul>
+	<li><em>Get there: </em>OPAC &gt; Login &gt; my messaging</li>
+	<li><em>Get there: </em>Staff Client &gt; Patron Record &gt; Notices</li>
+</ul>
+</li>
+</ol>
+</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><em>Get there:</em> More &gt; Serials &gt; New Subscription</li>
+	<li><em>Get there:</em> More &gt; Serials &gt; New Subscription</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>
+	<li>SHARE_ACCEPT
+<ul>
+	<li>Used to notify a patron when another patron has accepted their shared list.</li>
+	<li>Requires that you set OpacAllowSharingPrivateLists to 'Allow'</li>
+</ul>
+</li>
+	<li>SHARE_INVITE
+<ul>
+	<li>Used to notify a patron that another patron would like to share a list with them.</li>
+	<li>Requires that you set OpacAllowSharingPrivateLists to 'Allow'</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 SlipCSS preference to define a stylesheet.</p>
-
-<p>Here is what those slips are used for:</p>
+<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 SlipCSS preference to define a stylesheet. Here is what those slips are used for:</p>
 
 <ul>
-    <li>ISSUEQSLIP
+	<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>
+	<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
+	<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>
+	<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
+	<li>RESERVESLIP
 <ul>
-    <li>Used to print a holds slip</li>
-    <li>The holds slip is generated when a hold is confirmed</li>
+	<li>Used to print a holds slip</li>
+	<li>The holds slip is generated when a hold is confirmed</li>
 </ul>
 </li>
-    <li>TRANSFERSLIP
+	<li>TRANSFERSLIP
 <ul>
-    <li>Used to print a transfer slip</li>
-    <li>The transfer slip is printed when you confirm a transfer from one library to another in your system</li>
+	<li>Used to print a transfer slip</li>
+	<li>The transfer slip is printed when you confirm a transfer from one branch to another in your system</li>
 </ul>
 </li>
 </ul>
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 f2b7f7c..83c3d71 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
@@ -15,7 +15,11 @@
 </ul>
 </li>
 	<li>To send additional notices, click on the tabs for 'Second' and 'Third' notice</li>
-	<li>If you would like to prevent a patron from checking items out because of their overdue items, check the 'Restrict' box, this will put a notice on the patron's record at checkout informing the librarian that the patron cannot check out due to overdue items.</li>
+	<li>If you would like to prevent a patron from checking items out because of their overdue items, check the 'Restrict' box, this will put a notice on the patron's record at checkout informing the librarian that the patron cannot check out due to overdue items.
+	<ul>
+	<li>    If you choose to restrict a patron in this way you can also have Koha automatically remove that restriction with the AutoRemoveOverduesRestrictions preference.</li>
+	</ul></li>
+	<li>Next you can choose the delivery method for the overdue notice. You can choose from Email, Feed, Phone (if you are using the iTiva Talking Tech service), Print and SMS (if you have set your SMSSendDriver). </li>
 	<li>See a Sample Overdue Notice</li>
 </ul>
 
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue May 13 15:28:16 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 13 May 2014 08:28:16 -0500
Subject: [Koha-patches] [PATCH] [BUG 12244] Update authorized values help
	for 3.16
Message-ID: <1399987696-2283-1-git-send-email-nengard@bywatersolutions.com>

This patch adds a few new values to the authorized values help

To test:

* Visit Administration > Authorized Values
* Click help
* Confirm help is there and correct
---
 .../en/modules/help/admin/authorised_values.tt     |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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 0d21744..8eb11fd 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
@@ -36,8 +36,10 @@
     <li>'REPORT_GROUP' provides a way to sort and filter your reports, the default values in this category include the Koha modules (Accounts, Acquisitions, Catalog, Circulation, Patrons)</li>
     <li>'REPORT_SUBGROUP' can be used to further sort and filter your reports. This category is empty by default. Values here need to include the authorized value code from REPORT_GROUP in the Description (OPAC) field to link the subgroup to the appropriate group.</li>
     <li>'RESTRICTED' is used for the restricted status of an item</li>
+    <li>'ROADTYPE' is used forRoad types to be used in patron addresses</li>
     <li>'SUGGEST' is for a list of reasons to accept or reject patron suggestions. It appears when managing suggestions.</li>
     <li>'WITHDRAWN' is for a description of a withdrawn item. It appears when adding or editing an item.</li>
+    <li>'YES_NO' is a generic authorized value field that can be used anywhere you need a simple yes/no pull down menu.</li>
 </ul>
 
 <h2>Add New Authorized Value Category</h2>
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue May 13 15:38:29 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 13 May 2014 08:38:29 -0500
Subject: [Koha-patches] [PATCH] [BUG 12244] Update Admin Help for 3.16
Message-ID: <1399988309-2388-1-git-send-email-nengard@bywatersolutions.com>

This patch updates 3 help files.

To test:

* Visit Administration > Patron Categories
* Click help
* Confirm it's there and right
* Visit Administration > Currencies
* Click help
* Confirm it's there and right
* Visit Administration > Circ Rules
* Click help
* Confirm it's there and right
---
 .../prog/en/modules/help/admin/categorie.tt        |    1 +
 .../prog/en/modules/help/admin/currency.tt         |    2 ++
 .../prog/en/modules/help/admin/smart-rules.tt      |    3 +++
 3 files changed, 6 insertions(+), 0 deletions(-)

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 7b6d93e..d4e31bc 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
@@ -78,6 +78,7 @@
 </li>
 	<li>In the 'Category type' field choose one of the six main parent categories</li>
 	<li>The Branch Limitations let you limit this patron category to only some branches in your library system. Select 'All branches' if you would like any library to be able to use this category.</li>
+	<li>You can decide if this patron category is blocked from performing actions in the OPAC if their card is expired using the next option. By default it will follow the rule set in the BlockExpiredPatronOpacActions preference</li>
 	<li>Finally you can assign advanced messaging preferences by default to a patron category
 <ul>
 	<li style="color: #990000;">Important: Requires that you have EnhancedMessagingPreferences enabled</li>
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 034e69b..1240832 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
@@ -6,6 +6,8 @@
 
 <p style="background-color: #ffe599">Tip: This data is not automatically updated, so be sure to keep it up to date so that your accounting is kept correct.</p>
 
+<p>The ISO code you enter will be used when importing MARC files via the staging tools, the tool will attempt to find and use the price of the currently active currency.</p>
+
 <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/[% helpVersion %]/en/acqadmin.html#currexchangeadmin">manual</a> (online).</strong></p>
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 255cc22..c0f4a91 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
@@ -56,6 +56,9 @@
 </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 you're allowing renewals you can control how long the renewal loan peiod will be (in the units you have chosen) in the 'Renewal period' box</li>
+    <li>If you're allowing renewals you can control how soon before the due date patrons can renew their materials with the 'No renewals before' box.
+    <ul><li>Items can be renewed at any time if this value is left blank. Otherwise items can only be renewed if the item is before the number in units (days/hours) entered in this box.</li></ul></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>
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue May 13 15:49:41 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 13 May 2014 08:49:41 -0500
Subject: [Koha-patches] [PATCH] [BUG 12244] Update Acq Help for 3.16
Message-ID: <1399988981-2494-1-git-send-email-nengard@bywatersolutions.com>

This updates the basket help.

To test:

* Open a basket
* Click help and confirm it's right and there
---
 .../prog/en/modules/help/acqui/basket.tt           |   49 +++++++++-----------
 1 files changed, 22 insertions(+), 27 deletions(-)

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 53a1b25..44eef0c 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
@@ -5,59 +5,54 @@
 <p>Once your basket is created you are presented with several options for adding items to the order.</p>
 
 <ul>
-    <li>If you are ordering another copy of an existing item, you can simply search for the record in your system.
+	<li>If you are ordering another copy of an existing item, you can simply search for the record in your system.
 <ul>
-    <li>From the results, simply click 'Order' to be brought to the order form.
+	<li>From the results, simply click 'Order' to be brought to the order form.
 <ul>
-    <li>All of the details associated with the item will already be listed under 'Catalog details.'</li>
+	<li>All of the details associated with the item will already be listed under 'Catalog details.'</li>
 </ul>
 </li>
 </ul>
 </li>
-    <li>If you allow patrons to make purchase suggestions (learn more in the Managing Suggestions section of this manual), then you can place orders from those suggestions.</li>
-    <li>From the results, click 'Order' next to the item you want to order and you will be presented with the order form including a link to the suggestion
+	<li>If you allow patrons to make purchase suggestions (learn more in the Managing Suggestions section of this manual), then you can place orders from those suggestions.</li>
+	<li>From the results, click 'Order' next to the item you want to order and you will be presented with the order form including a link to the suggestion
 <ul>
-    <li>From this form you can make changes to the Catalog Details if necessary.</li>
-    <li>When the item appears in your basket it will include a link to the suggestion.</li>
+	<li>From this form you can make changes to the Catalog Details if necessary.</li>
+	<li>When the item appears in your basket it will include a link to the suggestion.</li>
 </ul>
 </li>
-    <li>To order from a record that can't be found anywhere else, choose the 'From a new (empty) record.'
+	<li>To order from a record that can't be found anywhere else, choose the 'From a new (empty) record.'
 <ul>
-    <li>You will be presented with an empty form to fill in all of the necessary details about the item you are ordering.</li>
+	<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>
 </li>
-    <li>If you want to search other libraries for an item to purchase, you can use the 'From an external source' option that will allow you to order from a MARC record found via a Z39.50 search.
+	<li>If you want to search other libraries for an item to purchase, you can use the 'From an external source' option that 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 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 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>
+	<li>In the order form that pops up, you will not be able to edit the catalog details.</li>
 </ul>
 </li>
-    <li>The final option for ordering is to order from a staged record (learn more about staging records).
+	<li>The next option for ordering is to order from a staged record.
 <ul>
-    <li>From the list of files you are presented with, choose the 'Add orders' link.
-<ul>
-    <li>From the list of records, click 'Add order' next to the item that you want to add to your order.
-<ul>
-    <li>From the order form, you will not be able to edit the catalog details.</li>
+	<li>From the list of files you are presented with, choose the 'Add orders' link to add the records in the staged file to your order.</li>
+	<li>Next to each title is a checkbox, check the items you would like to order, or choose 'Check all' at the top. Depending on your settings in the MarcFieldsToOrder preference Koha will populate the next screen with with the relevant Quantity, Price, Fund, Statistic 1, and Statistic 2 found within the staged file.</li>
+	<li>In the 'Item Information' tab you can enter information that will be added to every ordered item such as item type, collection code and not for loan status.</li>
+	<li>If no information is imported from the MARC record regarding fund information the 'Default accounting details' tab can be used to apply values related to the accounting.</li>
 </ul>
 </li>
-    <li>The other option is to import all records from the staged file by scrolling below the list of records in the staged file and filling in the item information.
+	<li>The final option for ordering is to order from a list of titles with the highest hold ratios
 <ul>
-    <li>If you choose this option the Koha will look in the 020$c and grab the pricing information from that field and put that on each order line.</li>
-</ul>
-</li>
-</ul>
-</li>
+	<li>This option will take you to the Holds Ratio report where you can find items with a high hold ratio and order additional copies. Next to each title will be a link with the number of items to order, click that and it will add the item to your basket.</li>
 </ul>
 </li>
 </ul>
 
-<p>After bringing in the bib information, if your AcqCreateItem system preference is set to add an item when ordering you will enter the item info next. You need to fill out at least one item record and then click the 'Add' button at the bottom left of the item form.</p>
+<p>After bringing in the bib information (for all import methods except for the staged file), if your AcqCreateItem system preference is set to add an item when ordering you will enter the item info next. You need to fill out at least one item record and then click the 'Add' button at the bottom left of the item form.</p>
 
 <p>After clicking add the item will appear above the form and then you can enter your next item the same way (if ordering more than one item).</p>
 
-- 
1.7.2.3


From tomascohen at gmail.com  Tue May 13 23:58:56 2014
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Tue, 13 May 2014 18:58:56 -0300
Subject: [Koha-patches] [PATCH] Bug 12251: Error in sample_notices.sql
	(es-ES)
Message-ID: <1400018336-5004-1-git-send-email-tomascohen@gmail.com>

On bug 10845 some lines from sample_notices.sql were ommited when adding the trailing parameter. This produces some errors when installing using 'es-ES' sample data; and, in some conditions I couldn't reproduce right now, ocasional C4/NewsChannel.pm errors due to mandatory message transport data incompletely loaded.

To reproduce:
- Make sure your setup has the es-ES translations installed and up-to-date (translation should raise lots of warnings)
- With a cleaned (DROP DATABASE ... ; CREATE DATABASE ...;) run the webinstaller
- Choose es-ES for the webinstaller.
- Follow the steps and choose all the sample data.
=> Errors related to sample_notices.sql and sample_notices_message_transports.sql show.

To fix:
- Apply this patch.
- Reset your DB (DROP DATABASE, CREATE DATABASE -- whatever method you prefer)
- Run the webinstaller using es-ES
- Follow the steps and choose all sample data.
=> SUCCESS: no errors.
- Sign :-D

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 installer/data/mysql/es-ES/mandatory/sample_notices.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
index 5a48e94..25f12a3 100644
--- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql
+++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
@@ -8,12 +8,12 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
 ('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nThe following item will be due soon:\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)', 'email'),
 ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <<count>> items due soon', 'email'),
 ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <<branches.branchname>>', 'Dear <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\nLocation: <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>', 'email'),
-('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n', 'email'),
+('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n', 'print'),
 ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you.', 'email'),
 ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.', 'email'),
-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).'),
-('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
-('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>'),
+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
+('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
+('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
 ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>', 'email'),
 ('suggestions','REJECTED','Suggestion rejected', 'Purchase suggestion declined','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your request today, and has decided not to accept the suggestion at this time.\n\nThe reason given is: <<suggestions.reason>>\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email');
 INSERT INTO `letter` (module, code, name, title, content) VALUES ('circulation','RENEWAL','Item Renewal','Renewals','The following items have been renew:\r\n----\r\n<<biblio.title>>\r\n----\r\nThank you for visiting <<branches.branchname>>.');
-- 
1.9.1


From dcook at prosentient.com.au  Wed May 14 05:42:01 2014
From: dcook at prosentient.com.au (David Cook)
Date: Wed, 14 May 2014 13:42:01 +1000
Subject: [Koha-patches] [PATCH] Bug 12252 - OAI-PMH result includes item data
Message-ID: <1400038921-21970-1-git-send-email-dcook@prosentient.com.au>

From: Robin Sheat <robin at catalyst.net.nz>

GetRecord for OAI-PMH was pulling the MARCXML directly from the
database. Now it uses GetMarcBiblio and includes the item data with it,
making it more generally useful.

Test plan:
* Run an OAI-PMH query, for example:
http://koha/cgi-bin/koha/oai.pl?verb=GetRecord&identifier=KOHA-OAI-TEST:52&metadataPrefix=marcxml
  to fetch biblionumber 52
* Note that it doesn't include the 952 data
* Apply the patch
* Do the same thing, but this time see that the 952 data is at the
  bottom of the MARCXML.

Note:
* This patch also includes a small tidy-up in C4::Biblios to group
  things semantically a bit better, so I don't spend ages looking for a
  function that was staring me in the face all along again.

Signed-off-by: David Cook <dcook at prosentient.com.au>

Works as described. Simple yet useful patch.
---
 C4/Biblio.pm |   16 ++++++++--------
 opac/oai.pl  |   12 +++++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 0fb453d..b6f98b4 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -54,13 +54,14 @@ BEGIN {
 
     # to get something
     push @EXPORT, qw(
-      &GetBiblio
-      &GetBiblioData
-      &GetBiblioItemData
-      &GetBiblioItemInfosOf
-      &GetBiblioItemByBiblioNumber
-      &GetBiblioFromItemNumber
-      &GetBiblionumberFromItemnumber
+      GetBiblio
+      GetBiblioData
+      GetMarcBiblio
+      GetBiblioItemData
+      GetBiblioItemInfosOf
+      GetBiblioItemByBiblioNumber
+      GetBiblioFromItemNumber
+      GetBiblionumberFromItemnumber
 
       &GetRecordValue
       &GetFieldMapping
@@ -74,7 +75,6 @@ BEGIN {
       &GetMarcISBN
       &GetMarcISSN
       &GetMarcSubjects
-      &GetMarcBiblio
       &GetMarcAuthors
       &GetMarcSeries
       &GetMarcHosts
diff --git a/opac/oai.pl b/opac/oai.pl
index b453408..b580a27 100755
--- a/opac/oai.pl
+++ b/opac/oai.pl
@@ -247,7 +247,9 @@ package C4::OAI::GetRecord;
 use strict;
 use warnings;
 use HTTP::OAI;
+use C4::Biblio;
 use C4::OAI::Sets;
+use MARC::File::XML;
 
 use base ("HTTP::OAI::GetRecord");
 
@@ -259,14 +261,14 @@ sub new {
 
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare("
-        SELECT marcxml, timestamp
+        SELECT timestamp
         FROM   biblioitems
         WHERE  biblionumber=? " );
     my $prefix = $repository->{koha_identifier} . ':';
     my ($biblionumber) = $args{identifier} =~ /^$prefix(.*)/;
     $sth->execute( $biblionumber );
-    my ($marcxml, $timestamp);
-    unless ( ($marcxml, $timestamp) = $sth->fetchrow ) {
+    my ($timestamp);
+    unless ( ($timestamp) = $sth->fetchrow ) {
         return HTTP::OAI::Response->new(
             requestURL  => $repository->self_url(),
             errors      => [ new HTTP::OAI::Error(
@@ -276,6 +278,10 @@ sub new {
         );
     }
 
+    # We fetch it using this method, rather than the database directly,
+    # so it'll include the item data
+    my $record = GetMarcBiblio($biblionumber, 1);
+    my $marcxml = $record->as_xml();
     my $oai_sets = GetOAISetsBiblio($biblionumber);
     my @setSpecs;
     foreach (@$oai_sets) {
-- 
1.7.7.4



From vanoudt at gmail.com  Thu May 15 07:32:46 2014
From: vanoudt at gmail.com (Nicholas van Oudtshoorn)
Date: Thu, 15 May 2014 13:32:46 +0800
Subject: [Koha-patches] [PATCH] BUG 11602 [ENH] - Fix localcover display
	Adds a css class of thumbnail to local covers Don't show the
	1px "No image found" image (since we'll ususally try another
	image provider)
Message-ID: <1400131966-11368-1-git-send-email-vanoudt@gmail.com>

---
 koha-tmpl/opac-tmpl/bootstrap/js/localcovers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/localcovers.js b/koha-tmpl/opac-tmpl/bootstrap/js/localcovers.js
index 7bd7ae2..d407ef6 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/js/localcovers.js
+++ b/koha-tmpl/opac-tmpl/bootstrap/js/localcovers.js
@@ -27,6 +27,7 @@ KOHA.LocalCover = {
             var img = $("<img />").attr('src',
                 '/cgi-bin/koha/opac-image.pl?thumbnail=1&biblionumber=' + $(mydiv).attr("class"))
                 .load(function () {
+                    this.setAttribute("class", "thumbnail");
                     if (!this.complete || typeof this.naturalWidth == "undefined" || this.naturalWidth == 0) {
                         //IE HACK
                         try {
@@ -35,7 +36,7 @@ KOHA.LocalCover = {
                         }
                         catch(err){
                         };
-                    } else {
+                    } else if (this.width > 1) { // don't show the silly 1px "no image" img
                         if (uselink) {
                             var a = $("<a />").attr('href', '/cgi-bin/koha/opac-imageviewer.pl?biblionumber=' + $(mydiv).attr("class"));
                             $(a).append(img);
-- 
1.8.3.1


From tomascohen at gmail.com  Tue May 20 19:34:04 2014
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Tue, 20 May 2014 14:34:04 -0300
Subject: [Koha-patches] [PATCH] Bug 12279: Diacritics in system preference
	editor broken
Message-ID: <1400607244-30885-1-git-send-email-tomascohen@gmail.com>

This patch changes how .pref files are read. Instead of going through
all our global ultra-tweaked template object, we only use gettemplate
to build the correct file name (path included) and load it using the
(at functional) YAML::Syck::LoadFile method.

Pros: Doesn't break anything for YAML::Syck pre-1.27 (the ones shipped with
      Ubuntu 14.04)
Cons: something is wrong with C4::Templates encoding/decoding, or at least
      our default setup using C4::Templates->new doesn't work properly for
      all file types.

To test:
- On clean master, install a translation like:
  cd misc/translator ; perl translate install fr-FR
- Go to sysprefs, opac
=> FAIL: descriptions are encoding-broken
- Apply the patch, reload
=> SUCCESS: Everything shows ok

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 admin/preferences.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/preferences.pl b/admin/preferences.pl
index 8bcdb0a..b885e3e 100755
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -54,7 +54,7 @@ sub GetTab {
         local_currency => $local_currency, # currency code is used, because we do not know how a given currency is formatted.
     );
 
-    return YAML::Syck::Load( $tab_template->output() );
+    return YAML::Syck::LoadFile( $tab_template->{filename} );
 }
 
 sub _get_chunk {
-- 
1.9.1


From dcook at prosentient.com.au  Wed May 21 05:36:50 2014
From: dcook at prosentient.com.au (David Cook)
Date: Wed, 21 May 2014 13:36:50 +1000
Subject: [Koha-patches] [PATCH] Bug 11014 - Slip Print Problem in Chrome
Message-ID: <1400643410-11980-1-git-send-email-dcook@prosentient.com.au>

Currently, slips cannot be printed in circulation, members, or the
self check out when using Chrome.

This patch adds a timer of 1ms which allows Chrome's custom code to
prevent "window.close" occuring before the user has dealt with the
print window.

This patch also allows admins to use the 'IntranetSlipPrinterJS'
system preference to override the slip printing code by centralizing
all the slip printing code in slip-print.inc, and including this JS
anywhere it's needed in the staff client.

I haven't used this include in the OPAC SCO but perhaps it would make
sense to do so as well (even if it isn't referred to in the syspref's
name).

_TEST PLAN_
1) Using Chrome on Windows (not sure if this is an issue on other OSes),
try to print a slip in the following locations:

Fines Tab -> Print button
koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt:

Details tab -> Print button -> Print slip || Print quick slip
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt:

Details tab -> Print button -> Print summary
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt:

Fines tab -> Accounts tab -> Print (Manual invoice of $5 sundry)
koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt:

Checkout tab -> Print button
koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt:

Finish button
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt

2) Note that each time you try to print, a new print page is created
but closed before you have a chance to print.

3) Apply the patch

4) Repeat Step 1

5) Note that the print page now doesn't close until after you've
chosen to print or cancel.
---
 .../intranet-tmpl/prog/en/includes/slip-print.inc  |   10 ++++++++++
 .../prog/en/modules/circ/printslip.tt              |   11 +----------
 .../prog/en/modules/members/moremember-print.tt    |    8 ++------
 .../prog/en/modules/members/moremember-receipt.tt  |    8 ++------
 .../prog/en/modules/members/printfeercpt.tt        |    8 ++------
 .../prog/en/modules/members/printinvoice.tt        |    8 ++------
 .../bootstrap/en/modules/sco/printslip.tt          |    2 +-
 7 files changed, 20 insertions(+), 35 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc
new file mode 100644
index 0000000..413f4bb
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+[% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %]
+    [% Koha.Preference('IntranetSlipPrinterJS') %]
+[% ELSE %]
+    function printThenClose() {
+        window.print();
+        setTimeout('window.close()', 1);
+    }
+[% END %]
+</script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
index 7dc5b81..8e2b25b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
@@ -8,16 +8,7 @@
 <link rel="stylesheet" type="text/css" href="[% stylesheet %]" />
 [% END %]
 
-<script type="text/javascript">
-[% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %]
-    [% Koha.Preference('IntranetSlipPrinterJS') %]
-[% ELSE %]
-     function printThenClose() {
-         window.print();
-         window.close();
-     }
-[% END %]
-</script>
+[% INCLUDE 'slip-print.inc' #printThenClose %]
 </head>
 <body id="circ_printslip" class="circ" onload="printThenClose();">
 <div id="receipt">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
index eee5aef..4c71072 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
@@ -1,15 +1,11 @@
+[% USE Koha %]
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
-<script type="text/javascript">
-    function printThenClose() {
-        window.print();
-        window.close();
-    }
-</script>
+[% INCLUDE 'slip-print.inc' #printThenClose %]
 <body id="pat_moremember-print" class="pat" onload="printThenClose();">
 
 </head>
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 80d3dc0..c7d67a1 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
@@ -1,15 +1,11 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Print Receipt for [% cardnumber %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
  <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" />
 
-<script type="text/javascript">
-    function printThenClose() {
-        window.print();
-        window.close();
-    }
-</script>
+[% INCLUDE 'slip-print.inc' #printThenClose %]
 </head>
 <body id="pat_moremember-receipt" class="pat" onload="printThenClose();">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
index 26be3f4..64bbf35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
@@ -1,14 +1,10 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Print Receipt for [% cardnumber %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/printreceiptinvoice.css" />
-<script type="text/javascript">
-    function printThenClose() {
-        window.print();
-        window.close();
-    }
-</script>
+[% INCLUDE 'slip-print.inc' #printThenClose %]
 </head>
 <body id="pat_printfeercpt" class="pat" onload="printThenClose();">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
index 8a19918..29e64da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
@@ -1,14 +1,10 @@
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Print Receipt for [% cardnumber %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/printreceiptinvoice.css" />
-<script type="text/javascript">
-    function printThenClose() {
-        window.print();
-        window.close();
-    }
-</script>
+[% INCLUDE 'slip-print.inc' #printThenClose %]
 </head>
 <body id="printinvoice" class="pat" onload="printThenClose();">
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
index 224c916..8ad25ac 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
@@ -23,7 +23,7 @@
 <script language="javascript">
     function printThenClose() {
         window.print();
-        window.close();
+        setTimeout('window.close()', 1);
     }
 </script>
 </body>
-- 
1.7.7.4



From oleonard at myacpl.org  Thu May 22 15:28:37 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 22 May 2014 09:28:37 -0400
Subject: [Koha-patches] [PATCH] Bug 12308 - show all title subfields on the
	holds list
Message-ID: <1400765317-23516-1-git-send-email-oleonard@myacpl.org>

The patron summary page in the bootstrap OPAC does not show subtitle in
the list of checkouts, overdues, or holds. This patch corrects this.

To test, set your OPAC theme to bootstrap and log in to the OPAC as a
user who has items checked out, items overdue, and items on hold. At
least one of each of those should be a title which has a subtitle as
defined in Administration -> Keyword to MARC mapping. Subtitles should
appear correctly under the "Checked out," "Overdue," and "Holds" tabs.
---
 .../opac-tmpl/bootstrap/en/modules/opac-user.tt    |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 50c66c1..797e671 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -184,7 +184,8 @@
                                                 </td>[% END # / IF JacketImages %]
 
                                                 <td class="title">
-                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a> <span class="item-details">[% ISSUE.author %]</span>
+                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %]</a>
+                                                    <span class="item-details">[% ISSUE.author %]</span>
                                                 </td>
                                                 [% IF ( ISSUE.overdue ) %]
                                                     <td class="date_due overdue">
@@ -338,7 +339,7 @@
                                                 <td><img src="[% themelang %]/images/[% WAITIN.itemtype %].gif" alt="[% WAITIN.itemtype %]" title="[% WAITIN.itemtype %]" /></td>
                                                 <td>
                                                     <a class="title" href="opac-detail.pl?biblionumber=[% WAITIN.biblionumber %]">
-                                                        [% WAITIN.waiting_title %]
+                                                        [% WAITIN.waiting_title %] [% FOREACH subtitl IN WAITIN.subtitle %] [% subtitl.subfield %][% END %]
                                                     </a>
                                                     <span class="item-details">
                                                         [% WAITIN.author %]
@@ -422,7 +423,7 @@
                                                 [% END # /IF jacketcell %]
 
                                                 <td>
-                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title |html %]
+                                                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title |html %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %]
                                                     </a>
                                                     <span class="item-details">[% OVERDUE.author %]</span></td>
 
@@ -520,7 +521,7 @@
                                             <tr>
                                         [% END %]
                                             <td class="title">
-                                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
+                                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %] [% FOREACH subtitl IN RESERVE.subtitle %] [% subtitl.subfield %][% END %]</a>
                                                 [% RESERVE.author %]
                                             </td>
                                             <td class="reservedate">
-- 
1.7.9.5

From oleonard at myacpl.org  Thu May 22 16:03:29 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 22 May 2014 10:03:29 -0400
Subject: [Koha-patches] [PATCH] Bug 12309 - Add more fields to batch patron
	modification tool
Message-ID: <1400767409-24926-1-git-send-email-oleonard@myacpl.org>

It would be helpful to be able to use the batch patron modification tool
to update city, state, zipcode, and country. This patch adds this
functionality.

This patch corrects an error in the batch modification script which
would have incorrectly marked first name as required if surname was
required.

This patch also converts the table sorting configuration to use table
header class names instead of index-based sorting for columns containing
dates.

To test, apply the patch and submit a batch of patrons to the batch
patron modification tool (Tools -> Batch patron modification).

In the list of patrons which will be modified you should see columns for
city, state, zipcode, and country. Table sorting should work correctly
without errors, including the registration and expiry date columns.

In the list of fields which can be batch modified you should see inputs
for city, state zipcode, and country. These fields should correctly
reflect mandatory/not mandatory based on the BorrowerMandatoryField
system preference.

Submit batch changes to a variety of fields and confirm that changes are
applied correctly. On the page of results the table should correctly
show all fields and be sorted correctly.
---
 .../prog/en/modules/tools/modborrowers.tt          |   28 +++++++++++++-----
 tools/modborrowers.pl                              |   31 ++++++++++++++++++--
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index dfb2107..b4f4c52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -14,15 +14,13 @@
                 $("#borrowerst").dataTable($.extend(true, {}, dataTablesDefaults, {
                     "sDom": 't',
                     [% IF ( op == 'show_results' ) %]
-                        "aoColumns": [
-                            null,null,null,null,null,{ "sType": "title-string" },{ "sType": "title-string" }[% FOREACH attrh IN attributes_header %],null[% END %]
+                        "aoColumnDefs": [
+                            { 'sType': "title-string", 'aTargets' : [ 'title-string'] }
                         ],
                     [% ELSE %]
                         "aoColumnDefs": [
                             { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
-                        ],
-                        "aoColumns": [
-                            null,null,null,null,null,null,{ "sType": "title-string" },{ "sType": "title-string" }[% FOREACH attrh IN attributes_header %],null[% END %]
+                            { 'sType': "title-string", 'aTargets' : [ 'title-string'] }
                         ],
                     [% END %]
                     "bPaginate": false
@@ -232,8 +230,12 @@
                                                 <th>First name</th>
                                                 <th>Library</th>
                                                 <th>Category</th>
-                                                <th>Registration date</th>
-                                                <th>Expiry date</th>
+                                                <th>City</th>
+                                                <th>State</th>
+                                                <th>Zip code</th>
+                                                <th>Country</th>
+                                                <th class="title-string">Registration date</th>
+                                                <th class="title-string">Expiry date</th>
                                                 [% FOREACH attrh IN attributes_header %]
                                                     <th>[% attrh.attribute %]</th>
                                                 [% END %]
@@ -250,6 +252,10 @@
                                                     <td>[% borrower.firstname %]</td>
                                                     <td>[% borrower.branchname %]</td>
                                                     <td>[% borrower.categorycode %]</td>
+                                                    <td>[% borrower.city %]</td>
+                                                    <td>[% borrower.state %]</td>
+                                                    <td>[% borrower.zipcode %]</td>
+                                                    <td>[% borrower.country %]</td>
                                                     <td><span title="[% borrower.dateenrolled %]">[% borrower.dateenrolled | $KohaDates %]</span></td>
                                                     <td><span title="[% borrower.dateexpiry %]">[% borrower.dateexpiry | $KohaDates %]</span></td>
                                                     [% FOREACH pa IN borrower.patron_attributes %]
@@ -288,6 +294,14 @@
                                                 Library:
                                                 [% CASE 'categorycode' %]
                                                 Category
+                                                [% CASE 'city' %]
+                                                City
+                                                [% CASE 'state' %]
+                                                State
+                                                [% CASE 'zipcode' %]
+                                                Zip code
+                                                [% CASE 'country' %]
+                                                Country
                                                 [% CASE 'sort1' %]
                                                 Sort 1:
                                                 [% CASE 'sort2' %]
diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
index 5bd2103..3b7808b 100755
--- a/tools/modborrowers.pl
+++ b/tools/modborrowers.pl
@@ -21,7 +21,8 @@
 #
 # Batch Edit Patrons
 # Modification for patron's fields:
-# surname firstname branchcode categorycode sort1 sort2 dateenrolled dateexpiry borrowernotes
+# surname firstname branchcode categorycode city state zipcode country sort1
+# sort2 dateenrolled dateexpiry borrowernotes
 # And for patron attributes.
 
 use Modern::Perl;
@@ -169,7 +170,7 @@ if ( $op eq 'show' ) {
         {
             name => "firstname",
             type => "text",
-            mandatory => ( grep /surname/, @mandatoryFields ) ? 1 : 0,
+            mandatory => ( grep /firstname/, @mandatoryFields ) ? 1 : 0,
         }
         ,
         {
@@ -187,6 +188,30 @@ if ( $op eq 'show' ) {
         }
         ,
         {
+            name => "city",
+            type => "text",
+            mandatory => ( grep /city/, @mandatoryFields ) ? 1 : 0,
+        }
+        ,
+        {
+            name => "state",
+            type => "text",
+            mandatory => ( grep /state/, @mandatoryFields ) ? 1 : 0,
+        }
+        ,
+        {
+            name => "zipcode",
+            type => "text",
+            mandatory => ( grep /zipcode/, @mandatoryFields ) ? 1 : 0,
+        }
+        ,
+        {
+            name => "country",
+            type => "text",
+            mandatory => ( grep /country/, @mandatoryFields ) ? 1 : 0,
+        }
+        ,
+        {
             name => "sort1",
             type => @sort1_option ? "select" : "text",
             option => \@sort1_option,
@@ -230,7 +255,7 @@ if ( $op eq 'do' ) {
 
     my @disabled = $input->param('disable_input');
     my $infos;
-    for my $field ( qw/surname firstname branchcode categorycode sort1 sort2 dateenrolled dateexpiry borrowernotes/ ) {
+    for my $field ( qw/surname firstname branchcode categorycode city state zipcode country sort1 sort2 dateenrolled dateexpiry borrowernotes/ ) {
         my $value = $input->param($field);
         $infos->{$field} = $value if $value;
         $infos->{$field} = "" if grep { /^$field$/ } @disabled;
-- 
1.7.9.5

From oleonard at myacpl.org  Thu May 22 19:24:59 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 22 May 2014 13:24:59 -0400
Subject: [Koha-patches] [PATCH] Bug 12255 - Amazon cover images have useless
	image alt text in bootstrap
Message-ID: <1400779499-27157-1-git-send-email-oleonard@myacpl.org>

"item-thumbnail" is not a useful alt text for an Amazon book cover
image. Better would be the link's title text, "View on Amazon.com." This
patch makes this correction. (Rather than "View at Amazon.com" which
doesn't sound correct to me).

To test you must have the OPACAmazonCoverImages system preference
enabled. Log in to the OPAC and view your list of checked-out titles.
The alt text for cover images should be "View on Amazon.com." Test in
both prog and Bootstrap.
---
 .../opac-tmpl/bootstrap/en/modules/opac-user.tt    |    4 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 50c66c1..8e4110b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -151,7 +151,7 @@
 
                                                     [% 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" title="View at Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="item-thumbnail" class="item-thumbnail"/></a>
+                                                            <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>
                                                         [% ELSE %]
                                                             <a href="#"><span class="no-image">No cover image available</span></a>
                                                         [% END %]
@@ -389,7 +389,7 @@
                                                     <td class="jacketcell">
                                                     [% IF ( OPACAmazonCoverImages ) %]
                                                         [% IF ( OVERDUE.normalized_isbn ) %]
-                                                            <a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% OVERDUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a>
+                                                            <a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% OVERDUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail" /></a>
                                                         [% ELSE %]
                                                             <a href="#"><span class="no-image">No cover image available</span></a>
                                                         [% 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 c3a4fe1..9f1478e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -193,7 +193,7 @@ var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended
 
 [% IF ( JacketImages ) %]<td class="jacketcell">
 
-[% 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" title="View at Amazon.com"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="Cover Image" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %]
+[% 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" title="View on Amazon.com"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="View on Amazon.com" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %]
 
 [% IF ( GoogleJackets ) %][% IF ( ISSUE.normalized_isbn ) %]<div style="display:block;" title="Click to view in Google Books" class="[% ISSUE.normalized_isbn %]" id="gbs-thumbnail[% loop.count %]"></div>[% ELSE %]<a href="http://books.google.com/books?q=[% ISSUE.title |url %]"><span class="no-image">No cover image available</span></a>[% END %][% END %]
 
@@ -348,7 +348,7 @@ var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended
 <tr>
 [% IF ( JacketImages ) %]<td class="jacketcell">
 
-[% IF ( OPACAmazonCoverImages ) %][% IF ( OVERDUE.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %]
+[% IF ( OPACAmazonCoverImages ) %][% IF ( OVERDUE.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="thumbnail" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %]
 
 [% IF ( GoogleJackets ) %][% IF ( OVERDUE.normalized_isbn ) %]<div style="display:block;" title="Click to view in Google Books" class="[% OVERDUE.normalized_isbn %]" id="gbs-thumbnail[% loop.count %]"></div>[% ELSE %]<a href="http://books.google.com/books?q=[% OVERDUE.title |url %]"><span class="no-image">No cover image available</span></a>[% END %][% END %]
 
-- 
1.7.9.5

From oleonard at myacpl.org  Thu May 22 19:28:49 2014
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 22 May 2014 13:28:49 -0400
Subject: [Koha-patches] [PATCH] Bug 12280 - "Others..." reason for
	suggestions not showing in Bootstrap OPAC
Message-ID: <1400779730-27497-1-git-send-email-oleonard@myacpl.org>

If you accept or reject a suggestion using the "Others..." option and
entering a reason manually, the text is not showing up in the Bootstrap
OPAC theme as it does in CCSR and prog. This patch corrects the problem.

This patch also adds a missing [% USE AuthorisedValues %] which would
cause errors if the template tried to display a custom suggestion status
as defined in the SUGGEST_STATUS authorized value category.

To test, accept or reject a suggestion and specify a custom reason. View
that suggestion in the Bootstrap OPAC and confirm that the custom reason
is displayed.
---
 .../bootstrap/en/modules/opac-suggestions.tt       |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index 573cd37..f58dd00 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -1,4 +1,5 @@
 [% USE Koha %]
+[% USE AuthorisedValues %]
 [% 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 %]
@@ -205,6 +206,7 @@
                                                         [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined
                                                         [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library
                                                         [% ELSE %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) %] [% END %]
+                                                        [% IF ( suggestions_loo.reason ) %]([% suggestions_loo.reason |html %])[% END %]
                                                     </td>
                                                 </tr>
                                             [% END # / FOREACH suggestions_loo %]
-- 
1.7.9.5

From Viktor.Sarge at regionhalland.se  Fri May 30 12:14:27 2014
From: Viktor.Sarge at regionhalland.se (Viktor.Sarge at regionhalland.se)
Date: Fri, 30 May 2014 10:14:27 +0000
Subject: [Koha-patches] Introduction from Viktor
Message-ID: <EA957225-2412-4409-A9DC-20D95F429C2D@regionhalland.se>

Dear subscribers of the patches list! 

My name is Viktor Sarge and I am now extending my lurking about from IRC, the general list and the dev list to the patches list. I work as a senior regional library development officer at the regional library of Halland in Sweden. I?ve been involved with Koha for a few years now and presently run a project trying to do as much as possible to make Koha a relevant free infrastructure for Swedish libraries. This includes both funding development in Koha and helping interested libraries get hold of the right information. The reason I subscribe to this list is that I want to learn more about the inner workings of Koha and plan to submit one or two line patches once in a while if I can wrap my head around using git to format my changes correctly. I?m not really a programmer but am dusting of my old SQL and learning a bit of Perl to be able to better understand what?s going on. 

Kind regards!
/Viktor Sarge


Viktor Sarge
Regionbibliotek Halland
Kultur i Halland

TFN: 0046(0)35-17 98 73
E-POST: Viktor.Sarge at regionhalland.se
BES?KSADRESS: S?dra v?gen 9, 30180 Halmstad
WEBB: www.regionhalland.se/regionbibliotek
 










From nengard at bywatersolutions.com  Sat May 31 19:33:44 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sat, 31 May 2014 12:33:44 -0500
Subject: [Koha-patches] [PATCH] [BUG 11958] Fix typon in classification
	source help The Classification Sources help file said the
	source was in the 942$2 but it's in the 952$2 and 94$2 so
	this patch fixes that.
Message-ID: <1401557624-6775-1-git-send-email-nengard@bywatersolutions.com>

To test:
* Go to Admin > Classification Sources
* Click Help
* Confirm the Help file is right now
---
 .../prog/en/modules/help/admin/classsources.tt     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 b33b947..da49580 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
@@ -2,7 +2,7 @@
 
 <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 952$2 and 942$2 in Koha's MARC Bibliographic frameworks.</p>
 
 <p>Commonly used values of this field are:</p>
 
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat May 31 19:34:30 2014
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Sat, 31 May 2014 12:34:30 -0500
Subject: [Koha-patches] [PATCH] [BUG 12231] Update
	AllowMultipleIssuesOnABiblio language
Message-ID: <1401557670-6811-1-git-send-email-nengard@bywatersolutions.com>

This preference had misleading language, this patch changes it a bit
to make it clearer.

To test:
* Apply patch
* Visit System Preferences
* Go to Circulation Tab
* Read description of AllowMultipleIssuesOnABiblio preference
* Confirm that it is clearer
---
 .../en/modules/admin/preferences/circulation.pref  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 81065f9..5a768a6 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
@@ -348,7 +348,7 @@ Circulation:
               choices:
                   yes: Allow
                   no: "Don't allow"
-            - patrons to check out multiple items from the same record, except for records with subscriptions.
+            - "patrons to check out multiple items from the same record.  (NOTE: This will only effect records without a subscription attached.)"
     Checkin Policy:
         -
             - pref: BlockReturnOfWithdrawnItems
-- 
1.7.2.3