! First of many cleanup commits to better support the penguin theme

! Removed commented out test code from index.css, revert to the old if you want any of that for testing in your branch.

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

Themes/default/BoardIndex.template.php

@@ -197,7 +197,7 @@ function template_main()
 					foreach ($board['children'] as $child)
 					{
 						if (!$child['is_redirect'])
-							$child['link'] = '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . ($child['new'] ? '</a> <a  ' . ($child['new'] ? 'class="new_posts" ' : '') . 'href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span>' : '') . '</a>';
+							$child['link'] = '<a href="' . $child['href'] . '" ' . ($child['new'] ? 'class="board_new_posts" ' : '') . 'title="' . ($child['new'] ? $txt['new_posts'] : $txt['old_posts']) . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')">' . $child['name'] . ($child['new'] ? '</a> <a href="' . $scripturl . '?action=unread;board=' . $child['id'] . '" title="' . $txt['new_posts'] . ' (' . $txt['board_topics'] . ': ' . comma_format($child['topics']) . ', ' . $txt['posts'] . ': ' . comma_format($child['posts']) . ')"><span class="new_posts">' . $txt['new'] . '</span>' : '') . '</a>';
 						else
 							$child['link'] = '<a href="' . $child['href'] . '" title="' . comma_format($child['posts']) . ' ' . $txt['redirects'] . '">' . $child['name'] . '</a>';
 

Themes/default/ManageAttachments.template.php

@@ -80,6 +80,7 @@ function template_maintenance()
 			</div>
 			<span class="botslice"><span></span></span>
 		</div>
+		<br class="clear" />
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['attachment_integrity_check'], '</h3>
 		</div>
@@ -95,6 +96,7 @@ function template_maintenance()
 			</div>
 			<span class="botslice"><span></span></span>
 		</div>
+		<br class="clear" />
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['attachment_pruning'], '</h3>
 		</div>

Themes/default/ManageBoards.template.php

@@ -102,7 +102,8 @@ function template_main()
 				</div>
 				<span class="botslice"><span></span></span>
 			</div>
-		</form>';
+		</form>
+		<br class="clear" />';
 	}
 	echo '
 	</div>

Themes/default/ManageMail.template.php

@@ -30,7 +30,8 @@ function template_browse()
 				</dl>
 			</div>
 			<span class="botslice"><span></span></span>
-		</div>';
+		</div>
+		<br class="clear" />';
 
 	template_show_list('mail_queue');
 

Themes/default/ManageMaintenance.template.php

@@ -57,8 +57,10 @@ function template_maintain_database()
 	if ($db_type == 'sqlite')
 		echo '
 					<hr class="hrcolor" />
