Changes in [2191:f3ecd85d5c32:2196:234c9e083cfb]

Files:

• admin/blog_theme.php (modified) (2 diffs)
• admin/images/minus-theme.png (added)
• admin/images/module.png (added)
• admin/images/plus-theme.png (added)
• admin/index.php (modified) (1 diff)
• admin/js/_blog_theme.js (modified) (1 diff)
• admin/js/_plugins.js (modified) (1 diff)
• admin/plugins.php (modified) (2 diffs)
• admin/services.php (modified) (2 diffs)
• admin/style/default.css (modified) (3 diffs)
• inc/admin/lib.dc.page.php (modified) (2 diffs)
• inc/admin/lib.moduleslist.php (added)
• inc/core/class.dc.repository.parser.php (added)
• inc/core/class.dc.repository.php (added)
• inc/core/class.dc.repository.reader.php (added)
• inc/prepend.php (modified) (2 diffs)
• plugins/maintenance/_admin.php (modified) (3 diffs)
• plugins/maintenance/_config.php (added)
• plugins/maintenance/index.php (modified) (2 diffs)

admin/blog_theme.php

@@ -15 +15 @@
 dcPage::check('admin');
 
-# Loading themes
+# --------------------------------------------------
+# @todo Add settings to Dotclear update features
+if ($core->blog->settings->system->repository_theme_url === null) {
+     $core->blog->settings->system->put(
+          'repository_theme_url', 'http://update.dotaddict.org/dc2/themes.xml', 'string', 'Themes XML feed location', true, true
+     );
+}
+# --------------------------------------------------
+
+# -- Loading themes --
 $core->themes = new dcThemes($core);
-$core->themes->loadModules($core->blog->themes_path,null);
-
-# Theme screenshot
+$core->themes->loadModules($core->blog->themes_path, null);
+
+# -- Repository helper --
+$repository = new dcRepository(
+     $core->themes, 
+     $core->blog->settings->system->repository_theme_url
+);
+$repository->check();
+
+# -- Page helper --
+$list = new adminThemesList(
+     $core, 
+     $core->blog->themes_path,
+     false
+);
+
+# -- Theme screenshot --
 if (!empty($_GET['shot']) && $core->themes->moduleExists($_GET['shot']))
 {
@@ -43 +66 @@
 }
 
