From 75ba6ad47a45ffd582efd3bbdb40aaa5aab2086a Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 30 Mar 2010 13:27:18 +0000 Subject: feature 1557: new design for plugin list management, 1 block = 1 status. No icon. git-svn-id: http://piwigo.org/svn/trunk@5474 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/plugins_list.php | 75 +++++++------- admin/themes/clear/theme.css | 3 + admin/themes/default/default-layout.css | 7 +- admin/themes/default/template/footer.tpl | 7 ++ admin/themes/default/template/plugins_list.tpl | 129 ++++++++++++------------- admin/themes/roma/theme.css | 3 + 6 files changed, 116 insertions(+), 108 deletions(-) diff --git a/admin/plugins_list.php b/admin/plugins_list.php index f09b0d576..8b8bf4873 100644 --- a/admin/plugins_list.php +++ b/admin/plugins_list.php @@ -58,48 +58,35 @@ $plugins->set_tabsheet($page['page']); //---------------------------------------------------------------Order options $link = get_root_url().'admin.php?page='.$page['page'].'&order='; -$template->assign('order_options', + +$template->assign( + 'order_options', array( $link.'name' => l10n('Name'), $link.'status' => l10n('Status'), $link.'author' => l10n('Author'), - $link.'id' => 'Id')); + $link.'id' => 'Id') + ); + $template->assign('order_selected', $link.$order); // +-----------------------------------------------------------------------+ // | start template output | // +-----------------------------------------------------------------------+ + $plugins->sort_fs_plugins($order); foreach($plugins->fs_plugins as $plugin_id => $fs_plugin) { - $display_name = $fs_plugin['name']; - if (!empty($fs_plugin['uri'])) - { - $display_name = '' - . $display_name . ''; - } - $desc = $fs_plugin['description']; - if (!empty($fs_plugin['author'])) - { - $desc .= ' ('; - if (!empty($fs_plugin['author uri'])) - { - $desc .= '' - . $fs_plugin['author'] . ''; - } - else - { - $desc .= $fs_plugin['author']; - } - $desc .= ')'; - } - $tpl_plugin = - array('NAME' => $display_name, - 'VERSION' => $fs_plugin['version'], - 'DESCRIPTION' => $desc, - 'U_ACTION' => sprintf($action_url, $plugin_id)); + $tpl_plugin = array( + 'NAME' => $fs_plugin['name'], + 'VISIT_URL' => $fs_plugin['uri'], + 'VERSION' => $fs_plugin['version'], + 'DESC' => $fs_plugin['description'], + 'AUTHOR' => $fs_plugin['author'], + 'AUTHOR_URL' => $fs_plugin['author uri'], + 'U_ACTION' => sprintf($action_url, $plugin_id) + ); if (isset($plugins->db_plugins_by_id[$plugin_id])) { @@ -109,25 +96,37 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin) { $tpl_plugin['STATE'] = 'uninstalled'; } + $template->append('plugins', $tpl_plugin); } $missing_plugin_ids = array_diff( - array_keys($plugins->db_plugins_by_id), array_keys($plugins->fs_plugins) - ); + array_keys($plugins->db_plugins_by_id), + array_keys($plugins->fs_plugins) + ); foreach($missing_plugin_ids as $plugin_id) { - $template->append( 'plugins', - array( - '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 !", - 'U_ACTION' => sprintf($action_url, $plugin_id), - 'STATE' => 'missing' + $template->append( + 'plugins', + array( + 'NAME' => $plugin_id, + 'VERSION' => $plugins->db_plugins_by_id[$plugin_id]['version'], + 'DESC' => "ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW !", + 'U_ACTION' => sprintf($action_url, $plugin_id), + 'STATE' => 'missing', ) ); } +$template->append('plugin_states', 'active'); +$template->append('plugin_states', 'inactive'); +$template->append('plugin_states', 'uninstalled'); + +if (count($missing_plugin_ids) > 0) +{ + $template->append('plugin_states', 'missing'); +} + $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); ?> \ No newline at end of file diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index f4e2cc526..0e70b4b20 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -233,3 +233,6 @@ html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers #pwgHead, #footer {color:#666;} #pwgHead A, #footer A {color:#444;} #pwgHead A:hover, #footer A:hover {color:black; border-color:black;} + +.pluginBox {background-color:#ddd;color:#333} +.pluginBoxNameCell {font-weight:bold;} diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css index 10c7386d8..0bebba5ea 100644 --- a/admin/themes/default/default-layout.css +++ b/admin/themes/default/default-layout.css @@ -802,4 +802,9 @@ h2:lang(en) { text-transform:capitalize; } .infos .submit {margin-left:30px;} .checkActions {text-align:left;padding:0;margin:0;} -.comment A:hover {border:none;} \ No newline at end of file +.comment A:hover {border:none;} + +.pluginBox {margin-bottom:10px;-moz-border-radius:5px;} +.pluginBox table {width:99%} +.pluginBox td {text-align:left;} +.pluginBoxNameCell {width:150px; vertical-align:top;} diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl index 18e68686b..19cb14f34 100644 --- a/admin/themes/default/template/footer.tpl +++ b/admin/themes/default/template/footer.tpl @@ -51,6 +51,13 @@ 'fadeOut' : 200, }); }); + + $(document).ready(function() { + $("a.externalLink").click(function() { + window.open($(this).attr("href")); + return false; + }); + }); {/literal} diff --git a/admin/themes/default/template/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl index 74672fadc..f09e6a09a 100644 --- a/admin/themes/default/template/plugins_list.tpl +++ b/admin/themes/default/template/plugins_list.tpl @@ -8,81 +8,72 @@

