Arreglo MegaMenú

dd-apps/docker/nextcloud/Dockerfile

@@ -82,9 +82,9 @@ COPY saml.sh /
 COPY template.docx /
 
 ## Save current forms plugin hash
-RUN sh -c 'curl -sL https://api.github.com/repos/3iPunt/nextcloud_forms/commits/STABLE_25 | jq  -r .sha > /forms.hash'
+#RUN sh -c 'curl -sL https://api.github.com/repos/3iPunt/nextcloud_forms/commits/STABLE_25 | jq  -r .sha > /forms.hash'
 ## And current forms code
-RUN sh -c 'curl -sL "https://github.com/3iPunt/nextcloud_forms/archive/$(cat /forms.hash).zip" > /forms.zip'
+#RUN sh -c 'curl -sL "https://github.com/3iPunt/nextcloud_forms/archive/$(cat /forms.hash).zip" > /forms.zip'
 
 # Setup cron as documented in:
 # https://github.com/nextcloud/docker/blob/master/.examples/dockerfiles/cron/fpm-alpine/Dockerfile

dd-apps/docker/nextcloud/nextcloud.yml

@@ -41,7 +41,8 @@ services:
       #- ${SRC_FOLDER}/nextcloud/custom_apps:/var/www/html/custom_apps
       #- ${SRC_FOLDER}/nextcloud/config:/var/www/html/config
       - ${DATA_FOLDER}/nextcloud:/var/www/html/data:rw
-      - ${BUILD_APPS_ROOT_PATH}/docker/nextcloud/src/themes/dd:/var/www/html/themes/dd:ro
+      
+      - ${BUILD_APPS_ROOT_PATH}/docker/nextcloud/src/themes/dd:/var/www/html/themes/dd:rw
       # We need this to configure the custom logos and background
       - ${CUSTOM_PATH}/custom/img:/custom/img:ro
       # SAML certificates

dd-apps/docker/nextcloud/src/themes/dd/core/appinfo/info.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<info>
+	<id>dd</id>
+	<name>MegaMenu</name>
+	<summary>Carga el megamenu</summary>
+	<description>Carga el megamenu</description>
+
+	<version>1.0.0</version>
+	<licence>agpl</licence>
+	<author>TresIPunt</author>
+	<namespace>DD</namespace>
+	<category>tools</category>
+
+	<dependencies>
+		<nextcloud min-version="20" max-version="25" />
+	</dependencies>
+
+</info>

dd-apps/docker/nextcloud/src/themes/dd/core/appinfo/routes.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Morris Jobke <hey@morrisjobke.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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/>.
+ *
+ */
+
+return [
+	'routes' => [
+		
+	],
+];

dd-apps/docker/nextcloud/src/themes/dd/core/css/ddstyles.css

@@ -0,0 +1,95 @@
+[data-action="onlyofficeDocxf"]{
+    display: none !important;
+}
+
+header#header a#nextcloud {
+    margin-left: 0;
+}
+body#body-user header#header {
+    background-image: none !important;
+}
+header#header #navbar-nextcloud #unified-search span.material-design-icon,
+header#header #navbar-nextcloud #notifications  .header-menu__trigger {
+    filter: invert();
+}
+.newFileMenu > ul:nth-child(1) > li:nth-child(3) {
+    	order: 1;
+    }
+    
+    #user-menu div.avatardiv {
+    	width: 39px;
+    	height: 39px;
+    }
+    .avatardiv__user-status {
+    	display: none;
+    }
+    
+    #header .header-right>div>.menu:after {
+    	display:none;
+    }
+    .ddicon {
+    	position: relative;
+    	left: 8px;
+    	top: 9px;
+    }
+    .ddiconcontainer {
+    	margin-right: 16px;
+    	width: 36px;
+    	height: 36px;
+    	background-color: #f0f0f0;
+    	position: relative;
+    	border-radius: 5px;
+    	left: -7px;
+    }
+    #expanddiv {
+    	padding: .5rem .7rem;
+    }
+    
+    #notifications {
+    	display: flex;
+    	align-items: center;
+    }
+    
+    
+    #notifications .header-menu__trigger,
+    #contactsmenu .contacts-icon {
+    	background-position: center;
+    	background-repeat: no-repeat;
+    	background-size: 20px 20px;
+    	width: 36px;
+    	height: 36px;
+    }
+    
+    #notifications .header-menu__trigger {
+    	background-image: url('./img/notifications.svg');
+    	background-color: #0f0f0f;
+    }
+    
+    #notifications .header-menu__trigger,
+    #dd-megamenu,
+    #dd-user-menu {
+    	display: flex;
+    	align-self: center;
+    	justify-self: center;
+    	align-items: center;
+    	justify-content: center;
+    }
+    
+    #contactsmenu .contacts-icon {
+        background-image: var(--original-icon-contacts-dark);
+    	background-color: #f0f0f0;
+    }
+    
+    #notifications .material-design-icon__svg,
+    #contactsmenu .contacts-icon .material-design-icon__svg {
+    	display: none;
+    }
+    
+    #dd-user-menu {
+    	width: 50px;
+    	height: 50px;
+    }
+    #dd-user-menu-button {
+    	width: 39px;
+    	height: 39px;
+    }

