diff options
| author | Michael <icarus@dabo.de> | 2012-05-19 16:55:33 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-19 16:55:33 +0200 |
| commit | 6342b3e0bdd5774857a8fca809994f05e0208d25 (patch) | |
| tree | 54114a005e74c8a6d8bad8a490e1d1e41bc4178f /view/settings.tpl | |
| parent | 2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (diff) | |
| parent | 9a940786c18c1c2bd772aec93f1828f67dc45667 (diff) | |
| download | volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.gz volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.bz2 volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'view/settings.tpl')
| -rw-r--r-- | view/settings.tpl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index 59c669a87..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" /> @@ -102,6 +107,7 @@ $unkmail <strong>$activity_options</strong> {{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}} |