SD-SimpleDesk

@@ -64,22 +64,22 @@ function template_shd_admin()

 				</div>

 				<div class="windowbg nopadding">

 					<div class="padding">

-							<img src="', $settings['default_images_url'], '/simpledesk/support.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['shd_need_support'], '</strong><br />

-							', sprintf($txt['shd_support_start_here'], $scripturl . '?action=admin;area=helpdesk_info;sa=support'), '<br />

-							<img src="', $settings['default_images_url'], '/simpledesk/versions.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['support_versions'], ':</strong><br />

+							<img src="', $settings['default_images_url'], '/simpledesk/support.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['shd_need_support'], '</strong><br>

+							', sprintf($txt['shd_support_start_here'], $scripturl . '?action=admin;area=helpdesk_info;sa=support'), '<br>

+							<img src="', $settings['default_images_url'], '/simpledesk/versions.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['support_versions'], ':</strong><br>

 							', $txt['shd_your_version'], ':

-						<em id="yourVersion">', SHD_VERSION, '</em><br />

+						<em id="yourVersion">', SHD_VERSION, '</em><br>

 							', $txt['shd_current_version'], ':

-						<em id="sdVersion">??</em><br /><br />

-							<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['shd_ticket_information'], ':</strong><br />

+						<em id="sdVersion">??</em><br><br>

+							<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['shd_ticket_information'], ':</strong><br>

 							', $txt['shd_total_tickets'], ':

 						<em id="totalTickets">

 								<a href="javascript: shd_ticket_total_information();" >', $context['total_tickets'], '</a>

 						</em>

 						<div id="shd_ticket_total_information" style="display: none;">

-							&nbsp;&nbsp;&nbsp;', $txt['shd_open_tickets'], ': <em>', $context['open_tickets'], '</em><br />

-							&nbsp;&nbsp;&nbsp;', $txt['shd_closed_tickets'], ': <em>', $context['closed_tickets'], '</em><br />

-							&nbsp;&nbsp;&nbsp;', $txt['shd_recycled_tickets'], ': <em>', $context['recycled_tickets'], '</em><br />

+							&nbsp;&nbsp;&nbsp;', $txt['shd_open_tickets'], ': <em>', $context['open_tickets'], '</em><br>

+							&nbsp;&nbsp;&nbsp;', $txt['shd_closed_tickets'], ': <em>', $context['closed_tickets'], '</em><br>

+							&nbsp;&nbsp;&nbsp;', $txt['shd_recycled_tickets'], ': <em>', $context['recycled_tickets'], '</em><br>

 						</div>';

 	// Display all the members who can manage the helpdesk.

@@ -112,7 +112,7 @@ function template_shd_admin()

 				<div class="roundframe">

 					<div class="padding">

 						', $section['pretext'], '

-						<hr />';

