Synching with rel_2_2.

diff --git a/koha-tmpl/intranet-tmpl/npl/en/images/checkall.gif b/koha-tmpl/intranet-tmpl/npl/en/images/checkall.gif
new file mode 100644 (file)
index 0000000..cc8c0a9
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/npl/en/images/checkall.gif differ

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbookfund.tmpl
index 03d602c..f8771f7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbookfund.tmpl
@@ -27,13 +27,13 @@
        <tr>
                <td><a href="<!-- TMPL_VAR name="action" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" --> "><!-- TMPL_VAR name="bookfundid" --></a></td>
                <td><!-- TMPL_VAR name="bookfundname" --></td>
-               <td><a class="edit" href="<!-- TMPL_VAR name="action" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" --> ">Edit</a></td>
-               <td><a class="delete" href="<!-- TMPL_VAR name="action" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Delete</a></td>
+               <td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
+               <td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
        </tr>
                <tr>
                <td>&nbsp;</td>
                <td><b>Budget</b></td>
-               <td><a class="edit" href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Add Budget</a></td>
+               <td><form action="aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="submit" value="Add Budget" /></form></td>
                <td></td>
        </tr>
        <!-- TMPL_LOOP name="budget" -->
@@ -42,8 +42,8 @@
                        <td>
                                <!-- TMPL_VAR name="startdate" --> - <!-- TMPL_VAR name="enddate" --> : <b><!-- TMPL_VAR name="budgetamount" --></b>
                        </td>
-                       <td><a class="edit" href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR name="aqbudgetid" -->">Edit</a></td>
-                       <td><a class="delete" href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;aqbudgetid=<!-- TMPL_VAR name="aqbudgetid" -->">Delete</a></td>
+                       <td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
+                       <td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
 
                </tr>
        <!-- /TMPL_LOOP -->
@@ -108,18 +108,21 @@
                }
        }
        </SCRIPT>
-<h1><!-- TMPL_VAR name="header" --></h1>
 <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
 <input type="hidden" name="op" value="add_validate" />
 <input type="hidden" name="checked" value="0" />
+<div class="data">
 <table>
+<caption><!-- TMPL_VAR name="header" --></caption>
 <!-- TMPL_IF name="add_or_modify" -->
-<tr><td>Book fund</td><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><!-- TMPL_VAR name="bookfundid" --></td></tr>
+<tr><th>Book fund</th><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><!-- TMPL_VAR name="bookfundid" --></td></tr>
 <!-- TMPL_ELSE -->
-<tr><td>Book fund</td><td><input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" /></td></tr>
+<tr><th>Book fund</th><td><input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" /></td></tr>
 <!-- /TMPL_IF -->
-<tr><td>Name</td><td><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" /></td></tr>
-</table><p><input type="button" value="OK" onclick="Check(this.form); return false;" class="submit" /> <input type="submit" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="action" -->'; return false;" /></p>
+<tr><th>Name</th><td><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" /></td></tr>
+</table>
+</div>
+<p><input type="button" value="<!-- TMPL_VAR name="header" -->" onclick="Check(this.form); return false;" class="submit" /> <input type="submit" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="action" -->'; return false;" /></p>
 </form>
 <!-- /TMPL_IF -->
 
@@ -131,11 +134,11 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-<h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundname" --></em></h3>
-<table>
-<tr><td>Book fund</td><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
-<tr><td>Name</td><td><!-- TMPL_VAR name="bookfundname" --></td></tr><tr><td>Group</td><td><!-- TMPL_VAR name="bookfundgroup" --></td></tr>
-</table><div class="tabitem"><form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" value="Delete this Fund" class="cancel" /></form> <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
+<h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></h3>
+<div class="data"><table>
+<tr><th>Book fund</th><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
+<tr><th>Name</th><td><!-- TMPL_VAR name="bookfundname" --></td></tr><tr><th>Group</th><td><!-- TMPL_VAR name="bookfundgroup" --></td></tr>
+</table></div><div class="tabitem"><form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" value="Delete this Fund" class="cancel" /></form> <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirmed" -->

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbudget.tmpl
index f8679f8..ab7c349 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbudget.tmpl
@@ -91,21 +91,22 @@
 <input type="hidden" name="op" value="add_validate" />
 <input type="hidden" name="checked" value="0" />
 <h1><!-- TMPL_VAR NAME="header" --></h1>
+<div class="data">
 <table>
 <!-- TMPL_IF name="modify" -->
