! Reworked the item listing to be better CSS controlled, using a dt/dd pairing for item and value. dt CSS defaults to a bold grey colour, as PT does - but it's two lines of CSS to change now.
gruffen

gruffen commited on 2011-04-22 03:16:52
Showing 3 changed files, with 80 additions and 24 deletions.

... ...
@@ -116,6 +116,25 @@ div.grid_header img
116 116
 	cursor: pointer;
117 117
 }
118 118
 
119
+.information li dt
120
+{
121
+	color: gray;
122
+	font-weight: bold;
123
+	float: left;
124
+}
125
+
126
+.information li dd
127
+{
128
+	float: left;
129
+	margin: 0;
130
+	padding: 0 4px 0 7px;
131
+}
132
+
133
+dd#assigned_button
134
+{
135
+	padding: 1px 0;
136
+}
137
+
119 138
 /**********************************
120 139
 * Stuff used within the actual tickets 	*
121 140
 ***********************************/
... ...
@@ -382,14 +382,7 @@ function AjaxAssign(oOptions)
382 382
 	this.bCollapsed = true;
383 383
 
384 384
 	// Insert the expand/collapse button
385
-	var maincontainer = document.getElementById(this.opt.sId);
386
-	var listcontainer = document.getElementById(this.opt.sListId);
387
-	var newhtml = document.createElement('img');
388
-	newhtml.setAttribute('id', 'assign_' + this.opt.sSelf);
389
-	newhtml.setAttribute('class', 'shd_assign_button');
390
-	newhtml.setAttribute('src', this.opt.sImagesUrl + "/" + this.opt.sImageCollapsed);
391
-	newhtml.setAttribute('onclick', this.opt.sSelf + '.click()');
392
-	maincontainer.insertBefore(newhtml, listcontainer);
385
+	document.getElementById(this.opt.sId).innerHTML = '<img src="' + this.opt.sImagesUrl + "/" + this.opt.sImageCollapsed + '" id="assign_' + this.opt.sSelf + '" class="shd_assign_button" onclick="' + this.opt.sSelf + '.click();" />';
393 386
 }
394 387
 
395 388
 AjaxAssign.prototype.click = function ()
... ...
@@ -71,30 +71,72 @@ function template_viewticket()
71 71
 							<strong><img src="', $settings['default_images_url'], '/simpledesk/details.png" alt="" class="shd_smallicon shd_icon_minihead" /> ', $txt['shd_ticket_details'], '</strong>
72 72
 							<hr />
73 73
 							<ul>
74
-								<li id="item_id"><img src="', $settings['default_images_url'], '/simpledesk/id.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_id'], ': ', $context['ticket']['display_id'], '</li>
75
-								<li id="item_userstarted"><img src="', $settings['default_images_url'], '/simpledesk/user.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_user'], ': ', $context['ticket']['member']['link'], '</li>
76
-								<li id="item_whenstarted"><img src="', $settings['default_images_url'], '/simpledesk/time.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_date'], ': ', $context['ticket']['poster_time'], '</li>
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>
77
+										<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>
83
+										<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>
89
+										<dd>', $context['ticket']['poster_time'], '</dd>
90
+									</dl>
91
+								</li>
77 92
 								<li id="item_urgency">
78
-									<img src="', $settings['default_images_url'], '/simpledesk/urgency.png" alt="" class="shd_smallicon" />
79
-									', $txt['shd_ticket_urgency'], ': <span id="urgency">', $context['ticket']['urgency']['label'], '</span>
93
+									<dl>
94
+										<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>
80 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['images_url'] . '/sort_up.gif" width="9px" alt="' . $txt['shd_urgency_increase'] . '" /></a>' : ''), '</span>
81 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['images_url'] . '/sort_down.gif" width="9px" alt="' . $txt['shd_urgency_decrease'] . '" /></a>' : ''), '</span>
98
+										</dd>
99
+									</dl>
82 100
 								</li>
83 101
 								<li id="item_assigned">
