Index: /trunk/admin/plugins_list.php =================================================================== --- /trunk/admin/plugins_list.php (revision 5473) +++ /trunk/admin/plugins_list.php (revision 5474) @@ -59,10 +59,14 @@ //---------------------------------------------------------------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); @@ -70,35 +74,18 @@ // | 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])) @@ -110,24 +97,36 @@ $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'); ?> Index: /trunk/admin/themes/clear/theme.css =================================================================== --- /trunk/admin/themes/clear/theme.css (revision 5473) +++ /trunk/admin/themes/clear/theme.css (revision 5474) @@ -234,2 +234,5 @@ #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;} Index: /trunk/admin/themes/default/default-layout.css =================================================================== --- /trunk/admin/themes/default/default-layout.css (revision 5473) +++ /trunk/admin/themes/default/default-layout.css (revision 5474) @@ -804,2 +804,7 @@ .checkActions {text-align:left;padding:0;margin:0;} .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;} Index: /trunk/admin/themes/default/template/footer.tpl =================================================================== --- /trunk/admin/themes/default/template/footer.tpl (revision 5473) +++ /trunk/admin/themes/default/template/footer.tpl (revision 5474) @@ -52,4 +52,11 @@ }); }); + + $(document).ready(function() { + $("a.externalLink").click(function() { + window.open($(this).attr("href")); + return false; + }); + }); {/literal} Index: /trunk/admin/themes/default/template/plugins_list.tpl =================================================================== --- /trunk/admin/themes/default/template/plugins_list.tpl (revision 5473) +++ /trunk/admin/themes/default/template/plugins_list.tpl (revision 5474) @@ -9,80 +9,71 @@ +{if isset($plugins)} -{if isset($plugins)} -
{'Name'|@translate} | -{'Actions'|@translate} | -{'Version'|@translate} | -{'Description'|@translate} | -