+						<hr>';

 				foreach ($section['groups'] as $group)

 				{

@@ -127,7 +127,7 @@ function template_shd_admin()

 					if (isset($group['title']))

 					echo '

-								<strong>', $group['title'], '</strong>', !empty($group['desc']) ? ' - <em class="smalltext">' . $group['desc'] . '</em>' : '', '<hr />';

+								<strong>', $group['title'], '</strong>', !empty($group['desc']) ? ' - <em class="smalltext">' . $group['desc'] . '</em>' : '', '<hr>';

 					/*// Try to make this read nicely.

 					if (count($group['members']) <= 2)

@@ -190,7 +190,7 @@ function template_shd_admin()

 				sAnnouncementMessageTemplate: ', JavaScriptEscape('

 					<dt><a href="%href%" target="_blank">%subject%</a> ' . $txt['on'] . ' %time% ' . $txt['by'] . ' %author%</dt>

 					<dd>

-						%message%<br />

+						%message%<br>

 						<a href="%readmore%" class="smalltext" target="_blank">' . $txt['shd_admin_readmore'] . '</a>

 					</dd>

 				'), ',

@@ -366,7 +366,7 @@ function template_shd_show_settings()

 			echo '

 			<div class="windowbg2">

 				<div class="content">

-					<dl class="permsettings">';

+					<dl class="settings">';

 		}

 		// Hang about? Are you pulling my leg - a callback?!

@@ -424,16 +424,16 @@ function template_shd_show_settings()

 				// Some quick helpers...

 				$javascript = $config_var['javascript'];

 				$disabled = !empty($config_var['disabled']) ? ' disabled="disabled"' : '';

-				$subtext = !empty($config_var['subtext']) ? '<br /><span class="smalltext"> ' . $config_var['subtext'] . '</span>' : '';

+				$subtext = !empty($config_var['subtext']) ? '<br><span class="smalltext"> ' . $config_var['subtext'] . '</span>' : '';

 				// Show the [?] button.

 				if ($config_var['help'])

 					echo '

-							<a id="setting_', $config_var['name'], '" href="', $scripturl, '?action=helpadmin;help=', $config_var['help'], '" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" border="0" /></a><span', ($config_var['disabled'] ? ' class="disabled"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label id="label_', $config_var['name'], '" for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br /><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>

+							<a id="setting_', $config_var['name'], '" href="', $scripturl, '?action=helpadmin;help=', $config_var['help'], '" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" border="0" /></a><span', ($config_var['disabled'] ? ' class="disabled"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label id="label_', $config_var['name'], '" for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>

 						</dt>';

 				else

 					echo '

-							<a id="setting_', $config_var['name'], '"></a> <span', ($config_var['disabled'] ? ' class="disabled"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label id="label_', $config_var['name'], '" for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br /><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>

+							<a id="setting_', $config_var['name'], '"></a> <span', ($config_var['disabled'] ? ' class="disabled"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label id="label_', $config_var['name'], '" for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>

 						</dt>';

 				echo '

@@ -447,7 +447,7 @@ function template_shd_show_settings()

 				// Escape (via htmlspecialchars.) the text box.

 				elseif ($config_var['type'] == 'password')

 					echo '

-							<input type="password"', $disabled, $javascript, ' name="', $config_var['name'], '[0]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), ' value="*#fakepass#*" onfocus="this.value = \'\'; this.form.', $config_var['name'], '.disabled = false;" class="input_password" /><br />

+							<input type="password"', $disabled, $javascript, ' name="', $config_var['name'], '[0]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), ' value="*#fakepass#*" onfocus="this.value = \'\'; this.form.', $config_var['name'], '.disabled = false;" class="input_password" /><br>

 							<input type="password" disabled="disabled" id="', $config_var['name'], '" name="', $config_var['name'], '[1]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), ' class="input_password" />';

 				// Show a selection box.

 				elseif ($config_var['type'] == 'select')

@@ -512,8 +512,8 @@ function template_shd_show_settings()

 			if ($config_var == '')

 				echo '

 					</dl>

-					<hr class="hrcolor" />

-					<dl class="permsettings">';

+					<hr>

+					<dl class="settings">';

 			else

 				echo '

 						<dd>

@@ -528,7 +528,7 @@ function template_shd_show_settings()

 	if (empty($context['settings_save_dont_show']))

 		echo '

-						<hr class="hrcolor" />

+						<hr>

 						<div class="righttext">

 							<input type="submit" value="', $txt['save'], '"', (!empty($context['save_disabled']) ? ' disabled="disabled"' : ''), (!empty($context['settings_save_onclick']) ? ' onclick="' . $context['settings_save_onclick'] . '"' : ''), ' class="button_submit" />

 						</div>';

@@ -633,9 +633,7 @@ function template_shd_action_log()

 				{

 					echo '

 						<tr class="windowbg">

-							<td width="1%">

-								<img src="', shd_image_url($action['action_icon']), '" alt="" class="shd_smallicon" />

-							</td>

+							<td width="1%"><img src="', shd_image_url($action['action_icon']), '" alt="" class="shd_smallicon" /></td>

 							<td class="smalltext">', $action['action_text'], '</td>

 							<td>', $action['time'], '</td>

 							<td>', $action['member']['link'], '</td>

@@ -680,8 +678,8 @@ function template_shd_admin_log()

 							', $txt['shd_admin_actionlog_title'], '

 						</h3>

 					</div>

-					<table class="shd_ticketlist" cellspacing="0" width="100%">

-						<tr class="titlebg">

+					<table class="table_grid">

+						<tr class="title_bar">

 							<td width="38%">

 								<img src="', $settings['default_images_url'], '/simpledesk/action.png" class="shd_smallicon" alt="" />

 								<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog', $context['sort'] == $sort_types['action'] && !isset($_REQUEST['asc']) ? ';sort=action;asc' : ';sort=action', '">

@@ -722,16 +720,15 @@ function template_shd_admin_log()

 			if (empty($context['actions']))

 				echo '

-						<tr class="windowbg2">

+						<tr class="windowbg">

 							<td colspan="7" class="shd_noticket">', $txt['shd_admin_actionlog_none'], '</td>

 						</tr>';

 			else

 			{

-				$use_bg2 = true; // start with windowbg2 to differentiate between that and windowbg2

 				foreach ($context['actions'] AS $action)

 				{

 					echo '

-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">

+						<tr class="windowbg">

 							<td class="smalltext">', $action['action_text'], '</td>

 							<td>', $action['time'], '</td>

 							<td>', $action['member']['link'], '</td>

@@ -739,8 +736,6 @@ function template_shd_admin_log()

 							<td>', !empty($action['member']['ip']) ? $action['member']['ip'] : $txt['shd_admin_actionlog_hidden'], '</td>

 							<td>', $action['can_remove'] && $context['can_delete'] ? '<a href="' . $scripturl . '?action=admin;area=helpdesk_info;sa=adminlog;remove='. $action['id'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/delete.png" alt="' . $txt['shd_delete_item'] . '" /></a>' : '', '</td>

 						</tr>';

-

-					$use_bg2 = !$use_bg2;

 				}

 			}

@@ -769,27 +764,25 @@ function template_shd_support()

 	echo '

 	<div class="shd_admin_leftcolumn floatleft">

-		<div class="tborder">

 		<div class="cat_bar">

 			<h3 class="catbg">

 				<img src="', $settings['default_images_url'], '/simpledesk/edit.png" alt="*" /> ', $txt['shd_admin_support_form_title'], '

 			</h3>

 		</div>

-				<div class="roundframe">

+		<div class="roundframe noup">

 			<form action="', $context['shd_support_url'], '" method="post" class="content">

 				<dl id="post_header">

 					<dt><span id="caption_subject">', $txt['subject'], '</span></dt>

 					<dd><input type="text" name="subject" tabindex="1" size="80" maxlength="80" class="input_text" /></dd>

 				</dl>

 				<textarea class="editor" name="message" rows="12" cols="60" tabindex="2" style="width: 90%; height: 150px;"></textarea>

-						<br /><br />

+				<br><br>

 				<input type="hidden" value="', $forum_version, '" name="smf_version" />

 				<input type="hidden" value="', SHD_VERSION, '" name="shd_version" />

 				<input type="submit" value="', $txt['shd_admin_support_send'], '" tabindex="3" accesskey="s" class="button_submit" />

 			</form>

 		</div>

 	</div>

-	</div>

 	<div class="shd_admin_rightcolumn floatleft">

 		<div class="cat_bar">

 			<h3 class="catbg">

@@ -33,7 +33,7 @@ function template_shd_cannedreplies_home()

 	if (empty($context['canned_replies']))

 	{

 		echo '

-				<br />

+				<br>

 				<div class="tborder">

 					<div class="title_bar">

 						<h3 class="titlebg">

@@ -48,7 +48,7 @@ function template_shd_cannedreplies_home()

 		{

 			echo '

 				<div class="tborder">

-					<br />

+					<br>

 					<div class="cat_bar">

 						<h3 class="catbg">

 							', $cat['name'], '

@@ -165,16 +165,14 @@ function template_shd_edit_canned_reply()

 	$editor_context = &$context['controls']['richedit'][$context['post_box_name']];

 	echo '

-				<div class="tborder">

 				<div class="cat_bar">

 					<h3 class="catbg">

 						<img src="', $settings['default_images_url'], '/simpledesk/cannedreplies.png" class="icon" alt="*" />

 						', $txt['shd_admin_cannedreplies_home'], '

 					</h3>

 				</div>

-					<p class="information">

+				<div class="information">

 					', $txt['shd_admin_cannedreplies_homedesc'], '

-					</p>

 				</div>

 				<form action="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=savereply" method="post" accept-charset="', $context['character_set'], '" name="cannedreply" id="cannedreply" onsubmit="', 'submitonce(this);smc_saveEntities(\'cannedreply\', [\'title\', \'', $context['post_box_name'], '\']);" enctype="multipart/form-data" style="margin: 0;">

 					<div class="cat_bar">

@@ -183,17 +181,18 @@ function template_shd_edit_canned_reply()

 							', $context['page_title'], '

 						</h3>

 					</div>

-					<div class="roundframe">

-						<div class="content">

-							<dl class="permsettings cannedsettings">

+					<div class="roundframe noup">

+						<dl class="settings">

 							<dt><strong>', $txt['shd_admin_cannedreplies_replytitle'], '</strong></dt>

-								<dd><input type="text" class="input_text" value="', $context['canned_reply']['title'], '" name="title" /></dd>

-								<dt><strong>', $txt['shd_admin_cannedreplies_content'], '</strong>

-								<dd>

+							<dd><input type="text" class="input_text" value="', $context['canned_reply']['title'], '" name="title" size="80" /></dd>

+						</dl>

+						<p><strong>', $txt['shd_admin_cannedreplies_content'], '</strong></p>

+						<div class="block">

 							<div id="bbcbox"></div>

 							<div id="smileybox"></div>',

 							template_control_richedit($context['post_box_name'], 'smileybox', 'bbcbox'), '

-								</dd>

+						</div>

+						<dl class="settings">

 							<dt><strong>', $txt['shd_admin_cannedreplies_active'], '</strong></dt>

 							<dd><input type="checkbox" name="active" class="input_check"', !empty($context['canned_reply']['active']) ? ' checked="checked"' : '', ' />

 							<dt><strong>', $txt['shd_admin_cannedreplies_selectvisible'], '</strong></dt>

@@ -204,16 +203,15 @@ function template_shd_edit_canned_reply()

 							</dd>

 						</dl>

 					</div>

-					</div>

+					<br>

 					<div class="cat_bar">

 						<h3 class="catbg">

 							<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="*" />

 							', $txt['shd_admin_cannedreplies_departments'], '

 						</h3>

 					</div>

-					<div class="roundframe">

-						<div class="content">

-							<dl class="permsettings cannedsettings">';

+					<div class="roundframe noup">

+						<dl class="settings">';

 	foreach ($context['canned_reply']['depts_available'] as $dept_id => $dept_name)

 	{

@@ -225,7 +223,7 @@ function template_shd_edit_canned_reply()

 	echo '

 						</dl>

 					</div>

-					</div>

+					<br>

 					<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['save'], '" tabindex="', $context['tabindex']++, '" accesskey="s" class="button_submit" />';

 	if ($context['canned_reply']['id'] != 'new')

@@ -237,8 +235,7 @@ function template_shd_edit_canned_reply()

 					<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />

 					<input type="hidden" name="reply" value="', $context['canned_reply']['id'], '" />

 					<input type="hidden" name="cat" value="', $context['canned_reply']['cat'], '" />

-				</form>

-				<br />';

+				</form>';

 }

 function template_shd_move_reply_cat()

@@ -246,16 +243,14 @@ function template_shd_move_reply_cat()

 	global $context, $settings, $txt, $modSettings, $scripturl;

 	echo '

-				<div class="tborder">

 				<div class="cat_bar">

 					<h3 class="catbg">

 						<img src="', $settings['default_images_url'], '/simpledesk/cannedreplies.png" class="icon" alt="*" />

 						', $txt['shd_admin_cannedreplies_home'], '

 					</h3>

 				</div>

-					<p class="information">

+				<div class="information">

 						', $txt['shd_admin_cannedreplies_homedesc'], '

-					</p>

 				</div>

 				<div class="cat_bar">

 					<h3 class="catbg">

@@ -265,7 +260,6 @@ function template_shd_move_reply_cat()

 				</div>

 				<div class="roundframe">

 					<form action="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=movereplycat;part=2" method="post">

-						<div class="content">

 						<dl class="settings">

 							<dt><strong>', $txt['shd_admin_cannedreplies_newcategory'], '</strong></dt>

 							<dd>

@@ -280,11 +274,7 @@ function template_shd_move_reply_cat()

 								</select>

 							</dd>

 						</dl>

-						</div>

-						<input type="submit" value="', $txt['shd_admin_cannedreplies_movereply'], '" onclick="return submitThisOnce(this);" class="button_submit" />';

-

-

-	echo '

+						<input type="submit" value="', $txt['shd_admin_cannedreplies_movereply'], '" onclick="return submitThisOnce(this);" class="button_submit" />

 						<input type="hidden" name="reply" value="', $_REQUEST['reply'], '" />

 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />

 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />

@@ -52,7 +52,7 @@ function template_shd_custom_field_home()

 			echo '

 						<tr class="windowbg">

 							<td width="2%">', empty($field['icon']) ? '' : '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" class="icon" alt="*" />', '</td>

-							<td>', $field['field_name'], '<br /><span class="smalltext">', $field['field_desc'], '</span></td>

+							<td>', $field['field_name'], '<br><span class="smalltext">', $field['field_desc'], '</span></td>

 							<td width="2%"><img src="' . $settings['default_images_url'] . '/simpledesk/cf_ui_' . $field['field_type'] . '.png" class="icon" alt="', $txt['shd_admin_custom_fields_ui_' . $field['field_type']], '" /></td>

 							<td>', $txt['shd_admin_custom_fields_ui_' . $field['field_type']], '</td>

 							<td><img src="', $settings['default_images_url'], '/simpledesk/cf_', $field['active_string'], '.png" alt="', $txt['shd_admin_custom_fields_' . $field['active_string']], '" title="', $txt['shd_admin_custom_fields_' . $field['active_string']], '" /></td>

@@ -163,7 +163,7 @@ function template_shd_custom_field_edit()

 				function add_option()

 				{

 					var ftype = document.getElementById("cf_fieldtype").value;

-					var newHTML = \'<br /><input type="radio" id="radio_\' + startOptID + \'" name="default_select" value="\' + startOptID + \'" id="\' + startOptID + \'"\';

+					var newHTML = \'<br><input type="radio" id="radio_\' + startOptID + \'" name="default_select" value="\' + startOptID + \'" id="\' + startOptID + \'"\';

 					if (ftype == ', CFIELD_TYPE_MULTI, ')

 						newHTML += \' style="display:none;"\';

 					newHTML += \' class="input_radio" />\' + "\n";

@@ -229,13 +229,13 @@ function template_shd_custom_field_edit()

 					<div class="roundframe">

 						<div class="content">

 							<dl class="settings">

-								<dt><strong>', $txt['shd_admin_custom_fields_fieldname'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_fields_fieldname_desc'], '</span></dt>

+								<dt><strong>', $txt['shd_admin_custom_fields_fieldname'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_fields_fieldname_desc'], '</span></dt>

 								<dd><input type="text" name="field_name" id="cf_fieldname"', !empty($context['custom_field']['field_name']) ? ' value="' . $context['custom_field']['field_name'] . '"' : '', ' class="input_text" size="30" /></dd>

-								<dt><strong>', $txt['shd_admin_custom_fields_description'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_fields_description_desc'], '</span></dt>

+								<dt><strong>', $txt['shd_admin_custom_fields_description'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_fields_description_desc'], '</span></dt>

 								<dd><textarea name="description" id="cf_description" cols="40" rows="4">', !empty($context['custom_field']['field_desc']) ? $context['custom_field']['field_desc'] : '', '</textarea></dd>

-								<dt><strong>', $txt['shd_admin_custom_fields_active'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_fields_active_desc'], '</span></dt>

+								<dt><strong>', $txt['shd_admin_custom_fields_active'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_fields_active_desc'], '</span></dt>

 								<dd><input type="checkbox" name="active" id="cf_active"', $context['field_active'],'class="input_check" /></dd>

-								<dt><strong>', $txt['shd_admin_custom_fields_icon'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_fields_icon_desc'], '</span></dt>

+								<dt><strong>', $txt['shd_admin_custom_fields_icon'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_fields_icon_desc'], '</span></dt>

 								<dd class="nowrap">

 									<span id="cf_fieldicon_icon"', $context['field_icon_value'] != '' ? ' style="background: url(' . $settings['images_url'] . '/simpledesk/cf/' . $context['field_icon_value'] . ') no-repeat left;"' : '','></span>

 									<select name="field_icon" id="cf_fieldicon" onchange="javascript:set_fieldicon(this.value);">';

@@ -251,7 +251,7 @@ function template_shd_custom_field_edit()

 	echo '

 									</select>

 								</dd>

-								<dt><strong>', $txt['shd_admin_custom_fields_visible'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_fields_visible_desc'], '</span></dt>

+								<dt><strong>', $txt['shd_admin_custom_fields_visible'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_fields_visible_desc'], '</span></dt>

 								<dd>

 									<span id="cf_fieldvisible_icon"></span>

 									<select name="field_visible" id="cf_fieldvisible" onchange="javascript:update_field_location(this.value);">

@@ -260,7 +260,7 @@ function template_shd_custom_field_edit()

 										<option value="', (CFIELD_TICKET | CFIELD_REPLY), '"',($context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY) ? ' selected="selected"' : ''), '>', $txt['shd_admin_custom_fields_visible_both'], '</option>

 									</select>

 								</dd>

-								<dt id="placement_dt"', (($context['field_loc'] == CFIELD_TICKET || $context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY)) ? '' : ' style="display: none;"'), '><strong>', $txt['shd_admin_custom_field_placement'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_field_placement_desc'], '</span></dt>

+								<dt id="placement_dt"', (($context['field_loc'] == CFIELD_TICKET || $context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY)) ? '' : ' style="display: none;"'), '><strong>', $txt['shd_admin_custom_field_placement'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_placement_desc'], '</span></dt>

 								<dd id="placement_dd"', (($context['field_loc'] == CFIELD_TICKET || $context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY)) ? '' : ' style="display: none;"'), '>

 									<select name="placement" id="cf_placement">

 										<option id="details" value="', CFIELD_PLACE_DETAILS, '"', ($context['placement'] == CFIELD_PLACE_DETAILS ? ' selected="selected"' : ''), '>', $txt['shd_admin_custom_field_placement_details'], '</option>

@@ -269,13 +269,13 @@ function template_shd_custom_field_edit()

 										<option id="place_prefixfilter" value="', CFIELD_PLACE_PREFIXFILTER, '"', ($context['placement'] == CFIELD_PLACE_PREFIXFILTER ? ' selected="selected"' : ''), '>', $txt['shd_admin_custom_field_placement_prefixfilter'], '</option>

 									</select>

 								</dd>

-								<dt><strong>', $txt['shd_admin_custom_field_can_see'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_field_can_see_desc'], '</span></dt>

+								<dt><strong>', $txt['shd_admin_custom_field_can_see'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_can_see_desc'], '</span></dt>

 								<dd>

 									<input type="checkbox" name="see_users" class="input_check" ', !empty($context['custom_field']['can_see'][0]) && $context['custom_field']['can_see'][0] == 1 ? 'checked="checked"' : '' ,' onchange="javascript:update_permissions(this.value,\'users\');"/> <img src="', $settings['default_images_url'], '/simpledesk/user.png" class="icon" alt="', $txt['shd_admin_custom_field_users'], '" title="', $txt['shd_admin_custom_field_users'], '"/>

 									<input type="checkbox" name="see_staff" class="input_check" ', !empty($context['custom_field']['can_see'][1]) && $context['custom_field']['can_see'][1] == 1 ? 'checked="checked"' : '' ,' onchange="javascript:update_permissions(this.value,\'staff\');"/> <img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="icon" alt="', $txt['shd_admin_custom_field_staff'], '" title="', $txt['shd_admin_custom_field_staff'], '"/>

 									<input type="checkbox" name="see_admin" class="input_check" checked="checked" disabled="disabled" /> <img src="', $settings['default_images_url'], '/simpledesk/admin.png" class="icon" alt="', $txt['shd_admin_custom_field_admins'], '" title="', $txt['shd_admin_custom_field_admins'], '" />

 								</dd>

-								<dt><strong>', $txt['shd_admin_custom_field_can_edit'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_field_can_edit_desc'], '</span></dt>

+								<dt><strong>', $txt['shd_admin_custom_field_can_edit'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_can_edit_desc'], '</span></dt>

 								<dd>

 									<input type="checkbox" name="edit_users" id="edit_users" class="input_check" ', !empty($context['custom_field']['can_edit'][0]) && $context['custom_field']['can_edit'][0] == 1 ? 'checked="checked"' : '', ' ', !empty($context['custom_field']['can_see'][0]) && $context['custom_field']['can_see'][0] == 1 ? '"' : 'disabled="disabled"', '/> <img src="', $settings['default_images_url'], '/simpledesk/user.png" class="icon" alt="', $txt['shd_admin_custom_field_users'], '" title="', $txt['shd_admin_custom_field_users'], '"/>

 									<input type="checkbox" name="edit_staff" id="edit_staff" class="input_check" ', !empty($context['custom_field']['can_edit'][1]) && $context['custom_field']['can_edit'][1] == 1 ? 'checked="checked"' : '', ' ', !empty($context['custom_field']['can_see'][1]) && $context['custom_field']['can_see'][1] == 1 ? '"' : 'disabled="disabled"', '/> <img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="icon" alt="', $txt['shd_admin_custom_field_staff'], '" title="', $txt['shd_admin_custom_field_staff'], '"/>

@@ -308,7 +308,7 @@ function template_shd_custom_field_edit()

 	echo '

 									</select>

 								</dd>

-								<dt id="max_length_dt"', in_array($context['field_type_value'], array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT)) ? '' : ' style="display: none;"','><strong>', $txt['shd_admin_custom_field_maxlength'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_field_maxlength_desc'], '</span></dt>

+								<dt id="max_length_dt"', in_array($context['field_type_value'], array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT)) ? '' : ' style="display: none;"','><strong>', $txt['shd_admin_custom_field_maxlength'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_maxlength_desc'], '</span></dt>

 								<dd id="max_length_dd"', in_array($context['field_type_value'], array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT)) ? '' : ' style="display: none;"','>

 									<input type="text" value="', isset($context['custom_field']['field_length']) ? $context['custom_field']['field_length'] : 255, '" size="7" maxlength="6" name="field_length" id="cf_field_length" />

 								</dd>

@@ -319,7 +319,7 @@ function template_shd_custom_field_edit()

 									<strong>', $txt['shd_admin_custom_field_dimensions_rows'], ':</strong> <input type="text" name="rows" value="', !empty($context['custom_field']['dimensions'][0]) ? $context['custom_field']['dimensions'][0] : 4, '" size="5" maxlength="3" class="input_text" />

 									<strong>', $txt['shd_admin_custom_field_dimensions_columns'], ':</strong> <input type="text" name="cols" value="', !empty($context['custom_field']['dimensions'][1]) ? $context['custom_field']['dimensions'][1] : 30, '" size="5" maxlength="3" class="input_text" />

 								</dd>

-								<dt id="bbc_dt"', $context['field_type_value'] == CFIELD_TYPE_TEXT || $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' style="display: none;"','><strong',empty($modSettings['shd_allow_ticket_bbc']) ? ' class="disabled"' : '', '>', $txt['shd_admin_custom_field_bbc'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_field_bbc_note'], '</span><br />', empty($modSettings['shd_allow_ticket_bbc']) ? '<span class="smalltext error">' . sprintf($txt['shd_admin_custom_field_bbc_off'], $scripturl . '?action=admin;area=helpdesk_options;sa=posting'). '</span>' : '', '</dt>

+								<dt id="bbc_dt"', $context['field_type_value'] == CFIELD_TYPE_TEXT || $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' style="display: none;"','><strong',empty($modSettings['shd_allow_ticket_bbc']) ? ' class="disabled"' : '', '>', $txt['shd_admin_custom_field_bbc'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_bbc_note'], '</span><br>', empty($modSettings['shd_allow_ticket_bbc']) ? '<span class="smalltext error">' . sprintf($txt['shd_admin_custom_field_bbc_off'], $scripturl . '?action=admin;area=helpdesk_options;sa=posting'). '</span>' : '', '</dt>

 								<dd id="bbc_dd"', $context['field_type_value'] == CFIELD_TYPE_TEXT || $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' style="display: none;"','>

 									<input type="checkbox" name="bbc" id="cf_bbc"',empty($modSettings['shd_allow_ticket_bbc']) ? ' disabled="disabled"' : (!empty($context['custom_field']['bbc']) ? ' checked="checked"' : ''), ' />

 								</dd>

@@ -345,7 +345,7 @@ function template_shd_custom_field_edit()

 			continue;

 		echo '

-									<br />

+									<br>

 									<input type="radio" id="radio_', $k, '" name="default_select" value="', $k, '"', $context['field_type_value'] != CFIELD_TYPE_MULTI && $context['custom_field']['default_value'] == $k ? ' checked="checked"' : '', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' style="display:none;"', ' class="input_radio" />

 									<input type="checkbox" id="multi_', $k, '" name="default_select_multi[', $k, ']" value="', $k, '"', $context['field_type_value'] == CFIELD_TYPE_MULTI && in_array($k, $context['custom_field']['default_value']) ? ' checked="checked"' : '', $context['field_type_value'] == CFIELD_TYPE_MULTI ? '' : ' style="display:none;"', ' class="input_check" />

 									<input type="text" name="select_option[', $k, ']" value="', $option, '" class="input_text" />';

@@ -363,7 +363,7 @@ function template_shd_custom_field_edit()

 									<input type="checkbox" name="default_check" class="input_check"',($context['custom_field']['default_value'] == 1 ? ' checked="checked"' : ''), ' onclick="update_default_label(this.checked);" />

 									<span class="smalltext" id="default_label">', $txt['shd_admin_default_state_' . ($context['custom_field']['default_value'] == 1 ? 'on' : 'off')], '</span>

 								</dd>

-								<dt id="display_empty_dt"><strong>', $txt['shd_admin_custom_field_display_empty'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_field_display_empty_desc'], '</span></dt>

+								<dt id="display_empty_dt"><strong>', $txt['shd_admin_custom_field_display_empty'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_display_empty_desc'], '</span></dt>

 								<dd id="display_empty_dd">

 									<input type="checkbox" class="input_check"', (!empty($context['custom_field']['display_empty']) && $context['custom_field']['display_empty'] == 1 ? ' checked="checked"' : ''), ' name="display_empty" id="cf_display_empty"', (!empty($context['custom_field']['required']) && $context['custom_field']['required'] == 1 ? ' disabled="disabled"' : ''), '/>

 								</dd>

@@ -401,7 +401,7 @@ function template_shd_custom_field_edit()

 	}

 	echo '

-					<br />

+					<br>

 					<input type="submit" value="', $txt['shd_admin_save_custom_field'], '" accesskey="s" class="button_submit" />

 					', !empty($context['new_field']) ? '' : '<input type="submit" value="' .$txt['shd_admin_delete_custom_field'] . '" onclick="return confirm(' . JavaScriptEscape($txt['shd_admin_delete_custom_field_confirm']). ');" name="delete" class="button_submit" />', '

 					<input type="submit" value="', $txt['shd_admin_cancel_custom_field'], '" name="cancel" class="button_submit" />

@@ -275,7 +275,7 @@ function template_shd_edit_dept()

 	echo '

 						</table>

-						<br />

+						<br>

 					</div>

 					<div class="floatleft">

@@ -185,7 +185,7 @@ function template_shd_admin_maint_home()

 						<dt><input type="checkbox" checked="checked" id="moveclosed" name="moveclosed" class="input_check" /> <label for="moveclosed">', $txt['shd_admin_maint_massdeptmove_closed'], '</label></dt>

 						<dt><input type="checkbox" checked="checked" id="movedeleted" name="movedeleted" class="input_check" /> <label for="movedeleted">', $txt['shd_admin_maint_massdeptmove_deleted'], '</label></dt>

 					</dl>

-					<br />

+					<br>

 					<dl class="settings">

 						<dt><input type="checkbox" id="movelast_less" name="movelast_less" class="input_check" /> ', sprintf($txt['shd_admin_maint_massdeptmove_lastupd_less'], '<input type="text" name="movelast_less_days" value="30" size="3" />'), '</dt>

 						<dt><input type="checkbox" id="movelast_more" name="movelast_more" class="input_check" /> ', sprintf($txt['shd_admin_maint_massdeptmove_lastupd_more'], '<input type="text" name="movelast_more_days" value="30" size="3" />'), '</dt>

@@ -61,7 +61,7 @@ function template_shd_permissions_home()

 	echo '

 					</table>

 				</div>

-				<br /><br />

+				<br><br>

 				<div class="tborder">

 					<div class="title_bar">

 						<h3 class="titlebg">

@@ -184,7 +184,7 @@ function template_shd_display_permission_list($permissions)

 		foreach ($rows as $rowitem => $rowicon)

 		{

 			if (!empty($permission_set[$rowitem]))

-				echo $txt['shd_permgroup_short_' . $rowitem], ': ', implode(' ', $permission_set[$rowitem]), '<br />';

+				echo $txt['shd_permgroup_short_' . $rowitem], ': ', implode(' ', $permission_set[$rowitem]), '<br>';

 		}

 		echo '</td>';

@@ -416,7 +416,7 @@ function template_shd_edit_role()

 							</div>

 						</div>

 						<span id="permfooter_', $rowitem, '"></span>

-						<br />';

+						<br>';

 		}

 		echo '

@@ -479,7 +479,7 @@ function template_shd_edit_role()

 	echo '

 						</table>

-						<br />

+						<br>

 					</div>

 					<div class="tborder floatleft" style="width: 100%;">

@@ -509,7 +509,7 @@ function template_shd_edit_role()

 	echo '

 						</table>

-						<br />

+						<br>

 					</div>

 					<div class="floatleft">

@@ -78,7 +78,7 @@ function template_shd_plugin_listing()

 		if (!empty($plugin['languages']))

 		{

 			echo '

-					<div class="langblock">', $txt['shd_admin_plugins_languages'], ':<br />';

+					<div class="langblock">', $txt['shd_admin_plugins_languages'], ':<br>';

 			foreach ($plugin['languages'] as $language)

 			{

 				if (!empty($txt['shd_admin_plugins_lang_' . $language]))

@@ -94,7 +94,7 @@ function template_shd_plugin_listing()

 					<p>';

 		if (!empty($plugin['details']['description']))

 			echo '

-						', $plugin['details']['description'], '<br />';

+						', $plugin['details']['description'], '<br>';

 		echo '			', $txt['shd_admin_plugins_writtenby'], ': ', (empty($plugin['details']['website']) ? $plugin['details']['author'] : '<a href="' . $plugin['details']['website'] . '" target="_blank" title="' . $txt['shd_admin_plugins_website'] . ' - ' . $plugin['details']['website'] . '">' . $plugin['details']['author'] . '</a>'), '

 					</p>';

@@ -66,7 +66,7 @@ function template_viewticket()

 			echo '

 					<div class="shd_ticketdetails">

 							<strong><img src="', $settings['default_images_url'], '/simpledesk/details.png" alt="" class="shd_smallicon shd_icon_minihead" /> ', $txt['shd_ticket_details'], '</strong>

-							<hr />

+							<hr>

 							<dl class="stats nobb">

 								<dt><span class="generic_icons inbox" title="', $txt['shd_ticket_id'], '"></span> ', $txt['shd_ticket_id'], ':</dt>

 										<dd>', $context['ticket']['display_id'], '</dd>

@@ -119,7 +119,7 @@ function template_viewticket()

 				if ($content)

 				{

 					echo '

-							<hr />

+							<hr>

 							<ul>';

 					foreach ($context['ticket']['custom_fields']['prefixfilter'] AS $field)

@@ -179,7 +179,7 @@ function template_viewticket()

 					echo '

 						<div class="information shd_additional_details">

 							<strong><img src="', $settings['default_images_url'], '/simpledesk/additional_details.png" alt="" class="shd_smallicon shd_icon_minihead" /> ', $txt['shd_ticket_additional_details'], '</strong>

-							<hr />

+							<hr>

 							<ul>';

 					foreach ($context['ticket']['custom_fields']['details'] AS $field)

@@ -265,7 +265,7 @@ function template_viewticket()

 			if (!empty($output))

 				echo '[', trim($output), '] ';

-			echo $context['ticket']['subject'], '</strong><hr /><br />

+			echo $context['ticket']['subject'], '</strong><hr><br>

 							<div id="shd_ticket_text">

 								', $context['ticket']['body'];

@@ -283,13 +283,13 @@ function template_viewticket()

 			if ($context['can_reply'])

 				echo '

 						<div class="information shd_replybutton floatright" id="shd_replybutton">

-							<a href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';num_replies=', $context['ticket']['num_replies'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_reply'], '</a><br />

+							<a href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';num_replies=', $context['ticket']['num_replies'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_reply'], '</a><br>

 						</div>';

 			if ($context['can_quote'])

 				echo '

 						<div class="information shd_quotebutton floatright" id="shd_quotebutton">

-							<a onclick="return oQuickReply.quote(', $context['ticket']['first_msg'], ', \'', $context['session_id'], '\', \'', $context['session_var'], '\', true);" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';quote=', $context['ticket']['first_msg'], ';num_replies=', $context['ticket']['num_replies'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_quote'], '</a><br />

+							<a onclick="return oQuickReply.quote(', $context['ticket']['first_msg'], ', \'', $context['session_id'], '\', \'', $context['session_var'], '\', true);" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';quote=', $context['ticket']['first_msg'], ';num_replies=', $context['ticket']['num_replies'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_quote'], '</a><br>

 						</div>';

 			template_inline_attachments($context['ticket']['first_msg']);

@@ -412,10 +412,10 @@ function template_viewticketattach()

 			{

 				if ($attachment['thumbnail']['has_thumb'])

 					echo '

-										<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" onclick="', $attachment['thumbnail']['javascript'], '"><img src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" class="shd_thumb" /></a><br />';

+										<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" onclick="', $attachment['thumbnail']['javascript'], '"><img src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" class="shd_thumb" /></a><br>';

 				else

 					echo '

-										<img src="' . $attachment['href'] . ';image" alt="" width="' . $attachment['width'] . '" height="' . $attachment['height'] . '" class="shd_thumb" /><br />';

+										<img src="' . $attachment['href'] . ';image" alt="" width="' . $attachment['width'] . '" height="' . $attachment['height'] . '" class="shd_thumb" /><br>';

 			}

 			echo '

@@ -495,7 +495,7 @@ function template_viewnotifications()

 		{

 			if ($displayed_something)

 				echo '

-							<hr />';

+							<hr>';

 			echo '

 							<form action="', $scripturl, '?action=helpdesk;sa=notify;ticket=', $context['ticket_id'], '" method="post">';

@@ -507,7 +507,7 @@ function template_viewnotifications()

 								<input type="submit" value="', $txt['shd_ticket_monitor_on'], '" class="button_submit" />';

 			else

 				echo '

-								<div><img src="', $settings['default_images_url'], '/simpledesk/cf_active.png" alt="" /> ', $txt['shd_ticket_notify_me_always'], '<br /><br />', $txt['shd_ticket_monitor_off_note'], '</div>

+								<div><img src="', $settings['default_images_url'], '/simpledesk/cf_active.png" alt="" /> ', $txt['shd_ticket_notify_me_always'], '<br><br>', $txt['shd_ticket_monitor_off_note'], '</div>

 								<input type="hidden" name="notifyaction" value="monitor_off" />

 								<input type="submit" value="', $txt['shd_ticket_monitor_off'], '" class="button_submit" />';

@@ -522,7 +522,7 @@ function template_viewnotifications()

 	{

 		if ($displayed_something)

 			echo '

-							<hr />';

+							<hr>';

 		echo '

 							<form action="', $scripturl, '?action=helpdesk;sa=notify;ticket=', $context['ticket_id'], '" method="post">';

@@ -592,7 +592,7 @@ function template_additional_fields()

 					echo '

 							<div class="information">

 							', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="" class="shd_smallicon" />' : '','

-							<strong>', $field['name'],':</strong><hr />';

+							<strong>', $field['name'],':</strong><hr>';

 					if ($field['type'] == CFIELD_TYPE_CHECKBOX)

 						echo !empty($field['value']) ? $txt['yes'] : $txt['no'];

@@ -624,7 +624,7 @@ function template_additional_fields()

 		</div>

 		<span id="additional_info_footer"></span>

 		</div>

-		<br />';

+		<br>';

 	}

 }

@@ -659,7 +659,7 @@ function template_quickreply()

 		{

 			echo '

 					<div class="information shd_advancedbutton floatright" id="shd_goadvancedbutton" style="display:none;">

-						<a onclick="goAdvanced(); return false;" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_go_advanced'], '</a><br />

+						<a onclick="goAdvanced(); return false;" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_go_advanced'], '</a><br>

 					</div>';

 		}

@@ -701,7 +701,7 @@ function template_inline_attachments($msg)

 							<table width="90%">';

 		/*echo '

 							<div class="smalltext">

-								<strong>', $txt['shd_ticket_attachments'], '</strong><br />

+								<strong>', $txt['shd_ticket_attachments'], '</strong><br>

 								<ul class="shd_replyattachments">';*/

 		$count = 0;

@@ -725,10 +725,10 @@ function template_inline_attachments($msg)

 			{

 				if ($attachment['thumbnail']['has_thumb'])

 					echo '

-										<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" onclick="', $attachment['thumbnail']['javascript'], '"><img src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" class="shd_thumb" /></a><br />';

+										<a href="', $attachment['href'], ';image" id="link_', $attachment['id'], '" onclick="', $attachment['thumbnail']['javascript'], '"><img src="', $attachment['thumbnail']['href'], '" alt="" id="thumb_', $attachment['id'], '" class="shd_thumb" /></a><br>';

 				else

 					echo '

-										<img src="' . $attachment['href'] . ';image" alt="" width="' . $attachment['width'] . '" height="' . $attachment['height'] . '" class="shd_thumb" /><br />';

+										<img src="' . $attachment['href'] . ';image" alt="" width="' . $attachment['width'] . '" height="' . $attachment['height'] . '" class="shd_thumb" /><br>';

 			}

 			echo '

@@ -799,7 +799,7 @@ function template_viewreplies()

 							<strong class="shd_postername">

 								', $reply['member']['link'], '

 							</strong>

-							<br />

+							<br>

 							', $reply['member']['group'], '<br class="shd_groupmargin" />';

 			if (!empty($modSettings['shd_display_avatar']) && empty($options['show_no_avatars']) && !empty($reply['member']['avatar']['image']))

@@ -809,10 +809,10 @@ function template_viewreplies()

 							</span>';

 			if ($modSettings['shd_staff_badge'] == (!empty($reply['is_staff']) ? 'staffbadge' : 'userbadge') || $modSettings['shd_staff_badge'] == 'bothbadge')

-				echo '<br />

+				echo '<br>

 							', $reply['member']['group_stars'];

 			elseif (!empty($reply['is_staff']) && $modSettings['shd_staff_badge'] == 'nobadge')

-				echo '<br />

+				echo '<br>

 							<img src="', $settings['default_images_url'] . '/simpledesk/staff.png" class="shd_smallicon" title="', $txt['shd_ticket_staff'], '" alt="', $txt['shd_ticket_staff'], '" />';

 			echo '

@@ -840,15 +840,15 @@ function template_viewreplies()

 								</span>

 								<a href="', $reply['link'], '">', sprintf($txt['shd_reply_written'], $reply['time']), '</a>

 							</div>

-							<hr />

+							<hr>

 							', $reply['body'], '

-							<br /><br />';

+							<br><br>';

 		// Custom fields for replies!

 		if (!empty($context['custom_fields_replies'][$reply['id']]))

 		{

 			echo '

-							<hr />';

+							<hr>';

 			foreach ($context['custom_fields_replies'][$reply['id']] AS $field)

 			{

@@ -859,23 +859,23 @@ function template_viewreplies()

 							<strong>', $field['name'],': </strong>';

 					if ($field['type'] == CFIELD_TYPE_CHECKBOX)

-						echo !empty($field['value']) ? $txt['yes'] : $txt['no'], '<br /><br />';

+						echo !empty($field['value']) ? $txt['yes'] : $txt['no'], '<br><br>';

 					elseif (empty($field['value']) && $field['display_empty'])

-						echo $txt['shd_ticket_empty_field'], '<br /><br />';

+						echo $txt['shd_ticket_empty_field'], '<br><br>';

 					else

 					{

 						if ($field['type'] == CFIELD_TYPE_SELECT || $field['type'] == CFIELD_TYPE_RADIO)

-							echo $field['options'][$field['value']], '<br /><br />';

+							echo $field['options'][$field['value']], '<br><br>';

 						elseif ($field['type'] == CFIELD_TYPE_MULTI)

 						{

 							$values = explode(',', $field['value']);

 							$string = '';

 							foreach ($values as $value)

 								$string .= $field['options'][$value] . ' ';

-							echo trim($string), '<br /><br />';

+							echo trim($string), '<br><br>';

 						}

 						else

-							echo $field['value'], '<br /><br />';

+							echo $field['value'], '<br><br>';

 					}

 				}

 			}

@@ -939,7 +939,7 @@ function template_viewrelationships()

 				continue;

 			echo '

-							<img src="', $settings['default_images_url'], '/simpledesk/rel_', $rel_type, '.png" alt="" /> <strong>', $txt['shd_ticket_reltype_' . $rel_type], ':</strong><br />';

+							<img src="', $settings['default_images_url'], '/simpledesk/rel_', $rel_type, '.png" alt="" /> <strong>', $txt['shd_ticket_reltype_' . $rel_type], ':</strong><br>';

 			foreach ($relationships as $rel)

 			{

@@ -949,7 +949,7 @@ function template_viewrelationships()

 				if (!empty($context['delete_relationships']))

 					echo '<a href="', $scripturl, '?action=helpdesk;sa=relation;ticket=', $context['ticket_id'], ';otherticket=', $rel['id'], ';relation=delete;', $context['session_var'], '=', $context['session_id'], '"><img class="shd_smallicon" src="', $settings['default_images_url'], '/simpledesk/delete.png" alt="', $txt['shd_ticket_delete_relationship'], '" title="', $txt['shd_ticket_delete_relationship'], '" /></a>';

-				echo '<span class="smalltext">[', $rel['display_id'], '] <a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $rel['id'], '">', $rel['subject'], '</a> (', $rel['status_txt'], ')</span><br />';

+				echo '<span class="smalltext">[', $rel['display_id'], '] <a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $rel['id'], '">', $rel['subject'], '</a> (', $rel['status_txt'], ')</span><br>';

 			}

 		}

