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

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/10/31 09:52:54

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

Log message:
        moving facets on the searchresults div.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.11&r2=1.1.2.12

Patches:
Index: results.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/results.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
--- results.tmpl        30 Oct 2006 09:59:52 -0000      1.1.2.11
+++ results.tmpl        31 Oct 2006 09:52:54 -0000      1.1.2.12
@@ -3,35 +3,6 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
-    <!-- TMPL_IF NAME="opacfacets" -->
-    <div id="facets">
-    <h2>Refine Your Search</h2>
-    <ul>
-    <!-- TMPL_LOOP NAME="facets_loop" -->
-    <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" 
-->
-        <ul>
-        <!-- TMPL_LOOP NAME="facets" -->
-            <li>
-                <a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR 
NAME="searchdesc" --> and <!-- TMPL_VAR NAME="type_link_value" -->:<!-- 
TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR 
NAME="facet_title_value" -->">
-                    <!-- TMPL_VAR NAME="facet_label_value" -->
-                </a> (<!-- TMPL_VAR NAME="facet_count" -->)
-            </li>
-        <!-- /TMPL_LOOP -->
-        <!-- TMPL_IF NAME="expandable" -->
-            <li class="showmore">
-                <a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" 
-->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" 
-->">
-                    Show More
-                </a>
-            </li>
-        <!-- /TMPL_IF -->
-        </ul>
-    </li>
-    <!-- /TMPL_LOOP -->
-    </ul>
-    </div>
-    <!-- /TMPL_IF -->
-    
-
     <!-- TMPL_IF NAME="koha_spsuggest" -->
         <div style="font-size: 12px;">Did you mean: 
             <ul style="list-style: none;">
@@ -45,6 +16,7 @@
     <!-- /TMPL_IF -->
     
     <!-- TMPL_IF NAME="total" -->
+    <h3><!-- TMPL_VAR NAME="total" --> results found.</h3>
     <!-- TMPL_ELSE -->
         <!-- TMPL_IF NAME="searchdesc" -->
             <h3> No Result found !</h3>
@@ -71,7 +43,6 @@
     
     <!-- Search Results Table -->
     <!-- TMPL_IF NAME="total" -->
-        <h3><!-- TMPL_VAR NAME="total" --> results found.</h3>
         <!-- TMPL_IF NAME="scan" -->
             <h1>Scan Index:</h1>
             <form action="search.pl" method="get">
@@ -131,20 +102,59 @@
                     <input type="hidden" name="q" value="<!-- TMPL_VAR 
NAME="searchdesc" escape="html" -->" />
                 <!-- /TMPL_IF -->
             
+                <div class="searchresults">
+                
+                    <!-- RE-SORT START -->
                 <!-- TMPL_IF NAME="sort_by_loop" -->
                     <p>
+                    Re-sort results
                     <select id="sort_by" name="sort_by" 
onChange="document.myform.submit();">
                         <option value="">Field-weighted, Relevance 
Ranked</option>
                         <!-- TMPL_LOOP NAME="sort_by_loop" -->
                             <option value="<!-- TMPL_VAR NAME="value" -->" 
<!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" 
-->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
                         <!-- /TMPL_LOOP -->
                     </select>
-                    <input type="submit" value="Re-sort" class="submit" />
                     <a href="http://wiki.koha.org/?id=en:opachelp#sort_by"; 
class="help"  
onclick="window.open('http://wiki.koha.org/?id=en:opachelp#sort_by','Sort By 
Help','width=350,top=50,left=50,resizable,scrollbars,height=650');  return 
false;">[ ? ]</a>
                     </p>
                 <!-- /TMPL_IF -->
+                    <!-- RESORT END -->
+                    
+                    <!-- ######### -->
+                    
+                    <!-- FACETS START -->
+                    <!-- TMPL_IF NAME="opacfacets" -->
+                    <div id="facets" style="display:inline;" >
+                    <h2>Refine Your Search</h2>
+                    <ul>
+                    <!-- TMPL_LOOP NAME="facets_loop" -->
+                    <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR 
NAME="type_label" -->
+                        <ul>
+                        <!-- TMPL_LOOP NAME="facets" -->
+                            <li>
+                                <a 
href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="searchdesc" --> 
and <!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR 
NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->">
+                                    <!-- TMPL_VAR NAME="facet_label_value" -->
+                                </a> (<!-- TMPL_VAR NAME="facet_count" -->)
+                            </li>
+                        <!-- /TMPL_LOOP -->
+                        <!-- TMPL_IF NAME="expandable" -->
+                            <li class="showmore">
+                                <a href="/search?q=<!-- TMPL_VAR 
NAME="searchdesc" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR 
NAME="type_id" -->">
+                                    Show More
+                                </a>
+                            </li>
+                        <!-- /TMPL_IF -->
+                        </ul>
+                    </li>
+                    <!-- /TMPL_LOOP -->
+                    </ul>
+                    </div>
+                    <!-- /TMPL_IF -->
+                    <!-- FACETS END -->
+                    
+                    <!-- ######### -->
+
+                    <!-- TABLE RESULTS START -->
             
-                <div class="searchresults">
                 <table>
                     <tr>
                         <th>&nbsp;</th>
@@ -285,6 +295,7 @@
     
     <!-- /TMPL_IF -->
 
-</div></div>
+</div>
+</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->