From 848c8bded97197123f4d247924b119274a866988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@bona.gent>
Date: Tue, 18 Jan 2022 17:57:59 +0100
Subject: [PATCH] New nextcloud top bar style

---
 .../themes/digitaldemocratic/core/img/dd.svg  | 71 +++++++++++++++++++
 .../digitaldemocratic/core/js/navbar.js       |  2 +-
 .../core/templates/layout.user.php            | 11 +--
 3 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 docker/nextcloud/themes/digitaldemocratic/core/img/dd.svg

diff --git a/docker/nextcloud/themes/digitaldemocratic/core/img/dd.svg b/docker/nextcloud/themes/digitaldemocratic/core/img/dd.svg
new file mode 100644
index 0000000..2fc8d44
--- /dev/null
+++ b/docker/nextcloud/themes/digitaldemocratic/core/img/dd.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg833"
+   xml:space="preserve"
+   width="938.60156"
+   height="822.26654"
+   viewBox="0 0 938.60156 822.26654"
+   sodipodi:docname="IMAGOTIPO.ai"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"><metadata
+     id="metadata839"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs837" /><sodipodi:namedview
+     pagecolor="#262626"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview835"
+     showgrid="false"
+     inkscape:zoom="0.52175937"
+     inkscape:cx="469.36709"
+     inkscape:cy="470.02306"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g841"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="g841"
+     inkscape:groupmode="layer"
+     inkscape:label="IMAGOTIPO"
+     transform="matrix(1.3333333,0,0,-1.3333333,-3.0729151,942.46306)"><g
+       id="g1485"><path
+         d="M 2.3046864,178.26794 H 90.405195 v 176.1992 H 2.3046864 Z"
+         style="fill:#262626;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.82241"
+         id="path851" /><path
+         d="m 442.47373,706.84731 h -88.10052 v -88.10052 h 88.10052 z"
+         style="fill:#262626;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.82241"
+         id="path853" /><path
+         d="M 90.607482,90.14739 H 266.27453 v 88.1005 H 90.607482 Z"
+         style="fill:#262626;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.82241"
+         id="path855" /><path
+         d="m 618.15536,618.74679 h 88.1005 v 88.10052 h -88.1005 z"
+         style="fill:#262626;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.82241"
+         id="path857" /><g
+         id="g859"
+         transform="matrix(1.8224046,0,0,1.8224046,530.05484,442.54687)"><path
+           d="m 0,0 h -96.401 v 96.685 h -48.342 V 0 h -96.393 v -48.343 h 96.393 v -96.685 h 48.342 v 0 96.685 H 0 v -96.685 H 48.343 V -48.343 0 96.685 H 0 Z"
+           style="fill:#262626;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path861" /></g><path
+         d="m 354.37321,90.14739 h 175.68163 v 88.1005 H 354.37321 Z"
+         style="fill:#262626;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.82241"
+         id="path863" /></g><g
+       id="g843"
+       transform="translate(548.0029,136.6879)" /></g></svg>
diff --git a/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js b/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js
index 599e33f..56e0a7f 100644
--- a/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js
+++ b/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js
@@ -7,7 +7,7 @@ jQuery(document).ready(() => {
     })
     $.get(`${base_url}/header/html/nextcloud`, (result) => {
         console.log(result)
-        $("#navbar-logo").after(result)
+        $("#settings").before(result)
         $('#dropdownMenuAppsButton').click(() => {
             $('#dropdownMenuApps').toggle()
         })
diff --git a/docker/nextcloud/themes/digitaldemocratic/core/templates/layout.user.php b/docker/nextcloud/themes/digitaldemocratic/core/templates/layout.user.php
index 54017cb..a38d152 100644
--- a/docker/nextcloud/themes/digitaldemocratic/core/templates/layout.user.php
+++ b/docker/nextcloud/themes/digitaldemocratic/core/templates/layout.user.php
@@ -61,14 +61,14 @@
 			<div id="navbar-logo" class="header-left">
 				<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
 					id="nextcloud">
-					<img src="<?php p($api_url) ?>/img/logo.png" alt="" style="height: 60px;">
+					<img src="<?php p($api_url) ?>/img/logo.png" alt="" style="height: 39px;">
 				</a>
 			</div>
 
 			<div id="navbar-nextcloud" class="header-right">      
 
-				<div id="unified-search"></div>
 				<div id="notifications"></div>
+				<div id="unified-search"></div>
 				<div id="contactsmenu">
 					<div class="icon-contacts menutoggle" tabindex="0" role="button"
 					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
@@ -109,9 +109,12 @@
 					</ul>
 					</nav>
 				</div>
+				<div id="dd-logo">
+					<a href="https://digitaldemocratic.xnet-x.net/" target="_blank">
+						<img src="/themes/digitaldemocratic/core/img/dd.svg" alt="" style="height: 16px; margin-right: 21px; margin-top: 16px"/>
+					</a>
+				</div>
 			</div>
-
-
 		</header>
 
 		<div id="sudo-login-background" class="hidden"></div>