summaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorAndreas Unterkircher <unki@netshadow.at>2008-05-13 19:33:09 +0200
committerAndreas Unterkircher <unki@netshadow.at>2008-05-13 19:33:09 +0200
commit112916d4ffcc59590b3fd8753ea832c171167751 (patch)
tree2bbafb1206e7bfb8ccda8e59a90e833b67fa74f8 /themes
parente3ff519ba724a0c3e3e682140e77b1fdb1100805 (diff)
parent8e14a6b9e1c7d2dfc25e786c425d76acc115f393 (diff)
Merge branch 'friendlyurl'
Diffstat (limited to 'themes')
-rw-r--r--themes/default/templates/photo_index.tpl8
-rw-r--r--themes/default/templates/search.tpl6
2 files changed, 8 insertions, 6 deletions
diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index 333d80e..9f0531e 100644
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -69,8 +69,12 @@
{if $images[thumb] }
<div class="thumb" onmouseover="setBackGrdColor(this, 'mouseover');" onmouseout="setBackGrdColor(this, 'mouseout');" style="width: { $thumb_container_width }px; height: { $thumb_container_height }px;">
- <a href="javascript:showImage({$images[thumb]}, 'scrollup');" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onclick="click(this);" title="{$img_title[thumb]}">
- <img class="thumb" id="thumbimg{$images[thumb]}" width="{$img_width[thumb]}" height="{$img_height[thumb]}" />
+ { if $user_friendly_url }
+ <a href="{$web_path}/photoview/{$images[thumb]}" onclick="showImage({$images[thumb]}, 'scrollup'); return false;" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onfocus="click(this);" title="{$img_title[thumb]}">
+ { else }
+ <a href="{$web_path}/index.php?mode=showp&amp;id={$images[thumb]}" onclick="showImage({$images[thumb]}, 'scrollup'); return false;" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onfocus="click(this);" title="{$img_title[thumb]}">
+ { /if }
+ <img class="thumb" id="thumbimg{$images[thumb]}" width="{$img_width[thumb]}" height="{$img_height[thumb]}" src="{$web_path}/phpfspot_img.php?idx={$images[thumb]}&width={$width}" />
<br />
{$img_name[thumb]}
</a>
diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl
index 401d9af..767cbcf 100644
--- a/themes/default/templates/search.tpl
+++ b/themes/default/templates/search.tpl
@@ -51,13 +51,11 @@
</tr>
<tr>
<td>&nbsp;</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>
+ <td>{$search_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="{$web_path}/resources/date.png" id="topic" alt="to" /></a>
- </td>
+ <td>{$search_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);" />
</td>