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

Merge branch 'nc-rework' of https://gitlab.com/DD-workspace/DD into nc-rework

main
elena 2023-05-12 08:38:39 +00:00
parent 28430d8fe2 bdffd5a733
commit b59201e4b6
3 changed files with 15 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UPDATING.md
View File

@ -55,9 +55,9 @@ UPGRADE messages) with:
# Upgrade to NC version 24.0.10 (latest 24 minor on 2023-03-14) # Upgrade to NC version 24.0.10 (latest 24 minor on 2023-03-14)
# Note this commit already includes the reworked image # Note this commit already includes the reworked image
./dd-ctl update 010a04bf37d75b39cf24bcc2b80c81023e037f78 ./dd-ctl update e401b47c84be5c71b102a02f3d9d505bc6b1106b
# Upgrade to NC version 25.0.5 (latest 25 minor on 2023-03-31) # Upgrade to NC version 25.0.5 (latest 25 minor on 2023-03-31)
./dd-ctl update a4f51d102396ebc0883882dfbcebd9e08f60a7b8 ./dd-ctl update ce61cfffbe9b0466ee6312ddd5199b7459da6d30
### 2023-02 - Nextcloud 24.0.10 ### 2023-02 - Nextcloud 24.0.10

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

@ -74,26 +74,6 @@ $getUserAvatar = static function (int $size) use ($_): string {
.newFileMenu > ul:nth-child(1) > li:nth-child(3) { .newFileMenu > ul:nth-child(1) > li:nth-child(3) {
order: 1; order: 1;
} }
#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;
}
</style> </style>
</head> </head>
<?php array_push($_['enabledThemes'], "light");?> <?php array_push($_['enabledThemes'], "light");?>
@ -159,33 +139,15 @@ $getUserAvatar = static function (int $size) use ($_): string {
</div> </div>
<nav class="settings-menu" id="expanddiv" style="display:none;"> <nav class="settings-menu" id="expanddiv" style="display:none;">
<ul> <ul>
<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 foreach ($_['settingsnavigation'] as $entry):?> <?php foreach ($_['settingsnavigation'] as $entry):?>
<?php if ($showsettings) { ?> <li data-id="<?php p($entry['id']); ?>">
<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; ?>>
<?php if ($entry["active"]): ?> class="active"<?php endif; ?>> <img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"> <?php p($entry['name']) ?>
<?php p($entry['name']) ?> </a>
</a> </li>
</li> <?php endforeach; ?>
<?php } else if ($entry['id'] == 'logout') { ?>
<li data-id="<?php p($entry['id']); ?>">
<a href="<?php print_unescaped($entry['href']); ?>">
<div class="ddiconcontainer">
<i class="icon fa fa-sign-out fa-fw ddicon" aria-hidden="true"></i> </div>
<?php p($entry['name']) ?>
</a>
</li>
<?php } ?>
<?php endforeach; ?>
</ul> </ul>
</nav> </nav>
</div> </div>

13
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
@ -122,14 +127,10 @@ NEXTCLOUD_POSTGRES_PASSWORD=N3xtcl0ud
### These should be available from https://apps.nextcloud.com/ ### These should be available from https://apps.nextcloud.com/
### Example: NEXTCLOUD_PLUGINS_ENABLE=cospend,cookbook ### Example: NEXTCLOUD_PLUGINS_ENABLE=cospend,cookbook
#NEXTCLOUD_PLUGINS_ENABLE= #NEXTCLOUD_PLUGINS_ENABLE=
<<<<<<< HEAD
#NEXTCLOUD_PLUGINS_DISABLE
=======
#NEXTCLOUD_PLUGINS_DISABLE= #NEXTCLOUD_PLUGINS_DISABLE=
# #
### This language will be forced (currently only Nextcloud) ### This language will be forced (currently only Nextcloud)
#FORCED_LANGUAGE=ca #FORCED_LANGUAGE=ca
>>>>>>> b61286cf97c4d84ffae9afc062549a70fb0ae62a
## WORDPRESS ## WORDPRESS
##============================================================================= ##=============================================================================
@ -176,11 +177,7 @@ MOODLE_MEMORY_LIMIT=128M
## NEXTCLOUD ## NEXTCLOUD
# If enabled overrides nextcloud.yaml default image. # If enabled overrides nextcloud.yaml default image.
# You usually do not want to change this, but instead rely on DD's version. # You usually do not want to change this, but instead rely on DD's version.
<<<<<<< HEAD
#NEXTCLOUD_IMG_OVERRIDE=nextcloud:25.0.4-fpm-alpine
=======
#NEXTCLOUD_IMG_OVERRIDE=nextcloud:25.0.5-fpm-alpine #NEXTCLOUD_IMG_OVERRIDE=nextcloud:25.0.5-fpm-alpine
>>>>>>> b61286cf97c4d84ffae9afc062549a70fb0ae62a
## ONLYOFFICE ## ONLYOFFICE
ONLYOFFICE_IMG=alehoho/oo-ce-docker-license:6.3.1.32 ONLYOFFICE_IMG=alehoho/oo-ce-docker-license:6.3.1.32