-$can_install = $core->auth->isSuperAdmin();
-$is_writable = is_dir($core->blog->themes_path) && is_writable($core->blog->themes_path);
-$default_tab = 'themes-list';
-
-# Selecting theme
-if (!empty($_POST['theme']) && !empty($_POST['select']) && empty($_REQUEST['conf']))
-{
-     $core->blog->settings->addNamespace('system');
-     $core->blog->settings->system->put('theme',$_POST['theme']);
-     $core->blog->triggerBlog();
-     $theme = $core->themes->getModules($_POST['theme']);
-     dcPage::addSuccessNotice(sprintf(
-          __('Current theme has been successfully changed to "%s".'),
-          html::escapeHTML($theme['name']))
+# -- Display module configuration page --
+if ($list->setConfigurationFile($core->themes, $core->blog->settings->system->theme)) {
+
+     # Get content before page headers
+     include $list->getConfigurationFile();
+
+     # Gather content
+     $list->setConfigurationContent();
+
+     # Display page
+     dcPage::open(__('Blog appearance'),
+          dcPage::jsPageTabs().
+          dcPage::jsColorPicker().
+
+          # --BEHAVIOR-- themesToolsHeaders
+          $core->callBehavior('themesToolsHeaders', $core, true),
+
+          dcPage::breadcrumb(
+               array(
+                    html::escapeHTML($core->blog->name) => '',
+                    __('Blog appearance') => 'blog_theme.php',
+                    '<span class="page-title">'.__('Theme configuration').'</span>' => ''
+               ))
      );
 
-     http::redirect('blog_theme.php');
-}
-
-if ($can_install && !empty($_POST['theme']) && !empty($_POST['remove']) && empty($_REQUEST['conf']))
-{
-     try
-     {
-          if ($_POST['theme'] == 'default') {
-               throw new Exception(__('You can\'t remove default theme.'));
-          }
-          
-          if (!$core->themes->moduleExists($_POST['theme'])) {
-               throw new Exception(__('Theme does not exist.'));
-          }
-          
-          $theme = $core->themes->getModules($_POST['theme']);
-          
-          # --BEHAVIOR-- themeBeforeDelete
-          $core->callBehavior('themeBeforeDelete',$theme);
-          
-          $core->themes->deleteModule($_POST['theme']);
-          
-          # --BEHAVIOR-- themeAfterDelete
-          $core->callBehavior('themeAfterDelete',$theme);
-          
-          http::redirect('blog_theme.php');
-     }
-     catch (Exception $e)
-     {
+     if (!empty($_GET['done'])){
+          dcPage::success(__('Theme successfully configured.'));
+     }
+
+     # Display previously gathered content
+     $list->getConfigurationContent();
+
+     dcPage::close();
+
+     # Stop reading code here
+     return;
+}
+
+# -- Execute actions --
+if (!empty($_POST) && empty($_REQUEST['conf']) && $core->auth->isSuperAdmin() && $list->isPathWritable()) {
+     try {
+          $list->executeAction('themes', $core->themes, $repository);
+     }
+     catch (Exception $e) {
           $core->error->add($e->getMessage());
      }
 }
 
-# Theme upload
-if ($can_install && $is_writable && ((!empty($_POST['upload_pkg']) && !empty($_FILES['pkg_file'])) ||
-     (!empty($_POST['fetch_pkg']) && !empty($_POST['pkg_url']))))
-{
-     try
-     {
-          if (empty($_POST['your_pwd']) || !$core->auth->checkPassword(crypt::hmac(DC_MASTER_KEY,$_POST['your_pwd']))) {
-               throw new Exception(__('Password verification failed'));
-          }
-          
-          if (!empty($_POST['upload_pkg']))
-          {
-               files::uploadStatus($_FILES['pkg_file']);
-               
-               $dest = $core->blog->themes_path.'/'.$_FILES['pkg_file']['name'];
-               if (!move_uploaded_file($_FILES['pkg_file']['tmp_name'],$dest)) {
-                    throw new Exception(__('Unable to move uploaded file.'));
-               }
-          }
-          else
-          {
-               $url = urldecode($_POST['pkg_url']);
-               $dest = $core->blog->themes_path.'/'.basename($url);
-               
-               try
-               {
-                    $client = netHttp::initClient($url,$path);
-                    $client->setUserAgent('Dotclear - http://www.dotclear.org/');
-                    $client->useGzip(false);
-                    $client->setPersistReferers(false);
-                    $client->setOutput($dest);
-                    $client->get($path);
-               }
-               catch( Exception $e)
-               {
-                    throw new Exception(__('An error occurred while downloading the file.'));
-               }
-               
-               unset($client);
-          }
-          
-          $ret_code = dcModules::installPackage($dest,$core->themes);
-          if ($ret_code == 2) {
-               dcPage::addSuccessNotice(__('Theme has been successfully upgraded.'));
-          } else {
-               dcPage::addSuccessNotice(__('Theme has been successfully installed.'));
-          }
-          http::redirect('blog_theme.php');
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
-          $default_tab = 'add-theme';
-     }
-}
-
-$theme_conf_mode = false;
-if (!empty($_REQUEST['conf']))
-{
-     $theme_conf_file = path::real($core->blog->themes_path.'/'.$core->blog->settings->system->theme).'/_config.php';
-     if (file_exists($theme_conf_file)) {
-          $theme_conf_mode = true;
-     }
-}
-
-function display_theme_details($id,$details,$current)
-{
-     global $core;
-     
-     $screenshot = 'images/noscreenshot.png';
-     if (file_exists($core->blog->themes_path.'/'.$id.'/screenshot.jpg')) {
-          $screenshot = 'blog_theme.php?shot='.rawurlencode($id);
-     }
-     
-     $radio_id = 'theme_'.html::escapeHTML($id);
-     if (preg_match('#^http(s)?://#',$core->blog->settings->system->themes_url)) {
-          $theme_url = http::concatURL($core->blog->settings->system->themes_url,'/'.$id);
-     } else {
-          $theme_url = http::concatURL($core->blog->url,$core->blog->settings->system->themes_url.'/'.$id);
-     }
-     $has_conf = file_exists(path::real($core->blog->themes_path.'/'.$id).'/_config.php');
-     $has_css = file_exists(path::real($core->blog->themes_path.'/'.$id).'/style.css');
-     $parent = $core->themes->moduleInfo($id,'parent');
-     $has_parent = (boolean)$parent;
-     if ($has_parent) {
-          $is_parent_present = $core->themes->moduleExists($parent);
-     }
-     
-     $res =
-     '<div class="theme-details'.($current ? ' current-theme' : '').'">'.
-     '<div class="theme-shot"><img src="'.$screenshot.'" alt="" /></div>'.
-     '<div class="theme-info">'.
-          '<h4>'.form::radio(array('theme',$radio_id),html::escapeHTML($id),$current,'','',($has_parent && !$is_parent_present)).' '.
-          '<label class="classic" for="'.$radio_id.'">'.
-          html::escapeHTML($details['name']).'</label></h4>'.
-          '<p><span class="theme-desc">'.html::escapeHTML($details['desc']).'</span> '.
-          '<span class="theme-author">'.sprintf(__('by %s'),html::escapeHTML($details['author'])).'</span> '.
-          '<span class="theme-version">'.sprintf(__('version %s'),html::escapeHTML($details['version'])).'</span> ';
-          if ($has_parent) {
-               if ($is_parent_present) {
-                    $res .= '<span class="theme-parent-ok">'.sprintf(__('(built on "%s")'),html::escapeHTML($parent)).'</span> ';
-               } else {
-                    $res .= '<span class="theme-parent-missing">'.sprintf(__('(requires "%s")'),html::escapeHTML($parent)).'</span> ';
-               }
-          }
-          if ($has_css) {
-               $res .= '<span class="theme-css"><a href="'.$theme_url.'/style.css">'.__('Stylesheet').'</a></span>';
-          }
-          $res .= '</p>';
-     $res .=
-     '</div>'.
-     '<div class="theme-actions">';
-          if ($current && $has_conf) {
-               $res .= '<p><a href="blog_theme.php?conf=1" class="button">'.__('Configure theme').'</a></p>';
-          }
-          if ($current) {
-               # --BEHAVIOR-- adminCurrentThemeDetails
-               $res .= $core->callBehavior('adminCurrentThemeDetails',$core,$id,$details);
-          }
-     $res .=
-     '</div>'.
-     '</div>';
-     
-     return $res;
-}
-
-if (!$theme_conf_mode)
-{
-     $breadcrumb = dcPage::breadcrumb(
+# -- Page header --
+dcPage::open(__('Themes management'),
+     dcPage::jsLoad('js/_blog_theme.js').
+     dcPage::jsPageTabs().
+     dcPage::jsColorPicker(),
+
+     # --BEHAVIOR-- themesToolsHeaders
+     $core->callBehavior('themesToolsHeaders', $core, false),
+
+     dcPage::breadcrumb(
           array(
                html::escapeHTML($core->blog->name) => '',
-               __('Blog appearance') => ''
-          ));
-} else {
-     $breadcrumb = dcPage::breadcrumb(
-          array(
-               html::escapeHTML($core->blog->name) => '',
-               __('Blog appearance') => 'blog_theme.php',
-               __('Theme configuration') => ''
-          ));
-}
-
-dcPage::open(__('Blog appearance'),
-     (!$theme_conf_mode ? dcPage::jsLoad('js/_blog_theme.js') : '').
-     dcPage::jsPageTabs($default_tab).
-     dcPage::jsColorPicker(),
-     $breadcrumb
+               '<span class="page-title">'.__('Blog appearance').'</span>' => ''
+          ))
 );
 
-if (!$theme_conf_mode)
-{
-     if (!empty($_GET['upd'])) {
-          dcPage::success(__('Theme has been successfully changed.'));
-     }
-     
-     if (!empty($_GET['added'])) {
-          dcPage::success(($_GET['added'] == 2 ? __('Theme has been successfully upgraded') : __('Theme has been successfully installed.')));
-     }
-     
-     if (!empty($_GET['del'])) {
-          dcPage::success(__('Theme has been successfully deleted.'));
-     }
-     
-     # Themes list
-     echo '<div class="multi-part" id="themes-list" title="'.__('Themes').'">'.
-     '<h3>'.__('Available themes in your installation').'</h3>';
-     
-     $themes = $core->themes->getModules();
-     if (isset($themes[$core->blog->settings->system->theme])) {
-          echo '<p>'.sprintf(__('You are currently using <strong>%s</strong>'),$themes[$core->blog->settings->system->theme]['name']).'.</p>';
-     }
-     
-     echo
-     '<form action="blog_theme.php" method="post" id="themes-form">'.
-     '<div id="themes">';
-     
-     if (isset($themes[$core->blog->settings->system->theme])) {
-          echo display_theme_details($core->blog->settings->system->theme,$themes[$core->blog->settings->system->theme],true);
-     }
-     
-     foreach ($themes as $k => $v)
-     {
-          if ($core->blog->settings->system->theme == $k) { // Current theme
-               continue;
-          }
-          echo display_theme_details($k,$v,false);
-     }
-     
-     echo '</div>';
-     
-     echo
-     '<div id="themes-actions">'.
-     
-     '<p>'.$core->formNonce().'<input type="submit" name="select" value="'.__('Use selected theme').'" /> ';  
-     if ($can_install) {
-          echo ' <input type="submit" class="delete" name="remove" value="'.__('Delete selected theme').'" />';
-     }
-     echo '</p>'.
-     
-     '</div>'.
-     '</form>'.
+# -- Succes messages --
+if (!empty($_GET['msg'])) {
+     $list->displayMessage($_GET['msg']);
+}
+
+# -- Display modules lists --
+if ($core->auth->isSuperAdmin() && $list->isPathWritable()) {
+
+     # Updated modules from repo
+     $modules = $repository->get(true);
+     if (!empty($modules)) {
+          echo 
+          '<div class="multi-part" id="update" title="'.html::escapeHTML(__('Update themes')).'">'.
+          '<h3>'.html::escapeHTML(__('Update themes')).'</h3>'.
+          '<p>'.sprintf(
+               __('There is one theme to update available from %2$s.', 'There are %s themes to update available from %s.', count($modules)),
+               count($modules),
+               '<a href="http://dotaddict.org/dc2/themes">Dotaddict</a>'
+          ).'</p>';
+
+          $list
+               ->newList('theme-update')
+               ->setModules($modules)
+               ->setPageTab('update')
+               ->displayModulesList(
+                    /*cols */      array('sshot', 'name', 'desc', 'author', 'version', 'current_version', 'parent'),
+                    /* actions */  array('update')
+               );
+
+          echo
+          '</div>';
+     }
+}
+
+# List all active plugins
+echo
+'<div class="multi-part" id="themes" title="'.__('Installed themes').'">';
+
+$modules = $core->themes->getModules();
+if (!empty($modules)) {
+
+     echo
+     '<h3>'.__('Activated themes').'</h3>'.
+     '<p>'.__('Manage installed themes from this list.').'</p>';
+
+     $list
+          ->newList('theme-activate')
+          ->setModules($modules)
+          ->setPageTab('themes')
+          ->displayModulesList(
+               /* cols */          array('sshot', 'name', 'config', 'desc', 'author', 'version', 'parent'),
+               /* actions */  array('select', 'deactivate', 'delete')
+          );
+}
+
+$modules = $core->themes->getDisabledModules();
+if (!empty($modules)) {
+
+     echo
+     '<h3>'.__('Deactivated themes').'</h3>'.
+     '<p>'.__('Deactivated themes are installed but not usable. You can activate them from here.').'</p>';
+
+     $list
+          ->newList('theme-deactivate')
+          ->setModules($modules)
+          ->setPageTab('themes')
+          ->displayModulesList(
+               /* cols */          array('name', 'distrib'),
+               /* actions */  array('activate', 'delete')
+          );
+}
+
+echo 
+'</div>';
+
+if ($core->auth->isSuperAdmin() && $list->isPathWritable()) {
+
+     # New modules from repo
+     $search = $list->getSearchQuery();
+     $modules = $search ? $repository->search($search) : $repository->get();
+
+     echo
+     '<div class="multi-part" id="new" title="'.__('Add themes from Dotaddict').'">'.
+     '<h3>'.__('Add themes from Dotaddict repository').'</h3>';
+
+     $list
+          ->newList('theme-new')
+          ->setModules($modules)
+          ->setPageTab('new')
+          ->displaySearchForm()
+          ->displayNavMenu()
+          ->displayModulesList(
+               /* cols */          array('expander', 'sshot', 'name', 'config', 'desc', 'author', 'version', 'parent', 'distrib'),
+               /* actions */  array('install'),
+               /* nav limit */     true
+          );
+
+     echo
+     '<p class="info vertical-separator">'.sprintf(
+          __("Visit %s repository, the resources center for Dotclear."),
+          '<a href="http://dotaddict.org/dc2/themes">Dotaddict</a>'
+          ).
+     '</p>'.
+
      '</div>';
-     
-     # Add a new theme
-     if ($can_install)
-     {
-          echo
-          '<div class="multi-part clear" id="add-theme" title="'.__('Install or upgrade a theme').'">'.
-          '<h3>'.__('Add themes to your installation').'</h3>'.
-          '<p class="form-note info">'.sprintf(__('You can find additional themes for your blog on %s.'),
-          '<a href="http://themes.dotaddict.org/galerie-dc2/">Dotaddict</a>').'</p>';
-          
-          if ($is_writable)
-          {
-               echo '<p>'.__('You can also install themes by uploading or downloading zip files.').'</p>';
-               
-               # 'Upload theme' form
-               echo
-               '<form method="post" action="blog_theme.php" id="uploadpkg" enctype="multipart/form-data" class="fieldset">'.
-               '<h4>'.__('Upload a zip file').'</h4>'.
-               '<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Theme zip file:').'</label> '.
-               '<input type="file" name="pkg_file" id="pkg_file" /></p>'.
-               '<p class="field"><label for="your_pwd1" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
-               form::password(array('your_pwd','your_pwd1'),20,255).'</p>'.
-               '<p><input type="submit" name="upload_pkg" value="'.__('Upload theme').'" />'.
-               $core->formNonce().'</p>'.
-               '</form>';
-               
-               # 'Fetch theme' form
-               echo
-               '<form method="post" action="blog_theme.php" id="fetchpkg" class="fieldset">'.
-               '<h4>'.__('Download a zip file').'</h4>'.
-               '<p class="field"><label for="pkg_url" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Theme zip file URL:').'</label> '.
-               form::field(array('pkg_url','pkg_url'),40,255).'</p>'.
-               '<p class="field"><label for="your_pwd2" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
-               form::password(array('your_pwd','your_pwd2'),20,255).'</p>'.
-               '<p><input type="submit" name="fetch_pkg" value="'.__('Download theme').'" />'.
-               $core->formNonce().'</p>'.
-               '</form>';
-          }
-          else
-          {
-               echo
-               '<p class="static-msg">'.
-               __('To enable this function, please give write access to your themes directory.').
-               '</p>';
-          }
-          echo '</div>';
-     }
-}
-else
-{
-     $theme_name = $core->themes->moduleInfo($core->blog->settings->system->theme,'name');
-     $core->themes->loadModuleL10Nresources($core->blog->settings->system->theme,$_lang);
-
-     echo
-     '<p><a class="back" href="blog_theme.php">'.__('Back to Blog appearance').'</a></p>';
-     
-     try
-     {
-          # Let theme configuration set their own form(s) if required
-          $standalone_config = (boolean) $core->themes->moduleInfo($core->blog->settings->system->theme,'standalone_config');
-
-          if (!$standalone_config)
-               echo '<form id="theme_config" action="blog_theme.php?conf=1" method="post" enctype="multipart/form-data">';
-
-          include $theme_conf_file;
-
-          if (!$standalone_config)
-               echo
-               '<p class="clear"><input type="submit" value="'.__('Save').'" />'.
-               $core->formNonce().'</p>'.
-               '</form>';
-
-     }
-     catch (Exception $e)
-     {
-          echo '<div class="error"><p>'.$e->getMessage().'</p></div>';
-     }
+
+     # Add a new plugin
+     echo
+     '<div class="multi-part" id="addtheme" title="'.__('Install or upgrade manually').'">';
+
+     echo '<p>'.__('You can install themes by uploading or downloading zip files.').'</p>';
+     
+     $list->displayManualForm();
+
+     echo
+     '</div>';
 }
 

admin/index.php

@@ -123 +123 @@
      }
      $__dashboard_icons['prefs'] = new ArrayObject(array(__('My preferences'),'preferences.php','images/menu/user-pref-b.png'));
+}
+
+# Check plugins and themes update from repository
+function dc_check_repository_update($mod, $url, $img, $icon)
+{
+     $repo = new dcRepository($mod, $url);
+     $repo->check();
+     $upd = $repo->get(true);
+     if (!empty($upd)) {
+          $icon[0] .= '<br />'.sprintf(__('An update is available', '%s updates are available.', count($upd)),count($upd));
+          $icon[1] .= '#update';
+          $icon[2] = 'images/menu/'.$img.'-b-update.png';
+     }
+}
+if (isset($__dashboard_icons['plugins'])) {
+     dc_check_repository_update($core->plugins, $core->blog->settings->system->repository_plugin_url, 'plugins', $__dashboard_icons['plugins']);
+}
+if (isset($__dashboard_icons['blog_theme'])) {
+     $themes = new dcThemes($core);
+     $themes->loadModules($core->blog->themes_path, null);
+     dc_check_repository_update($themes, $core->blog->settings->system->repository_theme_url, 'blog-theme', $__dashboard_icons['blog_theme']);
 }
 

