[Koha-patches] [PATCH] Markup corrections.

Owen Leonard oleonard at myacpl.org
Tue Sep 16 22:00:51 CEST 2008


---
 acqui/neworderempty.pl                             |    1 -
 admin/aqbudget.pl                                  |    4 +-
 admin/authorised_values.pl                         |    1 -
 .../prog/en/includes/authorities-search.inc        |   12 ++--
 .../prog/en/includes/bookfund-admin-search.inc     |   10 +-
 .../prog/en/includes/cities-admin-search.inc       |    4 +-
 .../prog/en/includes/dictionary-toolbar.inc        |    2 +-
 .../prog/en/includes/guided-reports-view.inc       |    8 +-
 .../prog/en/includes/roadtype-admin-search.inc     |    4 +-
 .../prog/en/modules/acqui/neworderempty.tmpl       |    6 +-
 .../prog/en/modules/admin/aqbudget.tmpl            |    4 +-
 .../prog/en/modules/admin/branches.tmpl            |   18 +++--
 .../prog/en/modules/admin/currency.tmpl            |   10 ++-
 .../prog/en/modules/admin/patron-attr-types.tmpl   |    2 +-
 .../prog/en/modules/authorities/authorities.tmpl   |   31 +++-----
 .../prog/en/modules/reports/borrowers_out.tmpl     |    2 +-
 .../prog/en/modules/reports/cat_issues_top.tmpl    |    4 +-
 .../en/modules/reports/guided_reports_start.tmpl   |    8 +-
 .../prog/en/modules/reports/itemslost.tmpl         |    2 +-
 .../prog/en/modules/serials/member-search.tmpl     |    6 +-
 .../prog/en/modules/serials/routing.tmpl           |   10 +-
 .../en/modules/serials/serials-collection.tmpl     |    2 +-
 .../prog/en/modules/serials/subscription-add.tmpl  |   78 ++++++++++----------
 .../en/modules/serials/subscription-detail.tmpl    |    4 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    5 +-
 25 files changed, 116 insertions(+), 122 deletions(-)

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 1340543..8baa60b 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -189,7 +189,6 @@ my $CGIbookfund = CGI::scrolling_list(
     -default  => ($data->{'bookfundid'} ? $data->{'bookfundid'} : $select_bookfund[0]),
     -labels   => \%select_bookfunds,
 	#-size     => 1,
-	-tabindex =>'',
     -multiple => 0
 );
 
diff --git a/admin/aqbudget.pl b/admin/aqbudget.pl
index 5ad9e1e..fccedae 100755
--- a/admin/aqbudget.pl
+++ b/admin/aqbudget.pl
@@ -168,8 +168,8 @@ SELECT branchcode,
     $template->param(
         dateformat => C4::Dates->new()->visual(),
         aqbudgetid => $dataaqbudget->{'aqbudgetid'},
-        startdate => $dataaqbudget->{'startdate'},
-          enddate => $dataaqbudget->{'enddate'},
+        startdate => format_date($dataaqbudget->{'startdate'}),
+          enddate => format_date($dataaqbudget->{'enddate'}),
         budgetamount => $dataaqbudget->{'budgetamount'},
         branches => \@branches,
     );
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index ee57abd..a183c8f 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -227,7 +227,6 @@ sub default_form {
 			-values=> \@category_list,
 			-default=>"",
 			-size=>1,
- 			-tabindex=>'',
 			-multiple=>0,
 			);
 	if (!$searchfield) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
index 1aa10a2..adc09ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -3,11 +3,11 @@
 <div id="header_search" class="residentsearch">
     <div id="authority_search" class="residentsearch">
     <p class="tip">Enter authority heading ($a):</p>
-    <form name="f" action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
+    <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
         <input type="hidden" name="op" value="do_search" />
         <input type="hidden" name="type" value="intranet" />
         <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-        <select id="authtypecode" name="authtypecode">
+        <select name="authtypecode">
         <!-- TMPL_LOOP NAME="authtypesloop" -->
             <!-- TMPL_IF name="selected" -->
             <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="authtypetext" --></option>
@@ -33,11 +33,11 @@
     </div>
     <div id="main_heading" class="residentsearch" style="display:none;">
     <p class="tip">Enter authority heading:</p>
-    <form name="f" action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
+    <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
         <input type="hidden" name="op" value="do_search" />
         <input type="hidden" name="type" value="intranet" />
         <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-        <select id="authtypecode" name="authtypecode">