-					<p><input type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" class="button_submit" />
-					<br class="clear_right" /></p>';
+					<p>
+						<input type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" class="button_submit" />
+						<br class="clear_right" />
+					</p>';
 	else
 	{
 		if ($context['safe_mode_enable'])
@@ -72,12 +74,16 @@ function template_maintain_database()
 					'</div>';
 
 		echo '
-					<p><label for="struct"><input type="checkbox" name="struct" id="struct" onclick="document.getElementById(\'submitDump\').disabled = !document.getElementById(\'struct\').checked &amp;&amp; !document.getElementById(\'data\').checked;" class="input_check" checked="checked" /> ', $txt['maintain_backup_struct'], '</label><br />
-					<label for="data"><input type="checkbox" name="data" id="data" onclick="document.getElementById(\'submitDump\').disabled = !document.getElementById(\'struct\').checked &amp;&amp; !document.getElementById(\'data\').checked;" checked="checked" class="input_check" /> ', $txt['maintain_backup_data'], '</label><br />
-					<label for="compress"><input type="checkbox" name="compress" id="compress" value="gzip"', $context['suggested_method'] == 'zipped_file' ? ' checked="checked"' : '', ' class="input_check" /> ', $txt['maintain_backup_gz'], '</label></p>
+					<p>
+						<label for="struct"><input type="checkbox" name="struct" id="struct" onclick="document.getElementById(\'submitDump\').disabled = !document.getElementById(\'struct\').checked &amp;&amp; !document.getElementById(\'data\').checked;" class="input_check" checked="checked" /> ', $txt['maintain_backup_struct'], '</label><br />
+						<label for="data"><input type="checkbox" name="data" id="data" onclick="document.getElementById(\'submitDump\').disabled = !document.getElementById(\'struct\').checked &amp;&amp; !document.getElementById(\'data\').checked;" checked="checked" class="input_check" /> ', $txt['maintain_backup_data'], '</label><br />
+						<label for="compress"><input type="checkbox" name="compress" id="compress" value="gzip"', $context['suggested_method'] == 'zipped_file' ? ' checked="checked"' : '', ' class="input_check" /> ', $txt['maintain_backup_gz'], '</label>
+					</p>
 					<hr class="hrcolor" />
-					<p><input ', $context['use_maintenance'] == 2 ? 'disabled="disabled" ' : '', 'type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" onclick="return document.getElementById(\'struct\').checked || document.getElementById(\'data\').checked;" class="button_submit" />
-					<br class="clear_right" /></p>';
+					<p>
+						<input ', $context['use_maintenance'] == 2 ? 'disabled="disabled" ' : '', 'type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" onclick="return document.getElementById(\'struct\').checked || document.getElementById(\'data\').checked;" class="button_submit" />
+						<br class="clear_right" />
+					</p>';
 	}
 
 	echo '

Themes/default/ManageMembers.template.php

@@ -158,7 +158,7 @@ function template_search_members()
 				</div>
 				<span class="botslice clear_right"><span></span></span>
 			</div>
-			<br />
+			<br class="clear" />
 			<div class="title_bar">
 				<h3 class="titlebg">', $txt['member_part_of_these_membergroups'], '</h3>
 			</div>

Themes/default/ManagePaid.template.php

@@ -491,7 +491,7 @@ function template_user_subscription()
 
 	echo '
 		</form>
-		<br />
+		<br class="clear"/>
 		<div class="title_bar">
 			<h3 class="titlebg">', $txt['paid_current'], '</h3>
 		</div>

Themes/default/ManageSmileys.template.php

@@ -350,7 +350,7 @@ function template_addsmiley()
 				</div>
 				<span class="botslice"><span></span></span>
 			</div>
-			<br />
+			<br class="clear" />
 			<div class="cat_bar">
 				<h3 class="catbg">', $txt['smiley_new'], '</h3>
 			</div>

Themes/default/Packages.template.php

@@ -580,7 +580,7 @@ function template_browse()
 		// ]]></script>';
 
 		echo '
-		<br />
+		<br class="clear" />
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['browse_packages'], '</h3>
 		</div>';
@@ -591,9 +591,6 @@ function template_browse()
 	{
 		if (!empty($context['available_' . $type]))
 		{
-			echo '
-		<br />';
-		
 			template_show_list('packages_lists_' . $type);
 			$mods_available = true;
 		}

Themes/default/Profile.template.php

@@ -455,7 +455,7 @@ function template_showPosts()
 		{
 			echo '
 				<tr class="', $attachment['approved'] ? ($alternate ? 'windowbg' : 'windowbg2') : 'approvebg', '">
-					<td><a href="', $scripturl, '?action=dlattach;topic=', $attachment['topic'], '.0;attach=', $attachment['id'], '">', $attachment['filename'], '</a>', !$attachment['approved'] ? '&nbsp;<em>(' . $txt['awaiting_approval'] . ')</em>' : '', '</td>
+					<td><a href="', $scripturl, '?action=dlattach;topic=', $attachment['topic'], '.0;attach=', $attachment['id'], '">',	$attachment['filename'], '</a>', !$attachment['approved'] ? '&nbsp;<em>(' . $txt['awaiting_approval'] . ')</em>' : '', '</td>
 					<td align="center">', $attachment['downloads'], '</td>
 					<td><a href="', $scripturl, '?topic=', $attachment['topic'], '.msg', $attachment['msg'], '#msg', $attachment['msg'], '" rel="nofollow">', $attachment['subject'], '</a></td>
 					<td>', $attachment['posted'], '</td>
@@ -487,10 +487,10 @@ function template_showPosts()
 function template_editBuddies()
 {
 	global $context, $settings, $options, $scripturl, $modSettings, $txt;
-	
+
 	$disabled_fields = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
 	$buddy_fields = array('icq', 'aim', 'yim', 'msn');
-	
+
 	echo '
 		<div class="title_bar">
 			<h3 class="titlebg">
@@ -757,7 +757,7 @@ function template_trackActivity()
 				</div>
 				<span class="botslice"><span></span></span>
 			</div>
-		<br />';
+			<br class="clear" />';
 
 	// Show the track user list.
 	template_show_list('track_user_list');
@@ -792,7 +792,7 @@ function template_trackIP()
 		</div>
 		<span class="lowerframe"><span></span></span>
 	</div>
-	<br />';
+	<br class="clear" />';
 
 	// The table inbetween the first and second table shows links to the whois server for every region.
 	if ($context['single_ip'])
@@ -811,7 +811,7 @@ function template_trackIP()
 				</div>
 				<span class="botslice"><span></span></span>
 			</div>
-		<br />';
+		<br class="clear" />';
 	}
 
 	// The second table lists all the members who have been logged as using this IP address.

Themes/default/Recent.template.php

@@ -193,7 +193,7 @@ function template_unread()
 								', $topic['views'], ' ', $txt['views'], '
 							</td>
 							<td class="', $color_class2, ' lastpost windowbg2">
-								<a href="', $topic['last_post']['href'], '"><img src="', $settings['images_url'], '/icons/last_post.png" alt="', $txt['last_post'], '" title="', $txt['last_post'], '" style="float: right;" /></a>
+								<a href="', $topic['last_post']['href'], '"><img src="', $settings['images_url'], '/icons/last_post.png" alt="', $txt['last_post'], '" title="', $txt['last_post'], '" class="floatright" /></a>
 								', $topic['last_post']['time'], '<br />
 								', $txt['by'], ' ', $topic['last_post']['member']['link'], '
 							</td>';
@@ -376,7 +376,7 @@ function template_replies()
 								', $topic['views'], ' ', $txt['views'], '
 							</td>
 							<td class="', $color_class2, ' lastpost windowbg2">
-								<a href="', $topic['last_post']['href'], '"><img src="', $settings['images_url'], '/icons/last_post.png" alt="', $txt['last_post'], '" title="', $txt['last_post'], '" style="float: right;" /></a>
+								<a href="', $topic['last_post']['href'], '"><img src="', $settings['images_url'], '/icons/last_post.png" alt="', $txt['last_post'], '" title="', $txt['last_post'], '" class="floatright" /></a>
 								', $topic['last_post']['time'], '<br />
 								', $txt['by'], ' ', $topic['last_post']['member']['link'], '
 							</td>';

Themes/penguin/Admin.template.php

@@ -772,6 +772,10 @@ function template_show_settings()
 			// A title?
 			if ($config_var['type'] == 'title')
 			{
+				if (!$is_open)
+					echo '
+					<br class="clear" />';
+				
 				echo '
 					<div class="cat_bar">
 						<h3 class="', !empty($config_var['class']) ? $config_var['class'] : 'catbg', '"', !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', '>

Themes/penguin/ManageMaintenance.template.php

@@ -18,14 +18,14 @@ function template_maintain_database()
 	// If maintenance has finished tell the user.
 	if (!empty($context['maintenance_finished']))
 		echo '
-			<div class="infobox">
+			<div class="maintenance_finished">
 				', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 			</div>';
 
 	echo '
 	<div id="manage_maintenance">
 		<div class="cat_bar">
-			<h3 class="catbg">', $txt['maintain_sub_database'], '', $txt['permitgroups_maintenance'], '</h3>
+			<h3 class="catbg">', $txt['maintain_sub_database'], ' ', $txt['permitgroups_maintenance'], '</h3>
 		</div>
 		<div class="windowbg2">
 			<div class="content">
@@ -35,14 +35,16 @@ function template_maintain_database()
 					<input type="submit" 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><hr />
+				</form>
+				<hr />
 			</div>
 			<div class="content">
 				<h3 class="double_height">
 					<a href="', $scripturl, '?action=helpadmin;help=maintenance_backup" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="', $txt['help'], '" /></a> ', $txt['maintain_backup'], '
 				</h3>
 				<form action="', $scripturl, '?action=admin;area=maintain;sa=database;activity=backup" method="post" accept-charset="', $context['character_set'], '">
-					<p class="floatleft">', $txt['maintain_backup_info'], '</p>';
+					<p class="floatleft">', $txt['maintain_backup_info'], '</p>
+					<br classs="clear" />';
 
 	if ($db_type == 'sqlite')
 		echo '
@@ -51,14 +53,27 @@ function template_maintain_database()
 						<input type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" class="button_submit" />
 					</p>';
 	else
+	{
+		if ($context['safe_mode_enable'])
+			echo '
+					<div class="errorbox">', $txt['safe_mode_enabled'], '</div>';
+		else
+			echo '
+					<div class="', $context['suggested_method'] == 'use_external_tool' || $context['use_maintenance'] != 0 ? 'errorbox' : 'noticebox', '">
+						', $txt[$context['suggested_method']],
+						$context['use_maintenance'] != 0 ? '<br />' . $txt['enable_maintenance' . $context['use_maintenance']] : '',
+					'</div>';
 		echo '
-					<p class="floatleft clear">
+					<p>
 						<label for="struct"><input type="checkbox" name="struct" id="struct" onclick="document.getElementById(\'submitDump\').disabled = !document.getElementById(\'struct\').checked &amp;&amp; !document.getElementById(\'data\').checked;" class="input_check" checked="checked" /> ', $txt['maintain_backup_struct'], '</label><br />
 						<label for="data"><input type="checkbox" name="data" id="data" onclick="document.getElementById(\'submitDump\').disabled = !document.getElementById(\'struct\').checked &amp;&amp; !document.getElementById(\'data\').checked;" checked="checked" class="input_check" /> ', $txt['maintain_backup_data'], '</label><br />
-						<label for="compress"><input type="checkbox" name="compress" id="compress" value="gzip" checked="checked" class="input_check" /> ', $txt['maintain_backup_gz'], '</label>
+						<label for="compress"><input type="checkbox" name="compress" id="compress" value="gzip"', $context['suggested_method'] == 'zipped_file' ? ' checked="checked"' : '', ' class="input_check" /> ', $txt['maintain_backup_gz'], '</label>
 					</p>
-					<input type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" onclick="return document.getElementById(\'struct\').checked || document.getElementById(\'data\').checked;" class="button_submit" />';
-
+					<p>
+						<input ', $context['use_maintenance'] == 2 ? 'disabled="disabled" ' : '', 'type="submit" value="', $txt['maintain_backup_save'], '" id="submitDump" onclick="return document.getElementById(\'struct\').checked || document.getElementById(\'data\').checked;" class="button_submit" />
+						<br class="clear_right" />
+					</p>';
+	}
 	echo '
 					<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'], '" />

Themes/penguin/MessageIndex.template.php

@@ -22,7 +22,7 @@ function template_main()
 		echo '
 	<div class="tborder childboards" id="board_', $context['current_board'], '_childboards">
 		<div class="cat_bar">
-			<h3 class="catbg"><span class="floatleft">', $txt['parent_boards'], '</span><img id="Child_swap" src="', $settings['images_url'], '/collapse.png" alt="*" title="', $txt['upshrink_description'], '" style="display: none; float: right;" /></h3>
+			<h3 class="catbg"><span class="floatleft">', $txt['parent_boards'], '</span><img class="toggle" id="Child_swap" src="', $settings['images_url'], '/collapse.png" alt="*" title="', $txt['upshrink_description'], '" /></h3>
 		</div>
 		<div class="table_frame">
 			<table class="table_list">
@@ -460,23 +460,35 @@ function template_main()
 
 	var mouse_on_div;
 
-		$(document).ready(function(){
-				$(".table_list tbody tr").show();
-				$("#Child_swap").show();
+	$(document).ready(function(){
+		$(".table_list tbody tr").show();
+		$("#Child_swap").show();
 
-			$("#Child_swap").click(function(){
+		$("#Child_swap").click(function(){
+			// toggle the div on / off
 			$(".table_list tbody tr").toggle();
-			});
+			
+			// swap the collapse / expand images
+			var sCurrent_image = $("#Child_swap").attr("src");
+			if ($("#Child_swap").attr("class") == "toggle") {
+				$("#Child_swap").attr("src", sCurrent_image.replace("collapse", "expand"));
+			} else {
+				$("#Child_swap").attr("src", sCurrent_image.replace("expand", "collapse"));
+			}
+			
+			// add/remove a class element to keep track of the image status
+			$("#Child_swap").toggleClass("on");
 		});
+	});
 
-		$(document).ready(function(){
-				$("td.stickybg, td.stickybg2").show();
-				$("#Sticky_toggle").show();
+	$(document).ready(function(){
+		$("td.stickybg, td.stickybg2").show();
+		$("#Sticky_toggle").show();
 
-			$("#Sticky_toggle").click(function(){
+		$("#Sticky_toggle").click(function(){
 			$("td.stickybg, td.stickybg2").toggle();
-			});
 		});
+	});
 ';
 		//$(document).ready(function() { 
 		//	$("span.thingy").bt();

Themes/penguin/Profile.template.php

@@ -550,7 +550,7 @@ function template_editBuddies()
 			<div class="title_bar">
 				<h3 class="titlebg">', $txt['buddy_add'], '</h3>
 			</div>
-			<div class="roundframe">
+			<div class="roundframe padding">
 				<dl class="settings">
 					<dt>
 						<label for="new_buddy"><strong>', $txt['who_member'], ':</strong></label>
@@ -733,7 +733,7 @@ function template_trackActivity()
 					</dl>
 				</div>
 			</div>
-		<br />';
+			<br class="clear" />';
 
 	// Show the track user list.
 	template_show_list('track_user_list');
@@ -766,7 +766,7 @@ function template_trackIP()
 			</form>
 		</div>
 	</div>
-	<br />';
+	<br class="clear" />';
 
 	// The table inbetween the first and second table shows links to the whois server for every region.
 	if ($context['single_ip'])
@@ -783,7 +783,7 @@ function template_trackIP()
 			echo '
 				</div>
 			</div>
-		<br />';
+		<br class="clear" />';
 	}
 
 	// The second table lists all the members who have been logged as using this IP address.
@@ -1014,7 +1014,8 @@ function template_statPanel()
 					</dl>
 				</div>
 			</div>
-		</div>';
+		</div>
+		<br class="clear" />';
 
 	// This next section draws a graph showing what times of day they post the most.
 	echo '

Themes/penguin/Stats.template.php

@@ -316,7 +316,7 @@ function template_main()
 					<th width="15%">', $txt['stats_new_topics'], '</th>
 					<th width="15%">', $txt['stats_new_posts'], '</th>
 					<th width="15%">', $txt['stats_new_members'], '</th>
-					<th', empty($modSettings['hitStats']) ? ' class="last_th"' : '', ' width="15%">', $txt['most_online'], '</th>';
+					<th width="15%">', $txt['most_online'], '</th>';
 
 		if (!empty($modSettings['hitStats']))
 			echo '

Themes/penguin/Themes.template.php

@@ -304,7 +304,8 @@ function template_reset_list()
 					</li>
 				</ul>
 			</div>
-		</div>';
+		</div>
+		<br class="clear" />';
 	}
 
 	echo '
@@ -446,7 +447,8 @@ function template_set_settings()
 						</li>
 					</ul>
 				</div>
-			</div>';
+			</div>
+			<br class="clear" />';
 
 	echo '
 			<div class="cat_bar">
@@ -483,7 +485,8 @@ function template_set_settings()
 						</dd>
 					</dl>
 				</div>
-			</div>';
+			</div>
+			<br class="clear" />';
 
 	// Do we allow theme variants?
 	if (!empty($context['theme_variants']))
@@ -790,7 +793,8 @@ function template_edit_list()
 					<li><a href="', $scripturl, '?action=admin;area=theme;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=copy">', $txt['themeadmin_edit_copy_template'], '</a></li>
 				</ul>
 			</div>
-		</div>';
+		</div>
+		<br class="clear" />';
 	}
 
 	echo '