Move calendar settings into basic settings #13796

jancborchardt · 2019-01-24T14:45:58Z

Currently the "Groupware" settings section only has Calendar settings. This doesn’t make a lot of sense. And the sentence below the checkbox says it all:

Please make sure to properly set up the email settings above.

Fixed by moving it to basic settings, and improved the spacing (Also fixes background jobs):

Please review @nextcloud/designers @karlitschek

georgehrke · 2019-01-24T14:47:42Z

👎

#13765 Is gonna add more settings to group ware

georgehrke · 2019-01-24T14:56:02Z

On top of that, apps that implement custom Room / Resource backends for calendar scheduling are also supposed to put their UI into the groupware category :)

juliusknorr · 2019-01-24T14:59:43Z

Circles was also in there iirc.

jancborchardt · 2019-01-24T15:06:44Z

@georgehrke @juliushaertl alright, good stuff then! :) Will remove the moving of the Calendar server from my pull request. Still modifying some more stuff. :)

jancborchardt · 2019-01-24T15:17:35Z

Alright, moved it back, but now I need some help – @georgehrke?

The docs page at https://docs.nextcloud.com/server/latest/user_manual/pim/calendar.html is empty. This is also where the first run wizard links to. There should really be some content on there and it seems to have been empty for long? cc @jospoortvliet
I doubt I linked the other settings sections correctly. ;) The apps/organization/calendar link, and the email settings link would need to be checked.
Instead of just the arrow icon linking to the email server settings, it would be good to link the text "the email server" of the text, but I don’t know how to put a link in that translatable text.

karlitschek · 2019-01-24T15:18:06Z

👍

georgehrke · 2019-01-24T15:37:51Z

The docs page at https://docs.nextcloud.com/server/latest/user_manual/pim/calendar.html is empty. This is also where the first run wizard links to. There should really be some content on there and it seems to have been empty for long?

It's the correct link, but the documentation is just missing. @MariusBluem What's the status on the calendar doc?

Ref: nextcloud/documentation#127

georgehrke · 2019-01-24T16:17:07Z

@jancborchardt Done

jancborchardt · 2019-01-24T18:21:46Z

Awesome, thanks a lot @georgehrke!

Please review @nextcloud/calendar @nextcloud/designers 🚀

jancborchardt · 2019-01-24T18:22:46Z

apps/dav/templates/settings-admin-caldav.php

+		<em>
+			<?php print_unescaped(str_replace(
+				[
+					'{emailopen}',


@georgehrke guess this is supposed to be called "linkopen"? Not sure :D

I basically copied it from here: https://github.com/nextcloud/server/blob/master/settings/templates/settings/personal/development.notice.php#L16

{emailopen} will only be visible to the translators anyway.

skjnldsv · 2019-01-25T11:44:19Z

apps/dav/templates/settings-admin-caldav.php

 	<p>
 		<input type="checkbox" name="caldav_send_invitations" id="caldavSendInvitations" class="checkbox"
 			<?php ($_['send_invitations'] === 'yes') ? print_unescaped('checked="checked"') : null ?>/>
 		<label for="caldavSendInvitations"><?php p($l->t('Send invitations to attendees')); ?></label>
 		<br>
-		<em><?php p($l->t('Please make sure to properly set up the email settings above.')); ?></em>
+		<em>
+			<?php print_unescaped(str_replace(


Please use p and use the l10n sprintf method:

p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));

p() will escape <a href="../admin#mail_general_settings">

ah yes, then just the translation ;)

but p will print the text and once it's printed i can't replace {emailopen} or {linkclose} 😉

print_unescaped($l->t( 'Please make sure to properly set up %sthe email server↗%s.', '<a href="../admin#mail_general_settings">', '</a>' ));

And I can see %sthe causing issues.
I don't know, the str_replace seemed weird to me :)

I throw <?php p($l->t('Please make sure to properly set up')) ?> <a href="../admin#mail_general_settings"><?php p($l->t('the email server ↗')) ?></a> in the ring 🤣

I don't know, the str_replace seemed weird to me 😀

As i said above already, I just copied it from https://github.com/nextcloud/server/blob/master/settings/templates/settings/personal/development.notice.php#L16
😉

kesselb · 2019-01-25T13:23:17Z

apps/dav/templates/settings-admin-caldav.php

+					'<a href="../admin#mail_general_settings">',
+					'</a>',
+				],
+				$l->t('Please make sure to properly set up {emailopen}the email server↗{linkclose}.')


There is usually one whitespace before ↗.

Actually that should not be here at all since it’s only used for external links. :)

If we have a verdict on the syntax of the link / translation combination, then it can be fixed in one go.

tcitworld · 2019-01-27T11:36:02Z

apps/dav/templates/settings-admin-caldav.php

@@ -30,12 +30,26 @@
 ?>
 <form id="CalDAV" class="section">
 	<h2><?php p($l->t('Calendar server')); ?></h2>
+	<p class="settings-hint">Also install the <a target="_blank" href="../apps/office/calendar">Calendar app</a>, or
+	<a target="_blank" href="<?php p(link_to_docs('user-sync-calendars')) ?>" rel="noreferrer noopener">connect your desktop & mobile for syncing</a>.</p>


Shouldn't these be translated as well ?

MariusBluem · 2019-01-27T18:39:15Z

