Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of git@github.com:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #165 from Spuds/clearcleaning

Some very basic cleaning of templates for new theme css
emanuele45 12 years ago
parent
dfc7ad2de1 165261f10f
commit
50ff1a3056
32 changed files with 339 additions and 417 deletions
Split View Show Diff Stats
  1. 6 4
      Themes/default/Admin.template.php
  2. 6 4
      Themes/default/Errors.template.php
  3. 1 3
      Themes/default/GenericMenu.template.php
  4. 3 2
      Themes/default/Login.template.php
  5. 3 8
      Themes/default/ManageAttachments.template.php
  6. 1 5
      Themes/default/ManageBans.template.php
  7. 1 3
      Themes/default/ManageCalendar.template.php
  8. 38 42
      Themes/default/ManageLanguages.template.php
  9. 6 9
      Themes/default/ManageMaintenance.template.php
  10. 2 6
      Themes/default/ManageMembergroups.template.php
  11. 1 1
      Themes/default/ManageMembers.template.php
  12. 4 5
      Themes/default/ManageNews.template.php
  13. 12 15
      Themes/default/ManagePaid.template.php
  14. 9 18
      Themes/default/ManagePermissions.template.php
  15. 1 2
      Themes/default/ManageScheduledTasks.template.php
  16. 8 19
      Themes/default/ManageSearch.template.php
  17. 9 17
      Themes/default/ManageSmileys.template.php
  18. 3 2
      Themes/default/Memberlist.template.php
  19. 9 18
      Themes/default/ModerationCenter.template.php
  20. 0 1
      Themes/default/MoveTopic.template.php
  21. 19 33
      Themes/default/Packages.template.php
  22. 7 11
      Themes/default/PersonalMessage.template.php
  23. 1 2
      Themes/default/Poll.template.php
  24. 4 3
      Themes/default/Profile.template.php
  25. 1 1
      Themes/default/Recent.template.php
  26. 27 22
      Themes/default/Register.template.php
  27. 12 11
      Themes/default/Reminder.template.php
  28. 19 18
      Themes/default/Search.template.php
  29. 10 12
      Themes/default/SendTopic.template.php
  30. 73 73
      Themes/default/SplitTopics.template.php
  31. 24 41
      Themes/default/Themes.template.php
  32. 19 6
      Themes/default/css/index.css

+ 6 - 4
Themes/default/Admin.template.php
View File 

@@ -296,7 +296,8 @@ function template_credits()
 
 
 		if (isset($section['posttext']))
 
 			echo '
 
-					<hr /><p>', $section['posttext'], '</p>';
 
+					<hr />
 
+					<p>', $section['posttext'], '</p>';
 
 	}
 
 
 	echo '
 
@@ -680,7 +681,7 @@ function template_not_done()
 
 
 	if (!empty($context['substep_enabled']))
 
 		echo '
 
-					<div class="progress_bar">
 
+				<div class="progress_bar">
 
 					<div class="full_bar">', $context['substep_title'], ' (', $context['substep_continue_percent'], '%)</div>
 
 					<div class="blue_percent" style="width: ', $context['substep_continue_percent'], '%;">&nbsp;</div>
 
 				</div>';
 
@@ -1218,7 +1219,7 @@ function template_admin_search_results()
 
 						<input type="submit" name="search_go" value="', $txt['admin_search_results_again'], '" class="button_submit" />
 
 					</form>
 
 				</object>
 
-				<img src="' . $settings['images_url'] . '/buttons/search.png" alt="" />&nbsp;', sprintf($txt['admin_search_results_desc'], $context['search_term']), '
 
+				<img class="icon" src="' . $settings['images_url'] . '/buttons/search.png" alt="" />&nbsp;', sprintf($txt['admin_search_results_desc'], $context['search_term']), '
 
 			</h3>
 
 		</div>
 
 	<div class="windowbg2 generic_list_wrapper">
 
@@ -1619,7 +1620,8 @@ function template_php_info()
 
 		}
 
 		echo '
 
 		</tbody>
 
-	</table><br />';
 
+	</table>
 
+	<br />';
 
 	}
 
 
 	echo '

+ 6 - 4
Themes/default/Errors.template.php
View File 

@@ -36,7 +36,9 @@ function template_fatal_error()
 
 
 	// Show a back button (using javascript.)
 
 	echo '
 
-	<div class="centertext"><a href="javascript:history.go(-1)">', $txt['back'], '</a></div>';
 
+	<div class="centertext">
 
+		<a class="button_link" style="float:none" href="javascript:history.go(-1)">', $txt['back'], '</a>
 
+	</div>';
 
 }
 
 
 function template_error_log()
 
@@ -191,14 +193,14 @@ function template_show_file()
 
 		<link rel="stylesheet" type="text/css" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css?alp21" />
 
 	</head>
 
 	<body>
 
-		<table border="0" cellpadding="0" cellspacing="3">';
 
+		<table class="errorfile_table">';
 
 	foreach ($context['file_data']['contents'] as $index => $line)
 
 	{
 
-		$line_num = $index+$context['file_data']['min'];
 
+		$line_num = $index + $context['file_data']['min'];
 
 		$is_target = $line_num == $context['file_data']['target'];
 
 		echo '
 
 			<tr>
 
-				<td align="right"', $is_target ? ' style="font-weight: bold; border: 1px solid black;border-width: 1px 0 1px 1px;">==&gt;' : '>', $line_num , ':</td>
 
+				<td align="right"', $is_target ? ' class="current">==&gt;' : '>', $line_num , ':</td>
 
 				<td style="white-space: nowrap;', $is_target ? ' border: 1px solid black;border-width: 1px 1px 1px 0;':'','">', $line, '</td>
 
 			</tr>';
 
 	}

+ 1 - 3
Themes/default/GenericMenu.template.php
View File 

@@ -16,11 +16,9 @@ function template_generic_menu_sidebar_above()
 
 	global $context, $settings, $options, $scripturl, $txt, $modSettings;
 
 
 	// This is the main table - we need it so we can keep the content to the right of it.
 
-	// [WIP] Why is there a span id="admin_menu"? #admin_menu is also the div that wraps the drop menu system.
 
-	// Is this some bonkers leftover span from 2.0 beta days? It has no content and is not listed in the CSS.
 
 	echo '
 
 	<div id="main_container">
 
-		<div id="left_admsection"><span id="admin_menu"></span>';
 
+		<div id="left_admsection">';
 
 
 	// What one are we rendering?
 
 	$context['cur_menu_id'] = isset($context['cur_menu_id']) ? $context['cur_menu_id'] + 1 : 1;

+ 3 - 2
Themes/default/Login.template.php
View File 

@@ -25,7 +25,7 @@ function template_login()
 
 					<img src="', $settings['images_url'], '/icons/login_sm.png" alt="" class="icon" /> ', $txt['login'], '
 
 				</h3>
 
 			</div>
 
-			<div class="roundframe"><br class="clear" />';
 
+			<div class="roundframe">';
 
 
 	// Did they make a mistake last time?
 
 	if (!empty($context['login_errors']))
 
@@ -186,7 +186,8 @@ function template_maintenance()
 
 				<dt>', $txt['always_logged_in'], ':</dt>
 
 				<dd><input type="checkbox" name="cookieneverexp" class="input_check" /></dd>
 
 			</dl>
 
-			<p class="centertext"><input type="submit" value="', $txt['login'], '" class="button_submit" /></p>
 
+			<input type="submit" value="', $txt['login'], '" class="button_submit" />
 
+			<br class="clear" />
 
 		</div>
 
 		<input type="hidden" name="hash_passwrd" value="" />
 
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />

+ 3 - 8
Themes/default/ManageAttachments.template.php
View File 

@@ -52,8 +52,6 @@ function template_browse()
 
 	</div>';
 
 
 	template_show_list('file_list');
 
-	echo '
 
-	<br class="clear" />';
 
 
 }
 
 
@@ -76,7 +74,7 @@ function template_maintenance()
 
 				</dl>
 
 			</div>
 
 		</div>
 
-		<br class="clear" />
 
+
 
 		<div class="cat_bar">
 
 			<h3 class="catbg">', $txt['attachment_integrity_check'], '</h3>
 
 		</div>
 
@@ -90,7 +88,7 @@ function template_maintenance()
 
 				</form>
 
 			</div>
 
 		</div>
 
-		<br class="clear" />
 
+		
 		<div class="cat_bar">
 
 			<h3 class="catbg">', $txt['attachment_pruning'], '</h3>
 
 		</div>
 
@@ -122,12 +120,10 @@ function template_maintenance()
 
 					<input type="hidden" name="type" value="avatars" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="sa" value="byAge" />
 
-					<br class="clear_right" />
 
 				</form>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_attachment_repair()
 
@@ -207,7 +203,6 @@ function template_attachment_paths()
 
 	if (!empty($modSettings['attachment_basedirectories']))
 
 	{
 
 		template_show_list('base_paths');
 
-		echo '<br />';
 
 	}
 
 
 	template_show_list('attach_paths');

+ 1 - 5
Themes/default/ManageBans.template.php
View File 

@@ -169,7 +169,6 @@ 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'], '" />
 
-						<br class="clear_right" />
 
 					</form>
 
 				</div>
 
 			</div>';
 
@@ -231,7 +230,6 @@ function template_ban_edit()
 
 						</div>
 
 					</div>
 
 				</div>
 
-				<br class="clear" />
 
 				<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'], '" />
 
@@ -241,7 +239,6 @@ function template_ban_edit()
 
 
 	echo '
 
 	</div>
 
-	<br class="clear" />
 
 	<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?alp21"></script>
 
 	<script type="text/javascript"><!-- // --><![CDATA[
 
 		var fUpdateStatus = function ()
 
@@ -330,7 +327,6 @@ function template_ban_edit_trigger()
 
 						</dl>
 
 					</fieldset>
 
 					<input type="submit" name="', $context['ban_trigger']['is_new'] ? 'add_new_trigger' : 'edit_trigger', '" value="', $context['ban_trigger']['is_new'] ? $txt['ban_add_trigger_submit'] : $txt['ban_edit_trigger_submit'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="bi" value="' . $context['ban_trigger']['id'] . '" />
 
