Ver código fonte

! Apply the new theme layout to more areas, mostly basic html re-order
May files, and not even close to done :(

Signed-off-by: Spuds <[email protected]>

Spuds 11 anos atrás
pai
commit
776370fa61

+ 37 - 29
Themes/default/Admin.template.php

@@ -585,7 +585,7 @@ function template_edit_censored()
 	// First section is for adding/removing words from the censored list.
 	echo '
 	<div id="admincenter">
-		<form action="', $scripturl, '?action=admin;area=postsettings;sa=censor" method="post" accept-charset="', $context['character_set'], '">
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=postsettings;sa=censor" method="post" accept-charset="', $context['character_set'], '">
 			<div id="section_header" class="cat_bar">
 				<h3 class="catbg">
 					', $txt['admin_censored_words'], '
@@ -1380,8 +1380,10 @@ function template_core_features()
 				<h3 class="catbg">
 					', $txt['core_settings_title'], '
 				</h3>
+				
 			</div>
-		<form id="core_features" action="', $scripturl, '?action=admin;area=corefeatures" method="post" accept-charset="', $context['character_set'], '">
+			<p class="description">', $txt['core_settings_desc'], '</p>
+			<form id="core_features" action="', $scripturl, '?action=admin;area=corefeatures" method="post" accept-charset="', $context['character_set'], '">
 			<div style="display:none" id="activation_message" class="errorbox"></div>';
 
 	$alternate = true;
@@ -1566,21 +1568,27 @@ function template_php_info()
 	global $context, $txt;
 
 	echo '
-	<div class="generic_list_wrapper" id="phpinfo">';
-
+	<div id="admin_form_wrapper">
+		<div id="section_header" class="cat_bar">
+			<h3 class="catbg">',
+				$txt['phpinfo_settings'], '
+			</h3>
+		</div>
+		<br />';
+	
 	// for each php info area
 	foreach ($context['pinfo'] as $area => $php_area)
 	{
 		echo '
-	<table id="', str_replace(' ', '_', $area), '" width="100%" class="table_grid">
-		<thead>
-		<tr class="catbg" align="center">
-			<th class="first_th" scope="col" width="33%"></th>
-			<th scope="col" width="33%"><strong>', $area, '</strong></th>
-			<th class="last_th" scope="col" width="33%"></th>
-		</tr>
-		</thead>
-		<tbody>';
+		<table id="', str_replace(' ', '_', $area), '" width="100%" class="table_grid">
+			<thead>
+			<tr class="catbg" align="center">
+				<th class="first_th" scope="col" width="33%"></th>
+				<th scope="col" width="33%"><strong>', $area, '</strong></th>
+				<th class="last_th" scope="col" width="33%"></th>
+			</tr>
+			</thead>
+			<tbody>';
 
 		$alternate = true;
 		$localmaster = true;
@@ -1595,42 +1603,42 @@ function template_php_info()
 				{
 					// heading row for the settings section of this categorys settings
 					echo '
-		<tr class="titlebg">
-			<td align="center" width="33%"><strong>', $txt['phpinfo_itemsettings'], '</strong></td>
-			<td align="center" width="33%"><strong>', $txt['phpinfo_localsettings'], '</strong></td>
-			<td align="center" width="33%"><strong>', $txt['phpinfo_defaultsettings'], '</strong></td>
-		</tr>';
+			<tr class="titlebg">
+				<td align="center" width="33%"><strong>', $txt['phpinfo_itemsettings'], '</strong></td>
+				<td align="center" width="33%"><strong>', $txt['phpinfo_localsettings'], '</strong></td>
+				<td align="center" width="33%"><strong>', $txt['phpinfo_defaultsettings'], '</strong></td>
+			</tr>';
 					$localmaster = false;
 				}
 
 				echo '
-		<tr>
-			<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $key, '</td>';
+			<tr>
+				<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $key, '</td>';
 
 				foreach ($setting as $key_lm => $value)
 				{
 					echo '
-			<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $value, '</td>';
+				<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $value, '</td>';
 				}
 				echo '
-		</tr>';
+			</tr>';
 			}
 			// just a single setting (2 col)
 			else
 			{
 				echo '
-		<tr>
-			<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $key,  '</td>
-			<td align="left" class="windowbg', $alternate ? '2' : '', '" colspan="2">', $setting, '</td>
-		</tr>';
+			<tr>
+				<td align="left" width="33%" class="windowbg', $alternate ? '2' : '', '">', $key,  '</td>
+				<td align="left" class="windowbg', $alternate ? '2' : '', '" colspan="2">', $setting, '</td>
+			</tr>';
 			}
 
 			$alternate = !$alternate;
 		}
 		echo '
-		</tbody>
-	</table>
-	<br />';
+			</tbody>
+		</table>
+		<br />';
 	}
 
 	echo '

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