dd-apps/docker/nextcloud/src/themes/dd/core/ddstyles.css

@@ -1,17 +0,0 @@
-[data-action="onlyofficeDocxf"]{
-    display: none !important;
-}
-
-/* Fix logo misplacement */
-header#header a#nextcloud {
-    margin-left: 0;
-}
-/* Force visual aesthetic */
-body#body-user header#header {
-    background-image: none !important;
-}
-/* Fix icon colours */
-header#header #navbar-nextcloud span.material-design-icon,
-header#header #navbar-nextcloud #contactsmenu div.menutoggle::before {
-    filter: invert();
-}

dd-apps/docker/nextcloud/src/themes/dd/core/img/notifications.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16">
+ <path d="m8 2c-0.5523 0-1 0.4477-1 1 0 0.0472 0.021 0.0873 0.0273 0.1328-1.7366 0.4362-3.0273 1.9953-3.0273 3.8672v2l-1 1v1h10v-1l-1-1v-2c0-1.8719-1.291-3.431-3.0273-3.8672 0.0063-0.0455 0.0273-0.0856 0.0273-0.1328 0-0.5523-0.4477-1-1-1zm-2 10c0 1.1046 0.8954 2 2 2s2-0.8954 2-2z" fill="#fff"/>
+</svg>

dd-apps/docker/nextcloud/src/themes/dd/core/js/navbar.js

@@ -1,24 +1,3 @@
-/*
-*   Copyright © 2021,2022 IsardVDI S.L.
-*   Copyright © 2022 Evilham <contact@evilham.com>
-*
-*   This file is part of DD
-*
-*   DD is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU Affero General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or (at your
-*   option) any later version.
-*
-*   DD is distributed in the hope that it will be useful, but WITHOUT ANY
-*   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-*   FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
-*   details.
-*
-*   You should have received a copy of the GNU Affero General Public License
-*   along with DD. If not, see <https://www.gnu.org/licenses/>.
-*
-* SPDX-License-Identifier: AGPL-3.0-or-later
-*/
 document.addEventListener("DOMContentLoaded", () => {
     base_url = `${window.location.protocol}//${window.location.host.replace(/^nextcloud\./, 'api.')}`
     $.getJSON(`${base_url}/json`, (result) => {
@@ -33,7 +12,7 @@ document.addEventListener("DOMContentLoaded", () => {
         }
     })
     $.get(`${base_url}/header/html/nextcloud`, (result) => {
-        $("#settings").before(result)
+        $("#dd-megamenu").html(result)
         $('#dropdownMenuAppsButton').click(() => {
             $('#dropdownMenuApps').toggle()
         })
@@ -42,15 +21,23 @@ document.addEventListener("DOMContentLoaded", () => {
         })
     })
     $(window).click( (event) => {
+        [{parents: '#dropdownMenuAppsButton, #dropdownMenuApps', target: '#dropdownMenuApps'},
+         {parents: '#dd-user-menu, #dd-user-menu-trigger', target: '#dd-user-menu-dropdown'},
+        ].forEach((it) => {
             if (
                 !$(event.target).parents(
-                '#dropdownMenuAppsButton, #dropdownMenuApps'
+                    it.parents
                 ).length
             ) {
-            $('#dropdownMenuApps').hide()
+                $(it.target).hide()
             }
 	    })
+    })
     $(window).blur( (event) => {
         $('#dropdownMenuApps').hide()
+        $('#dd-user-menu-dropdown').hide()
     })
+    $('#dd-user-menu-trigger').click(() => {
+        $('#dd-user-menu-dropdown').toggle();
+    });
 })

dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php

@@ -20,20 +20,20 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 */
-	$api_url = "https://" . preg_replace('/^nextcloud\./', 'api.', $_SERVER['HTTP_HOST']);
+// \OCP\Util::addScript('dd', 'navbar');
-	$profile_url = "https://" . preg_replace('/^nextcloud\./', 'sso.', $_SERVER['HTTP_HOST']) . "/auth/realms/master/account";
+// style('dd', 'ddstyles');
-	$showsettings = in_array($_['user_uid'], ['admin', 'ddadmin']) ? true : false;
+$api_url = "https://" . preg_replace('/^nextcloud\./', 'api.', $_SERVER['HTTP_HOST']);
+$profile_url = "https://" . preg_replace('/^nextcloud\./', 'sso.', $_SERVER['HTTP_HOST']) . "/auth/realms/master/account";
+$showsettings = in_array($_['user_uid'], ['admin', 'ddadmin']) ? true : false;
  
-	// Remove user menu Settings item for non-administrator users
+ $getUserAvatar = static function (int $size) use ($_): string {
-	if(!array_key_exists('core_apps', $_["settingsnavigation"])){
+	return \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
-		unset($_["settingsnavigation"]["settings"]);
+		'userId' => $_['user_uid'],
-	}
+		'size' => $size,
-
+		'v' => $_['userAvatarVersion']
-$getUserAvatar = static function (int $size) use ($_): string {
+	]);
-	$avatar_url = "https://" . preg_replace('/^nextcloud\./', 'sso.', $_SERVER['HTTP_HOST']) . "/auth/realms/master/avatar-provider";
-	return $avatar_url;
 }