-<tr><td>Book fund</td><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
-<tr><td>Book fund name</td><td><!-- TMPL_VAR NAME="bookfundname" --></td></tr>
+<tr><th>Book fund</th><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
+<tr><th>Book fund name</th><td><!-- TMPL_VAR NAME="bookfundname" --></td></tr>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="adding" -->
-<tr><td><label for="bookfundid">Bookfund</label></td><td><input type="hidden" name="bookfundid" id="bookfundid" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
+<tr><th><label for="bookfundid">Bookfund</label></th><td><input type="hidden" name="bookfundid" id="bookfundid" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
 <!-- /TMPL_IF -->
 
-<tr><td><label for="startdate">Start date (<!-- TMPL_VAR NAME="dateformat" -->)</label></td><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR NAME="startdate" -->" />&nbsp;</td></tr>
-<tr><td><label for="enddate">End date (<!-- TMPL_VAR NAME="dateformat" -->)</label></td><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR NAME="enddate" -->" /></td></tr>
-<tr><td><label for="budgetamount">Budget amount</label></td><td><input type="text" name="budgetamount" id="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->" /></td></tr>
-</table>
-<input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" /><input type="button" value="Add" class="submit" onclick="Check(this.form)" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='/cgi-bin/koha/admin/aqbudget.pl'; return false;" /></form>
+<tr><th><label for="startdate">Start date (<!-- TMPL_VAR NAME="dateformat" -->)</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR NAME="startdate" -->" />&nbsp;</td></tr>
+<tr><th><label for="enddate">End date (<!-- TMPL_VAR NAME="dateformat" -->)</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR NAME="enddate" -->" /></td></tr>
+<tr><th><label for="budgetamount">Budget amount</label></th><td><input type="text" name="budgetamount" id="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->" /></td></tr>
+</table></div>
+<input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" /><input type="button" value="<!-- TMPL_VAR NAME="header" -->" class="submit" onclick="Check(this.form)" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='/cgi-bin/koha/admin/aqbudget.pl'; return false;" /></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_validate" -->
@@ -116,16 +117,18 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-<h3>Delete Book Fund '<!-- TMPL_VAR NAME="bookfundid" -->'?</h3>
-<table>
-<tr><td>Start date</td><td><!-- TMPL_VAR NAME="startdate" --></td></tr>
-<tr><td>End date</td><td><!-- TMPL_VAR NAME="enddate" --></td></tr>
-<tr><td>Budget Amount</td><td><!-- TMPL_VAR NAME="budgetamount" --></td></tr>
-<tr><td></td></tr></table><div class="tabitem"><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" /><input type="submit" value="Delete this Book Fund" class="cancel" /></form> <form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="Do Not Delete" class="submit" /></form></div>
+<h3>Delete Book Budget?</h3>
+<div class="data"><table>
+<tr><th>Start date</th><td><!-- TMPL_VAR NAME="startdate" --></td></tr>
+<tr><th>End date</th><td><!-- TMPL_VAR NAME="enddate" --></td></tr>
+<tr><th>Budget Amount</th><td><!-- TMPL_VAR NAME="budgetamount" --></td></tr>
+</table></div>
+
+<div class="tabitem"><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" /><input type="submit" value="Delete this Book Fund" class="cancel" /></form> <form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="Do Not Delete" class="submit" /></form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
-<h3>Book fund deleted</h3>
+<h3>Budget deleted</h3>
 <div class="form"><form action="<!-- TMPL_VAR NAME="action" -->" method="post">
 <input type="submit" value="Continue" class="submit" />
 </form></div>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl
index c90d15d..9b3ff8c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl
@@ -78,20 +78,23 @@
        <!-- TMPL_ELSE -->
                <h1>Add category</h1>
        <!-- /TMPL_IF -->
-       <div class="form"><table>
+       <div class="data"><table>
        <!-- TMPL_IF NAME="categorycode" -->
        <tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" -->
                                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /></td></tr>
        <!-- TMPL_ELSE -->
        <tr><th>Category code</th><td><input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)" /></td></tr>
        <!-- /TMPL_IF -->
