Merge pull request 'update app info' (#317) from develop into master

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

.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,21 @@
 ## [Unreleased]
 
+## 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)
+
+## 3.11.2
+### Fixed
+* add default translations for Slovak - fix #298
+
 ## 3.11.1
 ### Added
 * add Portuguese (Brazil) translations - Thanks to igorfreire

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.1</version>
+    <version>3.11.5</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

css/sideMenu.css

@@ -288,7 +288,7 @@
 }
 
 .side-menu-always-displayed .app-navigation--close {
-  transform: translateX(calc(-100% + 50px)) !important;
+  transform: translateX(calc(-100% + 50px));
 }
 
 #side-menu.side-menu-with-categories {

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/sk.yaml

@@ -1,93 +1,93 @@
-"Custom menu": ""
-"Enable the custom menu": ""
-"No": ""
-"Yes": ""
-"Menu": ""
+"Custom menu": "Custom menu"
+"Enable the custom menu": "Enable the custom menu"
+"No": "No"
+"Yes": "Yes"
+"Menu": "Menu"
 ? 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
-: ''
-"Top menu": ""
-"Apps that not must be moved in the side menu": ""
-"If there is no selection then the global configuration is applied.": ""
-"Experimental": ""
-"Save": ""
-"You like this app and you want to support me?": ""
-"Buy me a coffee ☕": ""
-"Hidden": ""
-"Small": ""
-"Normal": ""
-"Big": ""
-"Hidden icon": ""
-"Small icon": ""
-"Normal icon": ""
-"Big icon": ""
-"Hidden text": ""
-"Small text": ""
-"Normal text": ""
-"Big text": ""
-"Colors": ""
-"Background color": ""
-"Background color of current app": ""
-"Text color": ""
-"Loader": ""
-"Icon": ""
-"Same color": ""
-"Opposite color": ""
-"Transparent": ""
-"Opaque": ""
-"Opener": ""
-"Default": ""
-"Default (dark)": ""
-"Hamburger": ""
-"Hamburger (dark)": ""
-"Hamburger 2": ""
-"Hamburger 2 (dark)": ""
-"Before the logo": ""
-"After the logo": ""
-"Position": ""
-"Show only the opener (hidden logo)": ""
-"Do not display the side menu and the opener if there is no application (eg: public pages).": ""
-"Panel": ""
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": ""
-"Display the big menu": ""
-"Display the logo": ""
-"Icons and texts": ""
-"Loader enabled": ""
-"Tips": ""
-"Always displayed": ""
-"This is the automatic behavior when the menu is always displayed.": ""
-"Not compatible with touch screens.": ""
-"Big menu": ""
-"Live preview": ""
-"Open apps in new tab": ""
-"Use the global setting": ""
-"Use my selection": ""
-"Show and hide the list of applications": ""
-"Use the avatar instead of the logo": ""
-"You do not have permission to change the settings.": ""
-"Force this configuration to users": ""
-"Export the configuration": ""
-"Purge the cache": ""
-"Show the link to settings": ""
-"The menu is enabled by default for users": ""
-"Except when the configuration is forced.": ""
-"Apps that should not be displayed in the menu": ""
-"This feature is only compatible with the <code>big menu</code> display.": ""
-"The logo is a link to the default app": ""
-"Others": ""
-"Categories": ""
-"Customize sorting": ""
-"Order by": ""
-"Name": ""
-"Customed": ""
-"Show and hide the list of categories": ""
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": ""
-"Dark mode colors": ""
-"With categories": ""
-"Custom categories": ""
-"Customize application categories": ""
-"Reset to default": ""
-"Applications": ""
-"Applications kept in the top menu": ""
-"Applications kept in the top menu but also shown in side menu": ""
-"These applications must be selected in the previous option.": ""
-"Hide labels on mouse over": ""
+: 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'
+"Top menu": "Top menu"
+"Apps that not must be moved in the side menu": "Apps that not must be moved in the side menu"
+"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
+"Experimental": "Experimental"
+"Save": "Save"
+"You like this app and you want to support me?": "You like this app and you want to support me?"
+"Buy me a coffee ☕": "Buy me a coffee ☕"
+"Hidden": "Hidden"
+"Small": "Small"
+"Normal": "Normal"
+"Big": "Big"
+"Hidden icon": "Hidden icon"
+"Small icon": "Small icon"
+"Normal icon": "Normal icon"
+"Big icon": "Big icon"
+"Hidden text": "Hidden text"
+"Small text": "Small text"
+"Normal text": "Normal text"
+"Big text": "Big text"
+"Colors": "Colors"
+"Background color": "Background color"
+"Background color of current app": "Background color of current app"
+"Text color": "Text color"
+"Loader": "Loader"
+"Icon": "Icon"
+"Same color": "Same color"
+"Opposite color": "Opposite color"
+"Transparent": "Transparent"
+"Opaque": "Opaque"
+"Opener": "Opener"
+"Default": "Default"
+"Default (dark)": "Default (dark)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (dark)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (dark)"
+"Before the logo": "Before the logo"
+"After the logo": "After the logo"
+"Position": "Position"
+"Show only the opener (hidden logo)": "Show only the opener (hidden logo)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)."
+"Panel": "Panel"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)"
+"Display the big menu": "Display the big menu"
+"Display the logo": "Display the logo"
+"Icons and texts": "Icons and texts"
+"Loader enabled": "Loader enabled"
+"Tips": "Tips"
+"Always displayed": "Always displayed"
+"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
+"Not compatible with touch screens.": "Not compatible with touch screens."
+"Big menu": "Big menu"
+"Live preview": "Live preview"
+"Open apps in new tab": "Open apps in new tab"
+"Use the global setting": "Use the global setting"
+"Use my selection": "Use my selection"
+"Show and hide the list of applications": "Show and hide the list of applications"
+"Use the avatar instead of the logo": "Use the avatar instead of the logo"
+"You do not have permission to change the settings.": "You do not have permission to change the settings."
+"Force this configuration to users": "Force this configuration to users"
+"Export the configuration": "Export the configuration"
+"Purge the cache": "Purge the cache"
+"Show the link to settings": "Show the link to settings"
+"The menu is enabled by default for users": "The menu is enabled by default for users"
+"Except when the configuration is forced.": "Except when the configuration is forced."
+"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
+"This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
+"The logo is a link to the default app": "The logo is a link to the default app"
+"Others": "Others"
+"Categories": "Categories"
+"Customize sorting": "Customize sorting"
+"Order by": "Order by"
+"Name": "Name"
+"Customed": "Customed"
+"Show and hide the list of categories": "Show and hide the list of categories"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled."
+"Dark mode colors": "Dark mode colors"
+"With categories": "With categories"
+"Custom categories": "Custom categories"
+"Customize application categories": "Customize application categories"
+"Reset to default": "Reset to default"
+"Applications": "Applications"
+"Applications kept in the top menu": "Applications kept in the top menu"
+"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
+"These applications must be selected in the previous option.": "These applications must be selected in the previous option."
+"Hide labels on mouse over": "Hide labels on mouse over"

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>