-
+//script('dd', 'navbar.js');
 ?><!DOCTYPE html>
 <html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" data-locale="<?php p($_['locale']); ?>" >
 	<head data-user="<?php p($_['user_uid']); ?>" data-user-displayname="<?php p($_['user_displayname']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
@@ -60,27 +60,19 @@ $getUserAvatar = static function (int $size) use ($_): string {
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
 		<link rel="manifest" href="<?php print_unescaped(image_path($_['appid'], 'manifest.json')); ?>">
-		<link rel="stylesheet" href="<?php p($api_url) ?>/css/font-awesome-4.7.0/css/font-awesome.min.css">
+		<link type="text/css"  rel="stylesheet" href="<?php p($api_url) ?>/css/font-awesome-4.7.0/css/font-awesome.min.css">
-		<link rel="stylesheet" href="<?php p($api_url) ?>/css/dd.css?2303">
+		<link type="text/css"  rel="stylesheet" href="<?php p($api_url) ?>/css/dd.css">
-		<link rel="stylesheet" href="/themes/dd/core/ddstyles.css?2303">
+		<link type="text/css" rel="stylesheet" href="/themes/dd/core/css/ddstyles.css">
 		<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="/themes/dd/core/js/navbar.js"></script>
 		<?php emit_css_loading_tags($_); ?>
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
-		<style>
-			/*
-			 * Move "New text document" to last position of file app plus menu
-			 */
-			.newFileMenu > ul:nth-child(1) > li:nth-child(3) {
-				order: 1;
-			}
-		</style>
 	</head>
 	<?php array_push($_['enabledThemes'], "light");?>
 	<body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) {
 				p("data-theme-$themeId ");
 			}?> data-themes=<?php p(join(',', $_['enabledThemes'])) ?>>
-	<?php include 'layout.noscript.warning.php'; ?>
+	<?php include_once (__DIR__ . '/../../../../core/templates/layout.noscript.warning.php'); ?>
 
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
 			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
