[Koha-cvs] koha/koha-tmpl intranet-tmpl/prog/en/catalogue/... [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Henri-Damien LAURENT <hdl>      07/02/05 15:40:07

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl 
        koha-tmpl/opac-tmpl/prog/en: opac-advsearch.tmpl 

Log message:
        adding kw to keyword in order to have a good CCL when keyword is 2nd 
position.
        kw is in ccl.properties.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.13&r2=1.1.2.14
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.11&r2=1.1.2.12

Patches:
Index: intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/advsearch.tmpl,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -b -r1.1.2.13 -r1.1.2.14
--- intranet-tmpl/prog/en/catalogue/advsearch.tmpl      22 Dec 2006 17:34:13 
-0000      1.1.2.13
+++ intranet-tmpl/prog/en/catalogue/advsearch.tmpl      5 Feb 2007 15:40:07 
-0000       1.1.2.14
@@ -17,30 +17,28 @@
 <fieldset>
         <legend>Select local databases</legend>
             <p>
-                <!-- TMPL_LOOP NAME="outer_servers_loop" -->
-                <!-- TMPL_LOOP NAME="inner_servers_loop" -->
+                <!-- TMPL_LOOP NAME="local_servers_loop" -->
                 <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" 
name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" 
-->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- 
TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img 
width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR 
NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR 
NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
-                <!-- /TMPL_LOOP -->
             </p>
 </fieldset>
 <!-- /DATABASES -->
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="outer_sup_servers_loop" -->
+<!-- TMPL_IF NAME="outer_servers_loop" -->
 <!-- REMOTE DATABASES -->
 <fieldset>
     <legend>Select remote databases:</legend>
         <p>
-                <!-- TMPL_LOOP NAME="outer_sup_servers_loop" -->
-                <!-- TMPL_LOOP NAME="inner_sup_servers_loop" -->
+                <!-- TMPL_LOOP NAME="outer_servers_loop" -->
                 <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" 
name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" 
-->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- 
TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img 
alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" 
-->/images/<!-- TMPL_VAR NAME="icon" -->"/><!-- TMPL_VAR NAME="label" 
--></label>
                 <!-- /TMPL_LOOP -->
-                <!-- /TMPL_LOOP -->
     </p>
     </fieldset>
 <!-- /REMOTE DATABASES -->
 <!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+<h3>Search the Library Catalog</h3>
 <!-- /TMPL_IF -->
 
 <!-- BOOLEAN SEARCH OPTIONS -->
@@ -51,7 +49,7 @@
         <!-- 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 -->
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR 
NAME="left_content" --><!-- /TMPL_IF --> 
         <select name="idx">
-    <option value="" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR 
NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+    <option value="kw" <!-- 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>
     <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>

Index: opac-tmpl/prog/en/opac-advsearch.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/opac-tmpl/prog/en/Attic/opac-advsearch.tmpl,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- opac-tmpl/prog/en/opac-advsearch.tmpl       10 Jan 2007 14:34:38 -0000      
1.1.2.11
+++ opac-tmpl/prog/en/opac-advsearch.tmpl       5 Feb 2007 15:40:07 -0000       
1.1.2.12
@@ -50,7 +50,7 @@
         <!-- 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 -->
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR 
NAME="left_content" --><!-- /TMPL_IF --> 
         <select name="idx">
-            <option value="" <!-- TMPL_IF NAME="selected" -->selected="<!-- 
TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+            <option value="kw" <!-- 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>