Updating for CSS-based design

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
index d297235..0a708a7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl
@@ -4,107 +4,49 @@
        <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
 
-<!------------------------ MAIN BODY OF PAGE ---------------------------->
+<div id="mainbloc">
 <form action="/cgi-bin/koha/search.pl" method="post">
 
-<h1>Catalogue Search</h1>
+<h1 class="catalogue">Catalogue Search</h1>
 
-<center>
 
-<table align="left" width="40%" cellspacing="0" cellpadding="5" border="0" >
-       <tr valign="top">
-               <td>Barcode</td>
-               <td><input type="text"  size="25"   name="itemnumber"></td>
-               <td><b> &nbsp; &nbsp; OR</b></td></tr>
-       <!-- <tr valign="top">
-       <td>ISBN</td> <td><input type="text"  size="25"   name="isbn"></td></tr>
-       -->
-       <tr valign="top">
-               <td colspan="2" > &nbsp;</td>
-       </tr>
-       <tr valign="top">
-               <td  bgcolor="#ad11ad" colspan="2">
-                       <span style="color:#FFFFFF;">
-                               <b>HELP</b><br>
-                               <b>Search :</b>Using more fields for your search will slow it down.<p>
-                       </span>
-               </td>
-       </tr>
-</table>
+<div id="bloc25">
+<h2 class="catalogue">Search on</h2>
+               <p><label class="label100" for="keyword">Keywords:</label><input type="text"  size="25" id="keyword"  name="keyword"></p>
 
+               <p><label class="label100" for="title">Title:</label><input type="text" id="title"  size="25" name="title"></p>
 
+               <p><label class="label100" for="author">Author:</label><input type="text"  size="25" id="author"  name="author"></p>
 
-<table border="0">
-       <tr valign="top">
-               <td>Keywords</td>
-               <td><input type="text"  size="25"   name="keyword"></td>
-       </tr>
-       <tr valign="top">
-               <td>Title</td>
-               <td><input type="text"  size="25" name="title"></td>
-               <td>
-                       <input type="radio" name="ttype" value="normal" checked>Normal
-                       <input type="radio" name="ttype" value="exact">Exact
-               </td>
-       </tr>
-       <tr valign="top">
-               <td>Author</td>
-               <td><input type="text"  size="25"   name="author"></td>
-       </tr>
-       <tr valign="top">
-               <td>Illustrator</td>
-               <td><input type="text"  size="25"   name="illustrator"></td>
-       </tr>
-               <tr valign="top">
-               <td>Dewey</td><td><input type="text"  size="25"   name="dewey"></td>
-       </tr>
+               <p><label class="label100" for="illustrator">Illustrator:</label><input type="text"  size="25" id="illustrator"  name="illustrator"></p>
+               
+               <p><label class="label100" for="dewey">Dewey:</label></td><td><input type="text"  size="25" id="dewey"  name="dewey"></p>
 
-       <tr valign="top">
-       <td>Class</td>
-               <td>
-                       <select name="class" size="1">
+<p>            <label class="label100" for="class">Class:</label><select name="class" id="class" size="1">
                        <option value=""> Any
                        <!-- TMPL_VAR NAME="classlist" -->
-                       </select>
-               </td>
-       </tr>
-       <!-- <tr valign="top">
-       <td>Branch</td><td><select name="branch">
-       <option value="F">Foxton
-       </select>
-       </td></tr> -->
+                       </select></p>
+                       
+                                       <p><label class="label100">Search Style:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Normal
+                       <input type="radio" name="ttype" value="exact">Exact</p>
+                       </div>
+                       
+       <div id="bloc25">
+               <h2 class="catalogue">Barcode Search</h2>
+               <p>
+               <label class="label100" for="itemnumber">Barcode:</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
+</div>
+
+<div id="bloc25">
+<h2 class="catalogue">Subject Search</h2>
+<p><label class="label100" for="subject">Subject:</label><input type="text"  size="25"  id="subject" name="subject"><input type="hidden" name="type" value="intra"></p></div>
+
+<div id="block25"><p><input type="submit" class="button catalogue" value="Start search">
+                                               <input type="reset"  value= "Clear" class="button catalogue">
+                                               <a href="/cgi-bin/koha/shelves.pl" class="button catalogue">Virtual Bookshelves</a></p></div>
 
