issue59, remove HTML table from main skeleton

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
author: Andreas Unterkircher <unki@netshadow.at> 2008-01-05 19:53:15 +0100
committer: Andreas Unterkircher <unki@netshadow.at> 2008-01-06 08:21:39 +0100
commit: 35efccbba53481402a9146911bb786781c1e3dc3 (patch)
tree: f7479f63c63e80e1b256a1b2a15c6ee515079cc8 /themes/default
parent: 3face190fc281981026fe48fb80cea007a2e841b (diff)
5 files changed, 88 insertions, 142 deletions
diff --git a/themes/default/templates/credits.tpl b/themes/default/templates/credits.tpl
index 54991d4..a940b03 100644
--- a/themes/default/templates/credits.tpl
+++ b/themes/default/templates/credits.tpl
@@ -1,29 +1,13 @@
-<!-- Single photo -->
-<table>
- <tr>
-  <td class="index_header">
-   <b>{$product} {$version}</b><br />
-  </td>
- </tr>
- <tr>
-  <td>
-   <div id='matrix'>
-   <table>
-    <tr>
-     <td>
-      by Andreas Unterkircher<br />
-      Licensed under GPLv3, <a href="http://oss.netshadow.at/oss/phpfspot/Project" target="_blank">phpfspot</a>
-      <hr />
-      <a href="http://wiki.bluga.net/HTML_AJAX/HomePage">HTML_AJAX</a>
-      <hr />
-      PHP tag-cloud code by <a href="http://prism-perfect.net/archive/php-tag-cloud-tutorial/">Jenny Ferenc</a>.
-      <hr />
-      F-Spot database version: {$db_version}
-     </td>
-    </tr>
-   </table>
-   </div>
-  </td>
- </tr>
-</table>
-<!-- /Single photo -->
+<div class="index_header">
+ <b>{$product} {$version}</b><br />
+</div>
+<div id='matrix' style="margin-top: 10px; margin-left: 10px;">
+ by Andreas Unterkircher<br />
+ Licensed under GPLv3, <a href="http://oss.netshadow.at/oss/phpfspot/Project" target="_blank">phpfspot</a>
+ <hr />
+ <a href="http://wiki.bluga.net/HTML_AJAX/HomePage">HTML_AJAX</a>
+ <hr />
+ PHP tag-cloud code by <a href="http://prism-perfect.net/archive/php-tag-cloud-tutorial/">Jenny Ferenc</a>.
+ <hr />
+ F-Spot database version: {$db_version}
+</div>
diff --git a/themes/default/templates/export.tpl b/themes/default/templates/export.tpl
index 14354b7..3647863 100644
--- a/themes/default/templates/export.tpl
+++ b/themes/default/templates/export.tpl
@@ -1,21 +1,14 @@
 {include file="header.tpl"}
  <body>
   <div id="frame">
-  <table>
-   <tr>
-    <td>
-     <form action="javascript:#" onsubmit="setViewMode(document.getElementsByName('format')[0].options[document.getElementsByName('format')[0].selectedIndex].value); return false;">
-      <select name="format">
-       <option value="HTML">HTML</option>
-       <option value="MoinMoin">MoinMoin Wiki</option>
-       <option value="MoinMoinList">MoinMoin Wiki List</option>
-      </select>
-      <input type="image" src="resources/doit.png" alt="Switch View" />
-     </form>
-     <div id="output"></div>
-    </td>
-   </tr>
-  </table>
-  </div>
+  <form action="javascript:#" onsubmit="setViewMode(document.getElementsByName('format')[0].options[document.getElementsByName('format')[0].selectedIndex].value); return false;">
+   <select name="format">
+    <option value="HTML">HTML</option>
+    <option value="MoinMoin">MoinMoin Wiki</option>
+    <option value="MoinMoinList">MoinMoin Wiki List</option>
+   </select>
+   <input type="image" src="resources/doit.png" alt="Switch View" />
+  </form>
+  <div id="output"></div>
  </body>
 {include file="footer.tpl"}
