[Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en includes/doc-h... [rel_3_0]

paul poulain paul at koha-fr.org
Fri Dec 22 18:12:12 CET 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	paul poulain <tipaul>	06/12/22 17:12:12

Modified files:
	koha-tmpl/opac-tmpl/prog/en/includes: doc-head-close-basket.inc 
	                                      navigation.inc opac.css 
	koha-tmpl/opac-tmpl/prog/en: opac-advsearch.tmpl 
	                             opac-basket.tmpl opac-detail.tmpl 
	                             opac-main.tmpl opac-results.tmpl 

Log message:
	modifying some OPAC shown datas according to SAN-OP suggestions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.7&r2=1.1.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.10&r2=1.1.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.8&r2=1.1.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.8&r2=1.1.2.9

Patches:
Index: includes/doc-head-close-basket.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- includes/doc-head-close-basket.inc	7 Dec 2006 15:42:15 -0000	1.1.2.1
+++ includes/doc-head-close-basket.inc	22 Dec 2006 17:12:12 -0000	1.1.2.2
@@ -3,9 +3,20 @@
 <meta http-equiv="Content-Language" content="en-us" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
 
-<style type="text/css">
+<!-- TMPL_IF name="opacstylesheet" -->
+        <style type="text/css"> 
    @import url(<!-- TMPL_VAR NAME="opacstylesheet" -->);
-</style>
+        </style>
+<!-- TMPL_ELSE -->
+    <!-- TMPL_IF name="opaccolorstylesheet" -->
+        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
+    <!-- TMPL_ELSE -->
+        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/opac.css" />
+    <!-- /TMPL_IF -->
+    <style type="text/css">
+        @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
+    </style>
+<!-- /TMPL_IF -->
 
 <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/script.js" ></script>
 

Index: includes/navigation.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- includes/navigation.inc	20 Dec 2006 10:44:51 -0000	1.1.2.4
+++ includes/navigation.inc	22 Dec 2006 17:12:12 -0000	1.1.2.5
@@ -3,9 +3,15 @@
             <!-- TMPL_VAR NAME="OpacNav" -->
             <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
             <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
+            <!-- TMPL_IF name="OpacAuthorities" -->
             <li><a href="/cgi-bin/koha/opac-authorities-home.pl">Authorities Headings</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="OpacTopissues" -->
             <li><a href="/cgi-bin/koha/opac-topissues.pl">Top issues</a></li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF name="OpacCloud" -->
             <li><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject cloud</a></li>
+            <!-- /TMPL_IF -->
             <li>
                 <a href="#" onclick="javascript:openBasket();" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket">
                     <script language="javascript" type="text/javascript">

Index: includes/opac.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- includes/opac.css	7 Dec 2006 15:42:15 -0000	1.1.2.2
+++ includes/opac.css	22 Dec 2006 17:12:12 -0000	1.1.2.3
@@ -3,6 +3,10 @@
     font-size : 1em;
 }
 
