fix conflicts during merge of Arun's tree

[phpfspot.git] / themes / default / templates / search.tpl

diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl
index f983c40b45ea168b4f90887965d47afe491ecb6d..401d9af937ae3b61addcaa2402fc5699419196fb 100644 (file)
--- a/themes/default/templates/search.tpl
+++ b/themes/default/templates/search.tpl
@@ -1,5 +1,5 @@
-<span style="vertical-align: middle; text-decoration: underline;">
- <img src="resources/loupe.png" alt="loupe" />Search:
+<span class="tags">
+ <img src="{$web_path}/resources/loupe.png" alt="loupe" />Search:
 </span>
 <form action="" onsubmit="startSearch(); return false;">
 <div class="searchfor">
@@ -12,7 +12,7 @@
    { literal }
    <script type="text/javascript">
       var options = {
-         script: "rpc.php?action=getxmltaglist&",
+         script: "rpc.php?action=getxmltaglist&amp;",
          varname: "search",
          json: false,
          maxresults: 15
@@ -25,7 +25,7 @@
    { /if }
   </td>
   <td>
-   <input type="image" class="submit" src="resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
+   <input type="image" class="submit" src="{$web_path}/resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
   </td>
  </tr>
  <tr>
@@ -34,16 +34,16 @@
    <input type="text" name="searchfor_name" value="{$searchfor_name}" size="15" />
   </td>
   <td>
-   <input type="image" class="submit" src="resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
+   <input type="image" class="submit" src="{$web_path}/resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
   </td>
  </tr>
  <tr>
   <td>Date:</td>
-  <td style="white-space: nowrap;">
+  <td class="nowarp">
    { if ! $date_search_enabled }
-    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();">
+    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" />
    { else }
-    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" checked="checked">
+    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" checked="checked" />
    { /if }
    consider date-range
   </td>
@@ -51,15 +51,15 @@
  </tr>
  <tr>
   <td>&nbsp;</td>
-  <td>{$from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="resources/date.png" id="frompic"/></a></td>
+  <td>{$from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="frompic" alt="from" /></a></td>
  </tr>
  <tr>
   <td>&nbsp;</td>
   <td>
-   {$to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="resources/date.png" id="topic" /></a>
+   {$to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="topic" alt="to" /></a>
   </td>
   <td>
-   <input type="image" class="submit" src="resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
+   <input type="image" class="submit" src="{$web_path}/resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
   </td>
  </tr>
  <tr>