@@ -168,7 +168,7 @@ function template_attachment_repair()
 	{
 		echo '
 	<div id="manage_attachments">
-		<form action="', $scripturl, '?action=admin;area=manageattachments;sa=repair;fixErrors=1;step=0;substep=0;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=manageattachments;sa=repair;fixErrors=1;step=0;substep=0;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['repair_attachments'], '</h3>
 			</div>

+ 112 - 116
Themes/default/ManageBans.template.php

@@ -16,150 +16,148 @@ function template_ban_edit()
 
 	echo '
 	<div id="manage_bans">
-
-		<div class="cat_bar">
-			<h3 class="catbg">
-				', $context['ban']['is_new'] ? $txt['ban_add_new'] : $txt['ban_edit'] . ' \'' . $context['ban']['name'] . '\'', '
-			</h3>
-		</div>';
-
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=ban;sa=edit" method="post" accept-charset="', $context['character_set'], '" onsubmit="if (this.ban_name.value == \'\') {alert(\'', $txt['ban_name_empty'], '\'); return false;} if (this.partial_ban.checked &amp;&amp; !(this.cannot_post.checked || this.cannot_register.checked || this.cannot_login.checked)) {alert(\'', $txt['ban_restriction_empty'], '\'); return false;}">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					', $context['ban']['is_new'] ? $txt['ban_add_new'] : $txt['ban_edit'] . ' \'' . $context['ban']['name'] . '\'', '
+				</h3>
+			</div>';
+			
 	if ($context['ban']['is_new'])
 		echo '
-		<div class="information">', $txt['ban_add_notes'], '</div>';
-
+			<div class="information">', $txt['ban_add_notes'], '</div>';
+		
 	echo '
-		<div class="windowbg">
 			<div class="content">
-				<form action="', $scripturl, '?action=admin;area=ban;sa=edit" method="post" accept-charset="', $context['character_set'], '" onsubmit="if (this.ban_name.value == \'\') {alert(\'', $txt['ban_name_empty'], '\'); return false;} if (this.partial_ban.checked &amp;&amp; !(this.cannot_post.checked || this.cannot_register.checked || this.cannot_login.checked)) {alert(\'', $txt['ban_restriction_empty'], '\'); return false;}">
+				<dl class="settings">
+					<dt>
+						<strong><label for="ban_name">', $txt['ban_name'], ':</label></strong>
+					</dt>
+					<dd>
+						<input type="text" name="ban_name" id="ban_name" value="', $context['ban']['name'], '" size="47" maxlength="60" class="input_text" />
+					</dd>
+					<dt>
+						<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br />
+						<span class="smalltext">', $txt['ban_reason_desc'], '</span>
+					</dt>
+					<dd>
+						<textarea name="reason" id="reason" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['reason'], '</textarea>
+					</dd>
+					<dt>
+						<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br />
+						<span class="smalltext">', $txt['ban_notes_desc'], '</span>
+					</dt>
+					<dd>
+						<textarea name="notes" id="ban_notes" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['notes'], '</textarea>
+					</dd>
+				</dl>
+				<fieldset class="ban_settings floatleft">
+					<legend>
+						', $txt['ban_expiration'], '
+					</legend>
+					<input type="radio" name="expiration" value="never" id="never_expires" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'never' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="never_expires">', $txt['never'], '</label><br />
+					<input type="radio" name="expiration" value="one_day" id="expires_one_day" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'still_active_but_we_re_counting_the_days' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="expires_one_day">', $txt['ban_will_expire_within'], '</label>: <input type="text" name="expire_date" id="expire_date" size="3" value="', $context['ban']['expiration']['days'], '" class="input_text" /> ', $txt['ban_days'], '<br />
+					<input type="radio" name="expiration" value="expired" id="already_expired" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'expired' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="already_expired">', $txt['ban_expired'], '</label>
+				</fieldset>
+				<fieldset class="ban_settings floatright">
+					<legend>
+						', $txt['ban_restriction'], '
+					</legend>
+					<input type="radio" name="full_ban" id="full_ban" value="1" onclick="fUpdateStatus();"', $context['ban']['cannot']['access'] ? ' checked="checked"' : '', ' class="input_radio" /> <label for="full_ban">', $txt['ban_full_ban'], '</label><br />
+					<input type="radio" name="full_ban" id="partial_ban" value="0" onclick="fUpdateStatus();"', !$context['ban']['cannot']['access'] ? ' checked="checked"' : '', ' class="input_radio" /> <label for="partial_ban">', $txt['ban_partial_ban'], '</label><br />
+					<input type="checkbox" name="cannot_post" id="cannot_post" value="1"', $context['ban']['cannot']['post'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_post">', $txt['ban_cannot_post'], '</label> (<a href="', $scripturl, '?action=helpadmin;help=ban_cannot_post" onclick="return reqOverlayDiv(this.href);">?</a>)<br />
+					<input type="checkbox" name="cannot_register" id="cannot_register" value="1"', $context['ban']['cannot']['register'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_register">', $txt['ban_cannot_register'], '</label><br />
+					<input type="checkbox" name="cannot_login" id="cannot_login" value="1"', $context['ban']['cannot']['login'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_login">', $txt['ban_cannot_login'], '</label><br />
+				</fieldset>
+				<br class="clear_right" />';
+
+	if (!empty($context['ban_suggestions']))
+	{
+		echo '
+				<fieldset>
+					<legend>
+						', $txt['ban_triggers'], '
+					</legend>
 					<dl class="settings">
 						<dt>
-							<strong><label for="ban_name">', $txt['ban_name'], ':</label></strong>
+							<input type="checkbox" name="ban_suggestion[]" id="main_ip_check" value="main_ip" class="input_check" />
+							<label for="main_ip_check">', $txt['ban_on_ip'], '</label>
 						</dt>
 						<dd>
-							<input type="text" name="ban_name" id="ban_name" value="', $context['ban']['name'], '" size="47" maxlength="60" class="input_text" />
-						</dd>
+							<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;" class="input_text" />
+						</dd>';
+
+		if (empty($modSettings['disableHostnameLookup']))
+			echo '
 						<dt>
-							<strong><label for="reason">', $txt['ban_reason'], ':</label></strong><br />
-							<span class="smalltext">', $txt['ban_reason_desc'], '</span>
+							<input type="checkbox" name="ban_suggestion[]" id="hostname_check" value="hostname" class="input_check" />
+							<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
 						</dt>
 						<dd>
-							<textarea name="reason" id="reason" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['reason'], '</textarea>
-						</dd>
+							<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;" class="input_text" />
+						</dd>';
+
+		echo '
 						<dt>
-							<strong><label for="ban_notes">', $txt['ban_notes'], ':</label></strong><br />
-							<span class="smalltext">', $txt['ban_notes_desc'], '</span>
+							<input type="checkbox" name="ban_suggestion[]" id="email_check" value="email" class="input_check" checked="checked" />
+							<label for="email_check">', $txt['ban_on_email'], '</label>
 						</dt>
 						<dd>
-							<textarea name="notes" id="ban_notes" cols="40" rows="3" style="min-height: 64px; max-height: 64px; min-width: 50%; max-width: 99%;">', $context['ban']['notes'], '</textarea>
+							<input type="text" name="email" value="', $context['ban_suggestions']['email'], '" size="44" onfocus="document.getElementById(\'email_check\').checked = true;" class="input_text" />
 						</dd>
-					</dl>
-					<fieldset class="ban_settings floatleft">
-						<legend>
-							', $txt['ban_expiration'], '
-						</legend>
-						<input type="radio" name="expiration" value="never" id="never_expires" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'never' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="never_expires">', $txt['never'], '</label><br />
-						<input type="radio" name="expiration" value="one_day" id="expires_one_day" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'still_active_but_we_re_counting_the_days' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="expires_one_day">', $txt['ban_will_expire_within'], '</label>: <input type="text" name="expire_date" id="expire_date" size="3" value="', $context['ban']['expiration']['days'], '" class="input_text" /> ', $txt['ban_days'], '<br />
-						<input type="radio" name="expiration" value="expired" id="already_expired" onclick="fUpdateStatus();"', $context['ban']['expiration']['status'] == 'expired' ? ' checked="checked"' : '', ' class="input_radio" /> <label for="already_expired">', $txt['ban_expired'], '</label>
-					</fieldset>
-					<fieldset class="ban_settings floatright">
-						<legend>
-							', $txt['ban_restriction'], '
-						</legend>
-						<input type="radio" name="full_ban" id="full_ban" value="1" onclick="fUpdateStatus();"', $context['ban']['cannot']['access'] ? ' checked="checked"' : '', ' class="input_radio" /> <label for="full_ban">', $txt['ban_full_ban'], '</label><br />
-						<input type="radio" name="full_ban" id="partial_ban" value="0" onclick="fUpdateStatus();"', !$context['ban']['cannot']['access'] ? ' checked="checked"' : '', ' class="input_radio" /> <label for="partial_ban">', $txt['ban_partial_ban'], '</label><br />
-						<input type="checkbox" name="cannot_post" id="cannot_post" value="1"', $context['ban']['cannot']['post'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_post">', $txt['ban_cannot_post'], '</label> (<a href="', $scripturl, '?action=helpadmin;help=ban_cannot_post" onclick="return reqOverlayDiv(this.href);">?</a>)<br />
-						<input type="checkbox" name="cannot_register" id="cannot_register" value="1"', $context['ban']['cannot']['register'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_register">', $txt['ban_cannot_register'], '</label><br />
-						<input type="checkbox" name="cannot_login" id="cannot_login" value="1"', $context['ban']['cannot']['login'] ? ' checked="checked"' : '', ' class="ban_restriction input_radio" /> <label for="cannot_login">', $txt['ban_cannot_login'], '</label><br />
-					</fieldset>
-					<br class="clear_right" />';
-
-	if (!empty($context['ban_suggestions']))
-	{
-		echo '
-					<fieldset>
-						<legend>
-							', $txt['ban_triggers'], '
-						</legend>
-						<dl class="settings">
-							<dt>
-								<input type="checkbox" name="ban_suggestion[]" id="main_ip_check" value="main_ip" class="input_check" />
-								<label for="main_ip_check">', $txt['ban_on_ip'], '</label>
-							</dt>
-							<dd>
-								<input type="text" name="main_ip" value="', $context['ban_suggestions']['main_ip'], '" size="44" onfocus="document.getElementById(\'main_ip_check\').checked = true;" class="input_text" />
-							</dd>';
-
-		if (empty($modSettings['disableHostnameLookup']))
-			echo '
-							<dt>
-								<input type="checkbox" name="ban_suggestion[]" id="hostname_check" value="hostname" class="input_check" />
-								<label for="hostname_check">', $txt['ban_on_hostname'], '</label>
-							</dt>
-							<dd>
-								<input type="text" name="hostname" value="', $context['ban_suggestions']['hostname'], '" size="44" onfocus="document.getElementById(\'hostname_check\').checked = true;" class="input_text" />
-							</dd>';
-
-		echo '
-							<dt>
-								<input type="checkbox" name="ban_suggestion[]" id="email_check" value="email" class="input_check" checked="checked" />
-								<label for="email_check">', $txt['ban_on_email'], '</label>
-							</dt>
-							<dd>
-								<input type="text" name="email" value="', $context['ban_suggestions']['email'], '" size="44" onfocus="document.getElementById(\'email_check\').checked = true;" class="input_text" />
-							</dd>
-							<dt>
-								<input type="checkbox" name="ban_suggestion[]" id="user_check" value="user" class="input_check" checked="checked" />
-								<label for="user_check">', $txt['ban_on_username'], '</label>:
-							</dt>
-							<dd>';
+						<dt>
+							<input type="checkbox" name="ban_suggestion[]" id="user_check" value="user" class="input_check" checked="checked" />
+							<label for="user_check">', $txt['ban_on_username'], '</label>:
+						</dt>
+						<dd>';
 
 		if (empty($context['ban_suggestions']['member']['id']))
 			echo '
-								<input type="text" name="user" id="user" value="" size="44" class="input_text" />';
+							<input type="text" name="user" id="user" value="" size="44" class="input_text" />';
 		else
 			echo '
-								', $context['ban_suggestions']['member']['link'], '
-								<input type="hidden" name="bannedUser" value="', $context['ban_suggestions']['member']['id'], '" />';
+							', $context['ban_suggestions']['member']['link'], '
+							<input type="hidden" name="bannedUser" value="', $context['ban_suggestions']['member']['id'], '" />';
 		echo '
-							</dd>';
+						</dd>';
 
 		if (!empty($context['ban_suggestions']['message_ips']))
 		{
 			echo '
-						</dl>
-						<div>', $txt['ips_in_messages'], ':</div>
-						<dl class="settings">';
+					</dl>
+					<div>', $txt['ips_in_messages'], ':</div>
+					<dl class="settings">';
 
 			foreach ($context['ban_suggestions']['message_ips'] as $ip)
 				echo '
-							<dt>
-								<input type="checkbox" name="ban_suggestion[ips][]" value="', $ip, '" class="input_check" />
-							</dt>
-							<dd>
-								', $ip, '
-							</dd>';
+						<dt>
+							<input type="checkbox" name="ban_suggestion[ips][]" value="', $ip, '" class="input_check" />
+						</dt>
+						<dd>
+							', $ip, '
+						</dd>';
 		}
 
 		if (!empty($context['ban_suggestions']['error_ips']))
 		{
 			echo '
-						</dl>
-						<div>', $txt['ips_in_errors'], '</div>
-						<dl class="settings">';
+					</dl>
+					<div>', $txt['ips_in_errors'], '</div>
+					<dl class="settings">';
 
 			foreach ($context['ban_suggestions']['error_ips'] as $ip)
 				echo '
-							<dt>
-								<input type="checkbox" name="ban_suggestion[ips][]" value="', $ip, '" class="input_check" />
-							</dt>
-							<dd>
-								', $ip, '
-							</dd>';
+						<dt>
+							<input type="checkbox" name="ban_suggestion[ips][]" value="', $ip, '" class="input_check" />
+						</dt>
+						<dd>
+							', $ip, '
+						</dd>';
 		}
 
 		echo '
-							</dl>
-						</fieldset>';
+					</dl>
+				</fieldset>';
 	}
 
 	echo '
@@ -169,9 +167,8 @@ function template_ban_edit()
 						<input type="hidden" name="bg" value="', $context['ban']['id'], '" />
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 						<input type="hidden" name="', $context['admin-bet_token_var'], '" value="', $context['admin-bet_token'], '" />
-					</form>
 				</div>
-			</div>';
+			</form>';
 
 	if (!$context['ban']['is_new'] && empty($context['ban_suggestions']))
 	{
@@ -188,6 +185,7 @@ function template_ban_edit()
 						</tr>
 					</thead>
 					<tbody>';
+		
 		if (empty($context['ban_items']))
 			echo '
 						<tr class="windowbg2">
@@ -222,17 +220,15 @@ function template_ban_edit()
 		echo '
 					</tbody>
 				</table>
+				
 				<div class="flow_auto">
-					<div class="floatright">
-						<div class="additional_row">
-							<input type="submit" name="remove_selection" value="', $txt['ban_remove_selected_triggers'], '" class="button_submit" />
-							<a class="button_link" href="', $scripturl, '?action=admin;area=ban;sa=edittrigger;bg=', $context['ban']['id'], '">', $txt['ban_add_trigger'], '</a>
-						</div>
-					</div>
+					<br />
+					<input type="submit" name="remove_selection" value="', $txt['ban_remove_selected_triggers'], '" class="button_submit" />
+					<a class="button_link" href="', $scripturl, '?action=admin;area=ban;sa=edittrigger;bg=', $context['ban']['id'], '">', $txt['ban_add_trigger'], '</a>
+					<input type="hidden" name="bg" value="', $context['ban']['id'], '" />
+					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
+					<input type="hidden" name="', $context['admin-bet_token_var'], '" value="', $context['admin-bet_token'], '" />
 				</div>
-				<input type="hidden" name="bg" value="', $context['ban']['id'], '" />
-				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
-				<input type="hidden" name="', $context['admin-bet_token_var'], '" value="', $context['admin-bet_token'], '" />
 			</form>';
 
 	}

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

@@ -429,7 +429,7 @@ function template_add_language()
 
 	echo '
 	<div id="admincenter">
-		<form action="', $scripturl, '?action=admin;area=languages;sa=add;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
+		<form id="admin_form_wrapper"action="', $scripturl, '?action=admin;area=languages;sa=add;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
 			<div class="cat_bar">
 				<h3 class="catbg">
 					', $txt['add_language'], '

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

@@ -113,7 +113,7 @@ function template_maintain_database()
 			<div class="content">
 				<form action="', $scripturl, '?action=admin;area=maintain;sa=database;activity=convertutf8" method="post" accept-charset="', $context['character_set'], '">
 					<p>', $txt['utf8_introduction'], '</p>
-					', !empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext' ? '<p class="errorbox">' . $txt['utf8_cannot_convert_fulltext'] . '</p>' : '', '
+					', !empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext' ? '<div class="errorbox">' . $txt['utf8_cannot_convert_fulltext'] . '</div>' : '', '
 					<input type="submit" value="', $txt['maintain_run_now'], '" class="button_submit" ', !empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext' ? 'disabled="disabled"' : '', '/><br class="clear_right" />
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 					<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '" />

+ 2 - 2
Themes/default/ManageMembers.template.php

@@ -164,8 +164,8 @@ function template_search_members()
 					<thead>
 						<tr class="catbg">
 							<th scope="col" class="first_th">', $txt['membergroups'], '</th>
-							<th scope="col">', $txt['primary'], '</th>
-							<th scope="col" class="last_th">', $txt['additional'], '</th>
+							<th scope="col" style="text-align: center">', $txt['primary'], '</th>
+							<th scope="col" class="last_th" style="text-align: center">', $txt['additional'], '</th>
 						</tr>
 					</thead>
 					<tbody>';

+ 73 - 63
Themes/default/ManagePermissions.template.php

@@ -22,7 +22,7 @@ function template_permission_index()
 	</div>';
 
 	echo '
-	<div id="admincenter">
+	<div id="admin_form_wrapper">
 		<form action="', $scripturl, '?action=admin;area=permissions;sa=quick" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" id="permissionForm">';
 
 		if (!empty($context['profile']))
@@ -30,25 +30,30 @@ function template_permission_index()
 			<div class="title_bar">
 				<h3 class="titlebg">', $txt['permissions_for_profile'], ': &quot;', $context['profile']['name'], '&quot;</h3>
 			</div>';
+		else
+			echo '
+			<div class="title_bar">
+				<h3 class="titlebg">', $txt['permissions_title'], '</h3>
+			</div>';
 
 		echo '
 			<table width="100%" class="table_grid">
 				<thead>
 					<tr class="catbg">
 						<th class="first_th">', $txt['membergroups_name'], '</th>
-						<th width="10%" align="center" valign="middle">', $txt['membergroups_members_top'], '</th>';
+						<th width="10%" style="text-align:center" valign="middle">', $txt['membergroups_members_top'], '</th>';
 
 			if (empty($modSettings['permission_enable_deny']))
 				echo '
-						<th width="16%" align="center">', $txt['membergroups_permissions'], '</th>';
+						<th width="16%" style="text-align:center">', $txt['membergroups_permissions'], '</th>';
 			else
 				echo '
-						<th width="8%" align="center">', $txt['permissions_allowed'], '</th>
-						<th width="8%" align="center">', $txt['permissions_denied'], '</th>';
+						<th width="8%" style="text-align:center">', $txt['permissions_allowed'], '</th>
+						<th width="8%" style="text-align:center">', $txt['permissions_denied'], '</th>';
 
 			echo '
-						<th width="10%" align="center" valign="middle">', $context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view'], '</th>
-						<th class="last_th" width="4%" align="center" valign="middle">
+						<th width="10%" style="text-align:center" valign="middle">', $context['can_modify'] ? $txt['permissions_modify'] : $txt['permissions_view'], '</th>
+						<th class="last_th" width="4%" style="text-align: center" valign="middle">
 							', $context['can_modify'] ? '<input type="checkbox" class="input_check" onclick="invertAll(this, this.form, \'group\');" />' : '', '
 						</th>
 					</tr>
@@ -62,11 +67,12 @@ function template_permission_index()
 		echo '
 					<tr class="windowbg', $alternate ? '2' : '', '">
 						<td>
-							', $group['name'], $group['id'] == -1 ? ' (<a href="' . $scripturl . '?action=helpadmin;help=membergroup_guests" onclick="return reqOverlayDiv(this.href);">?</a>)' : ($group['id'] == 0 ? ' (<a href="' . $scripturl . '?action=helpadmin;help=membergroup_regular_members" onclick="return reqOverlayDiv(this.href);">?</a>)' : ($group['id'] == 1 ? ' (<a href="' . $scripturl . '?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)' : ($group['id'] == 3 ? ' (<a href="' . $scripturl . '?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)' : '')));
+							', $group['id'] == -1 ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=membergroup_guests" onclick="return reqOverlayDiv(this.href);"><img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>' : ($group['id'] == 0 ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=membergroup_regular_members" onclick="return reqOverlayDiv(this.href);"><img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>' : ($group['id'] == 1 ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);"><img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>' : ($group['id'] == 3 ? ' <a class="help" href="' . $scripturl . '?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);"><img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>' : '<img class="icon" style="vertical-align: top" src="' . $settings['images_url'] . '/blank.png" width="16px" alt="' . $txt['help'] . '" />'))), '&nbsp;<span>', $group['name'], '</span>';
 
 		if (!empty($group['children']))
 			echo '
-							<br /><span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
+							<br />
+							<span class="smalltext">', $txt['permissions_includes_inherited'], ': &quot;', implode('&quot;, &quot;', $group['children']), '&quot;</span>';
 
 		echo '
 						</td>
@@ -107,7 +113,7 @@ function template_permission_index()
 						<legend>', $txt['permissions_with_selection'], '</legend>
 						<dl class="settings admin_permissions">
 							<dt>
-								', $txt['permissions_apply_pre_defined'], ' <a href="', $scripturl, '?action=helpadmin;help=permissions_quickgroups" onclick="return reqOverlayDiv(this.href);">(?)</a>:
+								<a class="help" href="', $scripturl, '?action=helpadmin;help=permissions_quickgroups" onclick="return reqOverlayDiv(this.href);"><img class="icon" src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" /></a>', $txt['permissions_apply_pre_defined'], ':
 							</dt>
 							<dd>
 								<select name="predefined">
@@ -207,8 +213,8 @@ function template_permission_index()
 			aSwapLinks: [
 				{
 					sId: \'permissions_panel_link\',
-					msgExpanded: ', JavaScriptEscape($txt['advanced']), ',
-					msgCollapsed: ', JavaScriptEscape($txt['advanced']), '
+					msgExpanded: ', JavaScriptEscape($txt['permissions_advanced_options']), ',
+					msgCollapsed: ', JavaScriptEscape($txt['permissions_advanced_options']), '
 				}
 			],
 			oThemeOptions: {
@@ -264,38 +270,40 @@ function template_by_board()
 	global $context, $settings, $options, $scripturl, $txt, $modSettings;
 
 	echo '
-	<form id="admincenter" action="', $scripturl, '?action=admin;area=permissions;sa=board" method="post" accept-charset="', $context['character_set'], '">
-		<div class="cat_bar">
-			<h3 class="catbg">', $txt['permissions_boards'], '</h3>
-		</div>
-		<div class="information">
-			', $txt['permissions_boards_desc'], '
-		</div>
-		<div class="title_bar">
-			<h3 id="board_permissions" class="titlebg flow_hidden">
-				<span class="perm_name floatleft">', $txt['board_name'], '</span>
-				<span class="perm_profile floatleft">', $txt['permission_profile'], '</span>
-			</h3>
-		</div>';
+	<div id="admincenter">
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=permissions;sa=board" method="post" accept-charset="', $context['character_set'], '">
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['permissions_boards'], '</h3>
+			</div>
+			<div class="information">
+				', $txt['permissions_boards_desc'], '
+			</div>
+			
+			<div class="title_bar">
+				<h3 id="board_permissions" class="titlebg flow_hidden">
+					<span class="perm_name floatleft">', $txt['board_name'], '</span>
+					<span class="perm_profile floatleft">', $txt['permission_profile'], '</span>';
 
 	if (!$context['edit_all'])
 		echo '
-			<div class="content flow_auto">
-			<a class="button_link" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>
+					<span class="floatright"><a class="button_link" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a></span>';
+	
+	echo '
+				</h3>
 			</div>';
-
+		
 	foreach ($context['categories'] as $category)
 	{
 		echo '
-		<div class="cat_bar">
-			<h3 class="catbg"><strong>', $category['name'], '</strong></h3>
-		</div>';
+			<div class="title_bar">
+				<h3 class="titlebg"><strong>', $category['name'], '</strong></h3>
+			</div>';
 
 		if (!empty($category['boards']))
 			echo '
-		<div class="windowbg">
-			<div class="content">
-				<ul class="perm_boards flow_hidden">';
+			<div class="windowbg">
+				<div class="content">
+					<ul class="perm_boards flow_hidden">';
 
 		$alternate = false;
 
@@ -305,54 +313,56 @@ function template_by_board()
 
 			echo '
 
-					<li class="flow_hidden' ,' windowbg', $alternate ? '' : '2','">
-						<span class="perm_board floatleft">
-							<a href="', $scripturl, '?action=admin;area=manageboards;sa=board;boardid=', $board['id'], ';rid=permissions;', $context['session_var'], '=', $context['session_id'], '">', str_repeat('-', $board['child_level']), ' ', $board['name'], '</a>
-						</span>
-						<span class="perm_boardprofile floatleft">';
+						<li class="flow_hidden' ,' windowbg', $alternate ? '' : '2','">
+							<span class="perm_board floatleft">
+								<a href="', $scripturl, '?action=admin;area=manageboards;sa=board;boardid=', $board['id'], ';rid=permissions;', $context['session_var'], '=', $context['session_id'], '">', str_repeat('-', $board['child_level']), ' ', $board['name'], '</a>
+							</span>
+							<span class="perm_boardprofile floatleft">';
+			
 			if ($context['edit_all'])
 			{
 				echo '
-							<select name="boardprofile[', $board['id'], ']">';
+								<select name="boardprofile[', $board['id'], ']">';
 
 				foreach ($context['profiles'] as $id => $profile)
 					echo '
-								<option value="', $id, '" ', $id == $board['profile'] ? 'selected="selected"' : '', '>', $profile['name'], '</option>';
+									<option value="', $id, '" ', $id == $board['profile'] ? 'selected="selected"' : '', '>', $profile['name'], '</option>';
 
 				echo '
-							</select>';
+								</select>';
 			}
 			else
 				echo '
-							<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $board['profile'], ';', $context['session_var'], '=', $context['session_id'], '"> [', $board['profile_name'], ']</a>';
+								<a href="', $scripturl, '?action=admin;area=permissions;sa=index;pid=', $board['profile'], ';', $context['session_var'], '=', $context['session_id'], '"> [', $board['profile_name'], ']</a>';
 
 			echo '
-						</span>
-					</li>';
+							</span>
+						</li>';
 		}
 
 		if (!empty($category['boards']))
 			echo '
-				</ul>
-			</div>
-		</div>';
+					</ul>
+				</div>
+			</div>';
 	}
 
 	echo '
-		<div class="content">';
+			<div class="content">';
 
 	if ($context['edit_all'])
 		echo '
-			<input type="submit" name="save_changes" value="', $txt['save'], '" class="button_submit" />';
+				<input type="submit" name="save_changes" value="', $txt['save'], '" class="button_submit" />';
 	else
 		echo '
-			<a class="button_link" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>';
+				<a class="button_link" href="', $scripturl, '?action=admin;area=permissions;sa=board;edit;', $context['session_var'], '=', $context['session_id'], '">', $txt['permissions_board_all'], '</a>';
 	
 	echo '
-			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
-			<input type="hidden" name="', $context['admin-mpb_token_var'], '" value="', $context['admin-mpb_token'], '" />
-		</div>
-	</form>';
+				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
+				<input type="hidden" name="', $context['admin-mpb_token_var'], '" value="', $context['admin-mpb_token'], '" />
+			</div>
+		</form>
+	</div>';
 }
 
 // Edit permission profiles (predefined).
@@ -361,10 +371,10 @@ function template_edit_profiles()
 	global $context, $settings, $options, $scripturl, $txt, $modSettings;
 
 	echo '
-	<div id="admincenter">
+	<div id="admin_form_wrapper">
 		<form action="', $scripturl, '?action=admin;area=permissions;sa=profiles" method="post" accept-charset="', $context['character_set'], '">
-			<div class="title_bar">
-				<h3 class="titlebg">', $txt['permissions_profile_edit'], '</h3>
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['permissions_profile_edit'], '</h3>
 			</div>
 
 			<table width="100%" class="table_grid">
@@ -485,7 +495,7 @@ function template_modify_group()
 
 	echo '
 	<div id="admincenter">
-		<form action="', $scripturl, '?action=admin;area=permissions;sa=modify2;group=', $context['group']['id'], ';pid=', $context['profile']['id'], '" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" id="permissionForm" onsubmit="return warnAboutDeny();">';
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=permissions;sa=modify2;group=', $context['group']['id'], ';pid=', $context['profile']['id'], '" method="post" accept-charset="', $context['character_set'], '" name="permissionForm" " onsubmit="return warnAboutDeny();">';
 
 	if (!empty($modSettings['permission_enable_deny']) && $context['group']['id'] != -1)
 		echo '
@@ -1059,10 +1069,10 @@ function template_postmod_permissions()
 	global $context, $settings, $options, $scripturl, $txt, $modSettings;
 
 	echo '
-	<div id="admincenter">
+	<div id="admin_form_wrapper">
 		<form action="', $scripturl, '?action=admin;area=permissions;sa=postmod;', $context['session_var'], '=', $context['session_id'], '" method="post" name="postmodForm" id="postmodForm" accept-charset="', $context['character_set'], '">
-			<div class="title_bar">
-				<h3 class="titlebg">', $txt['permissions_post_moderation'], '</h3>
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['permissions_post_moderation'], '</h3>
 			</div>';
 
 	// Got advanced permissions - if so warn!
@@ -1082,7 +1092,7 @@ function template_postmod_permissions()
 
 	echo '
 					</select>
-					<input type="submit" value="', $txt['go'], '" class="button_submit" style="margin-top: 5px;" />
+					<input type="submit" value="', $txt['go'], '" class="button_submit" />
 			</div>
 			<table width="100%" class="table_grid">
 				<thead>

+ 14 - 11
Themes/default/ManageSearch.template.php

@@ -16,7 +16,7 @@ function template_modify_weights()
 
 	echo '
 	<div id="admincenter">
-		<form action="', $scripturl, '?action=admin;area=managesearch;sa=weights" method="post" accept-charset="', $context['character_set'], '">
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=managesearch;sa=weights" method="post" accept-charset="', $context['character_set'], '">
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['search_weights'], '</h3>
 			</div>
@@ -94,13 +94,17 @@ function template_select_search_method()
 
 	echo '
 	<div id="admincenter">
-		<form action="', $scripturl, '?action=admin;area=managesearch;sa=method" method="post" accept-charset="', $context['character_set'], '">
+		<div class="cat_bar">
+			<h3 class="catbg">', $txt['search_method'], '</h3>
+		</div>
+		<div class="information">
+			<div class="smalltext" style="font-weight: normal;"><a href="', $scripturl, '?action=helpadmin;help=search_why_use_index" onclick="return reqOverlayDiv(this.href);">', $txt['search_create_index_why'], '</a></div>
+		</div>
+			
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=managesearch;sa=method" method="post" accept-charset="', $context['character_set'], '">
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['search_method'], '</h3>
 			</div>
-			<div class="information">
-				<div class="smalltext" style="font-weight: normal;"><a href="', $scripturl, '?action=helpadmin;help=search_why_use_index" onclick="return reqOverlayDiv(this.href);">', $txt['search_create_index_why'], '</a></div>
-			</div>
 			<div class="windowbg">
 				<div class="content">
 					<dl class="settings">
@@ -320,7 +324,7 @@ function template_spider_edit()
 	global $context, $settings, $options, $scripturl, $txt;
 	echo '
 	<div id="admincenter">
-		<form action="', $scripturl, '?action=admin;area=sengines;sa=editspiders;sid=', $context['spider']['id'], '" method="post" accept-charset="', $context['character_set'], '">
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=sengines;sa=editspiders;sid=', $context['spider']['id'], '" method="post" accept-charset="', $context['character_set'], '">
 			<div class="cat_bar">
 				<h3 class="catbg">', $context['page_title'], '</h3>
 			</div>
@@ -407,11 +411,10 @@ function template_show_spider_stats()
 	template_show_list('spider_stat_list');
 
 	echo '
-		<br />
-		<div class="cat_bar">
-			<h3 class="catbg">', $txt['spider_logs_delete'], '</h3>
-		</div>
-		<form action="', $scripturl, '?action=admin;area=sengines;sa=stats" method="post" accept-charset="', $context['character_set'], '">
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=sengines;sa=stats" method="post" accept-charset="', $context['character_set'], '">
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['spider_logs_delete'], '</h3>
+			</div>
 			<div class="windowbg">
 				<div class="content">
 					<p>

+ 26 - 29
Themes/default/Packages.template.php

@@ -530,42 +530,39 @@ function template_browse()
 	if ($context['sub_action'] == 'browse')
 	{
 		echo '
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a href="', $scripturl, '?action=helpadmin;help=latest_packages" onclick="return reqOverlayDiv(this.href);" class="help"><img class="icon" src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" /></a> ', $txt['packages_latest'], '
-			</h3>
-		</div>
-		<div class="windowbg2">
-			<div class="content">
-				<div id="packagesLatest">', $txt['packages_latest_fetch'], '</div>
+		<div id="admin_form_wrapper">
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<a href="', $scripturl, '?action=helpadmin;help=latest_packages" onclick="return reqOverlayDiv(this.href);" class="help"><img class="icon" src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" /></a> ', $txt['packages_latest'], '
+				</h3>
+			</div>
+			<div class="windowbg2">
+				<div class="content">
+					<div id="packagesLatest">', $txt['packages_latest_fetch'], '</div>
+				</div>
 			</div>
-		</div>
 
-		<script type="text/javascript"><!-- // --><![CDATA[
-			window.smfForum_scripturl = smf_scripturl;
-			window.smfForum_sessionid = smf_session_id;
-			window.smfForum_sessionvar = smf_session_var;';
+			<script type="text/javascript"><!-- // --><![CDATA[
+				window.smfForum_scripturl = smf_scripturl;
+				window.smfForum_sessionid = smf_session_id;
+				window.smfForum_sessionvar = smf_session_var;';
 
 		// Make a list of already installed mods so nothing is listed twice ;).
 		echo '
-			window.smfInstalledPackages = ["', implode('", "', $context['installed_mods']), '"];
-			window.smfVersion = "', $context['forum_version'], '";
-		// ]]></script>';
+				window.smfInstalledPackages = ["', implode('", "', $context['installed_mods']), '"];
+				window.smfVersion = "', $context['forum_version'], '";
+			// ]]></script>';
 
 		if (empty($modSettings['disable_smf_js']))
 			echo '
-		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=latest-packages.js"></script>';
+			<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=latest-packages.js"></script>';
 
 		echo '
-		<script type="text/javascript"><!-- // --><![CDATA[
-			var tempOldOnload;
-			smfSetLatestPackages();
-		// ]]></script>';
+			<script type="text/javascript"><!-- // --><![CDATA[
+				var tempOldOnload;
+				smfSetLatestPackages();
+			// ]]></script>
 
-		echo '
-		<br class="clear" />
-		<div class="cat_bar">
-			<h3 class="catbg">', $txt['browse_packages'], '</h3>
 		</div>';
 	}
 
@@ -581,7 +578,7 @@ function template_browse()
 
 	if (!$mods_available)
 		echo '
-		<div class="information">', $context['sub_action'] == 'browse' ? $txt['no_packages'] : $txt['no_mods_installed'], '</div>';
+		<div class="descbox">', $context['sub_action'] == 'browse' ? $txt['no_packages'] : $txt['no_mods_installed'], '</div>';
 
 	// the advanced (emulation) box, collapsed by default
 	echo '
@@ -679,7 +676,7 @@ function template_servers()
 					</div>';
 
 	echo '
-	<div id="admincenter">
+	<div id="admin_form_wrapper">
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['download_new_package'], '</h3>
 		</div>';
@@ -1497,7 +1494,7 @@ function template_file_permissions()
 	// ]]></script>';
 
 		echo '
-	<div class="information">
+	<div class="noticebox">
 		<div>
 			<strong>', $txt['package_file_perms_warning'], ':</strong>
 			<div class="smalltext">
@@ -1597,7 +1594,7 @@ function template_file_permissions()
 					', $txt['package_file_perms_ftp_details'], ':
 				</p>
 				', template_control_chmod(), '
-				<div class="information">', $txt['package_file_perms_ftp_retain'], '</div>';
+				<div class="descbox">', $txt['package_file_perms_ftp_retain'], '</div>';
 
 	echo '
 				<span id="test_ftp_placeholder_full"></span>

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

@@ -65,12 +65,12 @@ function template_summary()
 	// What about if we allow email only via the forum??
 	if ($context['member']['show_email'] === 'yes' || $context['member']['show_email'] === 'no_through_forum' || $context['member']['show_email'] === 'yes_permission_override' && $context['can_send_email'])
 		echo '
-					<li><a href="', $scripturl, '?action=emailuser;sa=email;uid=', $context['member']['id'], '" title="', $context['member']['show_email'] == 'yes' || $context['member']['show_email'] == 'yes_permission_override' ? $context['member']['email'] : '', '" rel="nofollow"><img src="', $settings['images_url'], '/email_sm.png" alt="', $txt['email'], '" /></a></li>';
+					<li><a href="', $scripturl, '?action=emailuser;sa=email;uid=', $context['member']['id'], '" title="', $context['member']['show_email'] == 'yes' || $context['member']['show_email'] == 'yes_permission_override' ? $context['member']['email'] : '', '" rel="nofollow"><img src="', $settings['images_url'], '/email_sm.png" alt="', $txt['email'], '" class="centericon" /></a></li>';
 
 	// Don't show an icon if they haven't specified a website.
 	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website']))
 		echo '
-					<li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/www_sm.png" alt="' . $context['member']['website']['title'] . '" />' : $txt['www']), '</a></li>';
+					<li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/www_sm.png" alt="' . $context['member']['website']['title'] . '" class="centericon" />' : $txt['www']), '</a></li>';
 
 	// Are there any custom profile fields for the summary?
 	if (!empty($context['custom_fields']))

+ 35 - 32
Themes/default/Register.template.php

@@ -507,10 +507,10 @@ function template_admin_register()
 
 	echo '
 	<div id="admincenter">
-		<div class="cat_bar">
-			<h3 class="catbg">', $txt['admin_browse_register_new'], '</h3>
-		</div>
-		<form class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '" name="postForm" id="postForm">
+		<form id="admin_form_wrapper" class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '" name="postForm" id="postForm">
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['admin_browse_register_new'], '</h3>
+			</div>
 			<div class="content" id="register_screen">';
 
 	if (!empty($context['registration_done']))
@@ -596,46 +596,49 @@ function template_edit_agreement()
 	global $context, $settings, $options, $scripturl, $txt;
 
 	// Just a big box to edit the text file ;).
-	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', $txt['registration_agreement'], '</h3>
-		</div>';
+echo '
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['registration_agreement'], '</h3>
+			</div>';
 
 	// Warning for if the file isn't writable.
 	if (!empty($context['warning']))
 		echo '
-		<p class="error">', $context['warning'], '</p>';
+			<p class="error">', $context['warning'], '</p>';
 
 	echo '
-		<div class="windowbg2" id="registration_agreement">
-			<div class="content">';
+			<div class="windowbg2" id="registration_agreement">
+				<div class="content">';
 
 	// Is there more than one language to choose from?
 	if (count($context['editable_agreements']) > 1)
 	{
 		echo '
-				<div class="information">
-					<form action="', $scripturl, '?action=admin;area=regcenter" id="change_reg" method="post" accept-charset="', $context['character_set'], '" style="display: inline;">
-						<strong>', $txt['admin_agreement_select_language'], ':</strong>&nbsp;
-						<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">';
+					<div class="cat_bar">
+						<h3 class="catbg">', $txt['language_configuration'], '</h3>
+					</div>
+					<div class="information">
+						<form action="', $scripturl, '?action=admin;area=regcenter" id="change_reg" method="post" accept-charset="', $context['character_set'], '" style="display: inline;">
+							<strong>', $txt['admin_agreement_select_language'], ':</strong>&nbsp;
+							<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">';
 
 		foreach ($context['editable_agreements'] as $file => $name)
 			echo '
-							<option value="', $file, '" ', $context['current_agreement'] == $file ? 'selected="selected"' : '', '>', $name, '</option>';
+								<option value="', $file, '" ', $context['current_agreement'] == $file ? 'selected="selected"' : '', '>', $name, '</option>';
 
 		echo '
-						</select>
-						<div class="righttext">
-							<input type="hidden" name="sa" value="agreement" />
-							<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
-							<input type="submit" name="change" value="', $txt['admin_agreement_select_language_change'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
-						</div>
-					</form>
-				</div>';
+							</select>
+							<div class="righttext">
+								<input type="hidden" name="sa" value="agreement" />
+								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
+								<input type="submit" name="change" value="', $txt['admin_agreement_select_language_change'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
+							</div>
+						</form>
+					</div>';
 	}
 
-	echo '
-				<form action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">';
+
 
 	// Show the actual agreement in an oversized text box.
 	echo '
@@ -653,9 +656,9 @@ function template_edit_agreement()
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 						<input type="hidden" name="', $context['admin-rega_token_var'], '" value="', $context['admin-rega_token'], '" />
 					</div>
-				</form>
+				</div>
 			</div>
-		</div>';
+		</form>';
 }
 
 function template_edit_reserved_words()
@@ -663,10 +666,10 @@ function template_edit_reserved_words()
 	global $context, $settings, $options, $scripturl, $txt;
 
 	echo '
-		<div class="cat_bar">
-			<h3 class="catbg">', $txt['admin_reserved_set'], '</h3>
-		</div>
-		<form id="registration_agreement" class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">
+		<form id="admin_form_wrapper" class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['admin_reserved_set'], '</h3>
+			</div>
 			<div class="content">
 				<h4>', $txt['admin_reserved_line'], '</h4>
 				<p class="reserved_names">

+ 140 - 126
Themes/default/Themes.template.php

@@ -17,152 +17,159 @@ function template_main()
 
 	echo '
 	<div id="admincenter">
-		<form action="', $scripturl, '?action=admin;area=theme;sa=admin" method="post" accept-charset="', $context['character_set'], '">
-			<div class="cat_bar">
-				<h3 class="catbg">
-					<a href="', $scripturl, '?action=helpadmin;help=themes" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a>
-					', $txt['themeadmin_title'], '
-				</h3>
-			</div>
-			<div class="information">
-				', $txt['themeadmin_explain'], '
-			</div>
-			<div class="windowbg2">
-				<div class="content">
-					<dl class="settings">
-						<dt>
-							<label for="options-theme_allow"> ', $txt['theme_allow'], '</label>
-						</dt>
-						<dd>
-							<input type="checkbox" name="options[theme_allow]" id="options-theme_allow" value="1"', !empty($modSettings['theme_allow']) ? ' checked="checked"' : '', ' class="input_check" />
-						</dd>
-						<dt>
-							<label for="known_themes_list">', $txt['themeadmin_selectable'], '</label>:
-						</dt>
-						<dd>
-							<div id="known_themes_list">';
+		<div class="cat_bar">
+			<h3 class="catbg">
+				<a href="', $scripturl, '?action=helpadmin;help=themes" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a>
+				', $txt['themeadmin_title'], '
+			</h3>
+		</div>
+		<div class="information">
+			', $txt['themeadmin_explain'], '
+		</div>
+		<div id="admin_form_wrapper">
+			<form action="', $scripturl, '?action=admin;area=theme;sa=admin" method="post" accept-charset="', $context['character_set'], '">
+				<div class="cat_bar">
+					<h3 class="catbg">',
+						$txt['settings'], '
+					</h3>
+				</div>
+				<div class="windowbg2">
+					<div class="content">
+						<dl class="settings">
+							<dt>
+								<label for="options-theme_allow"> ', $txt['theme_allow'], '</label>
+							</dt>
+							<dd>
+								<input type="checkbox" name="options[theme_allow]" id="options-theme_allow" value="1"', !empty($modSettings['theme_allow']) ? ' checked="checked"' : '', ' class="input_check" />
+							</dd>
+							<dt>
+								<label for="known_themes_list">', $txt['themeadmin_selectable'], '</label>:
+							</dt>
+							<dd>
+								<div id="known_themes_list">';
 	foreach ($context['themes'] as $theme)
 		echo '
-								<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked="checked"' : '', ' class="input_check" /> ', $theme['name'], '</label><br />';
+									<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked="checked"' : '', ' class="input_check" /> ', $theme['name'], '</label><br />';
 
 		echo '
-							</div>
-							<a href="javascript:void(0);" onclick="document.getElementById(\'known_themes_list\').style.display=\'block\'; document.getElementById(\'known_themes_link\').style.display = \'none\'; return false; " id="known_themes_link" style="display: none;">[ ', $txt['themeadmin_themelist_link'], ' ]</a>
-							<script type="text/javascript"><!-- // --><![CDATA[
-								document.getElementById("known_themes_list").style.display = "none";
-								document.getElementById("known_themes_link").style.display = "";
-							// ]]></script>
-						</dd>
-						<dt>
-							<label for="theme_guests">', $txt['theme_guests'], ':</label>
-						</dt>
-						<dd>
-							<select name="options[theme_guests]" id="theme_guests">';
+								</div>
+								<a href="javascript:void(0);" onclick="document.getElementById(\'known_themes_list\').style.display=\'block\'; document.getElementById(\'known_themes_link\').style.display = \'none\'; return false; " id="known_themes_link" style="display: none;">[ ', $txt['themeadmin_themelist_link'], ' ]</a>
+								<script type="text/javascript"><!-- // --><![CDATA[
+									document.getElementById("known_themes_list").style.display = "none";
+									document.getElementById("known_themes_link").style.display = "";
+								// ]]></script>
+							</dd>
+							<dt>
+								<label for="theme_guests">', $txt['theme_guests'], ':</label>
+							</dt>
+							<dd>
+								<select name="options[theme_guests]" id="theme_guests">';
 
 	// Put an option for each theme in the select box.
 	foreach ($context['themes'] as $theme)
 		echo '
-								<option value="', $theme['id'], '"', $modSettings['theme_guests'] == $theme['id'] ? ' selected="selected"' : '', '>', $theme['name'], '</option>';
+									<option value="', $theme['id'], '"', $modSettings['theme_guests'] == $theme['id'] ? ' selected="selected"' : '', '>', $theme['name'], '</option>';
 
 	echo '
-							</select>
-							<span class="smalltext pick_theme"><a href="', $scripturl, '?action=theme;sa=pick;u=-1;', $context['session_var'], '=', $context['session_id'], '">', $txt['theme_select'], '</a></span>
-						</dd>
-						<dt>
-							<label for="theme_reset">', $txt['theme_reset'], '</label>:
-						</dt>
-						<dd>
-							<select name="theme_reset" id="theme_reset">
-								<option value="-1" selected="selected">', $txt['theme_nochange'], '</option>
-								<option value="0">', $txt['theme_forum_default'], '</option>';
+								</select>
+								<span class="smalltext pick_theme"><a href="', $scripturl, '?action=theme;sa=pick;u=-1;', $context['session_var'], '=', $context['session_id'], '">', $txt['theme_select'], '</a></span>
+							</dd>
+							<dt>
+								<label for="theme_reset">', $txt['theme_reset'], '</label>:
+							</dt>
+							<dd>
+								<select name="theme_reset" id="theme_reset">
+									<option value="-1" selected="selected">', $txt['theme_nochange'], '</option>
+									<option value="0">', $txt['theme_forum_default'], '</option>';
 
 	// Same thing, this time for changing the theme of everyone.
 	foreach ($context['themes'] as $theme)
 		echo '
-								<option value="', $theme['id'], '">', $theme['name'], '</option>';
+									<option value="', $theme['id'], '">', $theme['name'], '</option>';
 
 	echo '
-							</select>
-							<span class="smalltext pick_theme"><a href="', $scripturl, '?action=theme;sa=pick;u=0;', $context['session_var'], '=', $context['session_id'], '">', $txt['theme_select'], '</a></span>
-						</dd>
-					</dl>
-					<input type="submit" name="save" value="' . $txt['save'] . '" class="button_submit" />
-					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
-					<input type="hidden" name="', $context['admin-tm_token_var'], '" value="', $context['admin-tm_token'], '" />
-					<input type="hidden" value="0" name="options[theme_allow]" />
+								</select>
+								<span class="smalltext pick_theme"><a href="', $scripturl, '?action=theme;sa=pick;u=0;', $context['session_var'], '=', $context['session_id'], '">', $txt['theme_select'], '</a></span>
+							</dd>
+						</dl>
+						<input type="submit" name="save" value="' . $txt['save'] . '" class="button_submit" />
+						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
+						<input type="hidden" name="', $context['admin-tm_token_var'], '" value="', $context['admin-tm_token'], '" />
+						<input type="hidden" value="0" name="options[theme_allow]" />
+					</div>
 				</div>
-			</div>
-		</form>';
+			</form>';
 
 	// Link to simplemachines.org for latest themes and info!
 	echo '
-		<br />
-		<div class="cat_bar">
-			<h3 class="catbg">
-				<a href="', $scripturl, '?action=helpadmin;help=latest_themes" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['theme_latest'], '
-			</h3>
-		</div>
-		<div class="windowbg">
-			<div class="content">
-				<div id="themeLatest">
-					', $txt['theme_latest_fetch'], '
+			<br />
+			<div class="cat_bar">
+				<h3 class="catbg">
+					<a href="', $scripturl, '?action=helpadmin;help=latest_themes" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['theme_latest'], '
+				</h3>
+			</div>
+			<div class="windowbg">
+				<div class="content">
+					<div id="themeLatest">
+						', $txt['theme_latest_fetch'], '
+					</div>
 				</div>
 			</div>
-		</div>
-		<br />';
+			<br />';
 
 	// Warn them if theme creation isn't possible!
 	if (!$context['can_create_new'])
 		echo '
-		<div class="errorbox">', $txt['theme_install_writable'], '</div>';
+			<div class="errorbox">', $txt['theme_install_writable'], '</div>';
 
 		echo '
-		<form action="', $scripturl, '?action=admin;area=theme;sa=install" method="post" accept-charset="', $context['character_set'], '" enctype="multipart/form-data" onsubmit="return confirm(\'', $txt['theme_install_new_confirm'], '\');">
 			<div class="cat_bar">
 				<h3 class="catbg">
 					<a href="', $scripturl, '?action=helpadmin;help=theme_install" onclick="return reqOverlayDiv(this.href);" class="help" id="theme_install"><img src="', $settings['images_url'], '/helptopics_hd.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['theme_install'], '
 				</h3>
 			</div>
-			<div class="windowbg">
-				<div class="content">
-					<dl class="settings">';
+			<form action="', $scripturl, '?action=admin;area=theme;sa=install" method="post" accept-charset="', $context['character_set'], '" enctype="multipart/form-data" onsubmit="return confirm(\'', $txt['theme_install_new_confirm'], '\');">
+				<div class="windowbg">
+					<div class="content">
+						<dl class="settings">';
 
 	// Here's a little box for installing a new theme.
 	// @todo Should the value="theme_gz" be there?!
 	if ($context['can_create_new'])
 		echo '
-						<dt>
-							<label for="theme_gz">', $txt['theme_install_file'], '</label>:
-						</dt>
-						<dd>
-							<input type="file" name="theme_gz" id="theme_gz" value="theme_gz" size="40" onchange="this.form.copy.disabled = this.value != \'\'; this.form.theme_dir.disabled = this.value != \'\';" class="input_file" />
-						</dd>';
+							<dt>
+								<label for="theme_gz">', $txt['theme_install_file'], '</label>:
+							</dt>
+							<dd>
+								<input type="file" name="theme_gz" id="theme_gz" value="theme_gz" size="40" onchange="this.form.copy.disabled = this.value != \'\'; this.form.theme_dir.disabled = this.value != \'\';" class="input_file" />
+							</dd>';
 
 	echo '
-						<dt>
-							<label for="theme_dir">', $txt['theme_install_dir'], '</label>:
-						</dt>
-						<dd>
-							<input type="text" name="theme_dir" id="theme_dir" value="', $context['new_theme_dir'], '" size="40" style="width: 70%;" class="input_text" />
-						</dd>';
+							<dt>
+								<label for="theme_dir">', $txt['theme_install_dir'], '</label>:
+							</dt>
+							<dd>
+								<input type="text" name="theme_dir" id="theme_dir" value="', $context['new_theme_dir'], '" size="40" style="width: 70%;" class="input_text" />
+							</dd>';
 
 	if ($context['can_create_new'])
 		echo '
-						<dt>
-							<label for="copy">', $txt['theme_install_new'], ':</label>
-						</dt>
-						<dd>
-							<input type="text" name="copy" id="copy" value="', $context['new_theme_name'], '" size="40" class="input_text" />
-						</dd>';
+							<dt>
+								<label for="copy">', $txt['theme_install_new'], ':</label>
+							</dt>
+							<dd>
+								<input type="text" name="copy" id="copy" value="', $context['new_theme_name'], '" size="40" class="input_text" />
+							</dd>';
 
 	echo '
-					</dl>
-					<input type="submit" name="save" value="', $txt['theme_install_go'], '" class="button_submit" />
-					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
-					<input type="hidden" name="', $context['admin-tm_token_var'], '" value="', $context['admin-tm_token'], '" />
+						</dl>
+						<input type="submit" name="save" value="', $txt['theme_install_go'], '" class="button_submit" />
+						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
+						<input type="hidden" name="', $context['admin-tm_token_var'], '" value="', $context['admin-tm_token'], '" />
+					</div>
 				</div>
-			</div>
-		</form>
+			</form>
+		</div>
 	</div>
 
 	<script type="text/javascript"><!-- // --><![CDATA[
@@ -194,7 +201,13 @@ function template_list_themes()
 		</div>
 		<div class="information">
 			', $txt['themeadmin_list_tip'], '
-		</div>';
+		</div>
+		
+		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=theme;', $context['session_var'], '=', $context['session_id'], ';sa=list" method="post" accept-charset="', $context['character_set'], '">
+			<div class="cat_bar">
+				<h3 class="catbg">', $txt['theme_settings'], '</h3>
+			</div>
+			<br />';
 
 	// Show each theme.... with X for delete and a link to settings.
 	foreach ($context['themes'] as $theme)
@@ -227,8 +240,6 @@ function template_list_themes()
 	}
 
 	echo '