@@ -92,6 +84,9 @@ $getUserAvatar = static function (int $size) use ($_): string {
 		</div>
 
 		<header role="banner" id="header">
+			<h1 class="hidden-visually" id="page-heading-level-1">
+				<?php p(!empty($_['pageTitle'])?$_['pageTitle']:$theme->getName()); ?>
+			</h1>
 			<div class="header-left" id="navbar-logo">
 				<a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>"
 					id="nextcloud">
@@ -104,18 +99,13 @@ $getUserAvatar = static function (int $size) use ($_): string {
 			<div class="header-right" id="navbar-nextcloud">
 				<div id="unified-search"></div>
 				<div id="notifications"></div>
-				<div id="contactsmenu">
+				<div id="contactsmenu"></div>
-					<div class="menutoggle" tabindex="0" role="button"
+				<div id="dd-megamenu"></div>
-					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
+<?php if ($showsettings) { // Native NextCloud Menu ?>
-						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
+				<div id="user-menu"></div>
-					</div>
+<?php } else { // Filtered menu ?>
-					<div id="contactsmenu-menu" class="menu"
+				<div id="dd-user-menu"><div id='dd-user-menu-button'>
-						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
+					<div id="dd-user-menu-trigger" data-toggle='dropdown'>
-				</div>
-				<div id="settings">
-					<div id="expand" tabindex="0" role="button" class="menutoggle"
-						aria-label="<?php p($l->t('Open settings menu'));?>"
-						aria-haspopup="true" aria-controls="expanddiv" aria-expanded="false">
 						<div id="avatardiv-menu" class="avatardiv<?php if ($_['userAvatarSet']) {
 				print_unescaped(' avatardiv-shown');
 			} else {
@@ -125,32 +115,40 @@ $getUserAvatar = static function (int $size) use ($_): string {
 							 data-displayname="<?php p($_['user_displayname']); ?>"
 			<?php
 			if ($_['userAvatarSet']) {
-				$avatar32 = $getUserAvatar(32); ?> data-avatar="<?php p($avatar32); ?>"
+				$avatar39 = $getUserAvatar(39); ?> data-avatar="<?php p($avatar39); ?>"
 			<?php
 			} ?>>
 							<?php
 							if ($_['userAvatarSet']) {?>
-								<img alt="" width="32" height="32"
+								<img alt="" width="39" height="39"
-								src="<?php p($avatar32);?>"
+								src="<?php p($avatar39);?>"
 								srcset="<?php p($getUserAvatar(64));?> 2x, <?php p($getUserAvatar(128));?> 4x"
 								>
 							<?php } ?>
 						</div>
 					</div>
-					<nav class="settings-menu" id="expanddiv" style="display:none;">
+					<div id="dd-user-menu-dropdown" class='dropdown-menu dropdown-menu-right' labeledby='dd-user-menu-trigger' style='display:none'>
 						<ul>
-					<?php foreach ($_['settingsnavigation'] as $entry):?>
+							<li>
+								<a target="_blank" href="<?php p($profile_url)?>">
+									<div class="ddiconcontainer">
+										<i class="icon fa fa-user fa-fw ddicon"></i>
+									</div>
+									<?php p($_['user_displayname']); ?>
+								</a>
+							</li>
+							<?php $entry = json_decode($_['initialStates']['core-settingsNavEntries'], true)['logout']; ?>
 							<li data-id="<?php p($entry['id']); ?>">
-							<a href="<?php print_unescaped($entry['href'] !== '' ? $entry['href'] : '#'); ?>"
+								<a href="<?php print_unescaped($entry['href']); ?>">
-								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
+									<div class="ddiconcontainer">
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
+										<i class="icon fa fa-sign-out fa-fw ddicon" aria-hidden="true"></i> </div>
 										<?php p($entry['name']) ?>
 								</a>
 							</li>
-					<?php endforeach; ?>
 						</ul>
-					</nav>
 					</div>
+				</div></div>
+			<?php } ?>
 				<div id="product-logo">
 					<a href="https://xnet-x.net/ca/digital-democratic/" target="_blank">
 						<img src="/themes/dd/core/img/dd.svg" alt="" style="height: 16px; margin-right: 21px; margin-top: 16px"/>
@@ -170,11 +168,9 @@ $getUserAvatar = static function (int $size) use ($_): string {
 		</form>
 
 		<main id="content" class="app-<?php p($_['appid']) ?>">
-			<h1 class="hidden-visually">
-				<?php p($l->t('%s\'s homepage', [$theme->getName()])); ?>
-			</h1>
 			<?php print_unescaped($_['content']); ?>
 		</main>
 		<div id="profiler-toolbar"></div>
 	</body>
+
 </html>