Merge pull request 'release v3.11.4' (#313) from develop into master

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

.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,23 @@
 ## [Unreleased]
 
+## 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
+### Fixed
+* add width to .side-menu-categories for side menu with categories display - fix #294
+
 ## 3.11.0
 ### Added
 * add a search component in menus - fix #282

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

css/sideMenu.css

@@ -201,7 +201,6 @@
   max-height: calc(100vh - 55px);
   overflow: auto;
   position: relative;
-  top: 5px;
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
@@ -289,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 {
@@ -300,6 +299,7 @@
 .side-menu-with-categories .side-menu-categories {
   display: block;
   padding: 0;
+  width: 100%;
 }
 
 .side-menu-with-categories .side-menu-category {

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

@@ -1,93 +1,93 @@
-"Custom menu": ""
+"Custom menu": "Menu personalizado"
-"Enable the custom menu": ""
+"Enable the custom menu": "Habilitar o menu personalizado"
-"No": ""
+"No": "Não"
-"Yes": ""
+"Yes": "Sim"
-"Menu": ""
+"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.'
-: ''
+: 'Use o atalho <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> para exibir e para esconder o menu lateral. Use <span class="keyboard-key">tab</span> para navegar.'
-"Top menu": ""
+"Top menu": "Menu superior"
-"Apps that not must be moved in the side menu": ""
+"Apps that not must be moved in the side menu": "Apps que não devem ser movidos para o menu lateral"
-"If there is no selection then the global configuration is applied.": ""
+"If there is no selection then the global configuration is applied.": "Se não houver seleção, a configuração global será aplicada."
-"Experimental": ""
+"Experimental": "Experimental"
-"Save": ""
+"Save": "Salvar"
-"You like this app and you want to support me?": ""
+"You like this app and you want to support me?": "Você gosta deste aplicativo e quer me apoiar?"
-"Buy me a coffee ☕": ""
+"Buy me a coffee ☕": "Me pague um café ☕"
-"Hidden": ""
+"Hidden": "Oculto"
-"Small": ""
+"Small": "Pequeno"
-"Normal": ""
+"Normal": "Normal"
-"Big": ""
+"Big": "Grande"
-"Hidden icon": ""
+"Hidden icon": "Ícone oculto"
-"Small icon": ""
+"Small icon": "Ícone pequeno"
-"Normal icon": ""
+"Normal icon": "Ícone normal"
-"Big icon": ""
+"Big icon": "Ícone grance"
-"Hidden text": ""
+"Hidden text": "Texto oculto"
-"Small text": ""
+"Small text": "Texto pequeno"
-"Normal text": ""
+"Normal text": "Texto normal"
-"Big text": ""
+"Big text": "Texto grande"
-"Colors": ""
+"Colors": "Cores"
-"Background color": ""
+"Background color": "Cor de fundo"
-"Background color of current app": ""
+"Background color of current app": "Cor de fundo do app atual"
-"Text color": ""
+"Text color": "Cor do texto"
-"Loader": ""
+"Loader": "Progresso"
-"Icon": ""
+"Icon": "Ícone"
-"Same color": ""
+"Same color": "Mesma cor"
-"Opposite color": ""
+"Opposite color": "Cor oposta"
-"Transparent": ""
+"Transparent": "Transparente"
-"Opaque": ""
+"Opaque": "Opaco"
-"Opener": ""
+"Opener": "Abrir"
-"Default": ""
+"Default": "Padrão"
-"Default (dark)": ""
+"Default (dark)": "Padrão (escuro)"
-"Hamburger": ""
+"Hamburger": "Hamburger"
-"Hamburger (dark)": ""
+"Hamburger (dark)": "Hamburger (escuro)"
-"Hamburger 2": ""
+"Hamburger 2": "Hamburger 2"
-"Hamburger 2 (dark)": ""
+"Hamburger 2 (dark)": "Hamburger 2 (escuro)"
-"Before the logo": ""
+"Before the logo": "Antes da logo"
-"After the logo": ""
+"After the logo": "Depois da logo"
-"Position": ""
+"Position": "Posição"
-"Show only the opener (hidden logo)": ""
+"Show only the opener (hidden logo)": "Mostrar apenas o Abrir (ocultar 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).": "Não mostrar o menu lateral e o Abrir se não houver aplicação (p.ex. páginas públicas)."
-"Panel": ""
+"Panel": "Painel"
-"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)": "Abrir o menu quando o mouse passar sobre o Abrir (desativado automaticamente em telas de toque)"
-"Display the big menu": ""
+"Display the big menu": "Mostrar o menu grande"
-"Display the logo": ""
+"Display the logo": "Mostrar a logo"
-"Icons and texts": ""
+"Icons and texts": "Ícones e textos"
-"Loader enabled": ""
+"Loader enabled": "Progresso ativado"
-"Tips": ""
+"Tips": "Dicas"
-"Always displayed": ""
+"Always displayed": "Sempre visível"
-"This is the automatic behavior when the menu is always displayed.": ""
+"This is the automatic behavior when the menu is always displayed.": "Este é o comportamento automático quando o menu está sempre visível."
-"Not compatible with touch screens.": ""
+"Not compatible with touch screens.": "Não compatível com telas de toque."
-"Big menu": ""
+"Big menu": "Menu grande"
-"Live preview": ""
+"Live preview": "Visualização ao vivo"
-"Open apps in new tab": ""
+"Open apps in new tab": "Abrir apps em nova aba"
-"Use the global setting": ""
+"Use the global setting": "Usar configurações globais"
-"Use my selection": ""
+"Use my selection": "Usar minha seleção"
-"Show and hide the list of applications": ""
+"Show and hide the list of applications": "Mostrar e ocultar a lista de aplicativos"
-"Use the avatar instead of the logo": ""
+"Use the avatar instead of the logo": "Use o avatar ao invés da logo"
-"You do not have permission to change the settings.": ""
+"You do not have permission to change the settings.": "Você não tem permissão para alterar as configurações."
-"Force this configuration to users": ""
+"Force this configuration to users": "Forçar esta configuração para os usuários"
-"Export the configuration": ""
+"Export the configuration": "Exportar a configuração"
-"Purge the cache": ""
+"Purge the cache": "Limpar o cache"
-"Show the link to settings": ""
+"Show the link to settings": "Mostrar o link para configurações"
-"The menu is enabled by default for users": ""
+"The menu is enabled by default for users": "O menu é habilitado por padrão para os usuários"
-"Except when the configuration is forced.": ""
+"Except when the configuration is forced.": "Exceto quando a configuração é forçada."
-"Apps that should not be displayed in the menu": ""
+"Apps that should not be displayed in the menu": "Apps que não devem ser mostrados no 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.": "Este recurso só é compatível com a exibição do <code>menu grande</code>."
-"The logo is a link to the default app": ""
+"The logo is a link to the default app": "A logo é um link para o app padrão"
-"Others": ""
+"Others": "Outros"
-"Categories": ""
+"Categories": "Categorias"
-"Customize sorting": ""
+"Customize sorting": "Personalizar classificação"
-"Order by": ""
+"Order by": "Ordenar por"
-"Name": ""
+"Name": "Nome"
-"Customed": ""
+"Customed": "Personalizado"
-"Show and hide the list of categories": ""
+"Show and hide the list of categories": "Mostrar e esconder a lista de categorias"
-"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.": "Estes parâmetros são usados quando o tema escuro ou o tema Dark Breeze está ativo."
-"Dark mode colors": ""
+"Dark mode colors": "Cores do modo escuro"
-"With categories": ""
+"With categories": "Com categorias"
-"Custom categories": ""
+"Custom categories": "Categorias personalizadas"
-"Customize application categories": ""
+"Customize application categories": "Personalizar categorias de apps"
-"Reset to default": ""
+"Reset to default": "Restaurar padrão"
-"Applications": ""
+"Applications": "Aplicativos"
-"Applications kept in the top menu": ""
+"Applications kept in the top menu": "Aplicativos mantidos no menu superior"
-"Applications kept in the top menu but also shown in side menu": ""
+"Applications kept in the top menu but also shown in side menu": "Aplicativos mantidos no menu superior, mas também mostrados no menu lateral"
-"These applications must be selected in the previous option.": ""
+"These applications must be selected in the previous option.": "Estes aplicativos devem ser selecionados na opção anterior."
-"Hide labels on mouse over": ""
+"Hide labels on mouse over": "Ocultar descrição ao passar o mouse"

src/l10n/fixtures/sk.yaml

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

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">
+            <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>
 
@@ -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>