diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
| commit | 7d23149a61f75923b2c71a288a722ee219f5e6ba (patch) | |
| tree | dea64e1cfc15eb6f95e7440e532258dfb909c21c /view/settings.tpl | |
| parent | 59b45f7fc12027c387f04a2121ea398c1d534626 (diff) | |
| parent | bb67ca9f1c61f96db6da15aee646a20c0b77a255 (diff) | |
| download | volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.gz volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.bz2 volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'view/settings.tpl')
| -rwxr-xr-x | view/settings.tpl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index 75225a0f1..8753474af 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -28,10 +28,7 @@ $nickname_block {{inc field_custom.tpl with $field=$timezone }}{{endinc}} {{inc field_input.tpl with $field=$defloc }}{{endinc}} {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}} -{{inc field_themeselect.tpl with $field=$theme }}{{endinc}} -{{inc field_input.tpl with $field=$ajaxint }}{{endinc}} -{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} -{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} + <div class="settings-submit-wrapper" > <input type="submit" name="submit" class="settings-submit" value="$submit" /> @@ -59,6 +56,10 @@ $blocktags $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> |