! fix page validation errors, several templates, ManagePaid.template.php, ManagePermissions.template.php

! move settings items in to the <dl for consistency Packages.template.php
! update expandable div's to use standard smc_toggle function ManageNews.template.php, Packages.template.php, PersonalMessage.template.php
! More form button and link consistency missed in the last round, Post.template.php, PersonalMessage.template.php
! update & add images so expand options click did not use the sort_down icon but its own icon

Themes/default/ManageNews.template.php

@@ -56,7 +56,7 @@ function template_edit_news()
 				</tbody>
 			</table>
 			<div class="floatleft padding">
-				<div id="moreNewsItems_link" style="display: none;">[<a href="javascript:void(0);" onclick="addNewsItem(); return false;">', $txt['editnews_clickadd'], '</a>]</div>
+				<div id="moreNewsItems_link" style="display: none;"><a class="button_link" href="javascript:void(0);" onclick="addNewsItem(); return false;">', $txt['editnews_clickadd'], '</a></div>
 				<script type="text/javascript"><!-- // --><![CDATA[
 					document.getElementById("moreNewsItems_link").style.display = "";
 					function addNewsItem()
@@ -82,20 +82,6 @@ function template_email_members()
 {
 	global $context, $settings, $options, $txt, $scripturl;
 
-	// This is some javascript for the simple/advanced toggling stuff.
-	echo '
-	<script type="text/javascript"><!-- // --><![CDATA[
-		function toggleAdvanced(mode)
-		{
-			// What styles are we doing?
-			var divStyle = mode ? "" : "none";
-
-			document.getElementById("advanced_settings_div").style.display = divStyle;
-			document.getElementById("gosimple").style.display = divStyle;
-			document.getElementById("goadvanced").style.display = mode ? "none" : "";
-		}
-	// ]]></script>';
-
 	echo '
 	<div id="admincenter">
 		<form action="', $scripturl, '?action=admin;area=news;sa=mailingcompose" method="post" class="flow_hidden" accept-charset="', $context['character_set'], '">
@@ -132,15 +118,13 @@ function template_email_members()
 			<br />
 
 			<div class="cat_bar">
-				<h3 class="catbg" id="advanced_select_div" style="display: none;">
-					<span class="ie6_header floatleft">
-						<a href="#" onclick="toggleAdvanced(1); return false;" id="goadvanced"><img src="', $settings['images_url'], '/selected.png" alt="', $txt['advanced'], '" />&nbsp;<strong>', $txt['advanced'], '</strong></a>
-						<a href="#" onclick="toggleAdvanced(0); return false;" id="gosimple" style="display: none;"><img src="', $settings['images_url'], '/sort_down.png" alt="', $txt['simple'], '" />&nbsp;<strong>', $txt['simple'], '</strong></a>
-					</span>
+				<h3 class="catbg">
+					<span class="ie6_header floatleft"><strong>', $txt['advanced'], '</strong></span>
+					<img class="panel_toggle" src="', $settings['images_url'], '/', empty($context['show_advanced_options']) ? 'collapse' : 'expand', '.png" id="advanced_panel_toggle" alt="*" />
 				</h3>
 			</div>
 
-			<div class="windowbg2" id="advanced_settings_div" style="display: none;">
+			<div id="advanced_panel_div" class="windowbg2">
 				<span class="topslice"><span></span></span>
 				<div class="content">
 					<dl class="settings">
@@ -206,11 +190,35 @@ function template_email_members()
 	</div>
 	<br class="clear" />';
 
-	// Make the javascript stuff visible.
+	// This is some javascript for the simple/advanced toggling and member suggest
 	echo '
+	<script type="text/javascript"><!-- // --><![CDATA[
+		var oAdvancedPanelToggle = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: ', empty($context['show_advanced_options']) ? 'true' : 'false', ',
+			aSwappableContainers: [
+				\'advanced_panel_div\'
+			],
+			aSwapImages: [
+				{
+					sId: \'advanced_panel_toggle\',
+					srcExpanded: smf_images_url + \'/collapse.png\',
+					altExpanded: ', JavaScriptEscape($txt['upshrink_description']), ',
+					srcCollapsed: smf_images_url + \'/expand.png\',
+					altCollapsed: ', JavaScriptEscape($txt['upshrink_description']), '
+				}
+			],
+			oThemeOptions: {
+				bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
+				sOptionName: \'admin_preferences\',
+				sSessionVar: smf_session_var,
+				sSessionId: smf_session_id,
+				sThemeId: \'1\'
+			}
+		});
+	// ]]></script>
 	<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?fin20"></script>
 	<script type="text/javascript"><!-- // --><![CDATA[
