update screenshots

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

README.md

@@ -12,6 +12,8 @@ Comptatible with AppOrder.
 * [How to contribute?](#how-to-contribute)
 * [Screenshots](https://gitnet.fr/deblan/side_menu/src/branch/master/screenshots/)
 
+You like this app and you want to support me? [Buy me a coffee](https://www.buymeacoffee.com/deblan) ☕
+
 Installation and upgrade
 ------------------------
 

appinfo/info.xml

@@ -2,7 +2,7 @@
 <info>
     <id>side_menu</id>
     <name>Side menu</name>
-    <summary>Move the top menu to the left side.</summary>
+    <summary>Modify the display of the menu.</summary>
     <description><![CDATA[Side menu allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
 You can also define apps that must be displayed in the top menu. Fully customisable.
 
@@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
 ]]></description>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.9.3</version>
+    <version>1.12.2</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>

css/admin.css

@@ -64,3 +64,7 @@
     font-size: 11px;
     font-weight: normal;
 }
+
+.side-menu-toggler {
+    cursor: pointer;
+}

css/sideMenu.css

@@ -211,17 +211,17 @@
     display: none;
 }
 
+.side-menu-always-displayed #side-menu .side-menu-header {
+    height: 49px;
+}
+
 .side-menu-always-displayed #side-menu.open,
 .side-menu-always-displayed #side-menu.open .side-menu-apps-list,
-.side-menu-always-displayed #side-menu.open .side-menu-header,
+.side-menu-always-displayed #side-menu.open .side-menu-header {
-.side-menu-always-displayed #side-menu:hover,
-.side-menu-always-displayed #side-menu:hover .side-menu-apps-list,
-.side-menu-always-displayed #side-menu:hover .side-menu-header {
     width: 100%;
 }
 
-.side-menu-always-displayed #side-menu.open .side-menu-app-text,
+.side-menu-always-displayed #side-menu.open .side-menu-app-text {
-.side-menu-always-displayed #side-menu:hover .side-menu-app-text {
     display: inline;
 }
 

lib/Controller/JsController.php

@@ -54,6 +54,7 @@ class JsController extends Controller
     {
         $user = OC::$server[IUserSession::class]->getUser();
         $topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
+        $targetBlankApps = (array) json_decode($this->config->getAppValue('side_menu', 'target-blank-apps', '[]'), true);
 
         if ($user) {
             $userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
@@ -61,8 +62,16 @@ class JsController extends Controller
             if (!empty($userTopMenuApps)) {
                 $topMenuApps = $userTopMenuApps;
             }
+
+            $userTargetBlankMode = (int) $this->config->getUserValue($user->getUid(), 'side_menu', 'target-blank-mode', '1');
+            $userTargetBlankApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'target-blank-apps', '[]'), true);
+
+            if ($userTargetBlankMode === 2) {
+                $targetBlankApps = $userTargetBlankApps;
+            }
         }
 
+
         $parameters = [
             'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
             'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
@@ -73,6 +82,7 @@ class JsController extends Controller
             'always-displayed' => (bool) $this->config->getAppValue('side_menu', 'always-displayed', '0'),
             'big-menu' => (bool) $this->config->getAppValue('side_menu', 'big-menu', '0'),
             'top-menu-apps' => $topMenuApps,
+            'target-blank-apps' => $targetBlankApps,
         ];
 
         $response = new TemplateResponse('side_menu', 'js/script', $parameters, 'blank');

lib/Controller/PersonalSettingController.php

@@ -65,6 +65,29 @@ class PersonalSettingController extends Controller
             }
         }
 
+        if ('target-blank-mode' === $name) {
+            $doSave = true;
+
+            if (!in_array($value, ['1', '2'])) {
+                $value = '1';
+            }
+        }
+
+        if ('target-blank-apps' === $name) {
+            $doSave = true;
+            $data = json_decode($value, true);
+
+            if (!is_array($data)) {
+                $doSave = false;
+            } else {
+                foreach ($data as $v) {
+                    if (!is_string($v)) {
+                        $doSave = false;
+                    }
+                }
+            }
+        }
+
         if ('top-menu-apps' === $name) {
             $doSave = true;
             $data = json_decode($value, true);

lib/Settings/Admin.php

@@ -83,6 +83,7 @@ class Admin implements ISettings
             'hide-when-no-apps' => $this->config->getAppValue('side_menu', 'hide-when-no-apps', '0'),
             'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
             'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
+            'target-blank-apps' => (array) json_decode($this->config->getAppValue('side_menu', 'target-blank-apps', '[]'), true),
             'top-menu-apps' => (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true),
             'apps' => $this->appRepository->getVisibleApps(),
         ];

