Changeset 3915:a57821ba9ef1 for themes/berlin

Timestamp:

11/05/18 16:40:40 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script. A step ahead…

Location:

themes/berlin

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (1 diff)
• js/berlin.js (modified) (2 diffs)
• style.css (modified) (2 diffs)

themes/berlin/_define.php

@@ -16 +16 @@
     "Dotclear 2.7+ default theme", // Description
     "Dotclear Team",               // Author
-    '1.2',                         // Version
+    '1.3',                         // Version
     [                              // Properties
         'type'   => 'theme',

themes/berlin/_public.php

@@ -23 +23 @@
     public static function publicHeadContent()
     {
-        echo \dcUtils::jsVars([
-            'dotclear_berlin_show_menu'  => __('Show menu'),
-            'dotclear_berlin_hide_menu'  => __('Hide menu'),
-            'dotclear_berlin_navigation' => __('Navigation')
+        echo
+        \dcUtils::jsLoad($GLOBALS['core']->blog->getPF('util.js')) .
+        \dcUtils::jsJson('dotclear_berlin', [
+            'show_menu'  => __('Show menu'),
+            'hide_menu'  => __('Hide menu'),
+            'navigation' => __('Navigation')
         ]);
     }

themes/berlin/js/berlin.js

@@ -1 @@
-/*global $, dotclear_berlin_navigation, dotclear_berlin_show_menu, dotclear_berlin_hide_menu */
+/*global $, getData */
 'use strict';
+
+const dotclear_berlin = getData('dotclear_berlin');
 
 $('html').addClass('js');
 // Show/Hide main menu
 $('.header__nav').
-before(`<button id="hamburger" type="button"><span class="visually-hidden">${dotclear_berlin_navigation}</span></button>`).
+before(`<button id="hamburger" type="button"><span class="visually-hidden">${dotclear_berlin.navigation}</span></button>`).
 toggle();
 $('#hamburger').click(function() {
@@ -12 +14 @@
 });
 // Show/Hide sidebar on small screens
-$('#main').prepend(`<button id="offcanvas-on" type="button"><span class="visually-hidden">${dotclear_berlin_show_menu}</span></button>`);
+$('#main').prepend(`<button id="offcanvas-on" type="button"><span class="visually-hidden">${dotclear_berlin.show_menu}</span></button>`);
 $('#offcanvas-on').click(function() {
-  const btn = $(`<button id="offcanvas-off" type="button"><span class="visually-hidden">${dotclear_berlin_hide_menu}</span></button>`);
+  const btn = $(`<button id="offcanvas-off" type="button"><span class="visually-hidden">${dotclear_berlin.hide_menu}</span></button>`);
   $('#wrapper').addClass('off-canvas');
   $('#footer').addClass('off-canvas');

themes/berlin/style.css

@@ -165 +165 @@
 article, aside, details, figcaption, figure, footer,
 header, hgroup, main, nav, section, summary {
-  display: block; }
+  display: block;
+  }
 
 audio, canvas, video {
@@ -644 +645 @@
   padding: 0;
   position: absolute;
-  width: 1px; }
+  width: 1px;
+  }
 
 .footer__widgets .widget {