From 05df33346624be9a5a7671528ab52369cd203899 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 5 Nov 2007 16:43:32 -0600
Subject: [PATCH] Improvements to layout, markup, breadcrumbs, search, etc.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../en/includes/suggestions-add-search.inc    | 16 +++--
 .../prog/en/modules/acqui/basket.tmpl         |  2 +-
 .../en/modules/acqui/newordersuggestion.tmpl  | 11 ++-
 .../prog/en/modules/acqui/orderreceive.tmpl   | 67 ++++++++++---------
 .../prog/en/modules/acqui/parcel.tmpl         |  4 +-
 .../prog/en/modules/acqui/parcels.tmpl        | 35 +++++-----
 .../en/modules/suggestion/acceptorreject.tmpl | 66 ++++++++----------
 7 files changed, 93 insertions(+), 108 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index 55c29133d9..11fae93cb9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -1,5 +1,6 @@
 <!-- Begin Suggestions Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
     new function() {
         // Define a custom formatter function
@@ -39,16 +40,17 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         //this.oAutoComp.queryDelay = 1;
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
-});    
-</script><!-- /TMPL_IF -->
+});
+ //]]>
+ </script>  <!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="suggestions_search" class="residentsearch">
 	<p class="tip">Suggestions Search:</p>
 	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
-	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
-    <label for="searchauthor">Author:</label> <input type="text" id="searchauthor" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
-    <label for="searchpublishercode">Publisher:</label> <input type="text" id="searchpublishercode" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" />
-    <input type="submit" class="button" value="Search Suggestions" />
+	<label for="searchtitle">Title:</label> <input type="text" id="searchtitle" name="title" size="10" value="<!-- TMPL_VAR NAME="title"-->" />
+    <label for="searchauthor">Author:</label> <input type="text" id="searchauthor" name="author" size="10" value="<!-- TMPL_VAR NAME="author" -->" />
+    <label for="searchpublishercode">Publisher:</label> <input type="text" id="searchpublishercode" name="publishercode" size="10" value="<!-- TMPL_VAR NAME="publishercode"-->" />
+    <input type="submit" class="button" value="Search" />
         </form>
 	</div>
 	<div id="circ_search" class="residentsearch">
@@ -80,7 +82,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 		</form>
 	</div>
 			<ul>
-			<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->#suggestions_search">Search Printers</a></li>
+			<li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->#suggestions_search">Search Suggestions</a></li>
 			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 22cf2090b8..d56b424aa7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -19,7 +19,7 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></div>
 
 <div id="doc3" class="yui-t2">
    
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
index 4bab39171b..5ecb0dbd9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="suggestions-add-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Add order from a suggestion</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">Shopping Basket <!-- TMPL_VAR NAME="basketno" --></a> &rsaquo; Add order from a suggestion</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -15,9 +15,8 @@
 	<div class="yui-b">
 	
 <h1>Suggestions</h1>
-<div id="acqui_suggestion_select">
-    <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
-    <table>
+    <!-- TMPL_IF NAME="suggestions_loop" -->
+	<table>
         <tr>
             <th>Suggestion</th>
             <th>Suggested by</th>
@@ -54,9 +53,7 @@
                 </td>
             </tr>
         <!-- /TMPL_LOOP -->
-    </table>
-    </form>
-</div>
+    </table><!-- TMPL_ELSE -->There are no outstanding suggestions.<!-- /TMPL_IF -->
 </div>
 </div>
 <div class="yui-b">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
