From 35efccbba53481402a9146911bb786781c1e3dc3 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 5 Jan 2008 19:53:15 +0100 Subject: [PATCH] issue59, remove HTML table from main skeleton Signed-off-by: Andreas Unterkircher --- themes/default/templates/credits.tpl | 42 +++----- themes/default/templates/export.tpl | 25 ++--- themes/default/templates/index.tpl | 20 ++-- themes/default/templates/photo_index.tpl | 119 +++++++++++------------ themes/default/templates/welcome.tpl | 24 +---- 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 @@ - - - - - - - - -

- {$product} {$version}
-

- - - - -

- by Andreas Unterkircher
- Licensed under GPLv3, phpfspot -

- HTML_AJAX -

- PHP tag-cloud code by Jenny Ferenc. -

- F-Spot database version: {$db_version} -

- +

+ {$product} {$version}
+

+ by Andreas Unterkircher
+ Licensed under GPLv3, phpfspot +

+ HTML_AJAX +

+ PHP tag-cloud code by Jenny Ferenc. +

+ F-Spot database version: {$db_version} +

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"}

- - - - -

- -

+ +

{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 @@

- - - - - - - -

- {include file="search.tpl"} -

- {include file="tags.tpl"} -

+ {include file="search.tpl"} +

+ {include file="tags.tpl"} +

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 - {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} -

- {if $slideshow_link } -

- {/if} - {if $extern_link } -

- {/if} -

- {section name="row" loop=$rows step=1} - {section name="col" loop=$columns step=1} - {if $images[row][col] } -

- - $thumb_{$images[row][col]}$ -
- {$img_name[row][col]} - -

- {/if} - {/section} - {/section} -

+ Photo Index + {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} +

+ {if $slideshow_link } +

+ {/if} + {if $extern_link } +

+ {/if} + {if $export_link } +

+ {/if} + {if $rss_link } +

+ {/if} +

+ +

+ {section name="row" loop=$rows step=1} + {section name="col" loop=$columns step=1} + {if $images[row][col] } +

+ + $thumb_{$images[row][col]}$ +
+ {$img_name[row][col]} + +

+ {/if} + {/section} + {/section} +

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 @@ - - - - - - - -

- phpfspot welcomes you to a dynamic photo gallery for F-Spot
-

- - - - -

+ phpfspot welcomes you to a dynamic photo gallery for F-Spot
+

This application targets to provide an easy way, to presentate your F-Spot
pictures in the web, in a way where you do not need any of the current
web2.0 providers or setup complex apps like gallery
@@ -19,11 +11,5 @@ You can addept this welcome page in the file "welcome.tpl" in the template
directory. ;)

[ Click here to take a look at your photo index or select a tag from the list on the left ] -

-- 2.17.1