From 52c7a4f6971823289b83ee969eb2c1bed091095a Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 24 Mar 2008 15:20:11 -0500
Subject: [PATCH] Markup corrections. Tweaking holds interface.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           | 22 ++++++
 .../opac-tmpl/prog/en/includes/opac-facets.inc     |  6 +-
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl |  2 +-
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl |  4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tmpl    | 78 +++++++++++-----------
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |  6 +-
 .../prog/en/modules/opac-tags_subject.tmpl         |  7 +-
 .../opac-tmpl/prog/en/modules/opac-topissues.tmpl  | 13 ++--
 8 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index e8c6dc2550..87f3fe22aa 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -113,6 +113,28 @@ fieldset.rows td label {
 	width : auto;
 }
 
+fieldset.holds {
+	background-color : #F3F3F3;
+	border: 0;
+	font-size : 110%;
+	padding : 1px;
+}
+
+fieldset.holds ol {
+	margin : 0;
+	padding : 0;
+}
+
+fieldset.holds li {
+	background-color : #FFF;
+	border-bottom : 1px solid #F3F3F3;
+	padding : .3em;
+}
+
+fieldset.holds label, fieldset.holds span.label {
+
+}
+
 fieldset.action {
 	clear : both;
 	float : none;
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
index 12370ca5df..5e88a0e723 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -3,14 +3,14 @@
 <div id="search-facets">
 <h4>Refine your search</h4>
 <ul>
-	<li>Availability<ul><li><!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF --></li></ul>
+	<li>Availability<ul><li><!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="URL" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="URL" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF --></li></ul>
 	<!-- TMPL_IF NAME="related" --> <li>(related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->)</li><!-- /TMPL_IF -->
 	</li>
 	
 <!-- TMPL_LOOP NAME="facets_loop" -->
 <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" --><ul>
-        <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
-        <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
+        <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="URL" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" ESCAPE="HTML" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
+        <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="URL" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
 <!-- /TMPL_IF -->
 </ul></li>
 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index 18fd327354..1e36185ab8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -18,7 +18,7 @@
     <div class="yui-u first">
 	
 	
-    <div id="views"> <h1 style="display: inline;">ISBD</h1> <span class="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">MARC View</a> <span id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</span></span></div>
+    <div id="views"> <h1 style="display: inline;">ISBD</h1> <span class="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a> <a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">MARC View</a> <span id="ISBDview">ISBD View</span></span></div>
     <!-- TMPL_VAR name="ISBD" -->
 	
 	</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index b8cc517321..15066ffd7c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -20,8 +20,8 @@
 </div>
 
     <div class="yui-g" style="margin-top : 1em;">
-	<div id="views"><h1 style="display: inline;">MARC View</h1> <span class="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a> <span id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">MARC View</span> <!-- TMPL_IF NAME="ISBD" --><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a><!-- /TMPL_IF --></span></div>
-    <h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" -->  ( <!-- TMPL_VAR NAME="bibliotitle" --> )</h1>
+	<div id="views"><h1 style="display: inline;">MARC View</h1> <span class="views"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a> <span id="MARCview">MARC View</span> <!-- TMPL_IF NAME="ISBD" --><a id="ISBDview"  href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a><!-- /TMPL_IF --></span></div>
+    <h1><!-- TMPL_VAR NAME="bibliotitle" --> (Record no. <!-- TMPL_VAR NAME="biblionumber" -->)</h1>
 	<table id="marc">
         <!-- TMPL_LOOP name="0XX" -->
         <tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index dadd8d8149..b3f67144fb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -10,54 +10,50 @@
 
 <!-- TMPL_IF NAME="message" -->
     <!-- TMPL_IF NAME="GNA" -->
-    <p class="problem">
+    <div class="dialog alert">
         <strong>Sorry</strong>, you cannot place holds because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.
-    </p>
-    <p class="problem">Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)
-    </p>
+    </div>
+    <div class="dialog alert">Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)
+    </div>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="lost" -->
-    <p class="problem">
+    <div class="dialog alert">
         <strong>Sorry</strong>, you cannot place holds because your library card has been marked as lost or stolen.
-    </p>
-    <p class="problem">
+    </div>
+    <div class="dialog alert">
         If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.
-    </p>
+    </div>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="debarred" -->
     <p class="error">
         <strong>Sorry</strong>, you cannot place holds because your account has been frozen.