index 1b0a8b7208..f67456421f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Receipt order for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Parcel <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --> (order #<!-- TMPL_VAR NAME="ordernumber" -->)</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Receipt order for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Parcel <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --> (order #<!-- TMPL_VAR NAME="ordernumber" -->)</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -17,25 +17,26 @@
 <h1>Receipt order for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Parcel <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --> (order #<!-- TMPL_VAR NAME="ordernumber" -->)</h1>
 
 <!-- TMPL_IF name="count" -->
-<div id="acqui_acquire_neworder">
-    
     <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
-    <fieldset>
+<div class="yui-g">
+<div class="yui-u first">
+    
+    <fieldset class="rows">
     <legend>Catalogue Details</legend>
-    <p>Title<!-- TMPL_VAR NAME="title" --></p>
-    <p> Author
-        <!-- TMPL_VAR NAME="author" --></p>
-    <p> Copyright Date
-        <!-- TMPL_VAR NAME="copyrightdate" --></p>
+    <ol><li><span class="label">Title: </span><!-- TMPL_VAR NAME="title" --></li>
+    <li> <span class="label">Author: </span>
+        <!-- TMPL_VAR NAME="author" --></li>
+    <li><span class="label">Copyright Date: </span>
+        <!-- TMPL_VAR NAME="copyrightdate" --></li>
     
-    <p> ISBN
-        <!-- TMPL_VAR NAME="isbn" --></p>
-    <p> Series
-        <!-- TMPL_VAR NAME="seriestitle" --></p>
-    <p> <label>Item Barcode</label>
-        <input type="text" size="20" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></p>
-    <p> <label>Volume Info (for serials)</label>
-        <input type="text" size="20" name="volinf" /></p>
+    <li> <span class="label">ISBN: </span>
+        <!-- TMPL_VAR NAME="isbn" --></li>
+    <li> <span class="label">Series: </span>
+        <!-- TMPL_VAR NAME="seriestitle" --></li>
+    <li> <label for="barcode">Item Barcode: </label>
+        <input type="text" size="20" name="barcode" id="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></li>
+    <li> <label for="volinf">Volume Info (for serials): </label>
+        <input type="text" size="20" name="volinf" id="volinf" /></li></ol>
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
     <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
     <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
@@ -44,27 +45,29 @@
     <input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
     <input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
     </fieldset>
-    <fieldset>
+	</div>
+	<div class="yui-u">
+    <fieldset class="rows">
     <legend>Accounting Details</legend>
-        <p><label>Quantity Ordered</label><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /></p>
-        <p><label>Quantity Received</label><input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /></p>
-        <p><label>Replacement Cost</label><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /></p>
-        <p><label>Budgeted Cost </label><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></p>
-        <p><label>Actual Cost</label>
+       <ol> <li><label for="quantity">Quantity Ordered: </label><input type="text" size="20" name="quantity" id="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /></li>
+        <li><label for="quantityrec">Quantity Received: </label><input type="text" size="20" name="quantityrec" id="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /></li>
+        <li><label for="rrp">Replacement Cost: </label><input type="text" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /></li>
+        <li><label for="ecost">Budgeted Cost: </label><input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></li>
+        <li><label for="cost">Actual Cost</label>
         <!-- TMPL_IF name="unitprice"-->
-         <input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->" />
+         <input type="text" size="20" name="cost" id="cost" value="<!-- TMPL_VAR NAME="unitprice" -->" />
         <!-- TMPL_ELSE -->
-            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost" -->" />
-        <!-- /TMPL_IF --></p>
+            <input type="text" size="20" name="cost" id="cost" value="<!-- TMPL_VAR name="ecost" -->" />
+        <!-- /TMPL_IF --></li></ol>
         <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
-    <!-- TMPL_IF name="catview" -->
-        <input type="submit"  name="submit" value="Save" />
-    <!-- TMPL_ELSE -->
-        <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
-    <!-- /TMPL_IF -->
     </fieldset>
-    </form>
+
 </div>
+</div><div class="yui-g"><fieldset class="action"><!-- TMPL_IF name="catview" -->
+        <input type="submit"  name="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->">Cancel</a>
+    <!-- TMPL_ELSE -->
+        <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
+    <!-- /TMPL_IF --></fieldset></div>    </form>
 <!-- TMPL_ELSE -->
 <div id="acqui_acquire_orderlist">
     <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index 9996a6d60b..1bf3ed7d65 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -98,8 +98,8 @@
             <th>Summary</th>
             <th>Order qty</th>
             <th>Order cost</th>
-            <th>Already Recieved </th>
-            <th>Recieved cost</th>
+            <th>Already Received </th>
+            <th>Received cost</th>
         </tr>
         <!-- TMPL_LOOP NAME="loop_orders" -->
             <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
index 002d8c18cc..07e75d55fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
@@ -6,9 +6,9 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Receive parcel from supplier <!-- TMPL_VAR NAME="name" --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>  &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; Receive parcel from supplier <!-- TMPL_VAR NAME="name" --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
@@ -99,32 +99,27 @@
 <!--/TMPL_IF-->
 </div>
     <div id="parcels_new_parcel">
-    <fieldset>
-    <legend>Receive a new Parcel </legend>
         <form method="get" action="parcel.pl">
-        <p>
+    <fieldset class="rows">
+    <legend>Receive a new Parcel</legend>
+       <ol> <li>
+            <label for="invoice">Parcel Code:</label>
             <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
-            <label for="invoice">Parcel Code</label>
             <input type="text" size="20" id="invoice" name="invoice" />
-        </p>
-        <p>
-            <label for="gst">GST</label>
+        </li>
+        <li>
+            <label for="gst">GST:</label>
             <input type="text" size="20" id="gst" name="gst" />
-        </p>
-        <p>
-            <label for="freight">Freight</label>
+        </li>
+        <li>
+            <label for="freight">Freight:</label>
             <input type="text" size="20" id="freight" name="freight" />
-        </p>
-        <p>
-            <input type="submit" class="button" value="Save" />
-        </p>
-        </form>
+        </li></ol>
     </fieldset>
+            <fieldset class="action"><input type="submit" class="button" value="Save" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->">Cancel</a></fieldset>
+        </form>
     </div>
 </div>
 </div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
-</div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
index a2563305ee..9b5bfb4ba8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
@@ -3,15 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/JavaScript">
  // <![CDATA[
-    /**
-     *  check(form);
-     *  This function check the form before submit it.
-     */
-     /*
-     function check(form){
-        return true;
-     }
-     */
+	
 	/**
 	 *  displayOther.
 	 *  This function display the select or an textaera to write a reason.
@@ -44,25 +36,29 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Suggestions Management</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;<!-- TMPL_IF NAME="op_accepted"--> <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Suggestions Management</a> &rsaquo; Accepted<!-- /TMPL_IF --><!-- TMPL_IF NAME="op_else"--> Suggestions Management<!-- /TMPL_IF --><!-- TMPL_IF NAME="op_rejected"--> <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Suggestions Management</a> &rsaquo; Rejected<!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
 
-    <h1>Suggestions Management</h1>
-    
-    <div id="action">
-        <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=accepted">Accepted</a>
-        <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Waiting</a>
-        <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=rejected">Rejected</a>
-    </div>
+    <h1>Suggestions</h1>
+	
+    <!-- TMPL_IF NAME="suggestions_loop" -->
+	<div class="toptabs">
+	<ul class="tabs-nav">
+			<!-- TMPL_IF NAME="op_accepted"--><li class="tabs-selected"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=accepted">Accepted</a></li>
+			<!-- TMPL_IF NAME="op_else" --><li class="tabs-selected"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Waiting</a></li>
+			<!-- TMPL_IF NAME="op_rejected"--><li class="tabs-selected"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=rejected">Rejected</a></li>
+		</ul>
+	<!-- /TMPL_IF -->
+	
+	<div class="tabs-container">
 
 <!-- TMPL_IF name="op_else" -->
     <!-- TMPL_IF NAME="suggestions_loop" -->
-    <b>Waiting suggestion,</b> accept or reject these suggestions with a reason.
     <form name="f" method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
     <input type="hidden" name="op" value="aorr_confirm" />
     <table>
@@ -73,7 +69,7 @@
             <th>Suggested by</th>
         </tr>
         <!-- TMPL_LOOP NAME="suggestions_loop" -->
-            <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
+            <!-- TMPL_IF name="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                 <td>
                     <select name="aorr">
                         <option value=""> -- Choose Action -- </option>
@@ -84,21 +80,20 @@
                 <td>
 
 		            <span id="span-select-reason<!-- TMPL_VAR NAME="suggestionid" -->" class="content_visible">
-                        <select name="reason<!-- TMPL_VAR name="suggestionid" -->" onchange="displayOther('<!-- TMPL_VAR NAME="suggestionid" -->');">
+                        <!-- TMPL_IF NAME="reasonsloop" --><select name="reason<!-- TMPL_VAR name="suggestionid" -->" onchange="displayOther('<!-- TMPL_VAR NAME="suggestionid" -->');">
 			                <option value=""> -- Choose a reason -- </option>
                             <!-- TMPL_LOOP NAME="reasonsloop" -->
                                 <option value="<!-- TMPL_VAR NAME="lib" -->"><!-- TMPL_VAR NAME="lib" --></option>
                             <!-- /TMPL_LOOP -->
 			                <option value="other">Others...</option>
-                        </select>
-                    <!-- TMPL_UNLESS NAME="reasonsloop"-->
-                        <span class="problem">No reasons defined on</span> <a href="/cgi-bin/koha/admin/authorised_values.pl">authorised value</a>.
-                    <!-- /TMPL_UNLESS -->
+                        </select><!-- TMPL_ELSE --><span class="problem">No reasons defined in <a href="/cgi-bin/koha/admin/authorised_values.pl">authorised values</a></span><!-- /TMPL_IF -->
 		    </span>
+			
 		    <span id="span-other-reason<!-- TMPL_VAR NAME="suggestionid" -->" class="content_hidden">
 			<input type="text" name="other-reason<!-- TMPL_VAR name="suggestionid" -->" value="write your reason here..." onclick="if(this.value === 'write your reason here...'){this.value=''}" />
-			<small><a href="JavaScript:displayOther('<!-- TMPL_VAR NAME="suggestionid" -->');">back to list</a></small>
+			<small><a href="#" onclick="displayOther('<!-- TMPL_VAR NAME="suggestionid" -->'); return false;">back to list</a></small>
 		    </span>
+			
                 </td>
                 <td>
 		<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
@@ -114,21 +109,14 @@
             </tr>
         <!-- /TMPL_LOOP -->
         </table>
-        <input type="submit" value="Change Status" />
+        <fieldset class="action"><input type="submit" value="Change Status" /></fieldset>
 </form>
 <!-- TMPL_ELSE -->
-    <b>No waiting suggestion to accept or reject.</b>
+    <b>No waiting suggestions to accept or reject.</b>
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="done" -->
-    <br />
-    <!-- TMPL_IF NAME="op_accepted"-->
-        <b>Accepted suggestion</b>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="op_rejected"-->
-        <b>Rejected suggestion</b>
-    <!-- /TMPL_IF -->
     
     <!-- TMPL_IF NAME="suggestions_loop" -->
         <table>
@@ -183,16 +171,16 @@
         <!-- /TMPL_LOOP -->
         </table>
     <!-- TMPL_ELSE -->
-        <br /><br />
-        No suggestion has already been 
+	
+		<h4>No suggestions have been 
         <!-- TMPL_IF NAME="op_accepted"-->
             accepted.
         <!-- TMPL_ELSE -->
             rejected.
-        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF --></h4>
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-
+</div></div>
 
 </div>
 </div>
-- 
2.39.2