Search engine redesign, second part :

improvement: in category.php, an icon opening a popup display the list of
search rules.

modification: function get_search_array is responsible of search rules
retrieving from database. This function is called from get_sql_search_clause
and from search_rules.php

modification: ability to search multiple authors. Warning: this version of
search tool can't search author names including any blank space.


git-svn-id: http://piwigo.org/svn/trunk@1015 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 56 insertions, 2 deletions

diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index 40391a923..1f9e50c66 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -107,15 +107,25 @@
   <div class="titrePage">
     <ul class="categoryActions">
       <li>&nbsp;</li>
+      
       <!-- BEGIN caddie -->
       <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"/></a></li>
       <!-- END caddie -->
+      
       <!-- BEGIN edit -->
       <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
       <!-- END edit -->
+
+      <!-- BEGIN search_rules -->
+      <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}"><img src="{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
+      <!-- END search_rules -->
+
     </ul>
-    <h2>{TITLE}</h2>
-  </div>
+    
+  <h2>{TITLE}</h2>
+    
+  </div> <!-- content -->
+    
 <!-- BEGIN calendar -->
 <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
 <div class="navigationBar">{calendar.MONTHS_NAV_BAR}</div>
diff --git a/template/yoga/icon/search_rules.png b/template/yoga/icon/search_rules.png
new file mode 100644
index 000000000..300186647
--- /dev/null
+++ b/template/yoga/icon/search_rules.png
diff --git a/template/yoga/search_rules.tpl b/template/yoga/search_rules.tpl
new file mode 100644
index 000000000..aac2586fe
--- /dev/null
+++ b/template/yoga/search_rules.tpl
@@ -0,0 +1,44 @@
+<div id="content">
+<h2>{lang:Search rules}</h2>
+
+<p>{INTRODUCTION}</p>
+
+<ul>
+
+  <!-- BEGIN words -->
+  <li>{words.CONTENT}</li>
+  <!-- END words -->
+
+  <!-- BEGIN author -->
+  <li>{author.CONTENT}</li>
+  <!-- END author -->
+
+  <!-- BEGIN date_creation -->
+  <li>{date_creation.CONTENT}</li>
+  <!-- END date_creation -->
+
+  <!-- BEGIN date_available -->
+  <li>{date_available.CONTENT}</li>
+  <!-- END date_available -->
+
+  <!-- BEGIN categories -->
+  <li>
+    <p>{categories.LIST_INTRO}</p>
+
+    <ul>
+      <!-- BEGIN category -->
+      <li>{categories.category.NAME}</li>
+      <!-- END category -->
+    </ul>
+  </li>
+  <!-- END categories -->
+  
+</ul>
+
+</div> <!-- content -->
+
+<p id="pageBottomActions">
+  <a href="#" onclick="window.close();" title="{lang:Close this window}">
+    <img src="{themeconf:icon_dir}/exit.png" class="button" alt="close">
+  </a>
+</p>