diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
| commit | bdd275474044152a5d9a33ea6b8a8071b931d27e (patch) | |
| tree | b10c2b68e0236925992449786d70f45aaca21984 /view/settings.tpl | |
| parent | 792edfe9c834e3daeae598727e4cb15dc0ff8475 (diff) | |
| parent | e894775a39920edc0e438364c818357ab809bace (diff) | |
| download | volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.gz volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.bz2 volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'view/settings.tpl')
| -rwxr-xr-x | view/settings.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index 25479b5bf..75225a0f1 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -28,10 +28,10 @@ $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_select.tpl with $field=$theme }}{{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" /> |