@@ -957,7 +957,7 @@ function template_viewrelationships()

 		{

 			if ($context['relationships_count'] > 0)

 				echo '

-						<hr />';

+						<hr>';

 			echo '

 						', $txt['shd_ticket_create_relationship'], ':

@@ -27,7 +27,7 @@ function template_movedept()

 	echo '

 		<div class="floatleft">

 			', template_button_strip(array($context['navigation']['back']), 'bottom'), '

-		</div><br class="clear" /><br />';

+		</div><br class="clear" /><br>';

 	echo '

 	<div class="cat_bar">

@@ -96,7 +96,7 @@ function template_ticket_info()

 	echo '

 					<div class="shd_ticketdetails">

 						<strong><img src="', $settings['default_images_url'], '/simpledesk/details.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_details'], '</strong>

-						<hr />

+						<hr>

 						<ul class="reset">';

 	if (!empty($context['ticket_form']['display_id']))

@@ -178,12 +178,12 @@ function template_ticket_custom_fields()

 						<dl class="settings">

 							<dt id="field-' . $field['id'] . '" style="width:98%;">

 								', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="" />' : '', '

-								<strong>' . $field['name'] . ': </strong><br />

-								<span class="smalltext">' . $field['desc'] . '</span><br />

+								<strong>' . $field['name'] . ': </strong><br>

+								<span class="smalltext">' . $field['desc'] . '</span><br>

 								<textarea name="field-', $field['id'], '"', !empty($field['default_value']) ? ' rows="' . $field['default_value'][0] . '" cols="' . $field['default_value'][1] . '" ' : '', ' style="width:auto; height:auto;">', $field['value'], '</textarea>

 							</dt>

 						</dl>

-						<hr class="hrcolor" />

+						<hr>

 					</div>';

 			}

 			else