-       <tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
-       <tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
-       <tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
-       <tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
-       <tr><th>Enrollment fee</th><td>$<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
-       <tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
-       <tr><th>Reserve fee</th><td>$<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
+       <tr><th>Description</th><td>&nbsp; <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
+       <tr><th>Enrolment period</th><td>&nbsp; <input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
+       <tr><th>Upperage limit</th><td>&nbsp; <input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
+       <tr><th>Age Required</th><td>&nbsp; <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
+       <tr><th>Enrollment fee</th><td>$ <input type="text" name="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
+       <tr><th>Overdue notice required</th><td>&nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
+                                               <option<!-- TMPL_UNLESS name="overduenoticerequired" --> selected="selected"<!-- /TMPL_UNLESS --> value="0">No</option>
+                                               <option<!-- TMPL_IF NAME="overduenoticerequired" --> selected="selected"<!-- /TMPL_IF --> value="1">Yes</option>
+                                       </select></td></tr>
+       <tr><th>Reserve fee</th><td>$ <input type="text" name="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
 </table></div>
        <p>                             <input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
        </form>
@@ -149,32 +152,28 @@
        </form> 
         <div class="data"><table>
                <tr>
-                       <th scope="col">Category</th>
-                       <th scope="col">Description</th>
+                       <th scope="col">Category Name</th>
+                       <th scope="col">Code</th>
                        <th scope="col">Enrollment Period</th>
                        <th scope="col">Upper Age Limit</th>
                        <th scope="col">Age Required</th>
-                       <th scope="col">Fine</th>
                        <th scope="col">Enrollment Fee</th>
                        <th scope="col">Overdue</th>
-                       <th scope="col">Issue Limit</th>
                        <th scope="col">Reservation Fee</th>
                        <th scope="col" colspan="2">&nbsp; </th>
                </tr>
                <!-- TMPL_LOOP NAME="loop" -->
-               <tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPl_IF -->>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
-                        <td><!-- TMPL_VAR NAME="description" --></td>
+               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPl_IF -->
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="description" --></a></td><td><!-- TMPL_VAR NAME="categorycode" --></td>
+                        
                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td>
                         <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
-                        <td><!-- TMPL_VAR NAME="finetype" --></td>
                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
-                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
-                        <td><!-- TMPL_VAR NAME="issuelimit" --></td>
+                        <td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
-                        <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
-                        <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>
+                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME=script_name -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
                </tr>
                <!-- /TMPL_LOOP -->
        </table></div><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/currency.tmpl
index 6ab3e32..ada8c7f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/currency.tmpl
@@ -68,7 +68,7 @@
         <form action="<!-- TMPL_VAR NAME=script_name -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 
-       <table>
+<div class="data">     <table>
        <caption><!-- TMPL_IF NAME=searchfield -->
                Modify currency
        <!-- TMPL_ELSE -->
@@ -76,14 +76,14 @@
        <!-- /TMPL_IF --></caption>
        <!-- TMPL_IF NAME="searchfield" -->
                <tr>
-                       <td>Currency</td>
+                       <th>Currency</th>
                        <td>
                                <input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
                        </td>
                </tr>
        <!-- TMPL_ELSE -->
                <tr>
-                       <td>Currency</td>
+                       <th>Currency</th>
                        <td>
                                <input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this);" />
                        </td>
@@ -91,12 +91,14 @@
        <!-- /TMPL_IF -->
 
                <tr>
-                       <td>Rate</td>
+                       <th>Rate</th    >
                        <td>
                                <input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
                        </td>
                </tr>
-        </table><input type="button" value="Update" onClick="Check(this.form)" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" />
+        </table></div>
+               
+               <input type="button" value="Update" onClick="Check(this.form)" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" />
         </form>
 
 <!-- /TMPL_IF -->
@@ -149,7 +151,7 @@
 
 <!-- TMPL_IF NAME="else" -->
 
-<h2>Currencies admin</h2>
+<h2>Currencies Management</h2>
        <!-- TMPL_IF NAME="searchfield" -->
                You searched for <span class="ex"><!-- TMPL_VAR NAME="searchfield" --></span>
        <!-- /TMPL_IF -->       
@@ -167,8 +169,8 @@
                <tr>
                        <td><!-- TMPL_VAR NAME="currency" --></td>
                        <td><!-- TMPL_VAR NAME="rate" --></td>
-                       <td><a class="edit"  href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->">Edit</a></td>
-                        <td><a class="delete" href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->">Delete</a></td>
+                       <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" value="Delete" class="delete" /></form></td>
                </tr>
                <!-- /TMPL_LOOP -->
        </table></div>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/itemtypes.tmpl