@@ -339,7 +335,7 @@ function template_ban_edit_trigger()
 
 			<input type="hidden" name="', $context['admin-bet_token_var'], '" value="', $context['admin-bet_token'], '" />
 
 		</form>
 
 	</div>
 
-	<br class="clear" />
 
+
 
 	<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?alp21"></script>
 
 	<script type="text/javascript"><!-- // --><![CDATA[
 
 		var oAddMemberSuggest = new smc_AutoSuggest({

+ 1 - 3
Themes/default/ManageCalendar.template.php
View File 

@@ -106,12 +106,10 @@ function template_edit_holiday()
 
 					<input type="hidden" name="holiday" value="', $context['holiday']['id'], '" />';
 
 	echo '
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 38 - 42
Themes/default/ManageLanguages.template.php
View File 

@@ -33,8 +33,7 @@ function template_download_language()
 
 				', $context['install_complete'], '
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 		return;
 
 	}
 
 
@@ -193,8 +192,7 @@ function template_download_language()
 
 				<input type="submit" name="do_install" value="', $txt['add_language_smf_install'], '" class="button_submit" />
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 
 	// The javascript for expand and collapse of sections.
 
 	echo '
 
@@ -266,38 +264,38 @@ function template_modify_language_entries()
 
 				<div class="content">
 
 					<fieldset>
 
 						<legend>', $context['primary_settings']['name'], '</legend>
 
-					<dl class="settings">
 
-						<dt>
 
-							<label for="character_set">', $txt['languages_character_set'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="text" name="character_set" id="character_set" size="20" value="', $context['primary_settings']['character_set'], '"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' class="input_text" />
 
-						</dd>
 
-						<dt>
 
-							<label for="locale>', $txt['languages_locale'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="text" name="locale" id="locale" size="20" value="', $context['primary_settings']['locale'], '"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' class="input_text" />
 
-						</dd>
 
-						<dt>
 
-							<label for="dictionary">', $txt['languages_dictionary'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="text" name="dictionary" id="dictionary" size="20" value="', $context['primary_settings']['dictionary'], '"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' class="input_text" />
 
-						</dd>
 
-						<dt>
 
-							<label for="spelling">', $txt['languages_spelling'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="text" name="spelling" id="spelling" size="20" value="', $context['primary_settings']['spelling'], '"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' class="input_text" />
 
-						</dd>
 
-						<dt>
 
-							<label for="rtl">', $txt['languages_rtl'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="checkbox" name="rtl" id="rtl" ', $context['primary_settings']['rtl'] ? ' checked="checked"' : '', ' class="input_check"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' />
 
-						</dd>
 
-					</dl>
 
+						<dl class="settings">
 
+							<dt>
 
+								<label for="character_set">', $txt['languages_character_set'], ':</label>
 
+							</dt>
 
+							<dd>
 
+								<input type="text" name="character_set" id="character_set" size="20" value="', $context['primary_settings']['character_set'], '"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' class="input_text" />
 
+							</dd>
 
+							<dt>
 
+								<label for="locale>', $txt['languages_locale'], ':</label>
 
+							</dt>
 
+							<dd>
 
+								<input type="text" name="locale" id="locale" size="20" value="', $context['primary_settings']['locale'], '"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' class="input_text" />
 
+							</dd>
 
+							<dt>
 
+								<label for="dictionary">', $txt['languages_dictionary'], ':</label>
 
+							</dt>
 
+							<dd>
 
+								<input type="text" name="dictionary" id="dictionary" size="20" value="', $context['primary_settings']['dictionary'], '"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' class="input_text" />
 
+							</dd>
 
+							<dt>
 
+								<label for="spelling">', $txt['languages_spelling'], ':</label>
 
+							</dt>
 
+							<dd>
 
+								<input type="text" name="spelling" id="spelling" size="20" value="', $context['primary_settings']['spelling'], '"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' class="input_text" />
 
+							</dd>
 
+							<dt>
 
+								<label for="rtl">', $txt['languages_rtl'], ':</label>
 
+							</dt>
 
+							<dd>
 
+								<input type="checkbox" name="rtl" id="rtl" ', $context['primary_settings']['rtl'] ? ' checked="checked"' : '', ' class="input_check"', (empty($context['file_entries']) ? '' : ' disabled="disabled"'), ' />
 
+							</dd>
 
+						</dl>
 
 					</fieldset>
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-mlang_token_var'], '" value="', $context['admin-mlang_token'], '" />
 
@@ -312,7 +310,6 @@ function template_modify_language_entries()
 
 	}
 
 
 	echo '
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
@@ -342,8 +339,9 @@ function template_modify_language_entries()
 
 					</select>
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-mlang_token_var'], '" value="', $context['admin-mlang_token'], '" />
 
-					<input type="submit" value="', $txt['go'], '" class="button_submit" />
 
-			</div>';
 
+					<input type="submit" value="', $txt['go'], '" class="button_submit" style="float: none"/>
 
+			</div>
 
+			<br class="clear" />';
 
 
 	// Is it not writable?
 
 	// Show an error.
 
@@ -414,7 +412,6 @@ function template_modify_language_entries()
 
 
 		echo '
 
 				</div>
 
-				<br class="clear" />
 
 			</div>';
 
 	}
 
 	echo '
 
@@ -472,8 +469,7 @@ function template_add_language()
 
 
 	echo '
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 6 - 9
Themes/default/ManageMaintenance.template.php
View File 

@@ -51,10 +51,7 @@ function template_maintain_database()
 
 
 	if ($db_type == 'sqlite')
 
 		echo '
 
-					<p>
 
-						<input type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" class="button_submit" />
 
-						<br class="clear_right" />
 
-					</p>';
 
+					<input type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" class="button_submit" />';
 
 	else
 
 	{
 
 		if ($context['safe_mode_enable'])
 
@@ -97,7 +94,7 @@ function template_maintain_database()
 
 				<form action="', $scripturl, '?action=admin;area=maintain;sa=database;activity=convertmsgbody" method="post" accept-charset="', $context['character_set'], '">
 
 					<p>', $txt['mediumtext_introduction'], '</p>',
 
 					$context['convert_to_suggest'] ? '<p class="infobox">' . $txt['convert_to_suggest_text'] . '</p>' : '', '
 
-					<input type="submit" name="evaluate_conversion" value="', $txt['maintain_run_now'], '" class="button_submit" /><br class="clear_right" />
 
+					<input type="submit" name="evaluate_conversion" value="', $txt['maintain_run_now'], '" class="button_submit" />
 
 					<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'], '" />
 
 				</form>
 
@@ -159,10 +156,10 @@ function template_maintain_routine()
 
 
 	// If maintenance has finished tell the user.
 
 	if (!empty($context['maintenance_finished']))
 
-	echo '
 
-		<div class="maintenance_finished">
 
-			', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 
-		</div>';
 
+		echo '
 
+			<div class="maintenance_finished">
 
+				', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 
+			</div>';
 
 
 	echo '
 
 		<div class="cat_bar">

+ 2 - 6
Themes/default/ManageMembergroups.template.php
View File 

@@ -616,7 +616,6 @@ function template_group_members()
 
 						</dd>
 
 					</dl>
 
 					<input type="submit" name="add" value="', $txt['membergroups_members_add'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>';
 
 	}
 
@@ -625,8 +624,7 @@ function template_group_members()
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 			<input type="hidden" name="', $context['mod-mgm_token_var'], '" value="', $context['mod-mgm_token'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 
 	if (!empty($context['group']['assignable']))
 
 		echo '
 
@@ -680,12 +678,10 @@ function template_group_request_reason()
 
 					<input type="submit" name="go" value="', $txt['mc_groupr_submit'], '" class="button_submit" />
 
 					<input type="hidden" name="req_action" value="got_reason" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 1 - 1
Themes/default/ManageMembers.template.php
View File 

@@ -303,7 +303,7 @@ function template_admin_browse()
 
 							</select>
 
 						</dd>
 
 					</dl>
 
-					<input type="submit" value="', $txt['admin_browse_outstanding_go'], '" class="button_submit" /><br class="clear_right">
 
+					<input type="submit" value="', $txt['admin_browse_outstanding_go'], '" class="button_submit" />
 
 					<input type="hidden" name="type" value="', $context['browse_type'], '" />
 
 					<input type="hidden" name="sort" value="', $context['approve_list']['sort']['id'], '" />
 
 					<input type="hidden" name="start" value="', $context['approve_list']['start'], '" />

+ 4 - 5
Themes/default/ManageNews.template.php
View File 

@@ -42,7 +42,8 @@ function template_email_members()
 
 
 	echo '
 
 						</dd>
 
-					</dl><br class="clear" />
 
+					</dl>
 
+					<br class="clear" />
 
 				</div>
 
 			</div>
 
 			<br />
 
@@ -394,8 +395,7 @@ function template_email_members_compose()
 
 			}
 
 		// ]]></script>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_email_members_send()
 
@@ -434,12 +434,11 @@ function template_email_members_send()
 
 					<input type="hidden" name="', $key, '" value="', implode(($key == 'emails' ? ';' : ','), $values), '" />';
 
 
 	echo '
 
-				<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
 	</div>
 
-	<br class="clear" />
 
+
 
 	<script type="text/javascript"><!-- // --><![CDATA[
 
 		var countdown = 2;
 
 		doAutoSubmit();

+ 12 - 15
Themes/default/ManagePaid.template.php
View File 

@@ -188,12 +188,10 @@ function template_modify_subscription()
 
 					<input type="submit" name="save" value="', $txt['paid_settings_save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-pms_token_var'], '" value="', $context['admin-pms_token'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 
 }
 
 
@@ -217,8 +215,7 @@ function template_delete_subscription()
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 
 }
 
 
