diff --git a/admin/plugins_list.php b/admin/plugins_list.php index ddae73ce3..bc9425092 100644 --- a/admin/plugins_list.php +++ b/admin/plugins_list.php @@ -89,42 +89,16 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin) $tpl_plugin = array('NAME' => $display_name, 'VERSION' => $fs_plugin['version'], - 'DESCRIPTION' => $desc); - - $action_url = $base_url.'&plugin='.$plugin_id; + 'DESCRIPTION' => $desc, + 'U_ACTION' => $base_url.'&plugin='.$plugin_id); if (isset($plugins->db_plugins_by_id[$plugin_id])) { $tpl_plugin['STATE'] = $plugins->db_plugins_by_id[$plugin_id]['state']; - switch ($plugins->db_plugins_by_id[$plugin_id]['state']) - { - case 'active': - $tpl_plugin['actions'][] = - array('U_ACTION' => $action_url . '&action=deactivate', - 'L_ACTION' => l10n('Deactivate')); - break; - - case 'inactive': - $tpl_plugin['actions'][] = - array('U_ACTION' => $action_url . '&action=activate', - 'L_ACTION' => l10n('Activate')); - $tpl_plugin['actions'][] = - array('U_ACTION' => $action_url . '&action=uninstall', - 'L_ACTION' => l10n('Uninstall'), - 'CONFIRM' => l10n('Are you sure?')); - break; - } } else { - $tpl_plugin['actions'][] = - array('U_ACTION' => $action_url . '&action=install', - 'L_ACTION' => l10n('Install'), - 'CONFIRM' => l10n('Are you sure?')); - $tpl_plugin['actions'][] = - array('U_ACTION' => $action_url . '&action=delete', - 'L_ACTION' => l10n('plugins_delete'), - 'CONFIRM' => l10n('plugins_confirm_delete')); + $tpl_plugin['STATE'] = 'uninstalled'; } $template->append('plugins', $tpl_plugin); } @@ -142,12 +116,10 @@ foreach($missing_plugin_ids as $plugin_id) 'NAME' => $plugin_id, 'VERSION' => $plugins->db_plugins_by_id[$plugin_id]['version'], 'DESCRIPTION' => "ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW !", - 'actions' => array ( array ( - 'U_ACTION' => $action_url . '&action=uninstall', - 'L_ACTION' => l10n('Uninstall'), - ) ) - ) - ); + 'U_ACTION' => $base_url.'&plugin='.$plugin_id, + 'STATE' => 'missing' + ) + ); } $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); diff --git a/admin/template/goto/default-layout.css b/admin/template/goto/default-layout.css index 74d3790df..52b8befae 100644 --- a/admin/template/goto/default-layout.css +++ b/admin/template/goto/default-layout.css @@ -40,20 +40,31 @@ TABLE#detailedStats { } /* Plugins tables */ -TABLE.table2 TR TD.pluginState { - padding-left: 16px; -} +TABLE.plugins a { border: 0; } +TABLE.plugins TR TD { padding: 4px 10px; } +TABLE.plugins TR TD.pluginState { padding: 4px 16px; } -TABLE.table2 TR TD.active { +TABLE.plugins TR TD.active { background: url(icon/plugin_active.gif) no-repeat center left; background-color: inherit; /* IE need it */ } -TABLE.table2 TR TD.inactive { +TABLE.plugins TR TD.inactive { background: url(icon/plugin_inactive.gif) no-repeat center left; background-color: inherit; /* IE need it */ } +TABLE.plugins ul.pluginsActions { + float: left; + padding: 0; + margin: 0; + width: 60px; + list-style: none; + text-align: center; +} + +TABLE.plugins ul.pluginsActions li { display: inline; } + /* categoryOrdering */ SELECT.categoryList { width: 100%; diff --git a/admin/template/goto/icon/plug_activate.png b/admin/template/goto/icon/plug_activate.png new file mode 100644 index 000000000..feb97a1c9 Binary files /dev/null and b/admin/template/goto/icon/plug_activate.png differ diff --git a/admin/template/goto/icon/plug_activate_grey.png b/admin/template/goto/icon/plug_activate_grey.png new file mode 100644 index 000000000..bf2a9be53 Binary files /dev/null and b/admin/template/goto/icon/plug_activate_grey.png differ diff --git a/admin/template/goto/icon/plug_deactivate.png b/admin/template/goto/icon/plug_deactivate.png new file mode 100644 index 000000000..8401ad8b9 Binary files /dev/null and b/admin/template/goto/icon/plug_deactivate.png differ diff --git a/admin/template/goto/icon/plug_deactivate_grey.png b/admin/template/goto/icon/plug_deactivate_grey.png new file mode 100644 index 000000000..a7e55e669 Binary files /dev/null and b/admin/template/goto/icon/plug_deactivate_grey.png differ diff --git a/admin/template/goto/icon/plug_delete.png b/admin/template/goto/icon/plug_delete.png new file mode 100644 index 000000000..285e53e19 Binary files /dev/null and b/admin/template/goto/icon/plug_delete.png differ diff --git a/admin/template/goto/icon/plug_delete_grey.png b/admin/template/goto/icon/plug_delete_grey.png new file mode 100644 index 000000000..d3d070bfc Binary files /dev/null and b/admin/template/goto/icon/plug_delete_grey.png differ diff --git a/admin/template/goto/icon/plug_install.png b/admin/template/goto/icon/plug_install.png new file mode 100644 index 000000000..bef78e171 Binary files /dev/null and b/admin/template/goto/icon/plug_install.png differ diff --git a/admin/template/goto/icon/plug_install_grey.png b/admin/template/goto/icon/plug_install_grey.png new file mode 100644 index 000000000..3bd56be3c Binary files /dev/null and b/admin/template/goto/icon/plug_install_grey.png differ diff --git a/admin/template/goto/icon/plug_uninstall.png b/admin/template/goto/icon/plug_uninstall.png new file mode 100644 index 000000000..9fd420ad7 Binary files /dev/null and b/admin/template/goto/icon/plug_uninstall.png differ diff --git a/admin/template/goto/icon/plug_uninstall_grey.png b/admin/template/goto/icon/plug_uninstall_grey.png new file mode 100644 index 000000000..4d6291cee Binary files /dev/null and b/admin/template/goto/icon/plug_uninstall_grey.png differ diff --git a/admin/template/goto/plugins_list.tpl b/admin/template/goto/plugins_list.tpl index 0f2cc43e4..2b0f9bb06 100644 --- a/admin/template/goto/plugins_list.tpl +++ b/admin/template/goto/plugins_list.tpl @@ -10,30 +10,70 @@ {if isset($plugins)} - +
+ - {foreach from=$plugins item=plugin name=plugins_loop} - - - - - + + + + + {/foreach}
{'Name'|@translate}{'Actions'|@translate} {'Version'|@translate} {'Description'|@translate}{'Actions'|@translate}
- {$plugin.NAME} - {$plugin.VERSION}{$plugin.DESCRIPTION} - {foreach from=$plugin.actions item=action} - {$action.L_ACTION} - {/foreach} -
+ {$plugin.NAME} + +
    + {if $plugin.STATE == 'active'} +
  • + + {'Deactivate'|@translate} + +
    • +
  • + {'Uninstall'|@translate} +
    • + {/if} + {if $plugin.STATE == 'inactive'} +
  • + + {'Activate'|@translate} + +
    • + {/if} + {if $plugin.STATE == 'inactive' or $plugin.STATE == 'missing'} +
  • + + {'Uninstall'|@translate} + +
    • + {/if} + {if $plugin.STATE == 'uninstalled'} +
  • + {'Activate'|@translate} +
    • +
  • + + {'Install'|@translate} + +
    • +
  • + + {'plugins_delete'|@translate} + +
    • + {elseif $plugin.STATE != 'missing'} +
  • + {'plugins_delete'|@translate} +
    • + {/if} +
+ 		{$plugin.VERSION}{$plugin.DESCRIPTION}
diff --git a/admin/template/goto/plugins_new.tpl b/admin/template/goto/plugins_new.tpl index b1827190c..0d3f4e1ba 100644 --- a/admin/template/goto/plugins_new.tpl +++ b/admin/template/goto/plugins_new.tpl @@ -12,17 +12,18 @@ jQuery().ready(function(){ldelim}
-

{'Plugins'|@translate}

-
- + {'Sort order'|@translate} : + +

{'Plugins'|@translate}

+ {if isset($plugins)}
- +
diff --git a/admin/template/goto/plugins_update.tpl b/admin/template/goto/plugins_update.tpl index fbfe04afb..c21e01e18 100644 --- a/admin/template/goto/plugins_update.tpl +++ b/admin/template/goto/plugins_update.tpl @@ -18,7 +18,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_not_uptodate)}
{'plugins_need_update'|@translate} -
{'Name'|@translate}
+
@@ -43,7 +43,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_uptodate)}
{'plugins_dontneed_update'|@translate} -
{'Name'|@translate}
+
@@ -63,7 +63,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_cant_check)}
{'plugins_cant_check'|@translate} -
{'Name'|@translate}
+
{'Name'|@translate}