release v1.13.0

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

README.md

@@ -12,7 +12,7 @@ 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 coffe](https://www.buymeacoffee.com/deblan) ☕
+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

@@ -14,10 +14,16 @@ Comptatible with AppOrder.
 
 You can report a bug or request a feature by opening an issue.
 
+If you like this app, leave a review on https://apps.nextcloud.com/apps/side_menu
+
+You like this app and you want to support me?
+
+* ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan)
+* 😃 [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.12.0</version>
+    <version>1.13.0</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>

css/sideMenu.css

@@ -217,15 +217,11 @@
 
 .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:hover,
-.side-menu-always-displayed #side-menu:hover .side-menu-apps-list,
-.side-menu-always-displayed #side-menu:hover .side-menu-header {
+.side-menu-always-displayed #side-menu.open .side-menu-header {
     width: 100%;
 }
 
-.side-menu-always-displayed #side-menu.open .side-menu-app-text,
-.side-menu-always-displayed #side-menu:hover .side-menu-app-text {
+.side-menu-always-displayed #side-menu.open .side-menu-app-text {
     display: inline;
 }
 

lib/Controller/JsController.php

@@ -55,6 +55,8 @@ 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);
+        $useAvatar = (bool) $this->config->getAppValue('side_menu', 'use-avatar', '0');
+        $avatar = null;
 
         if ($user) {
             $userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
@@ -66,11 +68,22 @@ class JsController extends Controller
             $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) {
+            if (2 === $userTargetBlankMode) {
                 $targetBlankApps = $userTargetBlankApps;
             }
-        }
 
+            $isAvatarSet = OC::$server->getAvatarManager()->getAvatar($user->getUid())->exists();
+
+            if ($useAvatar && $isAvatarSet) {
+                $avatar = OC::$server->getURLGenerator()->linkToRoute(
+                    'core.avatar.getAvatar', [
+                        'userId' => $user->getUid(),
+                        'size' => 128,
+                        'v' => $this->config->getUserValue($user, 'avatar', 'version', 0),
+                    ]
+                );
+            }
+        }
 
         $parameters = [
             'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
@@ -81,6 +94,7 @@ class JsController extends Controller
             'loader-enabled' => (bool) $this->config->getAppValue('side_menu', 'loader-enabled', '1'),
             'always-displayed' => (bool) $this->config->getAppValue('side_menu', 'always-displayed', '0'),
             'big-menu' => (bool) $this->config->getAppValue('side_menu', 'big-menu', '0'),
+            'avatar' => $avatar,
             'top-menu-apps' => $topMenuApps,
             'target-blank-apps' => $targetBlankApps,
         ];

lib/Settings/Admin.php

@@ -77,6 +77,7 @@ class Admin implements ISettings
             'always-displayed' => $this->config->getAppValue('side_menu', 'always-displayed', '0'),
             'big-menu' => $this->config->getAppValue('side_menu', 'big-menu', '0'),
             'display-logo' => $this->config->getAppValue('side_menu', 'display-logo', '1'),
+            'use-avatar' => $this->config->getAppValue('side_menu', 'use-avatar', '0'),
             'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
             'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'),
             'opener-only' => $this->config->getAppValue('side_menu', 'opener-only', '0'),

src/SideMenu.vue

@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         <div class="side-menu-header">
             <button class="side-menu-opener"></button>
 
-            <div v-if="logo" class="side-menu-logo">
+            <div v-if="logo" v-bind:class="{'side-menu-logo': true, 'avatardiv': isAvatar}">
                 <img v-bind:src="logo">
             </div>
         </div>
@@ -46,6 +46,7 @@ export default {
             logo: null,
             forceLightIcon: false,
 			targetBlank: false,
+			isAvatar: false,
         }
     },
     methods: {
@@ -104,8 +105,12 @@ export default {
         },
         retrieveLogo() {
             const ncLogo = document.querySelector('#nextcloud .logo')
+			const avatar = document.querySelector('#side-menu-container').getAttribute('data-avatar');
 
-            if (ncLogo) {
+			if (avatar) {
+				this.logo = avatar
+				this.isAvatar = true
+			} else if (ncLogo) {
                 const url = window.getComputedStyle(ncLogo, null)
                     .getPropertyValue('background-image')
                     .replace('url("', '')

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"
-'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>.'
+"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.': '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"
-"Save": "Sparen"
+"Experimental": "Experimentell"
+"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,9 +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": "Öffnen Sie Apps in einem neuen Tab"
-"Use the global setting": "Verwenden Sie die globale Einstellung"
-"Use my selection": "Verwenden Sie meine Auswahl"
+"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"

templates/js/_alwaysDisplayed.js

@@ -41,4 +41,4 @@ var alwaysDisplayed = function() {
     }
 }
 
-alwaysDisplayed()
+window.setTimeout(alwaysDisplayed, 200)

templates/js/script.php

@@ -13,6 +13,10 @@
     <?php if ($_['force-light-icon']): ?>
         sideMenuContainer.attr('data-forcelighticon', '1')
     <?php endif; ?>
+    
+    <?php if ($_['avatar']): ?>
+        sideMenuContainer.attr('data-avatar', '<?php p($avatar) ?>')
+    <?php endif; ?>
 
     sideMenuContainer.attr('data-targetblankapps', '<?php p(implode(',', $_['target-blank-apps'])) ?>')
 
@@ -67,7 +71,7 @@
             }
         }
 
-        <?php if ($_['opener-hover']): ?>
+        <?php if ($_['opener-hover'] || ($_['always-displayed'] && !$_['big-menu'])): ?>
             var sideMenuMouseLeave = function() {
                 sideMenu
                     .removeClass('open')
@@ -87,9 +91,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

@@ -342,6 +342,18 @@ $choicesSizes = [
             </select>
         </div>
 
+        <p><em><?php p($l->t('Use the avatar instead of the logo')); ?></em></p>
+
+        <div>
+            <select id="side-menu-use-avatar" name="use-avatar" class="side-menu-setting">
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['use-avatar']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
         <div>
             <label>
                 <?php p($l->t('Icons and texts')); ?>
@@ -475,7 +487,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

@@ -153,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>