admin/js/_blog_theme.js

@@ -1 +1 @@
 $(function() {
-     $('#themes-actions').hide();
-     var submit_s = $('#themes-actions input[name=select]');
-     var submit_r = $('#themes-actions input[name=remove]');
-     
-     var details = $('#themes div.theme-details');
-     $('div.theme-actions',details).hide();
-     $('input:radio',details).hide();
-     $('div.theme-info span, div.theme-info a',details).hide();
-     details.removeClass('theme-details').addClass('theme-details-js');
-     
-     var themes_wrapper = $('<div id="themes-wrapper"></div>');
-     var theme_box = $('<div id="theme-box"><div</div>');
-     $('#themes').wrap(themes_wrapper).before(theme_box);
-     
-     details.each(function() {
-          var box = this;
-          var a = $(document.createElement('a'));
-          a.attr('href','#');
-          a.attr('title',$('>div h3>label',this).text());
-          $(box).wrap(a);
-          $(box).parent().click(function(event) {
-               update_box(box);
-               event.preventDefault();
-               return false;
-          });
+     $('.module-sshot').not('.current-theme .module-sshot').each(function(){
+          var bar = $('<div>').addClass('bloc-toggler');
+          $(this).after(
+          $(bar).toggleWithLegend($(this).parent().children('.toggle-bloc'),{
+               img_on_src: dotclear.img_plus_theme_src,
+               img_on_alt: dotclear.img_plus_theme_alt,
+               img_off_src: dotclear.img_minus_theme_src,
+               img_off_alt: dotclear.img_minus_theme_alt, 
+               legend_click: true
+          }));
      });
-     
-     function update_box(e) {
-          theme_box.empty();
-          var img = $('div.theme-shot',e).clone();
-          var info = $('div.theme-info',e).clone();
-          
-          if ($(e).hasClass('current-theme')) {
-               var actions = $('div.theme-actions',e).clone();
-               actions.show();
-          } else {
-               var actions = $('<div class="theme-actions"></div>');
-               if (submit_s.length > 0  && !$('input:radio',info).attr('disabled')) {
-                    var select = $('<a href="#" class="button">' + dotclear.msg.use_this_theme + '</a>');
-                    select.addClass('select-button').click(function(){
-                         submit_s.click();
-                         return false;
-                    });
-                    actions.append(select).append('&nbsp;&nbsp;');
-               }
-               if (submit_r.length > 0 && $('input:radio',info).attr('id') != 'theme_default') {
-                    var remove = $('<a href="#" class="button delete">' + dotclear.msg.remove_this_theme + '</a>');
-                    remove.click(function() {
-                         var t_name = $(this).parents('#theme-box').find('div.theme-info h3:first').text();
-                         t_name = $.trim(t_name);
-                         if (window.confirm(dotclear.msg.confirm_delete_theme.replace('%s',t_name))) {
-                              submit_r.click();
-                         }
-                         return false;
-                    });
-                    actions.append(remove);
-               }
-          }
-          
-          $('input:radio',info).remove();
-          $('span, a',info).show();
-          
-          theme_box.append(img).append(info).append(actions);
-          details.removeClass('theme-selected');
-          $(e).addClass('theme-selected');
-          $('input:radio',e).prop('checked',true);
-     }
-     
-     update_box(details[0]);
 });

admin/js/_plugins.js

@@ +1 @@
+dotclear.moduleExpander = function(line) {
+        var td = line.firstChild;
+        
+        var img = document.createElement('img');
+        img.src = dotclear.img_plus_src;
+        img.alt = dotclear.img_plus_alt;
+        img.className = 'expand';
+        $(img).css('cursor','pointer');
+        img.line = line;
+        img.onclick = function() { dotclear.viewModuleContent(this,this.line); };
+        
+        td.insertBefore(img,td.firstChild);
+};
+
+dotclear.modulesExpander = function(line,lines) {
+        var td = line.firstChild;
+
+        var img = document.createElement('img');
+        img.src = dotclear.img_plus_src;
+        img.alt = dotclear.img_plus_alt;
+        img.className = 'expand';
+        $(img).css('cursor','pointer');
+        img.lines = lines;
+        img.onclick = function() { dotclear.viewModulesContent(this,this.lines); };
+
+        td.insertBefore(img,td.firstChild);
+};
+
+dotclear.viewModulesContent = function(img,lines) {
+        
+        action = 'toggle';
+
+        if (img.alt == dotclear.img_plus_alt) {
+                img.src = dotclear.img_minus_src;
+                img.alt = dotclear.img_minus_alt;
+                action = 'open';
+        } else {
+                img.src = dotclear.img_plus_src;
+                img.alt = dotclear.img_plus_alt;
+                action = 'close';
+        }
+        
+        lines.each(function() {
+                var td = this.firstChild;
+                dotclear.viewModuleContent(td.firstChild,td.firstChild.line,action);
+        });
+};
+
+dotclear.viewModuleContent = function(img,line,action) {
+
+        var action = action || 'toggle';
+          var cols = $('td',$(line)).length
+        var sp = line.id.split('_m_');
+          var listId=sp[0];
+          var moduleId= sp[1];
+
+        var tr = document.getElementById('pe'+moduleId);
+        
+          if ( !tr && ( action == 'toggle' || action == 'open' ) ) {
+                tr = document.createElement('tr');
+                tr.id = 'pe'+moduleId;
+
+                var td = document.createElement('td');
+                td.colSpan = cols;
+                td.className = 'expand';
+                tr.appendChild(td);
+                
+                img.src = dotclear.img_minus_src;
+                img.alt = dotclear.img_minus_alt;
+                
+                // Get post content
+                $.get('services.php',{f:'getModuleById', id: moduleId, list: listId},function(data) {
+                        var rsp = $(data).children('rsp')[0];
+                        
+                        if (rsp.attributes[0].value == 'ok') {
+                                var author = $(rsp).find('author').text();
+                                var details = $(rsp).find('details').text();
+                                var support = $(rsp).find('support').text();
+                                        var box = document.createElement('div');
+                                var dl = document.createElement('ul');
+                                dl.className = "mod-more";
+                                
+                                if (author) {
+                                        $(dl).append($('<li class="module-author">'+dotclear.msg.module_author+' '+author+'</li>'));
+                                }
+                                if (details) {
+                                        var dd = '';
+                                        dd += '<a class="module-details" href="'+details+'">'+dotclear.msg.module_details+'</a>';
+                                        if (support) {
+                                                dd += ' - ';
+                                                dd += '<a class="module-support" href="'+support+'">'+dotclear.msg.module_support+'</a>';
+                                        }
+                                        $(dl).append($('<li>'+dotclear.msg.module_help+' '+dd+'</li>'));
+                                }
+
+                                $(td).append($(box).addClass('two-boxes').append(dl));
+                                
+                                var section = $(rsp).find('section').text();
+                                var tags = $(rsp).find('tags').text();
+                                
+                                        var boxb = document.createElement('div');
+                                var dlb = document.createElement('ul');
+                                dlb.className = "mod-more";
+                                
+                                if (section) {
+                                        $(dlb).append($('<li class="module-section">'+dotclear.msg.module_section+' '+section+'</li>'));
+                                }
+                                if (tags) {
+                                        $(dlb).append($('<li class="module-tags">'+dotclear.msg.module_tags+' '+tags+'</li>'));
+                                }
+                                $(td).append($(boxb).addClass('two-boxes').append(dlb));
+                        } else {
+                                alert($(rsp).find('message').text());
+                        }
+                });
+                
+                $(line).addClass('expand');
+                line.parentNode.insertBefore(tr,line.nextSibling);
+        }
+        else if (tr && tr.style.display == 'none' && ( action == 'toggle' || action == 'open' ) )
+        {
+                $(tr).css('display', 'table-row');
+                $(line).addClass('expand');
+                img.src = dotclear.img_minus_src;
+                img.alt = dotclear.img_minus_alt;
+        }
+        else if (tr && tr.style.display != 'none' && ( action == 'toggle' || action == 'close' ) )
+        {
+                $(tr).css('display', 'none');
+                $(line).removeClass('expand');
+                img.src = dotclear.img_plus_src;
+                img.alt = dotclear.img_plus_alt;
+        }
+        
+        parentTable = $(line).parents('table');
+        if( parentTable.find('tr.expand').length == parentTable.find('tr.line').length ) {
+                img = parentTable.find('tr:not(.line) th:first img');
+                img.attr('src',dotclear.img_minus_src);
+                img.attr('alt',dotclear.img_minus_alt);
+        }
+        
+        if( parentTable.find('tr.expand').length == 0 ) {
+                img = parentTable.find('tr:not(.line) th:first img');
+                img.attr('src',dotclear.img_plus_src);
+                img.attr('alt',dotclear.img_plus_alt);
+        }
+        
+};
+
+
 $(function() {
-     $('table.plugins form input[type=submit][name=delete]').click(function() {
-          var p_name = $('input[name=plugin_id]',$(this).parent()).val();
-          return window.confirm(dotclear.msg.confirm_delete_plugin.replace('%s',p_name));
-     });
+        $('table.modules.expandable tr:not(.line)').each(function() {
+                dotclear.modulesExpander(this,$('table.modules tr.line'));
+        });
+        $('table.modules.expandable tr.line').each(function() {
+                dotclear.moduleExpander(this);
+        });
 });

admin/plugins.php

@@ -13 +13 @@
 require dirname(__FILE__).'/../inc/admin/prepend.php';
 
-dcPage::checkSuper();
-
-$default_tab = !empty($_REQUEST['tab']) ? html::escapeHTML($_REQUEST['tab']) : 'plugins';
-
-$p_paths = explode(PATH_SEPARATOR, DC_PLUGINS_ROOT);
-$p_path = array_pop($p_paths);
-unset($p_paths);
-
-$is_writable = false;
-if (is_dir($p_path) && is_writeable($p_path)) {
-     $is_writable = true;
-     $p_path_pat = preg_quote($p_path,'!');
-}
-
-$plugin_id = !empty($_POST['plugin_id']) ? $_POST['plugin_id'] : null;
-
-if ($is_writable)
-{
-     # Delete plugin
-     if ($plugin_id && !empty($_POST['delete']))
-     {
-          try
-          {
-               if (empty($_POST['deactivated']))
-               {
-                    if (!$core->plugins->moduleExists($plugin_id)) {
-                         throw new Exception(__('No such plugin.'));
-                    }
-                    
-                    $plugin = $core->plugins->getModules($plugin_id);
-                    $plugin['id'] = $plugin_id;
-                    
-                    if (!preg_match('!^'.$p_path_pat.'!', $plugin['root'])) {
-                         throw new Exception(__('You don\'t have permissions to delete this plugin.'));
-                    }
-                    
-                    # --BEHAVIOR-- pluginBeforeDelete
-                    $core->callBehavior('pluginsBeforeDelete', $plugin);
-                    
-                    $core->plugins->deleteModule($plugin_id);
-                    
-                    # --BEHAVIOR-- pluginAfterDelete
-                    $core->callBehavior('pluginsAfterDelete', $plugin);
-               }
-               else
-               {
-                    $core->plugins->deleteModule($plugin_id,true);
-               }
-               
-               http::redirect('plugins.php?removed=1');
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-     # Deactivate plugin
-     elseif ($plugin_id && !empty($_POST['deactivate']))
-     {
-          try
-          {
-               if (!$core->plugins->moduleExists($plugin_id)) {
-                    throw new Exception(__('No such plugin.'));
-               }
-               
-               $plugin = $core->plugins->getModules($plugin_id);
-               $plugin['id'] = $plugin_id;
-               
-               if (!$plugin['root_writable']) {
-                    throw new Exception(__('You don\'t have permissions to deactivate this plugin.'));
-               }
-               
-               # --BEHAVIOR-- pluginBeforeDeactivate
-               $core->callBehavior('pluginsBeforeDeactivate', $plugin);
-                    
-               $core->plugins->deactivateModule($plugin_id);
-
-               # --BEHAVIOR-- pluginAfterDeactivate
-               $core->callBehavior('pluginsAfterDeactivate', $plugin);
-                    
-               http::redirect('plugins.php');
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-     # Activate plugin
-     elseif ($plugin_id && !empty($_POST['activate']))
-     {
-          try
-          {
-               $p = $core->plugins->getDisabledModules();
-               if (!isset($p[$plugin_id])) {
-                    throw new Exception(__('No such plugin.'));
-               }
-
-               # --BEHAVIOR-- pluginBeforeActivate
-               $core->callBehavior('pluginsBeforeActivate', $plugin_id);
-               
-               $core->plugins->activateModule($plugin_id);
-
-               # --BEHAVIOR-- pluginAfterActivate
-               $core->callBehavior('pluginsAfterActivate', $plugin_id);
-               
-               http::redirect('plugins.php');
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-     # Plugin upload
-     elseif ((!empty($_POST['upload_pkg']) && !empty($_FILES['pkg_file'])) ||
-          (!empty($_POST['fetch_pkg']) && !empty($_POST['pkg_url'])))
-     {
-          try
-          {
-               if (empty($_POST['your_pwd']) || !$core->auth->checkPassword(crypt::hmac(DC_MASTER_KEY,$_POST['your_pwd']))) {
-                    throw new Exception(__('Password verification failed'));
-               }
-               
-               if (!empty($_POST['upload_pkg']))
-               {
-                    files::uploadStatus($_FILES['pkg_file']);
-                    
-                    $dest = $p_path.'/'.$_FILES['pkg_file']['name'];
-                    if (!move_uploaded_file($_FILES['pkg_file']['tmp_name'],$dest)) {
-                         throw new Exception(__('Unable to move uploaded file.'));
-                    }
-               }
-               else
-               {
-                    $url = urldecode($_POST['pkg_url']);
-                    $dest = $p_path.'/'.basename($url);
-                    
-                    try
-                    {
-                         $client = netHttp::initClient($url,$path);
-                         $client->setUserAgent('Dotclear - http://www.dotclear.org/');
-                         $client->useGzip(false);
-                         $client->setPersistReferers(false);
-                         $client->setOutput($dest);
-                         $client->get($path);
-                    }
-                    catch( Exception $e)
-                    {
-                         throw new Exception(__('An error occurred while downloading the file.'));
-                    }
-                    
-                    unset($client);
-               }
-
-               # --BEHAVIOR-- pluginBeforeAdd
-               $core->callBehavior('pluginsBeforeAdd', $plugin_id);
-                              
-               $ret_code = $core->plugins->installPackage($dest,$core->plugins);
-
-               # --BEHAVIOR-- pluginAfterAdd
-               $core->callBehavior('pluginsAfterAdd', $plugin_id);
-               
-               http::redirect('plugins.php?added='.$ret_code);
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-               $default_tab = 'addplugin';
-          }
-     }
-}
-
-# Plugin install
-$plugins_install = $core->plugins->installModules();
-
-/* DISPLAY Main page
--------------------------------------------------------- */
+dcPage::check('admin');
+
+# --------------------------------------------------
+# @todo Add settings to Dotclear update features
+if ($core->blog->settings->system->plugins_allow_multi_install === null) {
+     $core->blog->settings->system->put(
+          'plugins_allow_multi_install', false, 'boolean', 'Allow multi-installation for plugins', true, true
+     );
+}
+if ($core->blog->settings->system->repository_plugin_url === null) {
+     $core->blog->settings->system->put(
+          'repository_plugin_url', 'http://update.dotaddict.org/dc2/plugins.xml', 'string', 'Plugins XML feed location', true, true
+     );
+}
+# --------------------------------------------------
+
+# -- Repository helper --
+$repository = new dcRepository(
+     $core->plugins, 
+     $core->blog->settings->system->repository_plugin_url
+);
+$repository->check();
+
+# -- Page helper --
+$list = new adminModulesList(
+     $core, 
+     DC_PLUGINS_ROOT,
+     $core->blog->settings->system->plugins_allow_multi_install
+);
+
+$list::setDistributedModules(array(
+     'aboutConfig',
+     'akismet',
+     'antispam',
+     'attachments',
+     'blogroll',
+     'blowupConfig',
+     'daInstaller',
+     'fairTrackbacks',
+     'importExport',
+     'maintenance',
+     'pages',
+     'pings',
+     'simpleMenu',
+     'tags',
+     'themeEditor',
+     'userPref',
+     'widgets'
+));
+
+# -- Display module configuration page --
+if ($list->setConfigurationFile($core->plugins)) {
+
+     # Get content before page headers
+     include $list->getConfigurationFile();
+
+     # Gather content
+     $list->setConfigurationContent();
+
+     # Display page
+     dcPage::open(__('Plugins management'),
+
+          # --BEHAVIOR-- pluginsToolsHeaders
+          $core->callBehavior('pluginsToolsHeaders', $core, true),
+
+          dcPage::breadcrumb(
+               array(
+                    html::escapeHTML($core->blog->name) => '',
+                    '<a href="'.$list->getPageURL().'">'.__('Plugins management').'</a>' => '',
+                    '<span class="page-title">'.__('Plugin configuration').'</span>' => ''
+               ))
+     );
+
+     # Message
+     if (!empty($_GET['done'])){
+          dcPage::success(__('Plugin successfully configured.'));
+     }
+
+     # Display previously gathered content
+     $list->getConfigurationContent();
+
+     dcPage::close();
+
+     # Stop reading code here
+     return;
+}
+
+# -- Execute actions --
+if (!empty($_POST) && empty($_REQUEST['conf']) && $core->auth->isSuperAdmin() && $list->isPathWritable()) {
+     try {
+          $list->executeAction('plugins', $core->plugins, $repository);
+     }
+     catch (Exception $e) {
+          $core->error->add($e->getMessage());
+     }
+}
+
+# -- Plugin install --
+$plugins_install = null;
+if (!$core->error->flag()) {
+     $plugins_install = $core->plugins->installModules();
+}
+
+# -- Page header --
 dcPage::open(__('Plugins management'),
      dcPage::jsLoad('js/_plugins.js').
-     dcPage::jsPageTabs($default_tab),
+     dcPage::jsPageTabs().
+
+     # --BEHAVIOR-- pluginsToolsHeaders
+     $core->callBehavior('pluginsToolsHeaders', $core, false),
+
      dcPage::breadcrumb(
           array(
@@ -199 +131 @@
 );
 
-if (!empty($_GET['removed'])) {
-     dcPage::success(__('Plugin has been successfully deleted.'));
-}
-if (!empty($_GET['added'])) {
-     dcPage::success(($_GET['added'] == 2 ? __('Plugin has been successfully upgraded') : __('Plugin has been successfully installed.')));
-}
-
-# Plugins install messages
-if (!empty($plugins_install['success']))
-{
-     echo '<div class="static-msg">'.__('Following plugins have been installed:').'<ul>';
+# -- Succes messages --
+if (!empty($_GET['msg'])) {
+     $list->displayMessage($_GET['msg']);
+}
+
+# -- Plugins install messages --
+if (!empty($plugins_install['success'])) {
+     echo 
+     '<div class="static-msg">'.__('Following plugins have been installed:').'<ul>';
      foreach ($plugins_install['success'] as $k => $v) {
-          echo '<li>'.$k.'</li>';
-     }
-     echo '</ul></div>';
-}
-if (!empty($plugins_install['failure']))
-{
-     echo '<div class="error">'.__('Following plugins have not been installed:').'<ul>';
+          echo 
+          '<li>'.$k.'</li>';
+     }
+     echo 
+     '</ul></div>';
+}
+if (!empty($plugins_install['failure'])) {
+     echo 
+     '<div class="error">'.__('Following plugins have not been installed:').'<ul>';
      foreach ($plugins_install['failure'] as $k => $v) {
-          echo '<li>'.$k.' ('.$v.')</li>';
-     }
-     echo '</ul></div>';
+          echo 
+          '<li>'.$k.' ('.$v.')</li>';
+     }
+     echo 
+     '</ul></div>';
+}
+
+# -- Display modules lists --
+if ($core->auth->isSuperAdmin() && $list->isPathWritable()) {
+
+     # Updated modules from repo
+     $modules = $repository->get(true);
+     if (!empty($modules)) {
+          echo 
+          '<div class="multi-part" id="update" title="'.html::escapeHTML(__('Update plugins')).'">'.
+          '<h3>'.html::escapeHTML(__('Update plugins')).'</h3>'.
+          '<p>'.sprintf(
+               __('There is one plugin to update available from %2$s.', 'There are %s plugins to update available from %s.', count($modules)),
+               count($modules),
+               '<a href="http://dotaddict.org/dc2/plugins">Dotaddict</a>'
+          ).'</p>';
+
+          $list
+               ->newList('plugin-update')
+               ->setModules($modules)
+               ->setPageTab('update')
+               ->displayModulesList(
+                    /*cols */      array('icon', 'name', 'version', 'current_version', 'desc'),
+                    /* actions */  array('update')
+               );
+
+          echo
+          '</div>';
+     }
 }
 
 # List all active plugins
-echo '<p>'.__('Plugins add new functionalities to Dotclear. '.
-'Here you can activate or deactivate installed plugins.').'</p>';
-
-echo (!$core->plugins->moduleExists('daInstaller') ?
-     sprintf('<p><strong>'.__('You can find additional plugins for your blog on %s.').'</strong></p>',
-          '<a href="http://plugins.dotaddict.org/dc2/">Dotaddict</a>') :
-     sprintf('<p><strong>'.__('You can find additional plugins for your blog on %s or using the %s.').'</strong></p>',
-          '<a href="http://plugins.dotaddict.org/dc2/">Dotaddict</a>',
-          '<a href="plugin.php?p=daInstaller">'.__('DotAddict.org Installer').'</a>'));
-
-if ($is_writable) {
-     echo '<p>'.__('To install or upgrade a plugin you generally just need to upload it '.
-     'in "Install or upgrade a plugin" section.');
-} else {
-     echo '<p>'.__('To install or upgrade a plugin you just need to extract it in your plugins directory.');
-}
-echo '</p>';
-
 echo
-'<div class="multi-part" id="plugins" title="'.__('Plugins').'">';
-
-$p_available = $core->plugins->getModules();
-uasort($p_available,create_function('$a,$b','return strcasecmp($a["name"],$b["name"]);'));
-if (!empty($p_available)) 
-{
+'<div class="multi-part" id="plugins" title="'.__('Installed plugins').'">';
+
+$modules = $core->plugins->getModules();
+if (!empty($modules)) {
+
      echo
      '<h3>'.__('Activated plugins').'</h3>'.
-     '<div class="table-outer clear">'.
-     '<table class="plugins"><tr>'.
-     '<th>'.__('Plugin').'</th>'.
-     '<th class="nowrap">'.__('Version').'</th>'.
-     '<th class="nowrap">'.__('Details').'</th>'.
-     '<th class="nowrap">'.__('Action').'</th>'.
-     '</tr>';
-     
-     $distrib_plugins = array('aboutConfig','akismet','antispam','attachments','blogroll','blowupConfig','daInstaller',
-          'fairTrackbacks','importExport','maintenance','pages','pings','simpleMenu','tags','themeEditor','userPref','widgets');
-     $distrib_img = '<img src="images/dotclear_pw.png"'.
-          ' alt="'.__('Plugin from official distribution').'" title="'.__('Plugin from official distribution').'" />';
-
-     foreach ($p_available as $k => $v)
-     {
-          $is_deletable = $is_writable && preg_match('!^'.$p_path_pat.'!',$v['root']);
-          $is_deactivable = $v['root_writable'];
-          $is_distrib = in_array($k, $distrib_plugins);
-          
-          echo
-          '<tr class="line wide">'.
-          '<td class="minimal nowrap"><strong>'.html::escapeHTML($k).'</strong></td>'.
-          '<td class="minimal">'.html::escapeHTML($v['version']).'</td>'.
-          '<td class="maximal'.($is_distrib ? ' distrib' : '').'"><strong>'.html::escapeHTML(__($v['name'])).'</strong> '.
-          '<br />'.html::escapeHTML(__($v['desc'])).($is_distrib ? ' '.$distrib_img : '').'</td>'.
-          '<td class="nowrap action">';
-          
-          if ($is_deletable || $is_deactivable)
-          {
-               echo
-               '<form action="plugins.php" method="post">'.
-               '<div>'.
-               $core->formNonce().
-               form::hidden(array('plugin_id'),html::escapeHTML($k)).
-               ($is_deactivable ? '<input type="submit" name="deactivate" value="'.__('Deactivate').'" /> ' : '').
-               ($is_deletable ? '<input type="submit" class="delete" name="delete" value="'.__('Delete').'" /> ' : '').
-               '</div>'.
-               '</form>';
-          }
-          
-          echo
-          '</td>'.
-          '</tr>';
-     }
-     echo
-     '</table></div>';
-}
-
-$p_disabled = $core->plugins->getDisabledModules();
-uksort($p_disabled,create_function('$a,$b','return strcasecmp($a,$b);'));
-if (!empty($p_disabled))
-{
+     '<p>'.__('Manage installed plugins from this list.').'</p>';
+
+     $list
+          ->newList('plugin-activate')
+          ->setModules($modules)
+          ->setPageTab('plugins')
+          ->displayModulesList(
+               /* cols */          array('expander', 'icon', 'name', 'config', 'version', 'desc', 'distrib'),
+               /* actions */  array('deactivate', 'delete')
+          );
+}
+
+# Deactivated modules
+$modules = $core->plugins->getDisabledModules();
+if (!empty($modules)) {
+
      echo
      '<h3>'.__('Deactivated plugins').'</h3>'.
-     '<div class="clear table-outer">'.
-     '<table class="plugins"><tr>'.
-     '<th>'.__('Plugin').'</th>'.
-     '<th class="nowrap">'.__('Action').'</th>'.
-     '</tr>';
-     
-     foreach ($p_disabled as $k => $v)
-     {
-          $is_deletable = $is_writable && preg_match('!^'.$p_path_pat.'!',$v['root']);
-          $is_activable = $v['root_writable'];
-          
-          echo
-          '<tr class="line wide">'.
-          '<td class="maximal nowrap"><strong>'.html::escapeHTML($k).'</strong></td>'.
-          '<td class="nowrap action">';
-          
-          if ($is_deletable || $is_activable)
-          {
-               echo
-               '<form action="plugins.php" method="post">'.
-               '<div>'.
-               $core->formNonce().
-               form::hidden(array('plugin_id'),html::escapeHTML($k)).
-               form::hidden(array('deactivated'),1).
-               ($is_activable ? '<input type="submit" name="activate" value="'.__('Activate').'" /> ' : '').
-               ($is_deletable ? '<input type="submit" class="delete" name="delete" value="'.__('Delete').'" /> ' : '').
-               '</div>'.
-               '</form>';
-          }
-          
-          echo
-          '</td>'.
-          '</tr>';
-     }
-     echo
-     '</table></div>';
-}
-
-echo '</div>';
-
-# Add a new plugin
-echo
-'<div class="multi-part" id="addplugin" title="'.__('Install or upgrade a plugin').'">';
-
-if ($is_writable)
-{
+     '<p>'.__('Deactivated plugins are installed but not usable. You can activate them from here.').'</p>';
+
+     $list
+          ->newList('plugin-deactivate')
+          ->setModules($modules)
+          ->setPageTab('plugins')
+          ->displayModulesList(
+               /* cols */          array('icon', 'name', 'distrib'),
+               /* actions */  array('activate', 'delete')
+          );
+}
+
+echo 
+'</div>';
+
+if ($core->auth->isSuperAdmin() && $list->isPathWritable()) {
+
+     # New modules from repo
+     $search = $list->getSearchQuery();
+     $modules = $search ? $repository->search($search) : $repository->get();
+
+     echo
+     '<div class="multi-part" id="new" title="'.__('Add plugins from Dotaddict').'">'.
+     '<h3>'.__('Add plugins from Dotaddict repository').'</h3>';
+
+     $list
+          ->newList('plugin-new')
+          ->setModules($modules)
+          ->setPageTab('new')
+          ->displaySearchForm()
+          ->displayNavMenu()
+          ->displayModulesList(
+               /* cols */          array('expander', 'name', 'version', 'desc'),
+               /* actions */  array('install'),
+               /* nav limit */     true
+          );
+
+     echo
+     '<p class="info vertical-separator">'.sprintf(
+          __("Visit %s repository, the resources center for Dotclear."),
+          '<a href="http://dotaddict.org/dc2/plugins">Dotaddict</a>'
+          ).
+     '</p>'.
+
+     '</div>';
+
+     # Add a new plugin
+     echo
+     '<div class="multi-part" id="addplugin" title="'.__('Install or upgrade manually').'">';
+
      echo '<p>'.__('You can install plugins by uploading or downloading zip files.').'</p>';
      
-     # 'Upload plugin' form
-     echo
-     '<form method="post" action="plugins.php" id="uploadpkg" enctype="multipart/form-data" class="fieldset">'.
-     '<h3>'.__('Upload a zip file').'</h3>'.
-     '<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Plugin zip file:').'</label> '.
-     '<input type="file" id="pkg_file" name="pkg_file" /></p>'.
-     '<p class="field"><label for="your_pwd1" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
-     form::password(array('your_pwd','your_pwd1'),20,255).'</p>'.
-     '<p><input type="submit" name="upload_pkg" value="'.__('Upload plugin').'" />'.
-     $core->formNonce().
-     '</p>'.
-     '</form>';
-     
-     # 'Fetch plugin' form
-     echo
-     '<form method="post" action="plugins.php" id="fetchpkg" class="fieldset">'.
-     '<h3>'.__('Download a zip file').'</h3>'.
-     '<p class="field"><label for="pkg_url" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Plugin zip file URL:').'</label> '.
-     form::field(array('pkg_url','pkg_url'),40,255).'</p>'.
-     '<p class="field"><label for="your_pwd2" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
-     form::password(array('your_pwd','your_pwd2'),20,255).'</p>'.
-     '<p><input type="submit" name="fetch_pkg" value="'.__('Download plugin').'" />'.
-     $core->formNonce().'</p>'.
-     '</form>';
-}
-else
-{
-     echo
-     '<p class="static-msg">'.
-     __('To enable this function, please give write access to your plugins directory.').
-     '</p>';
-}
-echo '</div>';
+     $list->displayManualForm();
+
+     echo
+     '</div>';
+}
 
 # --BEHAVIOR-- pluginsToolsTabs
-$core->callBehavior('pluginsToolsTabs',$core);
+$core->callBehavior('pluginsToolsTabs', $core);
+
+# -- Notice for super admin --
+if ($core->auth->isSuperAdmin() && !$list->isPathWritable()) {
+     echo 
+     '<p class="warning">'.__('Some functions are disabled, please give write access to your plugins directory to enable them.').'</p>';
+}
 
 dcPage::close();

admin/services.php

@@ -27 +27 @@
 $core->rest->addFunction('searchMeta',array('dcRestMethods','searchMeta'));
 $core->rest->addFunction('setSectionFold',array('dcRestMethods','setSectionFold'));
+$core->rest->addFunction('getModuleById',array('dcRestMethods','getModuleById'));
 
 $core->rest->serve();
@@ -442 +443 @@
           return true;
      }
-          
-     
+     
+     public static function getModuleById($core, $get, $post)
+     {
+          if (empty($get['id'])) {
+                    throw new Exception('No module ID');
+          }
+          if (empty($get['list'])) {
+                    throw new Exception('No list ID');
+          }
+
+          $id = $get['id'];
+          $list = $get['list'];
+          $module = array();
+
+          if ($list == 'plugin-activate') {
+               $modules = $core->plugins->getModules();
+               if (empty($modules) || !isset($modules[$id])) {
+                    throw new Exception('Unknow module ID');
+               }
+               $module = $modules[$id];
+          }
+          elseif ($list == 'plugin-new') {
+               $repository = new dcRepository(
+                    $core->plugins, 
+                    $core->blog->settings->system->repository_plugin_url
+               );
+               $repository->check();
+
+               $modules = $repository->get();
+               if (empty($modules) || !isset($modules[$id])) {
+                    throw new Exception('Unknow module ID');
+               }
+               $module = $modules[$id];
+          }
+          else {
+               // behavior not implemented yet
+          }
+
+          if (empty($module)) {
+                    throw new Exception('Unknow module ID');
+          }
+
+          $module = adminModulesList::parseModuleInfo($id, $module);
+
+          $rsp = new xmlTag('module');
+          $rsp->id = $id;
+          
+          foreach($module as $k => $v) {
+               $rsp->{$k}((string) $v);
+          }
+
+          return $rsp;
+     }
 }
 ?>

admin/style/default.css

@@ -158 +158 @@
      -moz-box-sizing: border-box; 
      -webkit-box-sizing: border-box; 
-     box-sizing: border-box;  
+     box-sizing: border-box;
+     text-align: left;
      }
 .two-boxes {
@@ -1532 +1533 @@
                     }
 /* ------------------------------------------------------------------- blog_theme.php */
-#themes {
-     margin: 0;
-     width: 100%;
-     padding: 0;
-     }
-     .theme-details {
-          border-top: 1px solid #ccc;
-          padding: 12px;
-          display: inline-block;
-          vertical-align: top;
-          width: 284px;
-          }
-          .theme-details.current-theme {
-               background: #eef;
-               }
-          .theme-details:hover {
-               background: #f3f3f3;
-               }
-          .theme-shot img {
-               display: block;
-               border: 1px solid #ccc;
-               margin-bottom: 1.5em;
-               }
-          span.theme-desc {
-               display: block;
-               }
-          span.theme-version {
-               color: #676e78;
-               }
-          .theme-css {
-               display: block;
-               }
-     #themes-actions {
-          border-bottom: 1px solid #999;
-          margin-bottom: 3em;
-          }
-/* Themes list, JS version */
-#themes-wrapper {
-     display: table;
-     }
-     #themes-wrapper #themes {
-          display: table-cell;
-          vertical-align: top;
-          padding-left: 1em;
-          }
-     #theme-box {
-          display: table-cell;
-          vertical-align: top;
-          padding: 0;
-          width: 312px;
-          border: 1px solid #ccc;
-          border-radius: 3px;
-          }
-          #theme-box .theme-shot,
-          #theme-box .theme-info,
-          #theme-box .theme-actions {
-               background: #eef;
-               padding: 1em 16px;
-               margin: 0;
-               }
-          #theme-box .theme-shot img {
-               display: block;
-               width: 280px;
-               height: 245px;
-               border: 1px solid #ccc;
-               }
-          #theme-box h4 {
-               color: #000;
-               background: #eef;
-               }
-          #theme-box span.theme-version {
-               color: #676e78;
-               }
-          #theme-box span.theme-parent-ok {
-               color: #676e78;
-               }
-          #theme-box span.theme-parent-missing {
-               color: #c00;
-               font-weight:bold;
-               }
-          #theme-box .theme-actions {
-               border-bottom: 1px solid #ccc;
-               }
-#themes .theme-details-js {
+.box.theme {
+     margin: .5em;
+     padding: 1em 1em .5em 1em;
+     border: 1px solid #ccc;
+     }
+.box.current-theme {
+     width: 652px;
+     margin: .5em;
+     padding: 1em 0 .5em 1em;
+     background: #FCFDFD;
+     border: 1px solid #9AC123;
+     -webkit-border-radius: .5em;
+                  border-radius: .5em;  
+     }
+#theme-new .box.theme {
+     width: 280px;
+     }
+.module-name {
+     margin-bottom: .5em;
+     }
+.module-sshot img {
+     border: 1px solid #ddd;
+     padding: .5em;
+     background: #f7f7f7;
+     box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
+     }
+.module-actions {
+     margin-top: 1em;
+     }
+.current-theme .module-sshot img {
      float: left;
-     width: 120px;
-     height: 150px;
-     margin: 0 12px 24px;
-     padding: 12px 12px 0;
+     margin-right: 2em;
+     margin-bottom: 1em;
+     }
+.bloc-toggler {
      text-align: center;
-     background: #f3f3f3;
-     border: 1px solid #ddd;
-     cursor: pointer;
-     border-radius: 4px;
-     }
-     #themes .theme-details-js label {
-          cursor: pointer;
-          }
-     #themes .theme-details-js.theme-selected {
-          background: #e7e7e7;
-          border: 1px solid #999;
-          }
-     #themes .theme-details-js .theme-shot img {
-          width: 120px;
-          height: 105px;
-          border: 1px solid #fff;
-          }
-     #themes a:focus div, #themes a:hover div,
-     #themes a:focus div.current-theme, #themes a:hover div.current-theme {
-          background: #bee74b;
-          }
+}
 /* ------------------------------------------------------------------ categories.php */
 #categories {
