From: Andreas Unterkircher Date: Sun, 11 May 2008 07:42:36 +0000 (+0200) Subject: fix conflicts during merge of Arun's tree X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d97a057346bebb98be293d903a86987273cbee3e;p=phpfspot.git fix conflicts during merge of Arun's tree Signed-off-by: Andreas Unterkircher --- d97a057346bebb98be293d903a86987273cbee3e diff --cc themes/default/stylesheet.css index d67f3ac,9fe2c4e..93e56b7 --- a/themes/default/stylesheet.css +++ b/themes/default/stylesheet.css @@@ -245,3 -323,7 +323,7 @@@ input, select, textarea border: 1px solid #888888; border-collapse: collapse; } + + #slider-1{ + margin: 0 auto; -} ++} diff --cc themes/default/templates/header.tpl index 1cd9cb4,39b42ca..c1d7a0c --- a/themes/default/templates/header.tpl +++ b/themes/default/templates/header.tpl @@@ -3,19 -3,19 +3,19 @@@ {$page_title} - - - - - + + + + + { if $use_lightbox } - - - - + + + + { /if } { if $use_autocomplete } - - - ++ + { /if } diff --cc themes/default/templates/index.tpl index 46effe2,87c58b9..694f86a --- a/themes/default/templates/index.tpl +++ b/themes/default/templates/index.tpl @@@ -4,7 -4,7 +4,7 @@@
-   Loading... - Loading...  Loading... ++ Loading...  Loading...
@@@ -39,8 -39,8 +39,8 @@@
- {include file="welcome.tpl"} + { $initial_content }
- + {include file="footer.tpl"} diff --cc themes/default/templates/photo_index.tpl index 2c1b6ac,413ec26..2dedf86 --- a/themes/default/templates/photo_index.tpl +++ b/themes/default/templates/photo_index.tpl @@@ -1,9 -1,6 +1,9 @@@ + + +
-
+
Photo Index {if $searchfor } {if $count == 1} @@@ -29,29 -26,25 +29,29 @@@ Results are limited to a date within {$from_date} to {$to_date}. {/if}
-
+
{if $slideshow_link } - +  Slideshow {/if} {if $extern_link } - +  External Link {/if} {if $export_link } - +  Export {/if} {if $rss_link } - +  RSS-Feed {/if}
+ + + { if $tag_result } -
+
-
+
Tags:
{ $selected_tags } @@@ -83,13 -74,13 +83,13 @@@

-
+
-
+
{ if $next_url == "" } { if $count != 0 } - last page reached + last page reached { /if } { else } @@@ -99,10 -90,10 +99,10 @@@
-
+
{ if $previous_url == "" } { if $count != 0 } - first page reached + first page reached { /if } { else } diff --cc themes/default/templates/search.tpl index ca7042e,77ed7ad..401d9af --- a/themes/default/templates/search.tpl +++ b/themes/default/templates/search.tpl @@@ -1,5 -1,5 +1,5 @@@ - + - loupeSearch: + loupeSearch:
@@@ -51,15 -51,15 +51,15 @@@   - {$from_date} - {$from_date} from ++ {$from_date} from   - {$to_date} - {$to_date} to ++ {$to_date} to - + diff --cc themes/default/templates/single_photo.tpl index bf3051c,b6cdecb..571b524 --- a/themes/default/templates/single_photo.tpl +++ b/themes/default/templates/single_photo.tpl @@@ -29,9 -29,9 +29,9 @@@
-
+
{ if $ExifMadeWith } - camera icon Image taken with:
+ camera icon Image taken with:
{$ExifMadeWith}
{ /if } { if $ExifMadeOn } @@@ -67,11 -67,11 +67,11 @@@ -
+
{ if $next_url == "" } - + { else } - + { /if } {$image_filename} @@@ -79,22 -79,22 +79,22 @@@ -
+
{ if $previous_url == "" } - first photo reached + first photo reached { else } - - previous photo + + previous photo { /if } - - photo index + + photo index { if $next_url == "" } - last photo reached + last photo reached { else } - - next photo + + next photo { /if}
diff --cc themes/default/templates/slideshow.tpl index 84b6a6b,22c86a8..9a8f1fe --- a/themes/default/templates/slideshow.tpl +++ b/themes/default/templates/slideshow.tpl @@@ -1,18 -1,18 +1,18 @@@ {include file="header.tpl"} - - - - + + + +
- - - - + + + +
-
+ diff --cc themes/default/templates/tags.tpl index f0e3a47,e4b04a8..817cfbc --- a/themes/default/templates/tags.tpl +++ b/themes/default/templates/tags.tpl @@@ -1,9 -1,9 +1,9 @@@ - + - available tagsAvailable Tags: + available tagsAvailable Tags: -
+
{ $preset_available_tags }
- + - selected tagsSelected Tags: + selected tagsSelected Tags:   || diff --cc themes/default/templates/welcome.tpl index 6e6613c,fbb21a1..073af00 --- a/themes/default/templates/welcome.tpl +++ b/themes/default/templates/welcome.tpl @@@ -1,35 -1,35 +1,35 @@@ -
+
phpfspot welcomes you to a dynamic photo gallery for F-Spot
-
+
-
- -
-
+

+ - random image ++ random image + 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 -

+

-
+
-
- -
-
+

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

+

-
+
-
- -
- +