Shall we call this "taking the trash out" ? (0245ef7) - SD-SimpleDesk

Shall we call this "taking the trash out" ?

Antes commited on 2015-12-15 08:02:19
Showing 18 changed files, with 290 additions and 753 deletions.

Signed-off-by: Antes <antes@simplemachines.org>

css/helpdesk.css d648802..b9e002a
css/helpdesk_admin.css d924f6a..89f182d
sd_template/SimpleDesk-Admin.template.php c65a761..66a18ad
sd_template/SimpleDesk-AdminCannedReplies.template.php 163f2f0..4a671bd
sd_template/SimpleDesk-AdminCustomField.template.php d866688..4ab3992
sd_template/SimpleDesk-AdminDepartments.template.php 3bc64de..99cd1fd
sd_template/SimpleDesk-AdminMaint.template.php 2c26851..9b9ef80
sd_template/SimpleDesk-AdminPermissions.template.php a40e995..1ca4720
sd_template/SimpleDesk-AdminPlugins.template.php 0a56b4b..c56d003
sd_template/SimpleDesk-Assign.template.php 8800f69..e3e14fc
sd_template/SimpleDesk-Display.template.php 953ecba..35f3b56
sd_template/SimpleDesk-MoveDept.template.php 80da03d..0e0c38e
sd_template/SimpleDesk-Post.template.php f9e18e0..10d0e5c
sd_template/SimpleDesk-Profile.template.php a7840ce..cffe792
sd_template/SimpleDesk-Search.template.php ee32b02..0ef6b6b
sd_template/SimpleDesk-TicketTopicMove.template.php 93f5d96..9027e83
sd_template/SimpleDesk-Unread.template.php 60b568b..badb6e5
sd_template/SimpleDesk.template.php a8de94f..fdfd80e

css/helpdesk.css

View file @ 0245ef7

@@ -1,20 +1,6 @@
 /**********************************
 * General stuff used all around the helpdesk 	*
 ***********************************/
-
-/* Half rounded headers */
-div.grid_header
-{
-	height: 28px;
-	margin-bottom: -1px;
-}
-
-/* You no left float, Core! */
-div.grid_header img
-{
-	float: none;
-}
-
 /* SimpleDesk icons */
 .shd_smallicon
 {
@@ -32,11 +18,6 @@ div.grid_header img
 	position: relative;
 	top: 3px;
 }
-.shd_icon_fullhead
-{
-	position: relative;
-	top: 9px;
-}
 .shd_tinyicon
 {
 	width: 9px;
@@ -48,11 +29,6 @@ div.grid_header img
 	margin-top: -3px;
 }
 
-.shd_nowrap
-{
-	white-space: nowrap;
-}
-
 .shd_no_margin
 {
 	margin: 0;
@@ -63,24 +39,6 @@ div.grid_header img
 	border-bottom: 0;
 }
 
-/**********************************
-* The ticket listings 				*
-***********************************/
-.shd_ticketlist
-{
-	width: 100%;
-	border: solid #BBBBBB;
-	border-width: 1px 1px 0;
-}
-.shd_ticketlist td
-{
-	padding: 5px;
-	border-bottom: 1px solid #AFAFAF;
-}
-.shd_noticket
-{
-	text-align: center;
-}
 .shd_staffresources ul
 {
 	list-style-type: none;
@@ -92,12 +50,10 @@ div.grid_header img
 	margin-bottom: 3px;
 }
 
-.shd_gototicket
-{
+.shd_gototicket {
 	display: block;
 	float: right;
 	margin-left: 1em;
-	white-space: nowrap;
 }
 
 .shd_assignees
@@ -135,18 +91,6 @@ dd#assigned_button
 	padding: 1px 0;
 }
 
-span.shd_new_tickets
-{
-	margin-left: 5px;
-    padding: 1px 5px 3px 4px;
-}
-
-/* The page index color looks ugly with our theme. */
-.shd_main_hd .cat_bar .current_page
-{
-	color: #fff;
-}
-
 /**********************************
 * Stuff used within the actual tickets 	*
 ***********************************/
@@ -163,12 +107,11 @@ h3.ticketheader img
 .shd_ticket_side_column
 {
 	float: left;
-	width: 235px;
+	width: 20%;
 	margin-right: 20px;
+	padding: 5px;
 }