@@ -193,7 +193,7 @@ function template_ticket_custom_fields()

 						<dl class="settings">

 							<dt id="field-' . $field['id'] . '">

 								', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="" />' : '', '

-								<strong>' . $field['name'] . ': </strong><br />

+								<strong>' . $field['name'] . ': </strong><br>

 								<span class="smalltext">' . $field['desc'] . '</span>

 							</dt>';

@@ -260,7 +260,7 @@ function template_ticket_custom_fields()

 						// If the field is active, display it normally

 						if (!in_array($key, $field['options']['inactive']))

 							echo '

-								<input name="field-', $field['id'], '-', $key, '" type="checkbox" value="', $key, '"', in_array($key, $field['value']) ? ' checked="checked"' : '', ' /> <span>', $option, '</span><br />';

+								<input name="field-', $field['id'], '-', $key, '" type="checkbox" value="', $key, '"', in_array($key, $field['value']) ? ' checked="checked"' : '', ' /> <span>', $option, '</span><br>';

 						// If it's not required and inactive and present, display a hidden form item for it.

 						elseif (empty($field['is_required']) && in_array($key, $field['options']['inactive']) && in_array($key, $field['value']))

 							echo '

@@ -277,7 +277,7 @@ function template_ticket_custom_fields()

 							<dd>';

 					if (empty($field['is_required']))

 						echo '