diff --git a/themes/default/templates/index.tpl b/themes/default/templates/index.tpl
index 791dd32..10459aa 100644
--- a/themes/default/templates/index.tpl
+++ b/themes/default/templates/index.tpl
@@ -22,20 +22,12 @@
   <span style="clear: both;">
   <!-- option column -->
   <div class="options" style="float: left;">
-   <table>
-    <tr>
-     <td>
-      {include file="search.tpl"}
-     </td>
-    </tr>
-    <tr>
-     <td>
-      <div id="tags">
-       {include file="tags.tpl"}
-      </div>
-     </td>
-    </tr>
-   </table>
+   <div>
+    {include file="search.tpl"}
+   </div>
+   <div id="tags">
+    {include file="tags.tpl"}
+   </div>
   </div>
   <!-- /option column -->
 
diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index 39df0c0..f4a38d2 100644
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -1,68 +1,59 @@
 <!-- Photo Index -->
-<table>
- <tr>
-  <td colspan="3">
-   <table style="width: 100%;">
-    <tr>
-     <td class="content_title">
-      <b>Photo Index</b>
-      {if $searchfor }
-       {if $count == 1}
-        {$count} image is the result for your search about "{$searchfor}".
-       {else}
-        {$count} images are the result for your search about "{$searchfor}".
-       {/if}
-      {elseif $tag_result}
-       {if $count == 1}
-        {$count} image has been found for the selected tags.
-       {else}
-        {$count} images have been found for the selected tags.
-       {/if}
-      {else}
-       {if $count == 1}
-        {$count} image has been found.
-       {else}
-        {$count} images have been found.
-       {/if}
-      {/if}
-      {if $from_date && $to_date }
-       Results are limited to a date within {$from_date} to {$to_date}.
-      {/if}
-     </td>
-     <td class="index_header" style="text-align: right">
-      {if $slideshow_link }
-       <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="resources/slideshow.png" /></a>
-      {/if}
-      {if $extern_link }
-       <a href="{$extern_link}" title="Use this link to return to the current view"><img src="resources/link.png" /></a>
-      {/if} 
-      <a href="{$export_link}" target="_blank" title="this will open a new browser window where you can export this page in several formats"><img src="resources/export.png" /></a>
-      <a href="{$rss_link}" target="_blank" title="RSS feed"><img src="resources/rss.png" /></a>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
- <tr>
-  <td colspan="3" style="width: 100%;">
-   <div id="matrix">
-   {section name="row" loop=$rows step=1}
-    {section name="col" loop=$columns step=1}
-      {if $images[row][col] }
-      <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[row][col]});" id="{$images[row][col]}" name="image{$img_id[row][col]}" class="thumblink" onclick="click(this);" title="{$img_title[row][col]}">
-        <img class="thumb" id="{$images[row][col]}" src="phpfspot_img.php?idx={$images[row][col]}&amp;width={$width}" alt="thumb_{$images[row][col]}" width="{$img_width[row][col]}" height="{$img_height[row][col]}" />
-        <br />
-        {$img_name[row][col]}
-       </a>
-      </div>
-      {/if}
-    {/section}
-   {/section} 
-   </div>
-  </td>
- </tr>
-</table>
+<div class="content_title" style="float: left;">
+ <b>Photo Index</b>
+ {if $searchfor }
+  {if $count == 1}
+   {$count} image is the result for your search about "{$searchfor}".
+  {else}
+   {$count} images are the result for your search about "{$searchfor}".
+  {/if}
+ {elseif $tag_result}
+  {if $count == 1}
+   {$count} image has been found for the selected tags.
+  {else}
+   {$count} images have been found for the selected tags.
+  {/if}
+ {else}
+  {if $count == 1}
+   {$count} image has been found.
+  {else}
+   {$count} images have been found.
+  {/if}
+ {/if}
+ {if $from_date && $to_date }
+  Results are limited to a date within {$from_date} to {$to_date}.
+ {/if}
+</div>
+<div class="index_header" style="text-align: right">
+ {if $slideshow_link }
+  <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="resources/slideshow.png" /></a>
+ {/if}
+ {if $extern_link }
+  <a href="{$extern_link}" title="Use this link to return to the current view"><img src="resources/link.png" /></a>
+ {/if} 
+ {if $export_link }
+  <a href="{$export_link}" target="_blank" title="this will open a new browser window where you can export this page in several formats"><img src="resources/export.png" /></a>
+ {/if}
+ {if $rss_link }
+  <a href="{$rss_link}" target="_blank" title="RSS feed"><img src="resources/rss.png" /></a>
+ {/if}
+</div>
+
+<div id="matrix">
+ {section name="row" loop=$rows step=1}
+  {section name="col" loop=$columns step=1}
+   {if $images[row][col] }
+    <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[row][col]});" id="{$images[row][col]}" name="image{$img_id[row][col]}" class="thumblink" onclick="click(this);" title="{$img_title[row][col]}">
+      <img class="thumb" id="{$images[row][col]}" src="phpfspot_img.php?idx={$images[row][col]}&amp;width={$width}" alt="thumb_{$images[row][col]}" width="{$img_width[row][col]}" height="{$img_height[row][col]}" />
+      <br />
+     {$img_name[row][col]}
+     </a>
+    </div>
+   {/if}
+  {/section}
+ {/section} 
+</div>
 <br class="clearboth" />
 <div style="width: 100%; margin-top: 20px;">
  <div style="float: left; margin: 0px; padding-left: 10px; width: 40px;">
diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl
index fa8d80e..960e7cf 100644
--- a/themes/default/templates/welcome.tpl
+++ b/themes/default/templates/welcome.tpl
@@ -1,16 +1,8 @@
 <!-- welcome -->
-<table style="width: 100%;">
- <tr>
-  <td class="index_header" style="text-align: left;">
-   phpfspot welcomes you to a dynamic photo gallery for <a href="http://f-spot.org" target="_blank">F-Spot</a><br />
-  </td>
- </tr>
- <tr>
-  <td>
-   <div style="padding: 10px; display: table; margin-left: 10px; margin-right: 10px; table-layout: fixed; border: hidden; border-spacing: 10px; border-collapse: separate;">
-   <table>
-    <tr>
-     <td>
+<div class="index_header" style="text-align: left;">
+ phpfspot welcomes you to a dynamic photo gallery for <a href="http://f-spot.org" target="_blank">F-Spot</a><br />
+</div>
+<div style="padding: 10px; display: table; margin-left: 10px; margin-right: 10px; table-layout: fixed; border: hidden; border-spacing: 10px; border-collapse: separate;">
 This application targets to provide an easy way, to presentate your F-Spot<br />
 pictures in the web, in a way where you do not need any of the current<br />
 web2.0 providers or setup complex apps like gallery<br />
@@ -19,11 +11,5 @@ You can addept this welcome page in the file "welcome.tpl" in the template<br />
 directory. ;)
 <br /><br />
 <a href="javascript:showPhotoIndex();">[ Click here to take a look at your photo index or select a tag from the list on the left ]</a>
-     </td>
-    </tr>
-   </table>
-   </div>
-  </td>
- </tr>
-</table>
+</div>
 <!-- /welcome -->
author	Andreas Unterkircher <unki@netshadow.at>	2008-01-05 19:53:15 +0100
committer	Andreas Unterkircher <unki@netshadow.at>	2008-01-06 08:21:39 +0100
commit	35efccbba53481402a9146911bb786781c1e3dc3 (patch)
tree	f7479f63c63e80e1b256a1b2a15c6ee515079cc8 /themes/default
parent	3face190fc281981026fe48fb80cea007a2e841b (diff)