aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvdigital <vdigital@piwigo.org>2008-10-02 18:39:35 +0000
committervdigital <vdigital@piwigo.org>2008-10-02 18:39:35 +0000
commit89bcc54ad71027aafc2651135184414bd56b8e2d (patch)
treeb9aec030cf626b0797d6284ce58e5b74ec5aafbb
parentc8306bc746fc33f34c8eff0336d133e8eccf8632 (diff)
Random picture had double border with <p> Caption </p>.
Random caption is limited to 127 characters above and 255 below. git-svn-id: http://piwigo.org/svn/trunk@2638 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--plugins/AMenuManager/menu_templates/menubar_randompic.tpl7
-rw-r--r--template/yoga/theme/Sylvia/theme.css2
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/AMenuManager/menu_templates/menubar_randompic.tpl b/plugins/AMenuManager/menu_templates/menubar_randompic.tpl
index 20d7a0bf8..f45fd3737 100644
--- a/plugins/AMenuManager/menu_templates/menubar_randompic.tpl
+++ b/plugins/AMenuManager/menu_templates/menubar_randompic.tpl
@@ -4,9 +4,12 @@
<dd>
<div class="illustration" style="text-align:center;padding:5px;font-size:85%;">
{if $block->data.IMGNAME!="" and $block->data.SHOWNAME=="o"}{$block->data.IMGNAME}<br/>{/if}
- {if $block->data.IMGCOMMENT!="" and $block->data.SHOWCOMMENT=="o"}{$block->data.IMGCOMMENT}<br/>{/if}
+ {* No strip_tags because comment could have those for good reasons *}
+ {* Over comment is limited to 127 characters for look only *}
+ {if $block->data.IMGCOMMENT!="" and $block->data.SHOWCOMMENT=="o" and strlen($block->data.IMGCOMMENT) < 128}{$block->data.IMGCOMMENT}<br/>{/if}
<a href="{$block->data.LINK}"><img src="{$block->data.IMG}"/></a>
{if $block->data.IMGNAME!="" and $block->data.SHOWNAME=="u"}<br/>{$block->data.IMGNAME}{/if}
- {if $block->data.IMGCOMMENT!="" and $block->data.SHOWCOMMENT=="u"}<br/>{$block->data.IMGCOMMENT}{/if}
+ {* Under comment is limited to 255 characters *}
+ {if $block->data.IMGCOMMENT!="" and $block->data.SHOWCOMMENT=="u" and strlen($block->data.IMGCOMMENT) < 256}<br/>{$block->data.IMGCOMMENT}{/if}
</div>
</dd> \ No newline at end of file
diff --git a/template/yoga/theme/Sylvia/theme.css b/template/yoga/theme/Sylvia/theme.css
index 4f29ca988..5f64ff3a0 100644
--- a/template/yoga/theme/Sylvia/theme.css
+++ b/template/yoga/theme/Sylvia/theme.css
@@ -23,7 +23,7 @@ margin:0 0 5px 40px; padding:0; width: 231px; min-width: 231px; border: 0; min-h
#menubar DT { background-color:#111; border:0; display:inline; margin-left:8px; text-align:left; }
#menubar DD { background:transparent url(images/menuBox_bottom.gif) no-repeat scroll left bottom;
margin:14px 0 0 0; padding:0 0 22px; width: 231px; min-width: 231px; border: 0; overflow-x: hidden;}
-#menubar UL, #menubar p,
+#menubar UL, #menubar #mbCategories p,
#menubar .illustration { background:transparent url(images/menuBox_sides.gif) repeat-y scroll left bottom;
margin:0; }
#menubar DT A { font-size: 100%; }