-    </p>
-    <p class="problem">Usually the reason for freezing an account is old overdues or damage fees.   If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.
-    </p>
+    </div>
+    <div class="dialog alert">Usually the reason for freezing an account is old overdues or damage fees.   If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.
+    </div>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="too_much_oweing" -->
-    <p class="problem">
+    <div class="dialog alert">
         Sorry, you cannot place holds because you owe <!-- TMPL_VAR NAME="too_much_oweing" -->.
-    </p>
+    </div>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="too_many_reserves" -->
-        <p class="error">Sorry, you cannot place more than <!-- TMPL_VAR NAME="too_many_reserves" --> holds.
-        </p>
+        <div class="dialog alert">Sorry, you cannot place more than <!-- TMPL_VAR NAME="too_many_reserves" --> holds.
+        </div>
         <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="already_reserved" -->
-    <p class="problem">
-        You already have a hold placed on this item.
-        <form action="/cgi-bin/koha/opac-detail.pl" method="post">
-            <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-            <input type="submit" class="icon back" value="Return to Item Detail Screen" />
-        </form>
-    </p>
+    <div class="dialog alert">
+        You already have a hold placed on this item. <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Return to Item Detail Screen</a>
+    </div>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="no_items_selected" -->
-    <p class="problem">
+    <div class="dialog alert">
         You must select at least one item.
-    </p>
+    </div>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="no_branch_selected" -->
-    <p class="error">
+    <div class="dialog alert">
         You must select a library for pickup.
-    </p>
+    </div>
     <!-- /TMPL_IF -->
 </div>
 <!-- /TMPL_IF -->
@@ -67,15 +63,17 @@
     <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
         <input type="hidden" name="item_types_selected" value="1">
         <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
-        <h3>Place a hold on <span class="title"><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->,  by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h3>
-            <p><strong>For:</strong> <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)
+        <h3>Place a hold on <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><!-- TMPL_IF NAME="author" -->,  by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h3>
+		<fieldset class="rows holds">
+			<ol>
+				<li><span class="label">For:</span> <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)
             <!-- TMPL_IF NAME="singleBranchMode" -->
              <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branchcode" -->"/>
             <!-- /TMPL_IF -->
-            <!-- /TMPL_LOOP --></p>
-            <p><strong>Priority:</strong><!-- TMPL_VAR Name="fixedRank" --> out of ?</p> 
+            <!-- /TMPL_LOOP --></li>
+            <li><span class="label">Priority:</span><!-- TMPL_VAR Name="fixedRank" --> out of ?</li> 
             <!-- TMPL_UNLESS NAME="singleBranchMode" -->
-            <p>Pick up from:<select name="branch" id="branch">
+            <li><label for="branch">Pick up from:</label> <select name="branch" id="branch">
                     <!-- TMPL_LOOP NAME="CGIbranch" -->
                         <!-- TMPL_IF name="selected" -->
                             <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branch" --></option>
@@ -84,17 +82,20 @@
                         <!-- /TMPL_IF -->
                     <!-- /TMPL_LOOP -->
             </select>
-            </p>
+            </li>
             <!-- /TMPL_UNLESS -->
 			<!-- TMPL_IF NAME="forloan" -->
-            <p> <label for="requestany">Place a hold on the next available copy </label>
+            <li> <label for="requestany">Place a hold on the next available copy </label>
             <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
-            </p>
+            </li>
+			</ol>
+		</fieldset>
 
-            <input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
+
+<fieldset class="action">            <input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
             <input type="submit" value="Place Hold" />
-            <input type="hidden" name="all" value="1"/></p>
-            <input type="hidden" name="place_reserve" value="1"/>
+            <input type="hidden" name="all" value="1" /></p>
+            <input type="hidden" name="place_reserve" value="1" /></fieldset>
 			<!-- /TMPL_IF -->            
         <!-- TMPL_LOOP name="bibitemloop" -->    
 
@@ -102,8 +103,9 @@
             <p><strong>Item type:</strong> <!-- TMPL_VAR NAME="description" --></p>
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_IF NAME="publicationyear" --><p><strong>Publication year:</strong> <!-- TMPL_VAR NAME="publicationyear" --></p><!-- /TMPL_IF -->
-            <label for="requestspecific">Place a hold on a specific copy</label>
+
             <table id="requestspecific">
+			<caption>Place a hold on a specific copy</caption>
             <tr>
 	            <!-- TMPL_IF NAME="item-level_itypes" -->
                 <th>Hold</th>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 3f19a551c3..fbade8c73c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -7,7 +7,7 @@
 <!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <link rel="alternate" type="application/rss+xml" title="Koha - RSS"
