diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-07 21:53:57 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-07 21:53:57 -0400 |
| commit | 34d3d455892cbad299aac8710016daffefb1c4cb (patch) | |
| tree | 3035784f65e3d4bd58a12f382d77e99b19ad323d /view/theme/diabook/theme_settings.tpl | |
| parent | dbbcddf84527c7df95909c5dad2d03b26262efbc (diff) | |
| parent | b128a37cee7b49ae83d16ddfd3cd99097a80b9f9 (diff) | |
| download | volse-hubzilla-34d3d455892cbad299aac8710016daffefb1c4cb.tar.gz volse-hubzilla-34d3d455892cbad299aac8710016daffefb1c4cb.tar.bz2 volse-hubzilla-34d3d455892cbad299aac8710016daffefb1c4cb.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
finished dry run - now for real test
diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.
don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration
If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly.
separate poll_interval from delivery_interval - default is the same.
* master:
Diffstat (limited to 'view/theme/diabook/theme_settings.tpl')
| -rw-r--r-- | view/theme/diabook/theme_settings.tpl | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl index 27122857c..68b22a168 100644 --- a/view/theme/diabook/theme_settings.tpl +++ b/view/theme/diabook/theme_settings.tpl @@ -14,11 +14,26 @@ {{inc field_input.tpl with $field=$ELZoom}}{{endinc}} -<div class="field select"> -<a onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a> +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" /> </div> +{{inc field_select.tpl with $field=$close_pages}}{{endinc}} +{{inc field_select.tpl with $field=$close_profiles}}{{endinc}} +{{inc field_select.tpl with $field=$close_helpers}}{{endinc}} +{{inc field_select.tpl with $field=$close_services}}{{endinc}} +{{inc field_select.tpl with $field=$close_friends}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}} +{{inc field_select.tpl with $field=$close_twitter}}{{endinc}} +{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}} + <div class="settings-submit-wrapper"> <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" /> </div> +<div class="field select"> +<a onClick="restore_boxes()" title="Restore order at right-hand column" style="cursor: pointer;">Restore order at right-hand column</a> +</div> + |