-       <!-- <td>Pub Date (before)</td> <td><input type="text"  size="8"   name="date-before"> &nbsp; &nbsp; (after) <input type="text"  size="8"   name="date-after"></td></tr>
-       -->
-       <tr valign="top">
-       <td><b>OR</b></td>
-       </tr>
-
-       <tr valign="top">
-               <td>Subject</td>
-               <td><input type="text"  size="25"   name="subject"></td>
-       </tr>
-       <tr>
-               <td colspan="3">
-                       <table width="100%" cellpadding="0" cellspacing="0">
-                               <tr align="center">
-                                       <td>
-                                               <input type="hidden" name="type" value="intra">
-                                               <input type="submit" class="button" value="Start search">
-                                       </td>
-                                       <td>
-                                               <input type="reset"  value= "Clear" class="button">
-                                       </td>
-                                       <td>
-                                               <a href="/cgi-bin/koha/shelves.pl" class="button">Virtual Bookshelves</a>
-                                       </td>
-                               </tr>
-                       </table>
-               </td>
-       </tr>
-</table>
        </form>
-       <p>
-       </center>
+
+       </div>
 <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
 

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
index 0180da3..44d96b3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
@@ -3,17 +3,17 @@
 <!-- TMPL_ELSE -->
        <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
-<center>
+<div id="mainbloc">
 
-
-<!-- TMPL_IF NAME="searchdesc" -->
+<h1 class="catalogue">Search results</h1>
+<p><!-- TMPL_IF NAME="searchdesc" -->
        You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b>
 <!-- TMPL_ELSE -->
        You did not specify any seach criteria<br>
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --></p>
 
-<!-- TMPL_VAR NAME="numrecords" --> results found
-<p>
+<p><!-- TMPL_VAR NAME="numrecords" --> results found</p>
+<div id="resultnumber">
 <!-- Row of numbers corresponding to search result pages -->
 <!-- TMPL_IF NAME="displayprev" -->
        <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
@@ -32,51 +32,32 @@
 <!-- TMPL_ELSE -->
        <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
 <!-- /TMPL_IF -->
+</div>
 
-<p>
+<div id="resultlist">
 <!-- Search Results Table -->
 <!-- TMPL_IF NAME="numrecords" -->
-<table border="0" cellspacing="0" cellpadding="2" width="90%">
-       <!-- TMPL_IF NAME="opac" -->
-               <tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
-       <!-- TMPL_ELSE --> 
-               <tr bgcolor="#ccfff" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-       <!-- /TMPL_IF -->
-       <th align="left">Title</th><th align="left">Author</th><th>&copy;</th><th>Item Count</th><th>Location</th>
-       <!-- TMPL_IF NAME="opac" -->
-       <!-- TMPL_ELSE -->
-       <th>&nbsp;</th>
+<table>
+               <tr>
+       <th class="catalogue">Title</th><th class="catalogue">Author</th><th class="catalogue">&copy;</th><th class="catalogue">Item Count</th><th class="catalogue">Location</th><th class="catalogue">&nbsp;</th>
        <!-- /TMPL_IF -->
 </tr>
 <!-- Actual Search Results -->
 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
        <tr>
-               <!-- TMPL_IF NAME="opac" -->
-                       <td>
-                               <a href="/cgi-bin/koha/<!-- TMPL_VAR NAME="script" -->?type=opac&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
-                                       <!-- TMPL_VAR NAME="title" -->
-                               </a>
-                       </td>
-                       <td>
-                               <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=opac">
-                                       <!-- TMPL_VAR NAME="author" -->
-                               </a>
-                       </td>
-               <!-- TMPL_ELSE -->
-                       <td>
+                       <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
                                <a href="/cgi-bin/koha/<!-- TMPL_VAR NAME="script" -->?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
                                        <!-- TMPL_VAR NAME="title" -->
                                </a>
                        </td>
-                       <td>
+                       <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
                                <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=intra">
                                        <!-- TMPL_VAR NAME="author" -->
                                </a>
                        </td>
-               <!-- /TMPL_IF -->
-               <td align="center"> <!-- TMPL_VAR NAME="copyrightdate" --> </td>
-               <td align="center"> <!-- TMPL_VAR NAME="itemcount" --> </td>
-               <td>
+               <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="copyrightdate" --> </td>
+               <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="itemcount" --> </td>
+               <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
                <!-- TMPL_IF NAME=use-location-flags-p -->
                <!-- TMPL_IF NAME=location-only --><!-- TMPL_VAR NAME=location-only --><br><!-- /TMPL_IF -->
                <!-- TMPL_IF NAME=not-available-p -->Not Available<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
