Browse Source

Merge pull request #223 from Spuds/themeUpdates

Conflicts:
	Themes/default/MessageIndex.template.php
	Themes/default/css/index.css
emanuele 12 years ago
parent
commit
fe5fb97517

+ 25 - 12
Themes/default/Display.template.php

@@ -163,6 +163,22 @@ function template_main()
 						<span class="nextlinks floatright">', $context['previous_next'], '</span>
 					</h3>
 				</div>';
+	if (!empty($settings['display_who_viewing']))
+	{
+		echo '
+				<p id="whoisviewing">';
+
+		// Show just numbers...?
+		if ($settings['display_who_viewing'] == 1)
+				echo count($context['view_members']), ' ', count($context['view_members']) == 1 ? $txt['who_member'] : $txt['members'];
+		// Or show the actual people viewing the topic?
+		else
+			echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . ((empty($context['view_num_hidden']) || $context['can_moderate_forum']) ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+
+		// Now show how many guests are here too.
+		echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_topic'], '
+				</p>';
+	}
 
 	echo '
 				<form action="', $scripturl, '?action=quickmod2;topic=', $context['current_topic'], '.', $context['start'], '" method="post" accept-charset="', $context['character_set'], '" name="quickModForm" id="quickModForm" style="margin: 0;" onsubmit="return oQuickModify.bInEditMode ? oQuickModify.modifySave(\'' . $context['session_id'] . '\', \'' . $context['session_var'] . '\') : false">';
@@ -187,12 +203,9 @@ function template_main()
 		}
 
 		// Show the message anchor and a "new" anchor if this message is new.
-		if ($message['id'] != $context['first_message'])
-			echo '
-				<a id="msg', $message['id'], '"></a>', $message['first_new'] ? '<a id="new"></a>' : '';
-
 		echo '
-				<div class="', $message['approved'] ? ($message['alternate'] == 0 ? 'windowbg' : 'windowbg2') : 'approvebg', '">
+				<div class="', $message['approved'] ? ($message['alternate'] == 0 ? 'windowbg' : 'windowbg2') : 'approvebg', '">', $message['id'] != $context['first_message'] ? '
+					<a id="msg' . $message['id'] . '"></a>' . ($message['first_new'] ? '<a id="new"></a>' : '') : '', '
 					<div class="post_wrapper">';
 
 		// Show information about the poster of this message.
@@ -339,7 +352,7 @@ function template_main()
 
 		// Stuff for the staff to wallop them with.
 		echo '
-										<li><hr /></li>';
+										<li style="height: 2px; background: #ccc; box-shadow: 0 -1px 0 #fff inset;"></li>';
 
 		// Maybe they want to report this post to the moderator(s)?
 		if ($context['can_report_moderator'])
@@ -551,11 +564,6 @@ function template_main()
 			echo '
 						<ul class="quickbuttons">';
 
-		// Maybe we can approve it, maybe we should?
-		if ($message['can_approve'])
-			echo '
-							<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"  class="approve_button">', $txt['approve'], '</a></li>';
-
 		// Can they reply? Have they turned on quick reply?
 		if ($context['can_quote'] && !empty($options['display_quick_reply']))
 			echo '
@@ -574,7 +582,7 @@ function template_main()
 		// Can the user modify the contents of this post?
 		if ($message['can_modify'])
 			echo '
-							<li class="post_options">', $txt['post_options'], '';
+							<li class="post_options"><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '">', $txt['post_options'], '</a>';
 
 			echo '
 								<ul>';
@@ -599,6 +607,11 @@ function template_main()
 					echo '
 									<li><a href="', $scripturl, '?action=restoretopic;msgs=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" class="restore_button">', $txt['restore_message'], '</a></li>';
 
+				// Maybe we can approve it, maybe we should?
+				if ($message['can_approve'])
+					echo '
+									<li><a href="', $scripturl, '?action=moderate;area=postmod;sa=approve;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '"  class="approve_button">', $txt['approve'], '</a></li>';
+
 				// Maybe we can unapprove it?
 				if ($message['can_unapprove'])
 					echo '

+ 24 - 3
Themes/default/GenericMenu.template.php

@@ -36,7 +36,7 @@ function template_generic_menu_sidebar_above()
 						', $section['title'], '
 					</h4>
 				</div>
-				<ul class="smalltext left_admmenu">';
+				<ul class="dropmenu left_admmenu">';
 
 		// For every area of this section show a link to that area (bold if it's currently selected.)
 		foreach ($section['areas'] as $i => $area)
@@ -46,7 +46,7 @@ function template_generic_menu_sidebar_above()
 				continue;
 
 			echo '
-					<li>';
+					<li ', !empty($area['subsections']) ?'class="subsections"':'', ' ', ($i == $menu_context['current_area']) ?'id="menu_current_area"':'', '>';
 
 			// Is this the current area, or just some area?
 			if ($i == $menu_context['current_area'])
@@ -60,7 +60,28 @@ function template_generic_menu_sidebar_above()
 			else
 				echo '
 						<a href="', isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i, $menu_context['extra_parameters'], '">', $area['label'], '</a>';
+			// Is there any subsections?
+			if (!empty($area['subsections']))
+			{
+				echo '
+						<ul>';
+
+				foreach ($area['subsections'] as $sa => $sub)
+				{
+					if (!empty($sub['disabled']))
+						continue;
+
+					$url = isset($sub['url']) ? $sub['url'] : (isset($area['url']) ? $area['url'] : $menu_context['base_url'] . ';area=' . $i) . ';sa=' . $sa;
+
+					echo '
+							<li>
+								<a ', !empty($sub['selected']) ? 'class="chosen" ' : '', 'href="', $url, $menu_context['extra_parameters'], '">', $sub['label'], '</a>
+							</li>';
+				}
 
+				echo '
+						</ul>';
+			}
 			echo '
 					</li>';
 		}
@@ -147,7 +168,7 @@ function template_generic_menu_dropdown_above()
 
 					echo '
 							<li ', !empty($area['subsections']) ? ' class="subsections"' : '', '>
-								<a ', !empty($sub['selected']) ? 'class="chosen" ' : '', 'href="', $url, $menu_context['extra_parameters'], '">', $sub['label'], '</a>
+								<a ', !empty($sub['selected']) ? 'class="chosen" ' : '', ' href="', $url, $menu_context['extra_parameters'], '">', $sub['label'], '</a>
 							</li>';
 				}
 

+ 33 - 33
Themes/default/MessageIndex.template.php

@@ -139,31 +139,24 @@ function template_main()
 		', template_button_strip($context['normal_buttons'], 'right'), '
 	</div>';
 
-	if (!empty($options['show_board_desc']) && $context['description'] != '')
-		echo '
-	<div class="cat_bar description_header">
-		<h3 class="catbg">', $context['name'], '</h3>
-	</div>
-	<p class="description_board">
-		', $context['description'], '<br />';
-	else
+	if ((!empty($options['show_board_desc']) && $context['description'] != '') || !empty($context['moderators']))
+		{
 		echo '
-	<p class="description_board">';
+	<div id="description_board" class="generic_list_wrapper">
+		<h3 class="floatleft">', $context['name'], '&nbsp;-&nbsp;</h3>
+		<p>';
+	if (!empty($options['show_board_desc']) && $context['description'] != '')
+	echo '
+		', $context['description'], '&nbsp;';
 
 	if (!empty($context['moderators']))
-		echo '
-		', count($context['moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $context['link_moderators']), '.&nbsp;&nbsp;';
+	echo '
+		', count($context['moderators']) === 1 ? $txt['moderator'] : $txt['moderators'], ': ', implode(', ', $context['link_moderators']), '.';
 
