Merge pull request 'ci: rollback tag check' (#346) from develop into master

Reviewed-on: #346

.gitea/issue_template/QUESTION_TEMPLATE.yml

@@ -0,0 +1,30 @@
+name: New question
+about: Use this template when you don't know how to do something
+title: "[Question] "
+labels:
+  - question
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill information.
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      value: |
+        * Custom menu version: 
+        * Nextcloud version: 
+        * PHP version: 
+        * Web server (Nginx, Apache2): 
+        * Web browser and version (Firefox 80, Google Chrome 74, etc): 
+    validations:
+      required: true
+
+  - type: textarea
+    id: question
+    attributes:
+      label: Question
+    validations:
+      required: true

.gitea/issue_template/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Documentation
+    url: https://deblan.gitnet.page/side_menu_doc/
+    about: Official documentation web site
+  - name: Ask a question in our Matrix room
+    about: If you prefer a chat-like conversation or in need for quick help, this might be an alternative to opening an issue.
+    url: https://matrix.to/#/#custommenu:neutralnetwork.org

.woodpecker.yml

@@ -1,103 +0,0 @@
-steps:
-  "Verify tag and app version":
-    image: alpine
-    commands:
-      - TAG=${CI_COMMIT_TAG/v//}
-      - grep "<version>$TAG</version>" appinfo/info.xml
-    when:
-      event: [tag]
-
-  "Install dependencies":
-    image: node:16
-    pull: true
-    commands:
-      - npm i
-    when:
-      event: [tag, push, pull_request, manual]
-      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-  "Check dependencies":
-    image: gitnet.fr/deblan/osv-detector:v0.10
-    commands:
-      - osv-detector package-lock.json
-    failure: ignore
-
-  "Build JS":
-    image: node:16
-    commands:
-      - npm run build
-    when:
-      event: [tag, push, pull_request, manual]
-      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-  "Build translations":
-    image: deblan/php:8.0
-    commands:
-      - php bin/generate_l10n.php
-    when:
-      event: [tag, push, pull_request, manual]
-      branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
-
-  "Create signature":
-    image: nextcloud:25
-    secrets: [app_certificate, app_public_certificate]
-    environment:
-      SQLITE_DATABASE: /var/www/data/data.db
-      NEXTCLOUD_ADMIN_USER: admin
-      NEXTCLOUD_ADMIN_PASSWORD: admin
-    commands:
-      - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
-      - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
-      - mkdir /tmp/app
-      - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
-      - /usr/src/nextcloud/occ integrity:sign-app
-        --privateKey=/tmp/side_menu.key
-        --certificate=/tmp/side_menu.crt
-        --path=/tmp/app
-      - mv /tmp/app/appinfo/signature.json appinfo/
-    when:
-      event: [tag]
-
-  # check-code-quality:
-  #   image: sonarsource/sonar-scanner-cli
-  #   secrets: [sonar_token, sonar_host, sonar_project]
-  #   commands:
-  #     - sonar-scanner
-  #       -Dsonar.projectKey=$SONAR_PROJECT
-  #       -Dsonar.sources=.
-  #       -Dsonar.host.url=$SONAR_HOST
-  #       -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
-  #       -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
-  #       -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
-  #   failure: ignore
-  #   when:
-  #     event: [pull_request]
-
-  "Create package":
-    image: deblan/php:8.0
-    volumes:
-      - /var/www/html/artifacts:/var/www/html/artifacts
-    secrets: [app_certificate]
-    commands:
-      - apt-get update
-      - apt-get install -y zip make
-      - mkdir -p "$HOME/.nextcloud/certificates"
-      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
-      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
-      - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
-      - make release
-    when:
-      event: [tag]
-
-  "Push release":
-    image: plugins/gitea-release
-    volumes:
-      - /var/www/html/artifacts:/var/www/html/artifacts
-    settings:
-      api_key:
-        from_secret: gitnet_api_key
-      base_url: https://gitnet.fr
-      note: ${CI_COMMIT_MESSAGE}
-      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
-    when:
-      event: [tag]

.woodpecker/.build.yml

@@ -0,0 +1,28 @@
+variables:
+  volumes: &volumes
+    - /data/${CI_REPO}:/builds
+
+when:
+  event: [tag, push, pull_request, manual]
+  branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
+
+steps:
+  "Install dependencies":
+    image: node:16
+    pull: true
+    commands:
+      - npm i
+
+  "Build JS":
+    image: node:16
+    commands:
+      - npm run build
+
+  "Build translations":
+    image: deblan/php:8.3
+    commands:
+      - php bin/generate_l10n.php
+
+  "Build cache":
+    image: gitnet.fr/deblan/woodpecker-cache
+    volumes: *volumes

.woodpecker/.publish.yml

@@ -0,0 +1,61 @@
+variables:
+  volumes: &volumes
+    - /data/${CI_REPO}:/builds
+    - /var/www/html/artifacts:/var/www/html/artifacts
+
+depends_on:
+  - build
+
+when:
+  event: [tag]
+
+steps:
+  "Verify tag and app version":
+    image: alpine
+    commands:
+      - TAG=${CI_COMMIT_TAG/v//}
+      - grep "<version>$TAG</version>" appinfo/info.xml
+
+  "Create signature":
+    image: nextcloud:25
+    secrets: [app_certificate, app_public_certificate]
+    volumes: *volumes
+    environment:
+      SQLITE_DATABASE: /var/www/data/data.db
+      NEXTCLOUD_ADMIN_USER: admin
+      NEXTCLOUD_ADMIN_PASSWORD: admin
+    commands:
+      - cd "/builds/$CI_COMMIT_SHA"
+      - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
+      - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
+      - mkdir /tmp/app
+      - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
+      - /usr/src/nextcloud/occ integrity:sign-app
+        --privateKey=/tmp/side_menu.key
+        --certificate=/tmp/side_menu.crt
+        --path=/tmp/app
+      - mv /tmp/app/appinfo/signature.json appinfo/
+
+  "Create package":
+    image: deblan/php:8.3
+    volumes: *volumes
+    secrets: [app_certificate]
+    commands:
+      - cd "/builds/$CI_COMMIT_SHA"
+      - apt-get update
+      - apt-get install -y zip make
+      - mkdir -p "$HOME/.nextcloud/certificates"
+      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
+      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
+      - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
+      - make release
+
+  "Push release":
+    image: plugins/gitea-release
+    volumes: *volumes
+    settings:
+      api_key:
+        from_secret: gitnet_api_key
+      base_url: https://gitnet.fr
+      note: ${CI_COMMIT_MESSAGE}
+      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*

.woodpecker/.security.yml

@@ -0,0 +1,17 @@
+variables:
+  volumes: &volumes
+    - /data/${CI_REPO}:/builds
+
+depends_on:
+  - build
+
+skip_clone: true
+
+steps:
+  "Check dependencies":
+    image: gitnet.fr/deblan/osv-detector:v0.10
+    volumes: *volumes
+    commands:
+      - cd "/builds/$CI_COMMIT_SHA"
+      - osv-detector package-lock.json
+    failure: ignore

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## 3.12.0
+### Added
+* add compatibility with NC29
+
+## 3.11.8
+### Fixed
+* move the logo inside #nextcloud element (fix #278 #239) [NC26]
+
 ## 3.11.7
 ### Added
 * update translations

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.7</version>
+    <version>3.11.8</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
     <dependencies>
-        <nextcloud min-version="25" max-version="28"/>
+        <nextcloud min-version="25" max-version="29"/>
         <php min-version="7.4"/>
     </dependencies>
     <settings>

src/l10n/fixtures/es.yaml

@@ -1,5 +1,5 @@
 "Custom menu": "Menú personalizado"
-"Enable the custom menu": "Activar el menú personalizado"
+"Enable the custom menu": "Habilitar el menú personalizado"
 "No": "No"
 "Yes": "Sí"
 "Menu": "Menú"

src/l10n/fixtures/gl.yaml

@@ -1,96 +1,96 @@
-"Custom menu": "Menú personalizado"
-"Enable the custom menu": "Activar o menú personalizado"
-"No": "Non"
-"Yes": "Si"
-"Menu": "Menú"
+"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.'
-: 'Use o atallo <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> para abrir e agochar o menú lateral. Use <span class="keyboard-key">tab</span> para navegar.'
-"Top menu": "Menú superior"
-"Apps that not must be moved in the side menu": "As aplicacións que non deben moverse no menú lateral"
-"If there is no selection then the global configuration is applied.": "Se non hai selección, aplícase a configuración global."
+: '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": "Gardar"
-"You like this app and you want to support me?": "Gústalle esta aplicación e quere axudarme?"
-"Buy me a coffee ☕": "Convídeme a un café ☕"
-"Hidden": "Agochado"
-"Small": "Pequeno"
+"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": "Grande"
-"Hidden icon": "Icona agochada"
-"Small icon": "Icona pequena"
-"Normal icon": "Icona normal"
-"Big icon": "Icona grande"
-"Hidden text": "Texto agochado"
-"Small text": "Texto pequeno"
-"Normal text": "Texto normal"
-"Big text": "Texto grande"
-"Colors": "Cores"
-"Background color": "Cor do fondo"
-"Background color of current app": "Cor do fondo da aplicación actual"
-"Text color": "Cor do texto"
-"Loader": "Cargador"
-"Icon": "Icona"
-"Same color": "A mesma cor"
-"Opposite color": "A cor oposta"
-"Transparent": "Transparente"
-"Opaque": "Opaco"
-"Opener": "Abrir"
-"Default": "Predeterminado"
-"Default (dark)": "Predeterminado (escuro)"
-"Hamburger": "Hamburguesa"
-"Hamburger (dark)": "Hamburguesa (escuro)"
-"Hamburger 2": "Hamburguesa 2"
-"Hamburger 2 (dark)": "Hamburguesa 2 (escuro)"
-"Before the logo": "Antes do logotipo"
-"After the logo": "Após o logotipo"
-"Position": "Posición"
-"Show only the opener (hidden logo)": "Amosar só a icona de abrir (agochar o logotipo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Non amosar o menú lateral e a icona de abrir se non hai ningunha aplicación (por exemplo: páxinas públicas)."
+"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)": "Abre o menú cando o rato está sobre a icona de abrir (desactivado automaticamente nas pantallas táctiles)"
-"Display the big menu": "Amosar o menú en grande"
-"Display the logo": "Amosar o logotipo"
-"Icons and texts": "Iconas e textos"
-"Loader enabled": "Cargador activado"
-"Tips": "Consellos"
-"Always displayed": "Amosado sempre"
-"This is the automatic behavior when the menu is always displayed.": "Este é o comportamento automático cando se amosa sempre o menú."
-"Not compatible with touch screens.": "Non é compatíbel coas pantallas táctiles."
-"Big menu": "Menú grande"
-"Live preview": "Vista previa en directo"
-"Open apps in new tab": "Abrir as aplicacións nunha nova lapela"
-"Use the global setting": "Usar o axuste global"
-"Use my selection": "Usar a miña selección"
-"Show and hide the list of applications": "Amosar e agochar a lista de aplicacións"
-"Use the avatar instead of the logo": "Usar o avatar no canto do logotipo"
-"You do not have permission to change the settings.": "Non ten permiso para cambiar os axustes."
-"Force this configuration to users": "Forzar esta configuración para os usuarios"
-"Export the configuration": "Exportar a configuración"
-"Purge the cache": "Limpar a caché"
-"Show the link to settings": "Amosar a ligazón aos axustes"
-"The menu is enabled by default for users": "De xeito predeterminado o menú está activado para os usuarios"
-"Except when the configuration is forced.": "Agás cando a configuración é forzada."
-"Apps that should not be displayed in the menu": "Aplicacións que non deben amosarse no menú"
-"This feature is only compatible with the <code>big menu</code> display.": "Esta función só é compatíbel coa presentación do <code>menú grande</code>."
-"The logo is a link to the default app": "O logotipo é unha ligazón á aplicación predeterminada"
-"Others": "Outros"
-"Categories": "Categorías"
-"Customize sorting": "Personalizar a ordenación"
-"Order by": "Ordenar por"
-"Name": "Nome"
-"Customed": "Personalizado"
-"Show and hide the list of categories": "Amosar e agochar a lista de categorías"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Estes parámetros úsanse cando o tema escuro ou o tema escuro de Breeze están activados."
-"Dark mode colors": "Cores do modo escuro"
-"With categories": "Con categorías"
-"Custom categories": "Categorías personalizadas"
-"Customize application categories": "Personalizar as categorías das aplicacións"
-"Reset to default": "Restabelecer os valores predeterminados"
-"Applications": "Aplicacións"
-"Applications kept in the top menu": "As aplicacións mantéñense no menú superior"
-"Applications kept in the top menu but also shown in side menu": "As aplicacións mantéñense no menú superior mais tamén aparecen no menú lateral"
-"These applications must be selected in the previous option.": "Estas aplicacións deben ser seleccionadas na opción anterior."
-"Hide labels on mouse over": "Agochar as etiquetas ao pasar o rato"
-"Except the hovered app": "Agás a aplicación que pasa o rato"
-"Search": "Buscar"
-"Toggle the menu": "Alternar o menú"
+"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"
+"Except the hovered app": "Except the hovered app"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

src/l10n/fixtures/pt_BR.yaml

@@ -1,5 +1,5 @@
-"Custom menu": "Menú personalizado"
-"Enable the custom menu": "Activar o menu personalizado"
+"Custom menu": "Menu personalizado"
+"Enable the custom menu": "Habilitar o menu personalizado"
 "No": "Não"
 "Yes": "Sim"
 "Menu": "Menu"

src/l10n/fixtures/ru.yaml

@@ -47,31 +47,31 @@
 "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)": "Открывать меню при наведении мыши на открывалку (автоматически отключается на сенсорных экранах)"
+"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.": "Это автоматическое поведение, когда меню отображается всегда."
+"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.": "Не совместимо с сенсорными экранами."
 "Big menu": "Большое меню"
-"Live preview": "Предпросмотр в реальном времени"
+"Live preview": "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": "Принудительно предоставить эту конфигурацию пользователям"
+"Force this configuration to users": "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.": "За исключением случаев, когда конфигурация является принудительной."
+"Except when the configuration is forced.": "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.": "Эта функция совместима только с отображением <code>большого меню</code>."
+"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": "Логотип открывает приложение по умолчанию"
 "Others": "Прочие"
 "Categories": "Категории"
@@ -87,10 +87,10 @@
 "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.": "Эти приложения необходимо выбрать в предыдущем выборе."
+"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": "Скрыть название при наведении мыши"
-"Except the hovered app": "Кроме приложения, на котором курсор"
-"Search": "Поиск"
-"Toggle the menu": "Переключить меню"
+"Except the hovered app": "Except the hovered app"
+"Search": "Search"
+"Toggle the menu": "Toggle the menu"

templates/css/stylesheet.php

@@ -42,13 +42,11 @@
     top: 49px;
   }
 
-  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer
-  {
+  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer {
     visibility: hidden;
   }
 
-  #side-menu.hide-opener.side-menu-with-categories .side-menu-search
-  {
+  #side-menu.hide-opener.side-menu-with-categories .side-menu-search {
     float: none;
   }
 

templates/js/script.php

@@ -24,6 +24,7 @@ if ($_['always-displayed']) {
   const body = document.querySelector('body')
   const html = document.querySelector('html')
   const nextcloud = document.querySelector('#nextcloud')
+  const logo = document.querySelector('.header-left .logo')
 
   const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
 
@@ -170,6 +171,10 @@ if ($_['always-displayed']) {
   <?php endif; ?>
 
   if (nextcloud) {
+    if (logo && logo.parentNode !== nextcloud) {
+      nextcloud.appendChild(logo)
+    }
+
     <?php if ($_['opener-position'] === 'before'): ?>
       nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
     <?php else: ?>