diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-05 20:08:19 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-05 20:08:19 -0400 |
| commit | 0c4099966a5ac1f1ff5dc568a600aa57776fb752 (patch) | |
| tree | f6c8a337eeae8ecc1848e319c9e5beb8c338d973 /view/theme/diabook/theme_settings.tpl | |
| parent | 250bf57e1e69670b956c1365dcb9ffa90800c05c (diff) | |
| parent | e1ab3a93cc450ca52c7651ecca8cad8334e5f1ce (diff) | |
| download | volse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.tar.gz volse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.tar.bz2 volse-hubzilla-0c4099966a5ac1f1ff5dc568a600aa57776fb752.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-theme: small fix
diabook-theme: twitter-box-update at right_aside
diabook-theme: can now set the twitter search term in theme-settings & small fixes
consolidate item deletion so we can fix orphaned categories and file_as tags.
DE: new email templates translated
workaround to clean up orphaned filetags
only show remove category to item owner
Option to set theme width added. Minor layout changes
* master:
Diffstat (limited to 'view/theme/diabook/theme_settings.tpl')
| -rw-r--r-- | view/theme/diabook/theme_settings.tpl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl index 61b0b6dac..d08f2819c 100644 --- a/view/theme/diabook/theme_settings.tpl +++ b/view/theme/diabook/theme_settings.tpl @@ -6,6 +6,8 @@ {{inc field_select.tpl with $field=$resolution}}{{endinc}} +{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}} + <div class="field select"> <a onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a> </div> |