-
-		<form action="', $scripturl, '?action=admin;area=theme;', $context['session_var'], '=', $context['session_id'], ';sa=list" method="post" accept-charset="', $context['character_set'], '">
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['themeadmin_list_reset'], '</h3>
 			</div>
@@ -269,7 +280,8 @@ function template_reset_list()
 		</div>
 		<div class="information">
 			', $txt['themeadmin_reset_tip'], '
-		</div>';
+		</div>
+		<div id="admin_form_wrapper">';
 
 	// Show each theme.... with X for delete and a link to settings.
 	$alternate = false;
@@ -279,27 +291,28 @@ function template_reset_list()
 		$alternate = !$alternate;
 
 		echo '
-		<div class="title_bar">
-			<h3 class="titlebg">', $theme['name'], '</h3>
-		</div>
-		<div class="windowbg', $alternate ? '' : '2','">
-			<div class="content">
-				<ul class="reset">
-					<li>
-						<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset">', $txt['themeadmin_reset_defaults'], '</a> <em class="smalltext">(', $theme['num_default_options'], ' ', $txt['themeadmin_reset_defaults_current'], ')</em>
-					</li>
-					<li>
-						<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset;who=1">', $txt['themeadmin_reset_members'], '</a>
-					</li>
-					<li>
-						<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset;who=2;', $context['admin-stor_token_var'], '=', $context['admin-stor_token'], '" onclick="return confirm(\'', $txt['themeadmin_reset_remove_confirm'], '\');">', $txt['themeadmin_reset_remove'], '</a> <em class="smalltext">(', $theme['num_members'], ' ', $txt['themeadmin_reset_remove_current'], ')</em>
-					</li>
-				</ul>
+			<div class="title_bar">
+				<h3 class="titlebg">', $theme['name'], '</h3>
 			</div>
-		</div>';
+			<div class="windowbg', $alternate ? '' : '2','">
+				<div class="content">
+					<ul class="reset">
+						<li>
+							<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset">', $txt['themeadmin_reset_defaults'], '</a> <em class="smalltext">(', $theme['num_default_options'], ' ', $txt['themeadmin_reset_defaults_current'], ')</em>
+						</li>
+						<li>
+							<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset;who=1">', $txt['themeadmin_reset_members'], '</a>
+						</li>
+						<li>
+							<a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=reset;who=2;', $context['admin-stor_token_var'], '=', $context['admin-stor_token'], '" onclick="return confirm(\'', $txt['themeadmin_reset_remove_confirm'], '\');">', $txt['themeadmin_reset_remove'], '</a> <em class="smalltext">(', $theme['num_members'], ' ', $txt['themeadmin_reset_remove_current'], ')</em>
+						</li>
+					</ul>
+				</div>
+			</div>';
 	}
 
 	echo '
+		</div>
 	</div>';
 }
 
