fix conflicts in single_photo.tpl

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

diff --cc themes/default/templates/single_photo.tpl
index a9ecec4df9f2d5a0da8e266e41eb8ed7bfd2b6e9,78e489d79d71c51c6402e934fb0928c35e567b45..bf3051cf247e713ee6b60f4df8a0edc9c488b847
--- 1/themes/default/templates/single_photo.tpl
--- 2/themes/default/templates/single_photo.tpl
+++ b/themes/default/templates/single_photo.tpl
@@@ -15,14 -15,16 +15,16 @@@
    {/if}
   </div>
   <div style="text-align: right;">
-   <a href="javascript:zoom(-10);" title="zoom_out" onfocus="click(this);"><img src="{$web_path}/resources/zoom-out.png" /></a>
-   <a href="javascript:zoom(0);" title="zoom_100" onfocus="click(this);"><img src="{$web_path}/resources/zoom-100.png" /></a>
-   <a href="javascript:zoom(10);" title="zoom_in" onfocus="click(this);"><img src="{$web_path}/resources/zoom-in.png" /></a>
-  <a href="javascript:startAutoBrowse();" title="auto browsing"><img id="autobrowse_ico" src="{$web_path}/resources/16_play.png" />&nbsp;Auto-Browse</a>
+   <a href="javascript:zoom(-10);" title="zoom_out" onclick="click(this);"><img src="resources/zoom-out.png" /></a>
+   <a href="javascript:zoom(0);" title="zoom_100" onclick="click(this);"><img src="resources/zoom-100.png" /></a>
+   <a href="javascript:zoom(10);" title="zoom_in" onclick="click(this);"><img src="resources/zoom-in.png" /></a>
+   <a href="javascript:startAutoBrowse();" title="auto browsing"><img id="autobrowse_ico" src="resources/32_play.png" /></a>
    {if $extern_link }
 -   <a href="{$extern_link}" title="Use this link to return to the current view"><img src="resources/link.png" /></a>
 +   <a href="{$extern_link}" title="Use this link to return to the current view"><img src="{$web_path}/resources/link.png" />&nbsp;External Link</a>
    {/if}
-   <a href="{$image_url_full}" title="orig_image" target="_blank" onfocus="click(this);"><img src="{$web_path}/resources/original.png" alt="original resolution" />&nbsp;Fullsize</a>
+   <a href="{$image_url_full}" title="orig_image" target="_blank" onclick="click(this);">
+    <img src="resources/original.png" alt="original resolution" />
+   </a>
   </div>
  </div>