@@ -90,60 +71,36 @@
                <!-- TMPL_IF NAME="opac" -->
                <!-- TMPL_ELSE -->
                        <!-- TMPL_UNLESS name="norequests" -->
-                               <td> <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Request</a></td>
+                               <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <a class="button catalogue" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Request</a></td>
                        <!-- TMPL_ELSE -->
-                               <td>Not Reservable</td>
+                               <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>Not Reservable</td>
                        <!-- /TMPL_UNLESS -->
                <!-- /TMPL_IF -->
        </tr>
 <!-- /TMPL_LOOP -->
+</table>
 
-<!-- TMPL_IF NAME="opac" -->
-       <tr bgcolor="#99CCCC" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
-<!-- TMPL_ELSE -->
-       <tr bgcolor="#CCCCFF" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-<!-- /TMPL_IF -->
 
-       <td colspan="6">
-               <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                       <!-- TMPL_IF NAME="opac" -->
-                               <tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
-                       <!-- TMPL_ELSE --> 
-                               <tr bgcolor="#ccfff" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
-                       <!-- /TMPL_IF -->
-                       <td align="left">
-                               <!-- TMPL_IF NAME="displayprev" -->
+<p>                            <!-- TMPL_IF NAME="displayprev" -->
                                <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Previous Records</a>
                                <!-- TMPL_ELSE -->
                                &nbsp;
                                <!-- /TMPL_IF -->
-                       </td>
-                       <td align="right">
+
                                <!-- TMPL_IF NAME="displaynext" -->
                                <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Next Records</a>
                                <!-- TMPL_ELSE -->
                                &nbsp;
-                               <!-- /TMPL_IF -->
-                       </td>
-                       </tr>
-               </table>
-       </td>
-</tr>
-</table>
+                               <!-- /TMPL_IF --></p>
 
-<br>
-Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.
-<hr>
 
-Try another <a href="/cgi-bin/koha/catalogue-home.pl">search</a>
 
-<!-- TMPL_ELSE -->
-    Try another <a href="/cgi-bin/koha/catalogue-home.pl">search</a>
-<!-- /TMPL_IF -->
+<p>Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.</p>
 
 
-<!-- TMPL_IF NAME="opac" -->
-    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
-<!-- TMPL_ELSE -->
+<p>Try another <a href="/cgi-bin/koha/catalogue-home.pl">search</a></p>
+
+
+</div>
+
     <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
-<!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
index f903334..5c9f918 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl
@@ -1,49 +1,25 @@
-<!-- TMPL_IF NAME="opac" -->
-       <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
-<!-- TMPL_ELSE -->
-       <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<table border="0" cellspacing="0" cellpadding="2" align="center">
-<!-- TMPL_IF NAME="opac" -->
-       <tr bgcolor="#99cccc" background="/images/background-opac.gif">
-<!-- TMPL_ELSE -->
-       <tr background="/images/background-mem.gif">
-<!-- /TMPL_IF -->
-               <th>Subject</th>
+<div id="mainbloc">
+
+<h1 class="catalogue">Subject search results</h1>
+
+<div id="resultnumber"><p>Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --></b> records.<br></p></div>
+
+<table>
+<tr>
+               <th class="catalogue">Subject headings</th>
        </tr>
 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
        <tr>
-               <td>
+               <td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
                        <a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME="subject" --></a>
                </td>
        </tr>
 <!-- /TMPL_LOOP -->
-<!-- TMPL_IF NAME="opac" -->
-       <tr bgcolor="#99cccc" background="/images/background-opac.gif">
-<!-- TMPL_ELSE -->
-       <tr background="/images/background-mem.gif">
-<!-- /TMPL_IF -->
-               <td colspan="4">
-                       <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                       <tr>
-                               <td align="left">
-                                       <a href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a>
-                               </td>
-                               <td align="right">
-                                       <a href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a>
-                               </td>
-                       </tr>
-                       </table>
-               </td>
-       </tr>
 </table>
-<br>
-Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --></b> records.
-<hr>
+<p><a  class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a> <a class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a></p>
+
+</div>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
 
-<!-- TMPL_IF NAME="opac" -->
-    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
-<!-- TMPL_ELSE -->
-    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
-<!-- /TMPL_IF -->