From 621ed0b391f81bb7d636d1e447154e1f5b43fb24 Mon Sep 17 00:00:00 2001 From: rvelices Date: Mon, 3 Jan 2011 20:47:15 +0000 Subject: - css sprites - attempt to auto align plugin image links on the index page and picture pages - css sprites - a couple of rel nofolloz dissapeared - hide the flat icon if there are no sub albums for the current album git-svn-id: http://piwigo.org/svn/trunk@8463 68402e56-0260-453c-a942-63ccdbb3a9ee --- index.php | 5 +++++ themes/default/iconset.css | 3 ++- themes/default/template/index.tpl | 4 ++-- themes/default/template/tags.tpl | 2 +- themes/default/theme.css | 5 ----- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index f253ac120..39a73cd26 100644 --- a/index.php +++ b/index.php @@ -261,6 +261,11 @@ if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['co // include menubar include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); +if ( isset($page['category']['count_categories']) and $page['category']['count_categories']==0 ) +{// count_categories might be computed by menubar - if the case unassign flat link if no sub albums + $template->clear_assign('U_MODE_FLAT'); +} + //------------------------------------------------------ main part : thumbnails if ( 0==$page['start'] and !isset($page['flat']) diff --git a/themes/default/iconset.css b/themes/default/iconset.css index b0452256e..3af5b40ba 100644 --- a/themes/default/iconset.css +++ b/themes/default/iconset.css @@ -2,6 +2,7 @@ display: inline-block; /*IE6 does not get this correctly*/ text-indent: -9999px; overflow: hidden; background-repeat: no-repeat; width: 26px; height: 26px; background-image: url(s26/outline_808080.png); + vertical-align: bottom; } .pwg-button-text { display:none; } @@ -13,7 +14,7 @@ .pwg-button { display: inline-block; - vertical-align: middle; + vertical-align: top; } .pwg-icon-home {background-position: -26px 0} diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 14d63ab18..aabe8f2b9 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -51,12 +51,12 @@ {/if} {if isset($U_MODE_POSTED)} -
  • +
  •  {'Calendar'|@translate}
  • {/if} {if isset($U_MODE_CREATED)} -
  • +
  •  {'Calendar'|@translate}
  • {/if} diff --git a/themes/default/template/tags.tpl b/themes/default/template/tags.tpl index 820e3ee69..b0f3f4d64 100644 --- a/themes/default/template/tags.tpl +++ b/themes/default/template/tags.tpl @@ -8,7 +8,7 @@ {/if} {if $display_mode == 'cloud'} -
  • +
  •  {'letters'|@translate}
  • {/if} diff --git a/themes/default/theme.css b/themes/default/theme.css index e8c62dbe3..2de359b4f 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -132,11 +132,6 @@ display: inline; } -/*following rule not used directly but it is there for plugins*/ -.categoryActions IMG { - margin-bottom: -5px; -} - /* begin chronology/calendar elements*/ .content .calendarViews { display: block; -- cgit v1.2.3