+        <select  name="authtypecode">
         <!-- TMPL_LOOP NAME="authtypesloop" -->
             <!-- TMPL_IF name="selected" -->
             <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="authtypetext" --></option>
@@ -65,11 +65,11 @@
     </div>
     <div id="all_headings" class="residentsearch" style="display:none;">
     <p class="tip">Enter any authority field:</p>
-    <form name="f" action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
+    <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
         <input type="hidden" name="op" value="do_search" />
         <input type="hidden" name="type" value="intranet" />
         <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-        <select id="authtypecode" name="authtypecode">
+        <select name="authtypecode">
         <!-- TMPL_LOOP NAME="authtypesloop" -->
             <!-- TMPL_IF name="selected" -->
             <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="authtypetext" --></option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
index 97790c9..aa405d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
@@ -20,8 +20,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                 address,
                 ", ",
                 city,
-                "</small>",
-                "</div>"];
+                "<\/small>",
+                "<\/div>"];
             return (aMarkup.join(""));
         };
 
@@ -49,7 +49,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Search Funds:</p>
 
 	<form action="/cgi-bin/koha/admin/aqbookfund.pl" method="post">
-      <label for="filter_bookfundid">Code: </label><select name="filter_bookfundid" id="filter_bookfundid">
+      <label for="filter_bookfundid_s">Code: </label><select name="filter_bookfundid" id="filter_bookfundid_s">
         <option value="">----</option>
     <!-- TMPL_LOOP name="filter_bookfundids" -->
       <!-- TMPL_IF NAME="selected" -->
@@ -59,8 +59,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
       <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
       </select>
-      <label for="filter_bookfundname">Name: </label><input type="text" name="filter_bookfundname" id="filter_bookfundname" size="10" value="<!-- TMPL_VAR name="filter_bookfundname" -->" />
-      <label for="filter_branchcode">Library: </label><select name="filter_branchcode" id="filter_branchcode" style="width:10em;">
+      <label for="filter_bookfundname_s">Name: </label><input type="text" name="filter_bookfundname" id="filter_bookfundname_s" size="10" value="<!-- TMPL_VAR name="filter_bookfundname" -->" />
+      <label for="filter_branchcode_s">Library: </label><select name="filter_branchcode" id="filter_branchcode_s" style="width:10em;">
         <option value="">----</option>
     <!-- TMPL_LOOP name="filter_branches" -->
       <!-- TMPL_IF NAME="selected" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index fb184e8..ed04bf4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -20,8 +20,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                 address,
                 ", ",
                 city,
-                "</small>",
-                "</div>"];
+                "<\/small>",
+                "<\/div>"];
             return (aMarkup.join(""));
         };
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc
index 9abda17..f630ff2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc
@@ -17,5 +17,5 @@
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<li><a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add New Definition">New Definition</a></li>
+	<li><a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add%20New%20Definition">New Definition</a></li>
 </ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
index 65ab896..bad5429 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
@@ -1,10 +1,10 @@
 <h5>Build and Run Reports</h5>
 <ul>
-	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build new">Build New</a></li>
-	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Used saved">Use Saved</a></li>
-	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL">Create from SQL</a></li>
+	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build New</a></li>
+	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Used%20saved">Use Saved</a></li>
+	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">Create from SQL</a></li>
 </ul>
 <h5>Reports Dictionary</h5>
 <ul>
-<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View Dictionary">View Dictionary</a></li>
+<li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View Dictionary</a></li>
 </ul>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index 307aee0..9bf5552 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -20,8 +20,8 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                 address,
                 ", ",
                 city,
-                "</small>",
-                "</div>"];
+                "<\/small>",
+                "<\/div>"];
             return (aMarkup.join(""));
         };
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 2159130..91b4482 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -45,10 +45,10 @@ function messenger(X,Y,etc){	// FIXME: unused?
     win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
     win.focus();
     win.document.close();
-    win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br />");
+    win.document.write("<body>");
     win.document.write(etc);
-    win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
-    win.document.write("</font></body></html>");
+    win.document.write("<form><input type=\"button\" onclick=\"self.close()\" value=\"Close\" \/><\/form>");
+    win.document.write("<\/body><\/html>");
 }
 
 function check(f) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
index bd5505d..b4b02be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -76,12 +76,12 @@
 <!-- TMPL_IF NAME="add_validate" -->
   <div class="dialog message">
   <h3>Budget Data Recorded</h3>
