SD-SimpleDesk

! Fixed some issues caused by #39
Parent b9de5aa
jdarwood007

jdarwood007 commited on 2015-12-24 10:28:12
Showing 6 changed files, with 53 additions and 31 deletions. 

Signed-off-by: jdarwood007 <unmonitored+github@sleepycode.com>
css/helpdesk.css
View file @ a178782
... ... 
@@ -98,9 +98,14 @@ span.shd_new_tickets
98 98 
 }
99 99
100 100 
 /* The page index color looks ugly with our theme. */
101 
-.shd_main_hd .cat_bar .current_page, .shd_pages .current_page
101 
+.shd_cat_bar .current_page, .shd_pages .current_page
102 102 
 {
103 103 
 	color: #fff;
104 
+	padding: 0;
105 
+}
106 
+.bot_page .current_page
107 
+{
108 
+	padding: 0;
104 109 
 }
105 110
106 111 
 /**********************************
... ... 
@@ -121,13 +126,18 @@ h3.ticketheader img
121 126 
 	float: left;
122 127 
 	width: 20%;
123 128 
 	margin-right: 20px;
124 
-	padding: 5px;
129 
+	padding: 0 5px 5px 5px;
125 130 
 }
126 
-.shd_ticketdetails {
131 
+.shd_ticketdetails
132 
+{
127 133 
 	overflow: auto;
128 134 
 	float: left;
129 135 
 	width: 100%;
130 136 
 }
137 
+.shd_ticketdetails .shd_smallicon
138 
+{
139 
+	padding-top: 7px;
140 
+}
131 141 
 .shd_customfields
132 142 
 {
133 143 
 	width: 66%;
... ... 
@@ -148,11 +157,16 @@ h3.ticketheader img
148 157 
 }
149 158
150 159 
 /* The ticket container */
160 
+form#postmodify .shd_ticket_roundframe
161 
+{
162 
+	padding: 12px 16px;
163 
+}
151 164 
 .shd_ticket
152 165 
 {
153 166 
 	min-height: 250px;
154 167 
 }
155 
-.shd_ticket_description {
168 
+.shd_ticket_description
169 
+{
156 170 
 	margin-left: 260px;
157 171 
 }
158 172
... ... 
@@ -165,6 +179,7 @@ h3.ticketheader img
165 179 
 .shd_ticket_leftcolumn
166 180 
 {
167 181 
 	width: 25%;
182 
+	padding-top: 5px;
168 183 
 }
169 184 
 /* The right column in the ticket display */
170 185 
 .shd_ticket_rightcolumn
... ... 
@@ -251,8 +266,6 @@ h3.ticketheader img
251 266 
 /* The big reply button */
252 267 
 .shd_replybutton
253 268 
 {
254 
-	margin-top: 10px;
255 
-	height: 15px;
256 269 
 	background: url(../images/simpledesk/respond.png) no-repeat left;
257 270 
 	background-position: 10px;
258 271 
 	padding: 10px;
... ... 
@@ -261,6 +274,8 @@ h3.ticketheader img
261 274 
 	font-weight: bold;
262 275 
 	font-size: 100%;
263 276 
 	margin-bottom: 10px;
277 
+	border: 1px solid #ddd;
278 
+	border-radius: 7px;
264 279 
 }
265 280 
 /* The big quote button */
266 281 
 .shd_quotebutton
... ... 
@@ -525,25 +540,31 @@ h3.ticketheader img
525 540 
 }
526 541
527 542 
 /* I'm not sure about the above, I'll rewrite them later */
