Changeset 3427:75253b0af38a

Timestamp:

11/30/16 13:21:56 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with l10n for Berlin buttons (hamburgers), enclose simplemenu links label in span

Files:

• admin/style/scss/init/_config.scss (modified) (1 diff)
• plugins/simpleMenu/_public.php (modified) (2 diffs)
• themes/berlin/_define.php (modified) (2 diffs)
• themes/berlin/_public.php (added)
• themes/berlin/locales/fr/main.po (modified) (1 diff)
• themes/berlin/scss/libs/_scut.scss (modified) (1 diff)
• themes/berlin/scss/partials/_header.scss (modified) (1 diff)
• themes/berlin/style.css (modified) (1 diff)
• themes/berlin/tpl/user_footer.html (modified) (1 diff)

admin/style/scss/init/_config.scss

@@ -4 +4 @@
 // Do not support IE less than IE10
 $browser-minimum-versions: (
-  "ie": "10"
+  "ie": "11"
 );
 $graceful-usage-threshold: 100;

plugins/simpleMenu/_public.php

@@ -115 +115 @@
                          }
                          if ($description == 'span' || $description == 'both') {
-                              $span = ' <span>'.html::escapeHTML(__($m['descr'])).'</span>';
+                              $span = ' <span class="simple-menu-descr">'.html::escapeHTML(__($m['descr'])).'</span>';
                          }
                     }
@@ -138 +138 @@
                                    ($item['class'] ? $item['class'] : '').
                               '">'.
-                              '<a href="'.$href.'"'.$item['title'].'>'.$item['label'].$item['span'].'</a>'.
+                              '<a href="'.$href.'"'.$item['title'].'>'.
+                              '<span class="simple-menu-label">'.$item['label'].'</span>'.
+                              $item['span'].'</a>'.
                               '</li>';
                }

themes/berlin/_define.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ---------------------------------------
-# This file is part of Currywurst, a theme for Dotclear
+# This file is part of Berlin, a theme for Dotclear
 #
 # Copyright (c) Association Dotclear
@@ -9 +9 @@
 #
 # -- END LICENSE BLOCK -----------------------------------------
-
 if (!defined('DC_RC_PATH')) { return; }
 
 $this->registerModule(
      /* Name */                    "Berlin",
-     /* Description*/         "Dotclear > 2.7 default theme",
+     /* Description*/         "Dotclear 2.7+ default theme",
      /* Author */             "Dotclear Team",
-     /* Version */            '1.0',
+     /* Version */            '1.1',
      /* Properties */         array(
                                         'type' => 'theme',
-//                                      'tplset' => 'currywurst'
                                         'tplset' => 'dotty'
                                    )

themes/berlin/locales/fr/main.po

@@ -40 +40 @@
 msgid "Send"
 msgstr "Envoyer"
+
+msgid "Show menu"
+msgstr "Montrer le menu"
+
+msgid "Hide menu"
+msgstr "Cacher le menu"
+
+msgid "Navigation"
+msgstr "Navigation"

themes/berlin/scss/libs/_scut.scss

@@ -1551 +1551 @@
 
 @mixin scut-reverse-italics (
-  $elements: false
+  $elements: null
 ) {
 

themes/berlin/scss/partials/_header.scss

@@ -68 +68 @@
         padding-bottom: .25em;
         text-align: center;
-        span {
+        span:not(.simple-menu-label) {
             @include adjust-font-size-to(14px);
             font-family: $serif;

themes/berlin/style.css

@@ -538 +538 @@
     padding-bottom: .25em;
     text-align: center; }
-    .header__nav li span {
+    .header__nav li span:not(.simple-menu-label) {
       font-size: 0.875em;
       line-height: 1.7142857em;

themes/berlin/tpl/user_footer.html

@@ -1 @@
-
 <script type="text/javascript">
-        $("html").addClass("js");
-        // Show/Hide main menu
-        $(".header__nav").
-        before('<button id="hamburger" type="button"><span class="visually-hidden">Navigation</span></button>').
-        toggle();
-        $("#hamburger").click(function(){
-                $(this).toggleClass("open");
-                $(".header__nav").toggle('easing');
-        });
-        // Show/Hide sidebar on small screens
-        $("#main").prepend('<button id="offcanvas-on" type="button"><span class="visually-hidden">Show menu</span></button>');
-        $("#offcanvas-on").click(function(){
-            var btn = $('<button id="offcanvas-off" type="button"><span class="visually-hidden">Hide menu</span></button>');
-            $("#wrapper").addClass("off-canvas");
-            $("#footer").addClass("off-canvas");
-            $("#sidebar").prepend(btn);
-            btn.click(function(evt){
-                $("#wrapper").removeClass("off-canvas");
-                $("#footer").removeClass("off-canvas");
-                evt.target.remove();
-            });
-        });
-        $(document).ready(function(){
-        // totop scroll
-        $(window).scroll(function() {
-                if($(this).scrollTop() != 0) {
-                    $('#gotop').fadeIn();
-                } else {
-                    $('#gotop').fadeOut();
-                }
-            });
-
-            $('#gotop').click(function(e) {
-                $('body,html').animate({scrollTop:0},800);
-                e.preventDefault();
-            });
-});
+     $("html").addClass("js");
+     // Show/Hide main menu
+     $(".header__nav").
+     before('<button id="hamburger" type="button"><span class="visually-hidden">' + dotclear_berlin_navigation + '</span></button>').
+     toggle();
+     $("#hamburger").click(function() {
+          $(this).toggleClass("open");
+          $(".header__nav").toggle('easing');
+     });
+     // Show/Hide sidebar on small screens
+     $("#main").prepend('<button id="offcanvas-on" type="button"><span class="visually-hidden">' + dotclear_berlin_show_menu + '</span></button>');
+     $("#offcanvas-on").click(function() {
+          var 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");
+          $("#sidebar").prepend(btn);
+          btn.click(function(evt) {
+               $("#wrapper").removeClass("off-canvas");
+               $("#footer").removeClass("off-canvas");
+               evt.target.remove();
+          });
+     });
+     $(document).ready(function() {
+          // totop scroll
+          $(window).scroll(function() {
+               if ($(this).scrollTop() != 0) {
+                    $('#gotop').fadeIn();
+               } else {
+                    $('#gotop').fadeOut();
+               }
+          });
+          $('#gotop').click(function(e) {
+               $('body,html').animate({
+                    scrollTop: 0
+               }, 800);
+               e.preventDefault();
+          });
+     });
 </script>
-<!--
-Todo:
-Off-canvas
-    Passer les chaînes de caractères en variables pour les traductions.
--->