EDUCATIC
/
digitaldemocratic
mirror of https://gitlab.com/digitaldemocratic/digitaldemocratic
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolved conflicts

main
Antoni Bertran 2023-06-07 15:15:44 +02:00
parent 0f6747e429 65ddc5d11e
commit b00fefe575
2 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,18 +20,20 @@
# #
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
*/ */
$api_url = "https://" . preg_replace('/^nextcloud\./', 'api.', $_SERVER['HTTP_HOST']); // \OCP\Util::addScript('dd', 'navbar');
// style('dd', 'ddstyles');
// Remove user menu Settings item for non-administrator users $api_url = "https://" . preg_replace('/^nextcloud\./', 'api.', $_SERVER['HTTP_HOST']);
if(!array_key_exists('core_apps', $_["settingsnavigation"])){ $profile_url = "https://" . preg_replace('/^nextcloud\./', 'sso.', $_SERVER['HTTP_HOST']) . "/auth/realms/master/account";
unset($_["settingsnavigation"]["settings"]); $showsettings = in_array($_['user_uid'], ['admin', 'ddadmin']) ? true : false;
}
$getUserAvatar = static function (int $size) use ($_): string {
$getUserAvatar = static function (int $size) use ($_): string { return \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
$avatar_url = "https://" . preg_replace('/^nextcloud\./', 'sso.', $_SERVER['HTTP_HOST']) . "/auth/realms/master/avatar-provider"; 'userId' => $_['user_uid'],
return $avatar_url; 'size' => $size,
'v' => $_['userAvatarVersion']
]);
} }
//script('dd', 'navbar.js');
?><!DOCTYPE html> ?><!DOCTYPE html>
<html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" data-locale="<?php p($_['locale']); ?>" > <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']); ?>"> <head data-user="<?php p($_['user_uid']); ?>" data-user-displayname="<?php p($_['user_displayname']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
@ -58,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="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="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="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> <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="/themes/dd/core/js/navbar.js"></script>
<?php emit_css_loading_tags($_); ?> <?php emit_css_loading_tags($_); ?>
<?php emit_script_loading_tags($_); ?> <?php emit_script_loading_tags($_); ?>
<?php print_unescaped($_['headers']); ?> <?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> </head>
<?php array_push($_['enabledThemes'], "light");?> <?php array_push($_['enabledThemes'], "light");?>
<body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) { <body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) {
p("data-theme-$themeId "); p("data-theme-$themeId ");
}?> data-themes=<?php p(join(',', $_['enabledThemes'])) ?>> }?> 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) { ?> <?php foreach ($_['initialStates'] as $app => $initialState) { ?>
<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>"> <input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
@ -90,6 +84,9 @@ $getUserAvatar = static function (int $size) use ($_): string {
</div> </div>
<header role="banner" id="header"> <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"> <div class="header-left" id="navbar-logo">
<a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>" <a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>"
id="nextcloud"> id="nextcloud">
@ -102,18 +99,13 @@ $getUserAvatar = static function (int $size) use ($_): string {
<div class="header-right" id="navbar-nextcloud"> <div class="header-right" id="navbar-nextcloud">
<div id="unified-search"></div> <div id="unified-search"></div>
<div id="notifications"></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']) { <div id="avatardiv-menu" class="avatardiv<?php if ($_['userAvatarSet']) {
print_unescaped(' avatardiv-shown'); print_unescaped(' avatardiv-shown');
} else { } else {
@ -123,32 +115,40 @@ $getUserAvatar = static function (int $size) use ($_): string {
data-displayname="<?php p($_['user_displayname']); ?>" data-displayname="<?php p($_['user_displayname']); ?>"
<?php <?php
if ($_['userAvatarSet']) { if ($_['userAvatarSet']) {
$avatar32 = $getUserAvatar(32); ?> data-avatar="<?php p($avatar32); ?>" $avatar39 = $getUserAvatar(39); ?> data-avatar="<?php p($avatar39); ?>"
<?php <?php
} ?>> } ?>>
<?php <?php
if ($_['userAvatarSet']) {?> 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" srcset="<?php p($getUserAvatar(64));?> 2x, <?php p($getUserAvatar(128));?> 4x"
> >
<?php } ?> <?php } ?>
</div> </div>
</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> <ul>
<?php foreach ($_['settingsnavigation'] as $entry):?> <li>
<li data-id="<?php p($entry['id']); ?>"> <a target="_blank" href="<?php p($profile_url)?>">
<a href="<?php print_unescaped($entry['href'] !== '' ? $entry['href'] : '#'); ?>" <div class="ddiconcontainer">
<?php if ($entry["active"]): ?> class="active"<?php endif; ?>> <i class="icon fa fa-user fa-fw ddicon"></i>
<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"> </div>
<?php p($entry['name']) ?> <?php p($_['user_displayname']); ?>
</a> </a>
</li> </li>
<?php endforeach; ?> <?php $entry = json_decode($_['initialStates']['core-settingsNavEntries'], true)['logout']; ?>
</ul> <li data-id="<?php p($entry['id']); ?>">
</nav> <a href="<?php print_unescaped($entry['href']); ?>">
</div> <div class="ddiconcontainer">
<i class="icon fa fa-sign-out fa-fw ddicon" aria-hidden="true"></i> </div>
<?php p($entry['name']) ?>
</a>
</li>
</ul>
</div>
</div></div>
<?php } ?>
<div id="product-logo"> <div id="product-logo">
<a href="https://xnet-x.net/ca/digital-democratic/" target="_blank"> <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"/> <img src="/themes/dd/core/img/dd.svg" alt="" style="height: 16px; margin-right: 21px; margin-top: 16px"/>
@ -168,11 +168,9 @@ $getUserAvatar = static function (int $size) use ($_): string {
</form> </form>
<main id="content" class="app-<?php p($_['appid']) ?>"> <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']); ?> <?php print_unescaped($_['content']); ?>
</main> </main>
<div id="profiler-toolbar"></div> <div id="profiler-toolbar"></div>
</body> </body>
</html> </html>

5
dd.conf.sample
View File

@ -75,6 +75,11 @@ DDADMIN_EMAIL=theemail@mymailserver.com
#BBB_HOST=bbb.example.org #BBB_HOST=bbb.example.org
#BBB_API_SECRET=APISECRET #BBB_API_SECRET=APISECRET
# BBB settings
# This gets automatically configured on Nextcloud
#BBB_HOST=bbb.example.org
#BBB_API_SECRET=APISECRET
# ------ Api Secret ----------------------------------------------------------- # ------ Api Secret -----------------------------------------------------------
## Generate your own SECRET! (or apply securize script) ## Generate your own SECRET! (or apply securize script)
## openssl rand -base64 32 ## openssl rand -base64 32