-  <form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="submit" class="approve" value="OK" /><form></div>
+  <form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="submit" class="approve" value="OK" /></form></div>
 <!-- /TMPL_IF --> <!-- add_validate -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
   <div class="dialog message"><h3>Budget deleted</h3>
-  <form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="submit" class="approve" value="OK" /><form></div>
+  <form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="submit" class="approve" value="OK" /></form></div>
 <!-- /TMPL_IF --> <!-- delete_confirmed -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 3b16826..2547f51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -82,15 +82,19 @@
             <label for="branchname">Name</label>
             <input type="text" name="branchname" id="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />&nbsp;
         </li>
-		<li><fieldset><legend>Group(s):</legend>
+	</ol>
+	</fieldset>
+	<!-- TMPL_IF NAME="categoryloop" --><fieldset class="rows"><legend>Group(s):</legend>
         <ol>
 		<!-- TMPL_LOOP name="categoryloop" -->
             <li><label for="<!-- TMPL_VAR name="categorycode" -->"><!-- TMPL_VAR name="categoryname" --></label>
                 <input type="checkbox" id="<!-- TMPL_VAR name="categorycode" -->" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /> <span class="hint"><!-- TMPL_VAR name="codedescription" --></span>
             </li>
-        <!-- /TMPL_LOOP --></fieldset>
+        <!-- /TMPL_LOOP -->
 		</ol>
-		</li>
+	</fieldset><!-- /TMPL_IF -->
+	<fieldset class="rows">
+	<ol>
         <li><label for="branchaddress1">Address Line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></li>
         <li><label for="branchaddress2">Address Line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></li>
         <li><label for="branchaddress3">Address Line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></li>
@@ -191,10 +195,10 @@
                     <!-- TMPL_VAR NAME="branchprinter" -->
                 </td> -->
                 <td>
-                    <a href="<!-- TMPL_VAR name="action" -->?op=edit&amp;branchcode=<!-- TMPL_VAR name="value" escape="HTML" -->">Edit</a>
+                    <a href="<!-- TMPL_VAR name="action" -->?op=edit&amp;branchcode=<!-- TMPL_VAR name="value" escape="url" -->">Edit</a>
                 </td>
                 <td>
-                    <a href="<!-- TMPL_VAR name="action" -->?branchcode=<!-- TMPL_VAR name="value" escape="HTML" -->&amp;branchname=<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->&amp;op=delete">Delete</a>
+                    <a href="<!-- TMPL_VAR name="action" -->?branchcode=<!-- TMPL_VAR name="value" escape="url" -->&amp;branchname=<!-- TMPL_VAR NAME="branch_name" escape="url" -->&amp;op=delete">Delete</a>
                 </td>
             </tr>
         <!-- /TMPL_LOOP --></tbody>
@@ -220,9 +224,9 @@
         <td><!-- TMPL_VAR name="categoryname" --></td>
         <td><!-- TMPL_VAR name="categorycode" --></td>
         <td><!-- TMPL_VAR name="codedescription" --></td>
-        <td><a href="<!-- TMPL_VAR name="action" -->?op=editcategory&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="HTML" -->">Edit</a>
+        <td><a href="<!-- TMPL_VAR name="action" -->?op=editcategory&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="url" -->">Edit</a>
         </td>
-        <td><a href="<!-- TMPL_VAR name="action" -->?op=delete_category&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="HTML" -->">Delete</a>
+        <td><a href="<!-- TMPL_VAR name="action" -->?op=delete_category&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="url" -->">Delete</a>
         </td>
         </tr>
     <!-- /TMPL_LOOP --><!-- TMPL_ELSE --><tr><td colspan="5">No <!-- TMPL_IF NAME="properties" -->Properties<!-- TMPL_ELSE --><!-- TMPL_IF NAME="searchdomain" -->Search Domain<!-- /TMPL_IF --><!-- /TMPL_IF --> Defined</td></tr><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index d1fa60d..ed4248e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -142,9 +142,11 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="add_validate" -->
+<div class="dialog message">
 <h3>Data Recorded</h3>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" />
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="approve"  value="OK" />
         </form>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
