From ea7c5f379929222119df54f0f0a9af008bce4d30 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 27 Apr 2008 09:47:40 -0700 Subject: edited tool tips for links in single_image Signed-off-by: Arun Persaud --- themes/default/templates/single_photo.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'themes/default') diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl index a16776e..78e489d 100644 --- a/themes/default/templates/single_photo.tpl +++ b/themes/default/templates/single_photo.tpl @@ -16,13 +16,13 @@
- + {if $extern_link } {/if} - + original resolution
-- cgit v1.2.3-18-g5258 From fc6775ae5b69f566dcc32aa765e47ab6229c9abb Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Thu, 8 May 2008 21:27:46 -0700 Subject: cleanup: moved more CSS into the stylesheet started separating the CSS from the templates. Signed-off-by: Arun Persaud --- themes/default/stylesheet.css | 37 ++++++++++++++++++++++++++++++++++ themes/default/templates/search.tpl | 4 ++-- themes/default/templates/slideshow.tpl | 6 +++--- themes/default/templates/tags.tpl | 4 ++-- themes/default/templates/welcome.tpl | 28 ++++++++++++------------- 5 files changed, 58 insertions(+), 21 deletions(-) (limited to 'themes/default') diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css index 7771736..8fbee2f 100644 --- a/themes/default/stylesheet.css +++ b/themes/default/stylesheet.css @@ -55,6 +55,10 @@ div.searchfor { border-bottom: solid 1px #000000; } +div.searchfor td.nowrap { + white-space: nowrap; +} + .menu { position: absolute; left: 0px; @@ -81,6 +85,7 @@ div.header { padding: 10px; vertical-align: middle; white-space: nowrap; + text-align: left; } div.subheader { @@ -90,6 +95,19 @@ div.subheader { white-space: nowrap; } +div.welcome { + padding: 10px; + margin-left: 10px; + margin-right: 10px; +} + +div.welcome div { + float: left; + padding-right: 10px; + width: 150px; + text-align: center; +} + img { border: none; } @@ -192,6 +210,11 @@ div.thumb a.thumblink:hover { line-height: 21px; } +span.tags { + vertical-align: middle; + text-decoration: underline; +} + table.calendar tr td { border: solid 1px #ffffff; padding: 1px; @@ -225,6 +248,16 @@ table.calendar tr td { vertical-align: middle; } +#slide_close { + margin: 0 auto; + padding: 10px; +} + +#slide_close img { + padding: 15px; + background-color: #000000; +} + input.submit,input.checkbox { background-color: transparent; border: 0px; @@ -236,3 +269,7 @@ input, select, textarea { border: 1px solid #888888; border-collapse: collapse; } + +#slider-1{ + margin: 0 auto; +} \ No newline at end of file diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl index f983c40..18d1f40 100644 --- a/themes/default/templates/search.tpl +++ b/themes/default/templates/search.tpl @@ -1,4 +1,4 @@ - + loupeSearch:
@@ -39,7 +39,7 @@ Date: - + { if ! $date_search_enabled } { else } diff --git a/themes/default/templates/slideshow.tpl b/themes/default/templates/slideshow.tpl index c5e8ba5..22c86a8 100644 --- a/themes/default/templates/slideshow.tpl +++ b/themes/default/templates/slideshow.tpl @@ -10,13 +10,13 @@ -
+ -
+
diff --git a/themes/default/templates/tags.tpl b/themes/default/templates/tags.tpl index 326c095..e4b04a8 100644 --- a/themes/default/templates/tags.tpl +++ b/themes/default/templates/tags.tpl @@ -1,8 +1,8 @@ - + available tagsAvailable Tags:
- + selected tagsSelected Tags:   diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl index 4629fda..7edda55 100644 --- a/themes/default/templates/welcome.tpl +++ b/themes/default/templates/welcome.tpl @@ -1,35 +1,35 @@ -
+
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 -
+


-
- -
+

+ +
You can adapt this welcome page in the file "welcome.tpl" in the template
directory of your current theme. -
+


-
- -
+

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

-- cgit v1.2.3-18-g5258 From d774bea5f0bc063be6426668e19faf02167f3d65 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sat, 10 May 2008 09:40:29 -0700 Subject: cleanup: moved more CSS into the stylesheet almost everything in the stylesheet now Signed-off-by: Arun Persaud --- themes/default/stylesheet.css | 54 +++++++++++++++++++++++++++++++ themes/default/templates/credits.tpl | 2 +- themes/default/templates/photo_index.tpl | 16 ++++----- themes/default/templates/single_photo.tpl | 10 +++--- 4 files changed, 68 insertions(+), 14 deletions(-) (limited to 'themes/default') diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css index 8fbee2f..9457a80 100644 --- 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 ba772a1..2bc7b28 100644 --- a/themes/default/templates/credits.tpl +++ b/themes/default/templates/credits.tpl @@ -1,7 +1,7 @@
{$product} {$version}
-
+
by Andreas Unterkircher
Licensed under GPLv3, phpfspot
diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl index c01c6af..413ec26 100644 --- a/themes/default/templates/photo_index.tpl +++ b/themes/default/templates/photo_index.tpl @@ -1,6 +1,6 @@
-
+
Photo Index {if $searchfor } {if $count == 1} @@ -26,7 +26,7 @@ Results are limited to a date within {$from_date} to {$to_date}. {/if}
-
+
{if $slideshow_link } {/if} @@ -42,9 +42,9 @@
{ if $tag_result } -
+
-
+
Tags:
{ $selected_tags } @@ -74,10 +74,10 @@

-
+
-
+
{ if $next_url == "" } { if $count != 0 } last page reached @@ -90,7 +90,7 @@
-
+
{ if $previous_url == "" } { if $count != 0 } first page reached @@ -103,7 +103,7 @@
-
+
{ if $page_selector != "" } {$page_selector} { /if} diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl index 78e489d..b6cdecb 100644 --- a/themes/default/templates/single_photo.tpl +++ b/themes/default/templates/single_photo.tpl @@ -1,6 +1,6 @@
-
+
Photo {$image_name}
{if $photo_count > 0} {$photo_number} of {$photo_count} @@ -14,7 +14,7 @@ {/if} {/if}
-
+
@@ -29,7 +29,7 @@
-
+
{ if $ExifMadeWith } camera icon Image taken with:
{$ExifMadeWith}
@@ -67,7 +67,7 @@ -
+
{ if $next_url == "" } { else } @@ -79,7 +79,7 @@ -
+
{ if $previous_url == "" } first photo reached { else } -- cgit v1.2.3-18-g5258 From 7731c49b82089c7b62cc70f84edbae0d39f54fd3 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sat, 10 May 2008 10:02:09 -0700 Subject: cleanup: worked a bit on valid html the validator still shows some errors, but most are gone Signed-off-by: Arun Persaud --- themes/default/stylesheet.css | 2 +- themes/default/templates/header.tpl | 2 +- themes/default/templates/index.tpl | 6 +++--- themes/default/templates/search.tpl | 10 +++++----- themes/default/templates/welcome.tpl | 22 +++++++++++----------- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'themes/default') diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css index 9457a80..9fe2c4e 100644 --- a/themes/default/stylesheet.css +++ b/themes/default/stylesheet.css @@ -150,7 +150,7 @@ div.welcome { margin-right: 10px; } -div.welcome div { +div.welcome span { float: left; padding-right: 10px; width: 150px; diff --git a/themes/default/templates/header.tpl b/themes/default/templates/header.tpl index e946a5b..39b42ca 100644 --- a/themes/default/templates/header.tpl +++ b/themes/default/templates/header.tpl @@ -15,7 +15,7 @@ { /if } { if $use_autocomplete } - + { /if } diff --git a/themes/default/templates/index.tpl b/themes/default/templates/index.tpl index 0bd7a7b..87c58b9 100644 --- a/themes/default/templates/index.tpl +++ b/themes/default/templates/index.tpl @@ -4,7 +4,7 @@
-   Loading... + Loading...  Loading...
@@ -25,7 +25,7 @@
- +
@@ -41,6 +41,6 @@
{include file="welcome.tpl"}
- +
{include file="footer.tpl"} diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl index 18d1f40..77ed7ad 100644 --- a/themes/default/templates/search.tpl +++ b/themes/default/templates/search.tpl @@ -12,7 +12,7 @@ { literal }