diff options
| -rw-r--r-- | themes/default/stylesheet.css | 8 | ||||
| -rw-r--r-- | themes/default/templates/credits.tpl | 4 | ||||
| -rw-r--r-- | themes/default/templates/photo_index.tpl | 72 | ||||
| -rw-r--r-- | themes/default/templates/single_photo.tpl | 42 | ||||
| -rw-r--r-- | themes/default/templates/welcome.tpl | 2 |
5 files changed, 63 insertions, 65 deletions
diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css index 0918848..7550311 100644 --- a/themes/default/stylesheet.css +++ b/themes/default/stylesheet.css @@ -84,19 +84,13 @@ td.searchfor { font-weight: bolder; } -td.index_header,div.index_header { +div.header { background-color: #eeeeee; padding: 10px; vertical-align: middle; white-space: nowrap; } -td.content_title,div.content_title { - background-color: #eeeeee; - padding: 10px; - vertical-align: middle; -} - img { border: none; } diff --git a/themes/default/templates/credits.tpl b/themes/default/templates/credits.tpl index a940b03..ce9feb8 100644 --- a/themes/default/templates/credits.tpl +++ b/themes/default/templates/credits.tpl @@ -1,7 +1,7 @@ -<div class="index_header"> +<div class="header"> <b>{$product} {$version}</b><br /> </div> -<div id='matrix' style="margin-top: 10px; margin-left: 10px;"> +<div 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 /> diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl index f4a38d2..05d0ecd 100644 --- a/themes/default/templates/photo_index.tpl +++ b/themes/default/templates/photo_index.tpl @@ -1,45 +1,47 @@ <!-- Photo Index --> -<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}". +<div class="header"> + <div 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} - {$count} images are the result for your search about "{$searchfor}". + {if $count == 1} + {$count} image has been found. + {else} + {$count} images have been found. + {/if} {/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 $from_date && $to_date } + Results are limited to a date within {$from_date} to {$to_date}. {/if} - {else} - {if $count == 1} - {$count} image has been found. - {else} - {$count} images have been found. + </div> + <div style="text-align: right"> + {if $slideshow_link } + <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="resources/slideshow.png" /></a> {/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} + {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> -<div id="matrix"> +<div> {section name="row" loop=$rows step=1} {section name="col" loop=$columns step=1} {if $images[row][col] } diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl index c87118a..39e3bf4 100644 --- a/themes/default/templates/single_photo.tpl +++ b/themes/default/templates/single_photo.tpl @@ -1,26 +1,28 @@ <!-- Single photo --> -<div class="content_title" style="text-align: left; float: left;"> - <b>Photo {$image_name}</b><br /> - {if $photo_count > 0} - {$photo_number} of {$photo_count} - {if $photo_count == 1} - Photo - {else} - Photos +<div class="header"> + <div style="text-align: left; float: left;"> + <b>Photo {$image_name}</b><br /> + {if $photo_count > 0} + {$photo_number} of {$photo_count} + {if $photo_count == 1} + Photo + {else} + Photos + {/if} + {if $description} + {$description}<br /> + {/if} {/if} - {if $description} - {$description}<br /> + </div> + <div style="text-align: right;"> + <a href="javascript:startAutoBrowse();" title="auto browsing"><img id="autobrowse_ico" src="resources/32_play.png" /></a> + {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} -</div> -<div class="index_header" style="text-align: right;"> - <a href="javascript:startAutoBrowse();" title="auto browsing"><img id="autobrowse_ico" src="resources/32_play.png" /></a> - {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="{$image_url_full}" target="_blank" onclick="click(this);"> - <img src="resources/original.png" alt="original resolution" /> - </a> + <a href="{$image_url_full}" target="_blank" onclick="click(this);"> + <img src="resources/original.png" alt="original resolution" /> + </a> + </div> </div> <div> diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl index 832e306..12414b6 100644 --- a/themes/default/templates/welcome.tpl +++ b/themes/default/templates/welcome.tpl @@ -1,5 +1,5 @@ <!-- welcome --> -<div class="index_header" style="text-align: left;"> +<div class="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; margin-left: 10px; margin-right: 10px;"> |