-		if (!empty($settings['display_who_viewing']))
-		{
-			if ($settings['display_who_viewing'] == 1)
-				echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
-			else
-				echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
-			echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_board'], '';
+	echo '
+		</p>
+	</div>';
 		}
-		echo '
-	</p>';
 
 		// If Quick Moderation is enabled start the form.
 		if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] > 0 && !empty($context['topics']))
@@ -171,19 +164,33 @@ function template_main()
 	<form action="', $scripturl, '?action=quickmod;board=', $context['current_board'], '.', $context['start'], '" method="post" accept-charset="', $context['character_set'], '" class="clear" name="quickModForm" id="quickModForm">';
 
 		echo '
-	<div class="tborder topic_table" id="messageindex">
+		<div class="tborder topic_table" id="messageindex">';
+		if (!empty($settings['display_who_viewing']))
+		{
+		echo '
+			<p class="whoisviewing">';
+			if ($settings['display_who_viewing'] == 1)
+				echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members'];
+		else
+				echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')');
+			echo $txt['who_and'], $context['view_num_guests'], ' ', $context['view_num_guests'] == 1 ? $txt['guest'] : $txt['guests'], $txt['who_viewing_board'];
+
+		echo '
+			</p>';
+		}
+	echo '
+
 		<table class="table_grid" cellspacing="0">
 			<thead>
 				<tr class="catbg">';
 
 		// Are there actually any topics to show?