@@ -377,8 +374,12 @@ function template_modify_user_subscription()
 
 			echo '
 
 					<li class="reset">
 
 						', $payment['desc'], '
 
-						<span class="floatleft"><a href="', $scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;lid=', $context['log_id'], ';pending=', $id, ';accept">', $txt['pending_payments_accept'], '</a></span>
 
-						<span class="floatright"><a href="', $scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;lid=', $context['log_id'], ';pending=', $id, ';remove">', $txt['pending_payments_remove'], '</a></span>
 
+						<span class="floatleft">
 
+							<a href="', $scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;lid=', $context['log_id'], ';pending=', $id, ';accept">', $txt['pending_payments_accept'], '</a>
 
+						</span>
 
+						<span class="floatright">
 
+							<a href="', $scripturl, '?action=admin;area=paidsubscribe;sa=modifyuser;lid=', $context['log_id'], ';pending=', $id, ';remove">', $txt['pending_payments_remove'], '</a>
 
+						</span>
 
 					</li>';
 
 		}
 
 
@@ -389,8 +390,7 @@ function template_modify_user_subscription()
 
 	}
 
 
 	echo '
 
-		</div>
 
-	<br class="clear" />';
 
+		</div>';
 
 }
 
 
 // Template for a user to edit/pick their subscriptions.
 
@@ -466,8 +466,7 @@ function template_user_subscription()
 
 
 				echo '
 
 					<hr class="hrcolor" />
 
-					<input type="submit" name="sub_id[', $subscription['id'], ']" value="', $txt['paid_order'], '" class="button_submit" />
 
-					<br class="clear_right" />';
 
+					<input type="submit" name="sub_id[', $subscription['id'], ']" value="', $txt['paid_order'], '" class="button_submit" />';
 
 			}
 
 			else
 
 				echo '
 
@@ -529,8 +528,7 @@ function template_user_subscription()
 
 	echo '
 
 			</tbody>
 
 		</table>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // The "choose payment" dialog.
 
@@ -616,8 +614,7 @@ function template_paid_done()
 
 				<a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=subscriptions">', $txt['paid_sub_return'], '</a>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 9 - 18
Themes/default/ManagePermissions.template.php
View File 

@@ -183,7 +183,6 @@ function template_permission_index()
 
 						</dl>
 
 					</fieldset>
 
 					<input type="submit" value="', $txt['permissions_set_permissions'], '" onclick="return checkSubmit();" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>';
 
 
@@ -257,8 +256,7 @@ function template_permission_index()
 
 
 	echo '
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_by_board()
 
@@ -282,9 +280,8 @@ function template_by_board()
 
 
 	if (!$context['edit_all'])
 
 		echo '
 
-			<div class="content">
 
+			<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>
 
-			<br class="clear_right" />
 
 			</div>';
 
 
 	foreach ($context['categories'] as $category)
 
@@ -355,8 +352,7 @@ function template_by_board()
 
 			<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>
 
-	<br class="clear" />';
 
+	</form>';
 
 }
 
 
 // Edit permission profiles (predefined).
 
@@ -409,7 +405,7 @@ function template_edit_profiles()
 
 	echo '
 
 				</tbody>
 
 			</table>
 
-			<div class="righttext padding">
 
+			<div class="flow_auto righttext padding">
 
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 				<input type="hidden" name="', $context['admin-mpp_token_var'], '" value="', $context['admin-mpp_token'], '" />';
 
 
@@ -419,7 +415,6 @@ function template_edit_profiles()
 
 
 	echo '
 
 				<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" class="button_submit" />
 
-				<br class="clear" />
 
 			</div>
 
 		</form>
 
 		<br />
 
@@ -454,12 +449,10 @@ function template_edit_profiles()
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-mpp_token_var'], '" value="', $context['admin-mpp_token'], '" />
 
 					<input type="submit" name="create" value="', $txt['permissions_profile_new_create'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_modify_group()
 
@@ -551,7 +544,7 @@ function template_modify_group()
 
 
 	if ($context['profile']['can_modify'])
 
 		echo '
 
-			<div class="righttext padding">
 
+			<div class="padding">
 
 				<input type="submit" value="', $txt['permissions_commit'], '" class="button_submit" />
 
 			</div>';
 
 
@@ -559,8 +552,7 @@ function template_modify_group()
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 			<input type="hidden" name="', $context['admin-mp_token_var'], '" value="', $context['admin-mp_token'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 
 }
 
 
@@ -1090,7 +1082,7 @@ function template_postmod_permissions()
 
 
 	echo '
 
 					</select>
 
-					<input type="submit" value="', $txt['go'], '" class="button_submit" />
 
+					<input type="submit" value="', $txt['go'], '" class="button_submit" style="margin-top: 5px;" />
 
 			</div>
 
 			<table width="100%" class="table_grid">
 
 				<thead>
 
@@ -1170,8 +1162,7 @@ function template_postmod_permissions()
 
 			<img src="', $settings['default_images_url'], '/admin/post_moderation_moderate.png" alt="', $txt['permissions_post_moderation_moderate'], '" /> - ', $txt['permissions_post_moderation_moderate'], '<br />
 
 			<img src="', $settings['default_images_url'], '/admin/post_moderation_deny.png" alt="', $txt['permissions_post_moderation_disallow'], '" /> - ', $txt['permissions_post_moderation_disallow'], '
 
 		</p>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 1 - 2
Themes/default/ManageScheduledTasks.template.php
View File 

@@ -87,8 +87,7 @@ function template_edit_scheduled_tasks()
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 8 - 19
Themes/default/ManageSearch.template.php
View File 

@@ -83,12 +83,10 @@ function template_modify_weights()
 
 					<input type="submit" name="save" value="', $txt['search_weights_save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-msw_token_var'], '" value="', $context['admin-msw_token'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_select_search_method()
 
@@ -125,7 +123,7 @@ function template_select_search_method()
 
 						</dd>';
 
 	echo '
 
 					</dl>
 
-					', $context['double_index'] ? '<div class="information">
 
+					', $context['double_index'] ? '<div class="noticebox">
 
 					' . $txt['search_double_index'] . '</div>' : '', '
 
 					<fieldset class="search_settings floatleft">
 
 						<legend>', $txt['search_index'], '</legend>
 
@@ -211,12 +209,10 @@ function template_select_search_method()
 
 					<input type="submit" name="save" value="', $txt['search_method_save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-msmpost_token_var'], '" value="', $context['admin-msmpost_token'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_create_index()
 
@@ -246,7 +242,6 @@ function template_create_index()
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="save" value="', $txt['search_create_index_start'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 	</form>
 
@@ -273,7 +268,6 @@ function template_create_index_progress()
 
 					</div>
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="b" value="', $txt['search_create_index_continue'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="step" value="', $context['step'], '" />
 
@@ -282,7 +276,6 @@ function template_create_index_progress()
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 		</form>
 
 	</div>
 
-	<br class="clear" />
 
 	<script type="text/javascript"><!-- // --><![CDATA[
 
 		var countdown = 10;
 
 		doAutoSubmit();
 
@@ -319,8 +312,7 @@ function template_create_index_done()
 
 				</p>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Add or edit a search engine spider.
 
@@ -365,12 +357,10 @@ function template_spider_edit()
 
 					<input type="submit" name="save" value="', $context['page_title'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-ses_token_var'], '" value="', $context['admin-ses_token'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Show... spider... logs...
 
@@ -385,6 +375,7 @@ function template_show_spider_logs()
 
 	template_show_list('spider_logs');
 
 
 	echo '
 
+		<br class="clear" />
 
 		<form id="admin_form_wrapper" action="', $scripturl, '?action=admin;area=sengines;sa=logs" method="post" accept-charset="', $context['character_set'], '">
 
 			<div class="cat_bar">
 
 				<h3 class="catbg">', $txt['spider_logs_delete'], '</h3>
 
@@ -402,8 +393,7 @@ function template_show_spider_logs()
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Show... spider... stats...
 
@@ -436,8 +426,7 @@ function template_show_spider_stats()
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 9 - 17
Themes/default/ManageSmileys.template.php
View File 

@@ -31,7 +31,7 @@ function template_editsets()
 
 			</div>
 
 		</div>
 
 	</div>
 
-	<br class="clear" />
 
+	
 	<script type="text/javascript"><!-- // --><![CDATA[
 
 		window.smfForum_scripturl = "', $scripturl, '";
 
 		window.smfForum_sessionid = "', $context['session_id'], '";
 
@@ -144,15 +144,13 @@ function template_modifyset()
 
 					</dl>
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="smiley_save" value="', $txt['smiley_sets_save'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 			<input type="hidden" name="', $context['admin-mss_token_var'], '" value="', $context['admin-mss_token'], '" />
 
 			<input type="hidden" name="set" value="', $context['current_set']['id'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Editing an individual smiley
 
@@ -233,14 +231,13 @@ function template_modifysmiley()
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="smiley_save" value="', $txt['smileys_save'], '" class="button_submit" />
 
 					<input type="submit" name="deletesmiley" value="', $txt['smileys_delete'], '" onclick="return confirm(\'', $txt['smileys_delete_confirm'], '\');" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 			<input type="hidden" name="smiley" value="', $context['current_smiley']['id'], '" />
 
 		</form>
 
 	</div>
 
-	<br class="clear" />
 
+	
 	<script type="text/javascript"><!-- // --><![CDATA[
 
 		function updatePreview()
 
 		{
 
@@ -342,7 +339,7 @@ function template_addsmiley()
 
 					</dl>
 
 				</div>
 
 			</div>
 
-			<br class="clear" />
 
+			
 			<div class="cat_bar">
 
 				<h3 class="catbg">', $txt['smiley_new'], '</h3>
 
 			</div>
 
@@ -380,13 +377,11 @@ function template_addsmiley()
 
 					</dl>
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="smiley_save" value="', $txt['smileys_save'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Ordering smileys.
 
@@ -434,12 +429,11 @@ function template_setorder()
 
 				</div>
 
 			</div>
 
 		<input type="hidden" name="reorder" value="1" />
 
-	</form>
 
-	<br />';
 
+	</form>';
 
 	}
 
