From 324a4a112ac4a883f086372c8053c0021a4380d4 Mon Sep 17 00:00:00 2001 From: vdigital Date: Fri, 19 Sep 2008 19:38:15 +0000 Subject: [PATCH] =?UTF-8?q?Index=20page:=20Scrolling=20start=20above=20the?= =?UTF-8?q?=20category=20when=20description=20is=20too=20long.=20Sql=20Tra?= =?UTF-8?q?ce=20in=20a=20
=20clear:both.=20French=20de-=C3=A0=20=3D>?= =?UTF-8?q?=20du-au?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://piwigo.org/svn/trunk@2550 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/template/goto/theme/roma/theme.css | 5 +++-- language/fr_FR/common.lang.php | 2 +- .../samples/titling_categories.tpl | 19 ++++++++++++------- template/yoga/default-layout.css | 3 ++- template/yoga/footer.tpl | 10 +++++++--- template/yoga/mainpage_categories.tpl | 1 - template/yoga/theme/Sylvia/theme.css | 12 ++++++++++-- 7 files changed, 35 insertions(+), 17 deletions(-) diff --git a/admin/template/goto/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css index be8306ae3..68f938a67 100644 --- a/admin/template/goto/theme/roma/theme.css +++ b/admin/template/goto/theme/roma/theme.css @@ -114,7 +114,6 @@ padding:0; width:207px; z-index:99; text-align: left; } scrollbar-face-color: #222; scrollbar-shadow-color: #444; scrollbar-highlight-color: #000; scrollbar-3dlight-color: #292929; scrollbar-darkshadow-color: #333; scrollbar-track-color: #111; scrollbar-arrow-color: #ff3333; } -html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers */ #menubar .selected a { color: #f70; } #menubar .selected a:hover { color: #f36; border-bottom: 1px solid #f33;} #menubar dd { @@ -134,4 +133,6 @@ color: #F70; border-bottom: 1px dotted #F70;} #menubar li.external { list-style-image:url(images/external_inactive.png); padding:10px 0px 0pt 10px; } #menubar li.external:hover { list-style-image:url(images/external_active.png); } #menubar ul { color: #333; margin:10px 0pt 3px 9px; - list-style-type: square; list-style-position: inside; padding: 0 0 0 2px; } \ No newline at end of file + list-style-type: square; list-style-position: inside; padding: 0 0 0 2px; } +/* hacks */ +html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers */ \ No newline at end of file diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php index 466c34d46..5082f2719 100644 --- a/language/fr_FR/common.lang.php +++ b/language/fr_FR/common.lang.php @@ -343,7 +343,7 @@ $lang['Administrator, webmaster and special user cannot use this method'] = 'Adm $lang['reg_err_mail_address_dbl'] = 'un utilisateur utilise déjà cette adresse e-mail'; $lang['Category results for'] = 'Résultats des catégories pour'; $lang['Tag results for'] = 'Résultats des tags pour'; -$lang['from %s to %s'] = 'de %s à %s'; +$lang['from %s to %s'] = 'du %s au %s'; $lang['start_play'] = 'Lecture du diaporama'; $lang['stop_play'] = 'Pause du diaporama'; $lang['start_repeat'] = 'Répeter le diaporama'; diff --git a/template-extension/distributed/samples/titling_categories.tpl b/template-extension/distributed/samples/titling_categories.tpl index 83040e3bc..717390913 100644 --- a/template-extension/distributed/samples/titling_categories.tpl +++ b/template-extension/distributed/samples/titling_categories.tpl @@ -6,10 +6,15 @@ {if !empty($category_thumbnails)} {html_head} {/html_head}
-
- {if isset($cat.INFO_DATES) } + {if isset($cat.INFO_DATES) }

{$cat.INFO_DATES}

- {/if} -

{$cat.CAPTION_NB_IMAGES}

+ {/if} +
+

{$cat.CAPTION_NB_IMAGES}

{if not empty($cat.DESCRIPTION)}

{$cat.DESCRIPTION}

{/if} diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css index 6c2981411..29805b4a1 100644 --- a/template/yoga/default-layout.css +++ b/template/yoga/default-layout.css @@ -273,4 +273,5 @@ TABLE.tagLetterContent { font-size:80%; border-collapse : collapse; } -#theHeader {text-align: center;} \ No newline at end of file +#theHeader {text-align: center;} +#debug { margin: 15px 15px 5px 248px; font-size:12px; clear: both; word-wrap:break-word;} \ No newline at end of file diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl index a44260184..fdc0c92cf 100644 --- a/template/yoga/footer.tpl +++ b/template/yoga/footer.tpl @@ -19,14 +19,18 @@ {'Webmaster'|@translate} {/if} -
+ {if isset($footer_elements)} {foreach from=$footer_elements item=v} {$v} {/foreach} {/if}
- -{if isset($debug.QUERIES_LIST)}{$debug.QUERIES_LIST}{/if} +{if isset($debug.QUERIES_LIST)} +
+{$debug.QUERIES_LIST} +
+{/if} +
\ No newline at end of file diff --git a/template/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl index 0159bf6a4..9c810600b 100644 --- a/template/yoga/mainpage_categories.tpl +++ b/template/yoga/mainpage_categories.tpl @@ -28,4 +28,3 @@ {/foreach} - diff --git a/template/yoga/theme/Sylvia/theme.css b/template/yoga/theme/Sylvia/theme.css index 851a755f3..18df98a8a 100644 --- a/template/yoga/theme/Sylvia/theme.css +++ b/template/yoga/theme/Sylvia/theme.css @@ -1,6 +1,8 @@ /* $Id$ */ -.content div.thumbnailCategory div.illustration { width:190px !important; /* Usable range 162px-360px , optimal : Thumbnail width + 40px */ } +.content div.thumbnailCategory div.illustration { width:165px !important; /* Usable range 162px-360px , optimal : Thumbnail width + 40px */ } .content div.thumbnailCategory { height: 180px !important; /* Usable range 172px-250px , optimal : Thumbnail height + 30px */ } +.content div.thumbnailCategory div.description .text { height: 130px !important; /* -42px than previous one */ } + /* Sylvia Theme is close to the Roma Admin theme */ BODY, H1, H3, DT, INPUT.rateButtonSelected { color:#ddd; } H2, #menubar DT { color: #666; } @@ -52,7 +54,13 @@ padding: 0; margin:0; } padding: 0 0 0 10px; margin: 0; } .content .thumbnailCategory div.illustration a { display: block; margin: 0; padding:20px 0 0 8px; } #content .thumbnailCategory div.description { background:transparent url(images/cat_top-right.gif) no-repeat scroll right top; -margin:0; padding:15px 10px 3px 0; overflow: hidden; } +margin: 0; padding:15px 10px 3px 0; overflow: hidden; } +#content .thumbnailCategory div.description .text { margin: 10px 2px 0 0; padding:-10px 0 5px 0; +overflow: auto; overflow-x: hidden; /* Only IE family supports colored scrollbar */ + scrollbar-face-color: #222; scrollbar-shadow-color: #444; scrollbar-highlight-color: #000; + scrollbar-3dlight-color: #292929; scrollbar-darkshadow-color: #333; scrollbar-track-color: #111; + scrollbar-arrow-color: #f70; } +.content div.thumbnailCategory div.description p.dates { margin: 0 15px 0 15px; text-align: right; } #content.content .thumbnailCategory div.description H3 { display: block; margin: 0; } #content ul.thumbnailCategories li:hover { background-color:#111; } #imageHeaderBar .imageNumber { margin-right:170px; }