-								<input name="field-', $field['id'], '" type="radio" value="0"', $field['value'] == 0 ? ' checked="checked"' : '', ' class="input_radio" /> <span>', $txt['shd_no_value'], '</span><br />';

+								<input name="field-', $field['id'], '" type="radio" value="0"', $field['value'] == 0 ? ' checked="checked"' : '', ' class="input_radio" /> <span>', $txt['shd_no_value'], '</span><br>';

 					foreach ($field['options'] as $key => $option)

 					{

@@ -285,7 +285,7 @@ function template_ticket_custom_fields()

 							continue;

 						echo '

-								<input name="field-', $field['id'], '" type="radio" value="', $key, '"', $field['value'] == $key ? ' checked="checked"' : '', ' /> <span>', $option, '</span><br />';

+								<input name="field-', $field['id'], '" type="radio" value="', $key, '"', $field['value'] == $key ? ' checked="checked"' : '', ' /> <span>', $option, '</span><br>';

 					}

 					echo '

@@ -298,7 +298,7 @@ function template_ticket_custom_fields()

 				echo '

 						</dl>

-						<hr class="hrcolor" />

+						<hr>

 					</div>';

 			}

 		}

@@ -325,7 +325,7 @@ function template_ticket_posterrors()

 	foreach ($context['shd_errors'] as $error)

 		echo '