{'Plugins'|@translate}

- {if isset($plugins)} - - - - - - - - - -{foreach from=$plugins item=plugin name=plugins_loop} - - - - - - + {/foreach} + {/foreach} -
{'Name'|@translate}{'Actions'|@translate}{'Version'|@translate}{'Description'|@translate}
- {$plugin.NAME} - -
    +{foreach from=$plugin_states item=plugin_state} +
    + + {if $plugin_state == 'active'} + Active Plugins + + {elseif $plugin_state == 'inactive'} + Inactive Plugins + + {elseif $plugin_state == 'uninstalled'} + Uninstalled Plugins + + {elseif $plugin_state == 'missing'} + Missing Plugins + + {/if} + + {foreach from=$plugins item=plugin name=plugins_loop} + {if $plugin.STATE == $plugin_state} +
    + + + + + + + + + +
    {$plugin.NAME}{$plugin.DESC}
    {if $plugin.STATE == 'active'} -
  • - - {'Deactivate'|@translate} - -
    • -
  • - {'Uninstall'|@translate} -
    • + {'Deactivate'|@translate} + + {elseif $plugin_state == 'inactive'} + {'Activate'|@translate} + | {'Uninstall'|@translate} + + {elseif $plugin_state == 'uninstalled'} + {'Install'|@translate} + | {'Delete'|@translate} + + {elseif $plugin_state == 'missing'} + {'Uninstall'|@translate} + {/if} - {if $plugin.STATE == 'inactive'} -
  • - - {'Activate'|@translate} - -
    • -
  • - - {'Uninstall'|@translate} - -
    • +     		+ Version {$plugin.VERSION} + {if not empty($plugin.AUTHOR)} + | By + {if not empty($plugin.AUTHOR_URL)} + {$plugin.AUTHOR} + {else} + {$plugin.AUTHOR} + {/if} {/if} - {if $plugin.STATE == 'missing'} -
  • - {'Deactivate'|@translate} -
    • -
  • - - {'Uninstall'|@translate} - -
    • + + {if not empty($plugin.VISIT_URL)} + | Visit plugin site {/if} - {if $plugin.STATE == 'uninstalled'} -
  • - {'Activate'|@translate} -
    • -
  • - - {'Install'|@translate} - -
    • -
  • - - {'Delete'|@translate} - -
    • - {else} -
  • - {'Delete'|@translate} -
    • +
    +
    {/if} -
- 		{$plugin.VERSION}{$plugin.DESCRIPTION}
+ {/if} diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index f269685e8..54630a4b9 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -239,3 +239,6 @@ html>body #menubar {min-height:522px; height:522px;} /* IE 7 and modern browsers #helpContent, #pLoaderPage, #ftpPage, #ftpPage LEGEND {color:#aaa;} #pwgHead, #footer {background-color:#222;} + +.pluginBox {background-color:#333;color:#999} +.pluginBoxNameCell {color:#ccc;} -- cgit v1.2.3