@@ -180,10 +182,10 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
-<h3>Currency Deleted</h3>
+<div class="dialog message"><h3>Currency Deleted</h3>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" value="OK" />
-	</form>
+		<input type="submit" class="approve" value="OK" />
+	</form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
index 0ec126a..486cc7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
@@ -127,7 +127,7 @@ this feature on.</div>
        </li>
         <li><label for="authorised_value_category">Authorized value category: </label>
             <select name="authorised_value_category" id="authorised_value_category">
-                <option value="" />
+                <option value=""></option>
                 <!-- TMPL_LOOP name="authorised_value_categories" -->
                     <!-- TMPL_IF name="selected" -->
                         <option value="<!-- TMPL_VAR name="category" -->" selected="selected">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index a75b646..db7c409 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -531,16 +531,14 @@ function searchauthority() {
                 <!-- TMPL_UNLESS name="hide_marc" -->
                     <span title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></span>
                     <!-- TMPL_IF NAME="fixedfield" -->
-                    <input tabindex="1"
-                                class="indicator flat"
+                    <input class="indicator flat"
                                 type="text"
                                 style="display:none;"
                                 name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator1_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->"
                                 size="1"
                                 maxlength="1"
                                 value="<!-- TMPL_VAR NAME="indicator1" -->" />
-                    <input tabindex="1"
-                                class="indicator flat"
+                    <input class="indicator flat"
                                 type="text"
                                 style="display:none;"
                                 name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator2_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->"
@@ -548,15 +546,13 @@ function searchauthority() {
                                 maxlength="1"
                                 value="<!-- TMPL_VAR NAME="indicator2" -->" />
                     <!-- TMPL_ELSE -->
-                    <input tabindex="1"
-                                class="indicator flat"
+                    <input class="indicator flat"
                                 type="text"
                                 name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator1_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->"
                                 size="1"
                                 maxlength="1"
                                 value="<!-- TMPL_VAR NAME="indicator1" -->" />
-                    <input tabindex="1"
-                                class="indicator flat"
+                    <input class="indicator flat"
                                 type="text"
                                 name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator2_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->"
                                 size="1"
@@ -565,21 +561,17 @@ function searchauthority() {
                     <!-- /TMPL_IF --> -
                 <!-- TMPL_ELSE -->
                     <!-- TMPL_IF NAME="fixedfield" -->
-                        <input tabindex="1"
-                            type="hidden"
+                        <input type="hidden"
                             name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator1_<!-- TMPL_VAR NAME='index'-->"
                             value="<!-- TMPL_VAR NAME="indicator1" --><!-- TMPL_VAR name="random" -->" />
-                        <input tabindex="1"
-                            type="hidden"
+                        <input type="hidden"
                             name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator2_<!-- TMPL_VAR NAME='index'-->"
                             value="<!-- TMPL_VAR NAME="indicator2" --><!-- TMPL_VAR name="random" -->" />
                     <!-- TMPL_ELSE -->
-                        <input tabindex="1"
-                            type="hidden"
+                        <input type="hidden"
                             name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator1_<!-- TMPL_VAR NAME='index'-->"
                             value="<!-- TMPL_VAR NAME="indicator1" --><!-- TMPL_VAR name="random" -->" />
-                        <input tabindex="1"
-                            type="hidden"
+                        <input type="hidden"
                             name="tag_<!-- TMPL_VAR NAME="tag" -->_indicator2_<!-- TMPL_VAR NAME='index'-->"
                             value="<!-- TMPL_VAR NAME="indicator2" --><!-- TMPL_VAR name="random" -->" />
                     <!-- /TMPL_IF -->
@@ -619,7 +611,7 @@ function searchauthority() {
                                 size="1"
                                 maxlength="1"
                                 class="flat"
-                                tabindex="-1" />
+                                tabindex="0" />
                     <!-- TMPL_ELSE -->
                         <input type="hidden"
                             name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
@@ -677,11 +669,10 @@ function searchauthority() {
     <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->" />
     <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
 <!-- /TMPL_IF -->
-<div id="action">
+<fieldset class="action">
         <input type="button" id="addauth2" value="Save" onclick="Check(this.form)" accesskey="w" />
-</div>
-</form>
 </fieldset>
+</form>
 </div>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
index c80d9b2..fd0a67e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
@@ -17,7 +17,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
     <!-- TMPL_LOOP NAME="mainloop" -->
-        <h1>Patrons with No Checkouts</h1>
+        <h1>Patrons with no Checkouts</h1>
         <!-- TMPL_IF NAME="loopfilter"-->
             <p>Filtered on</p>
             <!-- TMPL_LOOP NAME="loopfilter" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
index 3191e99..13896e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
@@ -34,10 +34,10 @@ function Dopop(link) {
 		<!-- /TMPL_IF-->
 		
 		<table>
-				<th>Rank/Biblioitemnumbers</th>
+<tr>				<th>Rank/Biblioitemnumbers</th>
 				<!-- TMPL_LOOP NAME="loopcol" -->
 					<th colspan="2"><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
+				<!-- /TMPL_LOOP --></tr>
         <tr>
 				<th>&nbsp;</th>
 				<!-- TMPL_LOOP NAME="loopcol" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 38fa9af..a0450e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -108,7 +108,7 @@ reports</p>
 <td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&amp;phase=Show%20SQL">Show SQL</a></td>
 <td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&amp;phase=Run%20this%20report">Run this Report</a></td>
 <td><a href="/cgi-bin/koha/tools/scheduler.pl?id=<!-- TMPL_VAR NAME="id" -->">Schedule this Report</a></td>
-<td><a class="confirmdelete" title="delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&amp;phase=Delete%20Saved">Delete</a></td></tr>
+<td><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&amp;phase=Delete%20Saved">Delete</a></td></tr>
 <!-- /TMPL_LOOP -->
 </table>
 </form>
@@ -358,7 +358,7 @@ NAME="name" -->"><!-- TMPL_VAR NAME="name"--></label></td><td>
 
 <!-- TMPL_IF NAME="execute" -->
 <h1><!-- TMPL_VAR NAME="name" --></h1>
-<p><!-- TMPL_VAR NAME="notes" --></p>
+<!-- TMPL_IF NAME="notes" --><p><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
 <!-- TMPL_IF name="pagination_bar" --><!-- TMPL_VAR name='pagination_bar'--><!-- /TMPL_IF -->
 <!-- TMPL_UNLESS name="errors" -->
 <table>
@@ -457,9 +457,9 @@ Sub report:<select name="subreport">
 <h2>Your report has been saved</h2>
 <p>The report you have created has now been saved. You can now</p>
 <ul>
-	<li>Access this report from the: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Used+saved">Saved Reports Page</a></li>
+	<li>Access this report from the: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Used%20saved">Saved Reports Page</a></li>
 	<li>Schedule this report to run using the: <a href="/cgi-bin/koha/tools/scheduler.pl">Scheduler Tool</a></li>
-	<li>Return to: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Used+saved">Guided Reports</a></li>
+	<li>Return to: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Used%20saved">Guided Reports</a></li>
 </ul>
 <!-- /TMPL_UNLESS -->
 <!-- TMPL_IF NAME="errors" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl
index e075ce1..0f94685 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl
@@ -43,7 +43,7 @@
      <!-- TMPL_LOOP NAME="itemsloop"-->
         <tr>
             <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->" title="<!-- TMPL_VAR NAME="itemnotes"-->">
-						  <!-- TMPL_VAR NAME="title"--></td>
+						  <!-- TMPL_VAR NAME="title" escape="html" -->
 					 </a></td>
             <td><!-- TMPL_VAR NAME="author"--></td>
             <td><!-- TMPL_VAR NAME="lib"--></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
index 78462bb..2e61e02 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl
@@ -12,7 +12,7 @@ function add_member(subscriptionid,borrowernumber){
 //-->
 </script>
 <style type="text/css">
-   #custom-doc { width:38.46em;*width:37.53em;min-width:500px; margin:auto; text-align:left; }
+   #custom-doc { width:37.46em;*width:36.53em;min-width:430px; margin:auto; text-align:left; }
    </style>
 </head>
 <body>
@@ -41,7 +41,7 @@ function add_member(subscriptionid,borrowernumber){
 <!-- TMPL_LOOP NAME="memberloop" -->
 <tr><td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
     <td><!-- TMPL_VAR NAME="streetaddress" --></td>
-    <td><a href="#" onclick="add_member(<!-- TMPL_VAR
+    <td><a onclick="add_member(<!-- TMPL_VAR
 NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;op=add">Add</a></td></tr>
 <!-- /TMPL_LOOP -->
         </table>
@@ -52,7 +52,7 @@ NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
-<p><a href="javascript:window.close()" class="button">Close</a></p>
+<p><a href="#" class="button close">Close</a></p>
 
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
index 0bd4edd..bbdba1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Serials &rsaquo; Edit Routing List</title>
+<title>Koha &rsaquo; Serials &rsaquo; <!-- TMPL_VAR NAME="title" escape="html" --> &rsaquo; Edit Routing List</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script language="javascript" type="text/javascript">
 <!--
@@ -20,7 +20,7 @@ function search_member(subscriptionid){
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Edit Routing List </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->"><i><!-- TMPL_VAR NAME="title" escape="html" --></i></a> &rsaquo; Edit Routing List </div>
 
 <div id="doc3" class="yui-t2">
    
@@ -38,7 +38,7 @@ function search_member(subscriptionid){
 <form method="post" action="routing.pl">
 <input type="hidden" name="op" value="save" />
 <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" />
-<p><b>Serial Title:</b> <!-- TMPL_VAR NAME="title" --></p>
+<p><b>Serial Title:</b> <!-- TMPL_VAR NAME="title" escape="html" --></p>
 <p><b>Issue:</b> 
 
 <select name="date_selected">
@@ -50,8 +50,8 @@ function search_member(subscriptionid){
 <!-- TMPL_VAR NAME="issue" --></p>
 
 <!-- TMPL_IF NAME="memberloop" -->
-<table border="0" cellspacing="0" cellpadding="0">
-<tr valign="top"><td style="padding-top:5px;"><b>List Member:</b></td>
+<table>
+<tr><td style="padding-top:5px;"><b>List Member:</b></td>
     <td><table cellspacing="0" cellpadding="0" border="0" class="collapse">
         <tr><th>Name</th>
             <th>Location</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
index f32c776..e4beeeb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
@@ -169,7 +169,7 @@ $(document).ready(function() {
 
  <!-- TMPL_LOOP NAME="years" -->
 <div id="subscription-year-<!-- TMPL_VAR NAME="year" -->">
-        <table width="400px">
+        <table style="width:400px;">
             <tr>
 <!--TMPL_UNLESS Name="onesubscription"-->
                 <th># Subs</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index 3242215..17c36bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -1,10 +1,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Serials &rsaquo; <!-- TMPL_IF name="mod" --> Modify subscription to <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_ELSE -->New subscription<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Serials &rsaquo; <!-- TMPL_IF name="mod" --><!-- TMPL_VAR name="bibliotitle" escape="html" --> &rsaquo; Modify subscription<!-- TMPL_ELSE -->New subscription<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 
 <script type="text/javascript">
-<!--
+//<![CDATA[
 
 // the english words used in display purposes
 var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern"),
@@ -449,7 +449,7 @@ var textbox = '';
             }
             textbox +="<\/tr>";
         } else {
-          textbox +="<tr> <td>"+_("issues expected")+"</td><td><input type='text' name='issuesexpected1temp' id='issuesexpected1temp' size='4' onkeyup='moreoptionsupdate(this,0)' value=\"" + document.f.issuesexpected1.value + "\" ></td></tr>";
+          textbox +="<tr> <td>"+_("issues expected")+"<\/td><td><input type='text' name='issuesexpected1temp' id='issuesexpected1temp' size='4' onkeyup='moreoptionsupdate(this,0)' value=\"" + document.f.issuesexpected1.value + "\" ><\/td><\/tr>";
         }
         textbox +="<\/table>\n";
     }
@@ -630,11 +630,11 @@ function irregularity_check(){
 		}
         errortext +="<select multiple id='irregularity_select' name='irregularity_select' onchange='irregular_issues.update();'>\n"; 
 		errortext +=irregular_options(periodicity);
-		errortext += "</select>\n <textarea rows='6' width='18' id='irregularity_summary' name='irregularity_summary' value='foo' />";
+		errortext += "<\/select>\n <textarea rows='6' width='18' id='irregularity_summary' name='irregularity_summary' value='foo' />";
         error=errortext;
     }
     if(toobig){
-        errortext +=expectedover+_(" issues expected, ")+rollover+_(" were entered.<p class='warning'> You seem to have indicated more issues per year than expected.</p>");
+        errortext +=expectedover+_(" issues expected, ")+rollover+_(" were entered.<p class='warning'> You seem to have indicated more issues per year than expected.<\/p>");
         error=errortext;
     }
     if(error.length ==0){
@@ -747,7 +747,7 @@ function display_example(expected){
             } else {
                 count++;
             }
-            displaytext += '<li>' + numberpattern.replace(/{Z}/,count) + '</li>\n';
+            displaytext += '<li>' + numberpattern.replace(/{Z}/,count) + '<\/li>\n';
             displaytext = displaytext.replace(/{Y}/,count2);
             displaytext = displaytext.replace(/{X}/,startfrom1);
 
@@ -909,20 +909,20 @@ $('#numberpattern').change( function() {
     reset_num_pattern(); 
     });
 });
--->
+//]]>
 </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <!-- TMPL_IF name="mod" --> Modify subscription for <span class="title"><!-- TMPL_VAR name="bibliotitle" --></span><!-- TMPL_ELSE -->New subscription<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <!-- TMPL_IF name="mod" --><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->"><i><!-- TMPL_VAR NAME="bibliotitle" escape="html" --></i></a> &rsaquo; Modify subscription<!-- TMPL_ELSE -->New subscription<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t7">
    
    <div id="bd">
    <div class="yui-g">
-<h1><!-- TMPL_IF name="mod" --> Modify subscription for <i><!-- TMPL_VAR name="bibliotitle" --></i><!-- TMPL_ELSE -->Add a new subscription<!-- /TMPL_IF --></h1>
+<h1><!-- TMPL_IF name="mod" --> Modify subscription for <i><!-- TMPL_VAR name="bibliotitle" escape="html" --></i><!-- TMPL_ELSE -->Add a new subscription<!-- /TMPL_IF --></h1>
     <form method="post" name="f" action="/cgi-bin/koha/serials/subscription-add.pl">
 <!-- TMPL_IF name="mod" -->
         <input type="hidden" name="op" value="modsubscription" />
@@ -1035,7 +1035,8 @@ $('#numberpattern').change( function() {
                 <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="next_acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
                 <input type="text" name="nextacquidate" value="<!-- TMPL_VAR name="nextacquidate" -->" size="13" maxlength="10" id="next_acqui_date" style="border-width: 0px;"  />
                 </li><!-- /TMPL_IF -->
-                <!-- both scripts for calendar must follow the input field --> 
+                
+        <li><!-- both scripts for calendar must follow the input field --> 
                 <script type="text/javascript">
                     Calendar.setup({
                         inputField      :   "<!-- TMPL_IF NAME="mod" -->next_<!-- /TMPL_IF -->acqui_date",
@@ -1069,7 +1070,6 @@ $('#numberpattern').change( function() {
                                                         } 
                         });
                 </script>
-        <li>
             <label for="periodicity" class="required">Frequency:</label>
             
                 <select name="periodicity" size="1" id="periodicity" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1); reset_num_pattern();">
@@ -1331,33 +1331,35 @@ $('#numberpattern').change( function() {
         <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
         <input type="hidden" name="history_only" value="1" />
         <p>Hint : you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify these fields with care, as future serial receive will continue to update them automatically.</p>
-        <table>
-            <tr>
-            <td>Subscription start date</td>
-            <td><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /> (start date of the 1st subscription)</td>
-            </tr>
-            <tr>
-            <td>Subscription end date</td>
-            <td><input type="text" name="histenddate" value="<!-- TMPL_VAR name="histenddate" -->" />(if empty, subscription is still active)</td>
-            </tr>
-            <tr>
-                <td>Received issues</td>
-                <td><textarea name="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea></td>
-            </tr>
-            <tr>
-                <td>Missing issues</td>
-                <td><textarea name="missinglist" cols="60" rows="5"><!-- TMPL_VAR name="missinglist" --></textarea></td>
-            </tr>
-            <tr>
-                <td>Note for OPAC</td>
-                <td><textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></td>
-            </tr>
-            <tr>
-                <td>Note for staff</td>
-                <td><textarea name="librariannote" cols="60" rows="5"><!-- TMPL_VAR name="librariannote" --></textarea></td>
-            </tr>
-        </table>
-    <input type="submit" value="Save subscription history"  />
+        <fieldset class="rows">
+		<ol>
+            <li>
+            <label for="histstartdate">Subscription start date</label>
+            <input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /><div class="hint"> (start date of the 1st subscription)</div>
+            </li>
+            <li>
+            <label for="histenddate">Subscription end date</label>
+            <input type="text" name="histenddate" id="histenddate" value="<!-- TMPL_VAR name="histenddate" -->" /> <div class="hint">(if empty, subscription is still active)</div>
+            </li>
+            <li>
+                <label for="recievedlist">Received issues</label>
+            <textarea name="recievedlist" id="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea>
+            </li>
+            <li>
+                <label for="missinglist">Missing issues</label>
+            <textarea name="missinglist" id="missinglist" cols="60" rows="5"><!-- TMPL_VAR name="missinglist" --></textarea>
+            </li>
+            <li>
+                <label for="opacnote">Note for OPAC</label>
+            <textarea name="opacnote" id="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea>
+            </li>
+            <li>
+                <label for="librariannote">Note for staff</label>
+            <textarea name="librariannote" id="librariannote" cols="60" rows="5"><!-- TMPL_VAR name="librariannote" --></textarea>
+            </li>
+		</ol>
+        </fieldset>
+    <fieldset class="action"><input type="submit" value="Save subscription history"  /></fieldset>
     </form>
 </div>
 <!--/TMPL_IF-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 2c2c041..8f78e73 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -59,7 +59,7 @@ function popup(subscriptionid) {
 		<li><span class="label">Subscription ID: </span><!--TMPL_VAR name="subscriptionid"--></li>
         <li><span class="label">Librarian identity:</span> <!-- TMPL_VAR name="librarian" --></li>
         <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="aqbooksellerid"-->"><!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</a></li>
-        <li><span class="label">Biblio:</span> <i>(<!-- TMPL_VAR name="bibnum" -->)</i> <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="bibnum" -->"><!-- TMPL_VAR name="bibliotitle" --></a></li><br />
+        <li><span class="label">Biblio:</span> <i>(<!-- TMPL_VAR name="bibnum" -->)</i> <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="bibnum" -->"><!-- TMPL_VAR name="bibliotitle" --></a></li>
 <!-- TMPL_IF name="branchcode" --><li><span class="label">Library:</span> <!-- TMPL_VAR name="branchcode" -->&nbsp;</li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="serialsadditems" -->
             <li>Serial receipt creates an item record.</li>
@@ -70,7 +70,7 @@ function popup(subscriptionid) {
         <!-- TMPL_IF name="letter" --><li><span class="label">Patron alert with:</span> <!-- TMPL_VAR name="letter" -->&nbsp;</li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="notes" --><li><span class="label">Notes:</span> <!-- TMPL_VAR name="notes" --></li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="internalnotes" --><li><span class="label">Management Notes:</span> <!-- TMPL_VAR name="internalnotes" --></li><!-- /TMPL_IF -->
-        
+     </ul>
     </div>
     <div id="subscription_planning">
         <h2>Planning</h2>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 5270d99..4746eb8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -117,10 +117,7 @@
     <span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3A<!-- TMPL_VAR NAME="ocoins_format" -->&amp;rft.au=<!-- TMPL_VAR NAME="author" -->&amp;rft.btitle=<!-- TMPL_VAR NAME="title" -->&amp;rft.date=<!-- TMPL_VAR NAME="publicationyear" -->&amp;rft.tpages=<!-- TMPL_VAR NAME="size" -->&amp;rft.isbn=<!-- TMPL_VAR NAME=amazonisbn -->&amp;rft.aucorp=&amp;rft.place=<!-- TMPL_VAR NAME="place" -->&amp;rft.pub=<!-- TMPL_VAR NAME="publisher" -->&amp;rft.edition=<!-- TMPL_VAR NAME="edition" -->&amp;rft.series=<!-- TMPL_VAR NAME="series" -->&amp;rft.genre="></span><!-- /TMPL_IF -->
     <!-- TMPL_IF name="isbn" -->
     <!-- unAPI <abbr/> tag -->
-    <span class="results_summary"><span class="label">ISBN: </span><abbr class="unapi-id" title="koha:isbn:<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" --></abbr></span>
-<!-- TMPL_VAR NAME="amazonisbn" --><br>
-<!-- TMPL_VAR NAME="clean_isbn" -->
-    <!-- /TMPL_IF -->
+    <span class="results_summary"><span class="label">ISBN: </span><abbr class="unapi-id" title="koha:isbn:<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" --></abbr></span><!-- /TMPL_IF -->
     <!-- TMPL_IF name="issn" -->
     <span class="results_summary"><span class="label">ISSN:</span><!-- TMPL_VAR NAME="issn" --></span>
     <!-- /TMPL_IF -->
-- 
1.5.5.GIT




More information about the Koha-patches mailing list