further fix div-floating

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

diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css
index 07571c9b58f304777b698b751c9b8b7e79995b73..1c0ebcfed91fa53334be6ee13662e1dc8073d9c3 100644 (file)
--- a/themes/default/stylesheet.css
+++ b/themes/default/stylesheet.css
@@ -86,14 +86,17 @@ div.header {
    vertical-align:         middle;
    white-space:            nowrap;
    text-align:             left;
+   height:                 2em;
 }
 
-div.subheader {
-   background-color:       #eeeeee;
-   padding:                5px 10px 5px 10px;
-   vertical-align:         middle;
+div.header_title {
    white-space:            nowrap;
    text-align:             left; 
+   float:                  left;
+}
+
+div.header_menu {
+   text-align:             right;
 }
 
 div.tagresult{ 
@@ -139,10 +142,6 @@ div.indexnavigationcenter{
    text-align:             center;
 }
 
-div.textright { 
-   text-align:             right;
-}
-
 div.welcome { 
    padding:                10px; 
    margin-left:            10px;  
@@ -221,7 +220,7 @@ div.thumb a.thumblink:hover {
    color:                  #4761ab;
 }
 
-.clearboth { clear: both; }
+.cb { clear: both; }
 
 #photo_details {
    width:                  150px;

diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index 95fbb726b3ec6b136f12dff366352dff958b3053..b8c0365ebe4147e7a4ab62f87282764aabb00aeb 100644 (file)
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -3,7 +3,7 @@
 <!-- Header - displays count of matched photos and some link's -->
 
 <div class="header">
- <div class="subheader">
+ <div class="header_title">
   <b>Photo Index</b>
   {if $searchfor }
    {if $count == 1}
@@ -29,7 +29,7 @@
    Results are limited to a date within {$from_date} to {$to_date}.
   {/if}
  </div>
- <div class="textright">
+ <div class="header_menu">
   {if $slideshow_link }
    <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="{$web_path}/resources/slideshow.png" />&nbsp;Slideshow</a>
   {/if}
@@ -50,14 +50,14 @@
 
 { if $tag_result }
 <!-- seperator -->
-<div class="tagresult"></div>
-<!-- /seperator -->
-<div class="tagresulttags" style="float: left;">
- Tags:
-</div>
-<div class="tagresulttags">
- { $selected_tags }
-</div>
+ <div class="tagresult"></div>
+ <!-- /seperator -->
+ <div class="tagresulttags" style="float: left;">
+  Tags:
+ </div>
+ <div class="tagresulttags">
+  { $selected_tags }
+ </div>
 { /if }
 
 <!-- the photo matrix itself -->

diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl
index 8cd5aa5922f753d1d24e98b3dfec3818588cd68b..97ef0cfe16dfaef8b12e6ea12ce8f20c27a931a9 100644 (file)
--- a/themes/default/templates/single_photo.tpl
+++ b/themes/default/templates/single_photo.tpl
@@ -1,6 +1,6 @@
 <!-- Single photo -->
 <div class="header">
- <div class="subheader">
+ <div class="header_title">
   <b>Photo {$image_name}</b><br />
   {if $photo_count > 0}
    {$photo_number} of {$photo_count}
@@ -14,7 +14,7 @@
    {/if}
   {/if}
  </div>
- <div class="textright">
+ <div class="header_menu">
   <a href="javascript:zoom(-10);" title="zoom_out" onclick="click(this);"><img src="{$web_path}/resources/zoom-out.png" /></a>
   <a href="javascript:zoom(0);" title="zoom_100" onclick="click(this);"><img src="{$web_path}/resources/zoom-100.png" /></a>
   <a href="javascript:zoom(10);" title="zoom_in" onclick="click(this);"><img src="{$web_path}/resources/zoom-in.png" /></a>
@@ -26,7 +26,8 @@
  </div>
 </div>
 
-<div>
+<p class="cb">
+
  <div id="photo_details">
    { if $ExifMadeWith }
    <u><img src="{$web_path}/resources/camera.png" alt="camera icon" />&nbsp;Image taken with:</u><br />
@@ -96,7 +97,7 @@
    </a>
   { /if}
  </div>
-</div>
+</p>
 <script type="text/javascript">
 <!--
    if(autobrowse && document.getElementById("autobrowse_ico"))

diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl
index 073af0053c719591a7c73fd5be3252df9adfcbc4..8e06db5e9feefa0839052285b8a54cd438e2fec0 100644 (file)
--- a/themes/default/templates/welcome.tpl
+++ b/themes/default/templates/welcome.tpl
@@ -13,7 +13,7 @@
   web2.0 providers or setup complex apps like gallery
  </p>
 
- <br class="clearboth" />
+ <br class="cb" />
 
  <p>
  <span>
@@ -23,7 +23,7 @@
   directory of your current theme.
  </p>
 
- <br class="clearboth" />
+ <br class="cb" />
 
  <p>
  <span>