преди 11 години · e137d795bc
--- a/Sources/Subs-Editor.php
+++ b/Sources/Subs-Editor.php
@@ -1484,6 +1484,7 @@ function create_control_richedit($editorOptions)
 
 		if (!empty($txt['lang_locale']) && $txt['lang_locale'] != 'en_US')
 
 			loadJavascriptFile($scripturl . '?action=loadeditorlocale', array(), 'sceditor_language');
 
 
 
+		$context['shortcuts_text'] = $txt['shortcuts' . (!empty($context['drafts_save']) ? '_drafts' : '') . (isBrowser('is_firefox') ? '_firefox' : '')];
 
 		$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && function_exists('pspell_new');
 
 		if ($context['show_spellchecking'])
 
 		{
--- a/Themes/default/GenericControls.template.php
+++ b/Themes/default/GenericControls.template.php
@@ -132,6 +132,9 @@ function template_control_richedit_buttons($editor_id)
 
 	$editor_context = &$context['controls']['richedit'][$editor_id];
 
 
 
 	echo '
 
+		<span class="smalltext">
 
+			', $context['shortcuts_text'], '
 
+		</span>
 
 		<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['post'], '" tabindex="', $context['tabindex']++, '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />';
 
 
 
 	if ($editor_context['preview_type'])
--- a/Themes/default/ManageNews.template.php
+++ b/Themes/default/ManageNews.template.php
@@ -248,17 +248,15 @@ function template_email_members_compose()
 
 				', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
 
 
 
 					echo '
 
-					<ul class="reset">
 
-						<li><label for="send_pm"><input type="checkbox" name="send_pm" id="send_pm" ', !empty($context['send_pm']) ? 'checked="checked"' : '', 'class="input_check" onclick="checkboxes_status(this);" /> ', $txt['email_as_pms'], '</label></li>
 
-						<li><label for="send_html"><input type="checkbox" name="send_html" id="send_html" ', !empty($context['send_html']) ? 'checked="checked"' : '', 'class="input_check" onclick="checkboxes_status(this);" /> ', $txt['email_as_html'], '</label></li>
 
-						<li><label for="parse_html"><input type="checkbox" name="parse_html" id="parse_html" checked="checked" disabled="disabled" class="input_check" /> ', $txt['email_parsed_html'], '</label></li>
 
-					</ul>
 
-				<p id="shortcuts" class="smalltext">
 
-					', isBrowser('is_firefox') ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '
 
-				</p>
 
-				<p id="post_confirm_strip" class="righttext">
 
+				<ul class="reset">
 
+					<li><label for="send_pm"><input type="checkbox" name="send_pm" id="send_pm" ', !empty($context['send_pm']) ? 'checked="checked"' : '', 'class="input_check" onclick="checkboxes_status(this);" /> ', $txt['email_as_pms'], '</label></li>
 
+					<li><label for="send_html"><input type="checkbox" name="send_html" id="send_html" ', !empty($context['send_html']) ? 'checked="checked"' : '', 'class="input_check" onclick="checkboxes_status(this);" /> ', $txt['email_as_html'], '</label></li>
 
+					<li><label for="parse_html"><input type="checkbox" name="parse_html" id="parse_html" checked="checked" disabled="disabled" class="input_check" /> ', $txt['email_parsed_html'], '</label></li>
 
+				</ul>
 
+				<br class="clear_right" />
 
+				<span id="post_confirm_buttons">
 
 					', template_control_richedit_buttons($context['post_box_name']), '
 
-				</p>
 
+				</span>
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
--- a/Themes/default/PersonalMessage.template.php
+++ b/Themes/default/PersonalMessage.template.php
@@ -1059,9 +1059,6 @@ function template_send()
 
 					<label for="outbox"><input type="checkbox" name="outbox" id="outbox" value="1" tabindex="', $context['tabindex']++, '"', $context['copy_to_outbox'] ? ' checked="checked"' : '', ' class="input_check" /> ', $txt['pm_save_outbox'], '</label>
 
 				</p>
 
 				<hr class="hrcolor" />
 
-				<span id="shortcuts" class="smalltext">
 
-					', isBrowser('is_firefox') ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '
 
-				</span>
 
 				<span id="post_confirm_strip" class="righttext">
 
 					', template_control_richedit_buttons($context['post_box_name']), '
 
 				</span>
--- a/Themes/default/Post.template.php
+++ b/Themes/default/Post.template.php
@@ -523,9 +523,6 @@ function template_main()
 
 	// Finally, the submit buttons.
 
 	echo '
 
 					<br class="clear_right" />
 
-					<span class="smalltext">
 
-						', isBrowser('is_firefox') ? ($context['drafts_save'] ? $txt['shortcuts_drafts_firefox'] : $txt['shortcuts_firefox']) : ($context['drafts_save'] ? $txt['shortcuts_drafts'] : $txt['shortcuts']), '
 
-					</span>
 
 					<span id="post_confirm_buttons">
 
 						', template_control_richedit_buttons($context['post_box_name']);
 
 
--- a/Themes/default/languages/index.english.php
+++ b/Themes/default/languages/index.english.php
@@ -401,8 +401,8 @@ $txt['poll_vote'] = 'Submit Vote';
 
 $txt['poll_total_voters'] = 'Total Members Voted';
 
 $txt['shortcuts'] = 'shortcuts: alt+s submit/post, alt+p preview';
 
 $txt['shortcuts_firefox'] = 'shortcuts: shift+alt+s submit/post, shift+alt+p preview';
 
-$txt['shortcuts_drafts'] = 'or alt+d save draft';
 
-$txt['shortcuts_drafts_firefox'] = 'or shift+alt+d save draft';
 
+$txt['shortcuts_drafts'] = ', alt+d save draft';
 
+$txt['shortcuts_drafts_firefox'] = ', shift+alt+d save draft';
 
 $txt['poll_results'] = 'View results';
 
 $txt['poll_lock'] = 'Lock Voting';
 
 $txt['poll_unlock'] = 'Unlock Voting';