diff options
author | Andreas Unterkircher <unki@netshadow.at> | 2008-05-11 09:42:36 +0200 |
---|---|---|
committer | Andreas Unterkircher <unki@netshadow.at> | 2008-05-11 09:42:36 +0200 |
commit | d97a057346bebb98be293d903a86987273cbee3e (patch) | |
tree | 6f1ff7dc2f46b8de0bf2438447cb2f5165aa4199 /themes/default/templates/search.tpl | |
parent | b5ff85f75a27397c1ab4164fdefa9d734dc0e39d (diff) | |
parent | 7731c49b82089c7b62cc70f84edbae0d39f54fd3 (diff) |
fix conflicts during merge of Arun's tree
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
Diffstat (limited to 'themes/default/templates/search.tpl')
-rw-r--r-- | themes/default/templates/search.tpl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl index ca7042e..401d9af 100644 --- a/themes/default/templates/search.tpl +++ b/themes/default/templates/search.tpl @@ -1,4 +1,4 @@ -<span style="vertical-align: middle; text-decoration: underline;"> +<span class="tags"> <img src="{$web_path}/resources/loupe.png" alt="loupe" />Search: </span> <form action="" onsubmit="startSearch(); return false;"> @@ -12,7 +12,7 @@ { literal } <script type="text/javascript"> var options = { - script: "rpc.php?action=getxmltaglist&", + script: "rpc.php?action=getxmltaglist&", varname: "search", json: false, maxresults: 15 @@ -39,11 +39,11 @@ </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,12 +51,12 @@ </tr> <tr> <td> </td> - <td>{$from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="{$web_path}/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> </td> <td> - {$to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="{$web_path}/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="{$web_path}/resources/doit.png" alt="start search" title="start search" onclick="click(this);" /> |