-		// [WIP] There is trial code here to hide the topic icon column. Colspan can be cleaned up later.
 		if (!empty($context['topics']))
 		{
 			echo '
-					<th scope="col" class="first_th" width="6%" colspan="1">&nbsp;</th>
+					<th scope="col" class="first_th" width="4%">&nbsp;</th>
 					<th scope="col" class="lefttext">', $context['topics_headers']['subject'], ' / ', $context['topics_headers']['starter'], '</th>
-					<th scope="col" width="14%">', $context['topics_headers']['replies'], ' / ', $context['topics_headers']['views'], '</th>';
+					<th scope="col" class="stats" width="14%">', $context['topics_headers']['replies'], ' / ', $context['topics_headers']['views'], '</th>';
 			// Show a "select all" box for quick moderation?
 			if (empty($context['can_quick_mod']))
 				echo '
@@ -246,13 +253,9 @@ function template_main()
 			// Some columns require a different shade of the color class.
 			$alternate_class = $color_class . '2';
 
-			// [WIP] There is trial code here to hide the topic icon column. Hardly anyone will miss it.
 			// [WIP] Markup can be cleaned up later. CSS can go in the CSS files later.
 			echo '
 				<tr>
-					<td class="', $color_class, ' icon1" style="display: none;">
-						<img src="', $settings['images_url'], '/topic/', $topic['class'], '.png" alt="" />
-					</td>
 					<td class="', $color_class, ' icon2">
 						<div style="position: relative; width: 40px; margin: auto;">
 							<img src="', $topic['first_post']['icon_url'], '" alt="" />
@@ -378,14 +381,11 @@ function template_main()
 		echo '
 			<p class="floatleft">', !empty($modSettings['enableParticipation']) && $context['user']['is_logged'] ? '
 				<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="" class="centericon" /> ' . $txt['participation_caption'] . '<br />' : '', '
-				<img src="' . $settings['images_url'] . '/topic/normal_post.png" alt="" class="centericon" /> ' . $txt['normal_topic'] . '<br />
-				<img src="' . $settings['images_url'] . '/topic/hot_post.png" alt="" class="centericon" /> ' . sprintf($txt['hot_topics'], $modSettings['hotTopicPosts']) . '<br />
-				<img src="' . $settings['images_url'] . '/topic/veryhot_post.png" alt="" class="centericon" /> ' . sprintf($txt['very_hot_topics'], $modSettings['hotTopicVeryPosts']) . '
+				'. ($modSettings['pollMode'] == '1' ? '<img src="' . $settings['images_url'] . '/topic/normal_poll.png" alt="" class="centericon" /> ' . $txt['poll'] : '') . '
 			</p>
 			<p>
 				<img src="' . $settings['images_url'] . '/icons/quick_lock.png" alt="" class="centericon" /> ' . $txt['locked_topic'] . '<br />' . ($modSettings['enableStickyTopics'] == '1' ? '
-				<img src="' . $settings['images_url'] . '/icons/quick_sticky.png" alt="" class="centericon" /> ' . $txt['sticky_topic'] . '<br />' : '') . ($modSettings['pollMode'] == '1' ? '
-				<img src="' . $settings['images_url'] . '/topic/normal_poll.png" alt="" class="centericon" /> ' . $txt['poll'] : '') . '
+				<img src="' . $settings['images_url'] . '/icons/quick_sticky.png" alt="" class="centericon" /> ' . $txt['sticky_topic'] . '<br />' : '') . '
 			</p>';
 
 	echo '

+ 80 - 80
Themes/default/Post.template.php

@@ -178,13 +178,13 @@ function template_main()
 							</select>
 							<img src="', $context['icon_url'], '" name="icons" hspace="15" alt="" />
 						</dd>
-					</dl>
-					<hr class="clear" />';
+					</dl>';
 
 	// Are you posting a calendar event?
 	if ($context['make_event'])
 	{
 		echo '
+					<hr class="clear" />
 					<div id="post_event">
 						<fieldset id="event_main">
 							<legend><span', isset($context['post_error']['no_event']) ? ' class="error"' : '', ' id="caption_evtitle">', $txt['calendar_event_title'], '</span></legend>
@@ -284,6 +284,7 @@ function template_main()
 	if ($context['make_poll'])
 	{
 		echo '
+					<hr class="clear" />
 					<div id="edit_poll">
 						<fieldset id="poll_main">
 							<legend><span ', (isset($context['poll_error']['no_question']) ? ' class="error"' : ''), '>', $txt['poll_question'], '</span></legend>
@@ -369,143 +370,145 @@ function template_main()
 						<h4 class="titlebg">
 							<img id="postMoreExpand" class="panel_toggle" style="display: none;" src="', $settings['images_url'], '/collapse.png" alt="-" /> <strong><a href="#" id="postMoreExpandLink">', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
 						</h4>
-					</div>';
+					</div>
+					<div id="postAdditionalOptions">';
 
 	// Display the check boxes for all the standard options - if they are available to the user!
 	echo '
-					<div id="postMoreOptions" class="smalltext">
-						<ul class="post_options">
-							', $context['can_notify'] ? '<li><input type="hidden" name="notify" value="0" /><label for="check_notify"><input type="checkbox" name="notify" id="check_notify"' . ($context['notify'] || !empty($options['auto_notify']) ? ' checked="checked"' : '') . ' value="1" class="input_check" /> ' . $txt['notify_replies'] . '</label></li>' : '', '
-							', $context['can_lock'] ? '<li><input type="hidden" name="lock" value="0" /><label for="check_lock"><input type="checkbox" name="lock" id="check_lock"' . ($context['locked'] ? ' checked="checked"' : '') . ' value="1" class="input_check" /> ' . $txt['lock_topic'] . '</label></li>' : '', '
-							<li><label for="check_back"><input type="checkbox" name="goback" id="check_back"' . ($context['back_to_topic'] || !empty($options['return_to_post']) ? ' checked="checked"' : '') . ' value="1" class="input_check" /> ' . $txt['back_to_topic'] . '</label></li>
-							', $context['can_sticky'] ? '<li><input type="hidden" name="sticky" value="0" /><label for="check_sticky"><input type="checkbox" name="sticky" id="check_sticky"' . ($context['sticky'] ? ' checked="checked"' : '') . ' value="1" class="input_check" /> ' . $txt['sticky_after'] . '</label></li>' : '', '
-							<li><label for="check_smileys"><input type="checkbox" name="ns" id="check_smileys"', $context['use_smileys'] ? '' : ' checked="checked"', ' value="NS" class="input_check" /> ', $txt['dont_use_smileys'], '</label></li>', '
-							', $context['can_move'] ? '<li><input type="hidden" name="move" value="0" /><label for="check_move"><input type="checkbox" name="move" id="check_move" value="1" class="input_check" ' . (!empty($context['move']) ? 'checked="checked" ' : '') . '/> ' . $txt['move_after2'] . '</label></li>' : '', '
-							', $context['can_announce'] && $context['is_first_post'] ? '<li><label for="check_announce"><input type="checkbox" name="announce_topic" id="check_announce" value="1" class="input_check" ' . (!empty($context['announce']) ? 'checked="checked" ' : '') . '/> ' . $txt['announce_topic'] . '</label></li>' : '', '
-							', $context['show_approval'] ? '<li><label for="approve"><input type="checkbox" name="approve" id="approve" value="2" class="input_check" ' . ($context['show_approval'] === 2 ? 'checked="checked"' : '') . ' /> ' . $txt['approve_this_post'] . '</label></li>' : '', '
-						</ul>
-					</div>';
+						<div id="postMoreOptions" class="smalltext">
+							<ul class="post_options">
+								', $context['can_notify'] ? '<li><input type="hidden" name="notify" value="0" /><label for="check_notify"><input type="checkbox" name="notify" id="check_notify"' . ($context['notify'] || !empty($options['auto_notify']) ? ' checked="checked"' : '') . ' value="1" class="input_check" /> ' . $txt['notify_replies'] . '</label></li>' : '', '
+								', $context['can_lock'] ? '<li><input type="hidden" name="lock" value="0" /><label for="check_lock"><input type="checkbox" name="lock" id="check_lock"' . ($context['locked'] ? ' checked="checked"' : '') . ' value="1" class="input_check" /> ' . $txt['lock_topic'] . '</label></li>' : '', '
+								<li><label for="check_back"><input type="checkbox" name="goback" id="check_back"' . ($context['back_to_topic'] || !empty($options['return_to_post']) ? ' checked="checked"' : '') . ' value="1" class="input_check" /> ' . $txt['back_to_topic'] . '</label></li>
+								', $context['can_sticky'] ? '<li><input type="hidden" name="sticky" value="0" /><label for="check_sticky"><input type="checkbox" name="sticky" id="check_sticky"' . ($context['sticky'] ? ' checked="checked"' : '') . ' value="1" class="input_check" /> ' . $txt['sticky_after'] . '</label></li>' : '', '
+								<li><label for="check_smileys"><input type="checkbox" name="ns" id="check_smileys"', $context['use_smileys'] ? '' : ' checked="checked"', ' value="NS" class="input_check" /> ', $txt['dont_use_smileys'], '</label></li>', '
+								', $context['can_move'] ? '<li><input type="hidden" name="move" value="0" /><label for="check_move"><input type="checkbox" name="move" id="check_move" value="1" class="input_check" ' . (!empty($context['move']) ? 'checked="checked" ' : '') . '/> ' . $txt['move_after2'] . '</label></li>' : '', '
+								', $context['can_announce'] && $context['is_first_post'] ? '<li><label for="check_announce"><input type="checkbox" name="announce_topic" id="check_announce" value="1" class="input_check" ' . (!empty($context['announce']) ? 'checked="checked" ' : '') . '/> ' . $txt['announce_topic'] . '</label></li>' : '', '
+								', $context['show_approval'] ? '<li><label for="approve"><input type="checkbox" name="approve" id="approve" value="2" class="input_check" ' . ($context['show_approval'] === 2 ? 'checked="checked"' : '') . ' /> ' . $txt['approve_this_post'] . '</label></li>' : '', '
+							</ul>
+						</div>';
 
 	// If this post already has attachments on it - give information about them.
 	if (!empty($context['current_attachments']))
 	{
 		echo '
-					<dl id="postAttachment">
-						<dt>
-							', $txt['attached'], ':
-						</dt>
-						<dd class="smalltext" style="width: 100%;">
-							<input type="hidden" name="attach_del[]" value="0" />
-							', $txt['uncheck_unwatchd_attach'], ':
-						</dd>';
+						<dl id="postAttachment">
+							<dt>
+								', $txt['attached'], ':
+							</dt>
+							<dd class="smalltext" style="width: 100%;">
+								<input type="hidden" name="attach_del[]" value="0" />
+								', $txt['uncheck_unwatchd_attach'], ':
+							</dd>';
 		foreach ($context['current_attachments'] as $attachment)
 			echo '
-						<dd class="smalltext">
-							<label for="attachment_', $attachment['id'], '"><input type="checkbox" id="attachment_', $attachment['id'], '" name="attach_del[]" value="', $attachment['id'], '"', empty($attachment['unchecked']) ? ' checked="checked"' : '', ' class="input_check" /> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''),
-							!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1028) / 1028), 0)) : '', '</label>
-						</dd>';
+							<dd class="smalltext">
+								<label for="attachment_', $attachment['id'], '"><input type="checkbox" id="attachment_', $attachment['id'], '" name="attach_del[]" value="', $attachment['id'], '"', empty($attachment['unchecked']) ? ' checked="checked"' : '', ' class="input_check" /> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''),
+								!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1028) / 1028), 0)) : '', '</label>
+							</dd>';
 
 		echo '
-					</dl>';
+						</dl>';
 
 		if (!empty($context['files_in_session_warning']))
 			echo '
-					<div class="smalltext">', $context['files_in_session_warning'], '</div>';
+						<div class="smalltext">', $context['files_in_session_warning'], '</div>';
 	}
 
 	// Is the user allowed to post any additional ones? If so give them the boxes to do it!
 	if ($context['can_post_attachment'])
 	{
 		echo '
-					<dl id="postAttachment2">';
+						<dl id="postAttachment2">';
 
 		// But, only show them if they haven't reached a limit. Or a mod author hasn't hidden them.
 		if ($context['num_allowed_attachments'] > 0 || !empty($context['dont_show_them']))
 		{
 			echo '
-						<dt>
-							', $txt['attach'], ':
-						</dt>
-						<dd class="smalltext">
-							', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1028 . '" />'), '
-							<input type="file" size="60" multiple="multiple" name="attachment[]" id="attachment1" class="input_file" /> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)';
+							<dt>
+								', $txt['attach'], ':
+							</dt>
+							<dd class="smalltext">
+								', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1028 . '" />'), '
+								<input type="file" size="60" multiple="multiple" name="attachment[]" id="attachment1" class="input_file" /> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)';
 
 			// Show more boxes if they aren't approaching that limit.
 			if ($context['num_allowed_attachments'] > 1)
 				echo '