-									', $txt['error_' . $error], '<br />';

+									', $txt['error_' . $error], '<br>';

 	echo '

 								</dt>

@@ -348,7 +348,7 @@ function template_ticket_subjectbox()

 	if (!empty($context['ticket_form']['selecting_dept']) && !empty($context['postable_dept_list']))

 	{

 		echo '

-						<br />

+						<br>

 						<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="" class="shd_smallicon" /> <strong>', $txt['shd_ticket_dept'], '</strong>

 						<select name="newdept" onchange="updateDeptCFs(this.value)">

 							<option value="0">', $txt['shd_select_dept'], '</option>';

@@ -397,14 +397,14 @@ function template_ticket_subjectbox()

 	if (!empty($context['can_post_proxy']))

 	{

 		echo '

-						<br />

+						<br>

 						<input type="hidden" name="proxy" value="" />

 						<img src="', $settings['default_images_url'], '/simpledesk/proxy.png" alt="" class="shd_smallicon" /> <strong>', $txt['shd_ticket_proxy'], ':</strong>

 						<input type="text" name="proxy_author" id="proxy_author" size="50" maxlength="100" class="input_text" value="', (empty($context['ticket_form']['proxy']) ? '' : $context['ticket_form']['proxy']), '" tabindex="', $context['tabindex']++, '" />';

 	}

 	echo '

-						<hr /><br />';

+						<hr><br>';

 }

 function template_ticket_proxy_js()

