diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
| commit | 4e220ec391514fbdeaa7d64abfd1752a9b44bbaa (patch) | |
| tree | 1cb3cb621221e948be9e0e91916aac0dd6fccb0e /view/settings.tpl | |
| parent | 572678fef95816deaa1ecafe5cbcfb8cc65963c9 (diff) | |
| parent | 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e (diff) | |
| download | volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.gz volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.bz2 volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'view/settings.tpl')
| -rw-r--r-- | view/settings.tpl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index ebca4875f..59c669a87 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -99,7 +99,13 @@ $unkmail <h3 class="settings-heading">$h_not</h3> -<div id="settings-notify-desc">$lbl_not </div> +<strong>$activity_options</strong> + +{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}} +{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}} + + +<div id="settings-notify-desc"><strong>$lbl_not </strong></div> <div class="group"> {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}} |