-		document.getElementById("advanced_select_div").style.display = "";
 		var oMemberSuggest = new smc_AutoSuggest({
 			sSelf: \'oMemberSuggest\',
 			sSessionId: smf_session_id,

Themes/default/ManagePaid.template.php

@@ -185,7 +185,7 @@ function template_modify_subscription()
 							</dl>
 						</fieldset>
 					</div>
-					<hr class="hrcolor">
+					<hr class="hrcolor" />
 					<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'], '" />

Themes/default/ManagePermissions.template.php

@@ -97,9 +97,8 @@ function template_permission_index()
 		echo '
 			<div class="cat_bar">
 				<h3 class="catbg">
-					<span class="ie6_header floatleft">
-						<img src="', $settings['images_url'], '/', empty($context['show_advanced_options']) ? 'selected' : 'sort_down', '.png" id="permissions_panel_toggle" alt="*" /> ', $txt['permissions_advanced_options'], '
-					</span>
+					<span class="ie6_header">', $txt['permissions_advanced_options'], '</span>
+					<img class="panel_toggle" src="', $settings['images_url'], '/', empty($context['show_advanced_options']) ? 'collapse' : 'expand', '.png" id="permissions_panel_toggle" alt="*" />
 				</h3>
 			</div>
 			<div id="permissions_panel_advanced" class="windowbg">
@@ -202,9 +201,9 @@ function template_permission_index()
 			aSwapImages: [
 				{
 					sId: \'permissions_panel_toggle\',
-					srcExpanded: smf_images_url + \'/sort_down.png\',
+					srcExpanded: smf_images_url + \'/collapse.png\',
 					altExpanded: ', JavaScriptEscape($txt['upshrink_description']), ',
-					srcCollapsed: smf_images_url + \'/selected.png\',
+					srcCollapsed: smf_images_url + \'/expand.png\',
 					altCollapsed: ', JavaScriptEscape($txt['upshrink_description']), '
 				}
 			],
@@ -453,7 +452,7 @@ 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 />
+					<br class="clear_right" />
 				</div>
 				<span class="botslice"><span></span></span>
 			</div>
@@ -615,7 +614,7 @@ function template_modify_group_simple($type)
 					<tr class="windowbg">
 						<td colspan="2" width="100%" align="left">
 							<a href="#" onclick="return toggleBreakdown(\'', $id_group, '\');">
-								<img src="', $settings['images_url'], '/sort_down.png" id="group_toggle_img_', $id_group, '" alt="*" />&nbsp;<strong>', $permissionGroup['name'], '</strong>
+								<img src="', $settings['images_url'], '/selected_open.png" id="group_toggle_img_', $id_group, '" alt="*" />&nbsp;<strong>', $permissionGroup['name'], '</strong>
 							</a>
 						</td>';
 				if (empty($modSettings['permission_enable_deny']) || $context['group']['id'] == -1)

Themes/default/Packages.template.php

@@ -602,21 +602,19 @@ function template_browse()
 		echo '
 		<div class="information">', $context['sub_action'] == 'browse' ? $txt['no_packages'] : $txt['no_mods_installed'], '</div>';
 
+	// the advanced (emulation) box, collapsed by default
 	if ($context['sub_action'] == 'browse')
-	echo '
-		<div class="flow_auto">
-			<div class="padding">
-				<a class="button_link" href="#" onclick="document.getElementById(\'advanced_box\').style.display = document.getElementById(\'advanced_box\').style.display == \'\' ? \'none\' : \'\'; return false;">', $txt['package_advanced_button'], '</a>
-			</div>
-		</div>';
-		
-	echo '
+		echo '
+		<br class="clear" />
 		<form action="', $scripturl, '?action=admin;area=packages;sa=browse" method="get">
-			<div id="advanced_box" style="display: none;">
+			<div id="advanced_box" >
 				<div class="cat_bar">
-					<h3 class="catbg">', $txt['package_advanced_options'], '</h3>
+					<h3 class="catbg">
+					<span class="ie6_header floatleft"><strong>', $txt['package_advanced_options'], '</strong></span>
+					<img class="panel_toggle" src="', $settings['images_url'], '/', empty($context['show_advanced_options']) ? 'collapse' : 'expand', '.png" id="advanced_panel_toggle" alt="*" />
+					</h3>
 				</div>
-				<div class="windowbg">
+				<div id="advanced_panel_div" class="windowbg">
 					<span class="topslice"><span></span></span>
 					<div class="content">
 						<p>
@@ -643,9 +641,36 @@ function template_browse()
 			<input type="hidden" name="action" value="admin" />
 			<input type="hidden" name="area" value="packages" />
 			<input type="hidden" name="sa" value="browse" />
-		</form>
+		</form>';
+	
+	echo '
 	</div>
 	<br class="clear" />
+	<script type="text/javascript"><!-- // --><![CDATA[
+		var oAdvancedPanelToggle = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: ', empty($context['show_advanced_options']) ? 'true' : 'false', ',
+			aSwappableContainers: [
+				\'advanced_panel_div\'
+			],
+			aSwapImages: [
+				{
+					sId: \'advanced_panel_toggle\',
+					srcExpanded: smf_images_url + \'/collapse.png\',
+					altExpanded: ', JavaScriptEscape($txt['upshrink_description']), ',
+					srcCollapsed: smf_images_url + \'/expand.png\',
+					altCollapsed: ', JavaScriptEscape($txt['upshrink_description']), '
+				}
+			],
+			oThemeOptions: {
+				bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
+				sOptionName: \'admin_preferences\',
+				sSessionVar: smf_session_var,
+				sSessionId: smf_session_id,
+				sThemeId: \'1\'
+			}
+		});
+	// ]]></script>
 	<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?fin20"></script>
 	<script type="text/javascript"><!-- // --><![CDATA[
 			var oAddVersionSuggest = new smc_AutoSuggest({
@@ -1084,9 +1109,19 @@ function template_install_options()
 						<dd>
 							<input type="text" name="pack_user" id="pack_user" value="', $context['package_ftp_username'], '" size="30" class="input_text" />
 						</dd>
+						<dt>
+							<label for="package_make_backups">', $txt['package_install_options_make_backups'], '</label>
+						</dt>
+						<dd>
+							<input type="checkbox" name="package_make_backups" id="package_make_backups" value="1" class="input_check"', $context['package_make_backups'] ? ' checked="checked"' : '', ' />
+						</dd>
+						<dt>
+							<label for="package_make_full_backups">', $txt['package_install_options_make_full_backups'], '</label>
+						</dt>
+						<dd>
+							<input type="checkbox" name="package_make_full_backups" id="package_make_full_backups" value="1" class="input_check"', $context['package_make_full_backups'] ? ' checked="checked"' : '', ' />
+						</dd>
 					</dl>
-					<label for="package_make_backups"><input type="checkbox" name="package_make_backups" id="package_make_backups" value="1" class="input_check"', $context['package_make_backups'] ? ' checked="checked"' : '', ' /> ', $txt['package_install_options_make_backups'], '</label><br /><br />
-					<label for="package_make_full_backups"><input type="checkbox" name="package_make_full_backups" id="package_make_full_backups" value="1" class="input_check"', $context['package_make_full_backups'] ? ' checked="checked"' : '', ' /> ', $txt['package_install_options_make_full_backups'], '</label><br /><br />
 					<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'], '" />

Themes/default/PersonalMessage.template.php

@@ -739,10 +739,12 @@ function template_search()
 			<div class="roundframe">
 				<div class="title_bar">
 					<h4 class="titlebg">
-						<span class="ie6_header floatleft"><a href="javascript:void(0);" onclick="expandCollapseLabels(); return false;"><img src="', $settings['images_url'], '/expand.png" id="expandLabelsIcon" alt="" /></a> <a href="javascript:void(0);" onclick="expandCollapseLabels(); return false;"><strong>', $txt['pm_search_choose_label'], '</strong></a></span>
+						<span class="ie6_header floatleft"><strong>', $txt['pm_search_choose_label'], '</strong></span>
+						<img class="panel_toggle" src="', $settings['images_url'], '/', empty($context['show_advanced_options']) ? 'collapse' : 'expand', '.png" id="advanced_panel_toggle" alt="*" />
 					</h4>
 				</div>
-				<ul id="searchLabelsExpand" class="reset" ', $context['check_all'] ? 'style="display: none;"' : '', '>';
+				<div id="advanced_panel_div">
+				<ul id="searchLabelsExpand" class="reset" >';
 
 			foreach ($context['search_labels'] as $label)
 				echo '
@@ -753,6 +755,7 @@ function template_search()
 
 			echo '
 				</ul>
+				</div>
 				<p>
 					<span class="floatleft"><input type="checkbox" name="all" id="check_all" value="" ', $context['check_all'] ? 'checked="checked"' : '', ' onclick="invertAll(this, this.form, \'searchlabel\');" class="input_check" /><em> <label for="check_all">', $txt['check_all'], '</label></em></span>
 					<input type="submit" name="pm_search" value="', $txt['pm_search_go'], '" class="button_submit" />
@@ -760,6 +763,34 @@ function template_search()
 			</div>
 			<span class="lowerframe"><span></span></span>
 		</fieldset>';
+
+			// Some javascript for the advanced toggling
+			echo '
+		<script type="text/javascript"><!-- // --><![CDATA[
+			var oAdvancedPanelToggle = new smc_Toggle({
+				bToggleEnabled: true,
+				bCurrentlyCollapsed: ', empty($context['show_advanced_options']) ? 'true' : 'false', ',
+				aSwappableContainers: [
+					\'advanced_panel_div\'
+				],
+				aSwapImages: [
+					{
+						sId: \'advanced_panel_toggle\',
+						srcExpanded: smf_images_url + \'/collapse.png\',
+						altExpanded: ', JavaScriptEscape($txt['upshrink_description']), ',
+						srcCollapsed: smf_images_url + \'/expand.png\',
+						altCollapsed: ', JavaScriptEscape($txt['upshrink_description']), '
+					}
+				],
+				oThemeOptions: {
+					bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
+					sOptionName: \'admin_preferences\',
+					sSessionVar: smf_session_var,
+					sSessionId: smf_session_id,
+					sThemeId: \'1\'
+				}
+			});
+		// ]]></script>';
 		}
 	}
 
