Changeset 3858:ebcc8a63a4e1 for admin

Timestamp:

09/04/18 11:14:41 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

3857:f3946d839070 (diff), 3855:08b090767191 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.14.2 branch

Location:

admin

Files:

• js/common.js (modified) (5 diffs)
• style/default-dark.css (modified) (10 diffs)
• style/default.css (modified) (10 diffs)

admin/js/common.js

@@ -140 +140 @@
     $(ctarget).click(function(e) {
       if (p.user_pref && set_user_pref) {
-        if (p.hide ^ p.reverse_user_pref) {
-          jQuery.post('services.php', {
-            'f': 'setSectionFold',
-            'section': p.user_pref,
-            'value': 1,
-            xd_check: dotclear.nonce
-          }, function() {});
-        } else {
-          jQuery.post('services.php', {
-            'f': 'setSectionFold',
-            'section': p.user_pref,
-            'value': 0,
-            xd_check: dotclear.nonce
-          }, function() {});
-        }
+        jQuery.post('services.php', {
+          'f': 'setSectionFold',
+          'section': p.user_pref,
+          'value': (p.hide ^ p.reverse_user_pref ? 1 : 0),
+          xd_check: dotclear.nonce
+        }, function() {});
         jQuery.cookie(p.user_pref, '', {
           expires: -1
@@ -169 +160 @@
 (function($) {
   $.expandContent = function(opts) {
-    var defaults = {};
-    $.expandContent.options = $.extend({}, defaults, opts);
     if (opts == undefined || opts.callback == undefined || !$.isFunction(opts.callback)) {
       return;
     }
     if (opts.line != undefined) {
-      multipleExpander(opts.line, opts.lines);
+      multipleExpander(opts.line, opts.lines, opts.callback);
     }
     opts.lines.each(function() {
-      singleExpander(this);
-    });
-  };
-  var singleExpander = function singleExpander(line) {
+      singleExpander(this, opts.callback);
+    });
+  };
+  var singleExpander = function singleExpander(line, callback) {
     $('<button type="button" class="details-cmd" aria-label="' + dotclear.img_plus_alt + '">' + dotclear.img_plus_txt + '</button>').click(function (e) {
       toggleArrow(this);
-      $.expandContent.options.callback.call(this, line);
+      callback(line);
       e.preventDefault();
     }).prependTo($(line).children().get(0)); // first td
   };
-  var multipleExpander = function multipleExpander(line, lines) {
+  var multipleExpander = function multipleExpander(line, lines, callback) {
     $('<button type="button" class="details-cmd" aria-label="' + dotclear.img_plus_alt + '">' + dotclear.img_plus_txt + '</button>').click(function (e) {
-      var that = this;
       var action = toggleArrow(this);
       lines.each(function() {
         toggleArrow(this.firstChild.firstChild, action);
-        $.expandContent.options.callback.call(that, this, action);
+        callback(this, action);
       });
       e.preventDefault();
@@ -311 +299 @@
   enterKeyInForm: function(frm_id, ok_id, cancel_id) {
     $(frm_id + ':not(' + cancel_id + ')').keyup(function(e) {
-      if (e.key == 'Enter') {
+      if ((e.key == 'Enter') && ($(ok_id).prop('disabled') !== true)) {
         e.preventDefault();
         e.stopPropagation();
@@ -445 +433 @@
       return true;
     });
+  },
+  outgoingLinks: function(target) {
+    $(target).filter(function() {
+      return ((this.hostname && this.hostname != location.hostname && !$(this).hasClass('modal') && !$(this).hasClass('modal-image')) || $(this).hasClass('outgoing'));
+    }).each(function() {
+      $(this).prop('title', $(this).prop('title') + ' (' + dotclear.msg.new_window + ')');
+      if (!$(this).hasClass('outgoing')) {
+        $(this).append('&nbsp;<img class="outgoing-js" src="images/outgoing-link.svg" alt=""/>');
+      }
+    }).click(function(e) {
+      e.preventDefault();
+      window.open($(this).attr('href'));
+    });
   }
 };
@@ -460 +461 @@
   });
   // manage outgoing links
-  $('a').filter(function() {
-    return ((this.hostname && this.hostname != location.hostname && !$(this).hasClass('modal') && !$(this).hasClass('modal-image')) || $(this).hasClass('outgoing'));
-  }).each(function() {
-    $(this).prop('title', $(this).prop('title') + ' (' + dotclear.msg.new_window + ')');
-    if (!$(this).hasClass('outgoing')) {
-      $(this).append('&nbsp;<img class="outgoing-js" src="images/outgoing-link.svg" alt=""/>');
-    }
-  }).click(function(e) {
-    e.preventDefault();
-    window.open($(this).attr('href'));
-  });
+  dotclear.outgoingLinks('a');
   // Popups: dealing with Escape key fired
   $('#dotclear-admin.popup').keyup(function(e) {

admin/style/default-dark.css

@@ -229 +229 @@
 /* Typographie */
 :root {
-  --html-font-size: 62.5%; }
+  --html-font-size: 62.5%;
+  --body-color: #dcdee0;
+  --body-background: #272b30; }
 
 html {
@@ -1081 +1083 @@
   margin-bottom: .3em; }
 
+input[type=color] {
+  width: 4em;
+  height: 3em; }
+
 optgroup {
   font-weight: bold;
@@ -1583 +1589 @@
   padding: 0;
   overflow: hidden;
-  position: absolute;
-  top: 3em;
-  left: 0;
   background: #a2cbe9;
-  width: 100%;
-  z-index: 100; }
+  width: 100%; }
   #prelude li {
     list-style-type: none;
@@ -2111 +2113 @@
 #dashboard-main {
   text-align: center; }
+  #dashboard-main > *:last-child {
+    margin-bottom: 1em; }
 
 /* raccourcis */
 #icons {
+  margin: 1em auto 2em;
   display: flex;
   flex-wrap: wrap;
@@ -2150 +2155 @@
 /* billet rapide */
 #quick {
+  max-width: 72em;
+  margin: 1em auto 2em;
   padding: 1em;
-  max-width: 72em;
-  margin: 0 auto;
   background: #323334;
   border: 1px solid #dbdcdd;
@@ -2165 +2170 @@
     padding: .2em 1em .1em 24px;
     color: #323334; }
-  #quick #new_cat,
-  #quick .q-cat,
-  #quick .q-cat label {
+  #quick #new_cat, #quick .q-cat, #quick .q-cat label {
     display: inline-block;
     vertical-align: top;
@@ -2179 +2182 @@
 /* modules additionnels */
 #dashboard-boxes {
-  margin: 1em auto 1em;
-  padding-top: 2em;
+  margin: 1em auto 2em;
   display: flex;
   flex-wrap: wrap;
@@ -2192 +2194 @@
     text-align: left; }
 
-.db-items,
-.db-contents {
+.db-items, .db-contents {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
   flex: 1 1 auto; }
-  .db-items img,
-  .db-contents img {
+  .db-items img, .db-contents img {
     vertical-align: middle; }
-  .db-items ul,
-  .db-contents ul {
+  .db-items ul, .db-contents ul {
     display: block;
     padding-left: 1.5em;
     list-style: square; }
-  .db-items li,
-  .db-contents li {
+  .db-items li, .db-contents li {
     margin: 0.25em 0 0 0; }
 
@@ -3164 +3162 @@
 
 .offline {
-  color: #86888c; }
+  color: #86888c;
+  background: #323334; }
 
 /* caché pour tout le monde */
@@ -3193 +3192 @@
 
 /* ---------------------------------------------- Couleurs ajoutées via javascript
+
+/* Sortable (jQuery UI) */
+.sortable-area {
+  border: 1px dashed currentColor;
+  background-color: #4c4d4f; }
+
 /* color-picker.js */
 .color-color-picker {

admin/style/default.css

@@ -229 +229 @@
 /* Typographie */
 :root {
-  --html-font-size: 62.5%; }
+  --html-font-size: 62.5%;
+  --body-color: #323232;
+  --body-background: #fff; }
 
 html {
@@ -1081 +1083 @@
   margin-bottom: .3em; }
 
+input[type=color] {
+  width: 4em;
+  height: 3em; }
+
 optgroup {
   font-weight: bold;
@@ -1583 +1589 @@
   padding: 0;
   overflow: hidden;
-  position: absolute;
-  top: 3em;
-  left: 0;
   background: #a2cbe9;
-  width: 100%;
-  z-index: 100; }
+  width: 100%; }
   #prelude li {
     list-style-type: none;
@@ -2111 +2113 @@
 #dashboard-main {
   text-align: center; }
+  #dashboard-main > *:last-child {
+    margin-bottom: 1em; }
 
 /* raccourcis */
 #icons {
+  margin: 1em auto 2em;
   display: flex;
   flex-wrap: wrap;
@@ -2150 +2155 @@
 /* billet rapide */
 #quick {
+  max-width: 72em;
+  margin: 1em auto 2em;
   padding: 1em;
-  max-width: 72em;
-  margin: 0 auto;
   background: #f3f3f3;
   border: 1px solid #dbdbdb;
@@ -2165 +2170 @@
     padding: .2em 1em .1em 24px;
     color: #323232; }
-  #quick #new_cat,
-  #quick .q-cat,
-  #quick .q-cat label {
+  #quick #new_cat, #quick .q-cat, #quick .q-cat label {
     display: inline-block;
     vertical-align: top;
@@ -2179 +2182 @@
 /* modules additionnels */
 #dashboard-boxes {
-  margin: 1em auto 1em;
-  padding-top: 2em;
+  margin: 1em auto 2em;
   display: flex;
   flex-wrap: wrap;
@@ -2192 +2194 @@
     text-align: left; }
 
-.db-items,
-.db-contents {
+.db-items, .db-contents {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
   flex: 1 1 auto; }
-  .db-items img,
-  .db-contents img {
+  .db-items img, .db-contents img {
     vertical-align: middle; }
-  .db-items ul,
-  .db-contents ul {
+  .db-items ul, .db-contents ul {
     display: block;
     padding-left: 1.5em;
     list-style: square; }
-  .db-items li,
-  .db-contents li {
+  .db-items li, .db-contents li {
     margin: 0.25em 0 0 0; }
 
@@ -3164 +3162 @@
 
 .offline {
-  color: #676e78; }
+  color: #676e78;
+  background: #f3f3f3; }
 
 /* caché pour tout le monde */
@@ -3193 +3192 @@
 
 /* ---------------------------------------------- Couleurs ajoutées via javascript
+
+/* Sortable (jQuery UI) */
+.sortable-area {
+  border: 1px dashed currentColor;
+  background-color: #f3f3f3; }
+
 /* color-picker.js */
 .color-color-picker {