Changeset 2711

Timestamp:

Oct 11, 2008, 12:21:33 PM (16 years ago)

Author:

patdenice

Message:

Merge from 2710:

• Move filter button back to menubar_categories.tpl.
• Add dutch plugins language.

Location:

branches/2.0

Files:

• plugins/AMenuManager/language/de_DE (copied) (copied from trunk/plugins/AMenuManager/language/de_DE)
• plugins/add_index/language/de_DE (copied) (copied from trunk/plugins/add_index/language/de_DE)
• plugins/admin_advices/language/de_DE (copied) (copied from trunk/plugins/admin_advices/language/de_DE)
• plugins/c13y_upgrade/language/de_DE (copied) (copied from trunk/plugins/c13y_upgrade/language/de_DE)
• template/yoga/menubar.tpl (modified) (1 diff)
• template/yoga/menubar_categories.tpl (modified) (2 diffs)

branches/2.0/template/yoga/menubar.tpl

@@ -3 +3 @@
         {foreach from=$blocks key=id item=block}
         {if ( not empty($block->template) or not empty($block->raw_content) )}
-  {if $id == 'mbCategories'}
-    {if isset($U_START_FILTER)}
-    <a href="{$U_START_FILTER}" title="{'start_filter_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
-    {/if}
-    {if isset($U_STOP_FILTER)}
-    <a href="{$U_STOP_FILTER}" title="{'stop_filter_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
-    {/if}
-  {/if}
         <dl id="{$id}">
                 {if not empty($block->template)}

branches/2.0/template/yoga/menubar_categories.tpl

@@ -1 +1 @@
 <dt>
+  {if isset($U_START_FILTER)}
+  <a href="{$U_START_FILTER}" title="{'start_filter_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
+  {/if}
+  {if isset($U_STOP_FILTER)}
+  <a href="{$U_STOP_FILTER}" title="{'stop_filter_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
+  {/if}
         <a href="{$block->data.U_CATEGORIES}">{'Categories'|@translate}</a>
 </dt>
@@ -13 +19 @@
         <p class="totalImages">{$pwg->l10n_dec('%d element', '%d elements', $block->data.NB_PICTURE)}</p>
 </dd>
-