@@ -439,7 +439,7 @@ function template_ticket_content()

 	template_ticket_posterrors();

 	echo '

 						<img src="', $settings['default_images_url'], '/simpledesk/name.png" alt="" class="shd_smallicon" /> <strong>', $context['ticket_form']['subject'], '</strong>

-						<hr /><br />

+						<hr><br>

 							', $context['ticket_form']['message'];

 	if (!empty($settings['show_modify']) && !empty($context['ticket']['modified']))

@@ -497,7 +497,7 @@ function template_ticket_shd_replyarea()

 					</div>

 				</div>

 			</div>

-			<br />';

+			<br>';

 }

 function template_ticket_postbox()

@@ -531,7 +531,7 @@ function template_ticket_postbox()

 	echo '

 						<br class="clear" />

-						<span class="smalltext"><br />', $context['browser']['is_firefox'] ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '</span><br />

+						<span class="smalltext"><br>', $context['browser']['is_firefox'] ? $txt['shortcuts_firefox'] : $txt['shortcuts'], '</span><br>

 						<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['post'], '" tabindex="', $context['tabindex']++, '" accesskey="s" class="button_submit" />

 						<input class="button_submit" type="submit" name="preview" value="', $txt['preview'], '" accesskey="p" tabindex="', $context['tabindex']++, '" />';

