Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addded monthly report checkbox and changed order of the settings #646

Closed
wants to merge 1 commit into from
Closed

Addded monthly report checkbox and changed order of the settings #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions templates/settings/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,24 @@
/** @var \OCP\IL10N $l */
?>

<?php if ($_['email_enabled']) { ?>
<?php if (!$_['is_email_set']): ?>
<br />
<br />
<h3><strong><?php p($l->t('Notification')); ?></strong></h3>
<!-- <strong><?php p($l->t('You need to set up your email address before you can receive notification emails.')); ?></strong> -->
<?php endif; ?>


<label for="notify_setting_batchtime"><?php p($l->t('Send activity emails:')); ?></label>
<select id="notify_setting_batchtime" name="notify_setting_batchtime">
<option value="3"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_ASAP): ?> selected="selected"<?php endif; ?>><?php p($l->t('As soon as possible')); ?></option>
<option value="0"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_HOURLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Hourly')); ?></option>
<option value="1"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_DAILY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Daily')); ?></option>
<option value="2"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_WEEKLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Weekly')); ?></option>
</select>
<?php }?>

<table class="grid activitysettings">
<tbody>
<?php foreach ($_['activityGroups'] as $group): ?>
Expand Down Expand Up @@ -61,19 +79,3 @@
<?php endforeach; ?>
</tbody>
</table>

<?php if ($_['email_enabled']) { ?>
<?php if (!$_['is_email_set']): ?>
<br />
<strong><?php p($l->t('You need to set up your email address before you can receive notification emails.')); ?></strong>
<?php endif; ?>

<br />
<label for="notify_setting_batchtime"><?php p($l->t('Send activity emails:')); ?></label>
<select id="notify_setting_batchtime" name="notify_setting_batchtime">
<option value="3"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_ASAP): ?> selected="selected"<?php endif; ?>><?php p($l->t('As soon as possible')); ?></option>
<option value="0"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_HOURLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Hourly')); ?></option>
<option value="1"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_DAILY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Daily')); ?></option>
<option value="2"<?php if ($_['setting_batchtime'] === \OCA\Activity\UserSettings::EMAIL_SEND_WEEKLY): ?> selected="selected"<?php endif; ?>><?php p($l->t('Weekly')); ?></option>
</select>
<?php }
10 changes: 6 additions & 4 deletions templates/settings/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@
<?php p($l->t('Choose for which activities you want to get a push notification.')); ?>
<?php } ?>
</p>
<h3><strong><?php p($l->t('Daily activity summary')); ?></strong></h3>
<input type="checkbox" class="checkbox" id="monthly_report">
<label for="monthly_report"><?php p($l->t('Monthly Status Report.')); ?></label>

<?php print_unescaped($this->inc('settings/form')); ?>

<h2><?php p($l->t('Daily activity summary')); ?></h2>

<br />
<input id="activity_email_enabled" name="activity_digest" type="checkbox" class="checkbox"
value="1" <?php if ($_['activity_digest_enabled']) {
print_unescaped('checked="checked"');
} ?> />
<label for="activity_email_enabled"><?php p($l->t('Send daily activity summary in the morning')); ?></label>

<?php print_unescaped($this->inc('settings/form')); ?>
</form>