@@ -1227,6 +1258,7 @@ function template_labels()
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 	</form>
+	<br class="clear" />
 	<form action="', $scripturl, '?action=pm;sa=manlabels" method="post" accept-charset="', $context['character_set'], '" style="margin-top: 1ex;">
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['pm_label_add_new'], '</h3>
@@ -1242,9 +1274,9 @@ function template_labels()
 						<input type="text" id="add_label" name="label" value="" size="30" maxlength="30" class="input_text" />
 					</dd>
 				</dl>
-				<div class="righttext">
-					<input type="submit" name="add" value="', $txt['pm_label_add_new'], '" class="button_submit" />
-				</div>
+				<hr class="hrcolor" />
+				<input type="submit" name="add" value="', $txt['pm_label_add_new'], '" class="button_submit" />
+				<br class="clear_right" />
 			</div>
 			<span class="botslice"><span></span></span>
 		</div>
@@ -1385,7 +1417,7 @@ function template_rules()
 		</tbody>
 		</table>
 		<div class="righttext">
-			[<a href="', $scripturl, '?action=pm;sa=manrules;add;rid=0">', $txt['pm_add_rule'], '</a>]';
+			<a class="button_link" href="', $scripturl, '?action=pm;sa=manrules;add;rid=0">', $txt['pm_add_rule'], '</a>';
 
 	if (!empty($context['rules']))
 		echo '