@@ -594,7 +594,7 @@ function template_ticket_footer()

 				</div>

 				<br class="clear" />

 			</div>

-			<br />';

+			<br>';

 }

 function template_preview()

@@ -617,7 +617,7 @@ function template_preview()

 				</div>

 			</div>

 			</div>

-			<br />';

+			<br>';

 	}

 }

@@ -706,11 +706,11 @@ function template_ticket_additional_options()

 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.

 		if (!empty($modSettings['attachmentCheckExtensions']))

 			echo '

-								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br />';

+								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>';

 		if (!empty($context['attachment_restrictions']))

 			echo '

-								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br />';

+								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>';

 		echo '

 							</dd>

@@ -817,10 +817,10 @@ function template_ticket_do_replies()

 							', shd_profile_link($reply['member']['avatar']['image'], $reply['member']['id']);

 			if ($modSettings['shd_staff_badge'] == (!empty($reply['is_staff']) ? 'staffbadge' : 'userbadge') || $modSettings['shd_staff_badge'] == 'bothbadge')

-				echo '<br />

+				echo '<br>

 							', $reply['member']['group_stars'];

 			elseif (!empty($reply['is_staff']) && $modSettings['shd_staff_badge'] == 'nobadge')

-				echo '<br />

+				echo '<br>

 							<img src="', $settings['default_images_url'] . '/simpledesk/staff.png" class="shd_smallicon" title="', $txt['shd_ticket_staff'], '" alt="', $txt['shd_ticket_staff'], '" />';

 			echo '

@@ -837,9 +837,9 @@ function template_ticket_do_replies()

 								</span>

 								', sprintf($txt['shd_reply_written'], $reply['time']), '