cleanup: moved more CSS into the stylesheet

almost everything in the stylesheet now

Signed-off-by: Arun Persaud <arun@nubati.net>

diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css
index 8fbee2fc55e1af45a5aa2e2e498884c41f9b11db..9457a80094b01f4d4ca7a48ce6b552c380aa92ad 100644 (file)
--- a/themes/default/stylesheet.css
+++ b/themes/default/stylesheet.css
@@ -93,6 +93,55 @@ div.subheader {
    padding:                5px 10px 5px 10px;
    vertical-align:         middle;
    white-space:            nowrap;
+   text-align:             left; 
+   float:                  left;
+}
+
+div.tagresult{ 
+   height:                 1px; 
+   background-color:       #ffffff;
+}
+
+div.tagresulttags{
+   display:                table-cell; 
+   vertical-align:         middle;
+}
+
+div.photo{ 
+   text-align:             left; 
+   margin-top:             20px;
+   margin-left:            20px;
+}
+
+div.photonavigation{ 
+   margin-left:            20px;
+}
+
+div.indexnavigation{ 
+   width:                  100%; 
+   margin-top:             20px;
+}
+
+div.indexnavigationright{ 
+   float:                  right; 
+   width:                  40px; 
+   margin-right:           0px; 
+   padding-right:          10px;
+}
+
+div.indexnavigationleft{ 
+   float:                  left; 
+   margin:                 0px; 
+   padding-left:           10px; 
+   width:                  40px;
+}
+
+div.indexnavigationcenter{ 
+   text-align:             center;
+}
+
+div.textright { 
+   text-align:             right;
 }
 
 div.welcome { 
@@ -215,6 +264,11 @@ span.tags {
    text-decoration:        underline;
 }
 
+div.credits{
+   margin-top:             10px; 
+   margin-left:            10px;
+}
+
 table.calendar tr td {
    border:                 solid 1px #ffffff;
    padding:                1px;

diff --git a/themes/default/templates/credits.tpl b/themes/default/templates/credits.tpl
index ba772a1a6781d754aef21510f05e9a5b79c29516..2bc7b285ca040e6fdeae2173c679c3f7198ea750 100644 (file)
--- a/themes/default/templates/credits.tpl
+++ b/themes/default/templates/credits.tpl
@@ -1,7 +1,7 @@
 <div class="header">
  <b>{$product} {$version}</b><br />
 </div>
-<div style="margin-top: 10px; margin-left: 10px;">
+<div class="credits">
  by Andreas Unterkircher<br />
  Licensed under GPLv3, <a href="http://oss.netshadow.at/oss/phpfspot/Project" target="_blank">phpfspot</a>
  <hr />

diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index c01c6afc4a4190619a5a5572c0ff38eef655fc9f..413ec2668f6713d70f1b54c4e5c0aa2af2b58116 100644 (file)
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -1,6 +1,6 @@
 <!-- Photo Index -->
 <div class="header">
- <div style="float: left;">
+ <div class="subheader">
   <b>Photo Index</b>
   {if $searchfor }
    {if $count == 1}
@@ -26,7 +26,7 @@
    Results are limited to a date within {$from_date} to {$to_date}.
   {/if}
  </div>
-<div style="text-align: right">
+<div class="textright">
   {if $slideshow_link }
    <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="resources/slideshow.png" /></a>
   {/if}
@@ -42,9 +42,9 @@
  </div>
 </div>
 { if $tag_result }
-<div style="height: 1px; background-color: #ffffff;"></div>
+<div class="tagresult"></div>
 <div class="subheader">
- <div style="display: table-cell; vertical-align: middle;">
+ <div class="tagresulttags">
  Tags:
  </div>
  { $selected_tags }
@@ -74,10 +74,10 @@
 
 </div>
 <br class="clearboth" />
-<div style="width: 100%; margin-top: 20px;">
+<div class="indexnavigation">
 
  <!-- the right nav arrow -->
- <div style="float: right; width: 40px; margin-right: 0px; padding-right: 10px;">
+ <div class="indexnavigationright">
  { if $next_url == "" }
   { if $count != 0 }
    <img src="resources/arrow_right_gray.png" alt="last page reached" />
@@ -90,7 +90,7 @@
  </div>
 
  <!-- the left nav arrow -->
- <div style="float: left; margin: 0px; padding-left: 10px; width: 40px;">
+ <div class="indexnavigationleft">
  { if $previous_url == "" }
   { if $count != 0 }
    <img src="resources/arrow_left_gray.png" alt="first page reached" />
@@ -103,7 +103,7 @@
  </div>
 
  <!-- the middle page selector -->
- <div style="text-align: center;">
+ <div class="indexnavigationcenter">
  { if $page_selector != "" }
   {$page_selector}
  { /if}

diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl
index 78e489d79d71c51c6402e934fb0928c35e567b45..b6cdecbe7da1b6cdc4fd1a35dad5d971674c9237 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 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="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="javascript:showPhotoIndex();" onclick="click(this);" name="photo">
  { else }
@@ -79,7 +79,7 @@
 
  <!-- navigation arrows -->
 
- <div style="margin-left: 20px;">
+ <div class="photonavigation">
   { if $previous_url == "" }
    <img src="resources/arrow_left_gray.png" alt="first photo reached" />
   { else }