From 489af703b1c0c7beba790fba5c92e5a38ddb4514 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Mon, 23 May 2011 12:34:08 +0000 Subject: plugin manager : delete ordering by name, fiw some styles git-svn-id: http://piwigo.org/svn/trunk@11010 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/template/plugins_list.tpl | 54 +++++++------------------- admin/themes/default/theme.css | 36 ++++++++++++----- 2 files changed, 41 insertions(+), 49 deletions(-) (limited to 'admin/themes/default') diff --git a/admin/themes/default/template/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl index 54f051eac..7efdd822f 100644 --- a/admin/themes/default/template/plugins_list.tpl +++ b/admin/themes/default/template/plugins_list.tpl @@ -21,29 +21,19 @@ jQuery(document).ready(function() { jQuery('a.deactivate_all').click(function() { if (confirm(confirmMsg)) { jQuery('div.active').each(function() { - performPluginAction(jQuery(this).attr('id'), 'deactivate'); + performPluginDeactivate(jQuery(this).attr('id')); }); } }); - jQuery('a.activate_all').click(function() { - if (confirm(confirmMsg)) { - jQuery('div.inactive').each(function() { - performPluginAction(jQuery(this).attr('id'), 'activate'); - }); - } - }); - function performPluginAction(id, action) { + function performPluginDeactivate(id) { queuedManager.add({ type: 'GET', dataType: 'json', url: 'ws.php', - data: { method: 'pwg.plugins.performAction', action: action, plugin: id, pwg_token: pwg_token, format: 'json' }, + data: { method: 'pwg.plugins.performAction', action: 'deactivate', plugin: id, pwg_token: pwg_token, format: 'json' }, success: function(data) { if (data['stat'] == 'ok') { - if (action == 'deactivate') - jQuery("#"+id).removeClass('active').addClass('inactive'); - else - jQuery("#"+id).removeClass('inactive').addClass('active'); + jQuery("#"+id).removeClass('active').addClass('inactive'); } } }); @@ -80,23 +70,13 @@ jQuery(document).ready(function() {
-
+ - {'Sort order'|@translate} : - -   |   {'Display'|@translate} : -   |   - {'Deactivate'|@translate} {'all'|@translate} - {*   |   - {'Activate'|@translate} {'all'|@translate} *}

{'Plugins'|@translate}

@@ -107,9 +87,9 @@ jQuery(document).ready(function() { {assign var='field_name' value='null'} {foreach from=$plugins item=plugin name=plugins_loop} -{if $plugin_order == 'state' AND $field_name != $plugin.STATE} +{if $field_name != $plugin.STATE} {if $field_name != 'null'}{/if} -
+
{if $plugin.STATE == 'active'} {'Active Plugins'|@translate} @@ -122,11 +102,7 @@ jQuery(document).ready(function() { {/if} {assign var='field_name' value=$plugin.STATE} - -{elseif $field_name == 'null'} -
- {assign var='field_name' value='not_null'} - + {if $field_name == 'active'}{'Deactivate'|@translate} {'all'|@translate}{/if} {/if} {if not empty($plugin.AUTHOR)} @@ -147,7 +123,7 @@ jQuery(document).ready(function() { {$plugin.DESC} - + {if $plugin.STATE == 'active'} {'Deactivate'|@translate} @@ -155,13 +131,13 @@ jQuery(document).ready(function() { {elseif $plugin.STATE == 'inactive'} {'Activate'|@translate} - | {'Delete'|@translate} + | {'Delete'|@translate} {elseif $plugin.STATE == 'missing'} - {'Uninstall'|@translate} + {'Uninstall'|@translate} {elseif $plugin.STATE == 'merged'} - {'Delete'|@translate} + {'Delete'|@translate} {/if} @@ -199,13 +175,13 @@ jQuery(document).ready(function() { {elseif $plugin.STATE == 'inactive'} {'Activate'|@translate} - | {'Delete'|@translate} + | {'Delete'|@translate} {elseif $plugin.STATE == 'missing'} - {'Uninstall'|@translate} + {'Uninstall'|@translate} {elseif $plugin.STATE == 'merged'} - {'Delete'|@translate} + {'Delete'|@translate} {/if}
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 20a6b3aad..05c6bac8a 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -884,26 +884,42 @@ h2:lang(en) { text-transform:capitalize; } .checkActions {text-align:left;padding:0;margin:0;} .comment A:hover {border:none;} -.pluginBoxes {text-align:left;} -.author-group {text-align:left;background:url('icon/remove_filter.png') left center no-repeat;padding-left:15px;margin-left:-15px;} +.pluginBoxes { + text-align:left; + position:relative; +} -.pluginBox {margin-bottom:10px;-moz-border-radius:5px;} +.pluginBox { + margin-bottom:10px; + border-width:1px; + border-style:solid; + border-radius:5px; + -moz-border-radius:5px; + } .pluginBox table {width:99%;} .pluginBox td {text-align:left;} .pluginBox td.pluginDesc img {vertical-align:middle;} .pluginBoxNameCell {width:180px; vertical-align:top;} -.pluginBox.inactive, .pluginBox.uninstalled {margin-left:20px;opacity:0.65;filter:alpha(opacity=65);} -.pluginsByState .pluginBox.inactive, .pluginsByState .pluginBox.uninstalled {margin-left:0px;opacity:0.8;filter:alpha(opacity=80);} - -.pluginMiniBox {display:inline-table; text-align:center; width:250px; height:40px; margin:5px; -moz-border-radius:5px; overflow:hidden; } +.pluginBoxes .inactive, .pluginBoxes .uninstalled {opacity:0.8;filter:alpha(opacity=80);} + +.pluginMiniBox { + display:inline-table; + text-align:center; + width:250px; + height:40px; + margin:5px; + border-width:1px; + border-style:solid; + border-radius:5px; + -moz-border-radius:5px; + overflow:hidden; + } .pluginMiniBoxNameCell {font-size:1.05em; margin:5px 0;} .pluginActions {display: table-row; font-size:12px; } .pluginActions DIV {display: table-cell; vertical-align: middle; line-height:18px; } -.pluginMiniBox.inactive, .pluginMiniBox.uninstalled {opacity:0.65;filter:alpha(opacity=65);} -.pluginsByState .pluginMiniBox.inactive, .pluginsByState .pluginMiniBox.uninstalled {opacity:0.8;filter:alpha(opacity=80);} .warning:before {content:url(icon/warning.png);vertical-align:top;} -fieldset.pluginsByName{border:none;} +.deactivate_all {position:absolute;bottom:-10px;right:18px;color:#f36;border-bottom:1px dotted #f36;font-size:0.8em;} .languageBoxes {min-height:0;text-align:left;} .languageBox {display:inline-table; text-align:center; width:200px; height:40px; margin:5px; -moz-border-radius:5px; overflow:hidden; } -- cgit v1.2.3