fix template error, prepare 1.0.6

Philio · Feb 7, 2017 · 0e67b07 · 0e67b07
1 parent 511bebb
commit 0e67b07
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/admin/template/about.tpl b/admin/template/about.tpl
@@ -4,7 +4,7 @@
 </div>
 <div id="configContent" style="margin: 0 auto; max-width: 420px">
     <h3>{'Bootstrap Default'|@translate}</h3>
-    <h4>{'Version'|@translate}: 1.0.5</h4>
+    <h4>{'Version'|@translate}: 1.0.6</h4>
     <h5>{'By'|@translate}: <a href="https://philio.me">Phil Bayfield</a></h5>
 
     <p>{'A modern and responsive theme for Piwigo built with standard Bootstrap components and using the default Bootstrap theme. Intended for easy customisation using Bootstrap styles or as a parent theme for creating responsive themes for Piwigo.'|@translate}</p>

diff --git a/admin/template/changelog.tpl b/admin/template/changelog.tpl
@@ -3,6 +3,12 @@
     <h2>{'Bootstrap Default'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 <div id="configContent">
+    <fieldset class="mainConf">
+        <legend>1.0.6</legend>
+        <ul>
+            <li>{"Fixes a minor error in 1.0.5 related to the user collections plugin"|@translate}</li>
+        </ul>
+    </fieldset>
     <fieldset class="mainConf">
         <legend>1.0.5</legend>
         <ul>

diff --git a/template/menubar_user_collections.tpl b/template/menubar_user_collections.tpl
@@ -1,30 +1,28 @@
 <li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">{$block->get_title()|strip_tags:true} <span class="caret"></span></a>
-  <ul class="dropdown-menu dropdown-menu-scrollable" role="menu">
-  <li>{strip}
-    <a href="{$block->data.U_LIST}">
-{if $block->data.NB_COL == 0}
-      {'You have no collection'|translate}
-{else}
-      {$pwg->l10n_dec('You have %d collection', 'You have %d collections', $block->data.NB_COL)}
-{/if}
-    </a>
-  {/strip}</li>
-  <li class="divider"></li>
-{if $block->data.collections}
-  {foreach from=$block->data.collections item=col}{strip}
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">{$block->get_title()|strip_tags:true} <span class="caret"></span></a>
+    <ul class="dropdown-menu dropdown-menu-scrollable" role="menu">
+        <li>{strip}
+            <a href="{$block->data.U_LIST}">
+                {if $block->data.NB_COL == 0}
+                {'You have no collection'|translate}
+                {else}
+                {$pwg->l10n_dec('You have %d collection', 'You have %d collections', $block->data.NB_COL)}
+                {/if}
+            </a>
+        {/strip}</li>
+        <li class="divider"></li>
+        {if $block->data.collections}
+        {foreach from=$block->data.collections item=col}{strip}
 		<li>
-      <a href="{$col.u_edit}">
-        {$col.name}
-        &nbsp;<span class="badge" title="{$cat.TITLE}">{$col.nb_images}</span>
-      </a>
-    </li>
-  {/strip}{/foreach}
-  {if isset($block->data.MORE)}
-    <li class="divider"></li>
-    <li><a href="{$block->data.U_LIST}">{'%d more...'|translate:$block->data.MORE}</a></li>
-  {/if}
+            <a href="{$col.u_edit}">
+                {$col.name}
+        &nbsp;       <span class="badge" title="{$cat.TITLE}">{$col.nb_images}</span>
+            </a>
+        </li>
+        {/strip}{/foreach}
+        {if isset($block->data.MORE)}
+        <li class="divider"></li>
+        <li><a href="{$block->data.U_LIST}">{'%d more...'|translate:$block->data.MORE}</a></li>
+        {/if}
 	</ul>
-{/if}
-  </ul>
 </li>