Changeset 2354:d388f7fdcb4e

Timestamp:

10/13/13 21:55:41 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

2.6

Message:

Move addtionnal info on plugins list from js to php, addresses #1771

Files:

• admin/js/_plugins.js (modified) (1 diff)
• admin/plugins.php (modified) (1 diff)
• admin/style/default.css (modified) (1 diff)
• inc/admin/lib.moduleslist.php (modified) (9 diffs)

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 bloc = document.createElement('ul');
-                                bloc.className = "mod-more";
-                                
-                                if (author) {
-                                        $(bloc).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>';
-                                        }
-                                        $(bloc).append($('<li>'+dd+'</li>'));
-                                }
-
-                                $(td).append($(box).append(bloc));
-                                
-                                var section = $(rsp).find('section').text();
-                                var tags = $(rsp).find('tags').text();
-                                
-                    var boxb = document.createElement('div');
-                                var blocb = document.createElement('ul');
-                                blocb.className = "mod-more";
-                                
-                                if (section) {
-                                        $(blocb).append($('<li class="module-section">'+dotclear.msg.module_section+' '+section+'</li>'));
-                                }
-                                if (tags) {
-                                        $(blocb).append($('<li class="module-tags">'+dotclear.msg.module_tags+' '+tags+'</li>'));
-                                }
-                                $(td).append($(boxb).append(blocb));
-                        } 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() {
-/*
-     // expand all modules lines
-     $('table.modules.expandable tr:not(.line)').each(function() {
-          dotclear.modulesExpander(this,$('table.modules.expandable tr.line'));
-     });
-*/
      // expand a module line
-     $('table.modules.expandable tr.line').each(function() {
-          dotclear.moduleExpander(this);
+     $('table.modules.expandable tr.line').each(function(){
+          $('td.module-name',this).toggleWithLegend($(this).next('.module-more'),{
+               img_on_src: dotclear.img_plus_src,
+               img_on_alt: dotclear.img_plus_alt,
+               img_off_src: dotclear.img_minus_src,
+               img_off_alt: dotclear.img_minus_alt,
+               legend_click: true
+          });
      });
 

admin/plugins.php

@@ -162 +162 @@
           ->setModules($modules)
           ->displayModules(
-               /* cols */          array('expander', 'icon', 'name', 'config', 'version', 'desc', 'distrib'),
+               /* cols */          array('expander', 'icon', 'name', 'version', 'desc', 'distrib'),
                /* actions */  array('deactivate', 'delete', 'behavior')
           );

admin/style/default.css

@@ -2036 +2036 @@
      padding: 4px 4px 0 20px;
      }
+.modules a.module-config {
+     /* todo: add icon here */
+     padding: 4px 4px 0 20px;
+     }
 #m_search {
      background: transparent url(search.png) no-repeat 4px center;

inc/admin/lib.moduleslist.php

@@ -552 +552 @@
 
           if (in_array('distrib', $cols)) {
-               echo '<th'.(in_array('desc', $cols) ? '' : ' class="maximal"').'></th>';
+               echo 
+               '<th'.(in_array('desc', $cols) ? '' : ' class="maximal"').'></th>';
           }
 
@@ -586 +587 @@
                echo 
                '<tr class="line" id="'.html::escapeHTML($this->list_id).'_m_'.html::escapeHTML($id).'">';
+               
+               $tds = 0;
 
                if (in_array('icon', $cols)) {
+                    $tds++;
                     echo 
                     '<td class="module-icon nowrap">'.sprintf(
@@ -595 +599 @@
                }
 
-               # Link to config file
-               $config = in_array('config', $cols) && !empty($module['root']) && file_exists(path::real($module['root'].'/_config.php'));
-
+               $tds++;
                echo 
-               '<td class="module-name nowrap" scope="row">'.($config ? 
-                    '<a href="'.$this->getURL('module='.$id.'&amp;conf=1').'" title"'.sprintf(__('Configure module "%s"'), html::escapeHTML($module['name'])).'">'.html::escapeHTML($module['name']).'</a>' : 
-                    html::escapeHTML($module['name'])
-               ).'</td>';
+               '<td class="module-name nowrap" scope="row">'.html::escapeHTML($module['name']).'</td>';
 
                # Display score only for debug purpose
                if (in_array('score', $cols) && $this->getSearch() !== null && defined('DC_DEBUG') && DC_DEBUG) {
+                    $tds++;
                     echo 
                     '<td class="module-version nowrap count"><span class="debug">'.$module['score'].'</span></td>';
@@ -611 +611 @@
 
                if (in_array('version', $cols)) {
+                    $tds++;
                     echo 
                     '<td class="module-version nowrap count">'.html::escapeHTML($module['version']).'</td>';
@@ -616 +617 @@
 
                if (in_array('current_version', $cols)) {
+                    $tds++;
                     echo 
                     '<td class="module-current-version nowrap count">'.html::escapeHTML($module['current_version']).'</td>';
@@ -621 +623 @@
 
                if (in_array('desc', $cols)) {
+                    $tds++;
                     echo 
                     '<td class="module-desc maximal">'.html::escapeHTML($module['desc']).'</td>';
@@ -626 +629 @@
 
                if (in_array('distrib', $cols)) {
+                    $tds++;
                     echo 
                     '<td class="module-distrib">'.(self::isDistributedModule($id) ? 
@@ -637 +641 @@
                     $buttons = $this->getActions($id, $module, $actions);
 
+                    $tds++;
                     echo 
                     '<td class="module-actions nowrap">'.
@@ -655 +660 @@
                echo 
                '</tr>';
+
+               # Other informations
+               if (in_array('expander', $cols)) {
+                    echo
+                    '<tr class="module-more"><td colspan="'.$tds.'" class="expand">';
+
+                    if (!empty($module['author']) || !empty($module['details']) || !empty($module['support'])) {
+                         echo 
+                         '<div><ul class="mod-more">';
+
+                         if (!empty($module['author'])) {
+                              echo
+                              '<li class="module-author">'.__('Author:').' '.html::escapeHTML($module['author']).'</li>';
+                         }
+
+                         $more = array();
+                         if (!empty($module['details'])) {
+                              $more[] = '<a class="module-details" href="'.$module['details'].'">'.__('Details').'</a>';
+                         }
+
+                         if (!empty($module['support'])) {
+                              $more[] = '<a class="module-support" href="'.$module['support'].'">'.__('Support').'</a>';
+                         }
+                         
+                         if (!empty($more)) {
+                              echo
+                              '<li>'.implode(' - ', $more).'</li>';
+                         }
+
+                         echo
+                         '</ul></div>';
+                    }
+
+                    $config = !empty($module['root']) && file_exists(path::real($module['root'].'/_config.php'));
+
+                    if ($config || !empty($module['section']) || !empty($module['section'])) {
+                         echo 
+                         '<div><ul class="mod-more">';
+
+                         if ($config) {
+                              echo
+                              '<li><a class="module-config" href="'.$this->getURL('module='.$id.'&amp;conf=1').'">'.__('Configure plugin').'</a></li>';
+                         }
+
+                         if (!empty($module['section'])) {
+                              echo
+                              '<li class="module-section">'.__('Section:').' '.html::escapeHTML($module['section']).'</li>';
+                         }
+
+                         if (!empty($module['section'])) {
+                              echo
+                              '<li class="module-tags">'.__('Tags:').' '.html::escapeHTML($module['tags']).'</li>';
+                         }
+
+                         echo
+                         '</ul></div>';
+                    }
+
+                    echo
+                    '</td></tr>';
+               }
 
                $count++;