+	
 	echo '
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Editing Message Icons
 
@@ -533,12 +527,10 @@ function template_editicon()
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="icons_save" value="', $txt['smileys_save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 3 - 2
Themes/default/Memberlist.template.php
View File 

@@ -194,8 +194,9 @@ function template_search()
 
 	echo '
 
 					</dl>
 
 					<hr class="hrcolor" />
 
-					<input type="submit" name="submit" value="' . $txt['search'] . '" class="button_submit" />
 
-					<br class="clear_right" />
 
+					<div class="flow_auto">
 
+						<input type="submit" name="submit" value="' . $txt['search'] . '" class="button_submit" />
 
+					</div>
 
 				</div>
 
 			</div>
 
 		</div>

+ 9 - 18
Themes/default/ModerationCenter.template.php
View File 

@@ -69,7 +69,6 @@ function template_latest_news()
 
 	echo '
 
 		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=current-version.js"></script>
 
 		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>
 
-		<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/admin.js?alp21"></script>
 
 		<script type="text/javascript"><!-- // --><![CDATA[
 
 			var oAdminIndex = new smf_AdminIndex({
 
 				sSelf: \'oAdminCenter\',
 
@@ -227,10 +226,7 @@ function template_notes()
 
 					<div class="floatleft post_note">
 
 						<input type="text" name="new_note" value="', $txt['mc_click_add_note'], '" style="width: 95%;" onclick="if (this.value == \'', $txt['mc_click_add_note'], '\') this.value = \'\';" class="input_text" />
 
 					</div>
 
-					<div class="floatright">
 
-						<input type="submit" name="makenote" value="', $txt['mc_add_note'], '" class="button_submit" />
 
-					</div>
 
-					<br class="clear" />
 
+					<input type="submit" name="makenote" value="', $txt['mc_add_note'], '" class="button_submit" />
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
@@ -369,7 +365,6 @@ function template_unapproved_posts()
 
 
 			echo '
 
 					</span>
 
-					<br class="clear" />
 
 				</div>
 
 			</div>
 
 		</div>';
 
@@ -400,8 +395,7 @@ function template_unapproved_posts()
 
 		</div>
 
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 	</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // List all attachments awaiting approval.
 
@@ -422,8 +416,7 @@ function template_unapproved_attachments()
 
 	template_show_list('mc_unapproved_attach');
 
 
 	echo '
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_viewmodreport()
 
@@ -485,7 +478,9 @@ function template_viewmodreport()
 
 
 	if (empty($context['report']['mod_comments']))
 
 		echo '
 
-					<p class="centertext">', $txt['mc_modreport_no_mod_comment'], '</p>';
 
+				<div class="information">
 
+					<p class="centertext">', $txt['mc_modreport_no_mod_comment'], '</p>
 
+				</div>';
 
 
 	foreach ($context['report']['mod_comments'] as $comment)
 
 		echo
 
@@ -507,8 +502,7 @@ function template_viewmodreport()
 
 	echo '
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Callback function for showing a watched users post in the table.
 
@@ -614,12 +608,10 @@ function template_moderation_settings()
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['mod-set_token_var'], '" value="', $context['mod-set_token'], '" />
 
 					<input type="submit" name="save" value="', $txt['save'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Show a notice sent to a user.
 
@@ -725,14 +717,13 @@ function template_warn_template()
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="preview" id="preview_button" value="', $txt['preview'], '" class="button_submit" />
 
 					<input type="submit" name="save" value="', $context['page_title'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 			<input type="hidden" name="', $context['mod-wt_token_var'], '" value="', $context['mod-wt_token'], '" />
 
 		</form>
 
 	</div>
 
-	<br class="clear" />
 
+
 
 	<script type="text/javascript"><!-- // --><![CDATA[
 
 		$(document).ready(function() {
 
 			$("#preview_button").click(function() {

+ 0 - 1
Themes/default/MoveTopic.template.php
View File 

@@ -91,7 +91,6 @@ function template_main()
 
 							</dl>
 
 						</fieldset>
 
 						<input type="submit" value="', $txt['move_topic'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />
 
-						<br class="clear_right" />
 
 					</div>
 
 				</div>
 
 			</div>';

+ 19 - 33
Themes/default/Packages.template.php
View File 

@@ -41,8 +41,8 @@ function template_view_package()
 
 	{
 
 		echo '
 
 		<div class="errorbox">
 
-			', $txt['package_will_fail_title'], '<br />
 
-			', $txt['package_will_fail_warning'],
 
+			', sprintf($txt['package_will_fail_title'], $txt['package_' . ($context['uninstalling'] ? 'uninstall' : 'install')]), '<br />
 
+			', sprintf($txt['package_will_fail_warning'], $txt['package_' . ($context['uninstalling'] ? 'uninstall' : 'install')]),
 
 			!empty($context['failure_details']) ? '<br /><br /><strong>' . $context['failure_details'] . '</strong>' : '', '
 
 		</div>';
 
 	}
 
@@ -142,7 +142,7 @@ function template_view_package()
 
 					<th scope="col" width="30"></th>
 
 					<th scope="col" class="lefttext">', $txt['package_install_type'], '</th>
 
 					<th scope="col" class="lefttext" width="50%">', $txt['package_install_action'], '</th>
 
-					<th class="last_th lefttext" scope="col" class="lefttext" width="20%">', $txt['package_install_desc'], '</th>
 
+					<th class="last_th lefttext" scope="col" width="20%">', $txt['package_install_desc'], '</th>
 
 				</tr>
 
 			</thead>
 
 			<tbody>';
 
@@ -331,8 +331,7 @@ function template_view_package()
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />', (isset($context['form_sequence_number']) && !$context['ftp_needed']) ? '
 
 			<input type="hidden" name="seqnum" value="' . $context['form_sequence_number'] . '" />' : '', '
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 
 	// Toggle options.
 
 	echo '
 
@@ -468,8 +467,7 @@ function template_extract_package()
 
 	}
 
 
 	echo '
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_list()
 
@@ -498,8 +496,7 @@ function template_list()
 
 				<a href="', $scripturl, '?action=admin;area=packages">[ ', $txt['back'], ' ]</a>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_examine()
 
@@ -520,8 +517,7 @@ function template_examine()
 
 				<a href="', $scripturl, '?action=admin;area=packages;sa=list;package=', $context['package'], '">[ ', $txt['list_files'], ' ]</a>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_browse()
 
@@ -589,7 +585,6 @@ function template_browse()
 
 
 	// the advanced (emulation) box, collapsed by default
 
 	echo '
 
-		<br class="clear" />
 
 		<form action="', $scripturl, '?action=admin;area=packages;sa=', $context['sub_action'], '" method="get">
 
 			<div id="advanced_box" >
 
 				<div class="cat_bar">
 
@@ -627,7 +622,7 @@ function template_browse()
 
 
 	echo '
 
 	</div>
 
-	<br class="clear" />
 
+	
 	<script type="text/javascript"><!-- // --><![CDATA[
 
 		var oAdvancedPanelToggle = new smc_Toggle({
 
 			bToggleEnabled: true,
 
@@ -818,12 +813,10 @@ function template_servers()
 
 					<hr class="hrcolor" />
 
 					<input type="submit" value="' . $txt['package_upload'] . '" class="button_submit" />
 
 					<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '" />
 
-					<br class="clear_right" />
 
 				</form>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_package_confirm()
 
@@ -841,8 +834,7 @@ function template_package_confirm()
 
 				<a href="', $context['proceed_href'], '">[ ', $txt['package_confirm_proceed'], ' ]</a> <a href="JavaScript:history.go(-1);">[ ', $txt['package_confirm_go_back'], ' ]</a>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_package_list()
 
@@ -872,7 +864,7 @@ function template_package_list()
 
 		{
 
 			echo '
 
 					<li>
 
-						<strong><img id="ps_img_', $i, '" src="', $settings['images_url'], '/upshrink.png" alt="*" style="display: none;" /> ', $packageSection['title'], '</strong>';
 
+						<strong><img id="ps_img_', $i, '" src="', $settings['images_url'], '/collapse.png" alt="*" style="display: none;" /> ', $packageSection['title'], '</strong>';
 
 
 			if (!empty($packageSection['text']))
 
 				echo '
 
@@ -912,7 +904,7 @@ function template_package_list()
 
 				{
 
 					// 1. Some mod [ Download ].
 
 					echo '
 
-							<strong><img id="ps_img_', $i, '_pkg_', $id, '" src="', $settings['images_url'], '/upshrink.png" alt="*" style="display: none;" /> ', $package['can_install'] ? '<strong>' . $package['name'] . '</strong> <a href="' . $package['download']['href'] . '">[ ' . $txt['download'] . ' ]</a>': $package['name'];
 
+							<strong><img id="ps_img_', $i, '_pkg_', $id, '" src="', $settings['images_url'], '/collapse.png" alt="*" style="display: none;" /> ', $package['can_install'] ? '<strong>' . $package['name'] . '</strong> <a href="' . $package['download']['href'] . '">[ ' . $txt['download'] . ' ]</a>': $package['name'];
 
 
 					// Mark as installed and current?
 
 					if ($package['is_installed'] && !$package['is_newer'])
 
@@ -968,7 +960,6 @@ function template_package_list()
 
 			<img src="', $settings['images_url'], '/icons/package_old.png" alt="" class="centericon" style="margin-left: 2ex;" /> ', $txt['package_installed_old'], '
 
 		</div>
 
 	</div>
 
-	<br class="clear" />
 
 
 		';
 
 		// Now go through and turn off all the sections.
 
@@ -989,9 +980,9 @@ function template_package_list()
 
 					aSwapImages: [
 
 						{
 
 							sId: \'ps_img_', $section, '\',
 
-							srcExpanded: smf_images_url + \'/upshrink.png\',
 
+							srcExpanded: smf_images_url + \'/collapse.png\',
 
 							altExpanded: \'*\',
 
-							srcCollapsed: smf_images_url + \'/upshrink2.png\',
 
+							srcCollapsed: smf_images_url + \'/expand.png\',
 
 							altCollapsed: \'*\'
 
 						}
 
 					]
 
@@ -1010,9 +1001,9 @@ function template_package_list()
 
 					aSwapImages: [
 
 						{
 
 							sId: \'ps_img_', $section, '_pkg_', $id, '\',
 
-							srcExpanded: smf_images_url + \'/upshrink.png\',
 
+							srcExpanded: smf_images_url + \'/collapse.png\',
 
 							altExpanded: \'*\',
 
-							srcCollapsed: smf_images_url + \'/upshrink2.png\',
 
+							srcCollapsed: smf_images_url + \'/expand.png\',
 
 							altCollapsed: \'*\'
 
 						}
 
 					]
 
@@ -1046,8 +1037,7 @@ function template_downloaded()
 
 				<p><a href="', $scripturl, '?action=admin;area=packages;get', (isset($context['package_server']) ? ';sa=browse;server=' . $context['package_server'] : ''), '">[ ', $txt['back'], ' ]</a></p>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_install_options()
 
@@ -1101,12 +1091,10 @@ function template_install_options()
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="save" value="', $txt['save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<br class="clear_right" />
 
 				</form>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_control_chmod()
 
@@ -1616,7 +1604,6 @@ function template_file_permissions()
 
 				<hr class="hrcolor" />
 
 				<input type="hidden" name="action_changes" value="1" />
 
 				<input type="submit" value="', $txt['package_file_perms_go'], '" name="go" class="button_submit" />
 
-				<br class="clear_right" />
 
 			</div>
 
 		</div>';
 
 
@@ -1799,8 +1786,7 @@ function template_action_permissions()
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 
 	// Just the countdown stuff
 
 	echo '

+ 7 - 11
Themes/default/PersonalMessage.template.php
View File 

@@ -440,7 +440,7 @@ function template_folder()
 
 			if ($context['folder'] != 'sent' && !empty($context['currently_using_labels']) && $context['display_mode'] != 2)
 
 			{
 
 				echo '
 
-				<div class="labels righttext">';
 
+				<div class="labels righttext flow_auto">';
 
 				// Add the label drop down box.
 
 				if (!empty($context['currently_using_labels']))
 
 				{
 
@@ -480,7 +480,6 @@ function template_folder()
 
 
 			echo '
 
 			</div>
 
-			<br class="clear" />
 
 		</div>
 
 		<div class="moderatorbar">
 
 		</div>
 
@@ -632,7 +631,7 @@ function template_subject_list()
 
 		}
 
 
 		echo '
 
-				<input type="submit" name="del_selected" value="', $txt['quickmod_delete_selected'], '" onclick="if (!confirm(\'', $txt['delete_selected_confirm'], '\')) return false;" class="button_submit" />';
 
+				<input type="submit" name="del_selected" value="', $txt['quickmod_delete_selected'], '" onclick="if (!confirm(\'', $txt['delete_selected_confirm'], '\')) return false;" class="button_submit" style="float: none" />';
 
 	}
 
 
 	echo '
 
@@ -714,7 +713,7 @@ function template_search()
 
 				</dl>';
 
 		if (!$context['currently_using_labels'])
 
 			echo '
 
-				<input type="submit" name="pm_search" value="', $txt['pm_search_go'], '" class="button_submit floatright" />';
 
+				<input type="submit" name="pm_search" value="', $txt['pm_search_go'], '" class="button_submit" />';
 
 			echo '
 
 				<br class="clear_right" />
 
 			</div>
 
@@ -1333,10 +1332,7 @@ function template_prune()
 
 		<div class="windowbg">
 
 			<div class="content">
 
 				<p>', $txt['pm_prune_desc1'], ' <input type="text" name="age" size="3" value="14" class="input_text" /> ', $txt['pm_prune_desc2'], '</p>
 
-				<div class="righttext">
 
-					<input type="submit" value="', $txt['delete'], '" class="button_submit" />
 
-				</div>
 
-				<br class="clear" />
 
+				<input type="submit" value="', $txt['delete'], '" class="button_submit" />
 
 			</div>
 
 		</div>
 
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
@@ -1403,7 +1399,7 @@ function template_labels()
 
 
 	if (!count($context['labels']) < 2)
 
 		echo '
 
-		<div class="padding righttext">
 
+		<div class="padding">
 
 			<input type="submit" name="save" value="', $txt['save'], '" class="button_submit" />
 
 			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" onclick="return confirm(\'', $txt['pm_labels_delete'], '\');" class="button_submit" />
 
 		</div>';
 
@@ -1428,7 +1424,6 @@ function template_labels()
 
 				</dl>
 
 				<hr class="hrcolor" />
 
 				<input type="submit" name="add" value="', $txt['pm_label_add_new'], '" class="button_submit" />
 
-				<br class="clear_right" />
 
 			</div>
 
 		</div>
 
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
@@ -1840,7 +1835,8 @@ function template_add_rule()
 
 					<a href="#" onclick="addActionOption(); return false;" id="addonjs2" style="display: none;">(', $txt['pm_rule_add_action'], ')</a>
 
 				</fieldset>
 
 			</div>
 
-		</div><br class="clear" />
 
+		</div>
 
+		
 		<div class="cat_bar">
 
 			<h3 class="catbg">', $txt['pm_rule_description'], '</h3>
 
 		</div>

+ 1 - 2
Themes/default/Poll.template.php
View File 

@@ -141,10 +141,9 @@ function template_main()
 
 						<input type="checkbox" name="resetVoteCount" value="on" class="input_check" /> ' . $txt['reset_votes_check'] . '
 
 					</fieldset>';
 
 	echo '
 
-					<div class="righttext padding">
 
+					<div class="padding flow_auto">
 
 						<input type="submit" name="post" value="', $txt['save'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />
 
 					</div>
 
-					<br class="clear" />
 
 				</div>
 
 			</div>
 
 			<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />

+ 4 - 3
Themes/default/Profile.template.php
View File 

@@ -594,6 +594,7 @@ function template_editBuddies()
 
 					</dt>
 
 					<dd>
 
 						<input type="text" name="new_buddy" id="new_buddy" size="30" class="input_text" />
 
+						<input type="submit" value="', $txt['buddy_add_button'], '" class="button_submit floatnone" />
 
 					</dd>
 
 				</dl>';
 
 
@@ -603,7 +604,7 @@ function template_editBuddies()
 
 
 	echo '
 
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-				<input type="submit" value="', $txt['buddy_add_button'], '" class="button_submit" />
 
+				
 			</div>
 
 		</div>
 
 	</form>
 
@@ -2950,14 +2951,14 @@ function template_authentication_method()
 
 								</dt>
 
 								<dd>
 
 									<input type="password" name="passwrd1" id="smf_autov_pwmain" size="30" tabindex="', $context['tabindex']++, '" class="input_password" />
 
-									<span id="smf_autov_pwmain_div" style="display: none;"><img id="smf_autov_pwmain_img" src="', $settings['images_url'], '/icons/field_invalid.png" alt="*" /></span>
 
+									<span id="smf_autov_pwmain_div" style="display: none;"><img id="smf_autov_pwmain_img" class="centericon" src="', $settings['images_url'], '/icons/field_invalid.png" alt="*" /></span>
 
 								</dd>
 
 								<dt>
 
 									<em>', $txt['verify_pass'], ':</em>
 
 								</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" 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>

+ 1 - 1
Themes/default/Recent.template.php
View File 

@@ -167,7 +167,7 @@ function template_unread()
 
 			// [WIP] MEthinks the orange icons look better if they aren't all over the page.
 
 			echo '
 
 									<a href="', $topic['new_href'], '" id="newicon', $topic['first_post']['id'], '"><span class="new_posts">' . $txt['new'] . '</span></a>
 
-									', $topic['is_sticky'] ? '<strong>' : '', '<span title="', $topic[(empty($settings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], '</span>', $topic['is_sticky'] ? '</strong>' : '', '
 
+									', $topic['is_sticky'] ? '<strong>' : '', '<span class="preview" title="', $topic[(empty($settings['message_index_preview_first']) ? 'last_post' : 'first_post')]['preview'], '"><span id="msg_' . $topic['first_post']['id'] . '">', $topic['first_post']['link'], '</span></span>', $topic['is_sticky'] ? '</strong>' : '', '
 
 									<p>
 
 										', $topic['first_post']['started_by'], '
 
 										<small id="pages', $topic['first_post']['id'], '">', $topic['pages'], '</small>

+ 27 - 22
Themes/default/Register.template.php
View File 

@@ -329,7 +329,7 @@ function template_registration_form()
 
 	}
 
 
 	echo '
 
-			<div id="confirm_buttons">';
 
+			<div id="confirm_buttons flow_auto">';
 
 
 	// Age restriction in effect?
 
 	if (!$context['require_agreement'] && $context['show_coppa'])
 
@@ -345,7 +345,7 @@ function template_registration_form()
 
 			<input type="hidden" name="', $context['register_token_var'], '" value="', $context['register_token'], '" />
 
 			<input type="hidden" name="step" value="2" />
 
 		</form>
 
-		<br class="clear" />
 
+		
 		<script type="text/javascript"><!-- // --><![CDATA[
 
 			var regTextStrings = {
 
 				"username_valid": "', $txt['registration_username_available'], '",
 
@@ -578,12 +578,14 @@ function template_admin_register()
 
 					</dd>
 
 				</dl>
 
 				<hr class="hrcolor" />
 
-				<input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
 
-				<input type="hidden" name="sa" value="register" />
 
-				<br class="clear_right" />
 
+				<div class="flow_auto">
 
+					<input type="submit" name="regSubmit" value="', $txt['register'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
 
+					<input type="hidden" name="sa" value="register" />
 
+					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+					<input type="hidden" name="', $context['admin-regc_token_var'], '" value="', $context['admin-regc_token'], '" />
 
+				</div>
 
 			</div>
 
-			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-			<input type="hidden" name="', $context['admin-regc_token_var'], '" value="', $context['admin-regc_token'], '" />
 
+			
 		</form>
 
 	</div>
 
 	<br class="clear" />';
 
@@ -645,16 +647,16 @@ function template_edit_agreement()
 
 						<label for="requireAgreement"><input type="checkbox" name="requireAgreement" id="requireAgreement"', $context['require_agreement'] ? ' checked="checked"' : '', ' tabindex="', $context['tabindex']++, '" value="1" class="input_check" /> ', $txt['admin_agreement'], '.</label>
 
 					</p>
 
 					<hr class="hrcolor" />
 
-					<input type="submit" value="', $txt['save'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
 
-					<input type="hidden" name="agree_lang" value="', $context['current_agreement'], '" />
 
-					<input type="hidden" name="sa" value="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'], '" />
 
-					<br class="clear_right" />
 
+					<div class="flow_auto" >
 
+						<input type="submit" value="', $txt['save'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
 
+						<input type="hidden" name="agree_lang" value="', $context['current_agreement'], '" />
 
+						<input type="hidden" name="sa" value="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>
 
-		<br class="clear" />';
 
+		</div>';
 
 }
 
 
 function template_edit_reserved_words()
 
@@ -698,14 +700,17 @@ function template_edit_reserved_words()
 
 					</dd>
 
 				</dl>
 
 				<hr class="hrcolor" />
 
-				<input type="submit" value="', $txt['save'], '" name="save_reserved_names" tabindex="', $context['tabindex']++, '" style="margin: 1ex;" class="button_submit" />
 
-				<br class="clear_right" />
 
+				<div class="flow_auto" >
 
+					<input type="submit" value="', $txt['save'], '" name="save_reserved_names" tabindex="', $context['tabindex']++, '" style="margin: 1ex;" class="button_submit" />
 
+					<input type="hidden" name="sa" value="reservednames" />
 
+					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+					<input type="hidden" name="', $context['admin-regr_token_var'], '" value="', $context['admin-regr_token'], '" />
 
+				</div>
 
 			</div>
 
-			<input type="hidden" name="sa" value="reservednames" />
 
-			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-			<input type="hidden" name="', $context['admin-regr_token_var'], '" value="', $context['admin-regr_token'], '" />
 
-		</form>
 
-		<br class="clear" />';
 
+		</form>';
 
 }
 
 
+
 
+
 
+
 
 ?>

+ 12 - 11
Themes/default/Reminder.template.php
View File 

@@ -57,14 +57,14 @@ function template_reminder_pick()
 
 					<input type="radio" name="reminder_type" id="reminder_type_secret" value="secret" class="input_radio" />
 
 					<label for="reminder_type_secret">', $txt['authentication_' . $context['account_type'] . '_secret'], '</label>
 
 				</p>
 
-				<input type="submit" value="', $txt['reminder_continue'], '" class="button_submit" />
 
-				<br class="clear" />
 
+				<div class="flow_auto">
 
+					<input type="submit" value="', $txt['reminder_continue'], '" class="button_submit" />
 
+					<input type="hidden" name="uid" value="', $context['current_member']['id'], '" />
 
+					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+					<input type="hidden" name="', $context['remind_token_var'], '" value="', $context['remind_token'], '" />
 
+				</div>
 
 			</div>
 
 		</div>
 
-
 
-		<input type="hidden" name="uid" value="', $context['current_member']['id'], '" />
 
-		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-		<input type="hidden" name="', $context['remind_token_var'], '" value="', $context['remind_token'], '" />
 
 	</form>';
 
 }
 
 
@@ -170,13 +170,14 @@ function template_ask()
 
 
 	echo '
 
 				</dl>
 
-				<p class="align_center"><input type="submit" value="', $txt['save'], '" class="button_submit" /></p>
 
+				<div class="auto_flow">
 
+					<input type="submit" value="', $txt['save'], '" class="button_submit" />
 
+					<input type="hidden" name="uid" value="', $context['remind_user'], '" />
 
+					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+					<input type="hidden" name="', $context['remind-sai_token_var'], '" value="', $context['remind-sai_token'], '" />
 
+				</div>
 
 			</div>
 
 		</div>
 
-		<br class="clear" />
 
-		<input type="hidden" name="uid" value="', $context['remind_user'], '" />
 
-		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-		<input type="hidden" name="', $context['remind-sai_token_var'], '" value="', $context['remind-sai_token'], '" />
 
 	</form>';
 
 
 	if ($context['account_type'] == 'password')

+ 19 - 18
Themes/default/Search.template.php
View File 

@@ -155,7 +155,9 @@ function template_main()
 
 			<div class="roundframe">
 
 				<div class="title_bar">
 
 					<h4 class="titlebg">
 
-						<a href="javascript:void(0);" onclick="expandCollapseBoards(); return false;"><img src="', $settings['images_url'], '/expand.png" id="expandBoardsIcon" alt=""  class="icon"/></a>
 
+						<span class="floatright">
 
+							<a href="javascript:void(0);" onclick="expandCollapseBoards(); return false;"><img src="', $settings['images_url'], '/expand.png" id="expandBoardsIcon" alt=""  class="icon"/></a>
 
+						</span>
 
 						<span>
 
 							<a href="javascript:void(0);" onclick="expandCollapseBoards(); return false;"><strong>', $txt['choose_board'], '</strong></a>
 
 						</span>
 
@@ -186,7 +188,9 @@ function template_main()
 
 
 			echo '
 
 								<li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
 
-									<label for="brd', $board['id'], '"><input type="checkbox" id="brd', $board['id'], '" name="brd[', $board['id'], ']" value="', $board['id'], '"', $board['selected'] ? ' checked="checked"' : '', ' class="input_check" /> ', $board['name'], '</label>
 
+									<label for="brd', $board['id'], '">
 
+										<input type="checkbox" id="brd', $board['id'], '" name="brd[', $board['id'], ']" value="', $board['id'], '"', $board['selected'] ? ' checked="checked"' : '', ' class="input_check" /> ', $board['name'], '
 
+									</label>
 
 								</li>';
 
 
 			$i ++;
 
@@ -203,12 +207,11 @@ function template_main()
 
 				<br class="clear" />';
 
 
 			echo '
 
-				<div class="padding">
 
+				<div class="padding flow_auto">
 
 					<input type="checkbox" name="all" id="check_all" value=""', $context['boards_check_all'] ? ' checked="checked"' : '', ' onclick="invertAll(this, this.form, \'brd\');" class="input_check floatleft" />
 
 					<label for="check_all" class="floatleft"><em>', $txt['check_all'], '</em></label>
 
 					<input type="submit" name="b_search" value="', $txt['search'], '" class="button_submit" />
 
 				</div>
 
-				<br class="clear_right" />
 
 			</div>
 
 		</fieldset>';
 
 		}
 
@@ -260,17 +263,16 @@ function template_results()
 
 						<input type="text" name="search"', !empty($context['search_params']['search']) ? ' value="' . $context['search_params']['search'] . '"' : '', ' maxlength="', $context['search_string_limit'], '" size="40" class="input_text" />
 
 					</dd>
 
 				</dl>
 
-
 
-				<input type="submit" name="edit_search" value="', $txt['search_adjust_submit'], '" class="button_submit" />
 
-				<br class="clear_right" />
 
-				<input type="hidden" name="searchtype" value="', !empty($context['search_params']['searchtype']) ? $context['search_params']['searchtype'] : 0, '" />
 
-				<input type="hidden" name="userspec" value="', !empty($context['search_params']['userspec']) ? $context['search_params']['userspec'] : '', '" />
 
-				<input type="hidden" name="show_complete" value="', !empty($context['search_params']['show_complete']) ? 1 : 0, '" />
 
-				<input type="hidden" name="subject_only" value="', !empty($context['search_params']['subject_only']) ? 1 : 0, '" />
 
-				<input type="hidden" name="minage" value="', !empty($context['search_params']['minage']) ? $context['search_params']['minage'] : '0', '" />
 
-				<input type="hidden" name="maxage" value="', !empty($context['search_params']['maxage']) ? $context['search_params']['maxage'] : '9999', '" />
 
-				<input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '" />';
 
-
 
+				<div class="flow_auto" >
 
+					<input type="submit" name="edit_search" value="', $txt['search_adjust_submit'], '" class="button_submit" />
 
+					<input type="hidden" name="searchtype" value="', !empty($context['search_params']['searchtype']) ? $context['search_params']['searchtype'] : 0, '" />
 
+					<input type="hidden" name="userspec" value="', !empty($context['search_params']['userspec']) ? $context['search_params']['userspec'] : '', '" />
 
+					<input type="hidden" name="show_complete" value="', !empty($context['search_params']['show_complete']) ? 1 : 0, '" />
 
+					<input type="hidden" name="subject_only" value="', !empty($context['search_params']['subject_only']) ? 1 : 0, '" />
 
+					<input type="hidden" name="minage" value="', !empty($context['search_params']['minage']) ? $context['search_params']['minage'] : '0', '" />
 
+					<input type="hidden" name="maxage" value="', !empty($context['search_params']['maxage']) ? $context['search_params']['maxage'] : '9999', '" />
 
+					<input type="hidden" name="sort" value="', !empty($context['search_params']['sort']) ? $context['search_params']['sort'] : 'relevance', '" />
 
+				</div>';
 
 		if (!empty($context['search_params']['brd']))
 
 			foreach ($context['search_params']['brd'] as $board_id)
 
 				echo '
 
@@ -394,7 +396,7 @@ function template_results()
 
 		{
 
 			echo '
 
 			<div class="titlebg2" style="padding: 4px;">
 
-				<div class="floatright">
 
+				<div class="floatright flow_auto">
 
 					<select class="qaction" name="qaction"', $context['can_move'] ? ' onchange="this.form.move_to.disabled = (this.options[this.selectedIndex].value != \'move\');"' : '', '>
 
 						<option value="">--------</option>';
 
 
@@ -412,9 +414,8 @@ function template_results()
 
 
 			echo '
 
 					<input type="hidden" name="redirect_url" value="', $scripturl . '?action=search2;params=' . $context['params'], '" />
 
-					<input type="submit" style="font-size: 0.8em;" value="', $txt['quick_mod_go'], '" onclick="return this.form.qaction.value != \'\' &amp;&amp; confirm(\'', $txt['quickmod_confirm'], '\');" class="button_submit" />
 
+					<input type="submit" value="', $txt['quick_mod_go'], '" onclick="return this.form.qaction.value != \'\' &amp;&amp; confirm(\'', $txt['quickmod_confirm'], '\');" class="button_submit" style="float: none;font-size: .8em;"/>
 
 				</div>
 
-				<br class="clear" />
 
 			</div>';
 
 		}

+ 10 - 12
Themes/default/SendTopic.template.php
View File 

@@ -89,15 +89,14 @@ function template_main()
 
 							</dd>
 
 						</dl>
 
 					</fieldset>
 
-					<div class="righttext">
 
+					<div class="flow_auto">
 
 						<input type="submit" name="send" value="', $txt['sendtopic_send'], '" class="button_submit" />
 
+						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					</div>
 
 				</div>
 
 			</div>
 
-			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Send an email to a user!
 
@@ -178,8 +177,9 @@ function template_custom_email()
 
 						</dd>
 
 					</dl>
 
 					<hr class="hrcolor" />
 
-					<input type="submit" name="send" value="', $txt['sendtopic_send'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
+					<div class="flow_auto">
 
+						<input type="submit" name="send" value="', $txt['sendtopic_send'], '" class="button_submit" />
 
+					</div>
 
 				</div>
 
 			</div>';
 
 
@@ -190,8 +190,7 @@ function template_custom_email()
 
 	echo '
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_report()
 
@@ -224,7 +223,7 @@ function template_report()
 
 	}
 
 
 	echo '
 
-						<p>', $txt['report_to_mod_func'], '</p>
 
+						<p class="noticebox">', $txt['report_to_mod_func'], '</p>
 
 						<br />
 
 						<dl class="settings" id="report_post">';
 
 
@@ -260,13 +259,12 @@ function template_report()
 
 
 	echo '
 
 						</dl>
 
-						<div class="righttext">
 
+						<div class="flow_auto">
 
 							<input type="submit" name="save" value="', $txt['rtm10'], '" style="margin-left: 1ex;" class="button_submit" />
 
+							<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 						</div>
 
 					</div>
 
-					<br class="clear" />
 
 				</div>
 
-			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 		</form>
 
 	</div>';
 
 }

+ 73 - 73
Themes/default/SplitTopics.template.php
View File 

@@ -39,10 +39,11 @@ function template_ask()
 
 						</li>
 
 					</ul>
 
 					<hr class="hrcolor" />
 
-					<input type="submit" value="', $txt['split'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
+					<div class="auto_flow">
 
+						<input type="submit" value="', $txt['split'], '" class="button_submit" />
 
+						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+					</div>
 
 				</div>
 
-				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 			</div>
 
 		</form>
 
 	</div>';
 
@@ -145,86 +146,86 @@ function template_select()
 
 				</ul>
 
 			</div>
 
 			<br class="clear" />
 
-			<p>
 
+			<div class="flow_auto">
 
 				<input type="hidden" name="topic" value="', $context['current_topic'], '" />
 
 				<input type="hidden" name="subname" value="', $context['new_subject'], '" />
 
 				<input type="submit" value="', $txt['split'], '" class="button_submit" />
 
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-			</p>
 
+			</div>
 
 		</form>
 
 	</div>
 
-	<br class="clear" />
 
-		<script type="text/javascript"><!-- // --><![CDATA[
 
-			var start = new Array();
 
-			start[0] = ', $context['not_selected']['start'], ';
 
-			start[1] = ', $context['selected']['start'], ';
 
+	
+	<script type="text/javascript"><!-- // --><![CDATA[
 
+		var start = new Array();
 
+		start[0] = ', $context['not_selected']['start'], ';
 
+		start[1] = ', $context['selected']['start'], ';
 
 
-			function select(direction, msg_id)
 
+		function select(direction, msg_id)
 
+		{
 
+			if (window.XMLHttpRequest)
 
 			{
 
-				if (window.XMLHttpRequest)
 
-				{
 
-					getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '." + start[0] + ";start2=" + start[1] + ";move=" + direction + ";msg=" + msg_id + ";xml", onDocReceived);
 
-					return false;
 
-				}
 
-				else
 
-					return true;
 
+				getXMLDocument(smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '." + start[0] + ";start2=" + start[1] + ";move=" + direction + ";msg=" + msg_id + ";xml", onDocReceived);
 
+				return false;
 
 			}
 
-			function onDocReceived(XMLDoc)
 
+			else
 
+				return true;
 
+		}
 
+		function onDocReceived(XMLDoc)
 
+		{
 
+			var i, j, pageIndex;
 
+			for (i = 0; i < 2; i++)
 
 			{
 
-				var i, j, pageIndex;
 
-				for (i = 0; i < 2; i++)
 
-				{
 
-					pageIndex = XMLDoc.getElementsByTagName("pageIndex")[i];
 
-					setInnerHTML(document.getElementById("pageindex_" + pageIndex.getAttribute("section")), pageIndex.firstChild.nodeValue);
 
-					start[i] = pageIndex.getAttribute("startFrom");
 
-				}
 
-				var numChanges = XMLDoc.getElementsByTagName("change").length;
 
-				var curChange, curSection, curAction, curId, curList, curData, newItem, sInsertBeforeId;
 
-				for (i = 0; i < numChanges; i++)
 
+				pageIndex = XMLDoc.getElementsByTagName("pageIndex")[i];
 
+				setInnerHTML(document.getElementById("pageindex_" + pageIndex.getAttribute("section")), pageIndex.firstChild.nodeValue);
 
+				start[i] = pageIndex.getAttribute("startFrom");
 
+			}
 
+			var numChanges = XMLDoc.getElementsByTagName("change").length;
 
+			var curChange, curSection, curAction, curId, curList, curData, newItem, sInsertBeforeId;
 
+			for (i = 0; i < numChanges; i++)
 
+			{
 
+				curChange = XMLDoc.getElementsByTagName("change")[i];
 
+				curSection = curChange.getAttribute("section");
 
+				curAction = curChange.getAttribute("curAction");
 
+				curId = curChange.getAttribute("id");
 
+				curList = document.getElementById("messages_" + curSection);
 
+				if (curAction == "remove")
 
+					curList.removeChild(document.getElementById(curSection + "_" + curId));
 
+				// Insert a message.
 
+				else
 
 				{
 
-					curChange = XMLDoc.getElementsByTagName("change")[i];
 
-					curSection = curChange.getAttribute("section");
 
-					curAction = curChange.getAttribute("curAction");
 
-					curId = curChange.getAttribute("id");
 
-					curList = document.getElementById("messages_" + curSection);
 
-					if (curAction == "remove")
 
-						curList.removeChild(document.getElementById(curSection + "_" + curId));
 
-					// Insert a message.
 
-					else
 
+					// By default, insert the element at the end of the list.
 
+					sInsertBeforeId = null;
 
+					// Loop through the list to try and find an item to insert after.
 
+					oListItems = curList.getElementsByTagName("LI");
 
+					for (j = 0; j < oListItems.length; j++)
 
 					{
 
-						// By default, insert the element at the end of the list.
 
-						sInsertBeforeId = null;
 
-						// Loop through the list to try and find an item to insert after.
 
-						oListItems = curList.getElementsByTagName("LI");
 
-						for (j = 0; j < oListItems.length; j++)
 
+						if (parseInt(oListItems[j].id.substr(curSection.length + 1)) < curId)
 
 						{
 
-							if (parseInt(oListItems[j].id.substr(curSection.length + 1)) < curId)
 
-							{
 
-								// This would be a nice place to insert the row.
 
-								sInsertBeforeId = oListItems[j].id;
 
-								// We\'re done for now. Escape the loop.
 
-								j = oListItems.length + 1;
 
-							}
 
+							// This would be a nice place to insert the row.
 
+							sInsertBeforeId = oListItems[j].id;
 
+							// We\'re done for now. Escape the loop.
 
+							j = oListItems.length + 1;
 
 						}
 
+					}
 
 
-						// Let\'s create a nice container for the message.
 
-						newItem = document.createElement("LI");
 
-						newItem.className = "windowbg2";
 
-						newItem.id = curSection + "_" + curId;
 
-						newItem.innerHTML = "<div class=\\"content\\"><div class=\\"message_header\\"><a class=\\"split_icon float" + (curSection == "selected" ? "left" : "right") + "\\" href=\\"" + smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '.', $context['not_selected']['start'], ';start2=', $context['selected']['start'], ';move=" + (curSection == "selected" ? "up" : "down") + ";msg=" + curId + "\\" onclick=\\"return select(\'" + (curSection == "selected" ? "up" : "down") + "\', " + curId + ");\\"><img src=\\"', $settings['images_url'], '/split_" + (curSection == "selected" ? "de" : "") + "select.png\\" alt=\\"" + (curSection == "selected" ? "&lt;-" : "-&gt;") + "\\" /></a><strong>" + curChange.getElementsByTagName("subject")[0].firstChild.nodeValue + "</strong> ', $txt['by'], ' <strong>" + curChange.getElementsByTagName("poster")[0].firstChild.nodeValue + "</strong><br /><em>" + curChange.getElementsByTagName("time")[0].firstChild.nodeValue + "</em></div><div class=\\"post\\">" + curChange.getElementsByTagName("body")[0].firstChild.nodeValue + "</div></div>";
 
+					// Let\'s create a nice container for the message.
 
+					newItem = document.createElement("LI");
 
+					newItem.className = "windowbg2";
 
+					newItem.id = curSection + "_" + curId;
 
+					newItem.innerHTML = "<div class=\\"content\\"><div class=\\"message_header\\"><a class=\\"split_icon float" + (curSection == "selected" ? "left" : "right") + "\\" href=\\"" + smf_prepareScriptUrl(smf_scripturl) + "action=splittopics;sa=selectTopics;subname=', $context['topic']['subject'], ';topic=', $context['topic']['id'], '.', $context['not_selected']['start'], ';start2=', $context['selected']['start'], ';move=" + (curSection == "selected" ? "up" : "down") + ";msg=" + curId + "\\" onclick=\\"return select(\'" + (curSection == "selected" ? "up" : "down") + "\', " + curId + ");\\"><img src=\\"', $settings['images_url'], '/split_" + (curSection == "selected" ? "de" : "") + "select.png\\" alt=\\"" + (curSection == "selected" ? "&lt;-" : "-&gt;") + "\\" /></a><strong>" + curChange.getElementsByTagName("subject")[0].firstChild.nodeValue + "</strong> ', $txt['by'], ' <strong>" + curChange.getElementsByTagName("poster")[0].firstChild.nodeValue + "</strong><br /><em>" + curChange.getElementsByTagName("time")[0].firstChild.nodeValue + "</em></div><div class=\\"post\\">" + curChange.getElementsByTagName("body")[0].firstChild.nodeValue + "</div></div>";
 
 
-						// So, where do we insert it?
 
-						if (typeof sInsertBeforeId == "string")
 
-							curList.insertBefore(newItem, document.getElementById(sInsertBeforeId));
 
-						else
 
-							curList.appendChild(newItem);
 
-					}
 
+					// So, where do we insert it?
 
+					if (typeof sInsertBeforeId == "string")
 
+						curList.insertBefore(newItem, document.getElementById(sInsertBeforeId));
 
+					else
 
+						curList.appendChild(newItem);
 
 				}
 
-				// After all changes, make sure the window backgrounds are still correct for both lists.
 
-				applyWindowClasses(document.getElementById("messages_selected"));
 
-				applyWindowClasses(document.getElementById("messages_not_selected"));
 
 			}
 
-		// ]]></script>';
 
+			// After all changes, make sure the window backgrounds are still correct for both lists.
 
+			applyWindowClasses(document.getElementById("messages_selected"));
 
+			applyWindowClasses(document.getElementById("messages_not_selected"));
 
+		}
 
+	// ]]></script>';
 
 }
 
 
 function template_merge_done()
 
@@ -342,8 +343,7 @@ function template_merge()
 
 			<div class="pagesection">
 
 				<strong>', $txt['pages'], ':</strong> ', $context['page_index'], '
 
 			</div>
 
-		</div>
 
-	<br class="clear" />';
 
+		</div>';
 
 }
 
 
 function template_merge_extra_options()
 
@@ -444,15 +444,15 @@ function template_merge_extra_options()
 
 					</fieldset>';
 
 	}
 
 	echo '
 
-					<input type="submit" value="' . $txt['merge'] . '" class="button_submit" />
 
-					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<input type="hidden" name="sa" value="execute" />
 
-					<br class="clear_right" />
 
+					<div class="auto_flow">
 
+						<input type="submit" value="' . $txt['merge'] . '" class="button_submit" />
 
+						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+						<input type="hidden" name="sa" value="execute" />
 
+					</div>
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 24 - 41
Themes/default/Themes.template.php
View File 

@@ -89,11 +89,10 @@ function template_main()
 
 					</dl>
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="save" value="' . $txt['save'] . '" class="button_submit" />
 
-					<br class="clear_right" />
 
+					<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>
 
-			<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'], '" />
 
 		</form>';
 
 
 	// Link to simplemachines.org for latest themes and info!
 
@@ -161,21 +160,19 @@ function template_main()
 
 					</dl>
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="save" value="', $txt['theme_install_go'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
+					<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>
 
-			<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'], '" />
 
 		</form>
 
 	</div>
 
-	<br class="clear" />
 
 
-		<script type="text/javascript"><!-- // --><![CDATA[
 
-			window.smfForum_scripturl = "', $scripturl, '";
 
-			window.smfForum_sessionid = "', $context['session_id'], '";
 
-			window.smfForum_sessionvar = "', $context['session_var'], '";
 
-			window.smfThemes_writable = ', $context['can_create_new'] ? 'true' : 'false', ';
 
-		// ]]></script>';
 
+	<script type="text/javascript"><!-- // --><![CDATA[
 
+		window.smfForum_scripturl = "', $scripturl, '";
 
+		window.smfForum_sessionid = "', $context['session_id'], '";
 
+		window.smfForum_sessionvar = "', $context['session_var'], '";
 
+		window.smfThemes_writable = ', $context['can_create_new'] ? 'true' : 'false', ';
 
+	// ]]></script>';
 
 
 	if (empty($modSettings['disable_smf_js']))
 
 		echo '
 
@@ -254,15 +251,13 @@ function template_list_themes()
 
 						</dd>
 
 					</dl>
 
 					<input type="submit" name="save" value="', $txt['themeadmin_list_reset_go'], '" class="button_submit" />
 
-					<br class="clear_right" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 					<input type="hidden" name="', $context['admin-tl_token_var'], '" value="', $context['admin-tl_token'], '" />
 
 				</div>
 
 			</div>
 
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_reset_list()
 
@@ -307,8 +302,7 @@ function template_reset_list()
 
 	}
 
 
 	echo '
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_set_options()
 
@@ -405,12 +399,10 @@ function template_set_options()
 
 					<hr class="hrcolor" />
 
 					<input type="submit" name="submit" value="', $txt['save'], '" class="button_submit" />
 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-					<br class="clear_right" />
 
 				</div>
 
 			</div>
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_set_settings()
 
@@ -606,15 +598,13 @@ function template_set_settings()
 
 	echo '
 
 					</dl>
 
 					<hr class="hrcolor" />
 
-					<input type="submit" name="save" value="', $txt['save'], '" class="button_submit" /><br />
 
-					<br class="clear_right" />
 
+					<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-sts_token_var'], '" value="', $context['admin-sts_token'], '" />
 
 				</div>
 
 			</div>
 
-			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-			<input type="hidden" name="', $context['admin-sts_token_var'], '" value="', $context['admin-sts_token'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 
 	if (!empty($context['theme_variants']))
 
 	{
 
@@ -728,8 +718,7 @@ function template_pick()
 
 
 	echo '
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Okay, that theme was installed successfully!
 
@@ -753,8 +742,7 @@ function template_installed()
 
 				</p>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_edit_list()
 
@@ -792,8 +780,7 @@ function template_edit_list()
 
 	}
 
 
 	echo '
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_copy_template()
 
@@ -836,8 +823,7 @@ function template_copy_template()
 
 				</ul>
 
 			</div>
 
 		</div>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 function template_edit_browse()
 
@@ -885,8 +871,7 @@ function template_edit_browse()
 
 	echo '
 
 		</tbody>
 
 		</table>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // Wanna edit the stylesheet?
 
@@ -1039,8 +1024,7 @@ function template_edit_style()
 
 			<input type="hidden" name="filename" value="', $context['edit_filename'], '" />
 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 // This edits the template...
 
@@ -1135,8 +1119,7 @@ function template_edit_file()
 
 			</div>
 
 
 		</form>
 
-	</div>
 
-	<br class="clear" />';
 
+	</div>';
 
 }
 
 
 ?>

