Changeset 21516

Timestamp:

Mar 12, 2013, 3:36:26 PM (11 years ago)

Author:

flop25

Message:

bug correction
-no custom color on picture page
-the number of total pages was wrong in the navigation bar (will be improved on 2.5.1 piwigo update)

navigation bar for thumbs slightly improved

Location:

extensions/stripped_black_bloc

Files:

• local_head.tpl (modified) (3 diffs)
• template/navigation_bar.tpl (modified) (1 diff)
• theme.css (modified) (3 diffs)

extensions/stripped_black_bloc/local_head.tpl

@@ -1 @@
-{if ($BODY_ID=='theCategoryPage')}
-{combine_script id='jquery.isotope' load='header' require='jquery' path='themes/stripped_black_bloc/js/isotope.js'}
-{combine_script id='jquery.cookie' load='header' require='jquery' path='themes/stripped_black_bloc/js/jquery.ck.min.js'}
-{assign var='one_column' value=$stripped_black_bloc.thumbnail_width}
-{assign var='two_columns' value=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width}
-{assign var='three_columns' value=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width}
 {html_style}{literal}
 .bloc {
@@ -15 +9 @@
   border: 1.5px solid #{/literal}{$stripped_black_bloc.color_main}{literal};
   margin:-2px;
+}
+{/literal}{if isset($chronology_calendar)}{literal}
+#subcontent {
+        min-height: inherit;
+}
+{/literal}{/if}
+{/html_style}
+{if ($BODY_ID=='theCategoryPage')}
+{combine_script id='jquery.isotope' load='header' require='jquery' path='themes/stripped_black_bloc/js/isotope.js'}
+{combine_script id='jquery.cookie' load='header' require='jquery' path='themes/stripped_black_bloc/js/jquery.ck.min.js'}
+{assign var='one_column' value=$stripped_black_bloc.thumbnail_width}
+{assign var='two_columns' value=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width}
+{assign var='three_columns' value=$stripped_black_bloc.thumbnail_width+$stripped_black_bloc.column_width+$stripped_black_bloc.column_width}
+{html_style}{literal}
+.bloc {
+display:block;
 }
 
@@ -48 +58 @@
 {literal}
 }
-{/literal}{if isset($chronology_calendar)}{literal}
-#subcontent {
-        min-height: inherit;
-}
-{/literal}{/if}
+{/literal}
 {/html_style}
 

extensions/stripped_black_bloc/template/navigation_bar.tpl

@@ -1 +1 @@
 <div class="navigationBar bloc twocol">
-        <span class="nav_bulle">{'Page'|@translate} {$navbar.CURRENT_PAGE} / {$navbar.pages|@count}</span>
+        <span class="nav_bulle">{'Page'|@translate} {$navbar.CURRENT_PAGE}{if isset($navbar.NB_PAGE)}/ {$navbar.NB_PAGE}{/if}</span>
   {if isset($navbar.URL_FIRST)}
   <a href="{$navbar.URL_FIRST}" rel="first" class="first nav_bulle">{'First'|@translate}</a>

extensions/stripped_black_bloc/theme.css

@@ -175 +175 @@
     padding: 7px 10px 8px;
 }
+
 .titrePage .categoryActionsContainer {
  /*   float: none; */
@@ -191 +192 @@
 #thumb_navbar {
   display: inline-block
+}
+#thumb_navbar div {
+  max-width: none !important;
 }
 #thumb_navigation {
@@ -243 +247 @@
   background: transparent
 }
-#theHeader a, .titrePage a, .footer_login a, .navigationBar a {
+#theHeader a, .titrePage a, .footer_login a, .navigationBar a, #calendar_block A {
     color: #E6554F;
 }