+p {
+    margin:0px 0px 0px 0px;
+}
+
 table {
     border-collapse : collapse;
     border-top : 1px solid #CCCCCC;

Index: opac-advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-advsearch.tmpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- opac-advsearch.tmpl	7 Dec 2006 16:34:50 -0000	1.1.2.6
+++ opac-advsearch.tmpl	22 Dec 2006 17:12:12 -0000	1.1.2.7
@@ -46,7 +46,7 @@
 
 <!-- BOOLEAN SEARCH OPTIONS -->
     <fieldset>
-    <!-- TMPL_IF NAME="expanded_options" --><legend>Search For:</legend><!-- /TMPL_IF --> 
+    <legend>Search For:</legend>
     <!-- TMPL_LOOP NAME="search_boxes_loop" -->
 
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE --><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
@@ -54,6 +54,7 @@
         <select name="idx">
     <option value="" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
     <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
+    <!-- TMPL_IF NAME="expanded_options" -->
     <option value="au,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Author Phrase</option>
     <option value="cpn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
     <option value="cfn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
@@ -61,18 +62,23 @@
     <option value="cfn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Conference Name Phrase</option>
     <option value="pn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
     <option value="pn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
+    <!-- /TMPL_IF -->
     <option value="ln" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Language</option>
     <option value="nt" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
     <option value="pb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
     <option value="pl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</option>
+    <!-- TMPL_IF NAME="expanded_options" -->
     <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
     <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
     <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
     <option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
+    <!-- /TMPL_IF -->
     <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
     <option value="su,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Subject Phrase</option>
     <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
+    <!-- TMPL_IF NAME="expanded_options" -->
     <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase</option>
+    <!-- /TMPL_IF -->
     <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
 
         </select>

Index: opac-basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- opac-basket.tmpl	19 Dec 2006 10:20:28 -0000	1.1.2.7
+++ opac-basket.tmpl	22 Dec 2006 17:12:12 -0000	1.1.2.8
@@ -9,6 +9,9 @@
 
 <div> <!-- main -->
 
+
+<!-- TMPL_UNLESS NAME="print_basket" --><h1>Your Book Bag</h1>
+
 <div id="action">
         <!-- TMPL_IF NAME="verbose" -->
         <a href="opac-basket.pl" onclick="showLess(); return false;">Brief Display</a>
@@ -23,39 +26,36 @@
         <!-- /TMPL_UNLESS -->
 </div>
 
-<!-- TMPL_UNLESS NAME="print_basket" --><h3>Your Book Bag</h3>
-
 <!-- TMPL_IF NAME="verbose" -->
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<h3>
-    <!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
-</h3>
-<table>
-    <!-- TMPL_UNLESS NAME="print_basket" -->
-    <tr>
-        <td colspan="2">
+    <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+    <h3>
+        <!-- TMPL_IF NAME="print_basket" -->
+            <!-- TMPL_VAR NAME="title" -->
+                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
             <form>
-                <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">Select this Item</label>
                     <input type="checkbox"
                            value="<!-- TMPL_VAR NAME="biblionumber" -->"
                            name="bib<!-- TMPL_VAR NAME="biblionumber" -->"
                            id="bib<!-- TMPL_VAR NAME="biblionumber" -->"
                            onclick="selRecord(value,checked)" />
+                <!-- TMPL_VAR NAME="title" -->
+                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
            </form>
-        </td>
-    </tr>
-    <!-- /TMPL_UNLESS -->
+        <!-- /TMPL_IF -->
+    </h3>
+    <table>
 
     <!-- TMPL_IF name="isbn" -->
     <tr>
-        <th scope="row">ISBN:</th>
+            <th scope="row">ISBN</th>
         <td><!-- TMPL_VAR NAME="isbn" --></td>
     </tr>
     <!-- /TMPL_IF -->
     
     <!-- TMPL_IF name="MARCAUTHORS" -->
     <tr>
-        <td scope="row">Authors: </td>
+            <th scope="row">Authors</th>
         <td>
             <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
                 <!-- TMPL_VAR NAME="value" -->
@@ -64,49 +64,49 @@
     </tr>
     <!-- /TMPL_IF -->
     
-<!-- TMPL_IF NAME="publishercode" -->
+        <!-- TMPL_IF NAME="publishercode" -->
     <tr>
-        <th scope="row">Publisher:</th>
+                <th scope="row">Publisher</th>
         <td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" -->
         </td>
     </tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="pages" -->
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="pages" -->
     <tr>
-        <th scope="row">Details: </th>
+                <th scope="row">Details</th>
         <td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td>
     </tr>
-<!-- /TMPL_IF -->
-    <!-- TMPL_IF name="collection" -->
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="seriestitle" -->
     <tr>
-        <th scope="row">Collection:</th>
+            <th scope="row">Collection</th>
         <td> <!-- TMPL_VAR NAME="seriestitle" --></td>
     </tr>
     <!-- /TMPL_IF -->
     
     <!-- TMPL_IF name="MARCSUBJCTS" -->
     <tr>
-        <td scope="row">Subjects: </td>
+            <th scope="row">Subjects</th>
         <td>
             <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-                <!-- TMPL_VAR NAME="label" -->
+                    <p><!-- TMPL_VAR NAME="label" --></p>
         <!-- /TMPL_LOOP -->
         </td>
     </tr>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF name="copyrightdate" -->
-        <tr><th scope="row">Copyright:</th>
+            <tr><th scope="row">Copyright</th>
             <td> <!-- TMPL_VAR NAME="copyrightdate" --></td>
         </tr>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF name="MARCNOTES" -->
     <tr>
-        <td scope="row">Notes: </td>
+            <th scope="row">Notes</th>
         <td>
         <!-- TMPL_LOOP NAME="MARCNOTES" -->
-            - <!-- TMPL_VAR NAME="marcnote" -->
+                <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
         <!-- /TMPL_LOOP -->
         </td>
     </tr>
@@ -114,75 +114,67 @@
 
     <!-- TMPL_IF name="unititle" -->
     <tr>
-        <th scope="row">Unified title:</th>
+            <th scope="row">Unified title</th>
         <td> <!-- TMPL_VAR NAME="unititle" --></td>
     </tr>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="serial" -->
     <tr>
-        <th scope="row">Serial:</th>
+            <th scope="row">Serial</th>
         <td><!-- TMPL_VAR NAME="serial" --></td>
     </tr>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="dewey" -->
     <tr>
-        <th scope="row">Dewey:</th>
+            <th scope="row">Dewey</th>
         <td><!-- TMPL_VAR name="dewey" --></td>
     </tr>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="classification" -->
     <tr>
-        <th scope="row">Call Number:</th>
+            <th scope="row">Classification</th>
         <td> <!-- TMPL_VAR name="classification" --></td>
     </tr>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="lccn" -->
     <tr>
-        <th scope="row">LCCN:</th>
+            <th scope="row">LCCN</th>
         <td> <!-- TMPL_VAR name="lccn" --></td>
     </tr>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="url" -->
     <tr>
-        <th scope="row">URL:</th>
+            <th scope="row">URL</th>
         <td> <!-- TMPL_VAR NAME="url" --></td>
     </tr><!-- /TMPL_IF -->
-</table>
-    <!-- TMPL_IF NAME="ITEM_RESULTS" -->
-    <table>
-    <tr>
-        <th>Location: </th>
-        <th>Barcode: </th>
-    </tr>
-    <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
     <tr>
+            <th scope="row">Location</th>
         <td>
+                <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+                <p>
             <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" -->
             <!-- TMPL_IF name="itemcallnumber" -->
                 (<!-- TMPL_VAR NAME="itemcallnumber" -->)
             <!-- /TMPL_IF -->
-        </td>
-        <td>
-            <!-- TMPL_VAR NAME="barcode" -->
+                </p>
+                <!-- /TMPL_LOOP -->
         </td>
     </tr>
-    <!-- /TMPL_LOOP -->
     </table>
-    <!-- /TMPL_IF  -->
-<br>
-<!-- /TMPL_LOOP -->
+    <!-- /TMPL_LOOP -->
 
 <!-- TMPL_ELSE -->
-<table>
+    <table>
     <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-    <!-- BIBLIO RECORD TABLE -->
-<!-- TMPL_IF NAME="even" -->
-<tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="even" -->
+                <tr class="highlight">
+            <!-- TMPL_ELSE -->
+                <tr>
+            <!-- /TMPL_IF -->
     <td>
         <form>
             <!-- TMPL_UNLESS NAME="print_basket" -->
                 <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">
-                    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
                 </label>
                 <br />
                 <input type="checkbox"
@@ -193,6 +185,7 @@
             <!-- /TMPL_UNLESS -->
         </form>
     </td>
+            <td><!-- TMPL_VAR name="itemtype" --></td>
     <td>
         <p>
             <a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
@@ -212,9 +205,9 @@
         <a href="javascript:Dopop('/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">Add to a shelf</a>
     </td>
     <td><!-- TMPL_VAR NAME="classification" --></td>
-</tr>
+            </tr>
     <!-- /TMPL_LOOP -->
-</table>
+    </table>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_UNLESS NAME="print_basket" -->

Index: opac-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- opac-detail.tmpl	20 Dec 2006 16:21:08 -0000	1.1.2.10
+++ opac-detail.tmpl	22 Dec 2006 17:12:12 -0000	1.1.2.11
@@ -157,8 +157,6 @@
             <th>Location</th>
             <th>Status</th>
             <th>Date Due</th>
-            <th>Last seen</th>
-            <th>Barcode</th>
             <th>Volume</th>
         </tr>
         <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
@@ -181,8 +179,6 @@
                 <!-- /TMPL_IF -->
             </td>
             <td><!-- TMPL_VAR NAME="datedue" --></td>
-            <td><!-- TMPL_VAR NAME="datelastseen" --></td>
-            <td><!-- TMPL_VAR NAME="barcode" --></td>
             <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
             <!-- TMPL_IF NAME="type" -->
             <td>

Index: opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -b -r1.1.2.8 -r1.1.2.9
--- opac-main.tmpl	8 Dec 2006 17:33:27 -0000	1.1.2.8
+++ opac-main.tmpl	22 Dec 2006 17:12:12 -0000	1.1.2.9
@@ -9,19 +9,8 @@
     <form name="searchform" method="POST" action="/cgi-bin/koha/opac-search.pl" id="searchform">
     <p>
     <label for="masthead_search">Search</label>
-    <select name="idx" id="masthead_search">
-            <option selected="selected" value="">Library Catalog</option>
-            <option value="ti">Title</option>
-            <option value="au">Author</option>
-            <option value="su">Subject</option>
-            <option value="isbn">ISBN</option>
-            <option value="se">Series</option>
-            <option value="publisher">Publisher</option>
-            <option value="acqdate">Acquisition Date</option>
-            <option value="callnum">Call Number</option>
-    </select>
     <input type="text" name="q" style="width: 30%;"/>
-    <input type="submit" value="Search" class="submit" /> <a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></p>
+    <input type="submit" value="Search" class="submit" /></p>
     </form>
 </div>
 

Index: opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -b -r1.1.2.8 -r1.1.2.9
--- opac-results.tmpl	19 Dec 2006 12:08:10 -0000	1.1.2.8
+++ opac-results.tmpl	22 Dec 2006 17:12:12 -0000	1.1.2.9
@@ -168,7 +168,6 @@
             <tr>
                 <th>&nbsp;</th>
                 <th>Title</th>
-                <th>Call No.</th>
                 <th>Location</th>
                 <!-- TMPL_IF NAME="RequestOnOpac" -->
                 <th>Reservation</th>
@@ -231,20 +230,18 @@
                         </p>
                         <!-- /TMPL_IF -->
                     </td>
-                    <td>
-                        <a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
-                            <!-- TMPL_VAR NAME="classification" -->
-                        </a>
-                    </td>
                     <td style="white-space: nowrap">
                         <!-- TMPL_IF NAME="items_loop" -->
                         <span class="available">
                             <!-- TMPL_LOOP NAME="items_loop" -->
-                            <!-- <!-- TMPL_VAR NAME="branchcode" --> -->
-                            <!-- TMPL_VAR NAME="branchname" -->
-                            (<!-- TMPL_VAR NAME="count" -->
-                            <!-- TMPL_IF name="itemcallnumber" --> <i><!-- TMPL_VAR name="itemcallnumber" --></i><!-- /TMPL_IF -->
-                            ),<br />
+                                <!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR NAME="branchname" -->
+                                <!-- TMPL_IF name="itemcallnumber" --> <i>(<!-- TMPL_VAR name="itemcallnumber" -->)</i><!-- /TMPL_IF -->
+                                <!-- TMPL_IF name="classification" -->
+                                    <i>(<a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
+                                        <!-- TMPL_VAR NAME="classification" -->
+                                    </a>)</i>
+                                <!-- /TMPL_IF -->
+                                <br />
                             <!-- /TMPL_LOOP -->
                         </span>
                         <!-- /TMPL_IF -->





More information about the Koha-cvs mailing list