Merge pull request 'release v3.11.6' (#328) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/328

.woodpecker.yml

@@ -1,4 +1,12 @@
 steps:
+  check-tag:
+    image: alpine
+    commands:
+      - TAG=${CI_COMMIT_TAG/v//}
+      - grep "<version>$TAG</version>" appinfo/info.xml
+    when:
+      event: [tag]
+
   dependencies:
     image: node:16
     pull: true

CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## 3.11.6
+### Fixed
+* add --background-invert-if-bright in top menu (fix #326)
+
+## 3.11.5
+### Fixed
+* add missing label on buttons for accessiblity (fix #311)
+
+## 3.11.4
+### Fixed
+* add label on buttons for accessiblity (fix #311)
+
 ## 3.11.3
 ### Fixed
 * fix menu icon in decks, collectives and other apps (#302)

appinfo/info.xml

@@ -32,7 +32,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>3.11.3</version>
+    <version>3.11.6</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

src/AppMenu.vue

@@ -21,7 +21,10 @@
   -->
 
 <template>
-  <nav class="app-menu show">
+  <nav
+    class="app-menu show"
+    :aria-label="t('core', 'Applications menu')"
+  >
     <ul
       class="app-menu-main"
       :class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
@@ -214,7 +217,7 @@ $header-icon-size: 20px;
       width: $header-icon-size;
       height: $header-icon-size;
       padding: calc((100% - $header-icon-size) / 2);
-      filter: var(--primary-invert-if-bright);
+      filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
     }
 
     .app-menu-entry--label {
@@ -320,7 +323,7 @@ $header-icon-size: 20px;
     }
 
     img {
-      filter: var(--background-invert-if-bright);
+      filter: var(--background-invert-if-bright, var(--primary-invert-if-bright));
       width: $header-icon-size;
       height: $header-icon-size;
       padding: calc((50px - $header-icon-size) / 2);

src/OpenerButton.vue

@@ -15,11 +15,16 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
-  <button class="side-menu-opener"></button>
+  <button class="side-menu-opener" :arial-label="label"></button>
 </template>
 
 <script>
 export default {
   name: 'OpenerButton',
+  data() {
+    return {
+      label: t('side_menu', 'Toggle menu'),
+    }
+  }
 }
 </script>

src/l10n/fixtures/tpl/base.yaml

@@ -95,3 +95,4 @@
 "Hide labels on mouse over": ""
 "Except the hovered app": ""
 "Search": ""
+"Toggle menu": ""

templates/js/script.php

@@ -14,7 +14,10 @@ if ($_['always-displayed']) {
 
 (function() {
   const sideMenuContainer = SMcreateElement('div', {id: 'side-menu-container'})
-  const sideMenuOpener = SMcreateElement('button', {'class': 'side-menu-opener'})
+  const sideMenuOpener = SMcreateElement('button', {
+    'class': 'side-menu-opener',
+    'arial-label': t('side_menu', 'Toggle menu')
+  })
   const sideMenu = SMcreateElement('div', {id: 'side-menu'})
 
   const body = document.querySelector('body')

templates/settings/admin-form.php

@@ -1115,19 +1115,19 @@ $labelAlwaysDisplayed = 'Always displayed';
     </div>
 
     <div class="section" id="more">
-        <button id="side-menu-save" class="btn btn-info">
+        <button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
             <?php p($l->t('Save')); ?>
             <progress max="100" value="0" id="side-menu-save-progress"></progress>
         </button>
 
         <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank" rel="noopener">
-            <button class="btn btn-primary" >
+            <button class="btn btn-primary" arial-label="<?php p($l->t('Export the configuration')); ?>">
                 <?php p($l->t('Export the configuration')); ?>
             </button>
         </a>
 
         <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.removeCache') ?>">
-            <button class="btn btn-primary" >
+            <button class="btn btn-primary" arial-label="<?php p($l->t('Purge the cache')); ?>">
                 <?php p($l->t('Purge the cache')); ?> (<?php echo $cacheSize ?> Kb)
             </button>
         </a>
@@ -1139,7 +1139,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
-                    <button>
+                    <button arial-label="<?php p($l->t('Buy me a coffee ☕')); ?>">
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>

templates/settings/personal-form.php

@@ -240,8 +240,7 @@ $labelReset = 'Reset to default';
 
     <div class="section">
         <?php if (!$_['force']): ?>
-            <button id="side-menu-save" class="btn btn-info">
-                <?php p($l->t('Save')); ?>
+            <button id="side-menu-save" class="btn btn-info" arial-label="<?php p($l->t('Save')); ?>">
                 <progress max="100" value="0" id="side-menu-save-progress"></progress>
             </button>
 
@@ -255,7 +254,7 @@ $labelReset = 'Reset to default';
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
-                    <button>
+                    <button arial-label="<?php p($l->t('Buy me a coffee ☕')); ?>">
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>