Changeset 2156:5cdb254a24d2 for admin

Timestamp:

09/29/13 23:10:54 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Message:

Add rest service to get more module info on modules list through ajax

Location:

admin

Files:

• images/module.png (added)
• js/_plugins.js (modified) (1 diff)
• plugins.php (modified) (6 diffs)
• services.php (modified) (2 diffs)
• style/default.css (modified) (1 diff)

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('dl');
+                                
+                                if (author) {
+                                        $(dl).append($('<dt>'+dotclear.msg.module_author+'</dt><dd>'+author+'</dd>'));
+                                }
+                                if (details) {
+                                        var dd = '';
+                                        dd += '<a class="details" href="'+details+'">'+dotclear.msg.module_details+'</a>';
+                                        if (support) {
+                                                dd += ' - ';
+                                                dd += '<a class="support" href="'+support+'">'+dotclear.msg.module_support+'</a>';
+                                        }
+                                        $(dl).append($('<dt>'+dotclear.msg.module_help+'</dt><dd>'+dd+'</dd>'));
+                                }
+
+                                $(td).append($(box).addClass('box').append(dl));
+                                
+                                var section = $(rsp).find('section').text();
+                                var tags = $(rsp).find('tags').text();
+                                
+                                        var boxb = document.createElement('div');
+                                var dlb = document.createElement('dl');
+                                
+                                if (section) {
+                                        $(dlb).append($('<dt>'+dotclear.msg.module_section+'</dt><dd>'+section+'</dd>'));
+                                }
+                                if (tags) {
+                                        $(dlb).append($('<dt>'+dotclear.msg.module_tags+'</dt><dd>'+tags+'</dd>'));
+                                }
+                                $(td).append($(boxb).addClass('box').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

@@ -104 +104 @@
      dcPage::jsLoad('js/_plugins.js').
      dcPage::jsPageTabs().
+
+     # --BEHAVIOR-- pluginsToolsHeaders
      $core->callBehavior('pluginsToolsHeaders', $core),
+
      dcPage::breadcrumb(
           array(
@@ -155 +158 @@
 
           $list
+               ->newList('plugin-update')
                ->setModules($modules)
                ->setPageTab('update')
                ->displayModulesList(
-                    /*cols */ array('icon', 'name', 'version', 'current_version', 'desc'),
+                    /*cols */      array('icon', 'name', 'version', 'current_version', 'desc'),
                     /* actions */  array('update')
                );
@@ -179 +183 @@
 
      $list
+          ->newList('plugin-activate')
           ->setModules($modules)
           ->setPageTab('plugins')
           ->displayModulesList(
-               /* cols */          array('icon', 'name', 'config', 'version', 'desc', 'distrib'),
+               /* cols */          array('expander', 'icon', 'name', 'config', 'version', 'desc', 'distrib'),
                /* actions */  array('deactivate', 'delete')
           );
@@ -196 +201 @@
 
      $list
+          ->newList('plugin-deactivate')
           ->setModules($modules)
           ->setPageTab('plugins')
@@ -222 +228 @@
 
      $list
+          ->newList('plugin-new')
           ->setModules($modules)
           ->setPageTab('new')
@@ -227 +234 @@
           ->displayNavMenu()
           ->displayModulesList(
-               /* cols */          array('name', 'version', 'desc'),
+               /* cols */          array('expander', 'name', 'version', 'desc'),
                /* actions */  array('install'),
                /* nav limit */     true

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::setModuleInfo($id, $module);
+
+          $rsp = new xmlTag('module');
+          $rsp->id = $id;
+          
+          foreach($module as $k => $v) {
+               $rsp->{$k}((string) $v);
+          }
+
+          return $rsp;
+     }
 }
 ?>

admin/style/default.css

@@ -1966 +1966 @@
           }
 /* -------------------------------------------------------------------- plugins.php */
-#plugins td.action {
+.modules td.action, .modules td.icon {
      vertical-align: middle;
      }
-.icon img {
+.modules td.icon img:last-child {
      width: 16px;
      height: 16px;
      }
-.distrib img {
+.modules td.distrib img {
      display: block;
      float: right;
+     }
+.modules dt {
+     font-weight: bold;
+     }
+.modules a.details {
+     background: transparent url(search.png) no-repeat 2px 2px;
+     padding: 4px 4px 0 20px;
+     }
+.modules a.support {
+     background: transparent url(../images/page_help.png) no-repeat 2px 2px;
+     padding: 4px 4px 0 20px;
      }
 /* ---------------------------------------------------------- post.php, page.php */