aboutsummaryrefslogtreecommitdiffstats
path: root/view/settings.tpl
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-05-19 14:04:24 +0200
committerMichael Vogel <icarus@dabo.de>2012-05-19 14:04:24 +0200
commit9a940786c18c1c2bd772aec93f1828f67dc45667 (patch)
tree54114a005e74c8a6d8bad8a490e1d1e41bc4178f /view/settings.tpl
parentf2c0c40f6e488f1a8e62bda9449b28115f343cac (diff)
parent513ef2410d9b892c8ebcb7ceac96b97023c3b5a5 (diff)
downloadvolse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.gz
volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.bz2
volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/settings.tpl')
-rw-r--r--view/settings.tpl5
1 files changed, 5 insertions, 0 deletions
diff --git a/view/settings.tpl b/view/settings.tpl
index cec3c6f64..556cd3ba3 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -56,9 +56,12 @@ $suggestme
$unkmail
+
{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
<div class="field input">
<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
<div style="display: none;">
@@ -90,6 +93,8 @@ $unkmail
<br/>
<div id="settings-default-perms-end"></div>
+$group_select
+
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />