From b9507a443ff30d34c1596ad6fa4976e195f43ecd Mon Sep 17 00:00:00 2001 From: emanuele Date: Sun, 14 Jul 2013 22:16:28 +0200 Subject: [PATCH 1/2] Why not a dropdown for the message preview setting? Signed-off-by: emanuele --- themes/default/MessageIndex.template.php | 2 +- themes/default/Recent.template.php | 4 ++-- themes/default/Settings.template.php | 10 +++++----- themes/default/languages/Themes.english.php | 5 +++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/themes/default/MessageIndex.template.php b/themes/default/MessageIndex.template.php index 0fae6dfca9..7dd198de98 100644 --- a/themes/default/MessageIndex.template.php +++ b/themes/default/MessageIndex.template.php @@ -284,7 +284,7 @@ function template_main() echo '

- ', $topic['is_sticky'] ? '' : '', '', $topic['first_post']['link'], ($context['can_approve_posts'] && !$topic['approved'] ? '  ' . $txt['awaiting_approval'] . '(' . $txt['awaiting_approval'] . ')' : ''), '', $topic['is_sticky'] ? '' : '', ' + ', $topic['is_sticky'] ? '' : '', '', $topic['first_post']['link'], ($context['can_approve_posts'] && !$topic['approved'] ? '  ' . $txt['awaiting_approval'] . '(' . $txt['awaiting_approval'] . ')' : ''), '', $topic['is_sticky'] ? '' : '', '

diff --git a/themes/default/Recent.template.php b/themes/default/Recent.template.php index f4140d88e2..1b9fc871c8 100644 --- a/themes/default/Recent.template.php +++ b/themes/default/Recent.template.php @@ -150,7 +150,7 @@ function template_unread() echo ' ' . $txt['new'] . '

- ', $topic['is_sticky'] ? '' : '', '', $topic['first_post']['link'], '', $topic['is_sticky'] ? '' : '', ' + ', $topic['is_sticky'] ? '' : '', '', $topic['first_post']['link'], '', $topic['is_sticky'] ? '' : '', '

@@ -277,7 +277,7 @@ function template_replies() echo ' ' . $txt['new'] . '

- ', $topic['is_sticky'] ? '' : '', '', $topic['first_post']['link'], '', $topic['is_sticky'] ? '' : '', ' + ', $topic['is_sticky'] ? '' : '', '', $topic['first_post']['link'], '', $topic['is_sticky'] ? '' : '', '

diff --git a/themes/default/Settings.template.php b/themes/default/Settings.template.php index 686d0d6e3b..afdfbbbcec 100644 --- a/themes/default/Settings.template.php +++ b/themes/default/Settings.template.php @@ -291,11 +291,11 @@ function template_settings() array( 'id' => 'message_index_preview', 'label' => $txt['message_index_preview'], - ), - array( - 'id' => 'message_index_preview_first', - 'label' => $txt['message_index_preview_first'], - 'description' => $txt['message_index_preview_first_desc'], + 'options' => array( + 0 => $txt['message_index_preview_off'], + 1 => $txt['message_index_preview_first'], + 2 => $txt['message_index_preview_last'], + ), ), ); } \ No newline at end of file diff --git a/themes/default/languages/Themes.english.php b/themes/default/languages/Themes.english.php index 61ce52a072..69f5d89e7f 100644 --- a/themes/default/languages/Themes.english.php +++ b/themes/default/languages/Themes.english.php @@ -65,8 +65,9 @@ $txt['show_group_key'] = 'Show group key on board index'; $txt['additional_options_collapsable'] = 'Enable collapsible additional post options'; $txt['message_index_preview'] = 'Show post previews on the message index'; -$txt['message_index_preview_first'] = 'When using post previews, Show the text of the first post'; -$txt['message_index_preview_first_desc'] = 'Leave un-checked to show the text of the last post instead'; +$txt['message_index_preview_off'] = 'Do not show the previews'; +$txt['message_index_preview_first'] = 'Show the text of the first post'; +$txt['message_index_preview_last'] = 'Show the text of the last post'; $txt['allow_no_censored'] = 'Allow users to turn off word censoring'; $txt['who_display_viewing'] = 'Show who is viewing the board index and posts'; $txt['who_display_viewing_off'] = 'Don\'t show'; From 0f77cca10b8622e88e026b5cfae6ade47b0195e7 Mon Sep 17 00:00:00 2001 From: emanuele Date: Sun, 14 Jul 2013 22:18:14 +0200 Subject: [PATCH 2/2] Help entry missing description of message_index_preview index Signed-off-by: emanuele --- themes/default/languages/Help.english.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/languages/Help.english.php b/themes/default/languages/Help.english.php index fe3f93b4c5..34724311c9 100644 --- a/themes/default/languages/Help.english.php +++ b/themes/default/languages/Help.english.php @@ -392,7 +392,7 @@ $helptxt['oldTopicDays'] = 'If this option is enabled a warning will be displayed to the user when attempting to reply to a topic which has not had any new replies for the amount of time, in days, specified by this setting. Set this setting to 0 to disable the feature.'; $helptxt['edit_wait_time'] = 'Number of seconds allowed for a post to be edited before logging the last edit date.'; $helptxt['edit_disable_time'] = 'Number of minutes allowed to pass before a user can no longer edit a post they have made. Set to 0 disable.

Note: This will not affect any user who has permission to edit other people\'s posts.'; -$helptxt['preview_characters'] = 'This option sets the number of available characters for the first and last message topic preview. Note this only makes the information available to the theme, the theme must support the message_index_preview setting'; +$helptxt['preview_characters'] = 'This option sets the number of available characters for the first and last message topic preview. Note this only makes the information available to the theme, the theme must support the "Show post previews on the message index" setting'; $helptxt['posts_require_captcha'] = 'This setting will force users to pass anti-spam bot verification each time they make a post to a board. Only users with a post count below the number set will need to enter the code - this should help combat automated spamming scripts.'; $helptxt['enableSpellChecking'] = 'Enable spell checking. You MUST have the pspell library installed on your server and your PHP configuration set up to use the pspell library. Your server ' . (function_exists('pspell_new') ? 'DOES' : 'DOES NOT') . ' appear to have this set up.'; $helptxt['disable_wysiwyg'] = 'This setting disallows all users from using the WYSIWYG ("What You See Is What You Get") editor on the post page.';