diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-04-13 11:59:25 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-04-13 11:59:25 +0200 |
| commit | f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3 (patch) | |
| tree | feddc7956054f7966e2f4ebd4231df20e9e31fee /view/settings.tpl | |
| parent | 469710893da118d9fd174d69cc47069541bafe7b (diff) | |
| parent | df1904b204a969780609cac64bbb1a03a8dd3fcb (diff) | |
| download | volse-hubzilla-f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3.tar.gz volse-hubzilla-f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3.tar.bz2 volse-hubzilla-f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3.zip | |
Merge remote-tracking branch 'friendica/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}} |