[Koha-patches] [PATCH] Some fixes for bug Bug 2056, No Claim Letter Note Should Stand Out, and other markup corrections.

[Owen Leonard]

---
 .../prog/en/modules/serials/checkexpiration.tmpl   |   28 +++++++++++--------
 .../prog/en/modules/serials/claims.tmpl            |   14 +++------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
index 2fb1e3d..fea148e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
@@ -27,7 +27,7 @@
 <!-- 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; List subscriptions nearing expiry. </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; Check expiration </div>
 
 <div id="doc3" class="yui-t2">
    
@@ -37,30 +37,34 @@
 
 <h1>Check expiration</h1>
 
-<fieldset>
+    <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
+<fieldset class="rows">
     <legend>Filter results :</legend>
     
-    <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
-         
-        <p><label for="title">Title</label>
-        <input id="title" type="text" name="title" size="15" value="<!--TMPL_VAR NAME="title"-->" /></p>
+         <ol>
+        <li><label for="title">Title:</label>
+        <input id="title" type="text" name="title" size="15" value="<!--TMPL_VAR NAME="title"-->" /></li>
 
-        <p><label for="issn">ISSN</label>
-        <input id="issn" type="text" name="issn" size="15" value="<!-- TMPL_VAR NAME="issn"-->" /></p>
+        <li><label for="issn">ISSN:</label>
+        <input id="issn" type="text" name="issn" size="15" value="<!-- TMPL_VAR NAME="issn"-->" /></li>
 
-        <p><label for="date">Expiring before</label>
+        <li><label for="date" class="required" title="Required field">Expiring before:</label>
         <input id="date" type="text" name="date" size="10" value="<!-- TMPL_VAR NAME="date"-->" class="focus" />
+				<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendar" style="cursor: pointer;" />
             <script type="text/javascript">
                 Calendar.setup(
                  {
+					button : "openCalendar",
                      inputField : "date",
                      ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                  }
                 );
-            </script></p>
-        <input type="submit" value="Search" />
-    </form>
+            </script> <span class="required">Required</span></li>
+			</ol>
+        
 </fieldset>
+<fieldset class="action"><input type="submit" value="Search" /></fieldset>
+</form>
 
 <!-- TMPL_IF NAME="subscriptions_loop"-->
 <p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
index 6dfa689..ff0e68f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
@@ -35,6 +35,7 @@
 	<div id="yui-main">
 	<div class="yui-b">
 
+	<!-- TMPL_UNLESS NAME="letter" --><div class="dialog alert">No claims notice defined. Please Define One</div><!-- /TMPL_UNLESS -->
     <h1>Claims</h1>
     <form name="claims" action="claims.pl" method="post">
     <p>
@@ -46,14 +47,12 @@
     </p>
     <p>
         <!-- TMPL_IF NAME="letter" -->
-            Select Letter :
+            Select notice:
             <select name="letter_code">
                 <!-- TMPL_LOOP name="letters" -->
                     <option value="<!--TMPL_VAR Name="code"-->"><!--TMPL_VAR Name="name"--></option>
                 <!--/TMPL_LOOP-->
             </select>
-        <!--TMPL_ELSE-->
-            No Letter defined. Please Define One. The list of expected issues is displayed.
         <!--/TMPL_IF-->
     </p> 
         <input type="hidden" name="order" value="<!--TMPL_VAR Name="order"-->" />
@@ -103,7 +102,7 @@
                         <!-- TMPL_VAR name="claimdate" -->
                         </td>
                         <td>
-                            <a href="/cgi-bin/koha/serials/lateissues-excel.pl?supplierid=<!-- TMPL_VAR name="supplieri" -->&serialid=<!-- TMPL_VAR name="serialid" -->&op=claims">Export item data</a>
+                            <a href="/cgi-bin/koha/serials/lateissues-excel.pl?supplierid=<!-- TMPL_VAR name="supplieri" -->&amp;serialid=<!-- TMPL_VAR name="serialid" -->&amp;op=claims">Export item data</a>
                         </td>
                     </tr>
                 <!-- /TMPL_LOOP -->
@@ -114,10 +113,7 @@
 
         <!-- TMPL_IF Name="singlesupplier"-->
             <input type="hidden" name="supplierid" value="<!--TMPL_VAR NAME="supplierid"-->" />
-            <!--
-                <a href="claims.pl?supplierid=<!-- TMPL_VAR
-name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR
-name="supplierid" -->,''); return false" class="button">Supplier Group Claim Letter</a></p> -->
+            <!-- <a href="claims.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR name="supplierid" -->,''); return false" class="button">Supplier Group Claim Notice</a></p> -->
         <!-- /TMPL_IF -->
 
 <!--TMPL_IF Name="letter" -->
@@ -185,7 +181,7 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
         </table>
         <!-- /TMPL_IF -->
 
-<p class="noprint"><a href="javascript:window.print()" class="button">Print</a> &nbsp; <a href="javascript:window.close()" class="button">Close</a></p>
+<p class="noprint"><a href="javascript:window.print()">Print</a> &nbsp; <a href="javascript:window.close()">Close</a></p>
 <!-- /TMPL_UNLESS -->
 
 </div>
-- 
1.5.2.1