Merge pull request 'release v2.3.5' (#100) from develop into master

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

.woodpecker.yml

@@ -1,40 +0,0 @@
-pipeline:
-  dependencies:
-    image: deblan/devenv
-    commands:
-      - npm install
-    when:
-      event: [tag, push, pull_request]
-
-  build:
-    image: deblan/devenv
-    commands:
-      - make npm-build
-    when:
-      event: [push, pull_request]
-
-  package:
-    image: deblan/devenv
-    volumes:
-      - /var/www/html/artifacts:/var/www/html/artifacts
-    secrets: [app_certificate]
-    commands:
-      - 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]
-
-  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
-      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
-    when:
-      event: [tag]

CHANGELOG.md

@@ -1,31 +1,5 @@
 ## [Unreleased]
 
-## 2.4.2
-### Fixed
-* fix typo
-### Changed
-* change ci/cd
-
-## 2.4.1
-### Fixed
-* fix user setting save
-
-## 2.4.0
-### Added
-* remove focus on opener after click
-* add button to set default colors
-* add menu hover effect
-* add translations
-### Fixed
-* fix deprecated app.php file
-* fix menu with categories header
-* fix minor issues
-### Changed
-* change saving progression
-### Removed
-* Nextcloud 19 is not supported anymore
-* PHP 7.3 is not supported anymore
-
 ## 2.3.5
 ### Fixed
 * fix white square (#99)

README.md

@@ -15,12 +15,12 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co
 
 You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
 
-[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
+[![Build Status](https://ci2.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci2.gitnet.fr/deblan/side_menu)
 
 Requirements
 ------------
 
-* PHP >= 7.4
+* PHP >= 7.3
 * App `theming` enabled
 
 Installation and upgrade

appinfo/app.php

@@ -0,0 +1,10 @@
+<?php
+
+use OCA\SideMenu\AppInfo\Application;
+
+$app = new Application();
+
+if ($app->isEnabled()) {
+    $app->registerAssets();
+    $app->registerServices();
+}

appinfo/info.xml

@@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
 
 Requirements:
 
-* PHP >= 7.4
+* PHP >= 7.3
 * App `theming` enabled
 
 If you like this application and if you want to support the development:
@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>2.4.2</version>
+    <version>2.3.5</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -46,8 +46,8 @@ If you like this application and if you want to support the development:
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc20_big_menu_responsive.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
     <dependencies>
-        <nextcloud min-version="20" max-version="24"/>
-        <php min-version="7.4"/>
+        <nextcloud min-version="19" max-version="24"/>
+        <php min-version="7.3"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

css/admin.css

@@ -129,18 +129,3 @@
 .side-menu-setting-form-long {
     width: 400px;
 }
-
-#side-menu-save-progress {
-    display: inline-block;
-    width: 0;
-    height: 15px;
-    background: #fff;
-}
-
-.btn-reset {
-    display: inline-block;
-    cursor: pointer;
-    position: absolute;
-    margin-top: 17px;
-    margin-left: 5px;
-}

css/sideMenu.css

@@ -29,10 +29,6 @@
     display: none;
 }
 
-#side-menu a {
-    transition: 0.2s;
-}
-
 #side-menu.open {
     display: block;
 }
@@ -63,8 +59,6 @@
 .side-menu-settings img {
     vertical-align: bottom;
     margin-left: 3px;
-    width: 32px;
-    height: 32px;
 }
 
 #side-menu.open .side-menu-settings {
@@ -84,7 +78,7 @@
     margin-left: 3px !important;
 }
 
-.side-menu-opener:active, .side-menu-opener:focus {
+.side-menu-opener:active {
     background-color: var(--side-menu-current-app-background-color, #444) !important;
 }
 
@@ -157,10 +151,6 @@
     top: 0;
 }
 
-#side-menu.side-menu-with-categories .side-menu-header {
-    max-width: 295px;
-}
-
 #side-menu.hide-opener .side-menu-logo {
     margin-top: 20px;
 }

lib/AppInfo/Application.php

@@ -9,9 +9,6 @@ use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\App;
-use OCP\AppFramework\Bootstrap\IBootContext;
-use OCP\AppFramework\Bootstrap\IBootstrap;
-use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\IUserSession;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
@@ -21,7 +18,7 @@ use Psr\Container\ContainerInterface;
  *
  * @author Simon Vieille <simon@deblan.fr>
  */
-class Application extends App implements IBootstrap
+class Application extends App
 {
     public const APP_ID = 'side_menu';
 
@@ -47,9 +44,16 @@ class Application extends App implements IBootstrap
     public function __construct(array $urlParams = [])
     {
         parent::__construct(self::APP_ID, $urlParams);
+
+        $this->config = OC::$server->getConfig();
+        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
+        $this->user = OC::$server[IUserSession::class]->getUser();
     }
 
-    protected function isEnabled(): bool
+    /**
+     * Checks if this app is enabled.
+     */
+    public function isEnabled(): bool
     {
         $enabled = true;
         $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
@@ -70,65 +74,64 @@ class Application extends App implements IBootstrap
         return $enabled;
     }
 
-    protected function addAssets()
+    /**
+     * Registes services.
+     */
+    public function registerServices()
     {
-        Util::addScript(self::APP_ID, 'sideMenu');
-        Util::addStyle(self::APP_ID, 'sideMenu');
+        $container = $this->getContainer();
 
-        $assets = [
-            'stylesheet' => [
-                'route' => 'side_menu.Css.stylesheet',
-                'type' => 'link',
-                'route_attr' => 'href',
-                'attr' => [
-                    'rel' => 'stylesheet',
-                ],
-            ],
-            'script' => [
-                'route' => 'side_menu.Js.script',
-                'type' => 'script',
-                'route_attr' => 'src',
-                'attr' => [
-                    'nonce' => $this->cspnm->getNonce(),
-                ],
-            ],
-        ];
-
-        $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
-
-        foreach ($assets as $key => $value) {
-            $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
-            $value['attr'][$value['route_attr']] = $route;
-
-            Util::addHeader($value['type'], $value['attr'], '');
-        }
-    }
-
-    public function register(IRegistrationContext $context): void
-    {
-        $context->registerService('AppRepository', function (ContainerInterface $c) {
+        $container->registerService('AppRepository', function (ContainerInterface $c) {
             return new AppRepository();
         });
 
-        $context->registerService('CategoryRepository', function (ContainerInterface $c) {
+        $container->registerService('CategoryRepository', function (ContainerInterface $c) {
             return new CategoryRepository();
         });
 
-        $context->registerService('ConfigProxy', function (ContainerInterface $c) {
+        $container->registerService('ConfigProxy', function (ContainerInterface $c) {
             return new ConfigProxy();
         });
     }
 
-    public function boot(IBootContext $context): void
+    /**
+     * Registers assets.
+     */
+    public function registerAssets()
     {
-        $this->config = OC::$server->getConfig();
-        $this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
-        $this->user = OC::$server[IUserSession::class]->getUser();
+        Util::addScript(self::APP_ID, 'sideMenu');
+        Util::addStyle(self::APP_ID, 'sideMenu');
 
-        if (!$this->isEnabled()) {
-            return;
-        }
+        $stylesheet = OC::$server->getURLGenerator()->linkToRoute(
+            'side_menu.Css.stylesheet',
+            [
+                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
+            ]
+        );
 
-        $this->addAssets();
+        $script = OC::$server->getURLGenerator()->linkToRoute(
+            'side_menu.Js.script',
+            [
+                'v' => $this->config->getAppValue(self::APP_ID, 'cache', '0'),
+            ]
+        );
+
+        Util::addHeader(
+            'link',
+            [
+                'href' => $stylesheet,
+                'rel' => 'stylesheet',
+            ],
+            ''
+        );
+
+        Util::addHeader(
+            'script',
+            [
+                'src' => $script,
+                'nonce' => $this->cspnm->getNonce(),
+            ],
+            ''
+        );
     }
 }

lib/Settings/Admin.php

@@ -110,18 +110,6 @@ class Admin implements ISettings
         $darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
 
         $parameters = [
-            'defaults' => [
-                'background-color' => $darkenPrimaryColor,
-                'background-color-to' => $darkenPrimaryColor,
-                'current-app-background-color' => $darkenPrimaryColor2,
-                'text-color' => $textColor,
-                'loader-color' => $lightenPrimaryColor,
-                'dark-mode-background-color' => $darkenPrimaryColor,
-                'dark-mode-background-color-to' => $darkenPrimaryColor,
-                'dark-mode-current-app-background-color' => $darkenPrimaryColor2,
-                'dark-mode-text-color' => $textColor,
-                'dark-mode-loader-color' => $textColor,
-            ],
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
             'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),

src/admin.js

@@ -79,20 +79,17 @@ const saveSettings = (key) => {
         ++value
     }
 
-    const progress = document.querySelector('#side-menu-save-progress')
-
-    progress.style.width = '40px';
-    progress.style.marginLeft = '5px';
-
     const callbacks = {
         success: () => {
-            const percent = parseInt((key + 1) * 100 / size);
-
-            progress.setAttribute('value', percent)
+            OC.msg.finishedSuccess(
+                selector,
+                t('side_menu', (key + 1) + '/' + size)
+            )
 
             if (key < size - 1) {
                 saveSettings(key + 1)
             } else {
+                OC.msg.finishedSuccess(selector, t('side_menu', 'Saved! Page is reloading...'))
                 location.reload()
             }
         },
@@ -134,8 +131,6 @@ const updateAppsCategoriesCustom = () => {
 }
 
 document.addEventListener('DOMContentLoaded', () => {
-    $('*[data-toggle="tooltip"]').tooltip();
-
     if (document.querySelector('#side-menu-categories-custom')) {
         const View = Vue.extend(AdminCategoriesCustom)
         const adminCategoriesCustom = new View({})
@@ -152,19 +147,6 @@ document.addEventListener('DOMContentLoaded', () => {
         saveSettings(0)
     })
 
-    const resets = document.querySelectorAll('.btn-reset')
-
-    for (let btn of resets) {
-        btn.addEventListener('click', (event) => {
-            const target = event.target
-            const values = JSON.parse(target.getAttribute('data-reset'))
-
-            for (let i in values) {
-                document.querySelector(`#${i}`).value = values[i]
-            }
-        })
-    }
-
     const displays = document.querySelectorAll('.side-menu-display')
 
     for (let display of displays) {

src/l10n/fixtures/cs.yaml

@@ -82,12 +82,3 @@
 "Customize application categories": "Přizpůsobte kategorie aplikací"
 "Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce "
 "Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce"
-"Reset to default": "Vrátit zpět na výchozí hodnoty"
-"Hidden icon": "Skrytá ikona"
-"Small icon": "Malá ikona"
-"Normal icon": "Normální ikona"
-"Big icon": "Velká ikona"
-"Hidden text": "Skrytý text"
-"Small text": "Malý text"
-"Normal text": "Normální text"
-"Big text": "Velký text"

src/l10n/fixtures/de.yaml

@@ -81,12 +81,3 @@
 "Customize application categories": "Anwendungskategorien anpassen"
 "Apps only visible in the top menu": "Apps nur im oberen Menü sichtbar "
 "Apps visible in the top and side menus": "Apps im oberen und seitlichen Menü sichtbar"
-"Reset to default": "Auf Standard zurücksetzen"
-"Hidden icon": "Verstecktes Symbol"
-"Small icon": "Kleines Symbol"
-"Normal icon": "Normales Symbol"
-"Big icon": "Große Ikone"
-"Hidden text": "Versteckter Text"
-"Small text": "Kleiner Text"
-"Normal text": "Normaler Text"
-"Big text": "Großer Text"

src/l10n/fixtures/fr.yaml

@@ -15,14 +15,6 @@
 "Small": "Petit"
 "Normal": "Normal"
 "Big": "Gros"
-"Hidden icon": "Icône masqué"
-"Small icon": "Petit icône"
-"Normal icon": "Icône normal"
-"Big icon": "Gros icône"
-"Hidden text": "Text masqué"
-"Small text": "Texte petit"
-"Normal text": "Texte normal"
-"Big text": "Gros texte"
 "Colors": "Couleurs"
 "Background color": "Couleur de fond"
 "Background color of current app": "Couleur de fond de l'application en cours"
@@ -89,4 +81,3 @@
 "Customize application categories": "Personnaliser les catégories des applications"
 "Apps only visible in the top menu": "Applications visibles uniquement dans le menu supérieur"
 "Apps visible in the top and side menus": "Applications visibles dans le menus supérieur et latéral"
-"Reset to default": "Restaurer les valeurs par défaut"

src/l10n/fixtures/zh_CN.yaml

@@ -81,12 +81,3 @@
 "Customize application categories": "自定义应用程序类别"
 "Apps only visible in the top menu": "应用程序仅在顶部菜单中可见"
 "Apps visible in the top and side menus": "顶部和侧边菜单中可见的应用程序"
-"Reset to default": "重置为默认设置"
-"Hidden icon": "隐藏图标"
-"Small icon": "小图标"
-"Normal icon": "正常图标"
-"Big icon": "大图标"
-"Hidden text": "隐藏文字"
-"Small text": "小文本"
-"Normal text": "普通文本"
-"Big text": "大文本"

templates/js/_topMenuApps.js

@@ -201,7 +201,7 @@ const updateTopMenu = function() {
     menuCache = menu.innerHTML + menu.nextSibling.innerHTML
 }
 
-for (let i = 0; i < 4000; i+= 100) {
+for (let i = 0; i < 3000; i+= 100) {
     setTimeout(updateTopMenu, i)
 }
 

templates/js/script.php

@@ -149,8 +149,6 @@ if ($_['always-displayed']) {
             if (a !== null) {
                 a.focus()
             }
-
-            headerMenuOpener.blur()
         })
 
         for (let opener of sideMenuOpener) {

templates/settings/admin-form.php

@@ -67,10 +67,6 @@ $choicesSizes = [
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['background-color-to']); ?>">
 
-                        <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
-                            'side-menu-background-color' => $_['defaults']['background-color'],
-                            'side-menu-background-color-to' => $_['defaults']['background-color-to'],
-                        ])) ?>"></div>
                     <div>
                         <em>
                             <?php p($l->t('Transparent')); ?>
@@ -106,10 +102,6 @@ $choicesSizes = [
                         type="color"
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['current-app-background-color']); ?>">
-
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
-                        'side-menu-current-app-background-color' => $_['defaults']['current-app-background-color'],
-                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -126,10 +118,6 @@ $choicesSizes = [
                         type="color"
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['text-color']); ?>">
-
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
-                        'side-menu-text-color' => $_['defaults']['text-color'],
-                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -146,10 +134,6 @@ $choicesSizes = [
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['loader-color']); ?>">
-
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
-                        'side-menu-loader-color' => $_['defaults']['loader-color'],
-                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -243,23 +227,16 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
-                        id="side-menu-dark-mode-background-color"
                         name="dark-mode-background-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-background-color']); ?>">
                     <input
-                        id="side-menu-dark-mode-background-color-to"
                         name="dark-mode-background-color-to"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-background-color-to']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
-                        'side-menu-dark-mode-background-color' => $_['defaults']['dark-mode-background-color'],
-                        'side-menu-dark-mode-background-color-to' => $_['defaults']['dark-mode-background-color-to'],
-                    ])) ?>"></div>
-
                     <div>
                         <em>
                             <?php p($l->t('Transparent')); ?>
@@ -289,15 +266,10 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
-                        id="side-menu-dark-mode-current-app-background-color"
                         name="dark-mode-current-app-background-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-current-app-background-color']); ?>">
-
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
-                        'side-menu-dark-mode-current-app-background-color' => $_['defaults']['dark-mode-current-app-background-color'],
-                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -309,15 +281,10 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
-                        id="side-menu-dark-mode-text-color"
                         name="dark-mode-text-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-text-color']); ?>">
-
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
-                        'side-menu-dark-mode-text-color' => $_['defaults']['dark-mode-text-color'],
-                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -329,15 +296,10 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form side-menu-setting-form-long">
                     <input
-                        id="side-menu-dark-mode-loader-color"
                         name="dark-mode-loader-color"
                         type="color"
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-loader-color']); ?>">
-
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
-                        'side-menu-dark-mode-loader-color' => $_['defaults']['dark-mode-loader-color'],
-                    ])) ?>"></div>
                 </div>
             </div>
         </div>
@@ -697,7 +659,7 @@ $choicesSizes = [
                     <select id="side-menu-size-icon" name="size-icon" class="side-menu-setting">
                         <?php foreach ($choicesSizes as $label => $value): ?>
                             <option value="<?php echo $value ?>" <?php if ($value === $_['size-icon']): ?>selected<?php endif; ?>>
-                                <?php echo $l->t($label.' icon');  ?>
+                                <?php echo $l->t($label);  ?> icon
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -705,7 +667,7 @@ $choicesSizes = [
                     <select id="side-menu-size-text" name="size-text" class="side-menu-setting">
                         <?php foreach ($choicesSizes as $label => $value): ?>
                             <option value="<?php echo $value ?>" <?php if ($value === $_['size-text']): ?>selected<?php endif; ?>>
-                                <?php echo $l->t($label.' text'); ?>
+                                <?php echo $l->t($label);  ?> text
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -875,6 +837,7 @@ $choicesSizes = [
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Customize application categories')); ?>
+                    <small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
@@ -994,9 +957,10 @@ $choicesSizes = [
     <div class="section" id="more">
         <button id="side-menu-save" class="btn btn-info">
             <?php p($l->t('Save')); ?>
-            <progress max="100" value="0" id="side-menu-save-progress"></progress>
         </button>
 
+        <span id="side-menu-message" class="msg"></span>
+
         <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank">
             <button class="btn btn-primary" >
                 <?php p($l->t('Export the configuration')); ?>

templates/settings/personal-form.php

@@ -202,10 +202,7 @@ $choicesYesNo = [
 
     <div class="section">
         <?php if (!$_['force']): ?>
-            <button id="side-menu-save" class="btn btn-info">
-                <?php p($l->t('Save')); ?>
-                <progress max="100" value="0" id="side-menu-save-progress"></progress>
-            </button>
+            <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
 
             <span id="side-menu-message" class="msg"></span>