-							<script type="text/javascript"><!-- // --><![CDATA[
-								var allowed_attachments = ', $context['num_allowed_attachments'], ';
-								var current_attachment = 1;
-
-								function addAttachment()
-								{
-									allowed_attachments = allowed_attachments - 1;
-									current_attachment = current_attachment + 1;
-									if (allowed_attachments <= 0)
-										return alert("', $txt['more_attachments_error'], '");
-
-									setOuterHTML(document.getElementById("moreAttachments"), \'<dd class="smalltext"><input type="file" size="60" name="attachment[]" id="attachment\' + current_attachment + \'" class="input_file" /> (<a href="javascript:void(0);" onclick="cleanFileInput(\\\'attachment\' + current_attachment + \'\\\');">', $txt['clean_attach'], '<\/a>)\' + \'<\/dd><dd class="smalltext" id="moreAttachments"><a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')<\' + \'/a><\' + \'/dd>\');
-
-									return true;
-								}
-							// ]]></script>
-						</dd>
-						<dd class="smalltext" id="moreAttachments"><a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')</a></dd>';
+								<script type="text/javascript"><!-- // --><![CDATA[
+									var allowed_attachments = ', $context['num_allowed_attachments'], ';
+									var current_attachment = 1;
+
+									function addAttachment()
+									{
+										allowed_attachments = allowed_attachments - 1;
+										current_attachment = current_attachment + 1;
+										if (allowed_attachments <= 0)
+											return alert("', $txt['more_attachments_error'], '");
+
+										setOuterHTML(document.getElementById("moreAttachments"), \'<dd class="smalltext"><input type="file" size="60" name="attachment[]" id="attachment\' + current_attachment + \'" class="input_file" /> (<a href="javascript:void(0);" onclick="cleanFileInput(\\\'attachment\' + current_attachment + \'\\\');">', $txt['clean_attach'], '<\/a>)\' + \'<\/dd><dd class="smalltext" id="moreAttachments"><a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')<\' + \'/a><\' + \'/dd>\');
+
+										return true;
+									}
+								// ]]></script>
+							</dd>
+							<dd class="smalltext" id="moreAttachments"><a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')</a></dd>';
 			else
 				echo '
-						</dd>';
+							</dd>';
 		}
 
 		// Add any template changes for an alternative upload system here.
 		call_integration_hook('integrate_upload_template');
 
 		echo '
-						<dd class="smalltext">';
+							<dd class="smalltext">';
 
 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
 		if (!empty($modSettings['attachmentCheckExtensions']))
 			echo '
-							', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br />';
+								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br />';
 
 		if (!empty($context['attachment_restrictions']))
 			echo '
-							', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br />';
+								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br />';
 
 		if ($context['num_allowed_attachments'] == 0)
 			echo '
-							', $txt['attach_limit_nag'], '<br />';
+								', $txt['attach_limit_nag'], '<br />';
 
 		if (!$context['can_post_attachment_unapproved'])
 			echo '
-							<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br />';
+								<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br />';
 
 		echo '
-						</dd>
-					</dl>';
+							</dd>
+						</dl>';
 	}
 
+		echo '
+					</div>';
 	// If the admin enabled the drafts feature, show a draft selection box
 	if (!empty($modSettings['drafts_enabled']) && !empty($context['drafts']) && !empty($options['drafts_show_saved_enabled']))
 	{
 		echo '
-			<br />
-			<div id="postDraftOptionsHeader" class="title_bar">
-				<h4 class="titlebg">
-					<img id="postDraftExpand" class="panel_toggle" style="display: none;" src="', $settings['images_url'], '/collapse.png" alt="-" /> <strong><a href="#" id="postDraftExpandLink">', $txt['draft_load'], '</a></strong>
-				</h4>
-			</div>
-			<div id="postDraftOptions" class="load_drafts padding">
-				<dl class="settings">
-					<dt><strong>', $txt['subject'], '</strong></dt>
-					<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
+					<div id="postDraftOptionsHeader" class="title_bar">
+						<h4 class="titlebg">
+							<img id="postDraftExpand" class="panel_toggle" style="display: none;" src="', $settings['images_url'], '/collapse.png" alt="-" /> <strong><a href="#" id="postDraftExpandLink">', $txt['draft_load'], '</a></strong>
+						</h4>
+					</div>
+					<div id="postDraftOptions">
+						<dl class="settings">
+							<dt><strong>', $txt['subject'], '</strong></dt>
+							<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
 		foreach ($context['drafts'] as $draft)
 			echo '
-					<dt>', $draft['link'], '</dt>
-					<dd>', $draft['poster_time'], '</dd>';
+							<dt>', $draft['link'], '</dt>
+							<dd>', $draft['poster_time'], '</dd>';
 		echo '
-				</dl>
-			</div>';
+						</dl>
+					</div>';
 	}
 
 	// Is visual verification enabled?
@@ -750,10 +753,7 @@ function template_main()
 					document.getElementById(\'additional_options\').value = \'1\';
 				},
 				aSwappableContainers: [
-					\'postMoreOptions\',
-					\'postAttachment\',
-					\'postAttachment2\',
-					\'postAttachment3\'
+					\'postAdditionalOptions\',
 				],
 				aSwapImages: [
 					{

+ 1 - 1
Themes/default/Profile.template.php

@@ -2966,7 +2966,7 @@ function template_authentication_method()
 								</dt>
 								<dd>
 									<input type="password" name="passwrd2" id="smf_autov_pwverify" size="30" tabindex="', $context['tabindex']++, '" class="input_password" />
-									<span id="smf_autov_pwverify_div" style="display: none;"><img id="smf_autov_pwverify_img" class="centericon"  src="', $settings['images_url'], '/icons/field_valid.png" alt="*" /></span>
+									<span id="smf_autov_pwverify_div" style="display: none;"><img id="smf_autov_pwverify_img" class="centericon" src="', $settings['images_url'], '/icons/field_valid.png" alt="*" /></span>
 								</dd>
 							</dl>
 						</dd>

+ 4 - 5
Themes/default/css/admin.css

@@ -296,18 +296,17 @@ legend {
 ------------------------------------------------------- */
 /* Admin quick search bar, and results page. */
 h3.catbg #quick_search form {
-	padding-top: 2px;
-	font-size: 0.66em;
+	font-size: 0.9em;
 }
 h3.catbg #quick_search form input, h3.catbg #quick_search form select, h3.catbg #quick_search form .button_submit {
 	margin: 0 3px;
-	padding: 4px 3px 3px 3px;
+	padding: 3px;
 	border-radius: 4px;
 	border: 1px solid #777;
 	vertical-align: top;
 }
 h3.catbg #quick_search form select {
-	font-size: 1.01em;
+	font-size: 0.9em;
 	margin: 0;
 	padding: 2px;
 }
@@ -317,7 +316,7 @@ h3.catbg #quick_search form select option {
 h3.catbg #quick_search form .button_submit {
 	font-weight: bold;
 	background: #fff url(../images/theme/lower_section.png) 0 100% repeat-x;
