Changeset 3878:fd5264175804 for admin

Timestamp:

09/17/18 16:46:35 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Harmonize scripts used to display entries/comments/trackbacks content in lists - Spam content is displayed as HTML code only, meta key may be used to display other content HTML code (meta key = cmd key on MacOS, windows key on Windows, ...) - Server errors are now basically reported (more info in console log, as timeout, offline, …) to the user

Location:

admin

Files:

• js/_comments.js (modified) (1 diff)
• js/_post.js (modified) (3 diffs)
• js/_posts_list.js (modified) (1 diff)
• js/common.js (modified) (2 diffs)
• js/services.js (added)
• post.php (modified) (1 diff)

admin/js/_comments.js

@@ -2 +2 @@
 'use strict';
 
-dotclear.viewCommentContent = function(line, action) {
+dotclear.viewCommentContent = function(line, action, e) {
   action = action || 'toggle';
+  if ($(line).attr('id') == undefined) {
+    return;
+  }
+
   var commentId = $(line).attr('id').substr(1);
   var tr = document.getElementById('ce' + commentId);
+  var spam = (e.metaKey || $(line).hasClass('sts-junk'));
 
-  if (!tr && (action == 'toggle' || action == 'open')) {
-    tr = document.createElement('tr');
-    tr.id = 'ce' + commentId;
-    var td = document.createElement('td');
-    td.colSpan = 6;
-    td.className = 'expand';
-    tr.appendChild(td);
-
-    // Get comment content
-    $.get('services.php', {
-      f: 'getCommentById',
-      id: commentId
-    }, function(data) {
-      var rsp = $(data).children('rsp')[0];
-
-      if (rsp.attributes[0].value == 'ok') {
-        var comment = $(rsp).find('comment_display_content').text();
-
-        if (comment) {
-          $(td).append(comment);
-          var comment_email = $(rsp).find('comment_email').text();
-          var comment_site = $(rsp).find('comment_site').text();
-          var comment_ip = $(rsp).find('comment_ip').text();
-          var comment_spam_disp = $(rsp).find('comment_spam_disp').text();
-
-          $(td).append('<p><strong>' + dotclear.msg.website +
-            '</strong> ' + comment_site + '<br />' +
-            '<strong>' + dotclear.msg.email + '</strong> ' + comment_email + '<br />' +
-            '<strong>' + dotclear.msg.ip_address +
-            '</strong> <a href="comments.php?ip=' + comment_ip + '">' + comment_ip + '</a>' +
-            '<br />' + comment_spam_disp + '</p>');
-        }
+  if (!tr) {
+    // Get comment content if possible
+    dotclear.getCommentContent(commentId, function(content) {
+      if (content) {
+        // Content found
+        tr = document.createElement('tr');
+        tr.id = 'ce' + commentId;
+        var td = document.createElement('td');
+        td.colSpan = $(line).children('td').length;
+        td.className = 'expand';
+        tr.appendChild(td);
+        $(td).append(content);
+        $(line).addClass('expand');
+        line.parentNode.insertBefore(tr, line.nextSibling);
       } else {
-        window.alert($(rsp).find('message').text());
+        // No content, content not found or server error
+        $(line).removeClass('expand');
       }
+    }, {
+      clean: spam
     });
-
+  } else {
+    $(tr).toggle();
     $(line).toggleClass('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');
-  } else if (tr && tr.style.display != 'none' && (action == 'toggle' || action == 'close')) {
-    $(tr).css('display', 'none');
-    $(line).removeClass('expand');
   }
 };

admin/js/_post.js

@@ -2 +2 @@
 'use strict';
 
-dotclear.viewCommentContent = function(line) {
+dotclear.viewCommentContent = function(line, action, e) {
+  action = action || 'toggle';
+  if ($(line).attr('id') == undefined) {
+    return;
+  }
+
   var commentId = $(line).attr('id').substr(1);
   var tr = document.getElementById('ce' + commentId);
+  var spam = (e.metaKey || $(line).hasClass('sts-junk'));
 
   if (!tr) {
-    tr = document.createElement('tr');
-    tr.id = 'ce' + commentId;
-    var td = document.createElement('td');
-    td.colSpan = 6;
-    td.className = 'expand';
-    tr.appendChild(td);
-
     // Get comment content
-    $.get('services.php', {
-      f: 'getCommentById',
-      id: commentId
-    }, function(data) {
-      var rsp = $(data).children('rsp')[0];
-
-      if (rsp.attributes[0].value == 'ok') {
-        var comment = $(rsp).find('comment_display_content').text();
-
-        if (comment) {
-          $(td).append(comment);
-          var comment_email = $(rsp).find('comment_email').text();
-          var comment_site = $(rsp).find('comment_site').text();
-          //          var comment_ip = $(rsp).find('comment_ip').text();
-          var comment_spam_disp = $(rsp).find('comment_spam_disp').text();
-
-          $(td).append('<p><strong>' + dotclear.msg.website +
-            '</strong> ' + comment_site + '<br />' +
-            '<strong>' + dotclear.msg.email + '</strong> ' +
-            comment_email + '<br />' + comment_spam_disp + '</p>');
-        }
+    dotclear.getCommentContent(commentId, function(content) {
+      if (content) {
+        // Content found
+        tr = document.createElement('tr');
+        tr.id = 'ce' + commentId;
+        var td = document.createElement('td');
+        td.colSpan = $(line).children('td').length;
+        td.className = 'expand';
+        tr.appendChild(td);
+        $(td).append(content);
+        $(line).addClass('expand');
+        line.parentNode.insertBefore(tr, line.nextSibling);
       } else {
-        window.alert($(rsp).find('message').text());
+        // No content, content not found or server error
+        $(line).removeClass('expand');
       }
+    }, {
+      ip: false,
+      clean: spam
     });
-
-    $(line).toggleClass('expand');
-    line.parentNode.insertBefore(tr, line.nextSibling);
-  } else if (tr.style.display == 'none') {
-    $(tr).toggle();
-    $(line).toggleClass('expand');
   } else {
     $(tr).toggle();
@@ -164 +152 @@
   $('#comments').onetabload(function() {
     $.expandContent({
+      line: $('#form-comments .comments-list tr:not(.line)'),
       lines: $('#form-comments .comments-list tr.line'),
       callback: dotclear.viewCommentContent
@@ -176 +165 @@
   $('#trackbacks').onetabload(function() {
     $.expandContent({
+      line: $('#form-trackbacks .comments-list tr:not(.line)'),
       lines: $('#form-trackbacks .comments-list tr.line'),
       callback: dotclear.viewCommentContent

admin/js/_posts_list.js

@@ -2 +2 @@
 'use strict';
 
-dotclear.viewPostContent = function(line, action) {
+dotclear.viewPostContent = function(line, action, e) {
   action = action || 'toggle';
+  if ($(line).attr('id') == undefined) {
+    return;
+  }
+
   var postId = $(line).attr('id').substr(1);
   var tr = document.getElementById('pe' + postId);
 
-  if (!tr && (action == 'toggle' || action == 'open')) {
-    tr = document.createElement('tr');
-    tr.id = 'pe' + postId;
-    var td = document.createElement('td');
-    td.colSpan = 8;
-    td.className = 'expand';
-    tr.appendChild(td);
-
-    // Get post content
-    $.get('services.php', {
-      f: 'getPostById',
-      id: postId,
-      post_type: ''
-    }, function(data) {
-      var rsp = $(data).children('rsp')[0];
-
-      if (rsp.attributes[0].value == 'ok') {
-        var post = $(rsp).find('post_display_content').text();
-        var post_excerpt = $(rsp).find('post_display_excerpt').text();
-        var res = '';
-
-        if (post) {
-          if (post_excerpt) {
-            res += post_excerpt + '<hr />';
-          }
-          res += post;
-          $(td).append(res);
-        }
+  if (!tr) {
+    // Get post content if possible
+    dotclear.getEntryContent(postId, function(content) {
+      if (content) {
+        // Content found
+        tr = document.createElement('tr');
+        tr.id = 'pe' + postId;
+        var td = document.createElement('td');
+        td.colSpan = $(line).children('td').length;
+        td.className = 'expand';
+        tr.appendChild(td);
+        $(td).append(content);
+        $(line).addClass('expand');
+        line.parentNode.insertBefore(tr, line.nextSibling);
       } else {
-        window.alert($(rsp).find('message').text());
+        $(line).toggleClass('expand');
       }
+    }, {
+      clean: (e.metaKey)
     });
-
-    $(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');
-  } else if (tr && tr.style.display != 'none' && (action == 'toggle' || action == 'close')) {
-    $(tr).css('display', 'none');
-    $(line).removeClass('expand');
+  } else {
+    $(tr).toggle();
+    $(line).toggleClass('expand');
   }
 };

admin/js/common.js

@@ -173 +173 @@
     $('<button type="button" class="details-cmd" aria-label="' + dotclear.img_plus_alt + '">' + dotclear.img_plus_txt + '</button>').click(function(e) {
       toggleArrow(this);
-      callback(line);
+      callback(line, '', e);
       e.preventDefault();
     }).prependTo($(line).children().get(0)); // first td
@@ -182 +182 @@
       lines.each(function() {
         toggleArrow(this.firstChild.firstChild, action);
-        callback(this, action);
+        callback(this, action, e);
       });
       e.preventDefault();

admin/post.php

@@ -498 +498 @@
         $comment_url = $core->adminurl->get("admin.comment", ['id' => $rs->comment_id]);
 
-        $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
+        $img       = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
+        $sts_class = '';
         switch ($rs->comment_status) {
             case 1:
                 $img_status = sprintf($img, __('Published'), 'check-on.png');
+                $sts_class  = 'sts-online';
                 break;
             case 0:
                 $img_status = sprintf($img, __('Unpublished'), 'check-off.png');
+                $sts_class  = 'sts-offline';
                 break;
             case -1:
                 $img_status = sprintf($img, __('Pending'), 'check-wrn.png');
+                $sts_class  = 'sts-pending';
                 break;
             case -2:
                 $img_status = sprintf($img, __('Junk'), 'junk.png');
+                $sts_class  = 'sts-junk';
                 break;
         }
 
         echo
-        '<tr class="line' . ($rs->comment_status != 1 ? ' offline' : '') . '"' .
+        '<tr class="line ' . ($rs->comment_status != 1 ? ' offline ' : '') . $sts_class . '"' .
         ' id="c' . $rs->comment_id . '">' .