@@ -1947 +1874 @@
           }
 /* -------------------------------------------------------------------- plugins.php */
-#plugins td.action {
+.modules td.module-actions, .modules td.module-icon {
      vertical-align: middle;
      }
-.distrib img {
+.modules td.module-icon img:last-child {
+     width: 16px;
+     height: 16px;
+     }
+.modules td.module-icon img.expand {
+     margin-bottom: 3px;
+     }
+.modules td.module-distrib img {
      display: block;
      float: right;
-     margin-top: -1em;
+     }
+.modules dt {
+     font-weight: bold;
+     }
+.modules a.module-details {
+     background: transparent url(search.png) no-repeat 2px 2px;
+     padding: 4px 4px 0 20px;
+     }
+.modules a.module-support {
+     background: transparent url(../images/page_help.png) no-repeat 2px 2px;
+     padding: 4px 4px 0 20px;
+     }
+#m_search {    
+     background: transparent url(search.png) no-repeat 4px center;
+     padding-left: 20px;
+     }
+.modules tr.expand, .modules td.expand {
+     background: #f7f7f7;
+     border-color: #bee74b;
+     }
+.modules tr.expand td:first-child {
+     font-weight: bold;
+     background: #DFE5E7;
+     }
+.modules td.expand {
+     padding: 0;
+     }
+.mod-more, .mod-more li {
+     margin: .25em 0 0 1em;
+     padding: 0;
+     list-style-type: none;
+     }
+.mod-more {
+     padding-top: .5em;
      }
 /* ---------------------------------------------------------- post.php, page.php */