@@ -408,13 +421,14 @@ function template_set_settings()
 	global $context, $settings, $options, $scripturl, $txt;
 
 	echo '
-	<div id="admincenter">
+	<div id="admin_form_wrapper">
 		<form action="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['theme_settings']['theme_id'], '" method="post" accept-charset="', $context['character_set'], '">
-			<div class="title_bar">
-				<h3 class="titlebg">
+			<div class="cat_bar">
+				<h3 class="catbg">
 					<a href="', $scripturl, '?action=helpadmin;help=theme_settings" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" class="icon" /></a> ', $txt['theme_settings'], ' - ', $context['theme_settings']['name'], '
 				</h3>
-			</div>';
+			</div>
+			<br />';
 
 	// @todo Why can't I edit the default theme popup.
 	if ($context['theme_settings']['theme_id'] != 1)
@@ -747,7 +761,7 @@ function template_edit_list()
 	global $context, $settings, $options, $scripturl, $txt;
 
 	echo '
-	<div id="admincenter">
+	<div id="admin_form_wrapper">
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['themeadmin_edit_title'], '</h3>
 		</div>

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

@@ -38,7 +38,7 @@ body.action_admin .navigate_section ul li a {
 
 /* Common admin center classes.
 ------------------------------------------------------- */
-/* [WIP]
+/* @todo
 /* The CSS targeting for all this gets a bit convoluted and requires a good clean up.
 /* It's left over from when I started theming admin independently over a Curve forum.
 /* Can be simplified quite a lot before production builds. */
@@ -78,7 +78,7 @@ body.action_admin .navigate_section ul li a {
 	border: 1px solid #ddd;
 	border-top: none;
 	border-radius: 0 0 7px 7px;
-	margin: 0 0 0 0;
+	margin: -1px 0 12px 0;
 	padding: 12px 9px 8px 9px;
 }
 .action_admin p.description a {
@@ -228,7 +228,6 @@ div.quick_tasks {
 .action_admin .table_grid tr:nth-child(odd) td {
 	background: #f8f8f8;
 }
-/*-------------------------------------------*/
 
 /* Newsletters screen.
 ---------------------------------------------*/
@@ -566,11 +565,12 @@ div.quick_tasks {
 	margin: 0 12px 0 0;
 }
 .features_switch {
+	margin: -20px 0 6px 6px;
 	float: right;
 }
 .features h4 {
 	padding: 0;
-	margin-top: 6px;
+	margin: 0 6px 0 105px;
 	font-size: 1.1em;
 	overflow: hidden;
 	white-space: pre;
@@ -729,6 +729,10 @@ pre.file_content {
 	padding: 8px 16px 4px 16px;
 	color: #444;
 }
+#manage_boards .cat_bar .catbg {
+	border: none;
+	border-bottom: 1px solid #bbb;
+}
 #manage_boards .catbg a {
 	color: #346;
 }
@@ -873,7 +877,6 @@ dl.right dt {
 	padding: 6px 30px;
 	margin: 0 0 6px 0;
 }
-/* Didn't get any further last night. */
 
 /* Styles for the manage calendar section.
 ------------------------------------------------- */

+ 72 - 60
Themes/default/css/index.css

@@ -1,4 +1,4 @@
-/* Styles for the general looks for the Curve theme.
+/* Styles for the general looks for the Curve II theme.
 ------------------------------------------------------- */
 
 /* Normal, standard links. */
@@ -62,7 +62,7 @@ p, ul, ol, li, dl, dd ,dt, fieldset, form {
 }
 
 /* Set list-style to none by default. Best in most places.*/
-ul, ol, li {
+ul, ol {
 	list-style: none;
 }
 
@@ -87,6 +87,7 @@ ul.reset, ul.reset li {
 /* Thought it made sense to declare box-sizing here too. */
 input, button, select, textarea, textarea.editor {
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+	font: 83.33%/150% "Segoe UI", "Helvetica Neue", "Liberation Sans", "Nimbus Sans L", Arial, sans-serif;
 	background: #fff;
 	outline: none !important;
 	border: 1px solid #bbb;
@@ -135,9 +136,7 @@ input:focus, textarea:focus, button:focus, select:focus, textarea.editor:focus {
 	border-bottom: 1px solid #aaa;
 	border-radius: 1px;
 	box-shadow: 1px 1px 1px rgba(0,0,0,0.1);
-/*	font-weight: bold;*/
-/*	color: #444;*/
-	/* [WIP]*/
+	/* @todo */
 	-moz-transition: all 0.05s linear 0.05s;
 }
 .button_submit:hover, .button_reset:hover, .button_link:hover {
@@ -147,18 +146,14 @@ input:focus, textarea:focus, button:focus, select:focus, textarea.editor:focus {
 	border-left: 1px solid #bbb;
 	border-top: 1px solid #aaa;
 	box-shadow: -1px -1px 2px rgba(0,0,0,0.07), -1px -2px 4px rgba(255,255,255,0.33) inset;
-	/* [WIP]*/
+	/* @todo */
 	-moz-transition: all 0.05s linear 0.05s;
 }
-/*.button_link {
-	padding: 4px 5px 4px 4px;
-	font: 95%/115% verdana, Helvetica, sans-serif;
-	float: right;
-	border-radius: 3px;
-}*/
 a.button_link {
-	color: #333;
+	color: #000;
+	padding: 1px 5px;
 	margin: 0 !important;
+	font-size: 0.9em;
 }
 .button_link:hover {
 	text-decoration: none;
@@ -178,7 +173,7 @@ span.new_posts {
 	margin: 0 5px 0 -2px;
 	padding: 0 4px 1px 4px;
 	font-size: 9px;
-	font-family: verdana, sans-serif; /*[WIP] Might add extra fallbacks. Possibly monospace. */
+	font-family: verdana, sans-serif; /* @todo Might add extra fallbacks. Possibly monospace. */
 	box-shadow: 1px 2px 2px rgba(0,0,0,0.1), 0 -2px 4px rgba(0,0,0,0.1) inset;
 }
 a span.new_posts:hover {
@@ -408,9 +403,7 @@ em {
 }
 .bbc_list {
 	text-align: left;
-}
-.bbc_list li {
-	list-style: inside;
+	padding: 0 0 0 35px;
 	list-style-type: inherit;
 }
 .bbc_tt {
@@ -551,7 +544,7 @@ div.pagesection div.floatright input, div.pagesection div.floatright select {
 	padding: 2px 7px 1px 7px;
 	margin: 5px 8px 0 0;
 	color: #222;
-	/* [WIP]*/
+	/* @todo*/
 	-moz-transition: all 0.05s linear 0.05s;
 }
 .topbottom:hover {
@@ -563,29 +556,11 @@ div.pagesection div.floatright input, div.pagesection div.floatright select {
 	border-left: 1px solid #bbb;
 	border-top: 1px solid #aaa;
 	box-shadow: -1px -1px 2px rgba(0,0,0,0.07), -1px -2px 4px rgba(255,255,255,0.33) inset;
-	/* [WIP]*/
+	/* @todo*/
 	-moz-transition: all 0.05s linear 0.05s;
 }
 
-/* Colors for background of posts requiring approval */
-.approvebg {
-	color: #222;
-	background: #ffeaea;
-}
-.approvebg2 {
-	color: #222;
-	background: #fff2f2;
-}
 
-/* Color for background of *topics* requiring approval */
-.approvetbg {
-	color: #222;
-	background: #e4a17c;
-}
-.approvetbg2 {
-	color: #222;
-	background: #f3bd9f;
-}
 
 /* Sticky topics get a different background */
 .stickybg {
@@ -779,7 +754,7 @@ dl.settings dt a img {
 h3.catbg, h3.catbg2, h3.titlebg, h4.titlebg, h4.catbg {
 	overflow: hidden;
 	font-size: 1.1em;
-	font-family: tahoma;/*[WIP]*/
+	font-family: tahoma;/* @todo */
 	font-weight: bold;
 	line-height: 1.5em;
 	padding: 8px;
@@ -792,7 +767,7 @@ h3.catbg2 a, h3.catbg2 {
 }
 h3.catbg a:hover, h4.catbg a:hover, .table_list tbody.header td a:hover {
 	color: #ffc178;
-	text-shadow: -1px -1px 0 rgba(0,0,0,0.5);
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.4);
 	text-decoration: none;
 }
 h3.catbg2 a:hover {
@@ -837,7 +812,7 @@ div.cat_bar {
 	padding: 0;
 	border-radius: 6px 6px 0 0;
 	box-shadow: 0 16px 20px rgba(255,255,255,0.15) inset;
-	text-shadow: -1px -1px 1px rgba(0,0,0,0.4)
+	text-shadow: -1px -1px 1px rgba(0,0,0,0.2)
 }
 /* Message index board descriptions*/
 .description_header {
@@ -850,7 +825,7 @@ div.title_bar {
 	background: #c5cfd9 url(../images/theme/bars.png) 0 -340px repeat-x;
 }
 
-/* Info center title bars are a bit different. *//* [WIP] */
+/* Info center title bars are a bit different. */ /* @todo */
 /*div.title_barIC {
 	background: #dde3e9 url(../images/theme/bars.png) 0 0 repeat-x;
 }*/
@@ -921,7 +896,7 @@ img.sort {
 }
 
 /* Used for sections that need somewhat larger corners.
------------------------------------------------------------ *//* [WIP] */
+----------------------------------------------------------- */ /* @todo */
 .roundframe {
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 	margin: 2px 0 0 0;
@@ -983,7 +958,7 @@ img.sort {
 	float: left;
 	width: 100%;
 	position: relative; /* WTF is this relative for? Hmmmm.*/
-	-moz-box-sizing: border-box;
+	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 }
 /* Level 1 button background. */
 .dropmenu li {
@@ -1054,7 +1029,7 @@ img.sort {
 	position: absolute;
 	top: 2.25em;
 	left: -9999px;
-	width: 16em;
+	width: 17em;
 	padding: 5px 0 7px 0;
 	font-weight: normal;
 	background: #fff url(../images/theme/bars.png) 0 -580px repeat-x;
@@ -1237,13 +1212,13 @@ div#admin_menu {
 /*	font-weight: bold;*/
 	color: #444;
 	font-size: 0.8em;
-	/* [WIP]*/
+	/* @todo*/
 	-moz-transition: all 0.05s linear 0.05s;
 }
 /* Keep a consistent size when wrapped in pagesection. */
 .pagesection .buttonlist ul li a {
 	font-size: 0.889em;
-	/* [WIP]*/
+	/* @todo*/
 	-moz-transition: all 0.05s linear 0.05s;
 }
 .buttonlist ul li a:hover {
@@ -1254,7 +1229,7 @@ div#admin_menu {
 	border-left: 1px solid #bbb;
 	border-top: 1px solid #aaa;
 	box-shadow: -1px -1px 2px rgba(0,0,0,0.07), -1px -2px 4px rgba(255,255,255,0.33) inset;
-	/* [WIP]*/
+	/* @todo*/
 	-moz-transition: all 0.05s linear 0.05s;
 }
 .buttonlist ul li a span {
@@ -1273,12 +1248,12 @@ div#admin_menu {
 	border-left: 1px solid #bbb;
 	border-top: 1px solid #354f64;
 	box-shadow: -1px -1px 2px rgba(0,0,0,0.1), -1px -2px 3px rgba(255,255,255,0.3) inset, 1px 2px 3px rgba(0,0,0,0.1) inset;
-	/* [WIP]*/
+	/* @todo*/
 	-moz-transition: all 0.05s linear 0.05s;
 }
 .buttonlist ul li a.active:hover {
 	color: #ffc187;
-	/* [WIP]*/
+	/* @todo*/
 	-moz-transition: all 0.05s linear 0.05s;
 }
 .align_top ul li a, .align_bottom ul li a {
@@ -1359,7 +1334,7 @@ div#admin_menu {
 	background: #fff url(../images/theme/lower_section.png) 0 45% repeat-x;
 	color: #333;
 }
-/* [WIP] In practice it may be better to set a different value for Firefox and Opera only, */
+/* @todo In practice it may be better to set a different value for Firefox and Opera only, */
 /*	just to save a little bit of code. Will wait for Opera detection on body tag. */
 #ie #search_form .button_submit, #chrome #search_form .button_submit {
 	padding: 3px 5px;
@@ -1508,6 +1483,7 @@ img#upshrink {
 }
 .navigate_section ul li .dividers {
 	color: #3f6b8c;
+	font: 83.33%/150% Arial,sans-serif;
 	text-shadow: -2px -1px 0 rgba(0,0,0,0.4), -1px -1px 0 rgba(0,0,0,0.4), -2px 1px 0 rgba(0,0,0,0.4);
 }
 
@@ -1955,7 +1931,7 @@ p#whoisviewing {
 }
 /* poster and postarea + moderation area underneath */
 /* Need to sort the overflow on the post backgrounds. */
-#forumposts .windowbg, #forumposts .windowbg2 {
+#forumposts .windowbg, #forumposts .windowbg2, #forumposts .approvebg, #forumposts .approvebg2 {
 	overflow: visible;
 	float: left;
 	width: 100%;
@@ -1984,7 +1960,7 @@ p#whoisviewing {
 	display: block;
 }
 /* Nifty new flyout menu for the poster info. */
-/* [WIP] Can probably clean up the CSS here a bit. */
+/* @todo Can probably clean up the CSS here a bit. */
 /* Check inheritance with font size in the dropdown. */
 .poster .dropmenu {
 	padding: 0 0 0 0;
@@ -2244,7 +2220,7 @@ ul.quickbuttons li.inline_mod_check {
 	color: /*#492700*/ #222;
 	margin: 3px 19px;
 	overflow: visible;
-	/* [WIP] */
+	/* @todo */
 	-moz-transition: all 0.1s linear 0.05s;
 }
 .quickbuttons li:first-child {
@@ -2257,7 +2233,7 @@ ul.quickbuttons li.inline_mod_check {
 	border: 1px solid #ccc;
 	border-left: 1px solid #bbb;
 	border-top: 1px solid #aaa;
-	/* [WIP] */
+	/* @todo */
 	-moz-transition: all 0.1s linear 0.05s;
 }
 .quickbuttons li.quick_edit, .quickbuttons li.post_options {
@@ -2331,7 +2307,7 @@ ul.quickbuttons li.inline_mod_check {
 /*-------------------------------------*/
 /* The new little droppy off the "More.." button. */
 /* This should probably be Superfished for production, but transitions were fun to play with in testing. */
-	/* [WIP] */
+	/* @todo */
 .quickbuttons li.post_options ul {
 	opacity: 0;
 	z-index: -1;
@@ -2456,7 +2432,12 @@ ul.post_options li {
 	padding: 0;
 	padding: 6px;
 }
-#postAttachment dd, #postAttachment2 dd {
+#postAttachment dd {
+	margin: 4px 0 4px 12px;
+	width: 45%;
+	float: left;
+}
+#postAttachment2 dd {
 	margin: 4px 0 4px 12px;
 }
 #postAttachment dt, #postAttachment2 dt {
@@ -2913,6 +2894,13 @@ tr.windowbg td, tr.windowbg2 td, tr.approvebg td, tr.highlight2 td {
 	padding: 7px 10px 7px 35px;
 	margin-bottom: 12px;
 }
+.descbox  {
+	text-align: left;
+	padding: 7px 10px 7px 35px;
+	border: 1px solid #c5c5c5;
+	border-radius: 7px;
+	margin: 6px 0;
+}
 
 /* Styles for the profile section.
 ------------------------------------------------- */
@@ -3843,7 +3831,7 @@ span.hidelink {
 /* Forum posts may require some special treatment for dealing with clearing floated content. */
 /* Suspect it will be necessary to use float: left; width: 100%; on the windowbg and windowbg2 divs. */
 
-#forumposts .windowbg, #forumposts .windowbg2, #statistics .flow_hidden {
+#forumposts .windowbg, #forumposts .windowbg2, #statistics .flow_hidden, #forumposts .approvebg, #forumposts .approvebg2 {
 	background: /*#e8eff5;*/#f0f4f7;
 	margin: 12px 0 0 0;
 	padding: 8px 8px 16px 8px;
@@ -3890,6 +3878,9 @@ span.hidelink {
 	overflow: auto;
 	-moz-box-sizing: border-box; box-sizing: border-box; -webkit-box-sizing: border-box;
 }
+.generic_list_wrapper {
+	margin-top: -5px;
+}
 .generic_list_wrapper .title_bar{
 	background: none;
 	border-bottom: 1px solid #fff;
@@ -3902,10 +3893,13 @@ span.hidelink {
 }
 .generic_list_wrapper .additional_row {
 	margin: 0;
-	padding: 0;
-	border-bottom: 1px solid #aaa;
+	padding: 5px 0;
+	border-top: 1px solid #aaa;
 	border-radius: 0;
 }
+.generic_list_wrapper .information .additional_row{
+	border: none;
+}
 .generic_list_wrapper .information {
 	margin: 0;
 	padding: 0;
@@ -3949,7 +3943,7 @@ span.hidelink {
 .action_recent #recent .quickbuttons {
 	margin-top: 8px;
 }
-/* [WIP] Some odd inheritance glitch here with font-size. Check it out. */
+/* @todo Some odd inheritance glitch here with font-size. Check it out. */
 .topic_details .smalltext {
 	font-size: 0.9em;
 }
@@ -4065,3 +4059,21 @@ tr.catbg th:last-child, #show_attachments th:last-child {
 .table_grid td.whos_viewing {
 	font-size: 0.9em;
 }
+/* Colors for background of posts requiring approval */
+#forumposts .approvebg {
+	color: #222;
+	background: #ffeaea;
+}
+#forumposts .approvebg2 {
+	color: #222;
+	background: #fff2f2;
+}
+/* Color for background of *topics* requiring approval */
+.approvetbg {
+	color: #222;
+	background: #e4a17c;
+}
+.approvetbg2 {
+	color: #222;
+	background: #f3bd9f;
+}

+ 1 - 0
Themes/default/languages/Admin.english.php

@@ -637,6 +637,7 @@ $txt['admin_search_section_sections'] = 'Section';
 $txt['admin_search_section_settings'] = 'Setting';
 
 $txt['core_settings_title'] = 'Core Features';
+$txt['core_settings_desc'] = 'This page allows you to turn on or off optional features of your forum.';
 $txt['mods_cat_features'] = 'General';
 $txt['mods_cat_security_general'] = 'General';
 $txt['antispam_title'] = 'Anti-Spam';