+ 19 - 6
Themes/default/css/index.css
View File 

@@ -157,7 +157,6 @@ input:focus, textarea:focus, button:focus, select:focus, textarea.editor:focus {
 
 	border-radius: 3px;
 
 }*/
 
 a.button_link {
 
- 
 	color: #333;
 
 	margin: 0 !important;
 
 }
 
@@ -260,7 +259,9 @@ em {
 
 .floatleft {
 
 	float: left;
 
 }
 
-
 
+.floatnone {
 
+	float: none;
 
+}
 
 .flow_auto {
 
 	overflow: auto;
 
 }
 
@@ -908,7 +909,7 @@ img.sort {
 
 #permissions table.table_grid  td {
 
 	padding: 5px 10px;
 
 	cursor: default;
 
-} 
+}
 
 
 .postbg {
 
 	border-left: 1px solid #7f7f7f;
 
@@ -2841,6 +2842,17 @@ tr.windowbg td, tr.windowbg2 td, tr.approvebg td, tr.highlight2 td {
 
 	background-image: none;
 
 }
 
 
+.errorfile_table {
 
+	background: #f0f4f7;
 
+	border-spacing: 3;
 
+	border-collapse: collapse;
 
+}
 
+.errorfile_table td.current {
 
+	font-weight: bold;
 
+	border: 1px solid black;
 
+	border-width: 1px 0 1px 1px;
 
+}
 
+
 
 /* Styles for (fatal) errors.
 
 ------------------------------------------------- */
 
 
@@ -3049,7 +3061,8 @@ dl {
 
 	border: solid #666;
 
 	border-width: 1px 1px 1px 1px;
 
 	border-left: none;
 
-	border-right: none; background: #eee;
 
+	border-right: none;
 
+	background: #eee;
 
 	text-align: center;
 
 }
 
 .activity_stats li.last span {
 
@@ -3262,12 +3275,12 @@ img.centericon {
 
 #stats_left, #top_posters, #top_topics_replies, #top_topics_starter {
 
 	float: left;
 
 	width: 50%;
 
-	padding: 0 3px 0 0; 
+	padding: 0 3px 0 0;
 
 }
 
 #stats_right, #top_boards, #top_topics_views, #most_online {
 
 	float: right;
 
 	width: 50%;
 
-	padding: 0 0 0 3px; 
+	padding: 0 0 0 3px;
 
 }
 
 #stats_left{
 
 	border-right: 1px solid #bbb;