index 719ebbe..cd78ff0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/itemtypes.tmpl
@@ -37,7 +37,7 @@
                        <tr>
                        <tr>
                                <th><label for="renewalsallowed">Renewals</label></th>
-                               <td><input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_IF name="renewalsallowed" --><!-- TMPL_VAR NAME="renewalsallowed" --><!-- /TMPL_IF -->" value="1" /><!-- Display for NPL <input type="hidden" name="rentalcharge" value="0" /> /Display for NPL --></td>
+                               <td><input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_IF name="renewalsallowed" --><!-- TMPL_VAR NAME="renewalsallowed" --><!-- /TMPL_IF -->" value="1" /><!-- Display for NPL //<input type="hidden" name="rentalcharge" value="0" /> //Display for NPL --></td>
                        </tr>
 <!-- Hide from NPL-->                  <tr>
                                <th><label for="rentalcharge">Rental charge</label></th>
@@ -59,7 +59,7 @@
        <tr><th>Description</th><td><!-- TMPL_VAR name="description" --></td></tr>
        <tr><th>Loan length</th><td><!-- TMPL_VAR name="loanlength" --></td></tr>
        <tr><th>Renewals</th><td><!-- TMPL_IF name="renewalsallowed" -->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></td></tr>
-<!-- Hide from NPL --><tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" --></td></tr><!-- /Hide from NPL --></table></div>
+<!-- Hide from NPL  --><tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" --></td></tr><!-- Hide from NPL --></table></div>
                <div class="tabitem"><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
                <input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" /><!-- TMPL_IF name="total" -->
                </form><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>
@@ -87,17 +87,15 @@
                        <td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->"><!-- TMPL_VAR name="itemtype" --></a></td>
                        <td><!-- TMPL_VAR name="description" --></td>
                        <td><!-- TMPL_IF NAME="notforloan" -->Yes<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
-                       <td><!-- TMPL_UNLESS name="notforloan" -->
-                                       <!-- TMPL_IF NAME="renewalsallowed" -->
+                       <td><!-- TMPL_IF NAME="renewalsallowed" -->
                                                <!-- TMPL_VAR name="renewalsallowed" --> time(s)
                                        <!-- TMPL_ELSE -->
                                                No
                                        <!-- /TMPL_IF -->
-                               <!-- /TMPL_UNLESS -->
                        </td>
                <td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- /TMPL_UNLESS --></td>
-                       <td><a class="edit" href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->">Edit</a></td>
-                       <td><a class="delete" href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->">Delete</a></td>
+                       <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" escape="HTML" -->" /><input type="submit" value="Edit" class="submit" /></form></td>
+                       <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" escape="HTML" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
                </tr>
        <!-- /TMPL_LOOP -->
 </table>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl
index c7b510e..71000f7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl
@@ -54,34 +54,19 @@
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 
-<table border="0" cellspacing="0" cellpadding="2">
-       <tr valign="top" bgcolor="#99cc33">
-               <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Subfield</b></td>
-               <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="tagsubfield" --></b></td>
-       </tr>
-       <tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
-       <tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
+<div class="data"><table>
+<caption>Confirm Deletion of Subfield <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
        <tr>
-               <td>
-                       <form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
-                               <input type="hidden" name="op" value="delete_confirmed" />
-                               <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
-                               <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
-                               <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-                               <input type="submit" class="cancel" value="YES" />
-                       </form>
-               </td>
-               <td>
-                       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+               <th>Subfield</th>
+               <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+       </tr>
+       <tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+</table></div>
+                       <form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
                                <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
-                               <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
-                               <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-                               <input type="submit" class="submit" value="NO" />
+                               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="cancel" value="Yes, Delete this Subfield" />
+                       </form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">       <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /> <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />       <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" /> <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />     <input type="submit" class="submit" value="No, Do Not Delete" />
                        </form>
-               </td>
-       </tr>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
@@ -105,7 +90,7 @@
        <th>Constraints</th>
        <th>Delete</th>
 <!-- TMPL_LOOP NAME="loop" -->
-<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
        <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
        <td>
                <!-- TMPL_IF NAME="subfield_ignored" -->

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
index a8b325d..fe1e601 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
@@ -111,7 +111,7 @@
                        <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
                <!-- /TMPL_LOOP -->
                </select>