@georgehrke Same as I‘ve done with the CalDAV/CarDAV sync docs, I will create a PR with the Basic stuff which can be improved later ... End of this week :)

georgehrke · 2019-01-27T18:50:00Z

I made the text @jancborchardt added translatable, added a ↗ to the link to the docs and removed the ↗ from the link to the mail settings.

georgehrke · 2019-01-30T16:53:58Z

@jancborchardt @skjnldsv @MariusBluem Please check again :)

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

On some instances, users don't know each other and it doesn't makes sense to expose users as contacts (through Contacts Menu, Calendar Attendees,…) to everyone. Signed-off-by: Thomas Citharel <tcit@tcit.fr> Fix and add tests Signed-off-by: Thomas Citharel <tcit@tcit.fr> Change settings template according to #13796 Signed-off-by: Thomas Citharel <tcit@tcit.fr> Empty system addressbook instead of removing it This makes Federated Cloud Sharing not fail when synching trusted servers addressbooks (only synching an empty one, not bumping on an non-existent one). Signed-off-by: Thomas Citharel <tcit@tcit.fr> Fix tests Signed-off-by: Thomas Citharel <tcit@tcit.fr>

jancborchardt added enhancement design Design, UI, UX, etc. 3. to review Waiting for reviews feature: settings labels Jan 24, 2019

jancborchardt added this to the Nextcloud 16 milestone Jan 24, 2019

jancborchardt requested review from karlitschek, georgehrke, juliusknorr, pixelipo and skjnldsv January 24, 2019 14:45

georgehrke self-assigned this Jan 24, 2019

georgehrke force-pushed the design/settings-caldav branch from afc0122 to 29f33ba Compare January 24, 2019 15:47

georgehrke removed their assignment Jan 24, 2019

jancborchardt commented Jan 24, 2019

View reviewed changes

skjnldsv requested changes Jan 25, 2019

View reviewed changes

kesselb reviewed Jan 25, 2019

View reviewed changes

tcitworld reviewed Jan 27, 2019

View reviewed changes

tcitworld mentioned this pull request Jan 27, 2019

Allow to disable system addressbook sync #13765

Closed

1 task

skjnldsv approved these changes Jan 31, 2019

View reviewed changes

juliusknorr approved these changes Feb 1, 2019

View reviewed changes

jancborchardt and others added 7 commits February 1, 2019 10:06

Move calendar settings into basic settings

b068809

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

Improve design of description below label of checkbox or radio button

c44c23a

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

Calendar server: Link Calendar app and calendar sync docs

280dce8

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

Keep Calendar server settings in groupware but link mail server settings

3508c23

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

Turn "email server" in groupware settings to link to mail settings

9cea139

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

fix link to Calendar app in Groupware page

6c49dd1

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

make text in Groupware Settings translateable

ea1f6f6

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

juliusknorr force-pushed the design/settings-caldav branch from 6fb97a7 to ea1f6f6 Compare February 1, 2019 09:07

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Feb 1, 2019

rullzer merged commit b249c16 into master Feb 1, 2019

rullzer deleted the design/settings-caldav branch February 1, 2019 12:00

tcitworld added a commit that referenced this pull request Feb 1, 2019

Change settings template according to #13796

a9002a2

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move calendar settings into basic settings #13796

Move calendar settings into basic settings #13796

jancborchardt commented Jan 24, 2019 •

edited

Loading

georgehrke commented Jan 24, 2019

georgehrke commented Jan 24, 2019

juliusknorr commented Jan 24, 2019

jancborchardt commented Jan 24, 2019

jancborchardt commented Jan 24, 2019 •

edited by georgehrke

Loading

karlitschek commented Jan 24, 2019

georgehrke commented Jan 24, 2019 •

edited

Loading

georgehrke commented Jan 24, 2019

jancborchardt commented Jan 24, 2019

jancborchardt Jan 24, 2019

georgehrke Jan 24, 2019

skjnldsv Jan 25, 2019

georgehrke Jan 25, 2019

skjnldsv Jan 25, 2019

georgehrke Jan 25, 2019

skjnldsv Jan 25, 2019

kesselb Jan 25, 2019

georgehrke Jan 25, 2019

kesselb Jan 25, 2019

jancborchardt Jan 25, 2019

tcitworld Jan 27, 2019

MariusBluem commented Jan 27, 2019

georgehrke commented Jan 27, 2019

georgehrke commented Jan 30, 2019

Move calendar settings into basic settings #13796

Move calendar settings into basic settings #13796

Conversation

jancborchardt commented Jan 24, 2019 • edited Loading

georgehrke commented Jan 24, 2019

georgehrke commented Jan 24, 2019

juliusknorr commented Jan 24, 2019

jancborchardt commented Jan 24, 2019

jancborchardt commented Jan 24, 2019 • edited by georgehrke Loading

karlitschek commented Jan 24, 2019

georgehrke commented Jan 24, 2019 • edited Loading

georgehrke commented Jan 24, 2019

jancborchardt commented Jan 24, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MariusBluem commented Jan 27, 2019

georgehrke commented Jan 27, 2019

georgehrke commented Jan 30, 2019

jancborchardt commented Jan 24, 2019 •

edited

Loading

jancborchardt commented Jan 24, 2019 •

edited by georgehrke

Loading

georgehrke commented Jan 24, 2019 •

edited

Loading