aboutsummaryrefslogtreecommitdiffstats
path: root/view/settings.tpl
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-20 09:08:56 +0200
committerzottel <github@zottel.net>2012-05-20 09:08:56 +0200
commit2cd3ec7b983327f8c162845d0f4b8d9753f30e27 (patch)
tree3eefeaf641e91416fa7b43b9a36b829f28ff1983 /view/settings.tpl
parent764ac240a9a9ffb7c855a69bc2f81e9d314a617f (diff)
parentf16a1199408d167bbc7c52dc408ef02b36808317 (diff)
downloadvolse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.tar.gz
volse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.tar.bz2
volse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.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" />