lib/Settings/Personal.php

@@ -72,6 +72,8 @@ class Personal implements ISettings
         $parameters = [
             'enabled' => $this->config->getUserValue($user->getUid(), 'side_menu', 'enabled', '1'),
             'top-menu-apps' => (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true),
+            'target-blank-mode' => $this->config->getUserValue($user->getUid(), 'side_menu', 'target-blank-mode', '1'),
+            'target-blank-apps' => (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'target-blank-apps', '[]'), true),
             'apps' => $this->appRepository->getVisibleApps(),
         ];
 

src/SideMenu.vue

@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
         <ul class="side-menu-apps-list">
             <li v-for="app in apps" v-bind:class="{'side-menu-app': true, 'active': app.active}">
-                <a v-bind:href="app.href" v-bind:title="app.name">
+                <a v-bind:href="app.href" :target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined" v-bind:title="app.name">
                      <span class="side-menu-app-icon" v-html="app.icon"></span>
                      <span class="side-menu-app-text" v-html="app.name"></span>
                 </a>
@@ -45,6 +45,7 @@ export default {
             apps: [],
             logo: null,
             forceLightIcon: false,
+			targetBlank: false,
         }
     },
     methods: {
@@ -86,6 +87,7 @@ export default {
                     }
 
                     this.apps.push({
+						id: dataId,
                         href: href,
                         name: trim(element.querySelector('span').innerHTML),
                         icon: svg,
@@ -119,6 +121,7 @@ export default {
         this.retrieveApps()
         this.retrieveLogo()
         this.forceLightIcon = document.querySelector('#side-menu-container').getAttribute('data-forcelighticon') == 1;
+        this.targetBlankApps = document.querySelector('#side-menu-container').getAttribute('data-targetblankapps').split(',');
 
         const menu = document.querySelector('#appmenu')
 

src/SideMenuBig.vue

@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
                     <ul class="side-menu-apps-list">
                         <li v-bind:class="{'side-menu-app': true, 'active': activeApp === appId}" v-for="(app, appId) in category.apps">
-                            <a v-bind:href="app.href" v-bind:title="app.name">
+                            <a v-bind:href="app.href" :target="targetBlankApps.indexOf(appId) !== -1 ? '_blank' : undefined" v-bind:title="app.name">
                                  <img class="side-menu-app-icon" v-bind:src="app.icon"></span>
                                  <span class="side-menu-app-text" v-html="app.name"></span>
                             </a>
@@ -50,6 +50,7 @@ export default {
         return {
             items: [],
             activeApp: null,
+			targetBlank: false,
         }
     },
     methods: {
@@ -79,6 +80,8 @@ export default {
         },
     },
     mounted() {
+        this.targetBlankApps = document.querySelector('#side-menu-container').getAttribute('data-targetblankapps').split(',');
+
         this.retrieveApps()
         this.retrieveActiveApp()
     }

src/admin.js

@@ -81,6 +81,10 @@ const saveSettings = (key) => {
     }
 }
 
+const elementToggler = (element) => {
+    jQuery(element).toggle()
+}
+
 jQuery(document).ready(() => {
     elements = jQuery('.side-menu-setting')
 
@@ -118,4 +122,11 @@ jQuery(document).ready(() => {
 
         document.documentElement.style.setProperty('--side-menu-' + name, value)
     })
+
+    jQuery('.side-menu-toggler').on('click', (event) => {
+        var target = jQuery(event.target)
+        var element = target.attr('data-target')
+
+        elementToggler(element)
+    })
 });

src/l10n/fixtures/de.yaml

@@ -1,16 +1,16 @@
 "Side menu": "Seitenmenü"
-"Enable the side menu": "Aktivieren Sie das Seitenmenü"
+"Enable the side menu": "Aktiviere das Seitenmenü"
 "No": "Nein"
 "Yes": "Ja"
-"Menu": "Speisekarte"
+"Menu": "Menü"
-'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.': 'Verwenden Sie die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>, um das Seitenmenü zu öffnen und auszublenden. Verwenden Sie zum Navigieren die Registerkarte <span class="keyboard-key">tab</span>.'
+'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.': 'Verwende die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>, um das Seitenmenü ein- und auszublenden. Verwende <span class="keyboard-key">tab</span> zum Navigieren.'
 "Top menu": "Hauptmenü"
-"Apps that not must be moved in the side menu": "Apps, die nicht im Seitenmenü verschoben werden müssen"
+"Apps that not must be moved in the side menu": "Apps, die nicht ins Seitenmenü verschoben werden müssen"
 "If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
-"Experimental": "Experimental"
+"Experimental": "Experimentell"
-"Save": "Sparen"
+"Save": "Speichern"
 "You like this app and you want to support me?": "Du magst diese App und möchtest mich unterstützen?"
-"Buy me a coffe ☕": "Gib mir einen Kaffee ☕"
+"Buy me a coffee ☕": "Gib mir einen Kaffee ☕"
 "Hidden": "Versteckt"
 "Small": "Klein"
 "Normal": "Normal"
@@ -36,13 +36,13 @@
 "After the logo": "Nach dem Logo"
 "Position": "Position"
 "Show only the opener (hidden logo)": "Nur den Öffner anzeigen (verstecktes Logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeigen Sie das Seitenmenü und den Öffner nicht an, wenn keine Anwendung vorhanden ist (z. B. öffentliche Seiten)."
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und den Öffner nicht an, wenn keine Anwendung vorhanden ist (z.B. bei öffentlichen Seiten)."
 "Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffnen Sie das Menü, wenn Sie die Maus über den Öffner bewegen (auf Touchscreens automatisch deaktiviert)."
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über den Öffner bewegt wird (auf Touchscreens automatisch deaktiviert)."
 "Display the big menu": "Großes Menü anzeigen"
 "The big menu is not compatible with AppOrder.": "Das große Menü ist nicht mit AppOrder kompatibel."
 "Display the logo": "Logo anzeigen"
-"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit der großen Menüanzeige kompatibel."
+"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit <code>großes Menü</code> kompatibel."
 "Icons and texts": "Symbole und Texte"
 "Loader enabled": "Loader aktiviert"
 "Tips": "Tipps"
@@ -50,5 +50,9 @@
 "The logo will be hidden when the menu is always displayed.": "Das Logo wird ausgeblendet, wenn das Menü immer angezeigt wird."
 "This is the automatic behavior when the menu is always displayed.": "Dies ist das automatische Verhalten, wenn das Menü immer angezeigt wird."
 "Not compatible with touch screens.": "Nicht kompatibel mit Touchscreens."
-"Big menu": "Große Speisekarte"
+"Big menu": "Großes Menü"
 "Live preview": "Live Vorschau"
+"Open apps in new tab": "Öffne Apps in einem neuen Tab"
+"Use the global setting": "Verwende die globale Einstellung"
+"Use my selection": "Verwende meine Auswahl"
+"Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"

src/l10n/fixtures/fr.yaml

@@ -10,7 +10,7 @@
 "Experimental": "Expérimental"
 "Save": "Sauvegarder"
 "You like this app and you want to support me?": "Vous aimer cette application et vous souhaitez m'aider ?"
-"Buy me a coffe ☕": "Offrez moi un café ☕"
+"Buy me a coffee ☕": "Offrez moi un café ☕"
 "Hidden": "Caché"
 "Small": "Petit"
 "Normal": "Normal"
@@ -52,3 +52,7 @@
 "Not compatible with touch screens.": "Incompatible avec les écrans tactiles."
 "Big menu": "Menu large"
 "Live preview": "Aperçu en direct"
+"Open apps in new tab": "Ouvrir les applications dans un nouvel onglet"
+"Use the global setting": "Utiliser la configuration globale"
+"Use my selection": "Utiliser ma sélection"
+"Show and hide the list of applications": "Afficher et masquer la liste des applications"

templates/js/_topMenuApps.js

@@ -38,6 +38,10 @@ var updateTopMenu = function() {
             appShown.push(app)
             navigationApps.append(app.outerHTML)
         }
+
+        if (targetBlankApps.indexOf(dataId) !== -1) {
+            jQuery(app).children('a').attr('target', '_blank');
+        }
     })
 
     var rightHeaderWidth = jQuery('.header-right').outerWidth()

templates/js/script.php

@@ -14,6 +14,10 @@
         sideMenuContainer.attr('data-forcelighticon', '1')
     <?php endif; ?>
 
+    sideMenuContainer.attr('data-targetblankapps', '<?php p(implode(',', $_['target-blank-apps'])) ?>')
+
+    var targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>;
+
     body.on('side-menu.apps', function(e, apps) {
         <?php if ($_['hide-when-no-apps']): ?>
             sideMenu = jQuery('#side-menu')
@@ -63,7 +67,7 @@
             }
         }
 
-        <?php if ($_['opener-hover']): ?>
+        <?php if ($_['opener-hover'] || ($_['always-displayed'] && !$_['big-menu'])): ?>
             var sideMenuMouseLeave = function() {
                 sideMenu
                     .removeClass('open')
@@ -83,9 +87,14 @@
             }
 
             if (!isTouchDevice) {
-                headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
+                <?php if ($_['opener-hover']): ?>
+                    headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
 
-                sideMenu.addClass('hide-opener')
+                    sideMenu.addClass('hide-opener')
+                <?php else: ?>
+                    sideMenu.on('mouseleave', sideMenuMouseLeave)
+                    sideMenu.on('mouseenter', sideMenuOpenerMouseEnter)
+                <?php endif ?>
             }
         <?php endif; ?>
 

templates/settings/admin-form.php

@@ -366,6 +366,38 @@ $choicesSizes = [
             </select>
         </div>
 
+        <div>
+            <label for="side-menu-target-blank">
+                <?php p($l->t('Open apps in new tab')); ?>
+            </label>
+        </div>
+
+        <p>
+            <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
+                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+            </a>
+        </p>
+
+        <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none">
+            <?php foreach ($_['apps'] as $app): ?>
+                <div>
+                    <input
+                        type="checkbox"
+                        name="target-blank-apps[]"
+                        value="<?php echo $app['id'] ?>"
+                        id="target-blank-app-<?php echo $app['id'] ?>"
+                        <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
+                    />
+
+                    <label for="target-blank-app-<?php echo $app['id'] ?>">
+                        <?php echo p($l->t($app['name'])); ?>
+                    </label>
+                </div>
+            <?php endforeach; ?>
+        </div>
+
+        <br>
+
         <div>
             <label for="side-menu-loader-enabled">
                 <?php p($l->t('Loader enabled')); ?>
@@ -393,7 +425,13 @@ $choicesSizes = [
             </label>
         </div>
 
-        <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox>
+        <p>
+            <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
+                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+            </a>
+        </p>
+
+        <div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none">
             <?php foreach ($_['apps'] as $app): ?>
                 <div>
                     <input
@@ -437,7 +475,7 @@ $choicesSizes = [
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
                     <button>
-                        <?php p($l->t('Buy me a coffe ☕')); ?>
+                        <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>
             </span>

templates/settings/personal-form.php

@@ -52,6 +52,51 @@ $choicesYesNo = [
                 <?php endforeach; ?>
             </select>
         </div>
+
+        <div>
+            <label for="side-menu-target-blank">
+                <?php p($l->t('Open apps in new tab')); ?>
+            </label>
+        </div>
+
+        <div>
+            <?php $choices = [
+                'Use the global setting' => '1',
+                'Use my selection' => '2',
+            ]; ?>
+
+            <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
+                <?php foreach ($choices as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
+        <p>
+            <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
+                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+            </a>
+        </p>
+
+        <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
+            <?php foreach ($_['apps'] as $app): ?>
+                <div>
+                    <input
+                        type="checkbox"
+                        name="target-blank-apps[]"
+                        value="<?php echo $app['id'] ?>"
+                        id="target-blank-app-<?php echo $app['id'] ?>"
+                        <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
+                    />
+
+                    <label for="target-blank-app-<?php echo $app['id'] ?>">
+                        <?php echo p($l->t($app['name'])); ?>
+                    </label>
+                </div>
+            <?php endforeach; ?>
+        </div>
     </div>
 
     <div class="section">
@@ -70,7 +115,13 @@ $choicesYesNo = [
             </em>
         </p>
 
-        <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal>
+        <p>
+            <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
+                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+            </a>
+        </p>
+
+        <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
             <?php foreach ($_['apps'] as $app): ?>
                 <div>
                     <input
@@ -102,7 +153,7 @@ $choicesYesNo = [
 
                 <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
                     <button>
-                        <?php p($l->t('Buy me a coffe ☕')); ?>
+                        <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>
                 </a>
             </span>