inc/admin/lib.dc.page.php

@@ -571 +571 @@
           self::jsVar('dotclear.img_menu_on','images/menu_on.png').
           self::jsVar('dotclear.img_menu_off','images/menu_off.png').
+          
+          self::jsVar('dotclear.img_plus_theme_src','images/plus-theme.png').
+          self::jsVar('dotclear.img_plus_theme_alt',__('uncover')).
+          self::jsVar('dotclear.img_minus_theme_src','images/minus-theme.png').
+          self::jsVar('dotclear.img_minus_theme_alt',__('hide')).
 
           self::jsVar('dotclear.msg.help',
@@ -654 +659 @@
           self::jsVar('dotclear.msg.load_enhanced_uploader',
                __('Loading enhanced uploader, please wait.')).
+
+          self::jsVar('dotclear.msg.module_author',
+               __('Author:')).
+          self::jsVar('dotclear.msg.module_details',
+               __('Details')).
+          self::jsVar('dotclear.msg.module_support',
+               __('Support')).
+          self::jsVar('dotclear.msg.module_help',
+               __('Help:')).
+          self::jsVar('dotclear.msg.module_section',
+               __('Section:')).
+          self::jsVar('dotclear.msg.module_tags',
+               __('Tags:')).
                "\n//]]>\n".
           "</script>\n";

inc/prepend.php

@@ -46 +46 @@
 $__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php';
 $__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php';
+$__autoload['dcRepository']             = dirname(__FILE__).'/core/class.dc.repository.php';
+$__autoload['dcRepositoryReader']       = dirname(__FILE__).'/core/class.dc.repository.reader.php';
+$__autoload['dcRepositoryParser']       = dirname(__FILE__).'/core/class.dc.repository.parser.php';
 
 $__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
@@ -61 +64 @@
 $__autoload['dcPager']        = dirname(__FILE__).'/admin/lib.pager.php';
 $__autoload['dcAdminCombos']            = dirname(__FILE__).'/admin/lib.admincombos.php';
+$__autoload['adminModulesList']              = dirname(__FILE__).'/admin/lib.moduleslist.php';
+$__autoload['adminThemesList']               = dirname(__FILE__).'/admin/lib.moduleslist.php';
 
 $__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php';

plugins/maintenance/_admin.php

@@ -29 +29 @@
 $core->addBehavior('adminAfterDashboardOptionsUpdate', array('dcMaintenanceAdmin',   'adminAfterDashboardOptionsUpdate'));
 $core->addBehavior('adminPageHelpBlock',     array('dcMaintenanceAdmin',   'adminPageHelpBlock'));
+$core->addBehavior('pluginsToolsHeaders',    array('dcMaintenanceAdmin',   'pluginsToolsHeaders'));
 
 /**
@@ -223 +224 @@
           $core->auth->user_prefs->maintenance->put('dashboard_item', !empty($_POST['maintenance_dashboard_item']), 'boolean');
      }
-
 
      /**
@@ -294 +294 @@
           }
      }
+
+     /**
+      * Add javascript for plugin configuration.
+      *
+      * @param $core     <b>dcCore</b>  dcCore instance
+      * @param $module   <b>mixed</b>   Module ID or false if none
+      * @return     <b>string</b>  Header code for js inclusion
+      */
+     public static function pluginsToolsHeaders($core, $module)
+     {
+          if ($module == 'maintenance') {
+               return dcPage::jsLoad('index.php?pf=maintenance/js/settings.js');
+          }
+     }
 }

