Some templating for serials.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

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 2354d21..2fb1e3d 100644 (file)
--- 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; Check Expiration </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; List subscriptions nearing expiry. </div>
 
 <div id="doc3" class="yui-t2">
    
@@ -38,17 +38,17 @@
 <h1>Check expiration</h1>
 
 <fieldset>
-    <legend>Select record which will expire</legend>
+    <legend>Filter results :</legend>
     
     <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
          
-        <p><label for="title">Filter on title</label>
+        <p><label for="title">Title</label>
         <input id="title" type="text" name="title" size="15" value="<!--TMPL_VAR NAME="title"-->" /></p>
 
-        <p><label for="issn">Filter on ISSN</label>
+        <p><label for="issn">ISSN</label>
         <input id="issn" type="text" name="issn" size="15" value="<!-- TMPL_VAR NAME="issn"-->" /></p>
 
-        <p><label for="date">with expiration date before</label>
+        <p><label for="date">Expiring before</label>
         <input id="date" type="text" name="date" size="10" value="<!-- TMPL_VAR NAME="date"-->" class="focus" />
             <script type="text/javascript">
                 Calendar.setup(
@@ -66,11 +66,11 @@
 <p>
     <b><!-- TMPL_VAR NAME="numsubscription"--></b> subscription(s)
         <!-- TMPL_IF NAME="title"-->
-        with title like <b><!-- TMPL_VAR NAME="title"--></b>
+        with title matching <span class="title"><!-- TMPL_VAR NAME="title"--></class>
         <!-- TMPL_IF NAME="issn"-->and <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="issn"-->
-        ISSN like <b><!-- TMPL_VAR NAME="issn" --></b>
+        with ISSN matching <b><!-- TMPL_VAR NAME="issn" --></b>
     <!-- /TMPL_IF -->
         will expire before <b><!-- TMPL_VAR NAME="date" --></b>
 </p>
@@ -139,4 +139,4 @@
 <!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

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 c800254..0ae5581 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -105,19 +105,21 @@ function popup(subscriptionid) {
        <div class="yui-b">
        <!-- TMPL_INCLUDE NAME="serials-toolbar.inc" -->
 
-    <h1>Subscription #<!--TMPL_VAR name="subscriptionid"--></h1>
+    <h1>Subscription for <!-- TMPL_VAR name="bibliotitle" --> </h1>
     <!--TMPL_IF Name="abouttoexpire"--><div class="problem">Subscription is near its end. It should be renewed now.</div><!--/TMPL_IF-->
     
     <div id="subscription_info">
         <h2>Subscription information</h2>
-        <p><label>Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p>
-        <p><label>Supplier:</label> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR name="aqbooksellerid"-->"><!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</a></p>
-        <p><label>Biblio:</label> <i>(<!-- TMPL_VAR name="bibnum" -->)</i> <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="bibnum" -->"><!-- TMPL_VAR name="bibliotitle" --></a></p><br />
-<!-- TMPL_IF name="branchcode" --><p><label>Branch :</label> <!-- TMPL_VAR name="branchcode" -->&nbsp;</p><!-- /TMPL_IF -->
-        <!-- TMPL_IF name="callnumber" --><p><label>Call Number:</label> <!-- TMPL_VAR name="callnumber" -->&nbsp;</p><!-- /TMPL_IF -->
-        <!-- TMPL_IF name="letter" --><p><label>Patron alert with:</label> <!-- TMPL_VAR name="letter" -->&nbsp;</p><!-- /TMPL_IF -->
-        <!-- TMPL_IF name="notes" --><p><label>Notes:</label> <!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
-        <!-- TMPL_IF name="internalnotes" --><p><label>Management Notes:</label> <!-- TMPL_VAR name="internalnotes" --></p><!-- /TMPL_IF -->
+               <ul>
+               <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">Supplier:</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 />
+<!-- TMPL_IF name="branchcode" --><li><span class="label">Branch :</span> <!-- TMPL_VAR name="branchcode" -->&nbsp;</li><!-- /TMPL_IF -->
+        <!-- TMPL_IF name="callnumber" --><li><span class="label">Call Number:</span> <!-- TMPL_VAR name="callnumber" -->&nbsp;</li><!-- /TMPL_IF -->
+        <!-- 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 -->
         
     </div>
     <div id="subscription_planning">
@@ -350,7 +352,7 @@ function popup(subscriptionid) {
         <table cellpadding="0" cellspacing="0">
         <tr>
             <td><label>Start date</label></td>
-            <td> <!-- TMPL_VAR name="histstartdate" --> </td>
+            <td> <!-- TMPL_VAR name="startdate" --> </td>
         </tr>
         <tr>
             <td><label>End date</label></td>

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 0e87194..83e720f 100755 (executable)
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -98,6 +98,7 @@ $subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
 $template->param($subs);
 
 $template->param(
+       subscriptionid => $subscriptionid,
     routing => $routing,
     serialslist => \@serialslist,
     totalissues => $totalissues,