diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-31 23:22:19 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-31 23:22:19 -0400 |
| commit | b1dacd6d838ecf75fe828279e57c2e7a866be22f (patch) | |
| tree | 46b41c1f463ab90588f109105c95e85dad8fd432 /view/settings.tpl | |
| parent | 04119d31e51c749cfa81b9a8ac5f52005d71f8c4 (diff) | |
| parent | 93bc29a711637c84a4ffc380078277de89af4e6d (diff) | |
| download | volse-hubzilla-b1dacd6d838ecf75fe828279e57c2e7a866be22f.tar.gz volse-hubzilla-b1dacd6d838ecf75fe828279e57c2e7a866be22f.tar.bz2 volse-hubzilla-b1dacd6d838ecf75fe828279e57c2e7a866be22f.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
turn registration code into a standalone function for re-use
query using both `id` and `parent`
prevent email from leaking in feeds
y didn't i think of this b4?
some zero theming on settings page
missing delimiter
transition to beta for private forums
rev update
Friendicaland - you can't 'live' on a demo server.
Create a "potential default group" called "Friends" on registration.
fix private photos that also have a size specification
private group tests, cont.
hide private group if desired
prvgroup should see intros
private group fix
possible sql injection in search
bugfixes: private photo embeds and search for strings with %
* master:
Diffstat (limited to 'view/settings.tpl')
| -rw-r--r-- | view/settings.tpl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index d61af072f..d7ef21210 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -104,15 +104,16 @@ $group_select <h3 class="settings-heading">$h_not</h3> +<div id="settings-notifications"> -<strong>$activity_options</strong> +<div id="settings-activity-desc">$activity_options</div> {{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}} {{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}} {{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}} -<div id="settings-notify-desc"><strong>$lbl_not </strong></div> +<div id="settings-notify-desc">$lbl_not</div> <div class="group"> {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}} @@ -124,6 +125,7 @@ $group_select {{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}} </div> +</div> <div class="settings-submit-wrapper" > <input type="submit" name="submit" class="settings-submit" value="$submit" /> @@ -131,6 +133,7 @@ $group_select <h3 class="settings-heading">$h_advn</h3> +<div id="settings-pagetype-desc">$h_descadvn</div> $pagetype |