fix conflicts during merge of Arun's tree

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

diff --git a/themes/default/templates/tags.tpl b/themes/default/templates/tags.tpl
index 42a20ffb64a8a9c20090869a771e552e1668d90e..817cfbcf2a9590bb8a18be572ed7142c70573121 100644 (file)
--- a/themes/default/templates/tags.tpl
+++ b/themes/default/templates/tags.tpl
@@ -1,9 +1,9 @@
-<span style="vertical-align: middle; text-decoration: underline;">
- <img src="resources/available_tags.png" alt="available tags" />Available Tags:
+<span class="tags">
+ <img src="{$web_path}/resources/available_tags.png" alt="available tags" />Available Tags:
 </span>
-<div id="available_tags"></div>
-<span style="vertical-align: middle; text-decoration: underline;">
- <img src="resources/selected_tags.png" alt="selected tags" />Selected Tags:
+<div id="available_tags">{ $preset_available_tags }</div>
+<span class="tags">
+ <img src="{$web_path}/resources/selected_tags.png" alt="selected tags" />Selected Tags:
 </span>
  &nbsp;
  <input type="radio" name="condition" value="or" onclick="Tags('condition', this);" {if $current_condition == "or" } checked="checked" { /if } title="OR condition" />||