diff options
| author | root <root@debian.(none)> | 2012-06-01 03:10:57 -0400 |
|---|---|---|
| committer | root <root@debian.(none)> | 2012-06-01 03:10:57 -0400 |
| commit | bad66a1154b3ef6ba639038218317f7ac5bf43d7 (patch) | |
| tree | a03244a0005d732412fcfe6a1c8eb5734fcf6b78 /view/settings.tpl | |
| parent | 88d5d9684a51119f62a60c588b2bf468f71fd884 (diff) | |
| parent | 93bc29a711637c84a4ffc380078277de89af4e6d (diff) | |
| download | volse-hubzilla-bad66a1154b3ef6ba639038218317f7ac5bf43d7.tar.gz volse-hubzilla-bad66a1154b3ef6ba639038218317f7ac5bf43d7.tar.bz2 volse-hubzilla-bad66a1154b3ef6ba639038218317f7ac5bf43d7.zip | |
Merge remote branch 'friendica/master'
Diffstat (limited to 'view/settings.tpl')
| -rw-r--r-- | view/settings.tpl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index 556cd3ba3..d7ef21210 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -70,6 +70,7 @@ $unkmail {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}} + {{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}} </div> </div> @@ -103,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}} @@ -123,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" /> @@ -130,6 +133,7 @@ $group_select <h3 class="settings-heading">$h_advn</h3> +<div id="settings-pagetype-desc">$h_descadvn</div> $pagetype |