diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-06-04 08:09:15 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-06-04 08:09:15 +0200 |
| commit | 0353410cd4b8153fd2b6e9d3524c6e46ad4acd68 (patch) | |
| tree | e93cc7977a7367eb6281c733d9a34730dae3bf95 /view/settings.tpl | |
| parent | 5de91c2a7c924ac6067828a0e5bfbef5572c1f39 (diff) | |
| parent | ca105f1c669950768a1f4cd6b93f471cabbc5114 (diff) | |
| download | volse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.tar.gz volse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.tar.bz2 volse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/settings.tpl')
| -rw-r--r-- | view/settings.tpl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index d61af072f..99ee9b51e 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -98,21 +98,22 @@ $group_select <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="Submit" /> +<input type="submit" name="submit" class="settings-submit" value="$submit" /> </div> <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 |