some HTML cleaning & improvements

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
index 4d4eed1..a00903d 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
@@ -3,6 +3,12 @@
        <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
        <h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
 
+       <p>
+       <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">MARC</a>
+       <!-- TMPL_UNLESS NAME="norequests" -->
+               <a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Request</a>
+       </p>
+       <!-- /TMPL_UNLESS -->
        <div id="bibliobloc">
        <table cellspacing="0">
                <!-- BIBLIO RECORD TABLE -->
@@ -69,11 +75,6 @@
                        </tr>
                <!-- /TMPL_LOOP -->
        </table>
-       <!-- TMPL_UNLESS NAME="norequests" -->
-       <p>
-               <a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">Request</a>
-       </p>
-       <!-- /TMPL_UNLESS -->
        </div>
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
index ca74219..bcf6c62 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
@@ -37,12 +37,18 @@
                <input type="submit" value="OK" class="button" />
                </p>
        </form>
-       <h2>Virtual shelves</h2>
-       <form action="/cgi-bin/koha/opac-shelves.pl">
-               <p>
-               Look <!-- TMPL_VAR name="CGIshelves" --><input type="submit" value="OK" class="button" />
-               </p>
-       </form>
+       <!-- TMPL_IF name="CGIshelves" -->
+               <h2>Virtual shelves</h2>
+               <form action="/cgi-bin/koha/opac-shelves.pl">
+                       <p>
+                       Look <!-- TMPL_VAR name="CGIshelves" --><input type="submit" value="OK" class="button" />
+                       </p>
+               </form>
+       <!-- /TMPL_IF -->
+       <!-- TMPL_IF name="suggestion" -->
+               <h2>Suggestions</h2>
+               <a href="opac-suggestions.pl">View & manage suggestions</a>
+       <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="loggedinusername" -->
                <h2>Logged in as <!-- TMPL_VAR NAME="loggedinusername" --></h2>
                <p><a href="/cgi-bin/koha/opac-user.pl">Members Home</a> || <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></p>

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
index e811fee..394d8b0 100644 (file)
--- a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
@@ -35,11 +35,9 @@
        </div>
 <!-- Search Results Table -->
 <!-- TMPL_IF NAME="total" -->
-       <table cellspacing="0">
+       <table>
                <tr>
-                       <th>Title</th>
-                       <th>Author</th>
-                       <th>&copy;</th>
+                       <th>Summary</th>
                        <th>Item Count</th>
                        <th>Location</th>
                        <th>&nbsp;</th>
@@ -48,13 +46,12 @@
                <!-- TMPL_LOOP NAME="results" -->
                        <tr>
                                <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-                                       <a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
-                               </td>
-                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-                                       <a class="transparent" href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE=URL -->"><!-- TMPL_VAR NAME="author" --></a>
-                               </td>
-                               <td align="center"<!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
-                                       <!-- TMPL_VAR NAME="copyrightdate" -->
+                                       <p>
+                                               <b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
+                                               - <!-- TMPL_VAR NAME="author" -->
+                                               / <!-- TMPL_VAR name="publishercode" -->
+                                               : <!-- TMPL_VAR name="pages" -->
+                                       </p>
                                </td>
                                <td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
                                        <!-- TMPL_VAR name="totitem" -->
@@ -81,7 +78,7 @@
                                        &nbsp;
                                <!-- /TMPL_IF -->
                        </th>
-                       <th colspan="3">&nbsp;</th>
+                       <th colspan="1">&nbsp;</th>
                        <th colspan="2" align="right">
                                <!-- TMPL_IF NAME="displaynext" -->
                                        <a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Next &gt;&gt;&gt;</a>