plugins/maintenance/index.php

@@ -27 +27 @@
 $code = empty($_POST['code']) ? null : (integer) $_POST['code'];
 $tab = empty($_REQUEST['tab']) ? '' : $_REQUEST['tab'];
-
-// Save settings
-
-if (!empty($_POST['settings'])) {
-
-     try {
-          $core->blog->settings->maintenance->put(
-               'plugin_message', 
-               !empty($_POST['settings_plugin_message']), 
-               'boolean', 
-               'Display alert message of late tasks on plugin page', 
-               true, 
-               true
-          );
-
-          foreach($tasks as $t) {
-               if (!empty($_POST['settings_recall_type']) && $_POST['settings_recall_type'] == 'all') {
-                    $ts = $_POST['settings_recall_time'];
-               }
-               else {
-                    $ts = empty($_POST['settings_ts_'.$t->id()]) ? 0 : $_POST['settings_ts_'.$t->id()];
-               }
-               $core->blog->settings->maintenance->put(
-                    'ts_'.$t->id(), 
-                    abs((integer) $ts), 
-                    'integer', 
-                    sprintf('Recall time for task %s', $t->id()), 
-                    true, 
-                    $t->blog()
-               );
-          }
-          
-          http::redirect($p_url.'&done=1&tab='.$tab.'#'.$tab);
-     }
-     catch(Exception $e) {
-          $core->error->add($e->getMessage());
-     }
-}
 
 // Get task object