-	padding: 3px 6px 2px 6px;
+	padding: 2px 6px 2px 6px;
 }
 h3.catbg #quick_search form .button_submit:hover {
 	background: #fff;

File diff suppressed because it is too large
+ 278 - 214
Themes/default/css/index.css


+ 130 - 47
Themes/default/css/install.css

@@ -1,73 +1,156 @@
-body {
+a:link, a:hover, a:visited {
+	text-decoration: underline;
+}
+/* These divisions wrap the forum sections when a forum width is set. */
+#wrapper, .frame {
 	width: 90%;
+	max-width: 1140px;
 }
-#top_section {
-	height: 70px;
-	min-height: 65px;
+h1.forumtitle {
+	font-size: 2em;
+	font-family: tahoma;
+	margin: 0;
+	padding: 32px 12px 16px 12px;
+	float: left;
+	font-weight: normal;
+	color: #a85400;
+	text-shadow: -1px -1px 0 rgba(0,0,0,0.5), 1px 1px 0 #fff;
 }
-#upper_section {
-	margin-bottom: 0;
-	padding: 0;
+/* Tweak the SMF logo */
+img#smflogo {
+	margin: 26px 0 0 0;
 }
-#upper_section .user {
-	height: 4em;
+#inner_wrap {
+	min-height: 80px;
 }
-#upper_section .news {
+#inner_wrap .news {
 	height: 80px;
+	text-align: right;
+	width: 100%;
+	max-width: 100%;
+	float: left;
 }
-#main_screen {
-	padding: 0 40px;
-}
-#main_screen h2 {
-	font-size: 1.5em;
-	border-bottom: 1px solid #d05800;
-	line-height: 1.5em;
-	margin: 0 0 0.5em 0;
-	color: #d05800;
-}
-#main-steps {
+#main_steps {
 	float: right;
 	width: 50%;
-	margin-top: -60px;
+	padding: 0 0 1em 0;
 }
-#main-steps h2 {
-	font-size: 1.1em;
+#main_steps h2 {
+	font-size: 1.2em;
 	border-bottom: 1px solid #d05800;
-	line-height: 1.1em;
-	margin: 0 0 0.5em 0;
+	line-height: 1.6em;
+	margin: 0 1em 0.5em 0;
 	color: #d05800;
-	margin-right: 40px;
 }
-#main-steps ul {
+#main_steps ul {
 	list-style: none;
-	padding-left: 0;
+	padding: 0 0.5em;
 	margin: 0;
+	line-height: 1.8em;
 }
-#main-steps ul li {
-	padding: 1px 0;
-	font-size: 0.9em;
-}
-#main-steps ul li.stepdone {
+#main_steps ul li.stepdone {
 	color: #aaa;
 }
-#main-steps ul li.stepcurrent {
-	color: #000;
+#main_steps ul li.stepcurrent {
+	color: #222;
 	font-weight: bold;
 }
-#main-steps ul li.stepwaiting {
+#main_steps ul li.stepwaiting {
 	color: #666;
 }
-.panel {
-	font-weight: normal;
+#progress_bar {
+	position: relative;
+	font-size: 1.2em;
+	height: 2.3em;
+	border: 1px solid black;
+	border-radius: 2px;
+	background: #fff;
+	float: left;
+	margin: 0.6em 0 0 4em;
+	width: 33%;
+}
+#overall_text, #step_text {
+	z-index: 2;
+	color: #111;
+	font-weight: bold;
+	position: absolute;
+	top: 0.5em;
+	left: -3.3em;
 }
-a:link, a:hover, a:visited {
-	text-decoration: underline;
+#overall_progress, #step_progress {
+	height: 2.3em;
+	z-index: 1;
+	background: lime;
 }
-.progress {
-	position: relative;
-	margin: -16px 3px 0 3px;
+#step_progress {
+	background: #ffd000;
 }
-.overall_progress {
-	position: relative;
-	margin: -25px 3px 0 3px;
+.overall_progress, .progress {
+	position: absolute;
+	top: 0.5em;
+	left: 0.5em;
+}
+#substep_progress {
+	height: 2.3em;
+	z-index: 1;
+	background: #eebaf4;
+}
+#main_screen {
+	padding: 1em 1em 0.5em 1em;
+}
+#main_screen h2 {
+	font-size: 1.2em;
+	border-bottom: 1px solid #d05800;
+	line-height: 1.6em;
+	margin: 0 0 0.5em 0;
+	color: #d05800;
+}
+.panel form div{
+	max-height: 560px;
+	overflow: auto;
+}
+.panel p, .panel h3 {
+	margin: 0 0.5em 1em 0.5em;
+}
+.panel ul {
+	margin: 0 0.5em 1em 0.5em;
+}
+.error_message {
+	color: red;
+	padding: 0.5em;
+}
+.panel .button_submit, .panel .button_link {
+	font-size: 1em;
+	font-weight: bold;
+	color: #333;
+	padding: 3px 6px;
+	text-decoration: none;
+}
+.panel .button_submit:hover, .panel .button_link:hover {
+	color: #af6700;
+	text-decoration: none;
+}
+.panel .clear {
+	padding: 1em 0 0 0;
+	overflow: auto;
+}
+/* [WIP] Warning: this next bit may cause trouble. */
+/* It's just to hide an empty div when the submits are not shown. */
+.panel .clear:nth-child(3) {
+	border: 1px solid green;
+	display: none;
+}
+/* End [WIP] */
+#time_elapsed {
+	clear: both;
+	padding: 1em 1em 0 1em;
+	border: 1px solid green;
+	/* [WIP] */
+	background: /*#f0f4f7*/ #fcfcfc;
+	margin: 1em 0.9em 0 0.9em;
+	padding: 6px 8px 8px 8px;
+	border: 1px solid #ccc;
+	border-radius: 5px;
+	box-shadow: 0 -2px 2px rgba(0,0,0,0.1);
+	/* End [WIP] */
 }

+ 187 - 165
Themes/default/css/jquery.sceditor.css

@@ -1,5 +1,5 @@
 /**
- * SCEditor v1.3.1
+ * SCEditor v1.3.7
  * http://www.samclarke.com/2011/07/sceditor/
  *
  * Copyright (C) 2011, Sam Clarke (samclarke.com)
@@ -7,17 +7,10 @@
  * SCEditor is licensed under the MIT license:
  *	http://www.opensource.org/licenses/mit-license.php
  *
- * Icons by Mark James (http://www.famfamfam.com/lab/icons/silk/)
- * Licensed under the Creative Commons CC-BY license (http://creativecommons.org/licenses/by/3.0/)
  */
 
-/*
-	spritemapper.output_image = minified/jquery.sceditor.min.png
-	spritemapper.output_css = minified/jquery.sceditor.min.css
-*/
 .sceditor-container {
 	position: relative;
-	overflow: hidden;
 	border: 1px solid #aaa;
 	background: #fff;
 
@@ -27,167 +20,189 @@
 	-khtml-border-radius: 4px;
 	border-radius: 4px;
 }