-href="/cgi-bin/koha/opac-rss.pl?<!-- TMPL_VAR name="query_cgi"--><!-- TMPL_VAR NAME="limit_cgi" -->" />
+href="/cgi-bin/koha/opac-rss.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="URL" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="URL" -->" />
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.pack.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -131,7 +131,7 @@ $(document).ready(function(){
 			<tr>
 			<!-- /TMPL_IF -->
                 <td>
-                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
+                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title"  ESCAPE="URL" -->&quot;"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a>
                 </td>
                 <td>
                     <!-- TMPL_VAR NAME="subtitle" -->
@@ -185,7 +185,7 @@ $(document).ready(function(){
                         <!-- /TMPL_IF -->
                         <!-- /TMPL_UNLESS -->
                     </td>
-                    <td><!-- TMPL_VAR NAME="result_number" -->. <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author_nospan" ESCAPE="URL" -->" title="Search for works by this author"><!-- TMPL_VAR NAME="author" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+                    <td><!-- TMPL_VAR NAME="result_number" -->. <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title"  --> <!-- TMPL_VAR NAME="subtitle"  --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title"  --> <!-- TMPL_VAR NAME="subtitle"  --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle"  --></a><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author_nospan" ESCAPE="URL" -->" title="Search for works by this author"><!-- TMPL_VAR NAME="author" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
 				<p> 
 						<!-- TMPL_IF name="place" --><!-- TMPL_VAR name="place" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> <!-- TMPL_VAR name="publicationyear" -->
 					<!-- TMPL_ELSE --><!-- TMPL_IF name="copyrightdate" --> <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->						
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
index 1fa7025610..6cb7cacaec 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
@@ -11,14 +11,13 @@
 
     <h1>Subject cloud</h1>
     <p>This "cloud" show you the most used topics in our catalogue. Click on one of them to see the documents related to it</p>
-    <div id="action">
         <fieldset>
         <legend>Show</legend>
-        <form>
-            <p>up to <input type="text" name="number" value="<!-- TMPL_VAR name="number" -->" size="4" maxlength="4"/> subjects <input type="submit" value="OK"></p>
+        <form action="/cgi-bin/koha/opac-tags_subject.pl" method="post">
+            <p>up to <input type="text" name="number" value="<!-- TMPL_VAR name="number" -->" size="4" maxlength="4" /> subjects <input type="submit" value="OK" /></p>
         </form>
         </fieldset>
-    </div>
+
         <!-- TMPL_LOOP name="LOOP" -->
             <a href="/cgi-bin/koha/opac-search.pl?q=su:<!-- TMPL_VAR name="entry" ESCAPE="HTML" -->" style="font-size:<!-- TMPL_VAR name="weight" -->px;"><!-- TMPL_VAR name="entry" --></a>
         <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
index ed19e7cb58..81275230d9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
@@ -14,11 +14,11 @@ function Dopop(link) {
 	<div id="yui-main">
 	<div class="yui-b"><div class="yui-g">
 
-        <form method="post">
+        <form method="post" action="/cgi-bin/koha/opac-topissues.pl">
 		<fieldset class="rows">
 		<legend>See the Most Popular Titles</legend>
           <ol>  <li><label for="limit">Show the top </label> <select name="limit" id="limit">
-                            <option value ="10" checked>10</option>
+                            <option value ="10" selected="selected">10</option>
                             <option value ="15">15</option>
                             <option value ="20">20</option>
                             <option value ="25">25</option>
@@ -53,11 +53,13 @@ function Dopop(link) {
                 <option value="6">6 months</option>
                 <option value="12">12 months</option>
                 <option value="999">No limit</option>
-            <li></ol>
+				</select>
+            </li></ol>
         <input type="hidden" name="do_it" value="1" />
-    </fieldset><fieldset class="action">
+    </fieldset>
+	<fieldset class="action">
         <input type="submit" value="Submit" /></fieldset>
-        </form>
+    </form>
 
     <!-- TMPL_IF NAME="results_loop" -->
     
@@ -85,7 +87,6 @@ function Dopop(link) {
                         <p><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
                         <!-- TMPL_VAR name="title" --></a>
                         </p>
-                        <p>
                         <!-- TMPL_VAR NAME="author" -->
                         <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
                         <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --> <!-- TMPL_IF name="seriestitle" -->(<!-- TMPL_VAR name="seriestitle" -->)<!-- /TMPL_IF -->
-- 
2.11.0