@@ -287 +249 @@
           '</div>';
      }
-
-     // Settings
-
-     echo 
-     '<div id="settings" class="multi-part" title="'.__('Alert settings').'">'.
-     '<h3>'.__('Alert settings').'</h3>'.
-     '<form action="'.$p_url.'" method="post">'.
-
-     '<h4 class="pretty-title">'.__('Activation').'</h4>'.
-     '<p><label for="settings_plugin_message" class="classic">'.
-     form::checkbox('settings_plugin_message', 1, $core->blog->settings->maintenance->plugin_message).
-     __('Display alert messages on late tasks').'</label></p>'.
-
-     '<p class="info">'.sprintf(
-          __('You can place list of late tasks on your %s.'),
-          '<a href="preferences.php#user-favorites">'.__('Dashboard').'</a>'
-     ).'</p>'.
-
-     '<h4 class="pretty-title vertical-separator">'.__('Frequency').'</h4>'.
-
-     '<p class="vertical-separator">'.form::radio(array('settings_recall_type', 'settings_recall_all'), 'all').' '.
-     '<label class="classic" for="settings_recall_all">'.
-     '<strong>'.__('Use one recall time for all tasks').'</strong></label>'.
-
-     '<p class="field wide vertical-separator"><label for="settings_recall_time">'.__('Recall time for all tasks:').'</label>'.
-     form::combo('settings_recall_time', $combo_ts, 'seperate', 'recall-for-all').
-     '</p>'.
-
-     '<p class="vertical-separator">'.form::radio(array('settings_recall_type', 'settings_recall_separate'), 'separate', 1).' '.
-     '<label class="classic" for="settings_recall_separate">'.
-     '<strong>'.__('Use one recall time per task').'</strong></label>';
-
-     foreach($tasks as $t)
-     {
-          echo
-          '<div class="two-boxes">'.
-
-          '<p class="field wide"><label for="settings_ts_'.$t->id().'">'.$t->task().'</label>'.
-          form::combo('settings_ts_'.$t->id(), $combo_ts, $t->ts(), 'recall-per-task').
-          '</p>'.
-
-          '</div>';
-     }
-
-     echo 
-     '<p class="field wide"><input type="submit" value="'.__('Save this settings').'" /> '.
-     form::hidden(array('tab'), 'settings').
-     form::hidden(array('settings'), 1).
-     $core->formNonce().'</p>'.
-     '</form>'.
-     '</div>';
 }