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/config.php | |
| 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/config.php')
| -rw-r--r-- | view/theme/diabook/config.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php index 2477bb3d3..e6c2681e3 100644 --- a/view/theme/diabook/config.php +++ b/view/theme/diabook/config.php @@ -13,8 +13,9 @@ function theme_content(&$a){ $line_height = get_pconfig(local_user(), 'diabook', 'line_height' ); $resolution = get_pconfig(local_user(), 'diabook', 'resolution' ); $color = get_pconfig(local_user(), 'diabook', 'color' ); + $TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' ); - return diabook_form($a,$font_size, $line_height, $resolution, $color); + return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm); } function theme_post(&$a){ @@ -26,6 +27,7 @@ function theme_post(&$a){ set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']); set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']); set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']); + set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']); } } @@ -35,8 +37,9 @@ function theme_admin(&$a){ $line_height = get_config('diabook', 'line_height' ); $resolution = get_config('diabook', 'resolution' ); $color = get_config('diabook', 'color' ); + $TSearchTerm = get_config('diabook', 'TSearchTerm' ); - return diabook_form($a,$font_size, $line_height, $resolution, $color); + return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm); } function theme_admin_post(&$a){ @@ -45,11 +48,12 @@ function theme_admin_post(&$a){ set_config('diabook', 'line_height', $_POST['diabook_line_height']); set_config('diabook', 'resolution', $_POST['diabook_resolution']); set_config('diabook', 'color', $_POST['diabook_color']); + set_config('diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']); } } -function diabook_form(&$a, $font_size, $line_height, $resolution, $color){ +function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSearchTerm){ $line_heights = array( "1.3"=>"1.3", "---"=>"---", @@ -95,6 +99,7 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color){ '$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), '$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), '$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors), + '$TSearchTerm' => array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm), )); return $o; } |