fix conflicts during merge of Arun's tree

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

1 files changed, 5 insertions, 5 deletions

diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl
index bf3051c..571b524 100644
--- a/themes/default/templates/single_photo.tpl
+++ b/themes/default/templates/single_photo.tpl
@@ -1,6 +1,6 @@
 <!-- Single photo -->
 <div class="header">
- <div style="text-align: left; float: left;">
+ <div class="subheader">
   <b>Photo {$image_name}</b><br />
   {if $photo_count > 0}
    {$photo_number} of {$photo_count}
@@ -14,7 +14,7 @@
    {/if}
   {/if}
  </div>
- <div style="text-align: right;">
+ <div class="textright"">
   <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>
@@ -29,7 +29,7 @@
 </div>
 
 <div>
- <div id="photo_details" style="float: right; margin-top: 20px; margin-right: 20px;">
+ <div id="photo_details">
    { if $ExifMadeWith }
    <u><img src="{$web_path}/resources/camera.png" alt="camera icon" />&nbsp;Image taken with:</u><br />
    {$ExifMadeWith}<br />
@@ -67,7 +67,7 @@
 
  <!-- the photo itself -->
 
- <div style="text-align: left; margin-top: 20px; margin-left: 20px;">
+ <div class="photo">
  { if $next_url == "" }
   <a href="{$image_url}" onclick="showPhotoIndex(); return false;" onfocus="click(this);" name="photo">
  { else }
@@ -79,7 +79,7 @@
 
  <!-- navigation arrows -->
 
- <div style="margin-left: 20px;">
+ <div class="photonavigation">
   { if $previous_url == "" }
    <img src="{$web_path}/resources/arrow_left_gray.png" alt="first photo reached" />
   { else }