-
-.sceditor-container, .sceditor-container div,
-div.sceditor-dropdown, div.sceditor-dropdown div {
+.sceditor-container.resizing {
+	overflow: hidden;
+}
+.sceditor-container, .sceditor-container div, div.sceditor-dropdown, div.sceditor-dropdown div {
 	padding: 0;
 	margin: 0;
 	z-index: 3;
 }
-	.sceditor-container iframe, .sceditor-container textarea {
-		border: 0;
-		outline: none;
-		font-family: Verdana, Arial, Helvetica, sans-serif;
-		font-size: 13px;
-		color: #111;
-		padding: 0;
-		margin: 5px;
-		resize: none;
-	}
-	div.sceditor-resize-cover {
-		position: absolute;
-		top: 0;
-		left: 0;
-		background: #000;
-		width: 3000px;
-		height: 6000px;
-		z-index: 2;
-		filter: alpha(opacity=30);
-		opacity: 0.3;
-	}
-	div.sceditor-grip {
-		background: #000;
-		overflow: hidden;
-		width: 10px;
-		height: 10px;
-		cursor: pointer;
-		position: absolute;
-		bottom: 0;
-		right: 0;
-		z-index: 3;
-		background: url('../images/bbc/grip.png');
-	}
-	div.sceditor-dropdown {
-		position: absolute;
-		margin: 22px 0 0 1px;
-		border: 1px solid #bbb;
-		background: #fff;
-		color: #222;
-		font-size: 13px;
-		z-index: 6;
-	}
-		div.sceditor-dropdown form { margin: 0; }
-		div.sceditor-dropdown label {
-			display:block;
-			font-weight: bold;
-			font-size: .95em;
-			margin: .65em 0 .15em;
-		}
-		div.sceditor-dropdown .button {	margin: .5em 0 0; }
-		.sceditor-pastetext textarea { border: 1px solid #bbb; width: 20em; }
-		div.sceditor-inserttable, div.sceditor-insertimage,
-		div.sceditor-pastetext, div.sceditor-insertlink,
-		div.sceditor-insertemail {
-			padding: 5px;
-		}
-		div.sceditor-smileyPopup {
-			margin: 0;
-		}
-		.sceditor-insertemoticon img, .sceditor-smileyPopup img {
-			cursor: pointer;
-			margin: 2px;
-		}
-		.sceditor-more, .sceditor-smileyPopup {
-			display: inline;
-			text-align: center;
-			cursor: pointer;
-			padding: 2px 0;
-		}
-		.sceditor-more:hover { background: #eee; }
-		.sceditor-fontsize-option, .sceditor-font-option {
-			display: block;
-			padding: 4px 6px;
-			cursor: pointer;
-			font-size: 14px;
-			text-decoration: none;
-			color: #222;
-		}
-		.sceditor-fontsize-option:hover, .sceditor-font-option:hover { background: #eee; }
-		.sceditor-color-column { float: left; }
-			.sceditor-color-option {
-				display: block;
-				border: 1px solid #fff;
-				height: 20px;
-				width: 100px;
-				overflow: hidden;
-			}
-			.sceditor-color-option:hover { border: 1px solid #333; }
-
-	div.sceditor-toolbar {
-		overflow: hidden;
-		zoom: 1; /* IE6 */
-		padding: 3px 5px 0 5px;
-		*padding: 3px 5px 3px 5px;
-		background: #f7f7f7;
-		border-bottom: 1px solid #aaa;
-
-		-webkit-border-radius: 4px 4px 0 0;
-	}
-
-		div.sceditor-group {
-			overflow: hidden;
-			display: inline-block;
-			zoom: 1; /* IE6 */
-			*display: inline;
-			background: #ddd;
-			margin: 1px 5px 1px 0;
-			*margin: 2px 5px 2px 0;
-			padding: 2px;
-
-			-moz-border-radius: 4px;
-			-webkit-border-radius: 4px;
-			-opera-border-radius: 4px;
-			-khtml-border-radius: 4px;
-			border-radius: 4px;
-		}
-		div.sceditor-row {
-			overflow: hidden;
-			display: block;
-			zoom: 1; /* IE6 */
-			*display: inline;
-		}
-
-		.sceditor-button {
-			float: left;
-			cursor: pointer;
-			padding: 3px 4px;
-		}
-		/*.sceditor-button.disabled {
-			background-color: #666;
-		}*/
-		.sceditor-button.disabled div {
-			filter: alpha(opacity=30);
-			opacity: 0.3;
-		}
-		.sceditor-button.disabled:hover {
-			background: inherit;
-			cursor: default;
-		}
-		.sceditor-button div, .sceditor-button {
-			display: block;
-			width: 18px;
-			height: 18px;
-			background-repeat:no-repeat !important;
-			background-position:center center !important;
-		}
-		.sceditor-button div {
-			margin: 0;
-			padding: 0;
-			text-indent: -9999px;
-		}
-		.sceditor-button:hover { background: #eee; }
-			.sceditor-button-emoticon { display:none; }
-
+.sceditor-container iframe, .sceditor-container textarea {
+	border: 0;
+	outline: none;
+	color: #111;
+	padding: 5px;
+	margin: 0 0 12px 0;
+	resize: none;
+	background: #fff;
+	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+}
+/* Necessary for stabilising font-size in source mode! */
+.sceditor-container textarea, .sceditor-container textarea:focus {
+	font-size: 1em;
+	box-shadow: none;
+}
+div.sceditor-resize-cover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	background: #fff;
+	width: 3000px;
+	height: 6000px;
+	z-index: 2;
+	filter: alpha(opacity=70);
+	opacity: 0.7;
+}
+div.sceditor-grip {
+	overflow: hidden;
+	height: 12px;
+	cursor: pointer;
+	position: absolute;
+	bottom: 0;
+	left: -1px;
+	right: -1px;
+	z-index: 3;
+	background: #fff url('../images/bbc/grip.png') 100% 100% no-repeat;
+	border: 1px solid #ccc;
+	border-bottom: none;
+	border-radius: 0 0 4px 4px;
+	box-shadow: -1px -2px 4px rgba(0,0,0,0.1) inset, 2px 2px 4px rgba(255,255,255,0.75) inset;
+}
+div.sceditor-dropdown {
+	position: absolute;
+	margin: 22px 0 0 1px;
+	border: 1px solid #bbb;
+	background: #fff;
+	color: #222;
+	font-size: 13px;
+	z-index: 6;
+}
+div.sceditor-dropdown form { 
+	margin: 0; 
+}
+div.sceditor-dropdown label {
+	display: block;
+	font-eight: bold;
+	font-size: .95em;
+	margin: .65em 0 .15em;
+}
+div.sceditor-dropdown .button {	
+	margin: .5em 0 0; 
+}
+.sceditor-pastetext textarea { 
+	border: 1px solid #bbb; 
+	width: 20em; 
+}
+div.sceditor-inserttable, div.sceditor-insertimage, div.sceditor-pastetext, div.sceditor-insertlink, div.sceditor-insertemail {
+	padding: 5px;
+}
+div.sceditor-smileyPopup {
+	margin: 0;
+}
+.sceditor-insertemoticon img, .sceditor-smileyPopup img {
+	cursor: pointer;
+	margin: 6px 4px 4px 4px;
+}
+.sceditor-more, .sceditor-smileyPopup {
+	display: inline;
+	text-align: center;
+	cursor: pointer;
+	padding: 2px 0;
+}
+.sceditor-more:hover { 
+	background: #eee; 
+}
+.sceditor-fontsize-option, .sceditor-font-option {
+	display: block;
+	padding: 4px 6px;
+	cursor: pointer;
+	font-size: 14px;
+	text-decoration: none;
+	color: #222;
+}
+.sceditor-fontsize-option:hover, .sceditor-font-option:hover { 
+	background: #eee; 
+}
+.sceditor-color-column {
+	float: left; 
+}
+.sceditor-color-option {
+	display: block;
+	border: 1px solid #fff;
+	height: 20px;
+	width: 100px;
+	overflow: hidden;
+}
+.sceditor-color-option:hover { 
+	border: 1px solid #333; 
+}
+div.sceditor-toolbar {
+	overflow: hidden;
+	padding: 3px 5px 0 5px;
+	background: #f7f7f7;
+	border-bottom: 1px solid #aaa;
+	border-radius: 4px 4px 0 0;
+	box-shadow: 0 -1px 2px rgba(0,0,0,0.1) inset;
+}
+div.sceditor-group {
+	overflow: hidden;
+	display: inline-block;
+	background: none;
+	margin: 0;
+	padding: 0;
+}
+div.sceditor-row {
+	overflow: hidden;
+	display: inline-block;
+	border-left: 1px solid #ccc;
+	border-radius: 1px;
+	margin: 4px 2px 2px 2px;
+}
+.sceditor-button {
+	float: left;
+	cursor: pointer;
+	background: #fff;
+	border: 1px solid #ccc;
+	border-left: none;
+	border-right: 1px solid #bbb;
+	border-bottom: 1px solid #aaa;
+	border-radius: 1px;
+	box-shadow: -1px -1px 3px rgba(96,134,166,0.2) inset;
+	padding: 3px 6px 2px 6px;
+	color: #222;
+	margin: 0;
+}
+.sceditor-button.disabled div {
+	filter: alpha(opacity=30);
+	opacity: 0.3;
+}
+.sceditor-button.disabled:hover {
+	background: inherit;
+	cursor: default;
+}
+.sceditor-button div, .sceditor-button {
+	display: block;
+	width: 18px;
+	height: 18px;
+	background-repeat:no-repeat !important;
+	background-position:center center !important;
+}
+.sceditor-button div {
+	margin: 0;
+	padding: 0;
+	text-indent: -9999px;
+}
+.sceditor-button:hover {
+	background: #fafafa;
+	box-shadow: 1px 1px 1px rgba(0,0,0,0.07) inset;
+	border: 1px solid #ccc;
+	border-left: none;
+	border-top: 1px solid #aaa;
+}
+.sceditor-button-emoticon {
+	display:none; 
+}
 .sceditor-popup-grip {
 	display: block;
 	height: 15px;
@@ -197,6 +212,13 @@ div.sceditor-dropdown, div.sceditor-dropdown div {
 .sceditor-button-source div {
 	background: url('../images/bbc/toggle.png');
 }
+.sourceMode .sceditor-button-source {
+	background: #fafafa;
+	box-shadow: 1px 1px 3px rgba(96,134,166,0.3) inset;
+	border: 1px solid #ccc;
+	border-left: none;
+	border-top: 1px solid #aaa;
+}
 .sceditor-button-font div {
 	background: url('../images/bbc/font.png');
 }

+ 37 - 10
Themes/default/css/jquery.sceditor.default.css

@@ -1,11 +1,11 @@
 html, body, p, code:before, table {
 	margin: 0;
 	padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 13px;
 	color: #111;
 }
-
+html>body>p, html>body>div {
+	font: 83.33%/150% "Segoe UI", "Helvetica Neue", "Liberation Sans", "Nimbus Sans L", Arial, sans-serif;
+}
 ul, ol {
 	margin-top: 0;
 	margin-bottom: 0;
@@ -39,21 +39,48 @@ code:before, code {
 
 blockquote {
 	position: relative;
-	background: #fff6c7;
+	background: #ebf4f8;
 	margin: .25em 0;
-	border: 1px solid #aaa;
-	padding: .25em;
+	border: 1px solid #d6dfe2;
+	border-left: 2px solid #aaa;
+	border-right: 2px solid #aaa;
+	padding: 4px 8px;
+	font: 75%/150% "Segoe UI", "Helvetica Neue", "Liberation Sans", "Nimbus Sans L", Arial, sans-serif;
+}
+blockquote blockquote {
+	font-size: 1em;
+}
+/* Will correctly colour down to seventh level of nested quotes in editor. Can be extended easily enough. */
+body>blockquote>blockquote, body>blockquote>blockquote>blockquote>blockquote,
+body>blockquote>blockquote>blockquote>blockquote>blockquote>blockquote {
+	background: #e0e6f6;
 }
 blockquote cite, code cite {
-	font-weight: bold;
+	font-style: normal;
 	display: block;
 	font-size: 1em;
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid #fff;
+	box-shadow: 0 -1px 0 #ccc inset;
+	margin: 0 -4px;
+	padding: 0 0 4px 0;
+}
+body>blockquote>blockquote>cite, body>blockquote>blockquote>blockquote>blockquote>cite,
+body>blockquote>blockquote>blockquote>blockquote>blockquote>blockquote>cite {
+	border-bottom: 1px solid #f0f0f0;
+	box-shadow: 0 -1px 0 #c0c0c0 inset;
 }
 code cite {
 	position: relative;
 	top: -1.6em;
 	padding-left: 3em;
 }
-div { min-height: 1em; /*height:auto !important; height: 1em;*/ }
-h1, h2, h3, h4, h5, h6 { padding: 0; margin: 0; }
+blockquote cite a:link, blockquote cite a:visited {
+	text-decoration: none;
+	color: #346;
+}
+div {
+	min-height: 1em; /*height:auto !important; height: 1em;*/ 
+}
+h1, h2, h3, h4, h5, h6 {
+	padding: 0; margin: 0; 
+}

+ 4 - 4
Themes/default/index.template.php

@@ -306,7 +306,7 @@ function template_body_above()
 			echo '
 						<a href="', $scripturl, '?action=profile" class="avatar">', $context['user']['avatar']['image'], '</a>';
 			echo '
-						<ul class="floatleft">
+						<ul>
 							<li class="greeting">', $txt['hello_member_ndt'], ' <span>', $context['user']['name'], '</span></li>';
 
 		// Are there any members waiting for approval?
@@ -360,13 +360,13 @@ function template_body_below()
 		</div>
 	</div>';
 
-	// Show the "Powered by" and "Valid" logos, as well as the copyright. Remember, the copyright must be somewhere!
+	// Show the XHTML, RSS and WAP2 links, as well as the copyright.
 	// Footer is now full-width by default. Frame inside it will match theme wrapper width automatically.
 	echo '
 	<div id="footer_section">
 		<div class="frame">';
 
-	// Thee is now a global "Go to top" link above the copyright.
+	// There is now a global "Go to top" link at the right.
 		echo '
 			<a href="#top" id="bot"><img src="', $settings['images_url'], '/upshrink.png" alt="*" title="', $txt['go_up'], '" /></a>
 			<ul class="reset">
@@ -418,7 +418,7 @@ function theme_linktree($force_show = false)
 	if ($context['user']['is_logged'])
 	echo '
 			<li class="unread_links">
-				<a href="', $scripturl, '?action=unread" title="', $txt['unread_since_visit'], '">', $txt['view_unread_category'], '</a> -
+				<a href="', $scripturl, '?action=unread" title="', $txt['unread_since_visit'], '">', $txt['view_unread_category'], '</a>
 				<a href="', $scripturl, '?action=unreadreplies" title="', $txt['show_unread_replies'], '">', $txt['unread_replies'], '</a>
 			</li>';
 

+ 1 - 1
Themes/default/scripts/theme.js

@@ -1,6 +1,6 @@
 $(document).ready(function() {
 	// menu drop downs
-	$('ul.dropmenu').superfish();
+	$('ul.dropmenu, ul.quickbuttons').superfish({delay : 600, speed: 200, sensitivity : 8, interval : 50, timeout : 1}); 
 	
 	// tooltips
 	$('.preview').SMFtooltip();

+ 49 - 45
other/install.php

@@ -2035,60 +2035,63 @@ function template_install_above()
 		<script type="text/javascript" src="Themes/default/scripts/script.js"></script>
 	</head>
 	<body>
-	<div id="header"><div class="frame">
-		<div id="top_section">
-			<h1 class="forumtitle">', $txt['smf_installer'], '</h1>
-			<img id="smflogo" src="Themes/default/images/smflogo.png" alt="Simple Machines Forum" title="Simple Machines Forum" />
+		<div id="header">
+			<div class="frame">
+				<h1 class="forumtitle">', $txt['smf_installer'], '</h1>
+				<img id="smflogo" src="Themes/default/images/smflogo.png" alt="Simple Machines Forum" title="Simple Machines Forum" />
+			</div>
 		</div>
-		<div id="upper_section" class="middletext flow_hidden">
-			<div class="user"></div>
-			<div class="news normaltext">';
+		<div id="wrapper">
+			<div id="upper_section">
+				<div id="inner_section">
+					<div id="inner_wrap">';
 
 	// Have we got a language drop down - if so do it on the first step only.
 	if (!empty($incontext['detected_languages']) && count($incontext['detected_languages']) > 1 && $incontext['current_step'] == 0)
 	{
 		echo '
-				<div class="righttext">
-					<form action="', $installurl, '" method="get">
-						<label for="installer_language">', $txt['installer_language'], ':</label> <select id="installer_language" name="lang_file" onchange="location.href = \'', $installurl, '?lang_file=\' + this.options[this.selectedIndex].value;">';
+						<div class="news">
+							<form action="', $installurl, '" method="get">
+								<label for="installer_language">', $txt['installer_language'], ':</label>
+								<select id="installer_language" name="lang_file" onchange="location.href = \'', $installurl, '?lang_file=\' + this.options[this.selectedIndex].value;">';
 
 		foreach ($incontext['detected_languages'] as $lang => $name)
 			echo '
-							<option', isset($_SESSION['installer_temp_lang']) && $_SESSION['installer_temp_lang'] == $lang ? ' selected="selected"' : '', ' value="', $lang, '">', $name, '</option>';
+									<option', isset($_SESSION['installer_temp_lang']) && $_SESSION['installer_temp_lang'] == $lang ? ' selected="selected"' : '', ' value="', $lang, '">', $name, '</option>';
 
 		echo '
-						</select>
-						<noscript><input type="submit" value="', $txt['installer_language_set'], '" class="button_submit" /></noscript>
-					</form>
-				</div>';
+								</select>
+								<noscript><input type="submit" value="', $txt['installer_language_set'], '" class="button_submit" /></noscript>
+							</form>
+						</div>
+						<hr class="clear" />';
 	}
 
 	echo '
+					</div>
+				</div>
 			</div>
-		</div>
-	</div></div>
-	<div id="content_section"><div class="frame">
-		<div id="main_content_section">
-			<div id="main-steps">
-				<h2>', $txt['upgrade_progress'], '</h2>
-				<ul>';
+			<div id="content_section">
+				<div id="main_content_section">
+					<div id="main_steps">
+						<h2>', $txt['upgrade_progress'], '</h2>
+						<ul>';
 
 	foreach ($incontext['steps'] as $num => $step)
 		echo '
-					<li class="', $num < $incontext['current_step'] ? 'stepdone' : ($num == $incontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>';
+							<li class="', $num < $incontext['current_step'] ? 'stepdone' : ($num == $incontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>';
 
 	echo '
-				</ul>
-			</div>
-			<div style="font-size: 12pt; height: 25pt; border: 1px solid black; background: white; float: left; margin-left: 12%; width: 25%;">
-				<div id="overall_text" style="padding-top: 8pt; z-index: 2; color: black; margin-left: -4em; position: absolute; text-align: center; font-weight: bold;">', $incontext['overall_percent'], '%</div>
-				<div id="overall_progress" style="width: ', $incontext['overall_percent'], '%; height: 25pt; z-index: 1; background-color: lime;">&nbsp;</div>
-				<div class="overall_progress">', $txt['upgrade_overall_progress'], '</div>
-			</div>
-			<div id="main_screen" class="clear">
-				<h2>', $incontext['page_title'], '</h2>
-				<div class="panel">
-					<div style="max-height: 560px; overflow: auto;">';
+						</ul>
+					</div>
+					<div id="progress_bar">
+						<div id="overall_text">', $incontext['overall_percent'], '%</div>
+						<div id="overall_progress" style="width: ', $incontext['overall_percent'], '%;">&nbsp;</div>
+						<div class="overall_progress">', $txt['upgrade_overall_progress'], '</div>
+					</div>
+					<div id="main_screen" class="clear">
+						<h2>', $incontext['page_title'], '</h2>
+						<div class="panel">';
 }
 
 function template_install_below()
@@ -2098,16 +2101,16 @@ function template_install_below()
 	if (!empty($incontext['continue']) || !empty($incontext['skip']))
 	{
 		echo '
-						<div class="righttext" style="margin: 1ex;">';
+								<div class="clear">';
 
 		if (!empty($incontext['continue']))
 			echo '
-							<input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '" onclick="return submitThisOnce(this);" class="button_submit" />';
+									<input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '" onclick="return submitThisOnce(this);" class="button_submit" />';
 		if (!empty($incontext['skip']))
 			echo '
-							<input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="return submitThisOnce(this);" class="button_submit" />';
+									<input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="return submitThisOnce(this);" class="button_submit" />';
 		echo '
-						</div>';
+								</div>';
 	}
 
 	// Show the closing form tag and other data only if not in the last step
@@ -2116,14 +2119,18 @@ function template_install_below()
 							</form>';
 
 	echo '
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
-	</div></div>
-	<div id="footer_section"><div class="frame" style="height: 40px;">
-		<div class="smalltext"><a href="http://www.simplemachines.org/" title="Simple Machines Forum" target="_blank" class="new_win">SMF &copy; 2011, Simple Machines</a></div>
-	</div></div>
+		<div id="footer_section">
+			<div class="frame">
+				<ul class="reset">
+					<li class="copyright"><a href="http://www.simplemachines.org/" title="Simple Machines Forum" target="_blank" class="new_win">SMF &copy; 2011, Simple Machines</a></li>
+				</ul>
+			</div>
+		</div>
 	</body>
 </html>';
 }
@@ -2150,9 +2157,6 @@ function template_welcome_message()
 		echo '
 		<h3>', $txt['install_all_lovely'], '</h3>';
 
-	echo '
-		<div style="height: 100px;"></div>';
-
 	// Say we want the continue button!
 	if (empty($incontext['error']))
 		$incontext['continue'] = 1;

Some files were not shown because too many files changed in this diff