528 
-.bot_page {
543 
+.bot_page
544 
+{
529 545 
 	border: 1px solid #DDD;
530 546 
 	border-top: none;
531 547 
 }
532 
-#ticket_log_header {
548 
+#ticket_log_header
549 
+{
533 550 
 	clear: both;
534 551 
 }
535 552
536 553 
 /* Urgency stuff */
537 
-.generic_icons.urgency_increase {
554 
+.generic_icons.urgency_increase
555 
+{
538 556 
 	background-position: -161px -5px;
539 557 
 }
540 
-.generic_icons.urgency_decrease {
558 
+.generic_icons.urgency_decrease
559 
+{
541 560 
 	background-position: -213px -5px;
542 561 
 }
543 562
544 563 
 /* We need some adjustments */
545 
-dl.stats dd span, dl.stats dt span {
564 
+dl.stats dd span, dl.stats dt span
565 
+{
546 566 
 	position: relative;
567 
+	padding: 0;
547 568 
 }
548 569
549 570 
 /* We need something like winfo in helpdesk */
sd_source/SimpleDesk-AjaxHandler.php
View file @ a178782
... ... 
@@ -272,8 +272,8 @@ function shd_ajax_urgency()
272 272 
 		);
273 273
274 274 
 		$array = array(
275 
-			'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['images_url'] . '/simpledesk/move_up.png" width="9px" alt="' . $txt['shd_urgency_increase'] . '" /></a>',
276 
-			'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['images_url'] . '/simpledesk/move_down.png" width="9px" alt="' . $txt['shd_urgency_decrease'] . '" /></a>',
275 
+			'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>',
276 
+			'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>',
277 277 
 		);
278 278
279 279 
 		foreach ($new_options as $button => $can)
sd_source/SimpleDesk-Post.php
View file @ a178782
... ... 
@@ -1442,7 +1442,7 @@ function shd_setup_replies($first_msg)
1442 1442 
 	}
1443 1443 
 }
1444 1444
1445 
-function shd_postbox($id, $message, $buttons, $width = '70%')
1445 
+function shd_postbox($id, $message, $buttons, $width = '90%')
1446 1446 
 {
1447 1447 
 	global $context, $txt, $modSettings;
1448 1448 
 	$editorOptions = array(
sd_template/SimpleDesk-Display.template.php
View file @ a178782
... ... 
@@ -75,12 +75,12 @@ function template_viewticket()
75 75 
 								<dt><span class="generic_icons calendar" alt="', $txt['shd_ticket_date'], '"></span> ', $txt['shd_ticket_date'], ':</dt>
76 76 
 										<dd>', $context['ticket']['poster_time'], '</dd>
77 77 
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_urgency'], ':</dt>
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>' : ''), '
78 
+								<dd id="item_urgency"><span id="urgency">', $context['ticket']['urgency']['label'], '</span>
79 
+									<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'] . '"><span class="generic_icons urgency_increase" title="' . $txt['shd_urgency_increase'] . '"></span></a>' : ''), '</span>
80 
+									<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'] . '"><span class="generic_icons urgency_decrease" title="' . $txt['shd_urgency_decrease'] . '"></span></a>' : ''), '</span>
81 81 
 										</dd>
82 82 
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/staff.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_assignedto'], ':</dt>
83 
-								<dd>', $context['ticket']['assigned']['link'], '<span id="assigned_button"></span></dd>
83 
+								<dd><span id="assigned_to">', $context['ticket']['assigned']['link'], '</span><span id="assigned_button"></span></dd>
84 84 
 								<dt class="full_width">
85 85 
 									<ul id="assigned_list" style="display:none;"></ul>
86 86 
 								</dt>
... ... 
@@ -92,7 +92,7 @@ function template_viewticket()
92 92 
 				if (!empty($context['display_private']))
93 93 
 					echo '
94 94 
 										<dt><img src="', $settings['default_images_url'], '/simpledesk/private.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_privacy'], ':</dt>
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>';
95 
+								<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>';
96 96
97 97 
 				if (!empty($context['ticket']['ip_address']))
98 98 
 					echo '
... ... 
@@ -273,7 +273,7 @@ function template_viewticket()
273 273 
 			{
274 274 
 				echo '
275 275 
 							<div class="smalltext shd_modified">
276 
-								&#171; <em>', $txt['last_edit'], ': ', $context['ticket']['modified']['time'], ' ', $txt['by'], ' ', $context['ticket']['modified']['link'], '</em> &#187;
276 
+								&#171; <em>', sprintf($txt['last_edit_by'], $context['ticket']['modified']['time'], $context['ticket']['modified']['link']), '</em> &#187;
277 277 
 							</div>';
278 278 
 			}
279 279
... ... 
@@ -998,14 +999,14 @@ function template_ticketactionlog()
998 999 
 	{
999 1000 
 		echo '
1000 1001 
 				<div class="cat_bar" id="ticket_log_header">
1001 
-					<h3 class="catbg">
1002 
+					<h3 class="titlebg">
1002 1003 
 						<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>
1003 1004 
 							<img src="', $settings['default_images_url'], '/simpledesk/log.png" class="icon" alt="*" />
1004 1005 
 							<a href="#" onclick="ActionLog.swap(); return false;">', $txt['shd_ticket_log'], '</a>
1005 1006 
 							<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>
1006 1007 
 						</h3>
1007 1008 
 					</div>
1008 
-				<table class="table_grid">
1009 
+				<table class="table_grid" id="ticket_log">
1009 1010 
 						<tr class="title_bar">
1010 1011 
 							<td width="15%">
1011 1012 
 								<img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="" />
... ... 
@@ -1053,7 +1054,7 @@ function template_ticketactionlog()
1053 1054 
 				</div>
1054 1055 
 				<script type="text/javascript"><!-- // --><![CDATA[
1055 1056 
 				var ActionLog = new ActionLog({
1056 
-					sImagesUrl: "' . $settings['images_url'] . '",
1057 
+					sImagesUrl: "', $settings['images_url'], '",
1057 1058 
 					sContainerId: "ticket_log",
1058 1059 
 					sImageId: "shd_ticket_log_expand",
1059 1060 
 					sImageCollapsed: "selected_open.png",
... ... 
@@ -1061,7 +1062,7 @@ function template_ticketactionlog()
1061 1062 
 					sHeaderId: "ticket_log_header",
1062 1063 
 				});
1063 1064 
 				ActionLog.swap();
1064 
-				// ]' . ']></script>';
1065 
+				// ]', ']></script>';
1065 1066 
 	}
1066 1067 
 }
1067 1068
sd_template/SimpleDesk-Post.template.php
View file @ a178782
... ... 
@@ -88,7 +88,7 @@ function template_ticket_info()
88 88 
 					<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="x" /> ', $context['ticket_form']['form_title'], '
89 89 
 				</h3>
90 90 
 			</div>
91 
-			<div class="roundframe">
91 
+			<div class="roundframe shd_ticket_roundframe">
92 92 
 				<div class="content shd_ticket">
93 93 
 					<div class="shd_ticket_side_column">';
94 94
... ... 
@@ -150,7 +150,7 @@ function template_ticket_custom_fields()
150 150 
 		return;
151 151
152 152 
 	echo '
153 
-				<div class="information shd_customfields" id="shd_customfields"', empty($context['ticket_form']['dept']) ? ' style="display:none;"' : '', '>';
153 
+				<div class="shd_customfields" id="shd_customfields"', empty($context['ticket_form']['dept']) ? ' style="display:none;"' : '', '>';
154 154
155 155 
 		// Loop through each custom field
156 156 
 		// See also template_ticket_subjectbox() for the department selector which affects these.
... ... 
@@ -626,7 +626,7 @@ function template_ticket_additional_options()
626 626 
 	global $context, $options, $txt, $modSettings, $settings;
627 627
628 628 
 	echo '
629 
-					<div id="postAdditionalOptionsHeader"', !empty($context['shd_display']) ? ' style="display:none;"' : '', '>
629 
+					<div id="postAdditionalOptionsHeader"', !empty($context['shd_display']) ? ' style="display:none;"' : '', ' class="shd_reply_attachments">
630 630 
 						<ul class="post_options">';
631 631
632 632 
 	foreach ($context['ticket_form']['additional_opts'] as $key => $details)
sd_template/SimpleDesk.template.php
View file @ a178782
... ... 
@@ -317,9 +317,9 @@ function template_ticket_block()
317 317 
 	// $context['current_block'] = the block to display now
318 318
319 319 
 	echo '
320 
-		<div class="cat_bar">
320 
+		<div class="cat_bar shd_cat_bar">
321 321 
 			<h3 id="shd_block_', $context['current_block'], '" class="catbg">
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>' : '', '
322 
+				', !empty($context['ticket_blocks'][$context['current_block']]['page_index']) ? '<span class="floatright smalltext">' . $context['ticket_blocks'][$context['current_block']]['page_index'] . '</span>' : '', '
323 323 
 				<img src="', $settings['default_images_url'], '/simpledesk/', $context['ticket_blocks'][$context['current_block']]['block_icon'], '" alt="*" />
324 324 
 				', (empty($context['block_link']) ? '' : '<a href="' . $context['block_link'] . '">'), $context['ticket_blocks'][$context['current_block']]['title'], '
325 325 
 				<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>'), '
... ... 
@@ -425,7 +425,7 @@ function template_ticket_block()
425 425 
 							<td class="smalltext">', $ticket['dept_link'], $ticket['link'];
426 426
427 427 
 						if ($ticket['is_unread'] && !empty($ticket['new_href']))
428 
-							echo ' <a href="', $ticket['new_href'], '"><img src="', $context['new_posts_image'], '" class="new_posts" alt="', $txt['new'], '" /></a>';
428 
+							echo ' <a href="', $ticket['new_href'], '"><span class="new_posts shd_new_tickets">', $txt['new'], '</span></a>';
429 429
430 430 
 						echo '</td>';
431 431 
 						break;
... ... 
@@ -488,7 +488,7 @@ function template_ticket_block()
488 488 
 	if (!empty($context['ticket_blocks'][$context['current_block']]['page_index']))
489 489 
 		echo '
490 490 
 					<tr class="bot_page">
491 
-						<td colspan="', $block_width, '"><span class="floatright smalltext">', $txt['pages'], ': ', $context['ticket_blocks'][$context['current_block']]['page_index'], '</span></td>
491 
+						<td colspan="', $block_width, '"><span class="floatright smalltext">', $context['ticket_blocks'][$context['current_block']]['page_index'], '</span></td>
492 492 
 					</tr>';
493 493
494 494 
 	echo '
495 495