Arreglo MegaMenú

main
elena 2023-05-12 14:07:39 +00:00 committed by Antoni Bertran
parent b9a9132456
commit 1104032f51
9 changed files with 167 additions and 49 deletions

View File

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

View File

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

View File

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

View File

@ -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' => [
],
];

View File

@ -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;
}

View File

@ -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();
}

View File

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

After

Width:  |  Height:  |  Size: 455 B

File diff suppressed because one or more lines are too long

View File

@ -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) => {
if (
!$(event.target).parents(
'#dropdownMenuAppsButton, #dropdownMenuApps'
).length
) {
$('#dropdownMenuApps').hide()
}
[{parents: '#dropdownMenuAppsButton, #dropdownMenuApps', target: '#dropdownMenuApps'},
{parents: '#dd-user-menu, #dd-user-menu-trigger', target: '#dd-user-menu-dropdown'},
].forEach((it) => {
if (
!$(event.target).parents(
it.parents
).length
) {
$(it.target).hide()
}
})
})
$(window).blur( (event) => {
$('#dropdownMenuApps').hide()
$('#dd-user-menu-dropdown').hide()
})
$('#dd-user-menu-trigger').click(() => {
$('#dd-user-menu-dropdown').toggle();
});
})