-.shd_ticketdetails
-{
-	min-height: 280px;
+.shd_ticketdetails {
 	overflow: auto;
 	float: left;
 	width: 100%;
@@ -186,12 +129,7 @@ h3.ticketheader img
 	float: left;
 	width: 100%;
 }
-.shd_ticket_side_column ul
-{
-	list-style-type: none;
-	padding-left: 0;
-	margin: 0;
-}
+
 .shd_ticket_side_column li
 {
 	line-height: 1.8em;
@@ -202,12 +140,8 @@ h3.ticketheader img
 {
 	min-height: 250px;
 }
-.shd_ticket_description
-{
-	padding-top: 9px;
-	padding-bottom: 45px;
+.shd_ticket_description {
 	margin-left: 260px;
-	min-height: 200px;
 }
 
 #shd_ticket_text
@@ -360,20 +294,6 @@ h3.ticketheader img
 }
 
 /* Show tickets */
-.shd_description
-{
-	border: 1px solid #bbb;
-}
-.shd_windowbg
-{
-	background: #f0f4f7 none repeat scroll 0 0;
-	border: 1px solid #ddd;
-	 box-shadow: 0 -2px 2px rgba(0, 0, 0, 0.1);
-	box-sizing: border-box;
-	margin: 0;
-	overflow: auto;
-	padding: 10px 16px;
-}
 .shd_showtickets
 {
 	height: 15px;
@@ -403,11 +323,6 @@ h3.ticketheader img
 /**********************************
 * Ticket replies				 *
 ***********************************/
-.shd_reply
-{
-	padding-bottom: 32px;
-	padding-top: 12px;
-}
 .shd_posterinfo
 {
 	width: 14em;
@@ -496,10 +411,6 @@ h3.ticketheader img
 	margin-left: -8px;
 	margin-right: 3px;
 }
-.shd_attachmentbox
-{
-	padding: 10px;
-}
 .shd_attachmentcolumn
 {
 	margin-right: 20px;
@@ -601,9 +512,35 @@ h3.ticketheader img
 	border-right: none;
 }
 
-ul.shd_profile_nav_list, ul.shd_profile_nav_inline
-{
-	/* Webkit's default stylesheet also, just for giggles, adds margin-before and margin-after to lists. */
-	-webkit-margin-before: 0;
-	-webkit-margin-after: 0;
+/* I'm not sure about the above, I'll rewrite them later */
+.bot_page {
+	border: 1px solid #DDD;
+	border-top: none;
+}
+#ticket_log_header {
+	clear: both;
+}
+
+/* Urgency stuff */
+.generic_icons.urgency_increase {
+	background-position: -161px -5px;
+}
+.generic_icons.urgency_decrease {
+	background-position: -213px -5px;
+}
+
+/* We need some adjustments */
+dl.stats dd span, dl.stats dt span {
+	position: relative;
+}
+
+/* We need something like winfo in helpdesk */
+.noup {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+	margin: 0 !important;
+}
+
+.shd_icon_fullhead {
+	position: relative;
 }
\ No newline at end of file

css/helpdesk_admin.css

View file @ 0245ef7

@@ -1,45 +1,3 @@
-#sd_live_news
-{
-	width: 64%;
-	font-size: 0.85em;
-}
-#sd_live_news .cat_bar
-{
-	margin-bottom: 0;
-}
-#sd_live_news .windowbg
-{
-	margin-top: 0;
-	height: 23.5em;
-}
-#sd_live_news div.content
-{
-	padding: 0;
-}
-#sd_live_news div.content dl
-{
-	padding: 0.5em 0 0 0.5em;
-}
-
-#sd_supportVersionsTable
-{
-	width: 34%;
-}
-#sd_supportVersionsTable .cat_bar
-{
-	margin-bottom: 0;
-}
-#sd_supportVersionsTable .windowbg
-{
-	margin-top: 0;
-	height: 20em;
-}
-
-#sd_version_details
-{
-	overflow: auto;
-	height: 16.4em;
-}
 #sdAnnouncements
 {
 	height: 21.6em;
@@ -74,11 +32,6 @@
 	float: right;
 	margin-top: 8px;
 }
-.shd_actionloginfo
-{
-	margin-bottom: 0;
-	border-bottom: 0;
-}
 .shd_admin_leftcolumn
 {
 	width: 74%;
@@ -105,11 +58,6 @@
 {
 	margin-bottom: 0;
 }
-h3.sd_no_margin
-{
-	margin-bottom: 0px;
-	padding-bottom: 3px;
-}
 
 .disabled
 {
@@ -119,12 +67,6 @@ h3.sd_no_margin
 .shd_credits_names
 {
 	margin-left: 57px;
-	margin-bottom: 12px;
-}
-
-.shd_credits_names hr
-{
-	margin: 0;
 }
 
 .shd_valign_top
@@ -283,16 +225,3 @@ h3 a.permcollapse img
 {
 	vertical-align: top;
 }
\ No newline at end of file
-
-/* SMF 2.1 no longer uses description, but we make use of it still! */
-.sd_description
-{
-	background: #F8F8F8;
-    overflow: auto;
-    padding-bottom: .5em;
-    border: 1px solid #ddd;
-    border-top: none;
-    margin: 0 0 10px 0;
-    padding: 12px 9px 8px 9px;
-    box-sizing: border-box;
-}
\ No newline at end of file

sd_template/SimpleDesk-Admin.template.php

View file @ 0245ef7

@@ -39,8 +39,7 @@ function template_shd_admin()
 
 	// Display the "live news" from simpledesk.net
 	echo '
-			<div id="sd_live_news" class="floatleft">
-				<div class="tborder">
+			<div id="live_news" class="floatleft">
 				<div class="cat_bar">
 					<h3 class="catbg">
 						<img src="', $settings['default_images_url'], '/simpledesk/live.png" alt="*" />
@@ -48,19 +47,16 @@ function template_shd_admin()
 						<span class="righttext"><a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_live" onclick="return reqWin(this.href);"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a></span>
 					</h3>
 				</div>
-				<div class="windowbg">
-						<div class="content">
+				<div class="windowbg nopadding">
+					<div class="padding">
 							<div id="sdAnnouncements">', $txt['shd_no_connect'], '</div>
 						</div>
-					<span class="botslice"><span></span></span>
-				</div>
 				</div>
 			</div>';
 
 	// Show the user version information from their server.
 	echo '
-			<div id="sd_supportVersionsTable" class="floatright">
-				<div class="tborder">
+			<div id="supportVersionsTable" class="floatright">
 				<div class="cat_bar">
 					<h3 class="catbg">
 						<img src="', $settings['default_images_url'], '/simpledesk/modification.png" alt="*" />
@@ -68,54 +64,45 @@ function template_shd_admin()
 						<span class="righttext"><a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_modification" onclick="return reqWin(this.href);"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a></span>
 					</h3>
 				</div>
-				<div class="windowbg">
-					<div class="content">
-						<div id="sd_version_details">
+				<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 />
-							<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" class="shd_nowrap">', SHD_VERSION, '</em><br />
+						<em id="yourVersion">', SHD_VERSION, '</em><br />
 							', $txt['shd_current_version'], ':
-							<em id="sdVersion" class="shd_nowrap">??</em><br /><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" class="shd_nowrap">
+						<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 />
-							</div>
-							<br />';
+						</div>';
 
 	// Display all the members who can manage the helpdesk.
 	// NOTE: This is currently (15/1/10) uncapped, meaning it's just the full list direct from SimpleDesk-Admin.php.
 	// That gets the data. Up to here how it should be displayed.
 	echo '
-							<br />
 						<img src="', $settings['default_images_url'], '/simpledesk/staff.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['shd_staff_list'], ':</strong>
 						', implode(', ', $context['staff']);
 
 	echo '
 						</div>
 					</div>
-					<span class="botslice"><span></span></span>
 				</div>
-			</div>
-			</div>
-		</div>
-		<div class="shd_credits_break">&nbsp;</div>';
+		</div>';
 
 
 	echo '
 		<div id="sd_credits">
-			<div class="tborder">
 			<div class="title_bar">
-				<h3 class="titlebg sd_no_margin">
-					<img src="', $settings['default_images_url'], '/simpledesk/credits.png" alt="*" />
+				<h3 class="titlebg">
+					<a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_credits" onclick="return reqWin(this.href);"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a>
 					', $txt['shd_credits'], '
 					<span class="righttext"><a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_credits" onclick="return reqWin(this.href);"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a></span>
 				</h3>
@@ -125,14 +112,14 @@ function template_shd_admin()
 		{
 			echo '
 				<div class="roundframe">
-					<div class="content">
+					<div class="padding">
 						', $section['pretext'], '
 						<hr />';
 
 				foreach ($section['groups'] as $group)
 				{
 					echo '
-						<div class="sd_description">';
+						<div class="padding">';
 
 					// Pretty icons! :D
 					if (isset($group['icon']))
@@ -176,8 +163,6 @@ function template_shd_admin()
 						<span class="smalltext">&nbsp;<img src="', $settings['default_images_url'], '/simpledesk/update.png" alt="*" class="shd_tinyicon" /> ', $txt['shd_former_contributors'], '</span>
 					</div>
 				</div>
-				<span class="lowerframe"><span></span></span>
-				</div>
 			</div>';
 		}
 
@@ -242,7 +227,6 @@ function template_shd_admin()
 								</p>
 							</div>
 						</div>
-						<span class="botslice"><span></span></span>
 					</div>
 				'), ',
 				sUpdateNotificationLink: ', JavaScriptEscape($scripturl . '?action=admin;area=packages;pgdownload;auto;package=%package%;' . $context['session_var'] . '=' . $context['session_id']), ',
@@ -345,7 +329,6 @@ function template_shd_show_settings()
 				echo '
 					</dl>
 				</div>
-				<span class="botslice"><span></span></span>
 			</div>
 			</div>';
 			}
@@ -366,7 +349,7 @@ function template_shd_show_settings()
 			else
 			{
 				echo '
-					<p class="sd_description">
+					<p class="information">
 						', $config_var['label'], '
 					</p>';
 			}
@@ -555,7 +538,6 @@ function template_shd_show_settings()
 	if ($is_open)
 		echo '
 					</div>
-				<span class="botslice"><span></span></span>
 			</div>
 			</div>';
 
@@ -602,8 +584,8 @@ function template_shd_action_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%" colspan="2">
 								<img src="', $settings['default_images_url'], '/simpledesk/action.png" class="shd_smallicon" alt="" />
 								<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog', $context['sort'] == $sort_types['action'] && !isset($_REQUEST['asc']) ? ';sort=action;asc' : ';sort=action', '">
@@ -649,12 +631,11 @@ function template_shd_action_log()
 						</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'), '">
-							<td width="1%" class="shd_nowrap">
+						<tr class="windowbg">
+							<td width="1%">
 								<img src="', shd_image_url($action['action_icon']), '" alt="" class="shd_smallicon" />
 							</td>
 							<td class="smalltext">', $action['action_text'], '</td>
@@ -664,8 +645,6 @@ function template_shd_action_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=actionlog;remove='. $action['id'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/delete.png" alt="' . $txt['shd_delete_item'] . '" /></a>' : '', '</td>
 						</tr>';
-
-					$use_bg2 = !$use_bg2;
 				}
 			}
 
@@ -713,25 +692,18 @@ function template_shd_support()
 						<input type="submit" value="', $txt['shd_admin_support_send'], '" tabindex="3" accesskey="s" class="button_submit" />
 					</form>
 				</div>
-			<span class="lowerframe"><span></span></span>
 		</div>
 	</div>
 	<div class="shd_admin_rightcolumn floatleft">
-		<div class="tborder">
-			<div class="title_bar">
-				<h3 class="titlebg sd_no_margin">
+		<div class="cat_bar">
+			<h3 class="catbg">
 					<img src="', $settings['images_url'], '/helptopics.png" alt="?" /> ', $txt['shd_admin_support_what_is_this'], '
 				</h3>
 			</div>
-			<div class="windowbg2">
-				<div class="content smalltext">
+		<div class="information smalltext">
 					', $txt['shd_admin_support_explanation'], '
 				</div>
-				<span class="botslice"><span></span></span>
-			</div>
-		</div>
-	</div>
-	<br class="clear" />';
+	</div>';
 }
 
 /**

sd_template/SimpleDesk-AdminCannedReplies.template.php

View file @ 0245ef7

@@ -25,7 +25,7 @@ function template_shd_cannedreplies_home()
 							', $txt['shd_admin_cannedreplies_home'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_cannedreplies_homedesc'], '
 					</p>
 				</div>';
@@ -57,31 +57,29 @@ function template_shd_cannedreplies_home()
 							<a href="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=editcat;cat=' . $cat_id . ';', $context['session_var'], '=', $context['session_id'], '"><img src="', $settings['default_images_url'], '/simpledesk/edit.png" class="icon" alt="', $txt['shd_ticket_edit'],'" title="', $txt['shd_ticket_edit'], '" /></a>
 						</h3>
 					</div>
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">
-							<td width="30%" class="shd_nowrap">', $txt['shd_admin_cannedreplies_replyname'], '</td>
+					<table class="table_grid">
+						<tr class="title_bar">
+							<td width="30%">', $txt['shd_admin_cannedreplies_replyname'], '</td>
 							<td width="25%">', $txt['shd_departments'], '</td>
 							<td>', $txt['shd_admin_cannedreplies_isactive'], '</td>
 							<td>', $txt['shd_admin_cannedreplies_visibleto'], '</td>
-							<td colspan="3" width="1%" class="shd_nowrap">', $txt['shd_admin_custom_fields_move'], '</td>
-							<td colspan="2" width="1%" class="shd_nowrap">', $txt['shd_actions'], '</td>
+							<td colspan="3" width="1%">', $txt['shd_admin_custom_fields_move'], '</td>
+							<td colspan="2" width="1%">', $txt['shd_actions'], '</td>
 						</tr>';
 
 			if (empty($cat['replies']))
 			{
-				$use_bg2 = false;
 				echo '
-						<tr class="windowbg2">
+						<tr class="windowbg">
 							<td colspan="9" class="centertext">', $txt['shd_admin_cannedreplies_emptycat'], '</td>
 						</tr>';
 			}
 			else
 			{
-				$use_bg2 = true;
 				foreach ($cat['replies'] as $reply)
 				{
 					echo '
-						<tr class="windowbg', $use_bg2 ? '2' : '', '">
+						<tr class="windowbg">
 							<td>', $reply['title'], '</td>
 							<td>', $reply['depts'], '</td>
 							<td><img src="', $settings['default_images_url'], '/simpledesk/cf_', $reply['active_string'], '.png" alt="', $txt['shd_admin_custom_fields_' . $reply['active_string']], '" title="', $txt['shd_admin_custom_fields_' . $reply['active_string']], '" /></td>
@@ -96,12 +94,11 @@ function template_shd_cannedreplies_home()
 							<td><a href="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=editreply;reply=' . $reply['id_reply'] . ';', $context['session_var'], '=', $context['session_id'], '"><img src="', $settings['default_images_url'], '/simpledesk/edit.png" class="icon" alt="', $txt['shd_ticket_edit'],'" title="', $txt['shd_ticket_edit'], '" /></a></td>
 							<td><a href="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=savereply;reply=' . $reply['id_reply'] . ';delete=yes;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_admin_cannedreplies_deletereply_confirm']). ');"><img src="', $settings['default_images_url'], '/simpledesk/delete.png" class="icon" alt="', $txt['shd_ticket_delete'],'" title="', $txt['shd_ticket_delete'], '" /></a></td>
 						</tr>';
-					$use_bg2 = !$use_bg2;
 				}
 			}
 
 			echo '
-						<tr class="windowbg', $use_bg2 ? '2' : '', '">
+						<tr class="windowbg">
 							<td colspan="9" class="righttext">[<a href="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=createreply;cat=', $cat_id, '">', $txt['shd_admin_cannedreplies_addreply'], '</a>]</td>
 						</tr>
 					</table>
@@ -129,7 +126,7 @@ function template_shd_edit_canned_category()
 							', $txt['shd_admin_cannedreplies_home'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_cannedreplies_homedesc'], '
 					</p>
 				</div>
@@ -158,8 +155,7 @@ function template_shd_edit_canned_category()
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
 					</form>
-				</div>
-				<span class="lowerframe"><span></span></span>';
+				</div>';
 }
 
 function template_shd_edit_canned_reply()
@@ -176,7 +172,7 @@ function template_shd_edit_canned_reply()
 							', $txt['shd_admin_cannedreplies_home'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_cannedreplies_homedesc'], '
 					</p>
 				</div>
@@ -209,8 +205,6 @@ function template_shd_edit_canned_reply()
 							</dl>
 						</div>
 					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />
 					<div class="cat_bar">
 						<h3 class="catbg">
 							<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="*" />
@@ -232,8 +226,6 @@ function template_shd_edit_canned_reply()
 							</dl>
 						</div>
 					</div>
-					<span class="lowerframe"><span></span></span>
-					<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')
@@ -261,7 +253,7 @@ function template_shd_move_reply_cat()
 							', $txt['shd_admin_cannedreplies_home'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_cannedreplies_homedesc'], '
 					</p>
 				</div>
@@ -297,7 +289,6 @@ function template_shd_move_reply_cat()
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
 					</form>
-				</div>
-				<span class="lowerframe"><span></span></span>';
+				</div>';
 }
 

sd_template/SimpleDesk-AdminCustomField.template.php

View file @ 0245ef7

@@ -20,11 +20,11 @@ function template_shd_custom_field_home()
 							', $txt['shd_admin_custom_fields_long'], '
 						</h3>
 					</div>
-					<p class="sd_description shd_actionloginfo">
+					<p class="information">
 						', $txt['shd_admin_custom_fields_desc'], '
 					</p>
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">
+					<table class="table_grid">
+						<tr class="title_bar">
 							<td width="30%" colspan="2">
 								<img src="', $settings['default_images_url'], '/simpledesk/name.png" class="icon" alt="*" />
 								', $txt['shd_admin_custom_fields_fieldname'], '
@@ -36,8 +36,8 @@ function template_shd_custom_field_home()
 							<td>', $txt['shd_admin_custom_fields_active'], '</td>
 							<td>', $txt['shd_admin_custom_fields_visible'], '</td>
 							<td>', $txt['shd_admin_custom_field_permissions'], '</td>
-							<td colspan="2" width="1%" class="shd_nowrap">', $txt['shd_admin_custom_fields_move'], '</td>
-							<td class="shd_nowrap">', $txt['shd_actions'], '</td>
+							<td colspan="2" width="1%">', $txt['shd_admin_custom_fields_move'], '</td>
+							<td>', $txt['shd_actions'], '</td>
 						</tr>';
 
 	if (empty($context['custom_fields']))
@@ -47,17 +47,16 @@ function template_shd_custom_field_home()
 						</tr>';
 	else
 	{
-		$use_bg2 = true;
 		foreach ($context['custom_fields'] as $field)
 		{
 			echo '
-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+						<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 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>
-							<td class="shd_nowrap">
+							<td>
 								', ($field['field_loc'] & CFIELD_TICKET) !== 0 ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/ticket.png" alt="' . $txt['shd_admin_custom_fields_inticket'] . '" title="' . $txt['shd_admin_custom_fields_inticket'] . '" />') : '', '
 								', ($field['field_loc'] & CFIELD_REPLY) !== 0 ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/replies.png" alt="' . $txt['shd_admin_custom_fields_inreply'] . '" title="' . $txt['shd_admin_custom_fields_inreply'] . '" />') : '', '
 							</td>
@@ -79,8 +78,6 @@ function template_shd_custom_field_home()
 								<a href="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=save;field=', $field['id_field'], ';delete;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_admin_delete_custom_field_confirm']). ');"><img src="', $settings['default_images_url'], '/simpledesk/delete.png" class="icon" alt="', $txt['shd_ticket_delete'],'" title="', $txt['shd_ticket_delete'], '" /></a>
 							</td>
 						</tr>';
-
-			$use_bg2 = !$use_bg2;
 		}
 	}
 
@@ -219,7 +216,7 @@ function template_shd_custom_field_edit()
 								', $context['section_title'], '
 							</h3>
 						</div>
-						<p class="sd_description">
+						<p class="information">
 							', $context['section_desc'],'
 						</p>
 					</div>
@@ -287,8 +284,6 @@ function template_shd_custom_field_edit()
 							</dl>
 						</div>
 					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />
 					<div class="cat_bar">
 						<h3 class="catbg">
 							<img src="', $settings['default_images_url'], '/simpledesk/fieldtype.png" alt="*" />
@@ -298,8 +293,8 @@ function template_shd_custom_field_edit()
 					<div class="roundframe">
 						<div class="content">
 							<dl class="settings">
-								<dt><strong>', $txt['shd_admin_custom_fields_fieldtype'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_fields_description_desc'], '</span></dt>
-								<dd class="shd_nowrap">
+								<dt><strong>', $txt['shd_admin_custom_fields_fieldtype'], ':</strong></dt>
+								<dd>
 									<span id="cf_fieldtype_icon" class="cf_ui_', $context['field_types'][$context['field_type_value']][1], '"></span>
 									<select name="field_type" id="cf_fieldtype" onchange="javascript:update_field_type(this.value);">';
 
@@ -374,9 +369,7 @@ function template_shd_custom_field_edit()
 								</dd>
 							</dl>
 						</div>
-					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />';
+					</div>';
 
 	if (!empty($context['dept_fields']))
 	{
@@ -404,8 +397,7 @@ function template_shd_custom_field_edit()
 		echo '
 							</dl>
 						</div>
-					</div>
-					<span class="lowerframe"><span></span></span>';
+					</div>';
 	}
 
 	echo '

sd_template/SimpleDesk-AdminDepartments.template.php

View file @ 0245ef7

@@ -25,27 +25,26 @@ function template_shd_departments_home()
 							', $txt['shd_admin_departments_home'], '
 						</h3>
 					</div>
-					<p class="sd_description shd_actionloginfo">
+					<p class="information">
 						', $txt['shd_admin_departments_homedesc'], '
 					</p>
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">
+					<table class="table_grid">
+						<tr class="title_bar">
 							<td width="1%"></td>
-							<td width="25%" class="shd_nowrap">
+							<td width="25%">
 								', $txt['shd_department_name'], '
 							</td>
 							<td>', $txt['shd_dept_boardindex'], '</td>
-							<td width="40%" class="shd_nowrap">
+							<td width="40%">
 								', $txt['shd_roles_in_dept'], '
 							</td>
-							<td colspan="3" width="1%" class="shd_nowrap">', $txt['shd_actions'], '</td>
+							<td colspan="3" width="1%">', $txt['shd_actions'], '</td>
 						</tr>';
 
-	$use_bg2 = true;
 	foreach ($context['shd_departments'] as $department)
 	{
 		echo '
-						<tr class="windowbg', $use_bg2 ? '2' : '', '">
+						<tr class="windowbg">
 							<td></td>
 							<td>
 								', $department['dept_name'], '
@@ -76,7 +75,7 @@ function template_shd_departments_home()
 					$first = false;
 
 				echo '
-								<span class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$role['template']]['icon'], '" class="icon" alt="*">
+								<span><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$role['template']]['icon'], '" class="icon" alt="*">
 								<a href="', $scripturl, '?action=admin;area=helpdesk_permissions;sa=editrole;role=', $role['id_role'], '">', $role['role_name'], '</a></span>';
 			}
 		}
@@ -92,7 +91,6 @@ function template_shd_departments_home()
 
 		echo '
 						</tr>';
-		$use_bg2 = !$use_bg2;
 	}
 
 	echo '
@@ -117,7 +115,7 @@ function template_shd_create_dept()
 							', $txt['shd_admin_departments_home'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_departments_homedesc'], '
 					</p>
 				</div>
@@ -158,8 +156,7 @@ function template_shd_create_dept()
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
 					</form>
-				</div>
-				<span class="lowerframe"><span></span></span>';
+				</div>';
 }
 
 function template_shd_edit_dept()
@@ -175,7 +172,7 @@ function template_shd_edit_dept()
 								', $txt['shd_admin_departments_home'], '
 							</h3>
 						</div>
-						<p class="sd_description">
+						<p class="information">
 							', $txt['shd_admin_departments_homedesc'], '
 						</p>
 					</div>
@@ -210,9 +207,7 @@ function template_shd_edit_dept()
 										<option value="1"', $context['shd_dept']['before_after'] == 1 ? ' selected="selected"' : '', '>', $txt['shd_boardindex_cat_after'], '</option>
 									</select>
 								</dd>
-								<dt><strong>', $txt['shd_dept_theme'], '</strong>
-									<div class="smalltext">', $txt['shd_dept_theme_note'], '</div>
-								</dt>
+								<dt><strong>', $txt['shd_dept_theme'], '</strong></dt>
 								<dd>';
 
 	if (empty($context['dept_theme_list']) || count($context['dept_theme_list']) == 1)
@@ -245,36 +240,31 @@ function template_shd_edit_dept()
 							</dl>
 						</div>
 					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />
 					<div class="tborder floatleft" style="width: 100%;">
 						<div class="cat_bar">
-							<h3 class="catbg sd_no_margin">
+							<h3 class="catbg">
 								<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />
 								', $txt['shd_roles_in_dept'], '
 							</h3>
 						</div>
-						<p class="sd_description shd_actionloginfo">
+						<p class="information">
 							', $txt['shd_roles_in_dept_desc'], '
 						</p>
-						<table class="shd_ticketlist" cellspacing="0" width="100%">
-							<tr class="titlebg">
+						<table class="table_grid">
+							<tr class="title_bar">
 								<td width="50%">', $txt['shd_role'], '</td>
 								<td>', $txt['shd_assign_dept'], '</td>
 							</tr>';
 
-	$use_bg2 = true;
 	if (!empty($context['shd_roles']))
 	{
 		foreach ($context['shd_roles'] as $id_role => $role)
 		{
 			echo '
-							<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+							<tr class="windowbg">
 								<td><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$role['template']]['icon'], '"> <a href="', $scripturl, '?action=admin;area=helpdesk_permissions;sa=editrole;role=', $role['id_role'], '">', $role['role_name'], '</a></td>
 								<td><input type="checkbox" class="input_check" name="role', $id_role, '"', !empty($role['in_dept']) ? ' checked="checked"' : '', ' /></td>
 							</tr>';
-
-			$use_bg2 = !$use_bg2;
 		}
 	}
 	else

sd_template/SimpleDesk-AdminMaint.template.php

View file @ 0245ef7

@@ -33,8 +33,7 @@ function template_shd_admin_maint_home()
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				</form>
 			</div>
-		</div>
-		<span class="lowerframe"><span></span></span><br />';
+		</div>';
 
 	// Reattribute guest posts
 	echo '
@@ -127,7 +124,6 @@ function template_shd_admin_maint_home()
 				</form>
 			</div>
 		</div>
-		<span class="lowerframe"><span></span></span><br />
 		<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?rc5"></script>
 		<script type="text/javascript"><!-- // --><![CDATA[
 			var oAttributeMemberSuggest = new smc_AutoSuggest({
@@ -198,8 +194,7 @@ function template_shd_admin_maint_home()
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				</form>
 			</div>
-		</div>
-		<span class="lowerframe"><span></span></span><br />';
+		</div>';
 	}
 }
 
@@ -212,21 +207,18 @@ function template_shd_admin_maint_findrepairdone()
 		// Yay everything was fine.
 		echo '
 		<div class="windowbg">
-			<span class="topslice"><span></span></span>
 			<div class="content">
 				<p>', $txt['maintain_no_errors'], '</p>
 				<p class="padding">
 					<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
 				</p>
 			</div>
-			<span class="botslice"><span></span></span>
 		</div>';
 	}
 	else
 	{
 		echo '
 		<div class="windowbg">
-			<span class="topslice"><span></span></span>
 			<div class="content">
 				<p>', $txt['errors_found'], '</p>';
 
@@ -259,7 +251,6 @@ function template_shd_admin_maint_findrepairdone()
 					<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
 				</p>
 			</div>
-			<span class="botslice"><span></span></span>
 		</div>';
 	}
 }
@@ -270,14 +261,12 @@ function template_shd_admin_maint_reattributedone()
 
 	echo '
 		<div class="windowbg">
-			<span class="topslice"><span></span></span>
 			<div class="content">
 				<p>', $txt['shd_admin_maint_reattribute_success'], '</p>
 				<p class="padding">
 					<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
 				</p>
 			</div>
-			<span class="botslice"><span></span></span>
 		</div>';
 }
 
@@ -288,14 +277,12 @@ function template_shd_admin_maint_massdeptmovedone()
 	echo '
 	<div id="admincenter">
 		<div class="windowbg">
-			<span class="topslice"><span></span></span>
 			<div class="content">
 				<p>', $txt['shd_admin_maint_massdeptmove_success'], '</p>
 				<p class="padding">
 					<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
 				</p>
 			</div>
-			<span class="botslice"><span></span></span>
 		</div>
 	</div>';
 }
@@ -327,7 +314,6 @@ function template_shd_admin_maint_search()
 				</form>
 			</div>
 		</div>
-		<span class="lowerframe"><span></span></span><br />
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<img src="', $settings['default_images_url'], '/simpledesk/search.png" alt="*">
@@ -369,7 +355,6 @@ function template_shd_admin_maint_search()
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				</form>
 			</div>
-		</div>
-		<span class="lowerframe"><span></span></span><br />';
+		</div>';
 }
 

sd_template/SimpleDesk-AdminPermissions.template.php

View file @ 0245ef7

@@ -25,31 +25,30 @@ function template_shd_permissions_home()
 							', $txt['shd_admin_permissions'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_permissions_homedesc'], '
 					</p>
 				</div>
 				<div class="tborder">
 					<div class="title_bar">
-						<h3 class="titlebg sd_no_margin">
+						<h3 class="titlebg">
 							<img src="', $settings['default_images_url'], '/simpledesk/position.png" alt="*" />
 							', $txt['shd_role_templates'], '
 						</h3>
 					</div>
-					<p class="sd_description shd_actionloginfo">
+					<p class="information">
 						', $txt['shd_role_templates_desc'], '
 					</p>
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">
+					<table class="table_grid">
+						<tr class="title_bar">
 							<td colspan="2" width="30%">', $txt['shd_role'], '</td>
 							<td colspan="', count($context['shd_permissions']['group_display']), '">', $txt['shd_permissions'], '</td>
 						</tr>';
 
-	$use_bg2 = true;
 	foreach ($context['shd_permissions']['roles'] as $role_id => $role_details)
 	{
 		echo '
-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+						<tr class="windowbg">
 							<td>', !empty($role_details['icon']) ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/' . $role_details['icon'] . '" alt="" />') : '', '</td>
 							<td>
 								', $txt[$role_details['description']], '
@@ -57,8 +56,6 @@ function template_shd_permissions_home()
 							</td>
 							', template_shd_display_permission_list($role_details['permissions']), '
 						</tr>';
-
-		$use_bg2 = !$use_bg2;
 	}
 
 	echo '
@@ -67,16 +64,16 @@ function template_shd_permissions_home()
 				<br /><br />
 				<div class="tborder">
 					<div class="title_bar">
-						<h3 class="titlebg sd_no_margin">
+						<h3 class="titlebg">
 							<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />
 							', $txt['shd_roles'], '
 						</h3>
 					</div>
-					<p class="sd_description shd_actionloginfo">
+					<p class="information">
 						', $txt['shd_roles_desc'], '
 					</p>
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">
+					<table class="table_grid">
+						<tr class="title_bar">
 							<td colspan="2" width="20%">', $txt['shd_role'], '</td>
 							<td colspan="', count($context['shd_permissions']['group_display']), '">', $txt['shd_permissions'], '</td>
 							<td width="15%">', $txt['shd_membergroups'], '</td>
@@ -92,11 +89,10 @@ function template_shd_permissions_home()
 	}
 	else
 	{
-		$use_bg2 = true;
 		foreach ($context['shd_permissions']['user_defined_roles'] as $role => $role_details)
 		{
 			echo '
-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+						<tr class="windowbg">
 							<td>', !empty($role_details['template_icon']) ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/' . $role_details['template_icon'] . '" alt="" title="' . sprintf($txt['shd_based_on'], $role_details['template_name']) . '" />') : '', '</td>
 							<td>
 								', $role_details['name'], '
@@ -127,7 +123,6 @@ function template_shd_permissions_home()
 
 			echo '
 						</tr>';
-			$use_bg2 = !$use_bg2;
 		}
 	}
 
@@ -213,7 +208,7 @@ function template_shd_create_role()
 							', $txt['shd_admin_permissions'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_permissions_homedesc'], '
 					</p>
 				</div>
@@ -241,8 +236,7 @@ function template_shd_create_role()
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
 					</form>
-				</div>
-				<span class="lowerframe"><span></span></span>';
+				</div>';
 }
 
 /**
@@ -266,7 +260,7 @@ function template_shd_edit_role()
 							', $txt['shd_admin_permissions'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_permissions_homedesc'], '
 					</p>
 				</div>
@@ -331,9 +325,7 @@ function template_shd_edit_role()
 								<dd><input type="text" name="rolename" id="rolename" value="', $role['name'], '" class="input_text" size="30" /></dd>
 							</dl>
 						</div>
-					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />';
+					</div>';
 
 	// Get ready to display the actual permissions
 	$permission_set = array();
@@ -397,7 +389,7 @@ function template_shd_edit_role()
 
 				echo '
 									<dt', (empty($txt['permissionhelp_' . $permission]) ? '' : ' title="' . $txt['permissionhelp_' . $permission] . '"') . '><img src="', shd_image_url($icon), '" alt="*" />', $txt['permissionname_' . $permission], '</dt>
-									<dd class="shd_nowrap">
+									<dd>
 										<span id="perm_', $permission, '_icon" class="', $perm_class, '"></span>
 										<select name="perm_', $permission, '" id="perm_', $permission, '" onchange="javascript:shd_chicon(this);">
 											<option value="disallow"', ($perm_value == 'disallow' ? ' selected="selected"' : ''), '>', (empty($txt['permissionname_' . $permission . '_no']) ? $txt['shd_roleperm_disallow'] : $txt['permissionname_' . $permission . '_no']), '&nbsp;</option>';
@@ -451,26 +443,25 @@ function template_shd_edit_role()
 	echo '
 					<div class="tborder floatleft" style="width: 100%;">
 						<div class="cat_bar">
-							<h3 class="catbg sd_no_margin">
+							<h3 class="catbg">
 								<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />
 								', $txt['shd_role_membergroups'], '
 							</h3>
 						</div>
-						<p class="sd_description shd_actionloginfo">
+						<p class="information">
 							', $txt['shd_role_membergroups_desc'], '
 						</p>
-						<table class="shd_ticketlist" cellspacing="0" width="100%">
-							<tr class="titlebg">
+						<table class="table_grid">
+							<tr class="title_bar">
 								<td width="30%">', $txt['shd_role'], '</td>
 								<td width="30%">', $txt['shd_badge_stars'], '</td>
 								<td>', $txt['shd_assign_group'], '</td>
 							</tr>';
 
-	$use_bg2 = true;
 	foreach ($context['membergroups'] as $id_group => $group)
 	{
 		echo '
-							<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+							<tr class="windowbg">
 								<td>', $group['link'], '</td>
 								<td>';
 
@@ -484,8 +475,6 @@ function template_shd_edit_role()
 		echo '</td>
 								<td><input type="checkbox" class="input_check" name="group', $id_group, '"', (in_array($id_group, $context['role_groups']) ? ' checked="checked"' : ''), ' /></td>
 							</tr>';
-
-		$use_bg2 = !$use_bg2;
 	}
 
 	echo '
@@ -495,29 +484,27 @@ function template_shd_edit_role()
 
 					<div class="tborder floatleft" style="width: 100%;">
 						<div class="cat_bar">
-							<h3 class="catbg sd_no_margin">
+							<h3 class="catbg">
 								<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="*" />
 								', $txt['shd_role_departments'], '
 							</h3>
 						</div>
-						<p class="sd_description shd_actionloginfo">
+						<p class="information">
 							', $txt['shd_role_departments_desc'], '
 						</p>
-						<table class="shd_ticketlist" cellspacing="0" width="100%">
-							<tr class="titlebg">
+						<table class="table_grid">
+							<tr class="title_bar">
 								<td width="50%">', $txt['shd_department_name'], '</td>
 								<td width="50%">', $txt['shd_assign_dept'], '</td>
 							</tr>';
 
-	$use_bg2 = true;
 	foreach ($context['role_depts'] as $id_dept => $dept)
 	{
 		echo '
-							<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+							<tr class="windowbg">
 								<td>', $dept['dept_name'], '</td>
 								<td><input type="checkbox" class="input_check" name="dept', $id_dept, '"', !empty($dept['is_role']) ? ' checked="checked"' : '', ' /></td>
 							</tr>';
-		$use_bg2 = !$use_bg2;
 	}
 
 	echo '
@@ -552,7 +539,7 @@ function template_shd_copy_role()
 							', $txt['shd_admin_permissions'], '
 						</h3>
 					</div>
-					<p class="sd_description">
+					<p class="information">
 						', $txt['shd_admin_permissions_homedesc'], '
 					</p>
 				</div>
@@ -582,7 +569,6 @@ function template_shd_copy_role()
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 						<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
 					</form>
-				</div>
-				<span class="lowerframe"><span></span></span>';
+				</div>';
 }
 

sd_template/SimpleDesk-AdminPlugins.template.php

View file @ 0245ef7

@@ -45,17 +45,15 @@ function template_shd_plugin_listing()
 						', $txt['shd_admin_plugins'], '
 					</h3>
 				</div>
-				<p class="sd_description">
+				<p class="information">
 					', $txt['shd_admin_plugins_homedesc'], '
 				</p>
 			</div>';
 
-	$use_bg2 = true;
 	foreach ($context['plugins'] as $id => $plugin)
 	{
 		echo '
-			<div class="windowbg', $use_bg2 ? '2' : '', '">
-				<span class="topslice"><span></span></span>
+			<div class="windowbg">
 				<div class="content features">';
 
 		if (!empty($plugin['installable']))
@@ -110,10 +108,7 @@ function template_shd_plugin_listing()
 
 		echo '
 				</div>
-				<span class="botslice clear_right"><span></span></span>
 			</div>';
-
-		$use_bg2 = !$use_bg2;
 	}
 
 	echo '

sd_template/SimpleDesk-Assign.template.php

View file @ 0245ef7

@@ -26,11 +26,7 @@ function template_assign()
 	if (empty($context['shd_return_to']))
 		$context['shd_return_to'] = 'ticket';
 
-	// Back to the helpdesk.
-	echo '
-		<div class="floatleft">
-			', template_button_strip(array($context['navigation']['back']), 'bottom'), '
-		</div><br class="clear" /><br />';
+		template_button_strip(array($context['navigation']['back']));
 
 	echo '
 	<div class="cat_bar">
@@ -62,13 +58,9 @@ function template_assign()
 	echo '
 						</select>
 					</dd>
-					<dt>
+				</dl>
 						<input type="submit" name="cancel" value="', ($context['shd_return_to'] == 'home' ? $txt['shd_cancel_home'] : $txt['shd_cancel_ticket']), '" accesskey="c" class="button_submit" />
-					</dt>
-					<dd>
 						<input type="submit" value="', $txt['shd_ticket_assign_ticket'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />
-					</dd>
-				</dl>
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />';
 
 	if ($context['shd_return_to'] == 'home')
@@ -78,7 +70,6 @@ function template_assign()
 	echo '
 			</div>
 		</form>
-	</div>
-	<span class="lowerframe"><span></span></span>';
+	</div>';
 }
 

sd_template/SimpleDesk-Display.template.php

View file @ 0245ef7

@@ -27,18 +27,16 @@ function template_viewticket()
 	global $context, $txt, $scripturl, $settings, $modSettings, $options;
 
 	// Back to the helpdesk.
-	echo '<div class="floatleft">', template_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']), 'bottom'), '</div>', ($modSettings['shd_ticketnav_style'] != 'smf' ? '<br class="clear" /><br />' : ''), '';
+	template_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']));
 
 	if ($modSettings['shd_ticketnav_style'] == 'smf')
 	{
 		template_button_strip($context['ticket_navigation'], 'right');
-		echo '<br class="clear" />';
 	}
 
 	echo '
-			<div class="tborder">
 			<div class="cat_bar">
-				<h3 class="catbg ticketheader">
+				<h3 class="catbg">
 					<span class="floatright smalltext shd_ticketlinks" id="ticket">';
 
 	if ($modSettings['shd_ticketnav_style'] == 'sd')
@@ -62,84 +60,47 @@ function template_viewticket()
 				</h3>
 			</div>
 			<div class="windowbg">
-				<div class="content shd_ticket">
 					<div class="shd_ticket_side_column">';
 
 			// General ticket details
 			echo '
-						<div class="information shd_ticketdetails">
+					<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 />
-							<ul>
-								<li id="item_id">
-									<dl>
-										<dt><img src="', $settings['default_images_url'], '/simpledesk/id.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_id'], ':</dt>
+							<dl class="stats nobb">
+								<dt><span class="generic_icons inbox" alt="', $txt['shd_ticket_id'], '"></span> ', $txt['shd_ticket_id'], ':</dt>
 										<dd>', $context['ticket']['display_id'], '</dd>
-									</dl>
-								</li>
-								<li id="item_userstarted">
-									<dl>
-										<dt><img src="', $settings['default_images_url'], '/simpledesk/user.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_user'], ':</dt>
+								<dt><span class="generic_icons members" alt="', $txt['shd_ticket_user'], '"></span> ', $txt['shd_ticket_user'], ':</dt>
 										<dd>', $context['ticket']['member']['link'], '</dd>
-									</dl>
-								</li>
-								<li id="item_whenstarted">
-									<dl>
-										<dt><img src="', $settings['default_images_url'], '/simpledesk/time.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_date'], ':</dt>
+								<dt><span class="generic_icons calendar" alt="', $txt['shd_ticket_date'], '"></span> ', $txt['shd_ticket_date'], ':</dt>
 										<dd>', $context['ticket']['poster_time'], '</dd>
-									</dl>
-								</li>
-								<li id="item_urgency">
-									<dl>
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_urgency'], ':</dt>
-										<dd><span id="urgency">', $context['ticket']['urgency']['label'], '</span>
-											<span id="urgency_increase">', (!empty($context['ticket']['urgency']['increase']) ? '<a id="urglink_increase" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=increase;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_increase'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/move_up.png" width="9px" alt="' . $txt['shd_urgency_increase'] . '" /></a>' : ''), '</span>
-											<span id="urgency_decrease">', (!empty($context['ticket']['urgency']['decrease']) ? '<a id="urglink_decrease" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=decrease;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_decrease'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/move_down.png" width="9px" alt="' . $txt['shd_urgency_decrease'] . '" /></a>' : ''), '</span>
+								<dd>', $context['ticket']['urgency']['label'], '
+									', (!empty($context['ticket']['urgency']['increase']) ? '<a id="urglink_increase" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=increase;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_increase'] . '"><span class="generic_icons urgency_increase" title="' . $txt['shd_urgency_increase'] . '"></span></a>' : ''), '
+									', (!empty($context['ticket']['urgency']['decrease']) ? '<a id="urglink_decrease" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=decrease;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_decrease'] . '"><span class="generic_icons urgency_decrease" title="' . $txt['shd_urgency_decrease'] . '"></span></a>' : ''), '
 										</dd>
-									</dl>
-								</li>
-								<li id="item_assigned">
-									<dl>
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/staff.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_assignedto'], ':</dt>
-										<dd><span id="assigned_to">', $context['ticket']['assigned']['link'], '</span></dd>
-										<dd id="assigned_button"></dd>
-									</dl>
-									<ul id="assigned_list" style="display:none;">
-									</ul>
-								</li>
-								<li id="item_status">
-									<dl>
+								<dd>', $context['ticket']['assigned']['link'], '<span id="assigned_button"></span></dd>
+								<dt class="full_width">
+									<ul id="assigned_list" style="display:none;"></ul>
+								</dt>
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/status.png" alt="" class="shd_smallicon"/> ', $txt['shd_ticket_status'], ':</dt>
 										<dd>', $context['ticket']['status']['label'], '</dd>
-									</dl>
-								</li>
-								<li id="item_replies">
-									<dl>
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_num_replies'], ':</dt>
-										<dd><a href="#replies">', (empty($context['ticket']['display_recycle']) ? $context['ticket']['num_replies'] : (int) $context['ticket']['num_replies'] + (int) $context['ticket']['deleted_replies']), '</a></dd>
-									</dl>
-								</li>';
+								<dd><a href="#replies">', (empty($context['ticket']['display_recycle']) ? $context['ticket']['num_replies'] : (int) $context['ticket']['num_replies'] + (int) $context['ticket']['deleted_replies']), '</a></dd>';
 
 				if (!empty($context['display_private']))
 					echo '
-								<li>
-									<dl>
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/private.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_privacy'], ':</dt>
-										<dd><span id="privacy">', $context['ticket']['privacy']['label'], '</span>', ($context['ticket']['privacy']['can_change'] ? ' (<a id="privlink" href="' . $scripturl . '?action=helpdesk;sa=privacychange;ticket=' . $context['ticket']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['shd_ticket_change'] . '</a>)' : ''), '</dd>
-									</dl>
-								</li>';
+								<dd>', $context['ticket']['privacy']['label'], '', ($context['ticket']['privacy']['can_change'] ? ' (<a id="privlink" href="' . $scripturl . '?action=helpdesk;sa=privacychange;ticket=' . $context['ticket']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['shd_ticket_change'] . '</a>)' : ''), '</dd>';
 
 				if (!empty($context['ticket']['ip_address']))
 					echo '
-								<li>
-									<dl>
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/ip.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_ip'], ':</dt>
-										<dd>', $context['ticket']['ip_address'], '</dd>
-									</dl>
-								</li>';
+								<dd>', $context['ticket']['ip_address'], '</dd>';
 
 				echo '
-							</ul>';
+							</dl>';
 
 			// Display ticket custom fields/filters, if any
 			if (!empty($context['ticket']['custom_fields']['prefixfilter']))
@@ -321,14 +282,13 @@ function template_viewticket()
 
 			if ($context['can_reply'])
 				echo '
-						<br />
-						<div class="description shd_replybutton floatright" id="shd_replybutton">
+						<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 />
 						</div>';
 
 			if ($context['can_quote'])
 				echo '
-						<div class="description shd_quotebutton floatright" id="shd_quotebutton">
+						<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 />
 						</div>';
 
@@ -336,12 +296,7 @@ function template_viewticket()
 
 			echo '
 					</div>
-				</div>
-				<br class="clear" />
-				<span class="botslice"><span></span></span>
-			</div>
-			</div>
-			<br />';
+			</div>';
 
 	// Left column (ticket relationships, attachments)
 	template_ticket_leftcolumn();
@@ -451,7 +406,7 @@ function template_viewticketattach()
 		foreach ($context['ticket_attach']['ticket'] as $attachment)
 		{
 			echo '
-							<div class="description shd_attachment" id="attach', $attachment['id'], '">';
+							<div class="information shd_attachment" id="attach', $attachment['id'], '">';
 
 			if ($attachment['is_image'])
 			{
@@ -479,7 +434,6 @@ function template_viewticketattach()
 
 		echo '
 						</div>
-						<span class="botslice"><span></span></span>
 					</div>
 				</div>';
 	}
@@ -498,14 +452,12 @@ function template_viewnotifications()
 		return;
 
 	echo '
-				<div class="tborder">
-					<div class="title_bar">
-						<h3 class="titlebg">
+				<div class="cat_bar">
+					<h3 class="catbg">
 							<img src="', $settings['default_images_url'], '/simpledesk/log_notify.png" alt="" />', $txt['shd_ticket_notify'], '
 						</h3>
 					</div>
-					<div class="windowbg2">
-						<div class="shd_attachmentbox">';
+				<div class="information">';
 
 	$displayed_something = false;
 
@@ -592,11 +544,7 @@ function template_viewnotifications()
 	}
 
 	echo '
-						</div>
-						<span class="botslice"><span></span></span>
-					</div>
-				</div>
-				<br />';
+				</div>';
 }
 
 /**
@@ -627,7 +575,6 @@ function template_additional_fields()
 			return;
 
 		echo '
-				<div class="tborder">
 					<div class="title_bar" id="additionalinfoheader">
 						<h3 class="titlebg">
 							<span class="floatright"><a href="javascript:oCustomFields.infoswap();"><img src="', $settings['images_url'], '/collapse.png" alt="+" id="shd_custom_fields_swap" class="icon" /></a></span>
@@ -643,7 +590,7 @@ function template_additional_fields()
 				if ($field['display_empty'] || !empty($field['value']) || $field['type'] == CFIELD_TYPE_CHECKBOX)
 				{
 					echo '
-							<div class="description">
+							<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 />';
 
@@ -697,8 +644,6 @@ function template_quickreply()
 	if ($context['can_reply'] && !empty($options['display_quick_reply']))
 	{
 		echo '
-		<br />
-		<div class="tborder">
 			<div class="title_bar" id="quickreplyheader">
 				<h3 class="titlebg">
 					<span class="floatright"><a href="#" onclick="oQuickReply.swap(); return false;"><img src="', $settings['images_url'], '/', $options['display_quick_reply'] == 2 ? 'selected_open' : 'selected', '.png" alt="+" id="quickReplyExpand" class="icon" style="display:none;" /></a></span>
@@ -713,7 +658,7 @@ function template_quickreply()
 		if ($context['can_go_advanced'])
 		{
 			echo '
-					<div class="description shd_advancedbutton floatright" id="shd_goadvancedbutton" style="display:none;">
+					<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 />
 					</div>';
 		}
@@ -726,7 +671,6 @@ function template_quickreply()
 				</div>
 			</div>
 			<span id="quickreplyfooter" class="lowerframe"', $options['display_quick_reply'] == 2 ? '' : ' style="display: none"', '><span></span></span>
-		</div>
 		<script type="text/javascript"><!-- // --><![CDATA[
 		document.getElementById("quickReplyExpand").style.display = "";
 		document.getElementById("shd_goadvancedbutton").style.display = "";
@@ -775,7 +719,7 @@ function template_inline_attachments($msg)
 			}
 
 			echo '
-									<td class="description">';
+									<td class="information">';
 
 			if ($attachment['is_image'])
 			{
@@ -828,7 +772,6 @@ function template_viewreplies()
 	global $context, $settings, $txt, $scripturl, $options, $modSettings, $reply_request;
 
 	echo '
-		<div class="tborder">
 		<div class="title_bar">
 			<h3 class="titlebg">
 				<span class="floatright smalltext">', $txt['pages'], ': ', $context['page_index'], '</span>
@@ -851,7 +794,7 @@ function template_viewreplies()
 					<a id="new"></a>';
 
 			echo '
-					<div class="description shd_reply', (!empty($context['ticket']['display_recycle']) && $reply['message_status'] == MSG_STATUS_DELETED ? ' errorbox' : ''), '" id="msg', $reply['id'], '">
+					<div class="windowbg ', (!empty($context['ticket']['display_recycle']) && $reply['message_status'] == MSG_STATUS_DELETED ? ' errorbox' : ''), '" id="msg', $reply['id'], '">
 						<span class="floatleft shd_posterinfo">
 							<strong class="shd_postername">
 								', $reply['member']['link'], '
@@ -962,12 +905,8 @@ function template_viewreplies()
 	}
 
 	echo '
-				</div>
-				<span class="floatleft shd_nowrap"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>
+			<span class="floatleft"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>
 				<span class="floatright smalltext">', $txt['pages'], ': ', $context['page_index'], '</span>
-				<br class="clear" />
-			</div>
-			<span class="lowerframe"><span></span></span>
 		</div>';
 }
 
@@ -985,13 +924,12 @@ function template_viewrelationships()
 	if (!empty($context['display_relationships']))
 	{
 		echo '
-				<div class="tborder">
-					<div class="title_bar">
-						<h3 class="titlebg">
+				<div class="cat_bar">
+					<h3 class="catbg">
 							<img src="', $settings['default_images_url'], '/simpledesk/relationships.png" alt="" />', $txt['shd_ticket_relationships'], ' (', $context['relationships_count'], ')
 						</h3>
 					</div>
-					<div class="windowbg2">
+				<div class="information">
 						<div class="shd_attachmentbox">';
 
 		foreach ($context['ticket_relationships'] as $rel_type => $relationships)
@@ -1042,10 +980,7 @@ function template_viewrelationships()
 
 		echo '
 						</div>
-						<span class="botslice"><span></span></span>
-					</div>
-				</div>
-					<br />';
+					</div>';
 	}
 }
 
@@ -1062,18 +997,16 @@ function template_ticketactionlog()
 	if (!empty($context['display_ticket_log']))
 	{
 		echo '
-				<br />
-				<div class="tborder">
-					<div class="title_bar" id="ticket_log_header">
-						<h3 class="titlebg">
-							<span class="floatright shd_ticket_log_expand_container"> <a href="#" onclick="ActionLog.swap(); return false;"><img src="', $settings['images_url'], '/selected.png" alt="+" id="shd_ticket_log_expand" class="icon" style="display:none;" /></a></span>
+				<div class="cat_bar" id="ticket_log_header">
+					<h3 class="catbg">
+						<span class="floatright shd_ticket_log_expand_container"> <a href="#" onclick="ActionLog.swap(); return false;"><img src="', $settings['images_url'], '/expand.png" alt="+" id="shd_ticket_log_expand" class="icon" style="display:none;" /></a></span>
 							<img src="', $settings['default_images_url'], '/simpledesk/log.png" class="icon" alt="*" />
 							<a href="#" onclick="ActionLog.swap(); return false;">', $txt['shd_ticket_log'], '</a>
 							<span class="smalltext">(', $context['ticket_log_count'] == 1 ? $txt['shd_ticket_log_count_one'] : sprintf($txt['shd_ticket_log_count_more'], $context['ticket_log_count']), ')</span>
 						</h3>
 					</div>
-					<table class="shd_ticketlist" id="ticket_log" cellspacing="0" width="100%">
-						<tr class="titlebg">
+				<table class="table_grid">
+						<tr class="title_bar">
 							<td width="15%">
 								<img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" />
 								', $txt['shd_ticket_log_date'], '
@@ -1095,11 +1028,10 @@ function template_ticketactionlog()
 						</tr>';
 		else
 		{
-			$use_bg2 = true; // start with windowbg2 to differentiate between that and windowbg2
 			foreach ($context['ticket_log'] as $action)
 			{
 				echo '
-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+						<tr class="windowbg">
 							<td class="smalltext">', $action['time'], '</td>
 							<td', !empty($action['member']['ip']) ? ' title="' . $txt['shd_ticket_log_ip'] . ' ' . $action['member']['ip'] . '"' : '', '>', $action['member']['link'], ' <span class="smalltext">(', $action['member']['group'], ')</span></td>
 							<td class="smalltext">
@@ -1107,15 +1039,13 @@ function template_ticketactionlog()
 								', $action['action_text'], '
 							</td>
 						</tr>';
-
-				$use_bg2 = !$use_bg2;
 			}
 		}
 
 		echo '
-						<tr class="titlebg">
+						<tr class="bot_page">
 							<td colspan="3">
-								<span class="floatright shd_nowrap"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>
+								<span class="floatright"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>
 								', !empty($context['ticket_full_log']) ? '<span class="smalltext shd_main_log"><img src="' . $settings['default_images_url'] . '/simpledesk/browse.png" alt="" /> <a href="' . $scripturl . '?action=admin;area=helpdesk_info;sa=actionlog">' . $txt['shd_ticket_log_full'] . '</a></span>' : '', '
 							</td>
 						</tr>

sd_template/SimpleDesk-MoveDept.template.php

View file @ 0245ef7

@@ -90,7 +90,6 @@ function template_movedept()
 				<input type="submit" value="', $txt['shd_ticket_move'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />
 			</div>
 		</form>
-	</div>
-	<span class="lowerframe"><span></span></span>';
+	</div>';
 }
 

sd_template/SimpleDesk-Post.template.php

View file @ 0245ef7

@@ -20,12 +20,7 @@ function template_ticket_post()
 {
 	global $context;
 
-	// Back to the helpdesk.
-	echo '
-		<div class="floatleft">
-			', template_button_strip(array($context['navigation']['back']), 'bottom'), '
-		</div><br class="clear" /><br />';
-
+	template_button_strip(array($context['navigation']['back']));
 	template_preview();
 	template_ticket_info();
 	template_ticket_subjectbox();
@@ -93,13 +88,13 @@ function template_ticket_info()
 					<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="x" /> ', $context['ticket_form']['form_title'], '
 				</h3>
 			</div>
-			<div class="windowbg">
+			<div class="roundframe">
 				<div class="content shd_ticket">
 					<div class="shd_ticket_side_column">';
 
 	// General ticket details
 	echo '
-					<div class="information shd_ticketdetails">
+					<div class="shd_ticketdetails">
 						<strong><img src="', $settings['default_images_url'], '/simpledesk/details.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_details'], '</strong>
 						<hr />
 						<ul class="reset">';
@@ -157,7 +152,6 @@ function template_ticket_custom_fields()
 	echo '
 				<div class="information shd_customfields" id="shd_customfields"', empty($context['ticket_form']['dept']) ? ' style="display:none;"' : '', '>';
 
-		// Loop through each custom field
 		// Loop through each custom field
 		// See also template_ticket_subjectbox() for the department selector which affects these.
 		foreach ($context['ticket_form']['custom_fields'][$context['ticket_form']['custom_fields_context']] as $field)
@@ -410,8 +404,7 @@ function template_ticket_subjectbox()
 	}
 
 	echo '
-						<hr /><br />
-							';
+						<hr /><br />';
 }
 
 function template_ticket_proxy_js()
@@ -503,7 +496,6 @@ function template_ticket_shd_replyarea()
 		echo '
 					</div>
 				</div>
-				<span class="lowerframe"><span></span></span>
 			</div>
 			<br />';
 }
@@ -601,7 +593,6 @@ function template_ticket_footer()
 					</div>
 				</div>
 				<br class="clear" />
-				<span class="botslice"><span></span></span>
 			</div>
 			<br />';
 }
@@ -625,7 +616,6 @@ function template_preview()
 					', $context['ticket_form']['preview']['body'], '
 				</div>
 			</div>
-			<span class="lowerframe"><span></span></span>
 			</div>
 			<br />';
 	}
@@ -636,7 +626,7 @@ function template_ticket_additional_options()
 	global $context, $options, $txt, $modSettings, $settings;
 
 	echo '
-					<div class="information shd_reply_attachments" id="shd_attach_container"', !empty($context['shd_display']) ? ' style="display:none;"' : '', '>
+					<div id="postAdditionalOptionsHeader"', !empty($context['shd_display']) ? ' style="display:none;"' : '', '>
 						<ul class="post_options">';
 
 	foreach ($context['ticket_form']['additional_opts'] as $key => $details)
@@ -647,8 +637,7 @@ function template_ticket_additional_options()
 	}
 
 	echo '
-						</ul>
-						<hr />';
+						</ul>';
 
 	if (empty($context['current_attachments']) && empty($context['ticket_form']['do_attach']))
 	{
@@ -819,12 +807,9 @@ function template_ticket_do_replies()
 		while ($reply = $context['get_replies']())
 		{
 			echo '
-					<div class="description shd_reply" id="reply', $reply['id'], '">
-								<span class="floatleft shd_posterinfo">
-									<strong class="shd_postername">
-										', $reply['member']['link'], '
-									</strong>
-									<br />
+					<div class="windowbg" id="reply', $reply['id'], '">
+						<div class="poster">
+							<h4>', $reply['member']['link'], '</h4>
 									', $reply['member']['group'], '<br class="shd_groupmargin" />';
 
 			if (!empty($modSettings['shd_display_avatar']) && empty($options['show_no_avatars']) && !empty($reply['member']['avatar']['image']))
@@ -839,8 +824,8 @@ function template_ticket_do_replies()
 							<img src="', $settings['default_images_url'] . '/simpledesk/staff.png" class="shd_smallicon" title="', $txt['shd_ticket_staff'], '" alt="', $txt['shd_ticket_staff'], '" />';
 
 			echo '
-						</span>
-						<div class="shd_replyarea">
+						</div>
+						<div class="postarea">
 							<div class="smalltext">
 								<span class="floatright shd_ticketlinks">';
 
@@ -896,7 +881,6 @@ function template_ticket_do_replies()
 	echo '
 				</div>
 			</div>
-			<span class="lowerframe"><span></span></span>
 		</div>';
 }
 
@@ -934,9 +918,7 @@ function template_shd_thank_posting()
 			</h3>
 		</div>
 		<div class="windowbg">
-			<span class="topslice"><span></span></span>
 			<div class="padding">', $context['page_body'], '</div>
-			<span class="botslice"><span></span></span>
 		</div>
 	</div>
 	<br class="clear" />';

sd_template/SimpleDesk-Profile.template.php

View file @ 0245ef7

@@ -18,14 +18,13 @@ function template_shd_profile_main()
 	global $context, $txt, $settings, $scripturl, $modSettings;
 
 	echo '
-	<div class="tborder shd_profile_navigation">
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<img src="', $settings['default_images_url'], '/simpledesk/user.png" alt="" class="shd_icon_minihead" />
 				', sprintf($txt['shd_profile_heading'], $context['member']['name']), '
 			</h3>
 		</div>
-		<div class="shd_windowbg">
+		<div class="windowbg">
 			<div class="content">
 			<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="" class="shd_icon_minihead" /> <strong>', $txt['shd_profile_tickets'], '</strong><hr />
 				', $txt['shd_profile_tickets_created'], ': <a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=hd_showtickets">', $context['shd_numtickets'], '</a>';
@@ -35,28 +34,19 @@ function template_shd_profile_main()
 	echo '
 				<br />
 				', $txt['shd_profile_tickets_assigned'], ': <a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=hd_showtickets">', $context['shd_numassigned'], '</a>
-				<br /><br />
-
-				<div class="shd_description shd_showtickets floatright" id="shd_showtickets">
-					<a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=hd_showtickets">', $txt['shd_profile_view_tickets'], '</a><br />
-				</div>';
+				<div class="block floatright">
+					<a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=hd_showtickets" class="button"><span id="shd_showtickets"></span>', $txt['shd_profile_view_tickets'], '</a>';
 
 	if (!empty($context['can_post_proxy']))
 		echo '
-				<div class="shd_description shd_showtickets floatright" id="shd_post_proxy">
-					<a href="', $scripturl, '?action=helpdesk;sa=newticket;proxy=', $context['member']['id'], '">', $txt['shd_profile_proxy'], '</a><br />
-				</div>';
+					<a href="', $scripturl, '?action=helpdesk;sa=newticket;proxy=', $context['member']['id'], '"><span id="shd_post_proxy" class="button"></span>', $txt['shd_profile_proxy'], '</a>';
 
 	if (!empty($context['can_post_ticket']))
 		echo '
-				<div class="shd_description shd_showtickets floatright" id="shd_post_ticket">
-					<a href="', $scripturl, '?action=helpdesk;sa=newticket">', $txt['shd_profile_newticket'], '</a><br />
-				</div>';
+					<a href="', $scripturl, '?action=helpdesk;sa=newticket" class="button"><span id="shd_post_ticket"></span>', $txt['shd_profile_newticket'], '</a>';
 
 	echo '
-				<br /><br /><br />
 			</div>
-			<span class="botslice"><span></span></span>
 		</div>
 	</div>';
 
@@ -160,7 +150,6 @@ function template_shd_profile_main()
 		echo '
 				<br />
 			</div>
-			<span class="botslice"><span></span></span>
 		</div>
 	</div>';
 	}
@@ -339,7 +328,6 @@ function template_shd_profile_preferences()
 								', $txt['shd_profile_preferences_none_desc'], '
 								</div>
 							</div>
-							<span class="lowerframe"><span></span></span>
 						</div>';
 
 	echo '
@@ -358,11 +346,11 @@ function template_shd_profile_show_tickets()
 							', sprintf($txt['shd_profile_show_tickets_header'], $context['member']['name']), '
 						</h3>
 					</div>
-					<p class="description">', $txt['shd_profile_show_tickets_description'], '</p>
+					<p class="information">', $txt['shd_profile_show_tickets_description'], '</p>
 				</div>';
 
 	// The navigation.
-	echo '<div class="shd_profile_show_tickets_nav">', template_button_strip($context['show_tickets_navigation']), '<br class="clear" /></div>';
+	template_button_strip($context['show_tickets_navigation']);
 
 	// Pagination
 	echo '
@@ -383,7 +371,6 @@ function template_shd_profile_show_tickets()
 		echo '
 		<div class="topic">
 			<div class="', $item['alternate'] == 0 ? 'windowbg2' : 'windowbg', ' core_posts">
-				<span class="topslice"><span></span></span>
 				<div class="content">
 					<div class="counter">', $item['counter'], '</div>
 					<div class="topic_details">
@@ -392,13 +379,12 @@ function template_shd_profile_show_tickets()
 					</div>
 					<div class="list_posts">
 						', $item['body'], '
-						<div class="description shd_replybutton floatright" id="shd_replybutton">
-							<a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $item['ticket'], '.0">', $txt['shd_profile_view_full_ticket'], '</a><br />
+						<div class="block floatright">
+							<a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $item['ticket'], '.0" class="button">', $txt['shd_profile_view_full_ticket'], '</a>
 						</div>
 					</div>
 				</div>
 				<br class="clear" />
-				<span class="botslice"><span></span></span>
 			</div>
 		</div>';
 	}
@@ -426,23 +412,22 @@ function template_shd_profile_show_notify_override()
 							', $txt['shd_profile_show_' . $context['notify_type'] . '_header'], '
 						</h3>
 					</div>
-					<p class="description">', $txt['shd_profile_show_' . $context['notify_type'] . '_description'], '</p>
+					<p class="information">', $txt['shd_profile_show_' . $context['notify_type'] . '_description'], '</p>
 				</div>';
 
 	// The navigation.
-	echo '
-				<div class="shd_profile_show_tickets_nav">', template_button_strip($context['show_tickets_navigation']), '<br class="clear" /></div>';
-
-	echo '
-				<table class="shd_ticketlist" cellspacing="0" width="100%">
-					<tr class="titlebg">
-						<td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket'], '</td>
-						<td width="15%" class="shd_nowrap">', $txt['shd_ticket_name'], '</td>
-						<td width="12%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_started_by'], '</td>
-						<td width="7%" class="shd_nowrap">', $txt['shd_ticket_replies'], '</td>
-						<td width="17%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_status'], '</td>
-						<td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_urgency'], '</td>
-						<td width="22%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_updated'], '</td>
+	template_button_strip($context['show_tickets_navigation']);
+
+	echo '
+				<table class="table_grid">
+					<tr class="title_bar">
+						<td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket'], '</td>
+						<td width="15%">', $txt['shd_ticket_name'], '</td>
+						<td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_started_by'], '</td>
+						<td width="7%">', $txt['shd_ticket_replies'], '</td>
+						<td width="17%"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_status'], '</td>
+						<td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_urgency'], '</td>
+						<td width="22%"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_updated'], '</td>
 					</tr>';
 
 	if (empty($context['tickets']))
@@ -454,11 +439,10 @@ function template_shd_profile_show_notify_override()
 	}
 	else
 	{
-		$use_bg2 = true;
 		foreach ($context['tickets'] as $ticket)
 		{
 			echo '
-						<tr class="windowbg', $use_bg2 ? '2' : '', '">
+						<tr class="windowbg">
 							<td width="4%" class="smalltext">', $ticket['id_ticket_display'], '</td>
 							<td class="smalltext"><a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $ticket['id_ticket'], '">', $ticket['subject'], '</a></td>
 							<td class="smalltext">', $ticket['ticket_starter'], '</td>
@@ -467,8 +451,6 @@ function template_shd_profile_show_notify_override()
 							<td class="smalltext">', $txt['shd_urgency_' . $ticket['urgency']], '</td>
 							<td class="smalltext">', $ticket['updated'], '</td>
 						</tr>';
-
-			$use_bg2 = !$use_bg2;
 		}
 	}
 
@@ -493,7 +475,7 @@ function template_shd_profile_permissions()
 	{
 		// Whoa, this dude's special. Tidy up and BAIL!
 		echo '
-					<p class="description">
+					<p class="information">
 						', $txt['shd_profile_permissions_all_admin'], '
 					</p>
 				</div>';
@@ -502,7 +484,7 @@ function template_shd_profile_permissions()
 
 	// Regular user: carry on, sergeant.
 	echo '
-					<p class="description">
+					<p class="information">
 						', $txt['shd_profile_permissions_description'], '
 					</p>
 				</div>';
@@ -524,9 +506,7 @@ function template_shd_profile_permissions()
 						</select>
 						<input type="submit" class="button_submit" value="', $txt['go'], '" />
 					</form>
-				</div>
-				<span class="lowerframe"><span></span></span>
-				<br />';
+				</div>';
 	// We're done?
 	if (!empty($context['dept_list_only']))
 		return;
@@ -535,16 +515,16 @@ function template_shd_profile_permissions()
 	echo '
 				<div class="tborder">
 					<div class="cat_bar">
-						<h3 class="catbg sd_no_margin">
+						<h3 class="catbg">
 							<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />
 							', $txt['shd_roles'], '
 						</h3>
 					</div>
-					<p class="description shd_actionloginfo">
+					<p class="information">
 						', $txt['shd_profile_roles_assigned'], '
 					</p>
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">
+					<table class="table_grid">
+						<tr class="title_bar">
 							<td colspan="2" width="30%">', $txt['shd_role'], '</td>
 							<td>', $txt['shd_profile_role_membergroups'], '</td>
 						</tr>';
@@ -558,11 +538,10 @@ function template_shd_profile_permissions()
 	}
 	else
 	{
-		$use_bg2 = true;
 		foreach ($context['member_roles'] as $role)
 		{
 			echo '
-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+						<tr class="windowbg">
 							<td>', !empty($context['shd_permissions']['roles'][$role['template']]['icon']) ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/' . $context['shd_permissions']['roles'][$role['template']]['icon'] . '" alt="" />') : '', '</td>
 							<td>', $role['name'], '</td>
 							<td>';
@@ -579,7 +558,6 @@ function template_shd_profile_permissions()
 
 			echo '</td>
 						</tr>';
-			$use_bg2 = !$use_bg2;
 		}
 	}
 
@@ -594,22 +572,21 @@ function template_shd_profile_permissions()
 				<br />
 				<div class="tborder">
 					<div class="cat_bar">
-						<h3 class="catbg sd_no_margin">
+						<h3 class="catbg">
 							<img src="', $settings['default_images_url'], '/simpledesk/perm_yes.png" alt="*" />
 							', $txt['shd_profile_granted'], '
 						</h3>
 					</div>
-					<p class="description shd_actionloginfo">
+					<p class="information">
 						', $txt['shd_profile_granted_desc'], '
 					</p>
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">
+					<table class="table_grid">
+						<tr class="title_bar">
 							<td colspan="2" width="60%">', $txt['shd_permissions'], '</td>
 							<td>', $txt['shd_roles'], '</td>
 						</tr>';
 
 		// Right, we're going to go by what's in the master list first.
-		$use_bg2 = true;
 		$last_permission_cat = '';
 
 		foreach ($context['shd_permissions']['permission_list'] as $permission => $details)
@@ -648,7 +625,7 @@ function template_shd_profile_permissions()
 			}
 
 			echo '
-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+						<tr class="windowbg">
 							<td><img src="', shd_image_url($icon), '" alt="" /></td>';
 
 			if ($ownany)
@@ -683,15 +660,13 @@ function template_shd_profile_permissions()
 				if ($done_first)
 					echo ', ';
 
-				echo '<span class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$context['member_roles'][$role]['template']]['icon'], '" alt="" />&nbsp;', $context['member_roles'][$role]['name'], '</span>';
+				echo '<span><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$context['member_roles'][$role]['template']]['icon'], '" alt="" />&nbsp;', $context['member_roles'][$role]['name'], '</span>';
 				$done_first = true;
 			}
 
 			echo '
 							</td>
 						</tr>';
-
-			$use_bg2 = !$use_bg2;
 		}
 
 		echo '
@@ -715,8 +690,8 @@ function template_shd_profile_actionlog()
 							<span class="smalltext">(', $context['action_log_count'] == 1 ? $txt['shd_profile_log_count_one'] : sprintf($txt['shd_profile_log_count_more'], $context['action_log_count']) , ')</span>
 						</h3>
 					</div>
-					<table class="shd_ticketlist" id="ticket_log" cellspacing="0" width="100%">
-						<tr class="titlebg">
+					<table class="table_grid" id="ticket_log">
+						<tr class="title_bar">
 							<td width="15%">
 								<img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" />
 								', $txt['shd_ticket_log_date'], '
@@ -734,19 +709,16 @@ function template_shd_profile_actionlog()
 						</tr>';
 	else
 	{
-		$use_bg2 = true; // start with windowbg2 to differentiate between that and windowbg2
 		foreach ($context['action_log'] as $action)
 		{
 			echo '
-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
+						<tr class="windowbg">
 							<td class="smalltext">', $action['time'], '</td>
 							<td class="smalltext">
 								<img src="', $settings['default_images_url'], '/simpledesk/', $action['action_icon'], '" alt="" class="shd_smallicon" />
 								', $action['action_text'], '
 							</td>
 						</tr>';
-
-			$use_bg2 = !$use_bg2;
 		}
 	}
 
@@ -787,7 +759,6 @@ function template_shd_profile_navigation_above()
 					</ul>
 					', !empty($options['use_sidebar_menu']) ? '<br class="clear" />' : '', '
 				</div>
-				<span class="lowerframe"><span></span></span>
 			</div>
 		</div>
 		', !empty($options['use_sidebar_menu']) ? '<br />' : '', '

sd_template/SimpleDesk-Search.template.php

View file @ 0245ef7

@@ -19,10 +19,7 @@ function template_search()
 	global $context, $txt, $scripturl, $settings, $modSettings;
 
 	// Back to the helpdesk.
-	echo '
-		<div class="floatleft">
-			', template_button_strip(array($context['navigation']['back']), 'bottom'), '
-		</div><br class="clear" /><br />';
+	template_button_strip(array($context['navigation']['back']));
 
 	if (!empty($modSettings['shd_new_search_index']))
 		echo '
@@ -179,8 +176,7 @@ function template_search()
 				<input type="submit" value="', $txt['shd_search'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />
 			</div>
 		</form>
-	</div>
-	<span class="lowerframe"><span></span></span>';
+	</div>';
 }
 
 function template_search_no_results()
@@ -188,10 +184,7 @@ function template_search_no_results()
 	global $context, $txt, $scripturl, $settings, $modSettings;
 
 	// Back to the helpdesk.
-	echo '
-		<div class="floatleft">
-			', template_button_strip(array($context['navigation']['back'], $context['navigation']['search']), 'bottom'), '
-		</div><br class="clear" /><br />';
+	template_button_strip(array($context['navigation']['back'], $context['navigation']['search']));
 
 	echo '
 	<div class="cat_bar">
@@ -205,11 +198,9 @@ function template_search_no_results()
 	template_search_criteria();
 
 	echo '
-	<span class="upperframe"><span></span></span>
 	<div class="roundframe">
 		<div class="content">', $txt['shd_search_no_results'], '</div>
-	</div>
-	<span class="lowerframe"><span></span></span>';
+	</div>';
 }
 
 function template_search_criteria()
@@ -306,10 +297,7 @@ function template_search_results()
 	global $context, $txt, $scripturl, $settings, $modSettings, $smcFunc;
 
 	// Back to the helpdesk.
-	echo '
-		<div class="floatleft">
-			', template_button_strip(array($context['navigation']['back'], $context['navigation']['search']), 'bottom'), '
-		</div><br class="clear" /><br />';
+	template_button_strip(array($context['navigation']['back'], $context['navigation']['search']));
 
 	echo '
 	<div class="cat_bar">
@@ -330,15 +318,11 @@ function template_search_results()
 	// Search criteria
 	template_search_criteria();
 
-	// And finally, the results themselves.
-	$use_bg2 = false;
-
 	foreach ($context['search_results'] as $index => $result)
 	{
 				echo '
 	<div class="search_results_posts">
-		<div class="windowbg', $use_bg2 ? '2' : '', ' core_posts">
-			<span class="topslice"><span></span></span>
+		<div class="windowbg core_posts">
 			<div class="content flow_auto">
 				<div class="topic_details floatleft" style="width: 94%">
 					<div class="counter">', $result['result'], '</div>
@@ -348,9 +332,7 @@ function template_search_results()
 				<br class="clear">
 				<div class="list_posts double_height">', $result['body'], '</div>
 			</div>
-			<span class="botslice"><span></span></span>
 		</div>
 	</div>';
-				$use_bg2 = !$use_bg2;
 	}
 }

sd_template/SimpleDesk-TicketTopicMove.template.php

View file @ 0245ef7

@@ -26,11 +26,7 @@ function template_shd_tickettotopic()
 {
 	global $txt, $settings, $context, $scripturl, $modSettings;
 
-	// Back to the helpdesk.
-	echo '
-		<div class="floatleft">
-			', template_button_strip(array($context['navigation']['back']), 'bottom'), '
-		</div><br class="clear" /><br />';
+	template_button_strip(array($context['navigation']['back']));
 
 	echo '
 		<div class="cat_bar">
@@ -39,9 +35,8 @@ function template_shd_tickettotopic()
 				', $txt['shd_move_ticket_to_topic'], '
 			</h3>
 		</div>
-		<div class="roundframe">
+		<div class="roundframe noup">
 		<form action="', $scripturl, '?action=helpdesk;sa=tickettotopic2;ticket=', $context['ticket_id'], '" method="post" onsubmit="submitonce(this);">
-			<div class="content">
 				<dl class="settings">
 					<dt>
 						<strong>', $txt['shd_ticket_board'], ':</strong>
@@ -101,7 +96,6 @@ function template_shd_tickettotopic()
 	if (!empty($context['deleted_prompt']))
 	{
 		echo '
-				<br />
 				<fieldset id="deleted_replies">
 					<dl class="settings">
 						<dt>
@@ -121,7 +115,6 @@ function template_shd_tickettotopic()
 	if (!empty($context['custom_fields']))
 	{
 		echo '
-				<br />
 				<fieldset id="custom_fields">
 					<dl class="settings">
 						<dt>
@@ -131,8 +124,7 @@ function template_shd_tickettotopic()
 							<div class="error">', $txt['shd_ticket_move_cfs_warn'], '</div>';
 
 		echo '
-						</dt>
-						<br />';
+					</dt>';
 
 		foreach ($context['custom_fields'] as $field)
 		{
@@ -193,10 +185,8 @@ function template_shd_tickettotopic()
 				<input type="submit" name="cancel" value="', $txt['shd_cancel_ticket'], '" accesskey="c" class="button_submit" />
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
-			</div>
 		</form>
-		</div>
-		<span class="lowerframe"><span></span></span>';
+		</div>';
 }
 
 /**
@@ -220,9 +210,8 @@ function template_shd_topictoticket()
 				', $txt['shd_move_topic_to_ticket'], '
 			</h3>
 		</div>
-		<div class="roundframe">
+		<div class="roundframe noup">
 		<form action="', $scripturl, '?action=helpdesk;sa=topictoticket2;topic=', $context['topic_id'], '" method="post" onsubmit="submitonce(this);">
-			<div class="content">
 				<dl class="settings">
 					<dt>
 						<strong>', $txt['shd_change_topic_subject'], ':</strong>
@@ -295,9 +284,7 @@ function template_shd_topictoticket()
 				<input type="submit" name="cancel" value="', $txt['shd_cancel_topic'], '" accesskey="c" class="button_submit" />
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
-			</div>
 		</form>
-		</div>
-		<span class="lowerframe"><span></span></span>';
+		</div>';
 }
 

sd_template/SimpleDesk-Unread.template.php

View file @ 0245ef7

@@ -32,8 +32,6 @@ function template_shd_unread_below()
 	global $context, $txt, $scripturl, $settings;
 
 	echo '
-				<br />
-				<div class="tborder">
 					<div class="cat_bar">
 						<h3 id="shd_block_assigned" class="catbg">
 							<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="*">
@@ -41,32 +39,30 @@ function template_shd_unread_below()
 							<span class="smalltext">(', count($context['shd_unread_info']) == 1 ? '1 ' . $txt['shd_count_ticket_1'] : count($context['shd_unread_info']) . ' ' . $txt['shd_count_tickets'], ')</span>
 						</h3>
 					</div>
-
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">
-							<td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket'], '</td>
-							<td width="15%" class="shd_nowrap">', $txt['shd_ticket_name'], '</td>
-							<td width="12%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_started_by'], '</td>
-							<td width="7%" class="shd_nowrap">', $txt['shd_ticket_replies'], '</td>
-							<td width="17%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_status'], '</td>
-							<td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_urgency'], '</td>
-							<td width="22%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_updated'], '</td>
+				<table class="table_grid">
+					<tr class="title_bar">
+						<td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket'], '</td>
+						<td width="15%">', $txt['shd_ticket_name'], '</td>
+						<td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_started_by'], '</td>
+						<td width="7%">', $txt['shd_ticket_replies'], '</td>
+						<td width="17%"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_status'], '</td>
+						<td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_urgency'], '</td>
+						<td width="22%"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_updated'], '</td>
 						</tr>';
 
 	if (empty($context['shd_unread_info']))
 	{
 		echo '
-						<tr class="windowbg2">
+					<tr class="windowbg">
 							<td colspan="7">', $txt['shd_error_no_tickets'], '</td>
 						</tr>';
 	}
 	else
 	{
-		$use_bg2 = true;
 		foreach ($context['shd_unread_info'] as $ticket)
 		{
 			echo '
-						<tr class="windowbg', $use_bg2 ? '2' : '', '">
+					<tr class="windowbg">
 							<td width="4%" class="smalltext">', $ticket['id_ticket_display'], '</td>
 							<td class="smalltext"><a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $ticket['id_ticket'], '">', $ticket['subject'], '</a></td>
 							<td class="smalltext">', $ticket['ticket_starter'], '</td>
@@ -76,12 +72,10 @@ function template_shd_unread_below()
 							<td class="smalltext">', $ticket['updated'], '</td>
 						</tr>';
 
-			$use_bg2 = !$use_bg2;
 		}
 	}
 
 	echo '
-					</table>
-				</div>';
+				</table>';
 }
 

sd_template/SimpleDesk.template.php

View file @ 0245ef7

@@ -24,25 +24,16 @@ function template_main()
 {
 	global $context, $txt, $settings, $scripturl;
 
-	echo '
-		<div class="modbuttons clearfix margintop">';
-
 	template_button_strip($context['navigation'], 'bottom');
 
 	echo '
-		</div>
-		<div id="admin_content">
-		<table width="100%" class="shd_main_hd">
-			<tr>
-				<td valign="top">
 		<div class="title_bar">
 			<h3 class="titlebg">
 					', $txt['shd_helpdesk'], !empty($context['shd_dept_name']) && $context['shd_multi_dept'] ? ' - ' . $context['shd_dept_name'] : '', '
 				</h3>
 			</div>
-					<span class="upperframe"><span></span></span>
-					<div class="roundframe">
-						<div class="shd_gototicket smalltext">
+			<div class="information">
+				<div class="floatright smalltext">
 					<form action="', $scripturl, '?action=helpdesk;sa=ticket" method="get">
 						', $txt['shd_go_to_ticket'], ':
 						<input type="hidden" name="action" value="helpdesk" />
@@ -51,18 +42,18 @@ function template_main()
 						<input type="submit" class="button_submit" value="', $txt['shd_go'], '" onclick="shd_quickTicketJump(this.parentNode.ticketJump.value);" />
 					</form>
 				</div>
-						<div id="welcome">
-							<strong>', sprintf($txt['shd_welcome'], $context['user']['name']), '</strong><br />
+				<div class="floatleft">
+				<span class="block">', sprintf($txt['shd_welcome'], $context['user']['name']), '</span>
 					', $txt['shd_' . $context['shd_home_view'] . '_greeting'];
 
 	if (!empty($context['shd_filter_fields']))
 	{
 		echo '
-			<br /><br /><strong>', $txt['shd_category_filter'], ':</strong>';
+			<strong>', $txt['shd_category_filter'], ':</strong>';
 		foreach ($context['shd_filter_fields'] as $id_field => $field)
 		{
 			echo '
-			<br />', $field['name'], ':';
+				', $field['name'], ':';
 			foreach ($field['options'] as $key => $opt)
 			{
 				if (!empty($context['filter_fragment']) && $_REQUEST['field'] == $id_field && $_REQUEST['filter'] == $key)
@@ -75,9 +66,7 @@ function template_main()
 
 	echo '
 				</div>
-					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />';
+			</div>';
 
 	// Start the ticket listing
 	foreach ($context['ticket_block_order'] as $block)
@@ -95,9 +84,6 @@ function template_main()
 	}
 
 	echo '
-				</td>
-			</tr>
-			</table>
 		</div>';
 
 	//echo 'I\'m alive!!!!!!!!!!1111oneone'; 	- I had to save this :P
@@ -107,23 +93,14 @@ function template_shd_depts()
 {
 	global $context, $txt, $settings, $scripturl;
 
-	echo '
-		<div class="modbuttons clearfix margintop">';
-
 	template_button_strip($context['navigation'], 'bottom');
 
 	echo '
-		</div>
-		<div id="admin_content">
-		<table width="100%" class="shd_main_hd">
-			<tr>
-				<td valign="top">
 			<div class="title_bar">
 			<h3 class="titlebg">
 				', $txt['shd_helpdesk'], '
 			</h3>
 			</div>
-					<span class="upperframe"><span></span></span>
 			<div class="roundframe">
 				<div class="shd_gototicket smalltext">
 					<form action="', $scripturl, '?action=helpdesk;sa=ticket" method="get">
@@ -138,17 +115,13 @@ function template_shd_depts()
 							<strong>', sprintf($txt['shd_welcome'], $context['user']['name']), '</strong><br />
 							', $txt['shd_' . $context['shd_home_view'] . '_greeting'], '
 						</div>
-					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />
-					<div class="tborder">
 						<div class="cat_bar">
 							<h3 class="catbg">
 								<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="*" />
 								', $txt['shd_departments'], '
 							</h3>
 						</div>
-						<table class="shd_ticketlist table_list" cellspacing="0" width="100%">
+						<table class="table_grid">
 							<tbody class="content">';
 
 	foreach ($context['dept_list'] as $dept)
@@ -171,10 +144,6 @@ function template_shd_depts()
 	echo '
 							</tbody>
 						</table>
-					</div>
-				</td>
-			</tr>
-			</table>
 		</div>';
 }
 
@@ -192,25 +161,14 @@ function template_closedtickets()
 {
 	global $context, $txt, $settings, $scripturl;
 
-	echo '
-		<div class="modbuttons clearfix margintop">';
-
 	template_button_strip($context['navigation'], 'bottom');
 
 	echo '
-		</div>
-		<div id="admin_content">
-		<table width="100%" class="shd_main_hd">
-			<tr>';
-
-	echo '
-				<td valign="top">
 					<div class="title_bar">
 						<h3 class="titlebg">
 							', $txt['shd_helpdesk'], '
 						</h3>
 					</div>
-					<span class="upperframe"><span></span></span>
 					<div class="roundframe">
 						<div class="shd_gototicket smalltext">
 							<form action="', $scripturl, '?action=helpdesk" method="post">
@@ -244,9 +202,7 @@ function template_closedtickets()
 
 	echo '
 						</div>
-					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />';
+		</div>';
 
 	// Start the ticket listing
 	$blocks = array_keys($context['ticket_blocks']);
@@ -255,12 +211,6 @@ function template_closedtickets()
 		$context['current_block'] = $block;
 		template_ticket_block();
 	}
-
-	echo '
-				</td>
-			</tr>
-			</table>
-		</div>';
 }
 
 /**
@@ -277,25 +227,14 @@ function template_recyclebin()
 {
 	global $context, $txt, $settings, $scripturl;
 
-	echo '
-		<div class="modbuttons clearfix margintop">';
-
 	template_button_strip($context['navigation'], 'bottom');
 
 	echo '
-		</div>
-		<div id="admin_content">
-		<table width="100%" class="shd_main_hd">
-			<tr>';
-
-	echo '
-				<td valign="top">
 					<div class="title_bar">
 						<h3 class="titlebg">
 							', $txt['shd_helpdesk'], '
 						</h3>
 					</div>
-					<span class="upperframe"><span></span></span>
 					<div class="roundframe">
 						<div class="shd_gototicket smalltext">
 							<form action="', $scripturl, '?action=helpdesk" method="post">
@@ -329,9 +268,7 @@ function template_recyclebin()
 
 	echo '
 						</div>
-					</div>
-					<span class="lowerframe"><span></span></span>
-					<br />';
+		</div>';
 
 	// Loop through the crap... Uh, I mean the tickets! :)
 	$blocks = array_keys($context['ticket_blocks']);
@@ -340,12 +277,6 @@ function template_recyclebin()
 		$context['current_block'] = $block;
 		template_ticket_block();
 	}
-
-	echo '
-				</td>
-			</tr>
-			</table>
-		</div>';
 }
 
 /**
@@ -361,17 +292,13 @@ function template_collapsed_ticket_block()
 	global $context, $txt, $settings, $scripturl;
 
 	echo '
-					<div class="tborder">
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<img src="', $settings['default_images_url'], '/simpledesk/', $context['ticket_blocks'][$context['current_block']]['block_icon'], '" alt="*" />
 				', (empty($context['block_link']) ? '' : '<a href="' . $context['block_link'] . '">'), $context['ticket_blocks'][$context['current_block']]['title'], '
 				<span class="smalltext">(', $context['ticket_blocks'][$context['current_block']]['count'], ' ', ($context['ticket_blocks'][$context['current_block']]['count'] == 1 ? $txt['shd_count_ticket_1'] : $txt['shd_count_tickets']), ')</span>', (empty($context['block_link']) ? '' : '</a>'), '
 			</h3>
-						</div>
-					</div>
-					<br />
-					<br />';
+		</div>';
 }
 
 /**
@@ -390,7 +317,6 @@ function template_ticket_block()
 	// $context['current_block'] = the block to display now
 
 	echo '
-					<div class="tborder">
 		<div class="cat_bar">
 			<h3 id="shd_block_', $context['current_block'], '" class="catbg">
 				', !empty($context['ticket_blocks'][$context['current_block']]['page_index']) ? '<span class="floatright smalltext">'. $txt['pages'] . ': ' . $context['ticket_blocks'][$context['current_block']]['page_index'] . '</span>' : '', '
@@ -400,8 +326,8 @@ function template_ticket_block()
 			</h3>
 		</div>
 
-					<table class="shd_ticketlist" cellspacing="0" width="100%">
-						<tr class="titlebg">';
+		<table class="table_grid">
+			<tr class="title_bar">';
 
 	$block_width = 0;
 	foreach ($context['ticket_blocks'][$context['current_block']]['columns'] as $column)
@@ -411,48 +337,48 @@ function template_ticket_block()
 		{
 			case 'ticket_id':
 				echo '
-							<td width="8%" colspan="2" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('ticketid', $txt['shd_ticket']), '</td>';
+							<td width="8%" colspan="2"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('ticketid', $txt['shd_ticket']), '</td>';
 				$block_width++; // is 2 blocks wide
 				break;
 			case 'ticket_name':
 				echo '
-							<td width="15%" class="shd_nowrap">', template_shd_menu_header('ticketname', $txt['shd_ticket_name']), '</td>';
+							<td width="15%">', template_shd_menu_header('ticketname', $txt['shd_ticket_name']), '</td>';
 				break;
 			case 'starting_user':
 				echo '
-							<td width="12%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('starter', $txt['shd_ticket_started_by']), '</td>';
+							<td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('starter', $txt['shd_ticket_started_by']), '</td>';
 				break;
 			case 'last_reply':
 				echo '
-							<td width="20%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('lastreply', $txt['shd_ticket_updated_by']), '</td>';
+							<td width="20%"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('lastreply', $txt['shd_ticket_updated_by']), '</td>';
 				break;
 			case 'assigned':
 				echo '
-							<td width="12%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('assigned', $txt['shd_ticket_assigned']), '</td>';
+							<td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('assigned', $txt['shd_ticket_assigned']), '</td>';
 				break;
 			case 'status':
 				echo '
-							<td width="17%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('status', $txt['shd_ticket_status']), '</td>';
+							<td width="17%"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('status', $txt['shd_ticket_status']), '</td>';
 				break;
 			case 'urgency':
 				echo '
-							<td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('urgency', $txt['shd_ticket_urgency']), '</td>';
+							<td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('urgency', $txt['shd_ticket_urgency']), '</td>';
 				break;
 			case 'updated':
 				echo '
-							<td width="22%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('updated', $txt['shd_ticket_updated']), '</td>';
+							<td width="22%"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('updated', $txt['shd_ticket_updated']), '</td>';
 				break;
 			case 'replies':
 				echo '
-							<td width="7%" class="shd_nowrap">', template_shd_menu_header('replies', $txt['shd_ticket_num_replies']), '</td>';
+							<td width="7%">', template_shd_menu_header('replies', $txt['shd_ticket_num_replies']), '</td>';
 				break;
 			case 'allreplies':
 				echo '
-							<td width="7%" class="shd_nowrap">', template_shd_menu_header('allreplies', $txt['shd_ticket_num_replies']), '</td>';
+							<td width="7%">', template_shd_menu_header('allreplies', $txt['shd_ticket_num_replies']), '</td>';
 				break;
 			case 'actions':
 				echo '
-							<td width="5%" class="shd_nowrap">', $txt['shd_actions'] , '</td>';
+							<td width="5%">', $txt['shd_actions'] , '</td>';
 				break;
 			default:
 				echo '
@@ -467,17 +393,16 @@ function template_ticket_block()
 	if (empty($context['ticket_blocks'][$context['current_block']]['tickets']))
 	{
 		echo '
-						<tr class="windowbg2">
+			<tr class="windowbg">
 				<td colspan="', $block_width, '" class="shd_noticket">', $txt['shd_error_no_tickets'], '</td>
 			</tr>';
 	}
 	else
 	{
-		$use_bg2 = true; // start with windowbg2 to differentiate between that and titlebg
 		foreach ($context['ticket_blocks'][$context['current_block']]['tickets'] as $ticket)
 		{
 			echo '
-						<tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">';
+						<tr class="windowbg">';
 
 			foreach ($context['ticket_blocks'][$context['current_block']]['columns'] as $column)
 			{
@@ -489,7 +414,7 @@ function template_ticket_block()
 						$unread_image = $ticket['is_unread'] ? 'unread.png' : 'read.png';
 						$unread_txt = $ticket['is_unread'] ? $txt['shd_ticket_new'] : $txt['shd_ticket_notnew'];
 						echo '
-							<td width="1%" class="shd_nowrap">
+							<td width="1%">
 								<img src="', $settings['default_images_url'], '/simpledesk/', $unread_image, '" alt="', $unread_txt, '" title="', $unread_txt, '" />
 								<img src="', $settings['default_images_url'], '/simpledesk/', $private_image, '" alt="', $private_txt, '" title="', $private_txt, '" />
 							</td>
@@ -500,7 +425,7 @@ function template_ticket_block()
 							<td class="smalltext">', $ticket['dept_link'], $ticket['link'];
 
 						if ($ticket['is_unread'] && !empty($ticket['new_href']))
-							echo ' <a href="', $ticket['new_href'], '"><span class="new_posts shd_new_tickets">', $txt['new'], '</span></a>';
+							echo ' <a href="', $ticket['new_href'], '"><img src="', $context['new_posts_image'], '" class="new_posts" alt="', $txt['new'], '" /></a>';
 
 						echo '</td>';
 						break;
@@ -538,7 +463,7 @@ function template_ticket_block()
 						break;
 					case 'actions':
 						echo '
-							<td class="shd_nowrap">';
+							<td>';
 
 						foreach ($ticket['actions'] as $action)
 							echo '
@@ -557,21 +482,17 @@ function template_ticket_block()
 
 			echo '
 						</tr>';
-
-			$use_bg2 = !$use_bg2;
 		}
 	}
 
 	if (!empty($context['ticket_blocks'][$context['current_block']]['page_index']))
 		echo '
-					<tr class="titlebg">
+					<tr class="bot_page">
 						<td colspan="', $block_width, '"><span class="floatright smalltext">', $txt['pages'], ': ', $context['ticket_blocks'][$context['current_block']]['page_index'], '</span></td>
 					</tr>';
 
 	echo '
-					</table>
-					</div>
-					<br /><br />';
+		</table>';
 }
 
 /**


...	...	@@ -1,20 +1,6 @@
1	1	/**********************************
2	2	* General stuff used all around the helpdesk *
3	3	***********************************/
4		-
5		-/* Half rounded headers */
6		-div.grid_header
7		-{
8		- height: 28px;
9		- margin-bottom: -1px;
10		-}
11		-
12		-/* You no left float, Core! */
13		-div.grid_header img
14		-{
15		- float: none;
16		-}
17		-
18	4	/* SimpleDesk icons */
19	5	.shd_smallicon
20	6	{
...	...	@@ -32,11 +18,6 @@ div.grid_header img
32	18	position: relative;
33	19	top: 3px;
34	20	}
35		-.shd_icon_fullhead
36		-{
37		- position: relative;
38		- top: 9px;
39		-}
40	21	.shd_tinyicon
41	22	{
42	23	width: 9px;
...	...	@@ -48,11 +29,6 @@ div.grid_header img
48	29	margin-top: -3px;
49	30	}
50	31
51		-.shd_nowrap
52		-{
53		- white-space: nowrap;
54		-}
55		-
56	32	.shd_no_margin
57	33	{
58	34	margin: 0;
...	...	@@ -63,24 +39,6 @@ div.grid_header img
63	39	border-bottom: 0;
64	40	}
65	41
66		-/**********************************
67		-* The ticket listings *
68		-***********************************/
69		-.shd_ticketlist
70		-{
71		- width: 100%;
72		- border: solid #BBBBBB;
73		- border-width: 1px 1px 0;
74		-}
75		-.shd_ticketlist td
76		-{
77		- padding: 5px;
78		- border-bottom: 1px solid #AFAFAF;
79		-}
80		-.shd_noticket
81		-{
82		- text-align: center;
83		-}
84	42	.shd_staffresources ul
85	43	{
86	44	list-style-type: none;
...	...	@@ -92,12 +50,10 @@ div.grid_header img
92	50	margin-bottom: 3px;
93	51	}
94	52
95		-.shd_gototicket
96		-{
	53	+.shd_gototicket {
97	54	display: block;
98	55	float: right;
99	56	margin-left: 1em;
100		- white-space: nowrap;
101	57	}
102	58
103	59	.shd_assignees
...	...	@@ -135,18 +91,6 @@ dd#assigned_button
135	91	padding: 1px 0;
136	92	}
137	93
138		-span.shd_new_tickets
139		-{
140		- margin-left: 5px;
141		- padding: 1px 5px 3px 4px;
142		-}
143		-
144		-/* The page index color looks ugly with our theme. */
145		-.shd_main_hd .cat_bar .current_page
146		-{
147		- color: #fff;
148		-}
149		-
150	94	/**********************************
151	95	* Stuff used within the actual tickets *
152	96	***********************************/
...	...	@@ -163,12 +107,11 @@ h3.ticketheader img
163	107	.shd_ticket_side_column
164	108	{
165	109	float: left;
166		- width: 235px;
	110	+ width: 20%;
167	111	margin-right: 20px;
	112	+ padding: 5px;
168	113	}
169		-.shd_ticketdetails
170		-{
171		- min-height: 280px;
	114	+.shd_ticketdetails {
172	115	overflow: auto;
173	116	float: left;
174	117	width: 100%;
...	...	@@ -186,12 +129,7 @@ h3.ticketheader img
186	129	float: left;
187	130	width: 100%;
188	131	}
189		-.shd_ticket_side_column ul
190		-{
191		- list-style-type: none;
192		- padding-left: 0;
193		- margin: 0;
194		-}
	132	+
195	133	.shd_ticket_side_column li
196	134	{
197	135	line-height: 1.8em;
...	...	@@ -202,12 +140,8 @@ h3.ticketheader img
202	140	{
203	141	min-height: 250px;
204	142	}
205		-.shd_ticket_description
206		-{
207		- padding-top: 9px;
208		- padding-bottom: 45px;
	143	+.shd_ticket_description {
209	144	margin-left: 260px;
210		- min-height: 200px;
211	145	}
212	146
213	147	#shd_ticket_text
...	...	@@ -360,20 +294,6 @@ h3.ticketheader img
360	294	}
361	295
362	296	/* Show tickets */
363		-.shd_description
364		-{
365		- border: 1px solid #bbb;
366		-}
367		-.shd_windowbg
368		-{
369		- background: #f0f4f7 none repeat scroll 0 0;
370		- border: 1px solid #ddd;
371		- box-shadow: 0 -2px 2px rgba(0, 0, 0, 0.1);
372		- box-sizing: border-box;
373		- margin: 0;
374		- overflow: auto;
375		- padding: 10px 16px;
376		-}
377	297	.shd_showtickets
378	298	{
379	299	height: 15px;
...	...	@@ -403,11 +323,6 @@ h3.ticketheader img
403	323	/**********************************
404	324	* Ticket replies *
405	325	***********************************/
406		-.shd_reply
407		-{
408		- padding-bottom: 32px;
409		- padding-top: 12px;
410		-}
411	326	.shd_posterinfo
412	327	{
413	328	width: 14em;
...	...	@@ -496,10 +411,6 @@ h3.ticketheader img
496	411	margin-left: -8px;
497	412	margin-right: 3px;
498	413	}
499		-.shd_attachmentbox
500		-{
501		- padding: 10px;
502		-}
503	414	.shd_attachmentcolumn
504	415	{
505	416	margin-right: 20px;
...	...	@@ -601,9 +512,35 @@ h3.ticketheader img
601	512	border-right: none;
602	513	}
603	514
604		-ul.shd_profile_nav_list, ul.shd_profile_nav_inline
605		-{
606		- /* Webkit's default stylesheet also, just for giggles, adds margin-before and margin-after to lists. */
607		- -webkit-margin-before: 0;
608		- -webkit-margin-after: 0;
	515	+/* I'm not sure about the above, I'll rewrite them later */
	516	+.bot_page {
	517	+ border: 1px solid #DDD;
	518	+ border-top: none;
	519	+}
	520	+#ticket_log_header {
	521	+ clear: both;
	522	+}
	523	+
	524	+/* Urgency stuff */
	525	+.generic_icons.urgency_increase {
	526	+ background-position: -161px -5px;
	527	+}
	528	+.generic_icons.urgency_decrease {
	529	+ background-position: -213px -5px;
	530	+}
	531	+
	532	+/* We need some adjustments */
	533	+dl.stats dd span, dl.stats dt span {
	534	+ position: relative;
	535	+}
	536	+
	537	+/* We need something like winfo in helpdesk */
	538	+.noup {
	539	+ border-top-left-radius: 0;
	540	+ border-top-right-radius: 0;
	541	+ margin: 0 !important;
	542	+}
	543	+
	544	+.shd_icon_fullhead {
	545	+ position: relative;
609	546	}
610	547	\ No newline at end of file

...	...	@@ -1,45 +1,3 @@
1		-#sd_live_news
2		-{
3		- width: 64%;
4		- font-size: 0.85em;
5		-}
6		-#sd_live_news .cat_bar
7		-{
8		- margin-bottom: 0;
9		-}
10		-#sd_live_news .windowbg
11		-{
12		- margin-top: 0;
13		- height: 23.5em;
14		-}
15		-#sd_live_news div.content
16		-{
17		- padding: 0;
18		-}
19		-#sd_live_news div.content dl
20		-{
21		- padding: 0.5em 0 0 0.5em;
22		-}
23		-
24		-#sd_supportVersionsTable
25		-{
26		- width: 34%;
27		-}
28		-#sd_supportVersionsTable .cat_bar
29		-{
30		- margin-bottom: 0;
31		-}
32		-#sd_supportVersionsTable .windowbg
33		-{
34		- margin-top: 0;
35		- height: 20em;
36		-}
37		-
38		-#sd_version_details
39		-{
40		- overflow: auto;
41		- height: 16.4em;
42		-}
43	1	#sdAnnouncements
44	2	{
45	3	height: 21.6em;
...	...	@@ -74,11 +32,6 @@
74	32	float: right;
75	33	margin-top: 8px;
76	34	}
77		-.shd_actionloginfo
78		-{
79		- margin-bottom: 0;
80		- border-bottom: 0;
81		-}
82	35	.shd_admin_leftcolumn
83	36	{
84	37	width: 74%;
...	...	@@ -105,11 +58,6 @@
105	58	{
106	59	margin-bottom: 0;
107	60	}
108		-h3.sd_no_margin
109		-{
110		- margin-bottom: 0px;
111		- padding-bottom: 3px;
112		-}
113	61
114	62	.disabled
115	63	{
...	...	@@ -119,12 +67,6 @@ h3.sd_no_margin
119	67	.shd_credits_names
120	68	{
121	69	margin-left: 57px;
122		- margin-bottom: 12px;
123		-}
124		-
125		-.shd_credits_names hr
126		-{
127		- margin: 0;
128	70	}
129	71
130	72	.shd_valign_top
...	...	@@ -283,16 +225,3 @@ h3 a.permcollapse img
283	225	{
284	226	vertical-align: top;
285	227	}
286	228	\ No newline at end of file
287		-
288		-/* SMF 2.1 no longer uses description, but we make use of it still! */
289		-.sd_description
290		-{
291		- background: #F8F8F8;
292		- overflow: auto;
293		- padding-bottom: .5em;
294		- border: 1px solid #ddd;
295		- border-top: none;
296		- margin: 0 0 10px 0;
297		- padding: 12px 9px 8px 9px;
298		- box-sizing: border-box;
299		-}
300	229	\ No newline at end of file

...	...	@@ -39,8 +39,7 @@ function template_shd_admin()
39	39
40	40	// Display the "live news" from simpledesk.net
41	41	echo '
42		- <div id="sd_live_news" class="floatleft">
43		- <div class="tborder">
	42	+ <div id="live_news" class="floatleft">
44	43	<div class="cat_bar">
45	44	<h3 class="catbg">
46	45	<img src="', $settings['default_images_url'], '/simpledesk/live.png" alt="*" />
...	...	@@ -48,19 +47,16 @@ function template_shd_admin()
48	47	<span class="righttext"><a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_live" onclick="return reqWin(this.href);"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a></span>
49	48	</h3>
50	49	</div>
51		- <div class="windowbg">
52		- <div class="content">
	50	+ <div class="windowbg nopadding">
	51	+ <div class="padding">
53	52	<div id="sdAnnouncements">', $txt['shd_no_connect'], '</div>
54	53	</div>
55		- <span class="botslice"><span></span></span>
56		- </div>
57	54	</div>
58	55	</div>';
59	56
60	57	// Show the user version information from their server.
61	58	echo '
62		- <div id="sd_supportVersionsTable" class="floatright">
63		- <div class="tborder">
	59	+ <div id="supportVersionsTable" class="floatright">
64	60	<div class="cat_bar">
65	61	<h3 class="catbg">
66	62	<img src="', $settings['default_images_url'], '/simpledesk/modification.png" alt="*" />
...	...	@@ -68,54 +64,45 @@ function template_shd_admin()
68	64	<span class="righttext"><a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_modification" onclick="return reqWin(this.href);"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a></span>
69	65	</h3>
70	66	</div>
71		- <div class="windowbg">
72		- <div class="content">
73		- <div id="sd_version_details">
	67	+ <div class="windowbg nopadding">
	68	+ <div class="padding">
74	69	<img src="', $settings['default_images_url'], '/simpledesk/support.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['shd_need_support'], '</strong><br />
75	70	', sprintf($txt['shd_support_start_here'], $scripturl . '?action=admin;area=helpdesk_info;sa=support'), '<br />
76		- <br />
77	71	<img src="', $settings['default_images_url'], '/simpledesk/versions.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['support_versions'], ':</strong><br />
78	72	', $txt['shd_your_version'], ':
79		- <em id="yourVersion" class="shd_nowrap">', SHD_VERSION, '</em><br />
	73	+ <em id="yourVersion">', SHD_VERSION, '</em><br />
80	74	', $txt['shd_current_version'], ':
81		- <em id="sdVersion" class="shd_nowrap">??</em><br /><br />
	75	+ <em id="sdVersion">??</em><br /><br />
82	76	<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['shd_ticket_information'], ':</strong><br />
83	77	', $txt['shd_total_tickets'], ':
84		- <em id="totalTickets" class="shd_nowrap">
	78	+ <em id="totalTickets">
85	79	<a href="javascript: shd_ticket_total_information();" >', $context['total_tickets'], '</a>
86	80	</em>
87	81	<div id="shd_ticket_total_information" style="display: none;">
88	82	', $txt['shd_open_tickets'], ': <em>', $context['open_tickets'], '</em><br />
89	83	', $txt['shd_closed_tickets'], ': <em>', $context['closed_tickets'], '</em><br />
90	84	', $txt['shd_recycled_tickets'], ': <em>', $context['recycled_tickets'], '</em><br />
91		- </div>
92		- <br />';
	85	+ </div>';
93	86
94	87	// Display all the members who can manage the helpdesk.
95	88	// NOTE: This is currently (15/1/10) uncapped, meaning it's just the full list direct from SimpleDesk-Admin.php.
96	89	// That gets the data. Up to here how it should be displayed.
97	90	echo '
98		- <br />
99	91	<img src="', $settings['default_images_url'], '/simpledesk/staff.png" alt="*" class="shd_icon_minihead" /> <strong>', $txt['shd_staff_list'], ':</strong>
100	92	', implode(', ', $context['staff']);
101	93
102	94	echo '
103	95	</div>
104	96	</div>
105		- <span class="botslice"><span></span></span>
106	97	</div>
107		- </div>
108		- </div>
109		- </div>
110		- <div class="shd_credits_break"> </div>';
	98	+ </div>';
111	99
112	100
113	101	echo '
114	102	<div id="sd_credits">
115		- <div class="tborder">
116	103	<div class="title_bar">
117		- <h3 class="titlebg sd_no_margin">
118		- <img src="', $settings['default_images_url'], '/simpledesk/credits.png" alt="*" />
	104	+ <h3 class="titlebg">
	105	+ <a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_credits" onclick="return reqWin(this.href);"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a>
119	106	', $txt['shd_credits'], '
120	107	<span class="righttext"><a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_credits" onclick="return reqWin(this.href);"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" /></a></span>
121	108	</h3>
...	...	@@ -125,14 +112,14 @@ function template_shd_admin()
125	112	{
126	113	echo '
127	114	<div class="roundframe">
128		- <div class="content">
	115	+ <div class="padding">
129	116	', $section['pretext'], '
130	117	<hr />';
131	118
132	119	foreach ($section['groups'] as $group)
133	120	{
134	121	echo '
135		- <div class="sd_description">';
	122	+ <div class="padding">';
136	123
137	124	// Pretty icons! :D
138	125	if (isset($group['icon']))
...	...	@@ -176,8 +163,6 @@ function template_shd_admin()
176	163	<span class="smalltext"> <img src="', $settings['default_images_url'], '/simpledesk/update.png" alt="*" class="shd_tinyicon" /> ', $txt['shd_former_contributors'], '</span>
177	164	</div>
178	165	</div>
179		- <span class="lowerframe"><span></span></span>
180		- </div>
181	166	</div>';
182	167	}
183	168
...	...	@@ -242,7 +227,6 @@ function template_shd_admin()
242	227	</p>
243	228	</div>
244	229	</div>
245		- <span class="botslice"><span></span></span>
246	230	</div>
247	231	'), ',
248	232	sUpdateNotificationLink: ', JavaScriptEscape($scripturl . '?action=admin;area=packages;pgdownload;auto;package=%package%;' . $context['session_var'] . '=' . $context['session_id']), ',
...	...	@@ -345,7 +329,6 @@ function template_shd_show_settings()
345	329	echo '
346	330	</dl>
347	331	</div>
348		- <span class="botslice"><span></span></span>
349	332	</div>
350	333	</div>';
351	334	}
...	...	@@ -366,7 +349,7 @@ function template_shd_show_settings()
366	349	else
367	350	{
368	351	echo '
369		- <p class="sd_description">
	352	+ <p class="information">
370	353	', $config_var['label'], '
371	354	</p>';
372	355	}
...	...	@@ -555,7 +538,6 @@ function template_shd_show_settings()
555	538	if ($is_open)
556	539	echo '
557	540	</div>
558		- <span class="botslice"><span></span></span>
559	541	</div>
560	542	</div>';
561	543
...	...	@@ -602,8 +584,8 @@ function template_shd_action_log()
602	584	', $txt['shd_admin_actionlog_title'], '
603	585	</h3>
604	586	</div>
605		- <table class="shd_ticketlist" cellspacing="0" width="100%">
606		- <tr class="titlebg">
	587	+ <table class="table_grid">
	588	+ <tr class="title_bar">
607	589	<td width="38%" colspan="2">
608	590	<img src="', $settings['default_images_url'], '/simpledesk/action.png" class="shd_smallicon" alt="" />
609	591	<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog', $context['sort'] == $sort_types['action'] && !isset($_REQUEST['asc']) ? ';sort=action;asc' : ';sort=action', '">
...	...	@@ -649,12 +631,11 @@ function template_shd_action_log()
649	631	</tr>';
650	632	else
651	633	{
652		- $use_bg2 = true; // start with windowbg2 to differentiate between that and windowbg2
653	634	foreach ($context['actions'] AS $action)
654	635	{
655	636	echo '
656		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
657		- <td width="1%" class="shd_nowrap">
	637	+ <tr class="windowbg">
	638	+ <td width="1%">
658	639	<img src="', shd_image_url($action['action_icon']), '" alt="" class="shd_smallicon" />
659	640	</td>
660	641	<td class="smalltext">', $action['action_text'], '</td>
...	...	@@ -664,8 +645,6 @@ function template_shd_action_log()
664	645	<td>', !empty($action['member']['ip']) ? $action['member']['ip'] : $txt['shd_admin_actionlog_hidden'], '</td>
665	646	<td>', $action['can_remove'] && $context['can_delete'] ? '<a href="' . $scripturl . '?action=admin;area=helpdesk_info;sa=actionlog;remove='. $action['id'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/delete.png" alt="' . $txt['shd_delete_item'] . '" /></a>' : '', '</td>
666	647	</tr>';
667		-
668		- $use_bg2 = !$use_bg2;
669	648	}
670	649	}
671	650
...	...	@@ -713,25 +692,18 @@ function template_shd_support()
713	692	<input type="submit" value="', $txt['shd_admin_support_send'], '" tabindex="3" accesskey="s" class="button_submit" />
714	693	</form>
715	694	</div>
716		- <span class="lowerframe"><span></span></span>
717	695	</div>
718	696	</div>
719	697	<div class="shd_admin_rightcolumn floatleft">
720		- <div class="tborder">
721		- <div class="title_bar">
722		- <h3 class="titlebg sd_no_margin">
	698	+ <div class="cat_bar">
	699	+ <h3 class="catbg">
723	700	<img src="', $settings['images_url'], '/helptopics.png" alt="?" /> ', $txt['shd_admin_support_what_is_this'], '
724	701	</h3>
725	702	</div>
726		- <div class="windowbg2">
727		- <div class="content smalltext">
	703	+ <div class="information smalltext">
728	704	', $txt['shd_admin_support_explanation'], '
729	705	</div>
730		- <span class="botslice"><span></span></span>
731		- </div>
732		- </div>
733		- </div>
734		- <br class="clear" />';
	706	+ </div>';
735	707	}
736	708
737	709	/**

...	...	@@ -25,7 +25,7 @@ function template_shd_cannedreplies_home()
25	25	', $txt['shd_admin_cannedreplies_home'], '
26	26	</h3>
27	27	</div>
28		- <p class="sd_description">
	28	+ <p class="information">
29	29	', $txt['shd_admin_cannedreplies_homedesc'], '
30	30	</p>
31	31	</div>';
...	...	@@ -57,31 +57,29 @@ function template_shd_cannedreplies_home()
57	57	<a href="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=editcat;cat=' . $cat_id . ';', $context['session_var'], '=', $context['session_id'], '"><img src="', $settings['default_images_url'], '/simpledesk/edit.png" class="icon" alt="', $txt['shd_ticket_edit'],'" title="', $txt['shd_ticket_edit'], '" /></a>
58	58	</h3>
59	59	</div>
60		- <table class="shd_ticketlist" cellspacing="0" width="100%">
61		- <tr class="titlebg">
62		- <td width="30%" class="shd_nowrap">', $txt['shd_admin_cannedreplies_replyname'], '</td>
	60	+ <table class="table_grid">
	61	+ <tr class="title_bar">
	62	+ <td width="30%">', $txt['shd_admin_cannedreplies_replyname'], '</td>
63	63	<td width="25%">', $txt['shd_departments'], '</td>
64	64	<td>', $txt['shd_admin_cannedreplies_isactive'], '</td>
65	65	<td>', $txt['shd_admin_cannedreplies_visibleto'], '</td>
66		- <td colspan="3" width="1%" class="shd_nowrap">', $txt['shd_admin_custom_fields_move'], '</td>
67		- <td colspan="2" width="1%" class="shd_nowrap">', $txt['shd_actions'], '</td>
	66	+ <td colspan="3" width="1%">', $txt['shd_admin_custom_fields_move'], '</td>
	67	+ <td colspan="2" width="1%">', $txt['shd_actions'], '</td>
68	68	</tr>';
69	69
70	70	if (empty($cat['replies']))
71	71	{
72		- $use_bg2 = false;
73	72	echo '
74		- <tr class="windowbg2">
	73	+ <tr class="windowbg">
75	74	<td colspan="9" class="centertext">', $txt['shd_admin_cannedreplies_emptycat'], '</td>
76	75	</tr>';
77	76	}
78	77	else
79	78	{
80		- $use_bg2 = true;
81	79	foreach ($cat['replies'] as $reply)
82	80	{
83	81	echo '
84		- <tr class="windowbg', $use_bg2 ? '2' : '', '">
	82	+ <tr class="windowbg">
85	83	<td>', $reply['title'], '</td>
86	84	<td>', $reply['depts'], '</td>
87	85	<td><img src="', $settings['default_images_url'], '/simpledesk/cf_', $reply['active_string'], '.png" alt="', $txt['shd_admin_custom_fields_' . $reply['active_string']], '" title="', $txt['shd_admin_custom_fields_' . $reply['active_string']], '" /></td>
...	...	@@ -96,12 +94,11 @@ function template_shd_cannedreplies_home()
96	94	<td><a href="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=editreply;reply=' . $reply['id_reply'] . ';', $context['session_var'], '=', $context['session_id'], '"><img src="', $settings['default_images_url'], '/simpledesk/edit.png" class="icon" alt="', $txt['shd_ticket_edit'],'" title="', $txt['shd_ticket_edit'], '" /></a></td>
97	95	<td><a href="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=savereply;reply=' . $reply['id_reply'] . ';delete=yes;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_admin_cannedreplies_deletereply_confirm']). ');"><img src="', $settings['default_images_url'], '/simpledesk/delete.png" class="icon" alt="', $txt['shd_ticket_delete'],'" title="', $txt['shd_ticket_delete'], '" /></a></td>
98	96	</tr>';
99		- $use_bg2 = !$use_bg2;
100	97	}
101	98	}
102	99
103	100	echo '
104		- <tr class="windowbg', $use_bg2 ? '2' : '', '">
	101	+ <tr class="windowbg">
105	102	<td colspan="9" class="righttext">[<a href="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=createreply;cat=', $cat_id, '">', $txt['shd_admin_cannedreplies_addreply'], '</a>]</td>
106	103	</tr>
107	104	</table>
...	...	@@ -129,7 +126,7 @@ function template_shd_edit_canned_category()
129	126	', $txt['shd_admin_cannedreplies_home'], '
130	127	</h3>
131	128	</div>
132		- <p class="sd_description">
	129	+ <p class="information">
133	130	', $txt['shd_admin_cannedreplies_homedesc'], '
134	131	</p>
135	132	</div>
...	...	@@ -158,8 +155,7 @@ function template_shd_edit_canned_category()
158	155	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
159	156	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
160	157	</form>
161		- </div>
162		- <span class="lowerframe"><span></span></span>';
	158	+ </div>';
163	159	}
164	160
165	161	function template_shd_edit_canned_reply()
...	...	@@ -176,7 +172,7 @@ function template_shd_edit_canned_reply()
176	172	', $txt['shd_admin_cannedreplies_home'], '
177	173	</h3>
178	174	</div>
179		- <p class="sd_description">
	175	+ <p class="information">
180	176	', $txt['shd_admin_cannedreplies_homedesc'], '
181	177	</p>
182	178	</div>
...	...	@@ -209,8 +205,6 @@ function template_shd_edit_canned_reply()
209	205	</dl>
210	206	</div>
211	207	</div>
212		- <span class="lowerframe"><span></span></span>
213		- <br />
214	208	<div class="cat_bar">
215	209	<h3 class="catbg">
216	210	<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="*" />
...	...	@@ -232,8 +226,6 @@ function template_shd_edit_canned_reply()
232	226	</dl>
233	227	</div>
234	228	</div>
235		- <span class="lowerframe"><span></span></span>
236		- <br />
237	229	<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" />';
238	230
239	231	if ($context['canned_reply']['id'] != 'new')
...	...	@@ -261,7 +253,7 @@ function template_shd_move_reply_cat()
261	253	', $txt['shd_admin_cannedreplies_home'], '
262	254	</h3>
263	255	</div>
264		- <p class="sd_description">
	256	+ <p class="information">
265	257	', $txt['shd_admin_cannedreplies_homedesc'], '
266	258	</p>
267	259	</div>
...	...	@@ -297,7 +289,6 @@ function template_shd_move_reply_cat()
297	289	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
298	290	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
299	291	</form>
300		- </div>
301		- <span class="lowerframe"><span></span></span>';
	292	+ </div>';
302	293	}
303	294

...	...	@@ -20,11 +20,11 @@ function template_shd_custom_field_home()
20	20	', $txt['shd_admin_custom_fields_long'], '
21	21	</h3>
22	22	</div>
23		- <p class="sd_description shd_actionloginfo">
	23	+ <p class="information">
24	24	', $txt['shd_admin_custom_fields_desc'], '
25	25	</p>
26		- <table class="shd_ticketlist" cellspacing="0" width="100%">
27		- <tr class="titlebg">
	26	+ <table class="table_grid">
	27	+ <tr class="title_bar">
28	28	<td width="30%" colspan="2">
29	29	<img src="', $settings['default_images_url'], '/simpledesk/name.png" class="icon" alt="*" />
30	30	', $txt['shd_admin_custom_fields_fieldname'], '
...	...	@@ -36,8 +36,8 @@ function template_shd_custom_field_home()
36	36	<td>', $txt['shd_admin_custom_fields_active'], '</td>
37	37	<td>', $txt['shd_admin_custom_fields_visible'], '</td>
38	38	<td>', $txt['shd_admin_custom_field_permissions'], '</td>
39		- <td colspan="2" width="1%" class="shd_nowrap">', $txt['shd_admin_custom_fields_move'], '</td>
40		- <td class="shd_nowrap">', $txt['shd_actions'], '</td>
	39	+ <td colspan="2" width="1%">', $txt['shd_admin_custom_fields_move'], '</td>
	40	+ <td>', $txt['shd_actions'], '</td>
41	41	</tr>';
42	42
43	43	if (empty($context['custom_fields']))
...	...	@@ -47,17 +47,16 @@ function template_shd_custom_field_home()
47	47	</tr>';
48	48	else
49	49	{
50		- $use_bg2 = true;
51	50	foreach ($context['custom_fields'] as $field)
52	51	{
53	52	echo '
54		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	53	+ <tr class="windowbg">
55	54	<td width="2%">', empty($field['icon']) ? '' : '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" class="icon" alt="*" />', '</td>
56	55	<td>', $field['field_name'], '<br /><span class="smalltext">', $field['field_desc'], '</span></td>
57	56	<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>
58	57	<td>', $txt['shd_admin_custom_fields_ui_' . $field['field_type']], '</td>
59	58	<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>
60		- <td class="shd_nowrap">
	59	+ <td>
61	60	', ($field['field_loc'] & CFIELD_TICKET) !== 0 ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/ticket.png" alt="' . $txt['shd_admin_custom_fields_inticket'] . '" title="' . $txt['shd_admin_custom_fields_inticket'] . '" />') : '', '
62	61	', ($field['field_loc'] & CFIELD_REPLY) !== 0 ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/replies.png" alt="' . $txt['shd_admin_custom_fields_inreply'] . '" title="' . $txt['shd_admin_custom_fields_inreply'] . '" />') : '', '
63	62	</td>
...	...	@@ -79,8 +78,6 @@ function template_shd_custom_field_home()
79	78	<a href="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=save;field=', $field['id_field'], ';delete;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_admin_delete_custom_field_confirm']). ');"><img src="', $settings['default_images_url'], '/simpledesk/delete.png" class="icon" alt="', $txt['shd_ticket_delete'],'" title="', $txt['shd_ticket_delete'], '" /></a>
80	79	</td>
81	80	</tr>';
82		-
83		- $use_bg2 = !$use_bg2;
84	81	}
85	82	}
86	83
...	...	@@ -219,7 +216,7 @@ function template_shd_custom_field_edit()
219	216	', $context['section_title'], '
220	217	</h3>
221	218	</div>
222		- <p class="sd_description">
	219	+ <p class="information">
223	220	', $context['section_desc'],'
224	221	</p>
225	222	</div>
...	...	@@ -287,8 +284,6 @@ function template_shd_custom_field_edit()
287	284	</dl>
288	285	</div>
289	286	</div>
290		- <span class="lowerframe"><span></span></span>
291		- <br />
292	287	<div class="cat_bar">
293	288	<h3 class="catbg">
294	289	<img src="', $settings['default_images_url'], '/simpledesk/fieldtype.png" alt="*" />
...	...	@@ -298,8 +293,8 @@ function template_shd_custom_field_edit()
298	293	<div class="roundframe">
299	294	<div class="content">
300	295	<dl class="settings">
301		- <dt><strong>', $txt['shd_admin_custom_fields_fieldtype'], ':</strong><br /><span class="smalltext">', $txt['shd_admin_custom_fields_description_desc'], '</span></dt>
302		- <dd class="shd_nowrap">
	296	+ <dt><strong>', $txt['shd_admin_custom_fields_fieldtype'], ':</strong></dt>
	297	+ <dd>
303	298	<span id="cf_fieldtype_icon" class="cf_ui_', $context['field_types'][$context['field_type_value']][1], '"></span>
304	299	<select name="field_type" id="cf_fieldtype" onchange="javascript:update_field_type(this.value);">';
305	300
...	...	@@ -374,9 +369,7 @@ function template_shd_custom_field_edit()
374	369	</dd>
375	370	</dl>
376	371	</div>
377		- </div>
378		- <span class="lowerframe"><span></span></span>
379		- <br />';
	372	+ </div>';
380	373
381	374	if (!empty($context['dept_fields']))
382	375	{
...	...	@@ -404,8 +397,7 @@ function template_shd_custom_field_edit()
404	397	echo '
405	398	</dl>
406	399	</div>
407		- </div>
408		- <span class="lowerframe"><span></span></span>';
	400	+ </div>';
409	401	}
410	402
411	403	echo '

...	...	@@ -25,27 +25,26 @@ function template_shd_departments_home()
25	25	', $txt['shd_admin_departments_home'], '
26	26	</h3>
27	27	</div>
28		- <p class="sd_description shd_actionloginfo">
	28	+ <p class="information">
29	29	', $txt['shd_admin_departments_homedesc'], '
30	30	</p>
31		- <table class="shd_ticketlist" cellspacing="0" width="100%">
32		- <tr class="titlebg">
	31	+ <table class="table_grid">
	32	+ <tr class="title_bar">
33	33	<td width="1%"></td>
34		- <td width="25%" class="shd_nowrap">
	34	+ <td width="25%">
35	35	', $txt['shd_department_name'], '
36	36	</td>
37	37	<td>', $txt['shd_dept_boardindex'], '</td>
38		- <td width="40%" class="shd_nowrap">
	38	+ <td width="40%">
39	39	', $txt['shd_roles_in_dept'], '
40	40	</td>
41		- <td colspan="3" width="1%" class="shd_nowrap">', $txt['shd_actions'], '</td>
	41	+ <td colspan="3" width="1%">', $txt['shd_actions'], '</td>
42	42	</tr>';
43	43
44		- $use_bg2 = true;
45	44	foreach ($context['shd_departments'] as $department)
46	45	{
47	46	echo '
48		- <tr class="windowbg', $use_bg2 ? '2' : '', '">
	47	+ <tr class="windowbg">
49	48	<td></td>
50	49	<td>
51	50	', $department['dept_name'], '
...	...	@@ -76,7 +75,7 @@ function template_shd_departments_home()
76	75	$first = false;
77	76
78	77	echo '
79		- <span class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$role['template']]['icon'], '" class="icon" alt="*">
	78	+ <span><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$role['template']]['icon'], '" class="icon" alt="*">
80	79	<a href="', $scripturl, '?action=admin;area=helpdesk_permissions;sa=editrole;role=', $role['id_role'], '">', $role['role_name'], '</a></span>';
81	80	}
82	81	}
...	...	@@ -92,7 +91,6 @@ function template_shd_departments_home()
92	91
93	92	echo '
94	93	</tr>';
95		- $use_bg2 = !$use_bg2;
96	94	}
97	95
98	96	echo '
...	...	@@ -117,7 +115,7 @@ function template_shd_create_dept()
117	115	', $txt['shd_admin_departments_home'], '
118	116	</h3>
119	117	</div>
120		- <p class="sd_description">
	118	+ <p class="information">
121	119	', $txt['shd_admin_departments_homedesc'], '
122	120	</p>
123	121	</div>
...	...	@@ -158,8 +156,7 @@ function template_shd_create_dept()
158	156	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
159	157	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
160	158	</form>
161		- </div>
162		- <span class="lowerframe"><span></span></span>';
	159	+ </div>';
163	160	}
164	161
165	162	function template_shd_edit_dept()
...	...	@@ -175,7 +172,7 @@ function template_shd_edit_dept()
175	172	', $txt['shd_admin_departments_home'], '
176	173	</h3>
177	174	</div>
178		- <p class="sd_description">
	175	+ <p class="information">
179	176	', $txt['shd_admin_departments_homedesc'], '
180	177	</p>
181	178	</div>
...	...	@@ -210,9 +207,7 @@ function template_shd_edit_dept()
210	207	<option value="1"', $context['shd_dept']['before_after'] == 1 ? ' selected="selected"' : '', '>', $txt['shd_boardindex_cat_after'], '</option>
211	208	</select>
212	209	</dd>
213		- <dt><strong>', $txt['shd_dept_theme'], '</strong>
214		- <div class="smalltext">', $txt['shd_dept_theme_note'], '</div>
215		- </dt>
	210	+ <dt><strong>', $txt['shd_dept_theme'], '</strong></dt>
216	211	<dd>';
217	212
218	213	if (empty($context['dept_theme_list']) \|\| count($context['dept_theme_list']) == 1)
...	...	@@ -245,36 +240,31 @@ function template_shd_edit_dept()
245	240	</dl>
246	241	</div>
247	242	</div>
248		- <span class="lowerframe"><span></span></span>
249		- <br />
250	243	<div class="tborder floatleft" style="width: 100%;">
251	244	<div class="cat_bar">
252		- <h3 class="catbg sd_no_margin">
	245	+ <h3 class="catbg">
253	246	<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />
254	247	', $txt['shd_roles_in_dept'], '
255	248	</h3>
256	249	</div>
257		- <p class="sd_description shd_actionloginfo">
	250	+ <p class="information">
258	251	', $txt['shd_roles_in_dept_desc'], '
259	252	</p>
260		- <table class="shd_ticketlist" cellspacing="0" width="100%">
261		- <tr class="titlebg">
	253	+ <table class="table_grid">
	254	+ <tr class="title_bar">
262	255	<td width="50%">', $txt['shd_role'], '</td>
263	256	<td>', $txt['shd_assign_dept'], '</td>
264	257	</tr>';
265	258
266		- $use_bg2 = true;
267	259	if (!empty($context['shd_roles']))
268	260	{
269	261	foreach ($context['shd_roles'] as $id_role => $role)
270	262	{
271	263	echo '
272		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	264	+ <tr class="windowbg">
273	265	<td><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$role['template']]['icon'], '"> <a href="', $scripturl, '?action=admin;area=helpdesk_permissions;sa=editrole;role=', $role['id_role'], '">', $role['role_name'], '</a></td>
274	266	<td><input type="checkbox" class="input_check" name="role', $id_role, '"', !empty($role['in_dept']) ? ' checked="checked"' : '', ' /></td>
275	267	</tr>';
276		-
277		- $use_bg2 = !$use_bg2;
278	268	}
279	269	}
280	270	else

...	...	@@ -33,8 +33,7 @@ function template_shd_admin_maint_home()
33	33	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
34	34	</form>
35	35	</div>
36		- </div>
37		- <span class="lowerframe"><span></span></span><br />';
	36	+ </div>';
38	37
39	38	// Reattribute guest posts
40	39	echo '
...	...	@@ -127,7 +124,6 @@ function template_shd_admin_maint_home()
127	124	</form>
128	125	</div>
129	126	</div>
130		- <span class="lowerframe"><span></span></span><br />
131	127	<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?rc5"></script>
132	128	<script type="text/javascript"><!-- // --><![CDATA[
133	129	var oAttributeMemberSuggest = new smc_AutoSuggest({
...	...	@@ -198,8 +194,7 @@ function template_shd_admin_maint_home()
198	194	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
199	195	</form>
200	196	</div>
201		- </div>
202		- <span class="lowerframe"><span></span></span><br />';
	197	+ </div>';
203	198	}
204	199	}
205	200
...	...	@@ -212,21 +207,18 @@ function template_shd_admin_maint_findrepairdone()
212	207	// Yay everything was fine.
213	208	echo '
214	209	<div class="windowbg">
215		- <span class="topslice"><span></span></span>
216	210	<div class="content">
217	211	<p>', $txt['maintain_no_errors'], '</p>
218	212	<p class="padding">
219	213	<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
220	214	</p>
221	215	</div>
222		- <span class="botslice"><span></span></span>
223	216	</div>';
224	217	}
225	218	else
226	219	{
227	220	echo '
228	221	<div class="windowbg">
229		- <span class="topslice"><span></span></span>
230	222	<div class="content">
231	223	<p>', $txt['errors_found'], '</p>';
232	224
...	...	@@ -259,7 +251,6 @@ function template_shd_admin_maint_findrepairdone()
259	251	<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
260	252	</p>
261	253	</div>
262		- <span class="botslice"><span></span></span>
263	254	</div>';
264	255	}
265	256	}
...	...	@@ -270,14 +261,12 @@ function template_shd_admin_maint_reattributedone()
270	261
271	262	echo '
272	263	<div class="windowbg">
273		- <span class="topslice"><span></span></span>
274	264	<div class="content">
275	265	<p>', $txt['shd_admin_maint_reattribute_success'], '</p>
276	266	<p class="padding">
277	267	<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
278	268	</p>
279	269	</div>
280		- <span class="botslice"><span></span></span>
281	270	</div>';
282	271	}
283	272
...	...	@@ -288,14 +277,12 @@ function template_shd_admin_maint_massdeptmovedone()
288	277	echo '
289	278	<div id="admincenter">
290	279	<div class="windowbg">
291		- <span class="topslice"><span></span></span>
292	280	<div class="content">
293	281	<p>', $txt['shd_admin_maint_massdeptmove_success'], '</p>
294	282	<p class="padding">
295	283	<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
296	284	</p>
297	285	</div>
298		- <span class="botslice"><span></span></span>
299	286	</div>
300	287	</div>';
301	288	}
...	...	@@ -327,7 +314,6 @@ function template_shd_admin_maint_search()
327	314	</form>
328	315	</div>
329	316	</div>
330		- <span class="lowerframe"><span></span></span><br />
331	317	<div class="cat_bar">
332	318	<h3 class="catbg">
333	319	<img src="', $settings['default_images_url'], '/simpledesk/search.png" alt="*">
...	...	@@ -369,7 +355,6 @@ function template_shd_admin_maint_search()
369	355	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
370	356	</form>
371	357	</div>
372		- </div>
373		- <span class="lowerframe"><span></span></span><br />';
	358	+ </div>';
374	359	}
375	360

...	...	@@ -25,31 +25,30 @@ function template_shd_permissions_home()
25	25	', $txt['shd_admin_permissions'], '
26	26	</h3>
27	27	</div>
28		- <p class="sd_description">
	28	+ <p class="information">
29	29	', $txt['shd_admin_permissions_homedesc'], '
30	30	</p>
31	31	</div>
32	32	<div class="tborder">
33	33	<div class="title_bar">
34		- <h3 class="titlebg sd_no_margin">
	34	+ <h3 class="titlebg">
35	35	<img src="', $settings['default_images_url'], '/simpledesk/position.png" alt="*" />
36	36	', $txt['shd_role_templates'], '
37	37	</h3>
38	38	</div>
39		- <p class="sd_description shd_actionloginfo">
	39	+ <p class="information">
40	40	', $txt['shd_role_templates_desc'], '
41	41	</p>
42		- <table class="shd_ticketlist" cellspacing="0" width="100%">
43		- <tr class="titlebg">
	42	+ <table class="table_grid">
	43	+ <tr class="title_bar">
44	44	<td colspan="2" width="30%">', $txt['shd_role'], '</td>
45	45	<td colspan="', count($context['shd_permissions']['group_display']), '">', $txt['shd_permissions'], '</td>
46	46	</tr>';
47	47
48		- $use_bg2 = true;
49	48	foreach ($context['shd_permissions']['roles'] as $role_id => $role_details)
50	49	{
51	50	echo '
52		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	51	+ <tr class="windowbg">
53	52	<td>', !empty($role_details['icon']) ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/' . $role_details['icon'] . '" alt="" />') : '', '</td>
54	53	<td>
55	54	', $txt[$role_details['description']], '
...	...	@@ -57,8 +56,6 @@ function template_shd_permissions_home()
57	56	</td>
58	57	', template_shd_display_permission_list($role_details['permissions']), '
59	58	</tr>';
60		-
61		- $use_bg2 = !$use_bg2;
62	59	}
63	60
64	61	echo '
...	...	@@ -67,16 +64,16 @@ function template_shd_permissions_home()
67	64	<br /><br />
68	65	<div class="tborder">
69	66	<div class="title_bar">
70		- <h3 class="titlebg sd_no_margin">
	67	+ <h3 class="titlebg">
71	68	<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />
72	69	', $txt['shd_roles'], '
73	70	</h3>
74	71	</div>
75		- <p class="sd_description shd_actionloginfo">
	72	+ <p class="information">
76	73	', $txt['shd_roles_desc'], '
77	74	</p>
78		- <table class="shd_ticketlist" cellspacing="0" width="100%">
79		- <tr class="titlebg">
	75	+ <table class="table_grid">
	76	+ <tr class="title_bar">
80	77	<td colspan="2" width="20%">', $txt['shd_role'], '</td>
81	78	<td colspan="', count($context['shd_permissions']['group_display']), '">', $txt['shd_permissions'], '</td>
82	79	<td width="15%">', $txt['shd_membergroups'], '</td>
...	...	@@ -92,11 +89,10 @@ function template_shd_permissions_home()
92	89	}
93	90	else
94	91	{
95		- $use_bg2 = true;
96	92	foreach ($context['shd_permissions']['user_defined_roles'] as $role => $role_details)
97	93	{
98	94	echo '
99		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	95	+ <tr class="windowbg">
100	96	<td>', !empty($role_details['template_icon']) ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/' . $role_details['template_icon'] . '" alt="" title="' . sprintf($txt['shd_based_on'], $role_details['template_name']) . '" />') : '', '</td>
101	97	<td>
102	98	', $role_details['name'], '
...	...	@@ -127,7 +123,6 @@ function template_shd_permissions_home()
127	123
128	124	echo '
129	125	</tr>';
130		- $use_bg2 = !$use_bg2;
131	126	}
132	127	}
133	128
...	...	@@ -213,7 +208,7 @@ function template_shd_create_role()
213	208	', $txt['shd_admin_permissions'], '
214	209	</h3>
215	210	</div>
216		- <p class="sd_description">
	211	+ <p class="information">
217	212	', $txt['shd_admin_permissions_homedesc'], '
218	213	</p>
219	214	</div>
...	...	@@ -241,8 +236,7 @@ function template_shd_create_role()
241	236	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
242	237	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
243	238	</form>
244		- </div>
245		- <span class="lowerframe"><span></span></span>';
	239	+ </div>';
246	240	}
247	241
248	242	/**
...	...	@@ -266,7 +260,7 @@ function template_shd_edit_role()
266	260	', $txt['shd_admin_permissions'], '
267	261	</h3>
268	262	</div>
269		- <p class="sd_description">
	263	+ <p class="information">
270	264	', $txt['shd_admin_permissions_homedesc'], '
271	265	</p>
272	266	</div>
...	...	@@ -331,9 +325,7 @@ function template_shd_edit_role()
331	325	<dd><input type="text" name="rolename" id="rolename" value="', $role['name'], '" class="input_text" size="30" /></dd>
332	326	</dl>
333	327	</div>
334		- </div>
335		- <span class="lowerframe"><span></span></span>
336		- <br />';
	328	+ </div>';
337	329
338	330	// Get ready to display the actual permissions
339	331	$permission_set = array();
...	...	@@ -397,7 +389,7 @@ function template_shd_edit_role()
397	389
398	390	echo '
399	391	<dt', (empty($txt['permissionhelp_' . $permission]) ? '' : ' title="' . $txt['permissionhelp_' . $permission] . '"') . '><img src="', shd_image_url($icon), '" alt="*" />', $txt['permissionname_' . $permission], '</dt>
400		- <dd class="shd_nowrap">
	392	+ <dd>
401	393	<span id="perm_', $permission, '_icon" class="', $perm_class, '"></span>
402	394	<select name="perm_', $permission, '" id="perm_', $permission, '" onchange="javascript:shd_chicon(this);">
403	395	<option value="disallow"', ($perm_value == 'disallow' ? ' selected="selected"' : ''), '>', (empty($txt['permissionname_' . $permission . '_no']) ? $txt['shd_roleperm_disallow'] : $txt['permissionname_' . $permission . '_no']), ' </option>';
...	...	@@ -451,26 +443,25 @@ function template_shd_edit_role()
451	443	echo '
452	444	<div class="tborder floatleft" style="width: 100%;">
453	445	<div class="cat_bar">
454		- <h3 class="catbg sd_no_margin">
	446	+ <h3 class="catbg">
455	447	<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />
456	448	', $txt['shd_role_membergroups'], '
457	449	</h3>
458	450	</div>
459		- <p class="sd_description shd_actionloginfo">
	451	+ <p class="information">
460	452	', $txt['shd_role_membergroups_desc'], '
461	453	</p>
462		- <table class="shd_ticketlist" cellspacing="0" width="100%">
463		- <tr class="titlebg">
	454	+ <table class="table_grid">
	455	+ <tr class="title_bar">
464	456	<td width="30%">', $txt['shd_role'], '</td>
465	457	<td width="30%">', $txt['shd_badge_stars'], '</td>
466	458	<td>', $txt['shd_assign_group'], '</td>
467	459	</tr>';
468	460
469		- $use_bg2 = true;
470	461	foreach ($context['membergroups'] as $id_group => $group)
471	462	{
472	463	echo '
473		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	464	+ <tr class="windowbg">
474	465	<td>', $group['link'], '</td>
475	466	<td>';
476	467
...	...	@@ -484,8 +475,6 @@ function template_shd_edit_role()
484	475	echo '</td>
485	476	<td><input type="checkbox" class="input_check" name="group', $id_group, '"', (in_array($id_group, $context['role_groups']) ? ' checked="checked"' : ''), ' /></td>
486	477	</tr>';
487		-
488		- $use_bg2 = !$use_bg2;
489	478	}
490	479
491	480	echo '
...	...	@@ -495,29 +484,27 @@ function template_shd_edit_role()
495	484
496	485	<div class="tborder floatleft" style="width: 100%;">
497	486	<div class="cat_bar">
498		- <h3 class="catbg sd_no_margin">
	487	+ <h3 class="catbg">
499	488	<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="*" />
500	489	', $txt['shd_role_departments'], '
501	490	</h3>
502	491	</div>
503		- <p class="sd_description shd_actionloginfo">
	492	+ <p class="information">
504	493	', $txt['shd_role_departments_desc'], '
505	494	</p>
506		- <table class="shd_ticketlist" cellspacing="0" width="100%">
507		- <tr class="titlebg">
	495	+ <table class="table_grid">
	496	+ <tr class="title_bar">
508	497	<td width="50%">', $txt['shd_department_name'], '</td>
509	498	<td width="50%">', $txt['shd_assign_dept'], '</td>
510	499	</tr>';
511	500
512		- $use_bg2 = true;
513	501	foreach ($context['role_depts'] as $id_dept => $dept)
514	502	{
515	503	echo '
516		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	504	+ <tr class="windowbg">
517	505	<td>', $dept['dept_name'], '</td>
518	506	<td><input type="checkbox" class="input_check" name="dept', $id_dept, '"', !empty($dept['is_role']) ? ' checked="checked"' : '', ' /></td>
519	507	</tr>';
520		- $use_bg2 = !$use_bg2;
521	508	}
522	509
523	510	echo '
...	...	@@ -552,7 +539,7 @@ function template_shd_copy_role()
552	539	', $txt['shd_admin_permissions'], '
553	540	</h3>
554	541	</div>
555		- <p class="sd_description">
	542	+ <p class="information">
556	543	', $txt['shd_admin_permissions_homedesc'], '
557	544	</p>
558	545	</div>
...	...	@@ -582,7 +569,6 @@ function template_shd_copy_role()
582	569	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
583	570	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
584	571	</form>
585		- </div>
586		- <span class="lowerframe"><span></span></span>';
	572	+ </div>';
587	573	}
588	574

...	...	@@ -45,17 +45,15 @@ function template_shd_plugin_listing()
45	45	', $txt['shd_admin_plugins'], '
46	46	</h3>
47	47	</div>
48		- <p class="sd_description">
	48	+ <p class="information">
49	49	', $txt['shd_admin_plugins_homedesc'], '
50	50	</p>
51	51	</div>';
52	52
53		- $use_bg2 = true;
54	53	foreach ($context['plugins'] as $id => $plugin)
55	54	{
56	55	echo '
57		- <div class="windowbg', $use_bg2 ? '2' : '', '">
58		- <span class="topslice"><span></span></span>
	56	+ <div class="windowbg">
59	57	<div class="content features">';
60	58
61	59	if (!empty($plugin['installable']))
...	...	@@ -110,10 +108,7 @@ function template_shd_plugin_listing()
110	108
111	109	echo '
112	110	</div>
113		- <span class="botslice clear_right"><span></span></span>
114	111	</div>';
115		-
116		- $use_bg2 = !$use_bg2;
117	112	}
118	113
119	114	echo '

...	...	@@ -26,11 +26,7 @@ function template_assign()
26	26	if (empty($context['shd_return_to']))
27	27	$context['shd_return_to'] = 'ticket';
28	28
29		- // Back to the helpdesk.
30		- echo '
31		- <div class="floatleft">
32		- ', template_button_strip(array($context['navigation']['back']), 'bottom'), '
33		- </div><br class="clear" /><br />';
	29	+ template_button_strip(array($context['navigation']['back']));
34	30
35	31	echo '
36	32	<div class="cat_bar">
...	...	@@ -62,13 +58,9 @@ function template_assign()
62	58	echo '
63	59	</select>
64	60	</dd>
65		- <dt>
	61	+ </dl>
66	62	<input type="submit" name="cancel" value="', ($context['shd_return_to'] == 'home' ? $txt['shd_cancel_home'] : $txt['shd_cancel_ticket']), '" accesskey="c" class="button_submit" />
67		- </dt>
68		- <dd>
69	63	<input type="submit" value="', $txt['shd_ticket_assign_ticket'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />
70		- </dd>
71		- </dl>
72	64	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />';
73	65
74	66	if ($context['shd_return_to'] == 'home')
...	...	@@ -78,7 +70,6 @@ function template_assign()
78	70	echo '
79	71	</div>
80	72	</form>
81		- </div>
82		- <span class="lowerframe"><span></span></span>';
	73	+ </div>';
83	74	}
84	75

...	...	@@ -27,18 +27,16 @@ function template_viewticket()
27	27	global $context, $txt, $scripturl, $settings, $modSettings, $options;
28	28
29	29	// Back to the helpdesk.
30		- echo '<div class="floatleft">', template_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']), 'bottom'), '</div>', ($modSettings['shd_ticketnav_style'] != 'smf' ? '<br class="clear" /><br />' : ''), '';
	30	+ template_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']));
31	31
32	32	if ($modSettings['shd_ticketnav_style'] == 'smf')
33	33	{
34	34	template_button_strip($context['ticket_navigation'], 'right');
35		- echo '<br class="clear" />';
36	35	}
37	36
38	37	echo '
39		- <div class="tborder">
40	38	<div class="cat_bar">
41		- <h3 class="catbg ticketheader">
	39	+ <h3 class="catbg">
42	40	<span class="floatright smalltext shd_ticketlinks" id="ticket">';
43	41
44	42	if ($modSettings['shd_ticketnav_style'] == 'sd')
...	...	@@ -62,84 +60,47 @@ function template_viewticket()
62	60	</h3>
63	61	</div>
64	62	<div class="windowbg">
65		- <div class="content shd_ticket">
66	63	<div class="shd_ticket_side_column">';
67	64
68	65	// General ticket details
69	66	echo '
70		- <div class="information shd_ticketdetails">
	67	+ <div class="shd_ticketdetails">
71	68	<strong><img src="', $settings['default_images_url'], '/simpledesk/details.png" alt="" class="shd_smallicon shd_icon_minihead" /> ', $txt['shd_ticket_details'], '</strong>
72	69	<hr />
73		- <ul>
74		- <li id="item_id">
75		- <dl>
76		- <dt><img src="', $settings['default_images_url'], '/simpledesk/id.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_id'], ':</dt>
	70	+ <dl class="stats nobb">
	71	+ <dt><span class="generic_icons inbox" alt="', $txt['shd_ticket_id'], '"></span> ', $txt['shd_ticket_id'], ':</dt>
77	72	<dd>', $context['ticket']['display_id'], '</dd>
78		- </dl>
79		- </li>
80		- <li id="item_userstarted">
81		- <dl>
82		- <dt><img src="', $settings['default_images_url'], '/simpledesk/user.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_user'], ':</dt>
	73	+ <dt><span class="generic_icons members" alt="', $txt['shd_ticket_user'], '"></span> ', $txt['shd_ticket_user'], ':</dt>
83	74	<dd>', $context['ticket']['member']['link'], '</dd>
84		- </dl>
85		- </li>
86		- <li id="item_whenstarted">
87		- <dl>
88		- <dt><img src="', $settings['default_images_url'], '/simpledesk/time.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_date'], ':</dt>
	75	+ <dt><span class="generic_icons calendar" alt="', $txt['shd_ticket_date'], '"></span> ', $txt['shd_ticket_date'], ':</dt>
89	76	<dd>', $context['ticket']['poster_time'], '</dd>
90		- </dl>
91		- </li>
92		- <li id="item_urgency">
93		- <dl>
94	77	<dt><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_urgency'], ':</dt>
95		- <dd><span id="urgency">', $context['ticket']['urgency']['label'], '</span>
96		- <span id="urgency_increase">', (!empty($context['ticket']['urgency']['increase']) ? '<a id="urglink_increase" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=increase;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_increase'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/move_up.png" width="9px" alt="' . $txt['shd_urgency_increase'] . '" /></a>' : ''), '</span>
97		- <span id="urgency_decrease">', (!empty($context['ticket']['urgency']['decrease']) ? '<a id="urglink_decrease" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=decrease;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_decrease'] . '"><img src="' . $settings['default_images_url'] . '/simpledesk/move_down.png" width="9px" alt="' . $txt['shd_urgency_decrease'] . '" /></a>' : ''), '</span>
	78	+ <dd>', $context['ticket']['urgency']['label'], '
	79	+ ', (!empty($context['ticket']['urgency']['increase']) ? '<a id="urglink_increase" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=increase;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_increase'] . '"><span class="generic_icons urgency_increase" title="' . $txt['shd_urgency_increase'] . '"></span></a>' : ''), '
	80	+ ', (!empty($context['ticket']['urgency']['decrease']) ? '<a id="urglink_decrease" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=decrease;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_decrease'] . '"><span class="generic_icons urgency_decrease" title="' . $txt['shd_urgency_decrease'] . '"></span></a>' : ''), '
98	81	</dd>
99		- </dl>
100		- </li>
101		- <li id="item_assigned">
102		- <dl>
103	82	<dt><img src="', $settings['default_images_url'], '/simpledesk/staff.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_assignedto'], ':</dt>
104		- <dd><span id="assigned_to">', $context['ticket']['assigned']['link'], '</span></dd>
105		- <dd id="assigned_button"></dd>
106		- </dl>
107		- <ul id="assigned_list" style="display:none;">
108		- </ul>
109		- </li>
110		- <li id="item_status">
111		- <dl>
	83	+ <dd>', $context['ticket']['assigned']['link'], '<span id="assigned_button"></span></dd>
	84	+ <dt class="full_width">
	85	+ <ul id="assigned_list" style="display:none;"></ul>
	86	+ </dt>
112	87	<dt><img src="', $settings['default_images_url'], '/simpledesk/status.png" alt="" class="shd_smallicon"/> ', $txt['shd_ticket_status'], ':</dt>
113	88	<dd>', $context['ticket']['status']['label'], '</dd>
114		- </dl>
115		- </li>
116		- <li id="item_replies">
117		- <dl>
118	89	<dt><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_num_replies'], ':</dt>
119		- <dd><a href="#replies">', (empty($context['ticket']['display_recycle']) ? $context['ticket']['num_replies'] : (int) $context['ticket']['num_replies'] + (int) $context['ticket']['deleted_replies']), '</a></dd>
120		- </dl>
121		- </li>';
	90	+ <dd><a href="#replies">', (empty($context['ticket']['display_recycle']) ? $context['ticket']['num_replies'] : (int) $context['ticket']['num_replies'] + (int) $context['ticket']['deleted_replies']), '</a></dd>';
122	91
123	92	if (!empty($context['display_private']))
124	93	echo '
125		- <li>
126		- <dl>
127	94	<dt><img src="', $settings['default_images_url'], '/simpledesk/private.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_privacy'], ':</dt>
128		- <dd><span id="privacy">', $context['ticket']['privacy']['label'], '</span>', ($context['ticket']['privacy']['can_change'] ? ' (<a id="privlink" href="' . $scripturl . '?action=helpdesk;sa=privacychange;ticket=' . $context['ticket']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['shd_ticket_change'] . '</a>)' : ''), '</dd>
129		- </dl>
130		- </li>';
	95	+ <dd>', $context['ticket']['privacy']['label'], '', ($context['ticket']['privacy']['can_change'] ? ' (<a id="privlink" href="' . $scripturl . '?action=helpdesk;sa=privacychange;ticket=' . $context['ticket']['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['shd_ticket_change'] . '</a>)' : ''), '</dd>';
131	96
132	97	if (!empty($context['ticket']['ip_address']))
133	98	echo '
134		- <li>
135		- <dl>
136	99	<dt><img src="', $settings['default_images_url'], '/simpledesk/ip.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_ip'], ':</dt>
137		- <dd>', $context['ticket']['ip_address'], '</dd>
138		- </dl>
139		- </li>';
	100	+ <dd>', $context['ticket']['ip_address'], '</dd>';
140	101
141	102	echo '
142		- </ul>';
	103	+ </dl>';
143	104
144	105	// Display ticket custom fields/filters, if any
145	106	if (!empty($context['ticket']['custom_fields']['prefixfilter']))
...	...	@@ -321,14 +282,13 @@ function template_viewticket()
321	282
322	283	if ($context['can_reply'])
323	284	echo '
324		- <br />
325		- <div class="description shd_replybutton floatright" id="shd_replybutton">
	285	+ <div class="information shd_replybutton floatright" id="shd_replybutton">
326	286	<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 />
327	287	</div>';
328	288
329	289	if ($context['can_quote'])
330	290	echo '
331		- <div class="description shd_quotebutton floatright" id="shd_quotebutton">
	291	+ <div class="information shd_quotebutton floatright" id="shd_quotebutton">
332	292	<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 />
333	293	</div>';
334	294
...	...	@@ -336,12 +296,7 @@ function template_viewticket()
336	296
337	297	echo '
338	298	</div>
339		- </div>
340		- <br class="clear" />
341		- <span class="botslice"><span></span></span>
342		- </div>
343		- </div>
344		- <br />';
	299	+ </div>';
345	300
346	301	// Left column (ticket relationships, attachments)
347	302	template_ticket_leftcolumn();
...	...	@@ -451,7 +406,7 @@ function template_viewticketattach()
451	406	foreach ($context['ticket_attach']['ticket'] as $attachment)
452	407	{
453	408	echo '
454		- <div class="description shd_attachment" id="attach', $attachment['id'], '">';
	409	+ <div class="information shd_attachment" id="attach', $attachment['id'], '">';
455	410
456	411	if ($attachment['is_image'])
457	412	{
...	...	@@ -479,7 +434,6 @@ function template_viewticketattach()
479	434
480	435	echo '
481	436	</div>
482		- <span class="botslice"><span></span></span>
483	437	</div>
484	438	</div>';
485	439	}
...	...	@@ -498,14 +452,12 @@ function template_viewnotifications()
498	452	return;
499	453
500	454	echo '
501		- <div class="tborder">
502		- <div class="title_bar">
503		- <h3 class="titlebg">
	455	+ <div class="cat_bar">
	456	+ <h3 class="catbg">
504	457	<img src="', $settings['default_images_url'], '/simpledesk/log_notify.png" alt="" />', $txt['shd_ticket_notify'], '
505	458	</h3>
506	459	</div>
507		- <div class="windowbg2">
508		- <div class="shd_attachmentbox">';
	460	+ <div class="information">';
509	461
510	462	$displayed_something = false;
511	463
...	...	@@ -592,11 +544,7 @@ function template_viewnotifications()
592	544	}
593	545
594	546	echo '
595		- </div>
596		- <span class="botslice"><span></span></span>
597		- </div>
598		- </div>
599		- <br />';
	547	+ </div>';
600	548	}
601	549
602	550	/**
...	...	@@ -627,7 +575,6 @@ function template_additional_fields()
627	575	return;
628	576
629	577	echo '
630		- <div class="tborder">
631	578	<div class="title_bar" id="additionalinfoheader">
632	579	<h3 class="titlebg">
633	580	<span class="floatright"><a href="javascript:oCustomFields.infoswap();"><img src="', $settings['images_url'], '/collapse.png" alt="+" id="shd_custom_fields_swap" class="icon" /></a></span>
...	...	@@ -643,7 +590,7 @@ function template_additional_fields()
643	590	if ($field['display_empty'] \|\| !empty($field['value']) \|\| $field['type'] == CFIELD_TYPE_CHECKBOX)
644	591	{
645	592	echo '
646		- <div class="description">
	593	+ <div class="information">
647	594	', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="" class="shd_smallicon" />' : '','
648	595	<strong>', $field['name'],':</strong><hr />';
649	596
...	...	@@ -697,8 +644,6 @@ function template_quickreply()
697	644	if ($context['can_reply'] && !empty($options['display_quick_reply']))
698	645	{
699	646	echo '
700		- <br />
701		- <div class="tborder">
702	647	<div class="title_bar" id="quickreplyheader">
703	648	<h3 class="titlebg">
704	649	<span class="floatright"><a href="#" onclick="oQuickReply.swap(); return false;"><img src="', $settings['images_url'], '/', $options['display_quick_reply'] == 2 ? 'selected_open' : 'selected', '.png" alt="+" id="quickReplyExpand" class="icon" style="display:none;" /></a></span>
...	...	@@ -713,7 +658,7 @@ function template_quickreply()
713	658	if ($context['can_go_advanced'])
714	659	{
715	660	echo '
716		- <div class="description shd_advancedbutton floatright" id="shd_goadvancedbutton" style="display:none;">
	661	+ <div class="information shd_advancedbutton floatright" id="shd_goadvancedbutton" style="display:none;">
717	662	<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 />
718	663	</div>';
719	664	}
...	...	@@ -726,7 +671,6 @@ function template_quickreply()
726	671	</div>
727	672	</div>
728	673	<span id="quickreplyfooter" class="lowerframe"', $options['display_quick_reply'] == 2 ? '' : ' style="display: none"', '><span></span></span>
729		- </div>
730	674	<script type="text/javascript"><!-- // --><![CDATA[
731	675	document.getElementById("quickReplyExpand").style.display = "";
732	676	document.getElementById("shd_goadvancedbutton").style.display = "";
...	...	@@ -775,7 +719,7 @@ function template_inline_attachments($msg)
775	719	}
776	720
777	721	echo '
778		- <td class="description">';
	722	+ <td class="information">';
779	723
780	724	if ($attachment['is_image'])
781	725	{
...	...	@@ -828,7 +772,6 @@ function template_viewreplies()
828	772	global $context, $settings, $txt, $scripturl, $options, $modSettings, $reply_request;
829	773
830	774	echo '
831		- <div class="tborder">
832	775	<div class="title_bar">
833	776	<h3 class="titlebg">
834	777	<span class="floatright smalltext">', $txt['pages'], ': ', $context['page_index'], '</span>
...	...	@@ -851,7 +794,7 @@ function template_viewreplies()
851	794	<a id="new"></a>';
852	795
853	796	echo '
854		- <div class="description shd_reply', (!empty($context['ticket']['display_recycle']) && $reply['message_status'] == MSG_STATUS_DELETED ? ' errorbox' : ''), '" id="msg', $reply['id'], '">
	797	+ <div class="windowbg ', (!empty($context['ticket']['display_recycle']) && $reply['message_status'] == MSG_STATUS_DELETED ? ' errorbox' : ''), '" id="msg', $reply['id'], '">
855	798	<span class="floatleft shd_posterinfo">
856	799	<strong class="shd_postername">
857	800	', $reply['member']['link'], '
...	...	@@ -962,12 +905,8 @@ function template_viewreplies()
962	905	}
963	906
964	907	echo '
965		- </div>
966		- <span class="floatleft shd_nowrap"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>
	908	+ <span class="floatleft"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>
967	909	<span class="floatright smalltext">', $txt['pages'], ': ', $context['page_index'], '</span>
968		- <br class="clear" />
969		- </div>
970		- <span class="lowerframe"><span></span></span>
971	910	</div>';
972	911	}
973	912
...	...	@@ -985,13 +924,12 @@ function template_viewrelationships()
985	924	if (!empty($context['display_relationships']))
986	925	{
987	926	echo '
988		- <div class="tborder">
989		- <div class="title_bar">
990		- <h3 class="titlebg">
	927	+ <div class="cat_bar">
	928	+ <h3 class="catbg">
991	929	<img src="', $settings['default_images_url'], '/simpledesk/relationships.png" alt="" />', $txt['shd_ticket_relationships'], ' (', $context['relationships_count'], ')
992	930	</h3>
993	931	</div>
994		- <div class="windowbg2">
	932	+ <div class="information">
995	933	<div class="shd_attachmentbox">';
996	934
997	935	foreach ($context['ticket_relationships'] as $rel_type => $relationships)
...	...	@@ -1042,10 +980,7 @@ function template_viewrelationships()
1042	980
1043	981	echo '
1044	982	</div>
1045		- <span class="botslice"><span></span></span>
1046		- </div>
1047		- </div>
1048		- <br />';
	983	+ </div>';
1049	984	}
1050	985	}
1051	986
...	...	@@ -1062,18 +997,16 @@ function template_ticketactionlog()
1062	997	if (!empty($context['display_ticket_log']))
1063	998	{
1064	999	echo '
1065		- <br />
1066		- <div class="tborder">
1067		- <div class="title_bar" id="ticket_log_header">
1068		- <h3 class="titlebg">
1069		- <span class="floatright shd_ticket_log_expand_container"> <a href="#" onclick="ActionLog.swap(); return false;"><img src="', $settings['images_url'], '/selected.png" alt="+" id="shd_ticket_log_expand" class="icon" style="display:none;" /></a></span>
	1000	+ <div class="cat_bar" id="ticket_log_header">
	1001	+ <h3 class="catbg">
	1002	+ <span class="floatright shd_ticket_log_expand_container"> <a href="#" onclick="ActionLog.swap(); return false;"><img src="', $settings['images_url'], '/expand.png" alt="+" id="shd_ticket_log_expand" class="icon" style="display:none;" /></a></span>
1070	1003	<img src="', $settings['default_images_url'], '/simpledesk/log.png" class="icon" alt="*" />
1071	1004	<a href="#" onclick="ActionLog.swap(); return false;">', $txt['shd_ticket_log'], '</a>
1072	1005	<span class="smalltext">(', $context['ticket_log_count'] == 1 ? $txt['shd_ticket_log_count_one'] : sprintf($txt['shd_ticket_log_count_more'], $context['ticket_log_count']), ')</span>
1073	1006	</h3>
1074	1007	</div>
1075		- <table class="shd_ticketlist" id="ticket_log" cellspacing="0" width="100%">
1076		- <tr class="titlebg">
	1008	+ <table class="table_grid">
	1009	+ <tr class="title_bar">
1077	1010	<td width="15%">
1078	1011	<img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" />
1079	1012	', $txt['shd_ticket_log_date'], '
...	...	@@ -1095,11 +1028,10 @@ function template_ticketactionlog()
1095	1028	</tr>';
1096	1029	else
1097	1030	{
1098		- $use_bg2 = true; // start with windowbg2 to differentiate between that and windowbg2
1099	1031	foreach ($context['ticket_log'] as $action)
1100	1032	{
1101	1033	echo '
1102		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	1034	+ <tr class="windowbg">
1103	1035	<td class="smalltext">', $action['time'], '</td>
1104	1036	<td', !empty($action['member']['ip']) ? ' title="' . $txt['shd_ticket_log_ip'] . ' ' . $action['member']['ip'] . '"' : '', '>', $action['member']['link'], ' <span class="smalltext">(', $action['member']['group'], ')</span></td>
1105	1037	<td class="smalltext">
...	...	@@ -1107,15 +1039,13 @@ function template_ticketactionlog()
1107	1039	', $action['action_text'], '
1108	1040	</td>
1109	1041	</tr>';
1110		-
1111		- $use_bg2 = !$use_bg2;
1112	1042	}
1113	1043	}
1114	1044
1115	1045	echo '
1116		- <tr class="titlebg">
	1046	+ <tr class="bot_page">
1117	1047	<td colspan="3">
1118		- <span class="floatright shd_nowrap"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>
	1048	+ <span class="floatright"><a href="#replies" title="', $txt['shd_go_to_replies_start'], '"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" alt="" /><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" /></a></span>
1119	1049	', !empty($context['ticket_full_log']) ? '<span class="smalltext shd_main_log"><img src="' . $settings['default_images_url'] . '/simpledesk/browse.png" alt="" /> <a href="' . $scripturl . '?action=admin;area=helpdesk_info;sa=actionlog">' . $txt['shd_ticket_log_full'] . '</a></span>' : '', '
1120	1050	</td>
1121	1051	</tr>

...	...	@@ -90,7 +90,6 @@ function template_movedept()
90	90	<input type="submit" value="', $txt['shd_ticket_move'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />
91	91	</div>
92	92	</form>
93		- </div>
94		- <span class="lowerframe"><span></span></span>';
	93	+ </div>';
95	94	}
96	95

...	...	@@ -20,12 +20,7 @@ function template_ticket_post()
20	20	{
21	21	global $context;
22	22
23		- // Back to the helpdesk.
24		- echo '
25		- <div class="floatleft">
26		- ', template_button_strip(array($context['navigation']['back']), 'bottom'), '
27		- </div><br class="clear" /><br />';
28		-
	23	+ template_button_strip(array($context['navigation']['back']));
29	24	template_preview();
30	25	template_ticket_info();
31	26	template_ticket_subjectbox();
...	...	@@ -93,13 +88,13 @@ function template_ticket_info()
93	88	<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="x" /> ', $context['ticket_form']['form_title'], '
94	89	</h3>
95	90	</div>
96		- <div class="windowbg">
	91	+ <div class="roundframe">
97	92	<div class="content shd_ticket">
98	93	<div class="shd_ticket_side_column">';
99	94
100	95	// General ticket details
101	96	echo '
102		- <div class="information shd_ticketdetails">
	97	+ <div class="shd_ticketdetails">
103	98	<strong><img src="', $settings['default_images_url'], '/simpledesk/details.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_details'], '</strong>
104	99	<hr />
105	100	<ul class="reset">';
...	...	@@ -157,7 +152,6 @@ function template_ticket_custom_fields()
157	152	echo '
158	153	<div class="information shd_customfields" id="shd_customfields"', empty($context['ticket_form']['dept']) ? ' style="display:none;"' : '', '>';
159	154
160		- // Loop through each custom field
161	155	// Loop through each custom field
162	156	// See also template_ticket_subjectbox() for the department selector which affects these.
163	157	foreach ($context['ticket_form']['custom_fields'][$context['ticket_form']['custom_fields_context']] as $field)
...	...	@@ -410,8 +404,7 @@ function template_ticket_subjectbox()
410	404	}
411	405
412	406	echo '
413		- <hr /><br />
414		- ';
	407	+ <hr /><br />';
415	408	}
416	409
417	410	function template_ticket_proxy_js()
...	...	@@ -503,7 +496,6 @@ function template_ticket_shd_replyarea()
503	496	echo '
504	497	</div>
505	498	</div>
506		- <span class="lowerframe"><span></span></span>
507	499	</div>
508	500	<br />';
509	501	}
...	...	@@ -601,7 +593,6 @@ function template_ticket_footer()
601	593	</div>
602	594	</div>
603	595	<br class="clear" />
604		- <span class="botslice"><span></span></span>
605	596	</div>
606	597	<br />';
607	598	}
...	...	@@ -625,7 +616,6 @@ function template_preview()
625	616	', $context['ticket_form']['preview']['body'], '
626	617	</div>
627	618	</div>
628		- <span class="lowerframe"><span></span></span>
629	619	</div>
630	620	<br />';
631	621	}
...	...	@@ -636,7 +626,7 @@ function template_ticket_additional_options()
636	626	global $context, $options, $txt, $modSettings, $settings;
637	627
638	628	echo '
639		- <div class="information shd_reply_attachments" id="shd_attach_container"', !empty($context['shd_display']) ? ' style="display:none;"' : '', '>
	629	+ <div id="postAdditionalOptionsHeader"', !empty($context['shd_display']) ? ' style="display:none;"' : '', '>
640	630	<ul class="post_options">';
641	631
642	632	foreach ($context['ticket_form']['additional_opts'] as $key => $details)
...	...	@@ -647,8 +637,7 @@ function template_ticket_additional_options()
647	637	}
648	638
649	639	echo '
650		- </ul>
651		- <hr />';
	640	+ </ul>';
652	641
653	642	if (empty($context['current_attachments']) && empty($context['ticket_form']['do_attach']))
654	643	{
...	...	@@ -819,12 +807,9 @@ function template_ticket_do_replies()
819	807	while ($reply = $context['get_replies']())
820	808	{
821	809	echo '
822		- <div class="description shd_reply" id="reply', $reply['id'], '">
823		- <span class="floatleft shd_posterinfo">
824		- <strong class="shd_postername">
825		- ', $reply['member']['link'], '
826		- </strong>
827		- <br />
	810	+ <div class="windowbg" id="reply', $reply['id'], '">
	811	+ <div class="poster">
	812	+ <h4>', $reply['member']['link'], '</h4>
828	813	', $reply['member']['group'], '<br class="shd_groupmargin" />';
829	814
830	815	if (!empty($modSettings['shd_display_avatar']) && empty($options['show_no_avatars']) && !empty($reply['member']['avatar']['image']))
...	...	@@ -839,8 +824,8 @@ function template_ticket_do_replies()
839	824	<img src="', $settings['default_images_url'] . '/simpledesk/staff.png" class="shd_smallicon" title="', $txt['shd_ticket_staff'], '" alt="', $txt['shd_ticket_staff'], '" />';
840	825
841	826	echo '
842		- </span>
843		- <div class="shd_replyarea">
	827	+ </div>
	828	+ <div class="postarea">
844	829	<div class="smalltext">
845	830	<span class="floatright shd_ticketlinks">';
846	831
...	...	@@ -896,7 +881,6 @@ function template_ticket_do_replies()
896	881	echo '
897	882	</div>
898	883	</div>
899		- <span class="lowerframe"><span></span></span>
900	884	</div>';
901	885	}
902	886
...	...	@@ -934,9 +918,7 @@ function template_shd_thank_posting()
934	918	</h3>
935	919	</div>
936	920	<div class="windowbg">
937		- <span class="topslice"><span></span></span>
938	921	<div class="padding">', $context['page_body'], '</div>
939		- <span class="botslice"><span></span></span>
940	922	</div>
941	923	</div>
942	924	<br class="clear" />';

...	...	@@ -18,14 +18,13 @@ function template_shd_profile_main()
18	18	global $context, $txt, $settings, $scripturl, $modSettings;
19	19
20	20	echo '
21		- <div class="tborder shd_profile_navigation">
22	21	<div class="cat_bar">
23	22	<h3 class="catbg">
24	23	<img src="', $settings['default_images_url'], '/simpledesk/user.png" alt="" class="shd_icon_minihead" />
25	24	', sprintf($txt['shd_profile_heading'], $context['member']['name']), '
26	25	</h3>
27	26	</div>
28		- <div class="shd_windowbg">
	27	+ <div class="windowbg">
29	28	<div class="content">
30	29	<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="" class="shd_icon_minihead" /> <strong>', $txt['shd_profile_tickets'], '</strong><hr />
31	30	', $txt['shd_profile_tickets_created'], ': <a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=hd_showtickets">', $context['shd_numtickets'], '</a>';
...	...	@@ -35,28 +34,19 @@ function template_shd_profile_main()
35	34	echo '
36	35	<br />
37	36	', $txt['shd_profile_tickets_assigned'], ': <a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=hd_showtickets">', $context['shd_numassigned'], '</a>
38		- <br /><br />
39		-
40		- <div class="shd_description shd_showtickets floatright" id="shd_showtickets">
41		- <a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=hd_showtickets">', $txt['shd_profile_view_tickets'], '</a><br />
42		- </div>';
	37	+ <div class="block floatright">
	38	+ <a href="', $scripturl, '?action=profile;u=', $context['member']['id'], ';area=hd_showtickets" class="button"><span id="shd_showtickets"></span>', $txt['shd_profile_view_tickets'], '</a>';
43	39
44	40	if (!empty($context['can_post_proxy']))
45	41	echo '
46		- <div class="shd_description shd_showtickets floatright" id="shd_post_proxy">
47		- <a href="', $scripturl, '?action=helpdesk;sa=newticket;proxy=', $context['member']['id'], '">', $txt['shd_profile_proxy'], '</a><br />
48		- </div>';
	42	+ <a href="', $scripturl, '?action=helpdesk;sa=newticket;proxy=', $context['member']['id'], '"><span id="shd_post_proxy" class="button"></span>', $txt['shd_profile_proxy'], '</a>';
49	43
50	44	if (!empty($context['can_post_ticket']))
51	45	echo '
52		- <div class="shd_description shd_showtickets floatright" id="shd_post_ticket">
53		- <a href="', $scripturl, '?action=helpdesk;sa=newticket">', $txt['shd_profile_newticket'], '</a><br />
54		- </div>';
	46	+ <a href="', $scripturl, '?action=helpdesk;sa=newticket" class="button"><span id="shd_post_ticket"></span>', $txt['shd_profile_newticket'], '</a>';
55	47
56	48	echo '
57		- <br /><br /><br />
58	49	</div>
59		- <span class="botslice"><span></span></span>
60	50	</div>
61	51	</div>';
62	52
...	...	@@ -160,7 +150,6 @@ function template_shd_profile_main()
160	150	echo '
161	151	<br />
162	152	</div>
163		- <span class="botslice"><span></span></span>
164	153	</div>
165	154	</div>';
166	155	}
...	...	@@ -339,7 +328,6 @@ function template_shd_profile_preferences()
339	328	', $txt['shd_profile_preferences_none_desc'], '
340	329	</div>
341	330	</div>
342		- <span class="lowerframe"><span></span></span>
343	331	</div>';
344	332
345	333	echo '
...	...	@@ -358,11 +346,11 @@ function template_shd_profile_show_tickets()
358	346	', sprintf($txt['shd_profile_show_tickets_header'], $context['member']['name']), '
359	347	</h3>
360	348	</div>
361		- <p class="description">', $txt['shd_profile_show_tickets_description'], '</p>
	349	+ <p class="information">', $txt['shd_profile_show_tickets_description'], '</p>
362	350	</div>';
363	351
364	352	// The navigation.
365		- echo '<div class="shd_profile_show_tickets_nav">', template_button_strip($context['show_tickets_navigation']), '<br class="clear" /></div>';
	353	+ template_button_strip($context['show_tickets_navigation']);
366	354
367	355	// Pagination
368	356	echo '
...	...	@@ -383,7 +371,6 @@ function template_shd_profile_show_tickets()
383	371	echo '
384	372	<div class="topic">
385	373	<div class="', $item['alternate'] == 0 ? 'windowbg2' : 'windowbg', ' core_posts">
386		- <span class="topslice"><span></span></span>
387	374	<div class="content">
388	375	<div class="counter">', $item['counter'], '</div>
389	376	<div class="topic_details">
...	...	@@ -392,13 +379,12 @@ function template_shd_profile_show_tickets()
392	379	</div>
393	380	<div class="list_posts">
394	381	', $item['body'], '
395		- <div class="description shd_replybutton floatright" id="shd_replybutton">
396		- <a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $item['ticket'], '.0">', $txt['shd_profile_view_full_ticket'], '</a><br />
	382	+ <div class="block floatright">
	383	+ <a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $item['ticket'], '.0" class="button">', $txt['shd_profile_view_full_ticket'], '</a>
397	384	</div>
398	385	</div>
399	386	</div>
400	387	<br class="clear" />
401		- <span class="botslice"><span></span></span>
402	388	</div>
403	389	</div>';
404	390	}
...	...	@@ -426,23 +412,22 @@ function template_shd_profile_show_notify_override()
426	412	', $txt['shd_profile_show_' . $context['notify_type'] . '_header'], '
427	413	</h3>
428	414	</div>
429		- <p class="description">', $txt['shd_profile_show_' . $context['notify_type'] . '_description'], '</p>
	415	+ <p class="information">', $txt['shd_profile_show_' . $context['notify_type'] . '_description'], '</p>
430	416	</div>';
431	417
432	418	// The navigation.
433		- echo '
434		- <div class="shd_profile_show_tickets_nav">', template_button_strip($context['show_tickets_navigation']), '<br class="clear" /></div>';
435		-
436		- echo '
437		- <table class="shd_ticketlist" cellspacing="0" width="100%">
438		- <tr class="titlebg">
439		- <td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket'], '</td>
440		- <td width="15%" class="shd_nowrap">', $txt['shd_ticket_name'], '</td>
441		- <td width="12%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_started_by'], '</td>
442		- <td width="7%" class="shd_nowrap">', $txt['shd_ticket_replies'], '</td>
443		- <td width="17%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_status'], '</td>
444		- <td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_urgency'], '</td>
445		- <td width="22%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_updated'], '</td>
	419	+ template_button_strip($context['show_tickets_navigation']);
	420	+
	421	+ echo '
	422	+ <table class="table_grid">
	423	+ <tr class="title_bar">
	424	+ <td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket'], '</td>
	425	+ <td width="15%">', $txt['shd_ticket_name'], '</td>
	426	+ <td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_started_by'], '</td>
	427	+ <td width="7%">', $txt['shd_ticket_replies'], '</td>
	428	+ <td width="17%"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_status'], '</td>
	429	+ <td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_urgency'], '</td>
	430	+ <td width="22%"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_updated'], '</td>
446	431	</tr>';
447	432
448	433	if (empty($context['tickets']))
...	...	@@ -454,11 +439,10 @@ function template_shd_profile_show_notify_override()
454	439	}
455	440	else
456	441	{
457		- $use_bg2 = true;
458	442	foreach ($context['tickets'] as $ticket)
459	443	{
460	444	echo '
461		- <tr class="windowbg', $use_bg2 ? '2' : '', '">
	445	+ <tr class="windowbg">
462	446	<td width="4%" class="smalltext">', $ticket['id_ticket_display'], '</td>
463	447	<td class="smalltext"><a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $ticket['id_ticket'], '">', $ticket['subject'], '</a></td>
464	448	<td class="smalltext">', $ticket['ticket_starter'], '</td>
...	...	@@ -467,8 +451,6 @@ function template_shd_profile_show_notify_override()
467	451	<td class="smalltext">', $txt['shd_urgency_' . $ticket['urgency']], '</td>
468	452	<td class="smalltext">', $ticket['updated'], '</td>
469	453	</tr>';
470		-
471		- $use_bg2 = !$use_bg2;
472	454	}
473	455	}
474	456
...	...	@@ -493,7 +475,7 @@ function template_shd_profile_permissions()
493	475	{
494	476	// Whoa, this dude's special. Tidy up and BAIL!
495	477	echo '
496		- <p class="description">
	478	+ <p class="information">
497	479	', $txt['shd_profile_permissions_all_admin'], '
498	480	</p>
499	481	</div>';
...	...	@@ -502,7 +484,7 @@ function template_shd_profile_permissions()
502	484
503	485	// Regular user: carry on, sergeant.
504	486	echo '
505		- <p class="description">
	487	+ <p class="information">
506	488	', $txt['shd_profile_permissions_description'], '
507	489	</p>
508	490	</div>';
...	...	@@ -524,9 +506,7 @@ function template_shd_profile_permissions()
524	506	</select>
525	507	<input type="submit" class="button_submit" value="', $txt['go'], '" />
526	508	</form>
527		- </div>
528		- <span class="lowerframe"><span></span></span>
529		- <br />';
	509	+ </div>';
530	510	// We're done?
531	511	if (!empty($context['dept_list_only']))
532	512	return;
...	...	@@ -535,16 +515,16 @@ function template_shd_profile_permissions()
535	515	echo '
536	516	<div class="tborder">
537	517	<div class="cat_bar">
538		- <h3 class="catbg sd_no_margin">
	518	+ <h3 class="catbg">
539	519	<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*" />
540	520	', $txt['shd_roles'], '
541	521	</h3>
542	522	</div>
543		- <p class="description shd_actionloginfo">
	523	+ <p class="information">
544	524	', $txt['shd_profile_roles_assigned'], '
545	525	</p>
546		- <table class="shd_ticketlist" cellspacing="0" width="100%">
547		- <tr class="titlebg">
	526	+ <table class="table_grid">
	527	+ <tr class="title_bar">
548	528	<td colspan="2" width="30%">', $txt['shd_role'], '</td>
549	529	<td>', $txt['shd_profile_role_membergroups'], '</td>
550	530	</tr>';
...	...	@@ -558,11 +538,10 @@ function template_shd_profile_permissions()
558	538	}
559	539	else
560	540	{
561		- $use_bg2 = true;
562	541	foreach ($context['member_roles'] as $role)
563	542	{
564	543	echo '
565		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	544	+ <tr class="windowbg">
566	545	<td>', !empty($context['shd_permissions']['roles'][$role['template']]['icon']) ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/' . $context['shd_permissions']['roles'][$role['template']]['icon'] . '" alt="" />') : '', '</td>
567	546	<td>', $role['name'], '</td>
568	547	<td>';
...	...	@@ -579,7 +558,6 @@ function template_shd_profile_permissions()
579	558
580	559	echo '</td>
581	560	</tr>';
582		- $use_bg2 = !$use_bg2;
583	561	}
584	562	}
585	563
...	...	@@ -594,22 +572,21 @@ function template_shd_profile_permissions()
594	572	<br />
595	573	<div class="tborder">
596	574	<div class="cat_bar">
597		- <h3 class="catbg sd_no_margin">
	575	+ <h3 class="catbg">
598	576	<img src="', $settings['default_images_url'], '/simpledesk/perm_yes.png" alt="*" />
599	577	', $txt['shd_profile_granted'], '
600	578	</h3>
601	579	</div>
602		- <p class="description shd_actionloginfo">
	580	+ <p class="information">
603	581	', $txt['shd_profile_granted_desc'], '
604	582	</p>
605		- <table class="shd_ticketlist" cellspacing="0" width="100%">
606		- <tr class="titlebg">
	583	+ <table class="table_grid">
	584	+ <tr class="title_bar">
607	585	<td colspan="2" width="60%">', $txt['shd_permissions'], '</td>
608	586	<td>', $txt['shd_roles'], '</td>
609	587	</tr>';
610	588
611	589	// Right, we're going to go by what's in the master list first.
612		- $use_bg2 = true;
613	590	$last_permission_cat = '';
614	591
615	592	foreach ($context['shd_permissions']['permission_list'] as $permission => $details)
...	...	@@ -648,7 +625,7 @@ function template_shd_profile_permissions()
648	625	}
649	626
650	627	echo '
651		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	628	+ <tr class="windowbg">
652	629	<td><img src="', shd_image_url($icon), '" alt="" /></td>';
653	630
654	631	if ($ownany)
...	...	@@ -683,15 +660,13 @@ function template_shd_profile_permissions()
683	660	if ($done_first)
684	661	echo ', ';
685	662
686		- echo '<span class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$context['member_roles'][$role]['template']]['icon'], '" alt="" /> ', $context['member_roles'][$role]['name'], '</span>';
	663	+ echo '<span><img src="', $settings['default_images_url'], '/simpledesk/', $context['shd_permissions']['roles'][$context['member_roles'][$role]['template']]['icon'], '" alt="" /> ', $context['member_roles'][$role]['name'], '</span>';
687	664	$done_first = true;
688	665	}
689	666
690	667	echo '
691	668	</td>
692	669	</tr>';
693		-
694		- $use_bg2 = !$use_bg2;
695	670	}
696	671
697	672	echo '
...	...	@@ -715,8 +690,8 @@ function template_shd_profile_actionlog()
715	690	<span class="smalltext">(', $context['action_log_count'] == 1 ? $txt['shd_profile_log_count_one'] : sprintf($txt['shd_profile_log_count_more'], $context['action_log_count']) , ')</span>
716	691	</h3>
717	692	</div>
718		- <table class="shd_ticketlist" id="ticket_log" cellspacing="0" width="100%">
719		- <tr class="titlebg">
	693	+ <table class="table_grid" id="ticket_log">
	694	+ <tr class="title_bar">
720	695	<td width="15%">
721	696	<img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" />
722	697	', $txt['shd_ticket_log_date'], '
...	...	@@ -734,19 +709,16 @@ function template_shd_profile_actionlog()
734	709	</tr>';
735	710	else
736	711	{
737		- $use_bg2 = true; // start with windowbg2 to differentiate between that and windowbg2
738	712	foreach ($context['action_log'] as $action)
739	713	{
740	714	echo '
741		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">
	715	+ <tr class="windowbg">
742	716	<td class="smalltext">', $action['time'], '</td>
743	717	<td class="smalltext">
744	718	<img src="', $settings['default_images_url'], '/simpledesk/', $action['action_icon'], '" alt="" class="shd_smallicon" />
745	719	', $action['action_text'], '
746	720	</td>
747	721	</tr>';
748		-
749		- $use_bg2 = !$use_bg2;
750	722	}
751	723	}
752	724
...	...	@@ -787,7 +759,6 @@ function template_shd_profile_navigation_above()
787	759	</ul>
788	760	', !empty($options['use_sidebar_menu']) ? '<br class="clear" />' : '', '
789	761	</div>
790		- <span class="lowerframe"><span></span></span>
791	762	</div>
792	763	</div>
793	764	', !empty($options['use_sidebar_menu']) ? '<br />' : '', '

...	...	@@ -19,10 +19,7 @@ function template_search()
19	19	global $context, $txt, $scripturl, $settings, $modSettings;
20	20
21	21	// Back to the helpdesk.
22		- echo '
23		- <div class="floatleft">
24		- ', template_button_strip(array($context['navigation']['back']), 'bottom'), '
25		- </div><br class="clear" /><br />';
	22	+ template_button_strip(array($context['navigation']['back']));
26	23
27	24	if (!empty($modSettings['shd_new_search_index']))
28	25	echo '
...	...	@@ -179,8 +176,7 @@ function template_search()
179	176	<input type="submit" value="', $txt['shd_search'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit" />
180	177	</div>
181	178	</form>
182		- </div>
183		- <span class="lowerframe"><span></span></span>';
	179	+ </div>';
184	180	}
185	181
186	182	function template_search_no_results()
...	...	@@ -188,10 +184,7 @@ function template_search_no_results()
188	184	global $context, $txt, $scripturl, $settings, $modSettings;
189	185
190	186	// Back to the helpdesk.
191		- echo '
192		- <div class="floatleft">
193		- ', template_button_strip(array($context['navigation']['back'], $context['navigation']['search']), 'bottom'), '
194		- </div><br class="clear" /><br />';
	187	+ template_button_strip(array($context['navigation']['back'], $context['navigation']['search']));
195	188
196	189	echo '
197	190	<div class="cat_bar">
...	...	@@ -205,11 +198,9 @@ function template_search_no_results()
205	198	template_search_criteria();
206	199
207	200	echo '
208		- <span class="upperframe"><span></span></span>
209	201	<div class="roundframe">
210	202	<div class="content">', $txt['shd_search_no_results'], '</div>
211		- </div>
212		- <span class="lowerframe"><span></span></span>';
	203	+ </div>';
213	204	}
214	205
215	206	function template_search_criteria()
...	...	@@ -306,10 +297,7 @@ function template_search_results()
306	297	global $context, $txt, $scripturl, $settings, $modSettings, $smcFunc;
307	298
308	299	// Back to the helpdesk.
309		- echo '
310		- <div class="floatleft">
311		- ', template_button_strip(array($context['navigation']['back'], $context['navigation']['search']), 'bottom'), '
312		- </div><br class="clear" /><br />';
	300	+ template_button_strip(array($context['navigation']['back'], $context['navigation']['search']));
313	301
314	302	echo '
315	303	<div class="cat_bar">
...	...	@@ -330,15 +318,11 @@ function template_search_results()
330	318	// Search criteria
331	319	template_search_criteria();
332	320
333		- // And finally, the results themselves.
334		- $use_bg2 = false;
335		-
336	321	foreach ($context['search_results'] as $index => $result)
337	322	{
338	323	echo '
339	324	<div class="search_results_posts">
340		- <div class="windowbg', $use_bg2 ? '2' : '', ' core_posts">
341		- <span class="topslice"><span></span></span>
	325	+ <div class="windowbg core_posts">
342	326	<div class="content flow_auto">
343	327	<div class="topic_details floatleft" style="width: 94%">
344	328	<div class="counter">', $result['result'], '</div>
...	...	@@ -348,9 +332,7 @@ function template_search_results()
348	332	<br class="clear">
349	333	<div class="list_posts double_height">', $result['body'], '</div>
350	334	</div>
351		- <span class="botslice"><span></span></span>
352	335	</div>
353	336	</div>';
354		- $use_bg2 = !$use_bg2;
355	337	}
356	338	}

...	...	@@ -26,11 +26,7 @@ function template_shd_tickettotopic()
26	26	{
27	27	global $txt, $settings, $context, $scripturl, $modSettings;
28	28
29		- // Back to the helpdesk.
30		- echo '
31		- <div class="floatleft">
32		- ', template_button_strip(array($context['navigation']['back']), 'bottom'), '
33		- </div><br class="clear" /><br />';
	29	+ template_button_strip(array($context['navigation']['back']));
34	30
35	31	echo '
36	32	<div class="cat_bar">
...	...	@@ -39,9 +35,8 @@ function template_shd_tickettotopic()
39	35	', $txt['shd_move_ticket_to_topic'], '
40	36	</h3>
41	37	</div>
42		- <div class="roundframe">
	38	+ <div class="roundframe noup">
43	39	<form action="', $scripturl, '?action=helpdesk;sa=tickettotopic2;ticket=', $context['ticket_id'], '" method="post" onsubmit="submitonce(this);">
44		- <div class="content">
45	40	<dl class="settings">
46	41	<dt>
47	42	<strong>', $txt['shd_ticket_board'], ':</strong>
...	...	@@ -101,7 +96,6 @@ function template_shd_tickettotopic()
101	96	if (!empty($context['deleted_prompt']))
102	97	{
103	98	echo '
104		- <br />
105	99	<fieldset id="deleted_replies">
106	100	<dl class="settings">
107	101	<dt>
...	...	@@ -121,7 +115,6 @@ function template_shd_tickettotopic()
121	115	if (!empty($context['custom_fields']))
122	116	{
123	117	echo '
124		- <br />
125	118	<fieldset id="custom_fields">
126	119	<dl class="settings">
127	120	<dt>
...	...	@@ -131,8 +124,7 @@ function template_shd_tickettotopic()
131	124	<div class="error">', $txt['shd_ticket_move_cfs_warn'], '</div>';
132	125
133	126	echo '
134		- </dt>
135		- <br />';
	127	+ </dt>';
136	128
137	129	foreach ($context['custom_fields'] as $field)
138	130	{
...	...	@@ -193,10 +185,8 @@ function template_shd_tickettotopic()
193	185	<input type="submit" name="cancel" value="', $txt['shd_cancel_ticket'], '" accesskey="c" class="button_submit" />
194	186	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
195	187	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
196		- </div>
197	188	</form>
198		- </div>
199		- <span class="lowerframe"><span></span></span>';
	189	+ </div>';
200	190	}
201	191
202	192	/**
...	...	@@ -220,9 +210,8 @@ function template_shd_topictoticket()
220	210	', $txt['shd_move_topic_to_ticket'], '
221	211	</h3>
222	212	</div>
223		- <div class="roundframe">
	213	+ <div class="roundframe noup">
224	214	<form action="', $scripturl, '?action=helpdesk;sa=topictoticket2;topic=', $context['topic_id'], '" method="post" onsubmit="submitonce(this);">
225		- <div class="content">
226	215	<dl class="settings">
227	216	<dt>
228	217	<strong>', $txt['shd_change_topic_subject'], ':</strong>
...	...	@@ -295,9 +284,7 @@ function template_shd_topictoticket()
295	284	<input type="submit" name="cancel" value="', $txt['shd_cancel_topic'], '" accesskey="c" class="button_submit" />
296	285	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
297	286	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '" />
298		- </div>
299	287	</form>
300		- </div>
301		- <span class="lowerframe"><span></span></span>';
	288	+ </div>';
302	289	}
303	290

...	...	@@ -32,8 +32,6 @@ function template_shd_unread_below()
32	32	global $context, $txt, $scripturl, $settings;
33	33
34	34	echo '
35		- <br />
36		- <div class="tborder">
37	35	<div class="cat_bar">
38	36	<h3 id="shd_block_assigned" class="catbg">
39	37	<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="*">
...	...	@@ -41,32 +39,30 @@ function template_shd_unread_below()
41	39	<span class="smalltext">(', count($context['shd_unread_info']) == 1 ? '1 ' . $txt['shd_count_ticket_1'] : count($context['shd_unread_info']) . ' ' . $txt['shd_count_tickets'], ')</span>
42	40	</h3>
43	41	</div>
44		-
45		- <table class="shd_ticketlist" cellspacing="0" width="100%">
46		- <tr class="titlebg">
47		- <td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket'], '</td>
48		- <td width="15%" class="shd_nowrap">', $txt['shd_ticket_name'], '</td>
49		- <td width="12%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_started_by'], '</td>
50		- <td width="7%" class="shd_nowrap">', $txt['shd_ticket_replies'], '</td>
51		- <td width="17%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_status'], '</td>
52		- <td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_urgency'], '</td>
53		- <td width="22%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_updated'], '</td>
	42	+ <table class="table_grid">
	43	+ <tr class="title_bar">
	44	+ <td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket'], '</td>
	45	+ <td width="15%">', $txt['shd_ticket_name'], '</td>
	46	+ <td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_started_by'], '</td>
	47	+ <td width="7%">', $txt['shd_ticket_replies'], '</td>
	48	+ <td width="17%"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_status'], '</td>
	49	+ <td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_urgency'], '</td>
	50	+ <td width="22%"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', $txt['shd_ticket_updated'], '</td>
54	51	</tr>';
55	52
56	53	if (empty($context['shd_unread_info']))
57	54	{
58	55	echo '
59		- <tr class="windowbg2">
	56	+ <tr class="windowbg">
60	57	<td colspan="7">', $txt['shd_error_no_tickets'], '</td>
61	58	</tr>';
62	59	}
63	60	else
64	61	{
65		- $use_bg2 = true;
66	62	foreach ($context['shd_unread_info'] as $ticket)
67	63	{
68	64	echo '
69		- <tr class="windowbg', $use_bg2 ? '2' : '', '">
	65	+ <tr class="windowbg">
70	66	<td width="4%" class="smalltext">', $ticket['id_ticket_display'], '</td>
71	67	<td class="smalltext"><a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $ticket['id_ticket'], '">', $ticket['subject'], '</a></td>
72	68	<td class="smalltext">', $ticket['ticket_starter'], '</td>
...	...	@@ -76,12 +72,10 @@ function template_shd_unread_below()
76	72	<td class="smalltext">', $ticket['updated'], '</td>
77	73	</tr>';
78	74
79		- $use_bg2 = !$use_bg2;
80	75	}
81	76	}
82	77
83	78	echo '
84		- </table>
85		- </div>';
	79	+ </table>';
86	80	}
87	81

...	...	@@ -24,25 +24,16 @@ function template_main()
24	24	{
25	25	global $context, $txt, $settings, $scripturl;
26	26
27		- echo '
28		- <div class="modbuttons clearfix margintop">';
29		-
30	27	template_button_strip($context['navigation'], 'bottom');
31	28
32	29	echo '
33		- </div>
34		- <div id="admin_content">
35		- <table width="100%" class="shd_main_hd">
36		- <tr>
37		- <td valign="top">
38	30	<div class="title_bar">
39	31	<h3 class="titlebg">
40	32	', $txt['shd_helpdesk'], !empty($context['shd_dept_name']) && $context['shd_multi_dept'] ? ' - ' . $context['shd_dept_name'] : '', '
41	33	</h3>
42	34	</div>
43		- <span class="upperframe"><span></span></span>
44		- <div class="roundframe">
45		- <div class="shd_gototicket smalltext">
	35	+ <div class="information">
	36	+ <div class="floatright smalltext">
46	37	<form action="', $scripturl, '?action=helpdesk;sa=ticket" method="get">
47	38	', $txt['shd_go_to_ticket'], ':
48	39	<input type="hidden" name="action" value="helpdesk" />
...	...	@@ -51,18 +42,18 @@ function template_main()
51	42	<input type="submit" class="button_submit" value="', $txt['shd_go'], '" onclick="shd_quickTicketJump(this.parentNode.ticketJump.value);" />
52	43	</form>
53	44	</div>
54		- <div id="welcome">
55		- <strong>', sprintf($txt['shd_welcome'], $context['user']['name']), '</strong><br />
	45	+ <div class="floatleft">
	46	+ <span class="block">', sprintf($txt['shd_welcome'], $context['user']['name']), '</span>
56	47	', $txt['shd_' . $context['shd_home_view'] . '_greeting'];
57	48
58	49	if (!empty($context['shd_filter_fields']))
59	50	{
60	51	echo '
61		- <br /><br /><strong>', $txt['shd_category_filter'], ':</strong>';
	52	+ <strong>', $txt['shd_category_filter'], ':</strong>';
62	53	foreach ($context['shd_filter_fields'] as $id_field => $field)
63	54	{
64	55	echo '
65		- <br />', $field['name'], ':';
	56	+ ', $field['name'], ':';
66	57	foreach ($field['options'] as $key => $opt)
67	58	{
68	59	if (!empty($context['filter_fragment']) && $_REQUEST['field'] == $id_field && $_REQUEST['filter'] == $key)
...	...	@@ -75,9 +66,7 @@ function template_main()
75	66
76	67	echo '
77	68	</div>
78		- </div>
79		- <span class="lowerframe"><span></span></span>
80		- <br />';
	69	+ </div>';
81	70
82	71	// Start the ticket listing
83	72	foreach ($context['ticket_block_order'] as $block)
...	...	@@ -95,9 +84,6 @@ function template_main()
95	84	}
96	85
97	86	echo '
98		- </td>
99		- </tr>
100		- </table>
101	87	</div>';
102	88
103	89	//echo 'I\'m alive!!!!!!!!!!1111oneone'; - I had to save this :P
...	...	@@ -107,23 +93,14 @@ function template_shd_depts()
107	93	{
108	94	global $context, $txt, $settings, $scripturl;
109	95
110		- echo '
111		- <div class="modbuttons clearfix margintop">';
112		-
113	96	template_button_strip($context['navigation'], 'bottom');
114	97
115	98	echo '
116		- </div>
117		- <div id="admin_content">
118		- <table width="100%" class="shd_main_hd">
119		- <tr>
120		- <td valign="top">
121	99	<div class="title_bar">
122	100	<h3 class="titlebg">
123	101	', $txt['shd_helpdesk'], '
124	102	</h3>
125	103	</div>
126		- <span class="upperframe"><span></span></span>
127	104	<div class="roundframe">
128	105	<div class="shd_gototicket smalltext">
129	106	<form action="', $scripturl, '?action=helpdesk;sa=ticket" method="get">
...	...	@@ -138,17 +115,13 @@ function template_shd_depts()
138	115	<strong>', sprintf($txt['shd_welcome'], $context['user']['name']), '</strong><br />
139	116	', $txt['shd_' . $context['shd_home_view'] . '_greeting'], '
140	117	</div>
141		- </div>
142		- <span class="lowerframe"><span></span></span>
143		- <br />
144		- <div class="tborder">
145	118	<div class="cat_bar">
146	119	<h3 class="catbg">
147	120	<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="*" />
148	121	', $txt['shd_departments'], '
149	122	</h3>
150	123	</div>
151		- <table class="shd_ticketlist table_list" cellspacing="0" width="100%">
	124	+ <table class="table_grid">
152	125	<tbody class="content">';
153	126
154	127	foreach ($context['dept_list'] as $dept)
...	...	@@ -171,10 +144,6 @@ function template_shd_depts()
171	144	echo '
172	145	</tbody>
173	146	</table>
174		- </div>
175		- </td>
176		- </tr>
177		- </table>
178	147	</div>';
179	148	}
180	149
...	...	@@ -192,25 +161,14 @@ function template_closedtickets()
192	161	{
193	162	global $context, $txt, $settings, $scripturl;
194	163
195		- echo '
196		- <div class="modbuttons clearfix margintop">';
197		-
198	164	template_button_strip($context['navigation'], 'bottom');
199	165
200	166	echo '
201		- </div>
202		- <div id="admin_content">
203		- <table width="100%" class="shd_main_hd">
204		- <tr>';
205		-
206		- echo '
207		- <td valign="top">
208	167	<div class="title_bar">
209	168	<h3 class="titlebg">
210	169	', $txt['shd_helpdesk'], '
211	170	</h3>
212	171	</div>
213		- <span class="upperframe"><span></span></span>
214	172	<div class="roundframe">
215	173	<div class="shd_gototicket smalltext">
216	174	<form action="', $scripturl, '?action=helpdesk" method="post">
...	...	@@ -244,9 +202,7 @@ function template_closedtickets()
244	202
245	203	echo '
246	204	</div>
247		- </div>
248		- <span class="lowerframe"><span></span></span>
249		- <br />';
	205	+ </div>';
250	206
251	207	// Start the ticket listing
252	208	$blocks = array_keys($context['ticket_blocks']);
...	...	@@ -255,12 +211,6 @@ function template_closedtickets()
255	211	$context['current_block'] = $block;
256	212	template_ticket_block();
257	213	}
258		-
259		- echo '
260		- </td>
261		- </tr>
262		- </table>
263		- </div>';
264	214	}
265	215
266	216	/**
...	...	@@ -277,25 +227,14 @@ function template_recyclebin()
277	227	{
278	228	global $context, $txt, $settings, $scripturl;
279	229
280		- echo '
281		- <div class="modbuttons clearfix margintop">';
282		-
283	230	template_button_strip($context['navigation'], 'bottom');
284	231
285	232	echo '
286		- </div>
287		- <div id="admin_content">
288		- <table width="100%" class="shd_main_hd">
289		- <tr>';
290		-
291		- echo '
292		- <td valign="top">
293	233	<div class="title_bar">
294	234	<h3 class="titlebg">
295	235	', $txt['shd_helpdesk'], '
296	236	</h3>
297	237	</div>
298		- <span class="upperframe"><span></span></span>
299	238	<div class="roundframe">
300	239	<div class="shd_gototicket smalltext">
301	240	<form action="', $scripturl, '?action=helpdesk" method="post">
...	...	@@ -329,9 +268,7 @@ function template_recyclebin()
329	268
330	269	echo '
331	270	</div>
332		- </div>
333		- <span class="lowerframe"><span></span></span>
334		- <br />';
	271	+ </div>';
335	272
336	273	// Loop through the crap... Uh, I mean the tickets! :)
337	274	$blocks = array_keys($context['ticket_blocks']);
...	...	@@ -340,12 +277,6 @@ function template_recyclebin()
340	277	$context['current_block'] = $block;
341	278	template_ticket_block();
342	279	}
343		-
344		- echo '
345		- </td>
346		- </tr>
347		- </table>
348		- </div>';
349	280	}
350	281
351	282	/**
...	...	@@ -361,17 +292,13 @@ function template_collapsed_ticket_block()
361	292	global $context, $txt, $settings, $scripturl;
362	293
363	294	echo '
364		- <div class="tborder">
365	295	<div class="cat_bar">
366	296	<h3 class="catbg">
367	297	<img src="', $settings['default_images_url'], '/simpledesk/', $context['ticket_blocks'][$context['current_block']]['block_icon'], '" alt="*" />
368	298	', (empty($context['block_link']) ? '' : '<a href="' . $context['block_link'] . '">'), $context['ticket_blocks'][$context['current_block']]['title'], '
369	299	<span class="smalltext">(', $context['ticket_blocks'][$context['current_block']]['count'], ' ', ($context['ticket_blocks'][$context['current_block']]['count'] == 1 ? $txt['shd_count_ticket_1'] : $txt['shd_count_tickets']), ')</span>', (empty($context['block_link']) ? '' : '</a>'), '
370	300	</h3>
371		- </div>
372		- </div>
373		- <br />
374		- <br />';
	301	+ </div>';
375	302	}
376	303
377	304	/**
...	...	@@ -390,7 +317,6 @@ function template_ticket_block()
390	317	// $context['current_block'] = the block to display now
391	318
392	319	echo '
393		- <div class="tborder">
394	320	<div class="cat_bar">
395	321	<h3 id="shd_block_', $context['current_block'], '" class="catbg">
396	322	', !empty($context['ticket_blocks'][$context['current_block']]['page_index']) ? '<span class="floatright smalltext">'. $txt['pages'] . ': ' . $context['ticket_blocks'][$context['current_block']]['page_index'] . '</span>' : '', '
...	...	@@ -400,8 +326,8 @@ function template_ticket_block()
400	326	</h3>
401	327	</div>
402	328
403		- <table class="shd_ticketlist" cellspacing="0" width="100%">
404		- <tr class="titlebg">';
	329	+ <table class="table_grid">
	330	+ <tr class="title_bar">';
405	331
406	332	$block_width = 0;
407	333	foreach ($context['ticket_blocks'][$context['current_block']]['columns'] as $column)
...	...	@@ -411,48 +337,48 @@ function template_ticket_block()
411	337	{
412	338	case 'ticket_id':
413	339	echo '
414		- <td width="8%" colspan="2" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('ticketid', $txt['shd_ticket']), '</td>';
	340	+ <td width="8%" colspan="2"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('ticketid', $txt['shd_ticket']), '</td>';
415	341	$block_width++; // is 2 blocks wide
416	342	break;
417	343	case 'ticket_name':
418	344	echo '
419		- <td width="15%" class="shd_nowrap">', template_shd_menu_header('ticketname', $txt['shd_ticket_name']), '</td>';
	345	+ <td width="15%">', template_shd_menu_header('ticketname', $txt['shd_ticket_name']), '</td>';
420	346	break;
421	347	case 'starting_user':
422	348	echo '
423		- <td width="12%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('starter', $txt['shd_ticket_started_by']), '</td>';
	349	+ <td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('starter', $txt['shd_ticket_started_by']), '</td>';
424	350	break;
425	351	case 'last_reply':
426	352	echo '
427		- <td width="20%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('lastreply', $txt['shd_ticket_updated_by']), '</td>';
	353	+ <td width="20%"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('lastreply', $txt['shd_ticket_updated_by']), '</td>';
428	354	break;
429	355	case 'assigned':
430	356	echo '
431		- <td width="12%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('assigned', $txt['shd_ticket_assigned']), '</td>';
	357	+ <td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('assigned', $txt['shd_ticket_assigned']), '</td>';
432	358	break;
433	359	case 'status':
434	360	echo '
435		- <td width="17%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('status', $txt['shd_ticket_status']), '</td>';
	361	+ <td width="17%"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('status', $txt['shd_ticket_status']), '</td>';
436	362	break;
437	363	case 'urgency':
438	364	echo '
439		- <td width="8%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('urgency', $txt['shd_ticket_urgency']), '</td>';
	365	+ <td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('urgency', $txt['shd_ticket_urgency']), '</td>';
440	366	break;
441	367	case 'updated':
442	368	echo '
443		- <td width="22%" class="shd_nowrap"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('updated', $txt['shd_ticket_updated']), '</td>';
	369	+ <td width="22%"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" /> ', template_shd_menu_header('updated', $txt['shd_ticket_updated']), '</td>';
444	370	break;
445	371	case 'replies':
446	372	echo '
447		- <td width="7%" class="shd_nowrap">', template_shd_menu_header('replies', $txt['shd_ticket_num_replies']), '</td>';
	373	+ <td width="7%">', template_shd_menu_header('replies', $txt['shd_ticket_num_replies']), '</td>';
448	374	break;
449	375	case 'allreplies':
450	376	echo '
451		- <td width="7%" class="shd_nowrap">', template_shd_menu_header('allreplies', $txt['shd_ticket_num_replies']), '</td>';
	377	+ <td width="7%">', template_shd_menu_header('allreplies', $txt['shd_ticket_num_replies']), '</td>';
452	378	break;
453	379	case 'actions':
454	380	echo '
455		- <td width="5%" class="shd_nowrap">', $txt['shd_actions'] , '</td>';
	381	+ <td width="5%">', $txt['shd_actions'] , '</td>';
456	382	break;
457	383	default:
458	384	echo '
...	...	@@ -467,17 +393,16 @@ function template_ticket_block()
467	393	if (empty($context['ticket_blocks'][$context['current_block']]['tickets']))
468	394	{
469	395	echo '
470		- <tr class="windowbg2">
	396	+ <tr class="windowbg">
471	397	<td colspan="', $block_width, '" class="shd_noticket">', $txt['shd_error_no_tickets'], '</td>
472	398	</tr>';
473	399	}
474	400	else
475	401	{
476		- $use_bg2 = true; // start with windowbg2 to differentiate between that and titlebg
477	402	foreach ($context['ticket_blocks'][$context['current_block']]['tickets'] as $ticket)
478	403	{
479	404	echo '
480		- <tr class="', ($use_bg2 ? 'windowbg2' : 'windowbg'), '">';
	405	+ <tr class="windowbg">';
481	406
482	407	foreach ($context['ticket_blocks'][$context['current_block']]['columns'] as $column)
483	408	{
...	...	@@ -489,7 +414,7 @@ function template_ticket_block()
489	414	$unread_image = $ticket['is_unread'] ? 'unread.png' : 'read.png';
490	415	$unread_txt = $ticket['is_unread'] ? $txt['shd_ticket_new'] : $txt['shd_ticket_notnew'];
491	416	echo '
492		- <td width="1%" class="shd_nowrap">
	417	+ <td width="1%">
493	418	<img src="', $settings['default_images_url'], '/simpledesk/', $unread_image, '" alt="', $unread_txt, '" title="', $unread_txt, '" />
494	419	<img src="', $settings['default_images_url'], '/simpledesk/', $private_image, '" alt="', $private_txt, '" title="', $private_txt, '" />
495	420	</td>
...	...	@@ -500,7 +425,7 @@ function template_ticket_block()
500	425	<td class="smalltext">', $ticket['dept_link'], $ticket['link'];
501	426
502	427	if ($ticket['is_unread'] && !empty($ticket['new_href']))
503		- echo ' <a href="', $ticket['new_href'], '"><span class="new_posts shd_new_tickets">', $txt['new'], '</span></a>';
	428	+ echo ' <a href="', $ticket['new_href'], '"><img src="', $context['new_posts_image'], '" class="new_posts" alt="', $txt['new'], '" /></a>';
504	429
505	430	echo '</td>';
506	431	break;
...	...	@@ -538,7 +463,7 @@ function template_ticket_block()
538	463	break;
539	464	case 'actions':
540	465	echo '
541		- <td class="shd_nowrap">';
	466	+ <td>';
542	467
543	468	foreach ($ticket['actions'] as $action)
544	469	echo '
...	...	@@ -557,21 +482,17 @@ function template_ticket_block()
557	482
558	483	echo '
559	484	</tr>';
560		-
561		- $use_bg2 = !$use_bg2;
562	485	}
563	486	}
564	487
565	488	if (!empty($context['ticket_blocks'][$context['current_block']]['page_index']))
566	489	echo '
567		- <tr class="titlebg">
	490	+ <tr class="bot_page">
568	491	<td colspan="', $block_width, '"><span class="floatright smalltext">', $txt['pages'], ': ', $context['ticket_blocks'][$context['current_block']]['page_index'], '</span></td>
569	492	</tr>';
570	493
571	494	echo '
572		- </table>
573		- </div>
574		- <br /><br />';
	495	+ </table>';
575	496	}
576	497
577	498	/**
578	499