Changeset 3851:21fc9983c334

Timestamp:

09/02/18 10:31:48 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Allow folding of blog (standard) parameters (+es6)

Location:

admin

Files:

• blog_pref.php (modified) (2 diffs)
• js/_auth.js (modified) (3 diffs)
• js/_blog_pref.js (modified) (1 diff)

admin/blog_pref.php

@@ -345 +345 @@
     echo
     '<div class="multi-part" id="params" title="' . __('Parameters') . '">' .
-    '<h3 class="out-of-screen-if-js">' . __('Parameters') . '</h3>' .
+    '<div id="standard-pref"><h3>' . __('Blog parameters') . '</h3>' .
         '<form action="' . $action . '" method="post" id="blog-form">';
 
@@ -615 +615 @@
     '<br class="clear" />' . //Opera sucks
 
+    '</div>' .
     '</div>';
 

admin/js/_auth.js

@@ -3 +3 @@
 
 $(window).load(function() {
-  var uid = $('input[name=user_id]');
-  var upw = $('input[name=user_pwd]');
+  let uid = $('input[name=user_id]');
+  let upw = $('input[name=user_pwd]');
   uid.focus();
 
@@ -10 +10 @@
     return;
   }
-
-  uid.keypress(processKey);
-
-  function processKey(evt) {
+  uid.keypress(evt => {
     if (evt.which == 13 && upw.val() == '') {
       upw.focus();
@@ -19 +16 @@
     }
     return true;
-  }
+  });
+
   $.cookie('dc_admin_test_cookie', true);
   if ($.cookie('dc_admin_test_cookie')) {

admin/js/_blog_pref.js

@@ -1 +1 @@
 /*global $, dotclear, jsToolBar */
 'use strict';
-function checkQueryString() {
-     var blogUrl = $('#blog_url')[0].value;
-     var urlScan = $('#url_scan')[0].value;
-     var errorMsg = '';
-     if (/.*[^\/]$/.exec(blogUrl) && urlScan=='path_info') {
-          errorMsg = dotclear.msg.warning_path_info;
-     } else if (/.*[^\?]$/.exec(blogUrl) && urlScan=='query_string') {
-          errorMsg = dotclear.msg.warning_query_string;
-     }
-     $('p#urlwarning').remove();
-     if (errorMsg != '') {
-          $('#blog_url').parents('p').after('<p id="urlwarning" class="warning">'+errorMsg+'</p>');
-     }
-}
-
 
 $(function() {
-     var blog_url = $('#blog_url');
-     if (blog_url.length > 0 && !blog_url.is(':hidden')) {
-          checkQueryString();
-          $('#blog_url').focusout(checkQueryString);
-          $('body').on('change','#url_scan',checkQueryString);
-     }
+  var blog_url = $('#blog_url');
+  if (blog_url.length > 0 && !blog_url.is(':hidden')) {
+    var checkQueryString = function() {
+      const url = $('#blog_url')[0].value;
+      const scan = $('#url_scan')[0].value;
+      let msg = '';
+      if (/.*[^\/]$/.exec(url) && scan == 'path_info') {
+        msg = dotclear.msg.warning_path_info;
+      } else if (/.*[^\?]$/.exec(url) && scan == 'query_string') {
+        msg = dotclear.msg.warning_query_string;
+      }
+      $('p#urlwarning').remove();
+      if (msg != '') {
+        $('#blog_url').parents('p').after(`<p id="urlwarning" class="warning">${msg}</p>`);
+      }
+    };
+    checkQueryString();
+    $('#blog_url').focusout(checkQueryString);
+    $('body').on('change', '#url_scan', checkQueryString);
+  }
 
-     $('#date_format_select,#time_format_select').change(function() {
-          if ($(this).prop('value') == '') {
-               return;
-          }
-          $('#'+$(this).attr('id').replace('_select','')).prop('value', $(this).prop('value'));
-          $(this).parent().next('.chosen').html($(this).find(':selected').prop('label'));
-     });
+  $('#date_format_select,#time_format_select').change(function() {
+    if ($(this).prop('value') == '') {
+      return;
+    }
+    $('#' + $(this).attr('id').replace('_select', '')).prop('value', $(this).prop('value'));
+    $(this).parent().next('.chosen').html($(this).find(':selected').prop('label'));
+  });
 
-     // HTML text editor
-     if ($.isFunction(jsToolBar)) {
-          $('#blog_desc').each(function() {
-               var tbWidgetText = new jsToolBar(this);
-               tbWidgetText.context = 'blog_desc';
-               tbWidgetText.draw('xhtml');
-          });
-     }
+  // HTML text editor
+  if ($.isFunction(jsToolBar)) {
+    $('#blog_desc').each(function() {
+      let tbWidgetText = new jsToolBar(this);
+      tbWidgetText.context = 'blog_desc';
+      tbWidgetText.draw('xhtml');
+    });
+  }
 
-     // Hide advanced and plugins prefs sections
-     $('#advanced-pref h3').toggleWithLegend($('#advanced-pref').children().not('h3'),{
-          legend_click: true,
-          user_pref: 'dcx_blog_pref_adv'
-     });
-     $('#plugins-pref h3').toggleWithLegend($('#plugins-pref').children().not('h3'),{
-          legend_click: true,
-          user_pref: 'dcx_blog_pref_plg'
-     });
+  // Hide advanced and plugins prefs sections
+  $('#standard-pref h3').toggleWithLegend($('#standard-pref').children().not('h3'), {
+    legend_click: true,
+    hide: false
+  });
+  $('#advanced-pref h3').toggleWithLegend($('#advanced-pref').children().not('h3'), {
+    legend_click: true,
+    user_pref: 'dcx_blog_pref_adv',
+  });
+  $('#plugins-pref h3').toggleWithLegend($('#plugins-pref').children().not('h3'), {
+    legend_click: true,
+    user_pref: 'dcx_blog_pref_plg',
+  });
 });