84
-									<img src="', $settings['default_images_url'], '/simpledesk/staff.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_assignedto'], ': <span id="assigned_to">', $context['ticket']['assigned']['link'], '</span>
102
+									<dl>
103
+										<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>
85 107
 									<ul id="assigned_list" style="display:none;">
86 108
 									</ul>
87 109
 								</li>
88
-								<li id="item_status"><img src="', $settings['default_images_url'], '/simpledesk/status.png" alt="" class="shd_smallicon"/> ', $txt['shd_ticket_status'], ': ', $context['ticket']['status']['label'], '</li>
89
-								<li id="item_replies"><img src="', $settings['default_images_url'], '/simpledesk/replies.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_num_replies'], ': <a href="#replies">', (empty($context['ticket']['display_recycle']) ? $context['ticket']['num_replies'] : (int) $context['ticket']['num_replies'] + (int) $context['ticket']['deleted_replies']), '</a></li>';
110
+								<li id="item_status">
111
+									<dl>
112
+										<dt><img src="', $settings['default_images_url'], '/simpledesk/status.png" alt="" class="shd_smallicon"/> ', $txt['shd_ticket_status'], ':</dt>
113
+										<dd>', $context['ticket']['status']['label'], '</dd>
114
+									</dl>
115
+								</li>
116
+								<li id="item_replies">
117
+									<dl>
118
+										<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 122
 
91 123
 				if (!empty($context['display_private']))
92 124
 					echo '
93
-								<li><img src="', $settings['default_images_url'], '/simpledesk/private.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_privacy'], ': <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>)' : ''), '</li>';
125
+								<li>
126
+									<dl>
127
+										<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>';
94 131
 
95 132
 				if (!empty($context['ticket']['ip_address']))
96 133
 					echo '
97
-								<li><img src="', $settings['default_images_url'], '/simpledesk/ip.png" alt="" class="shd_smallicon" /> ', $txt['shd_ticket_ip'], ': ', $context['ticket']['ip_address'], '</li>';
134
+								<li>
135
+									<dl>
136
+										<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>';
98 140
 
99 141
 				echo '
100 142
 							</ul>';
... ...
@@ -127,9 +169,9 @@ function template_viewticket()
127 169
 				{
128 170
 					echo '
129 171
 						<div class="information shd_additional_details">
130
-							<ul>
131 172
 							<strong><img src="', $settings['default_images_url'], '/simpledesk/additional_details.png" alt="" class="shd_smallicon shd_icon_minihead" /> ',$txt['shd_ticket_additional_details'],'</strong>
132
-							<hr />';
173
+							<hr />
174
+							<ul>';
133 175
 
134 176
 					foreach ($context['ticket']['custom_fields']['details'] AS $field)
135 177
 					{
... ...
@@ -137,8 +179,9 @@ function template_viewticket()
137 179
 						{
138 180
 							echo '
139 181
 								<li>
140
-									', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="" class="shd_smallicon" />' : '','
141
-										', $field['name'],': ';
182
+									<dl>
183
+										<dt>', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="" class="shd_smallicon" />' : '', ' ', $field['name'],':</dt>
184
+										<dd>';
142 185
 
143 186
 							if (empty($field['value']) && $field['display_empty'])
144 187
 								echo $txt['shd_ticket_empty_field'];
... ...
@@ -152,7 +195,8 @@ function template_viewticket()
152 195
 									echo $field['value'];
153 196
 							}
154 197
 
155
-							echo '
198
+							echo '</dd>
199
+									</dl>
156 200
 								</li>';
157 201
 						}
158 202
 					}
... ...
@@ -262,7 +306,7 @@ function template_viewticket()
262 306
 		sSelf: "oAjaxAssign",
263 307
 		sScriptUrl: smf_scripturl,
264 308
 		iTicketId: ' . $context['ticket_id'] . ',
265
-		sId: "item_assigned",
309
+		sId: "assigned_button",
266 310
 		sListId: "assigned_list",
267 311
 		sAssignedSpan: "assigned_to",
268 312
 		sImagesUrl: "' . $settings['default_images_url'] . '/simpledesk",
269 313