aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2008-10-04 15:36:45 +0000
committerpatdenice <patdenice@piwigo.org>2008-10-04 15:36:45 +0000
commita97451563437b12de9050e7f37c021b9eaa62d6d (patch)
tree5923f305c8cbd14fbd22c82177d531720dcda8e3
parent094ed0f17ac87505ee7e85a2dffa976871977283 (diff)
- don't display empty <ul> if no plugins to display in specials admin menu.
- correction in plugins_list.tpl if plugins missing. - filter icon is displayed inside <dt> tags. git-svn-id: http://piwigo.org/svn/trunk@2656 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/template/goto/admin.tpl4
-rw-r--r--admin/template/goto/plugins_list.tpl12
-rw-r--r--template/yoga/menubar_categories.tpl13
3 files changed, 19 insertions, 10 deletions
diff --git a/admin/template/goto/admin.tpl b/admin/template/goto/admin.tpl
index 1c4ca1a6c..76b936cfd 100644
--- a/admin/template/goto/admin.tpl
+++ b/admin/template/goto/admin.tpl
@@ -84,12 +84,14 @@ jQuery().ready(function(){ldelim}
<li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
<li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
<li><a href="{$U_ADVANCED_FEATURE}">{'Advanced_features'|@translate}</a></li>
- <li><a href="{$U_PLUGINS}">{'Plugins'|@translate}</a>
+ <li><a href="{$U_PLUGINS}">{'Plugins'|@translate}</a>
+ {if !empty($plugin_menu_items)}
<ul class="scroll">
{foreach from=$plugin_menu_items item=menu_item}
<li><a href="{$menu_item.URL}">{$menu_item.NAME}</a></li>
{/foreach}
</ul>
+ {/if}
</li>
</ul>
</dd>
diff --git a/admin/template/goto/plugins_list.tpl b/admin/template/goto/plugins_list.tpl
index 2b0f9bb06..96b1f2b1a 100644
--- a/admin/template/goto/plugins_list.tpl
+++ b/admin/template/goto/plugins_list.tpl
@@ -43,8 +43,16 @@
<img src="{$themeconf.admin_icon_dir}/plug_activate.png" alt="{'Activate'|@translate}" title="{'Activate'|@translate}" />
</a>
</li>
+ <li>
+ <a href="{$plugin.U_ACTION}&amp;action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">
+ <img src="{$themeconf.admin_icon_dir}/plug_uninstall.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}" />
+ </a>
+ </li>
{/if}
- {if $plugin.STATE == 'inactive' or $plugin.STATE == 'missing'}
+ {if $plugin.STATE == 'missing'}
+ <li>
+ <img src="{$themeconf.admin_icon_dir}/plug_deactivate_grey.png" alt="{'Deactivate'|@translate}" title="{'Deactivate'|@translate}" />
+ </li>
<li>
<a href="{$plugin.U_ACTION}&amp;action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">
<img src="{$themeconf.admin_icon_dir}/plug_uninstall.png" alt="{'Uninstall'|@translate}" title="{'Uninstall'|@translate}" />
@@ -65,7 +73,7 @@
<img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}">
</a>
</li>
- {elseif $plugin.STATE != 'missing'}
+ {else}
<li>
<img src="{$themeconf.admin_icon_dir}/plug_delete_grey.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}" />
</li>
diff --git a/template/yoga/menubar_categories.tpl b/template/yoga/menubar_categories.tpl
index eb09ec914..9986f7dd5 100644
--- a/template/yoga/menubar_categories.tpl
+++ b/template/yoga/menubar_categories.tpl
@@ -1,11 +1,10 @@
-{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}
-
<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>
<dd>