-               <input type="submit" value="OK" class="button">
+               <input type="submit" value="OK" class="submit">
        </form>
 <!-- /TMPL_IF -->
 

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/printers.tmpl
index 2cfc252..495b972 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/printers.tmpl
@@ -171,7 +171,8 @@
                        <td><!-- TMPL_VAR NAME="printername" --></td>
                        <td><!-- TMPL_VAR NAME="printqueue" --></td>
                        <td><!-- TMPL_VAR NAME="printtype" --></td>
-                       <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Delete</a></td>
+                       <td><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" value="Edit" class="submit" /></form> <form class="inline" action="" method="get"><input type="hidden" name=
+"op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
                </tr>
                <!-- /TMPL_LOOP -->
        </table>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/z3950servers.tmpl
index a796510..4d3c7b0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/z3950servers.tmpl
@@ -85,17 +85,17 @@
         <!-- TMPL_ELSE -->
                 <h1>Add Z39.50 Server</h1>
         <!-- /TMPL_IF -->                
-        <table>
+        <div class="data"><table>
         <!-- TMPL_IF NAME=searchfield -->
                 <tr>
-                        <td>Z39.50 Server</td>
+                        <th>Z39.50 Server</th>
                         <td>
                                 <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
                         </td>
                 </tr>
         <!-- TMPL_ELSE -->
                 <tr>
-                        <td>Z39.50 Server</td>
+                        <th>Z39.50 Server</th>
                         <td>
                                 <input type="text" name="searchfield" size="65" maxlength="100" onblur="toUC(this)" />
                         </td>
@@ -103,48 +103,48 @@
         <!-- /TMPL_IF -->
 
                <tr>
-                       <td>Hostname</td>
+                       <th>Hostname</th>
                        <td>
                                <input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Port</td>
+                       <th>Port</th>
                        <td>
                                <input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
                        </td>
                </tr>
                <tr>
-                       <td>Database</td>
+                       <th>Database</th>
                        <td>
                                <input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Userid</td>
+                       <th>Userid</th>
                        <td>
                                <input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Password</td>
+                       <th>Password</th>
                        <td>
                                <input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Checked (searched by default)</td>
+                       <th>Checked (searched by default)</th>
                        <td>
                                <input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)" />  
                <tr>
-                       <td>Rank (display order)</td>
+                       <th>Rank (display order)</th>
                        <td>
                                <input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)" />
                        </td>
                </tr>
                                <tr>
-                       <td>Syntax (z3950 can send<br>
-                        records in various format. Choose one)</td>
+                       <th>Syntax (z3950 can send<br>
+                        records in various format. Choose one)</th>
                        <td>
                                <select name="syntax">
                                        <option value="USMARC">USMARC</option>
@@ -152,7 +152,7 @@
                                </select>
                        </td>
                </tr>
-        </table><input type="button" value="<!-- TMPL_IF NAME=searchfield -->Update Z39.50 Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" class="submit" />  <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" />
+        </table></div><input type="button" value="<!-- TMPL_IF NAME=searchfield -->Update Z39.50 Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" class="submit" />  <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" />
         </form>
 <!-- /TMPL_IF -->
 
@@ -229,8 +229,7 @@
 <table>
                 <tr>
                         <th>Site</th>
-                        <th>Hostname</th>
-                        <th>Port</th>
+                        <th>Hostname/Port</th>
                         <th>Database</th>
                         <th>Userid</th>
                         <th>Password</th>
@@ -240,18 +239,17 @@
                         <th colspan="2">&nbsp;</th>
                 </tr>
                 <!-- TMPL_LOOP NAME=loop -->
-                <tr>
+               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                         <td><!-- TMPL_VAR NAME="name" --></td>
-                        <td><!-- TMPL_VAR NAME="host" --></td>
-                        <td><!-- TMPL_VAR NAME="port" --></td>
+                        <td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td>
                         <td><!-- TMPL_VAR NAME="db" --></td>
                         <td><!-- TMPL_VAR NAME="userid" --></td>
                         <td><!-- TMPL_VAR NAME="password" --></td>
                         <td><!-- TMPL_VAR NAME="checked" --></td>
                         <td><!-- TMPL_VAR NAME="rank" --></td>
                                                <td><!-- TMPL_VAR NAME="syntax" --></td>
-                        <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Edit</a></td>
-                        <td><a class="delete" href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Delete</a></td>                
+                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
+                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><input type="submit" class="delete" value="Delete" /></form></td>                
                        </tr>
                 <!-- /TMPL_LOOP -->
        </table>