Themes/default/Post.template.php

@@ -507,8 +507,8 @@ function template_main()
 					<p class="smalltext" id="shortcuts">
 						', isBrowser('is_firefox') ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '
 					</p>
+					<hr class="hrcolor" />
 					<p id="post_confirm_buttons">
-						<hr class="hrcolor" />
 						', template_control_richedit_buttons($context['post_box_name']);
 
 	// Option to delete an event if user is editing one.

Themes/default/css/admin.css

@@ -407,7 +407,6 @@ span.search_weight
 	width: 40px;
 	padding: 0 0.5em;
 	text-align: right;
-	display: inline-block;
 }
 .search_settings
 {

Themes/default/css/index.css

@@ -134,7 +134,8 @@ input:focus, textarea:focus, button:focus, select:focus
 /* Lotsa new stuff innit */
 /* Nifty input focus styling from Mollyhawk pages. */
 
-input, select, textarea, textarea.editor {
+input, select, textarea, textarea.editor 
+{
 	background: #fff;
 	outline:none !important;
 	border: 1px solid #bbb;
@@ -142,19 +143,25 @@ input, select, textarea, textarea.editor {
 	border-radius: 3px;
 	box-shadow: 0 2px 5px rgba(0,0,0,0.05) inset;
 }
-input:hover, select:hover, textarea:hover, textarea.editor:hover {
+input:hover, select:hover, textarea:hover, textarea.editor:hover 
+{
 	outline:none !important;
 	border: 1px solid #999;
 }
-textarea:hover, textarea.editor:hover {
+textarea:hover, textarea.editor:hover 
+{
 	background: #fbfbfb;
 }
-input:focus, select:focus, textarea:focus, textarea.editor:focus {
+input:focus, select:focus, textarea:focus, textarea.editor:focus 
+{
 	outline:none !important;
 	border: 1px solid #999;
 	box-shadow: 0 2px 5px rgba(0,0,0,0.1) inset;
 }
-select option {padding: 0.1em 0.3em 0.1em 0.3em;}
+select option 
+{
+	padding: 0.1em 0.3em 0.1em 0.3em;
+}
 /* End lotsa new stuff */
 
 .button_link
@@ -166,6 +173,7 @@ select option {padding: 0.1em 0.3em 0.1em 0.3em;}
 	cursor: pointer;
 	font-weight: normal;
 	float: right;
+	border-radius: 3px;
 }
 a.button_link
 { 
@@ -397,6 +405,7 @@ ul.reset, ul.reset li
 	white-space: nowrap;
 	/* Show a scrollbar after about 24 lines. */
 	max-height: 24em;
+	resize: vertical;
 }
 
 /* The "Quote:" and "Code:" header parts... */
@@ -557,7 +566,7 @@ tr.catbg th a:link, tr.catbg th a:visited, tr.catbg2 td a:link, tr.catbg2 td a:v
 	overflow: hidden;
 	margin-bottom: 1px;
 }
-div.pagesection div.floatright input
+div.pagesection div.floatright input, div.pagesection div.floatright select
 {
 	margin-top: 3px;
 }
@@ -934,6 +943,11 @@ table.table_list a.collapse
 	height: 31px;
 	line-height: 31px;
 }
+.panel_toggle
+{	
+	margin: 12px 5px 0 1em;
+	float: right;
+}
 
 /* The half-round header bars for some tables. */
 .table_grid tr.catbg, .table_grid tr.titlebg