Cleanup Templates (1d762ea) - SD-SimpleDesk · SleePy Public Git Projects

Cleanup Templates

jdarwood007 commited on 2018-08-11 14:39:49
Showing 26 changed files, with 1198 additions and 1053 deletions.

Optimized templates and Javascript handling
Convert most hard coded Javascript into prototypes and make use of JQuery
Removed Collapsing quick reply as its not always on in SMF and no settings exists
Removed hard coded styles as appropriate.

css/helpdesk.css 375eaac..8e7ebff
css/helpdesk_admin.css f6a15ef..eb6db33
scripts/helpdesk.js 104acc8..ebb2021
scripts/helpdesk_admin.js e37370d..d7a8614
sd_source/SimpleDesk-Admin.php ba2e5ac..57a3887
sd_source/SimpleDesk-AjaxHandler.php 64e5bbb..50faec7
sd_source/SimpleDesk-Display.php e7154fd..bfa0f74
sd_source/SimpleDesk-Profile.php 260b70f..9e87711
sd_source/SimpleDesk-Search.php 0682b0f..4294867
sd_source/SimpleDesk-TicketTopicMove.php 8157d48..de6da89
sd_source/SimpleDesk.php 72ffa19..21871ba
sd_template/SimpleDesk-Admin.template.php 00e0c3f..cb6fe88
sd_template/SimpleDesk-AdminCannedReplies.template.php c93d2e2..89f6288
sd_template/SimpleDesk-AdminCustomField.template.php 8e7d31e..edcf065
sd_template/SimpleDesk-AdminDepartments.template.php 2738965..2367b72
sd_template/SimpleDesk-AdminMaint.template.php 0e03512..512f8f0
sd_template/SimpleDesk-AdminPermissions.template.php 77293ff..ef88493
sd_template/SimpleDesk-AdminPlugins.template.php fbd60f2..e455efb
sd_template/SimpleDesk-Assign.template.php c2c9066..35bea51
sd_template/SimpleDesk-Display.template.php 9e4e0cf..044723b
sd_template/SimpleDesk-MoveDept.template.php ff9a9c1..a9f8413
sd_template/SimpleDesk-Post.template.php 0c21d59..d60dae6
sd_template/SimpleDesk-Profile.template.php 3ceb51f..d31e436
sd_template/SimpleDesk-Search.template.php 16e13e7..de620ec
sd_template/SimpleDesk-TicketTopicMove.template.php e9a450d..8e715cb
sd_template/SimpleDesk-Unread.template.php 1366094..1244428

css/helpdesk.css

View file @ 1d762ea

@@ -7,15 +7,6 @@
 }
 
 /* SimpleDesk icons */
-.shd_smallicon {
-	width: 16px;
-	height: 20px;
-	margin-right: 4px;
-}
-.shd_icon_minihead {
-	position: relative;
-	top: 3px;
-}
 .shd_icon {
 	position: relative;
 	top: 3px;
@@ -204,9 +195,6 @@ form#postmodify .shd_ticket_roundframe {
 	position: relative;
 	left: 4px;
 }
-#shd_custom_fields_swap {
-	margin-top: 8px;
-}
 .shd_customfields input[type="text"]
 {
 	width: 85%;
@@ -253,8 +241,6 @@ form#postmodify .shd_ticket_roundframe {
 }
 /* Go advanced! */
 .shd_advancedbutton {
-	margin-top: 10px;
-	height: 15px;
 	background: url(../images/simpledesk/advanced.png) no-repeat left;
 	background-position: 10px;
 	padding: 10px;
@@ -263,6 +249,8 @@ form#postmodify .shd_ticket_roundframe {
 	font-weight: bold;
 	font-size: 100%;
 	margin-right: 10px;
+	border-top: 1px solid #ddd;
+	border-radius: 7px;
 }
 
 /* Edit settings*/
@@ -337,6 +325,10 @@ form#postmodify .shd_ticket_roundframe {
 	margin-right: 5%;
 	float: left;
 }
+dl.settings dt.shd_cust_fields_largetext, .shd_cust_fields_largetext textarea {
+	width: 100%;
+}
+
 
 /**********************************
 * Attachment stuff				  *
@@ -412,6 +404,9 @@ form#postmodify .shd_ticket_roundframe {
 #canned_replies {
 	margin-top: 1em;
 }
+#canned_replies #canned_title {
+	font-weight:bold;
+}
 
 /**********************************
 * General actions				 *

css/helpdesk_admin.css

View file @ 1d762ea

@@ -42,7 +42,7 @@
 
 }
 .shd_former_contributor {
-	color: #696969;
+	color: #6969E7;
 }
 .shd_bbc_list {
 	width: 33%;

scripts/helpdesk.js

View file @ 1d762ea

@@ -8,7 +8,6 @@ function shd_getJSONDocument(sUrl, funcCallback, sMethod)
 	if (typeof(sMethod) == 'undefined')
 		sMethod = 'GET';
 
-	var oCaller = this;
 	var oMyDoc = $.ajax({
 		method: sMethod,
 		url: sUrl,
@@ -19,7 +18,7 @@ function shd_getJSONDocument(sUrl, funcCallback, sMethod)
 			{
 				ajax_indicator(false);
 
-				funcCallback.call(oCaller, responseJSON);
+				funcCallback.call(this, responseJSON);
 			}
 		},
 	});
@@ -35,23 +34,19 @@ function shd_sendJSONDocument(sUrl, funcCallback)
 /* The privacy toggle in AJAX */
 function shd_privacyControl(oOpts)
 {
-	shd_privacyControl.prototype.opts = oOpts; // attaches to the link, but it doesn't exist until after DOM is loaded!
-	if (window.addEventListener)
-		window.addEventListener('load', shd_privacyControl.prototype.init, false);
-	else if (window.attachEvent)
-		window.attachEvent('onload', shd_privacyControl.prototype.init);
+	this.opts = oOpts; // attaches to the link, but it doesn't exist until after DOM is loaded!
+	$(document).ready(this.init.bind(this));
 }
 
 shd_privacyControl.prototype.init = function ()
 {
-	var oDiv = document.getElementById(shd_privacyControl.prototype.opts.sSrcA);
-	if (oDiv !== null)
-		oDiv.onclick = shd_privacyControl.prototype.action;
+	$('#' + this.opts.sSrcA).on('click', this.action.bind(this));
 }
 
-shd_privacyControl.prototype.action = function ()
+shd_privacyControl.prototype.action = function (e)
 {
-	shd_getJSONDocument(shd_privacyControl.prototype.opts.sUrl + ';' + shd_privacyControl.prototype.opts.sSession, shd_privacyControl.prototype.callback);
+	e.preventDefault();
+	shd_getJSONDocument(this.opts.sUrl + ';' + this.opts.sSession, this.callback.bind(this));
 	return false;
 }
 
@@ -60,13 +55,10 @@ shd_privacyControl.prototype.callback = function (oRecvd)
 	if (oRecvd && oRecvd.success === false)
 		alert(oRecvd.error);
 	else if (oRecvd && oRecvd.message)
-	{
-		var oSpan = document.getElementById(shd_privacyControl.prototype.opts.sDestSpan);
-		oSpan.firstChild.nodeValue = oRecvd.message;
-	}
+		$('#' + this.opts.sDestSpan).html(oRecvd.message);
 	else
 		if (confirm(shd_ajax_problem))
-			window.location = smf_scripturl + '?action=helpdesk;sa=privacychange;ticket=' + shd_privacyControl.prototype.opts.ticket + ';' + shd_privacyControl.prototype.opts.sSession;
+			window.location = smf_scripturl + '?action=helpdesk;sa=privacychange;ticket=' + this.opts.ticket + ';' + this.opts.sSession;
 
 	return false;
 }
@@ -74,42 +66,41 @@ shd_privacyControl.prototype.callback = function (oRecvd)
 /* The urgency doodad */
 function shd_urgencyControl(oOpts)
 {
-	shd_urgencyControl.prototype.opts = oOpts; // attaches to the link, but it doesn't exist until after DOM is loaded!
-	if (window.addEventListener)
-		window.addEventListener('load', shd_urgencyControl.prototype.init, false);
-	else if (window.attachEvent)
-		window.attachEvent('onload', shd_urgencyControl.prototype.init);
+	this.opts = oOpts; // attaches to the link, but it doesn't exist until after DOM is loaded!
+	$(document).ready(this.init.bind(this));
 }
 
 shd_urgencyControl.prototype.init = function ()
 {
-	for (var i in shd_urgencyControl.prototype.opts.aButtonOps)
+	for (var i in this.opts.aButtonOps)
 	{
-		if (!shd_urgencyControl.prototype.opts.aButtonOps.hasOwnProperty(i))
+		if (!this.opts.aButtonOps.hasOwnProperty(i))
 			continue;
 
-		var oDiv = document.getElementById('urglink_' + shd_urgencyControl.prototype.opts.aButtonOps[i]);
+		var oDiv = $('#urglink_' + this.opts.aButtonOps[i]);
 		if (oDiv !== null && i == 'up')
-			oDiv.onclick = shd_urgencyControl.prototype.actionUp;
+			oDiv.on('click', this.actionUp.bind(this));
 		else if (oDiv !== null && i == 'down')
-			oDiv.onclick = shd_urgencyControl.prototype.actionDown; // I *did* try to make this a single parameterised function but it always fired when it wasn't supposed to
+			oDiv.on('click', this.actionDown.bind(this)); // I *did* try to make this a single parameterised function but it always fired when it wasn't supposed to
 	}
 }
 
-shd_urgencyControl.prototype.actionUp = function ()
+shd_urgencyControl.prototype.actionUp = function (e)
 {
-	return shd_urgencyControl.prototype.action('up');
+	e.preventDefault();
+	return this.action('up');
 }
 
-shd_urgencyControl.prototype.actionDown = function ()
+shd_urgencyControl.prototype.actionDown = function (e)
 {
-	return shd_urgencyControl.prototype.action('down');
+	e.preventDefault();
+	return this.action('down');
 }
 
 shd_urgencyControl.prototype.action = function (direction)
 {
-	shd_urgencyControl.prototype.opts.direction = direction;
-	shd_getJSONDocument(shd_urgencyControl.prototype.opts.sUrl + shd_urgencyControl.prototype.opts.aButtonOps[direction] + ';' + shd_urgencyControl.prototype.opts.sSession, shd_urgencyControl.prototype.callback);
+	this.direction = direction;
+	shd_getJSONDocument(this.opts.sUrl + this.opts.aButtonOps[direction] + ';' + this.opts.sSession, this.callback.bind(this));
 	return false;
 }
 
@@ -119,25 +110,24 @@ shd_urgencyControl.prototype.callback = function (oRecvd)
 		alert(oRecvd.error);
 	else if (oRecvd && oRecvd.message)
 	{
-		setInnerHTML(document.getElementById(shd_urgencyControl.prototype.opts.sDestSpan), oRecvd.message);
+		$('#' + this.opts.sDestSpan).html(oRecvd.message);
 
-		var btn_set = [ "increase", "decrease" ];
+		var btn_set = ['increase', 'decrease'];
 		for (var i in btn_set)
 		{
 			if (!btn_set.hasOwnProperty(i))
 				continue;
 
 			var oBtn = oRecvd[btn_set[i]];
-			var oSpan = document.getElementById('urgency_' + btn_set[i]);
-			setInnerHTML(oSpan, (oBtn ? oBtn : ''));
+			$('#urgency_' + btn_set[i]).html(oBtn ? oBtn : '');
 		}
 
 		// Attach JS events to new links
-		shd_urgencyControl.prototype.init();
+		this.init();
 	}
 	else
 		if (confirm(shd_ajax_problem))
-			window.location = smf_scripturl + '?action=helpdesk;sa=urgencychange;ticket=' + shd_urgencyControl.prototype.opts.ticket + ';change=' + shd_urgencyControl.prototype.opts.aButtonOps[shd_urgencyControl.prototype.opts.direction] + ';' + shd_urgencyControl.prototype.opts.sSession;
+			window.location = smf_scripturl + '?action=helpdesk;sa=urgencychange;ticket=' + this.opts.ticket + ';change=' + this.opts.aButtonOps[this.direction] + ';' + this.opts.sSession;
 
 	return false;
 }
@@ -275,26 +264,19 @@ shd_attach_select.prototype.checkActive = function()
 function QuickReply(oOptions)
 {
 	this.opt = oOptions;
-	this.bCollapsed = this.opt.bDefaultCollapsed;
+	$(this.opt.sRepliesSelector + ', ' + this.opt.sFirstPostSelector).on('click', this.quote.bind(this));
 }
 
 // When a user presses quote, put it in the quick reply box (if expanded).
-QuickReply.prototype.quote = function (iMessageId, sSessionId, sSessionVar)
+QuickReply.prototype.quote = function (e)
 {
-	if (this.bCollapsed)
-	{
-		window.location.href = smf_prepareScriptUrl(this.opt.sScriptUrl) + 'action=helpdesk;sa=reply;quote=' + iMessageId + ';ticket=' + this.opt.iTicketId + '.' + this.opt.iStart + ';' + sSessionVar + '=' + sSessionId;
-		return false;
-	}
+	e.preventDefault();
+	iMessageId = e.currentTarget.dataset.id;
 
-	shd_getJSONDocument(smf_prepareScriptUrl(this.opt.sScriptUrl) + 'action=helpdesk;sa=ajax;op=quote;quote=' + iMessageId + ';' + sSessionVar + '=' + sSessionId + ';json' + ';mode=' + (oEditorHandle_shd_message.bRichTextEnabled ? 1 : 0), this.onQuoteReceived);
+	shd_getJSONDocument(smf_prepareScriptUrl(this.opt.sScriptUrl) + 'action=helpdesk;sa=ajax;op=quote;quote=' + iMessageId + ';' + this.opt.sSession + ';json' + ';mode=' + (oEditorHandle_shd_message.bRichTextEnabled ? 1 : 0), this.onQuoteReceived.bind(this));
 
 	// Move the view to the quick reply box.
-	if (navigator.appName == 'Microsoft Internet Explorer')
-		window.location.hash = this.opt.sJumpAnchor;
-	else
-		window.location.hash = '#' + this.opt.sJumpAnchor;
-
+	window.location.hash = navigator.appName == 'Microsoft Internet Explorer' ? this.opt.sJumpAnchor : '#' + this.opt.sJumpAnchor;
 	return false;
 }
 
@@ -305,30 +287,21 @@ QuickReply.prototype.onQuoteReceived = function (oRecvd)
 		oEditorHandle_shd_message.insertText(oRecvd.message, false, true);
 }
 
-// The function handling the swapping of the quick reply.
-QuickReply.prototype.swap = function ()
-{
-	document.getElementById(this.opt.sImageId).src = this.opt.sImagesUrl + "/" + (this.bCollapsed ? this.opt.sImageCollapsed : this.opt.sImageExpanded);
-	document.getElementById(this.opt.sContainerId).style.display = this.bCollapsed ? '' : 'none';
-	document.getElementById(this.opt.sFooterId).style.display = this.bCollapsed ? '' : 'none';
-	document.getElementById(this.opt.sHeaderId).setAttribute('class', (this.bCollapsed ? 'title_bar grid_header' : 'title_bar'));
-
-	this.bCollapsed = !this.bCollapsed;
-}
 
 function CannedReply(oOptions)
 {
 	this.opt = oOptions;
-	document.getElementById("canned_replies").style.display = "";
+	$('#' + this.opt.sCannedRepliesContainerId).show();
+	$('#' + this.opt.sCannedRepliesContainerId + ' input.button').on('click', this.getReply.bind(this));
 }
 
-CannedReply.prototype.getReply = function ()
+CannedReply.prototype.getReply = function (e)
 {
-	var iReplyId = document.getElementById('canned_replies_select').value;
+	var iReplyId = $('#' + this.opt.sSelectContainerId).val();
 	if (!iReplyId || parseInt(iReplyId, 10) < 1)
 		return false;
 
-	shd_getJSONDocument(smf_prepareScriptUrl(this.opt.sScriptUrl) + 'action=helpdesk;sa=ajax;op=canned;ticket=' + this.opt.iTicketId + ';reply=' + iReplyId + ';' + this.opt.sSessionVar + '=' + this.opt.sSessionId + ';json' + ';mode=' + (oEditorHandle_shd_message.bRichTextEnabled ? 1 : 0), this.onReplyReceived);
+	shd_getJSONDocument(smf_prepareScriptUrl(this.opt.sScriptUrl) + 'action=helpdesk;sa=ajax;op=canned;ticket=' + this.opt.iTicketId + ';reply=' + iReplyId + ';' + this.opt.sSessionVar + '=' + this.opt.sSessionId + ';json' + ';mode=' + (oEditorHandle_shd_message.bRichTextEnabled ? 1 : 0), this.onReplyReceived.bind(this));
 
 	return false;
 }
@@ -347,51 +320,17 @@ function shd_quickTicketJump(id_ticket)
 	return false;
 }
 
-/* The action log in tickets - Not much. */
-
-function ActionLog(oOptions)
-{
-	this.opt = oOptions;
-	this.bCollapsed = false;
-	document.getElementById(this.opt.sImageId).style.display = '';
-	return false;
-}
-
-// The function handling the swapping of the ticket log.
-ActionLog.prototype.swap = function ()
-{
-	document.getElementById(this.opt.sImageId).src = this.opt.sImagesUrl + "/" + (this.bCollapsed ? this.opt.sImageCollapsed : this.opt.sImageExpanded);
-	document.getElementById(this.opt.sContainerId).style.display = this.bCollapsed ? '' : 'none';
-	document.getElementById(this.opt.sHeaderId).setAttribute('class', (this.bCollapsed ? 'title_bar grid_header' : 'title_bar'));
-
-	this.bCollapsed = !this.bCollapsed;
-}
-
-function CustomFields(oOptions)
-{
-	this.opt = oOptions;
-	this.bCollapsed = false;
-}
-
-// Expand and collapse the additional information block
-CustomFields.prototype.infoswap = function ()
-{
-	document.getElementById(this.opt.sImageId).src = this.opt.sImagesUrl + "/" + (this.bCollapsed ? this.opt.sImageCollapsed : this.opt.sImageExpanded);
-	document.getElementById(this.opt.sContainerId).style.display = this.bCollapsed ? '' : 'none';
-	document.getElementById(this.opt.sFooterId).style.display = this.bCollapsed ? '' : 'none';
-	document.getElementById(this.opt.sHeaderId).setAttribute('class', (this.bCollapsed ? 'title_bar grid_header' : 'title_bar'));
-
-	this.bCollapsed = !this.bCollapsed;
-}
-
 /* AJAX assignment */
 function AjaxAssign(oOptions)
 {
 	this.opt = oOptions;
 	this.bCollapsed = true;
+	this.opt.sUrlExpand = smf_prepareScriptUrl(smf_scripturl) + 'action=helpdesk;sa=ajax;op=assign;ticket=' + this.opt.iTicketId;
+	this.opt.sUrlAssign = smf_prepareScriptUrl(smf_scripturl) + 'action=helpdesk;sa=ajax;op=assign2;ticket=' + this.opt.iTicketId;
 
 	// Insert the expand/collapse button
-	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();">';
+	$('#' + this.opt.sId).html('<img src="' + this.opt.sImageCollapsed + '" id="assign_' + this.opt.sSelf + '" class="shd_assign_button">');
+	$('.shd_ticketdetails').on('click', '#assign_' + this.opt.sSelf, this.click.bind(this));
 }
 
 AjaxAssign.prototype.click = function ()
@@ -405,11 +344,10 @@ AjaxAssign.prototype.click = function ()
 AjaxAssign.prototype.expand = function ()
 {
 	this.bCollapsed = false;
-	var img = document.getElementById('assign_' + this.opt.sSelf);
-	img.setAttribute('src', this.opt.sImagesUrl + "/" + this.opt.sImageExpanded);
+	$('#assign_' + this.opt.sSelf).attr('src', this.opt.sImageExpanded);
 
 	// Fetch the list of items
-	shd_getJSONDocument.call(this, smf_prepareScriptUrl(this.opt.sScriptUrl) + 'action=helpdesk;sa=ajax;op=assign;ticket=' + this.opt.iTicketId + ';' + sSessV + '=' + sSessI, this.expand_callback);
+	shd_getJSONDocument(this.opt.sUrlExpand + ';' + this.opt.sSession, this.expand_callback.bind(this));
 }
 
 AjaxAssign.prototype.expand_callback = function (oRecvd)
@@ -418,9 +356,7 @@ AjaxAssign.prototype.expand_callback = function (oRecvd)
 		alert(oRecvd.error);
 	else if (oRecvd && oRecvd.members)
 	{
-		var assign_list = document.getElementById(this.opt.sListId);
-		assign_list.innerHTML = '';
-		assign_list.setAttribute('style', 'display:block');
+		$('#' + this.opt.sListId).show();
 
 		var newhtml = '';
 		var cur = 0;
@@ -430,23 +366,20 @@ AjaxAssign.prototype.expand_callback = function (oRecvd)
 				continue;
 
 			cur = oRecvd.members[i];
-			newhtml += '<li class="shd_assignees" onclick="' + this.opt.sSelf + '.assign(' + cur.uid + ');">';
-
-			if (cur.admin)
-				newhtml += '<img src="' + smf_default_theme_url + '/images/simpledesk/' + (cur.admin == 'yes' ? 'admin' : 'staff') + '.png" alt="" class="shd_smallicon"> ';
-
-			newhtml += cur.name + '</li>';
+			newhtml += '<li class="shd_assignees" data-uid="' + cur.uid + '"><img src="' + (cur.admin == 'yes' ? this.opt.sImageAdmin : this.opt.sImageStaff) + '" alt="" class="shd_smallicon">' + cur.name + '</li>';
 		}
 
-		assign_list.innerHTML = newhtml;
+		$('#' + this.opt.sListId).html(newhtml);
+		$('#' + this.opt.sListId).on('click', 'li.shd_assignees', this.assign.bind(this));
 	}
 }
 
-AjaxAssign.prototype.assign = function (uid)
+AjaxAssign.prototype.assign = function (e)
 {
 	// Click handler for the assignment list, to issue the assign
 	ajax_indicator(true);
-	shd_getJSONDocument.call(this, smf_prepareScriptUrl(this.opt.sScriptUrl) + 'action=helpdesk;sa=ajax;op=assign2;ticket=' + this.opt.iTicketId + ';to_user=' + uid + ';' + sSessV + '=' + sSessI, this.assign_callback);
+
+	shd_getJSONDocument(this.opt.sUrlAssign + ';to_user=' + e.currentTarget.dataset.uid + ';'+ this.opt.sSession, this.assign_callback.bind(this));
 }
 
 AjaxAssign.prototype.assign_callback = function(oRecvd)
@@ -457,20 +390,14 @@ AjaxAssign.prototype.assign_callback = function(oRecvd)
 	if (oRecvd && oRecvd.success === false)
 		alert(oRecvd.error);
 	else if (oRecvd && oRecvd.assigned)
-	{
 		document.getElementById(this.opt.sAssignedSpan).innerHTML = oRecvd.assigned;
 }
-}
 
 AjaxAssign.prototype.collapse = function ()
 {
 	this.bCollapsed = true;
-	var assign_list = document.getElementById(this.opt.sListId);
-	assign_list.innerHTML = '';
-	assign_list.setAttribute('style', 'display:none');
-
-	var img = document.getElementById('assign_' + this.opt.sSelf);
-	img.setAttribute('src', this.opt.sImagesUrl + "/" + this.opt.sImageCollapsed);
+	$('#' + this.opt.sListId).hide().html();
+	$('#assign_' + this.opt.sSelf).attr('src', this.opt.sImageCollapsed);
 }
 
 /* Ajax Notifications List */
@@ -484,17 +411,13 @@ function shd_notifications(iTicketId, oOptions)
 
 shd_notifications.prototype.init = function ()
 {
-	var oLink = document.getElementById(this.opt.sLinkId);
-
-	oLink.instanceRef = this;
-	oLink.onclick = function (oEvent) {return this.instanceRef.receiveNotifications(oEvent);};
-
-	document.getElementById(this.opt.sContainerId).style.display = "";
+	$('#' + this.opt.sLinkId).on('click', this.receiveNotifications.bind(this));
+	$('#' + this.opt.sContainerId).show();
 }
 
 shd_notifications.prototype.receiveNotifications = function ()
 {
-	shd_getJSONDocument.call(this, smf_prepareScriptUrl(smf_scripturl) + "action=helpdesk;sa=ajax;op=notify;ticket=" + this.ticketId + ";" + this.opt.sSessionVar + '=' + this.opt.sSessionId + (this.opt.sPinglist ? ";" + this.opt.sPinglist : ''), this.onReceiveNotifications);
+	shd_getJSONDocument(smf_prepareScriptUrl(smf_scripturl) + "action=helpdesk;sa=ajax;op=notify;ticket=" + this.ticketId + ";" + this.opt.sSessionVar + '=' + this.opt.sSessionId + (this.opt.sPinglist ? ";" + this.opt.sPinglist : ''), this.onReceiveNotifications.bind(this));
 	return false;
 }
 
@@ -585,5 +507,64 @@ shd_notifications.prototype.onReceiveNotifications = function (oRecvd)
 		newhtml += template.replace('%title%', oRecvd.optional_butoff_txt).replace('%subtemplate%', temphtml);
 	}
 
-	document.getElementById("shd_notifications_div").innerHTML = newhtml;
+	$('#' + this.opt.sContainerId).html(newhtml);
+}
+
+/* Go Advanced Handling */
+function goAdvanced(oOptions)
+{
+	this.opt = oOptions;
+	$('#' + this.opt.sAdvancedContainerId).on('click', this.click.bind(this));
+
+	$(document).ready(this.init.bind(this));
+}
+
+goAdvanced.prototype.init = function(e)
+{
+	$('#' + this.opt.sBbcContainerId +
+		', .' + this.opt.sBbcContainerEditorClass +
+		', #' + this.opt.sSmileyContainerId +
+		', .' + this.opt.sSmileyContainerEditorClass +
+		', .' + this.opt.sAttachContainerId +
+		', #' + this.opt.sAdditionalOptionsContainerId
+		).hide();
+}
+
+goAdvanced.prototype.click = function(e)
+{
+	e.preventDefault();
+
+	$('#' + this.opt.sBbcContainerId + ', .' + this.opt.sBbcContainerEditorClass).css('display', this.opt.bAllowBBC ? '' : 'none');
+	$('#' + this.opt.sSmileyContainerId + ', .' + this.opt.sSmileyContainerEditorClass).css('display', this.opt.bAllowSmileys ? '' : 'none');
+	$('#' + this.opt.sAttachContainerId).css('display', this.opt.bAllowAttach ? '' : 'none');
+	$('#' + this.opt.sAdditionalOptionsContainerId).show();
+	$('#' + this.opt.sAdvancedContainerId).hide();
+}
+
+/* Department Filters */
+function shd_dept_filter(oOptions)
+{
+	this.opt = oOptions;
+	$('#' + this.opt.sSelectContainerId).on('change', this.startFilter.bind(this));
+}
+
+shd_dept_filter.prototype.startFilter = function ()
+{
+	this.displayed = false;
+	$(this.opt.oFields).each(this.filterDept.bind(this));
+}
+
+shd_dept_filter.prototype.filterDept = function (index, value)
+{
+	this.currentDept = $('#' + this.opt.sSelectContainerId).val();
+
+	if (in_array(this.currentDept, this.opt.oFields[index]))
+	{
+		this.displayed = true;
+		$('#field_' + index + '_container').show();
+	}
+	else
+		$('#field_' + index + '_container').hide();
+
+	$('#' + this.opt.sCustomFieldsContainerId + ', #' + this.opt.sCustomFieldsTitleContainerId).toggle(this.displayed)
 }

scripts/helpdesk_admin.js

View file @ 1d762ea

@@ -1,17 +1,24 @@
 // Handle the JavaScript surrounding the admin center.
+$(document).ready(function(){
+	$('.shd_help').on('click', function(e) {
+		e.preventDefault();
+		return reqOverlayDiv(this.href);
+	});
+
+	/* If we have a submit with a save class, default the submitOnce check */
+	$('input[type="submit"].save').parent('form').on('submit', function(){
+		submitonce(this.currentTarget);
+	});
+	$('input[type="submit"].save').on('click', function(e){
+		submitThisOnce(this.currentTarget);
+	});
+});
+
 function sd_AdminIndex(oOptions)
 {
 	this.opt = oOptions;
-	this.init();
-}
 
-sd_AdminIndex.prototype.init = function ()
-{
-	window.adminIndexInstanceRef = this;
-	var fHandlePageLoaded = function () {
-		window.adminIndexInstanceRef.loadAdminIndex();
-	}
-	addLoadEvent(fHandlePageLoaded);
+	$(document).ready(this.loadAdminIndex.bind(this));
 }
 
 sd_AdminIndex.prototype.loadAdminIndex = function ()
@@ -27,19 +34,21 @@ sd_AdminIndex.prototype.loadAdminIndex = function ()
 	// Load the text box that sais there's a new version available.
 	if (this.opt.bLoadUpdateNotification)
 		this.checkUpdateAvailable();
-}
 
+	// Totoal Tickets link.
+	$('#' + this.opt.sTotalTicketsContainerId + ' a').on('click', this.TickekTotals.bind(this));
+}
 
 sd_AdminIndex.prototype.setAnnouncements = function ()
 {
-	if (!('sdAnnouncements' in window) || !('length' in window.sdAnnouncements))
+	if (!$('#sdAnnouncements').length)
 		return;
 
 	var sMessages = '';
 	for (var i = 0; i < window.sdAnnouncements.length; i++)
 		sMessages += this.opt.sAnnouncementMessageTemplate.replace('%href%', window.sdAnnouncements[i].href).replace('%subject%', window.sdAnnouncements[i].subject).replace('%time%', window.sdAnnouncements[i].time).replace('%message%', window.sdAnnouncements[i].message).replace('%author%', window.sdAnnouncements[i].author).replace('%readmore%', window.sdAnnouncements[i].href);
 
-	setInnerHTML(document.getElementById(this.opt.sAnnouncementContainerId), this.opt.sAnnouncementTemplate.replace('%content%', sMessages));
+	$('#' + this.opt.sAnnouncementContainerId).html(this.opt.sAnnouncementTemplate.replace('%content%', sMessages));
 }
 
 sd_AdminIndex.prototype.showCurrentVersion = function ()
@@ -47,18 +56,17 @@ sd_AdminIndex.prototype.showCurrentVersion = function ()
 	if (!('sdVersion' in window))
 		return;
 
-	var oSdVersionContainer = document.getElementById(this.opt.sSdVersionContainerId);
-	var oYourVersionContainer = document.getElementById(this.opt.sYourVersionContainerId);
+	var oSdVersionContainer = $('#' + this.opt.sSdVersionContainerId);
+	var oYourVersionContainer = $('#' + this.opt.sYourVersionContainerId);
 
 	// Handle a developer version cleaner.
-	if (this.opt.bDeveloperMode && 'sdDevVersion' in window)
-		setInnerHTML(oSdVersionContainer, window.sdDevVersion);
-	else
-		setInnerHTML(oSdVersionContainer, window.sdVersion);
+	oSdVersionContainer.html((this.opt.bDeveloperMode && 'sdDevVersion' in window) ? window.sdDevVersion : window.sdVersion)
 
-	var sCurrentVersion = getInnerHTML(oYourVersionContainer);
-	if (sCurrentVersion != window.sdVersion && !this.opt.bDeveloperMode)
-		setInnerHTML(oYourVersionContainer, this.opt.sVersionOutdatedTemplate.replace('%currentVersion%', sCurrentVersion));
+	var sCurrentVersion = oYourVersionContainer.html();
+	if (this.opt.bDeveloperMode && 'sdDevVersion' in window && sCurrentVersion != window.sdDevVersion)
+		oYourVersionContainer.html(this.opt.sVersionOutdatedTemplate.replace('%currentVersion%', sCurrentVersion));
+	else if (sCurrentVersion != window.sdVersion && !this.opt.bDeveloperMode)
+		oYourVersionContainer.html(this.opt.sVersionOutdatedTemplate.replace('%currentVersion%', sCurrentVersion));
 }
 
 sd_AdminIndex.prototype.checkUpdateAvailable = function ()
@@ -67,59 +75,71 @@ sd_AdminIndex.prototype.checkUpdateAvailable = function ()
 		return;
 
 	// We don't handle developer mode stuff here, best to get any developer edition to a supported edition.
-
-	var oContainer = document.getElementById(this.opt.sUpdateNotificationContainerId);
+	var oContainer = $('#' + this.opt.sUpdateNotificationContainerId);
 
 	// Are we setting a custom title and message?
 	var sTitle = 'sdUpdateTitle' in window ? window.sdUpdateTitle : this.opt.sUpdateNotificationDefaultTitle;
 	var sMessage = 'sdUpdateNotice' in window ? window.sdUpdateNotice : this.opt.sUpdateNotificationDefaultMessage;
 
-	setInnerHTML(oContainer, this.opt.sUpdateNotificationTemplate.replace('%title%', sTitle).replace('%message%', sMessage).replace('%criticaltitle%', sTitle));
+	oContainer.html(this.opt.sUpdateNotificationTemplate.replace('%title%', sTitle).replace('%message%', sMessage).replace('%criticaltitle%', sTitle));
 
 	// Parse in the package download URL if it exists in the string.
-	document.getElementById('update-link').href = this.opt.sUpdateNotificationLink.replace('%package%', window.sdUpdatePackage);
+	$('#update-link').attr('href', this.opt.sUpdateNotificationLink.replace('%package%', window.sdUpdatePackage));
 
 	if ('sdUpdateInformation' in window)
 	{
-		document.getElementById('information-link-span').style.display = 'block';
-		document.getElementById('information-link').href = this.opt.sUpdateInformationLink.replace('%information%', window.sdUpdateInformation);
+		$('#information-link-span').css('display', 'block');
+		$('#information-link').attr('href', this.opt.sUpdateInformationLink.replace('%information%', window.sdUpdateInformation));
 	}
 
 	// If we decide to override life into "red" mode, do it.
 	if ('sdUpdateCritical' in window && window.sdUpdateCritical === true)
 	{
-		document.getElementById('update_container').className = 'errorbox';
-		document.getElementById('update_critical_title').style.display = 'block';
-		document.getElementById('update_critical_alert').style.display = 'block';
-		document.getElementById('update_title').style.display = 'none';
-		document.getElementById('update_content').className = '';
+		$('#update_container').removeClass().addClass('errorbox');
+		$('#update_critical_title').show();
+		$('#update_critical_alert').show();
+		$('#update_title').hide();
 	}
 
-	document.getElementById('sd_update_section').style.display = 'block';
+	$('#sd_update_section').show();
 }
 
 // Ticket number information...
-function shd_ticket_total_information()
+sd_AdminIndex.prototype.TickekTotals = function ()
 {
-	var infocontainer = document.getElementById('shd_ticket_total_information');
-
-	if (infocontainer.style.display == 'none')
-		infocontainer.style.display = 'block';
-	else
-		infocontainer.style.display = 'none';
+	var infocontainer = $('#' + this.opt.sTotalTicketsInfoContainerID).toggle();
 }
 
 // Modified, SMF 2.0 ToggleItem
-function toggleItem(itemID, theme_url, txt_on, txt_off)
+function shd_plugins(oOptions)
+{
+	this.opt = oOptions;
+
+	$('#' + this.opt.sJSworkedID).val(1);
+	$('.' + this.opt.sFeaturesSwitchClass + ' a').on('click', this.togglePlugin.bind(this));
+	$(this.opt.oJSInstallablePlugins).each(this.setupPlugins.bind(this));
+}
+
+shd_plugins.prototype.setupPlugins = function (index, itemID)
+{
+	$('#' + this.opt.sJSFeatureClass.replace('%itemid%', itemID)).css('display', '');
+	$('#' + this.opt.sJSPlainFeatureClass.replace('%itemid%', itemID)).css('display', 'none');
+}
+
+shd_plugins.prototype.togglePlugin = function (e)
 {
+	e.preventDefault();
+	itemID = e.currentTarget.dataset.plugin;
+
 	// Toggle the hidden item.
-	var itemValueHandle = document.getElementById("feature_" + itemID);
-	itemValueHandle.value = itemValueHandle.value === 1 ? 0 : 1;
+	this.oItemValueHandle = $('#' + this.opt.sFeatureClass.replace('%itemid%', itemID));
+	this.bItemValue = this.oItemValueHandle.val() == 0 ? 1 : 0;
 
 	// Change the image, alternative text and the title.
-	document.getElementById("switch_" + itemID).src = theme_url + '/simpledesk/switch_' + (itemValueHandle.value === 1 ? 'on' : 'off') + '.png';
-	document.getElementById("switch_" + itemID).alt = itemValueHandle.value === 1 ? txt_off : txt_on;
-	document.getElementById("switch_" + itemID).title = itemValueHandle.value === 1 ? txt_off : txt_on;
+	$('#' + this.opt.sSwitchClass.replace('%itemid%', itemID)).attr('src', this.bItemValue === 1 ? this.opt.sPluginOnImg : this.opt.sPluginOffImg);
+	$('#' + this.opt.sSwitchClass.replace('%itemid%', itemID)).attr('alt', this.bItemValue === 1 ? this.opt.sPluginOnText : this.opt.sPluginOffText);
+	$('#' + this.opt.sSwitchClass.replace('%itemid%', itemID)).attr('title', this.bItemValue === 1 ? this.opt.sPluginOnText : this.opt.sPluginOffText);
+	$('#' + this.opt.sFeatureClass.replace('%itemid%', itemID)).val(this.bItemValue);
 
 	// Don't reload.
 	return false;
@@ -250,3 +271,151 @@ shd_custom_field_order.prototype.resort = function (currentOrder)
 			$('#option_' + key).val($('#option_' + key).attr('data-value-input'));
 	});
 }
+
+/* Reattribute Posts */
+function shd_AttributeValidate(oOptions)
+{
+	this.opt = oOptions;
+
+	this.init();
+}
+
+/* Reattribute Posts: Bind the events */
+shd_AttributeValidate.prototype.init = function ()
+{
+	/* Changing the radio */
+	$('#' + this.opt.sTypeEmailContainerId + ', #' + this.opt.sTypeStarterContainerId + ', #' + this.opt.sTypeFromContainerId).change(this.validator.bind(this));
+
+	/* Clicking into a field, special as we update the radio */
+	$('#' + this.opt.sEmailContainerId + ', #' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId + ', #' + this.opt.sToContainerId).focus(this.focusValidator.bind(this));
+
+	/* After typing a key */
+	$('#' + this.opt.sEmailContainerId + ', #' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId + ', #' + this.opt.sToContainerId).keyup(this.validator.bind(this));
+}
+
+/* Reattribute Posts: Does a radio change and processes the validator */
+shd_AttributeValidate.prototype.focusValidator = function (e)
+{
+	if (e.currentTarget.id == this.opt.sEmailContainerId)
+		$('#' + this.opt.sTypeEmailContainerId).prop('checked', true);
+	else if (e.currentTarget.id == this.opt.sStarterContainerId)
+		$('#' + this.opt.sTypeStarterContainerId).prop('checked', true);
+	else if (e.currentTarget.id == this.opt.sFromContainerId)
+		$('#' + this.opt.sTypeFromContainerId).prop('checked', true);
+
+	this.validator();
+}
+
+/* Reattribute Posts: Validate if we can start the process to reattribute */
+shd_AttributeValidate.prototype.validator = function ()
+{
+	origText = this.opt.sOrigText;
+	origTextStarter = this.opt.sOrigTextStarter;
+	valid = true;
+
+	// Do all the fields!
+	if (!$('#' + this.opt.sToContainerId).val())
+		valid = false;
+
+	warningMessage = origText.replace(/%member_to%/, $('#' + this.opt.sToContainerId).value);
+
+	if ($('#' + this.opt.sTypeEmailContainerId).is(":checked"))
+	{
+		$('#' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId).val("");
+			valid = $('#' + this.opt.sEmailContainerId).val() != '';
+		warningMessage = warningMessage.replace(/%type%/, this.opt.sEmailConfirmText).replace(/%find%/, $('#' + this.opt.sEmailContainerId).val());
+	}
+	else if ($('#' + this.opt.sTypeStarterContainerId).is(":checked"))
+	{
+		$('#' + this.opt.sEmailContainerId + ' #' + this.opt.sFromContainerId).val("");
+
+			valid = $('#' + this.opt.sStarterContainerId).val() != '';
+		warningMessage = origTextStarter.replace(/%member_to%/, $('#' + this.opt.sToContainerId).val()).replace(/%find%/, $('#' + this.opt.sStarterContainerId).val());			
+	}
+	else
+	{
+		$('#' + this.opt.sEmailContainerId + ' #' + this.opt.sStarterContainerId).val("");
+
+		valid = $('#' + this.opt.sFromContainerId).val() != '';
+		warningMessage = warningMessage.replace(/%type%/, this.opt.sFromConfirmText).replace(/%find%/, $('#' + this.opt.sFromContainerId).val());
+	}
+
+	$('#' + this.opt.sDoAttributeContainerId).prop("disabled", valid ? false : true);
+}
+
+/* Roles Management */
+function shd_role(oOptions)
+{
+	this.opt = oOptions;
+
+	this.init();
+}
+
+/* Roles Management: Bind the events */
+shd_role.prototype.init = function ()
+{
+	/* When they change a permission, change the icon */
+	this.iconInit();
+
+	this.toggleBlockInt();
+}
+
+/* Roles Management: Bind the events */
+shd_role.prototype.iconInit = function ()
+{
+	this.iconSelector = {
+		disallow: this.opt.sPermissionDisallowClass,
+		allow: this.opt.sPermissionAllowClass,
+		allow_own: this.opt.sPermissionAllowOwnClass,
+		allow_any: this.opt.sPermissionAllowAnyClass
+	};
+
+	$('dl.permsettings dd select[id*="perm_"]').on('change', this.icon.bind(this));
+}
+
+/* Roles Management: Handle changing the icon */
+shd_role.prototype.icon = function (e)
+{
+	$('#' + e.currentTarget.id + '_icon').attr('class', this.iconSelector[e.currentTarget.value] ? this.iconSelector[e.currentTarget.value] : '');
+}
+
+shd_role.prototype.toggleBlockInt = function ()
+{
+	$(this.opt.oHiddenBlocks).each(this.toggleBlock.bind(this));
+
+	$('div.cat_bar h3.catbg a').on('click', this.toggleBlock.bind(this));
+	$('input#' + this.opt.sDeleteContainerId).on('click', this.formConfirm.bind(this))
+}
+
+shd_role.prototype.toggleBlock = function (e, block)
+{
+	if (typeof e.currentTarget !== 'undefined')
+	{
+		e.preventDefault();
+		block = e.currentTarget.dataset.block;
+	}
+
+	if ($('#' + this.opt.sBlockHeader.replace('%block%', block)).hasClass('cat_collapsed'))
+	{
+		$('#' + this.opt.sBlockHeader.replace('%block%', block)).attr('class', 'cat_bar');
+		$('#' + this.opt.sBlockContent.replace('%block%', block)).css('display', '');
+		$('#' + this.opt.sBlockFooter.replace('%block%', block)).css('display', '');
+		$('#' + this.opt.sBlockIcon.replace('%block%', block)).attr('src', this.opt.sBlockIconExpandedImg);
+	}
+	else
+	{
+		$('#' + this.opt.sBlockHeader.replace('%block%', block)).attr('class', 'cat_bar cat_collapsed');
+		$('#' + this.opt.sBlockContent.replace('%block%', block)).css('display', 'none');
+		$('#' + this.opt.sBlockFooter.replace('%block%', block)).css('display', 'none');
+		$('#' + this.opt.sBlockIcon.replace('%block%', block)).attr('src', this.opt.sBlockIconCollapsedImg);
+	}
+
+	$('#' + this.opt.sBlockIcon.replace('%block%', block)).css('display', '');
+}
+
+shd_role.prototype.formConfirm = function (e)
+{
+	e.preventDefault();
+
+	return confirm(this.opt.sDeleteConfirmText);
+}

sd_source/SimpleDesk-Admin.php

View file @ 1d762ea

@@ -912,7 +912,8 @@ function shd_credits()
 					'desc' => $txt['shd_credits_devs_desc'],
 					'icon' => 'devs.png',
 					'members' => array(
-						array('Peter &quot;Arantor&quot; Spicer', false),
+						array('Jeremy &quot;SleePy&quot; Darwood', false),
+						array('Peter &quot;Arantor&quot; Spicer', true),
 						array('Jason &quot;JBlaze&quot; Clemons', true),
 						array('Marcus &quot;c&#963;&#963;&#1082;&#953;&#1108; &#1084;&#963;&#951;&#1109;&#1090;&#1108;&#1103;&quot; Forsberg', true),
 					),
@@ -922,8 +923,7 @@ function shd_credits()
 					'desc' => $txt['shd_credits_projectsupport_desc'],
 					'icon' => 'managers.png',
 					'members' => array(
-						array('Graeme &quot;Trekkie101&quot; Spence', false),
-						array('Jeremy &quot;SleePy&quot; Darwood', false),
+						array('Graeme &quot;Trekkie101&quot; Spence', true),
 					),
 				),
 				array(
@@ -931,7 +931,7 @@ function shd_credits()
 					'desc' => $txt['shd_credits_marketing_desc'],
 					'icon' => 'marketers.png',
 					'members' => array(
-						array('Brannon &quot;B&ordf;&quot; Hall', false),
+						array('Brannon &quot;B&ordf;&quot; Hall', true),
 					),
 				),
 				array(
@@ -957,9 +957,9 @@ function shd_credits()
 					'desc' => $txt['shd_credits_qualityassurance_desc'],
 					'icon' => 'qa.png',
 					'members' => array(
-						array('Sinan &quot;[SiNaN]&quot; &Ccedil;evik', false),
-						array('Paul &quot;tfs&quot; Laufer', false),
-						array('Shomari &quot;spoogs&quot; Scott', false),
+						array('Sinan &quot;[SiNaN]&quot; &Ccedil;evik', true),
+						array('Paul &quot;tfs&quot; Laufer', true),
+						array('Shomari &quot;spoogs&quot; Scott', true),
 						array('Alex &quot;Cleo&quot; Tokar', true),
 					),
 				),
@@ -968,21 +968,21 @@ function shd_credits()
 					'desc' => $txt['shd_credits_beta_desc'],
 					'icon' => 'testers.png',
 					'members' => array(
-						array('Chris &quot;ccbtimewiz&quot; Batista', false),
-						array('Wade &quot;&#1109;&#951;&#963;&#969;&quot; Poulsen', false),
-						array('Edwin &quot;Dismal Shadow&quot; Mendez', false),
-						array('Treznax', false),
-						array('Mark &quot;KiLLuMiNaTi&minus;7&minus;&quot; Longworth', false),
-						array('NIBOGO', false),
-						array('Robert &quot;Robbo&quot; Clancy', false),
-						array('Ya&#x11F;izcan Arslan', false),
-						array('MultiformeIngegno', false),
-						array('flapjack', false),
-						array('feline', false),
-						array('Sordell Media', false),
-						array('[FailSafe]', false),
-						array('chilly', false),
-						array('Tah Zonemaster', false),
+						array('Chris &quot;ccbtimewiz&quot; Batista', true),
+						array('Wade &quot;&#1109;&#951;&#963;&#969;&quot; Poulsen', true),
+						array('Edwin &quot;Dismal Shadow&quot; Mendez', true),
+						array('Treznax', true),
+						array('Mark &quot;KiLLuMiNaTi&minus;7&minus;&quot; Longworth', true),
+						array('NIBOGO', true),
+						array('Robert &quot;Robbo&quot; Clancy', true),
+						array('Ya&#x11F;izcan Arslan', true),
+						array('MultiformeIngegno', true),
+						array('flapjack', true),
+						array('feline', true),
+						array('Sordell Media', true),
+						array('[FailSafe]', true),
+						array('chilly', true),
+						array('Tah Zonemaster', true),
 					),
 				),
 				array(

sd_source/SimpleDesk-AjaxHandler.php

View file @ 1d762ea

@@ -528,7 +528,7 @@ function shd_ajax_assign2()
 		return array('error' => $txt['shd_no_ticket']);
 
 	if (!isset($_GET['to_user']) || !is_numeric($_GET['to_user']))
-		return array('success' => false, 'error' => $txt['shd_assigned_not_permitted'] . 'line459');
+		return array('success' => false, 'error' => $txt['shd_assigned_not_permitted']);
 
 	if (!shd_allowed_to('shd_assign_ticket_any', $dept) || $status == TICKET_STATUS_CLOSED || $status == TICKET_STATUS_DELETED)
 		return array('success' => false, 'error' => $txt['shd_cannot_assign']);

sd_source/SimpleDesk-Display.php

View file @ 1d762ea

@@ -398,10 +398,12 @@ function shd_view_ticket()
 		);
 		if (!empty($field['options']) && empty($field['options']['inactive']))
 			$field['options']['inactive'] = array();
+		if (!empty($field['options']) && empty($field['options']['order']))
+			$field['options']['order'] = array();
 
 		if (in_array($field['type'], array(CFIELD_TYPE_RADIO, CFIELD_TYPE_SELECT, CFIELD_TYPE_MULTI)))
 			foreach ($field['options'] as $k => $v)
-				if ($k != 'inactive' && strpos($v, '[') !== false)
+				if ($k != 'inactive' && $k != 'order' && strpos($v, '[') !== false)
 					$field['options'][$k] = parse_bbc($v, false);
 
 		if (($row['field_loc'] & CFIELD_REPLY) && $field['editable'])
@@ -668,78 +670,8 @@ function shd_view_ticket()
 	$context['can_ping'] = $context['can_reply'] && shd_allowed_to('shd_singleton_email', $context['ticket']['dept']);
 
 	// Set up the fancy editor
-	shd_postbox('shd_message', '', array('post_button' => $txt['shd_reply_ticket']));
-
-	// Lastly, our magic AJAX stuff ;D and we know we already made html_headers exist in SimpleDesk.php, score!
-	$context['html_headers'] .= '
-	<script type="text/javascript"><!-- // --><![CDATA[
-	var sSessI = "' . $context['session_id'] . '";
-	var sSessV = "' . $context['session_var'] . '";';
-
-	if ($context['ticket']['privacy']['can_change'])
-		$context['html_headers'] .= '
-	var shd_ajax_problem = ' . JavaScriptEscape($txt['shd_ajax_problem']) . ';
-	var privacyCtl = new shd_privacyControl({
-		ticket: ' . $context['ticket_id'] . ',
-		sUrl: smf_scripturl + "?action=helpdesk;sa=ajax;op=privacy;ticket=' . $context['ticket_id'] . '",
-		sSession: sSessV + "=" + sSessI,
-		sSrcA: "privlink",
-		sDestSpan: "privacy"
-	});';
-
-	if ($context['ticket']['urgency']['increase'] || $context['ticket']['urgency']['decrease'])
-		$context['html_headers'] .= '
-	var urgencyCtl = new shd_urgencyControl({
-		ticket: ' . $context['ticket_id'] . ',
-		sUrl: smf_scripturl + "?action=helpdesk;sa=ajax;op=urgency;ticket=' . $context['ticket_id'] . ';change=",
-		sSession: sSessV + "=" + sSessI,
-		sDestSpan: "urgency",
-		aButtons: ["up", "down"],
-		aButtonOps: { up: "increase", down: "decrease" }
-	});';
-
-	if (!empty($options['display_quick_reply']))
-		$context['html_headers'] .= '
-	var oQuickReply = new QuickReply({
-		bDefaultCollapsed: ' . (!empty($options['display_quick_reply']) && $options['display_quick_reply'] == 2 ? 'false' : 'true') . ',
-		iTicketId: ' . $context['ticket_id'] . ',
-		iStart: ' . $context['start'] . ',
-		sScriptUrl: smf_scripturl,
-		sImagesUrl: "' . $settings['images_url'] . '",
-		sContainerId: "quickReplyOptions",
-		sImageId: "quickReplyExpand",
-		sImageCollapsed: "collapse.png",
-		sImageExpanded: "expand.png",
-		sJumpAnchor: "quickreply",
-		sHeaderId: "quickreplyheader",
-		sFooterId: "quickreplyfooter"
-	});';
-
-	$context['html_headers'] .= '
-	var oCustomFields = new CustomFields({
-		sImagesUrl: "' . $settings['images_url'] . '",
-		sContainerId: "additional_info",
-		sImageId: "shd_custom_fields_swap",
-		sImageCollapsed: "collapse.png",
-		sImageExpanded: "expand.png",
-		sHeaderId: "additionalinfoheader",
-		sFooterId: "additional_info_footer",
-	});';
-
-	if (!empty($options['display_quick_reply']) && $context['can_go_advanced'])
-		$context['html_headers'] .= '
-	function goAdvanced()
-	{
-		document.getElementById("shd_bbcbox").style.display = ' . (!empty($modSettings['shd_allow_ticket_bbc']) ? '""' : '"none"') . ';
-		document.getElementById("shd_smileybox").style.display = ' . (!empty($modSettings['shd_allow_ticket_smileys']) ? '""' : '"none"') . ';
-		document.getElementById("shd_attach_container").style.display = ' . (!empty($context['ticket_form']['do_attach']) ? '""' : '"none"') . ';
-		document.getElementById("shd_goadvancedbutton").style.display = "none";' . (!empty($context['controls']['richedit']['shd_message']['rich_active']) ? '
-		oEditorHandle_shd_message.toggleView(true);' : '') . '
-	}
-	';
+	shd_postbox('shd_message', '', array('post_button' => $txt['shd_reply_ticket']), '100%');
 
-	$context['html_headers'] .= '
-	// ]' . ']></script>';
 	$context['shd_display'] = true;
 	$context['controls']['richedit']['shd_message']['rich_active'] = 0; // we don't want it by default!
 

sd_source/SimpleDesk-Profile.php

View file @ 1d762ea

@@ -33,7 +33,9 @@ function shd_profile_main($memID)
 	global $context, $txt, $scripturl, $sourcedir, $user_info, $settings, $user_profile, $modSettings;
 
 	// Load the profile details
-	loadTemplate('sd_template/SimpleDesk-Profile', array('helpdesk', 'helpdesk_admin'));
+	loadTemplate('sd_template/SimpleDesk-Profile', array('helpdesk'));
+	loadJavascriptFile('helpdesk.js', array('defer' => false, 'minimize' => false), 'helpdesk');
+
 	shd_load_language('sd_language/SimpleDeskProfile');
 	$context['shd_preferences'] = shd_load_user_prefs();
 	shd_load_plugin_files('hdprofile');

sd_source/SimpleDesk-Search.php

View file @ 1d762ea

@@ -36,6 +36,7 @@ function shd_search()
 	global $context, $smcFunc, $txt, $modSettings, $scripturl;
 
 	shd_is_allowed_to('shd_search', 0);
+	loadJavascriptFile('suggest.js', array('defer' => false, 'minimize' => false), 'suggest');
 
 	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
 		return fatal_lang_error('loadavg_search_disabled', false);

sd_source/SimpleDesk-TicketTopicMove.php

View file @ 1d762ea

@@ -218,7 +218,10 @@ function shd_tickettotopic()
 	{
 		// Didn't we have any values? If not, prune it, not interested.
 		if (empty($field['values']))
+		{
 			unset($context['custom_fields'][$field_id]);
+			continue;
+		}
 
 		// If the user is an administrator, they can always see the fields.
 		if ($is_admin)

sd_source/SimpleDesk.php

View file @ 1d762ea

@@ -1145,8 +1145,7 @@ function shd_helpdesk_listing()
 			if (!empty($row['field_options']))
 			{
 				$row['field_options'] = smf_json_decode($row['field_options'], true);
-				if (isset($row['field_options']['inactive']))
-					unset($row['field_options']['inactive']);
+				unset($row['field_options']['inactive'], $row['field_options']['order']);
 				foreach ($row['field_options'] as $k => $v)
 					if (strpos($v, '[') !== false)
 						$row['field_options'][$k] = parse_bbc($v);

sd_template/SimpleDesk-Admin.template.php

View file @ 1d762ea

@@ -32,7 +32,7 @@ function template_shd_admin()
 
 	// Update?
 	echo '
-		<div id="sd_update_section" class="tborder" style="display: none;"></div>';
+		<div id="sd_update_section" class="tborder hidden"></div>';
 
 	echo '
 		<div id="admin_main_section">';
@@ -44,7 +44,7 @@ function template_shd_admin()
 					<h3 class="catbg">
 						<img src="', $settings['default_images_url'], '/simpledesk/live.png" alt="*">
 						', $txt['shd_live_from'], '
-						<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>
+						<span class="righttext"><a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_live" class="shd_help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '"></a></span>
 					</h3>
 				</div>
 				<div class="windowbg nopadding">
@@ -59,7 +59,7 @@ function template_shd_admin()
 					<h3 class="catbg">
 						<img src="', $settings['default_images_url'], '/simpledesk/modification.png" alt="*">
 						', $txt['shd_mod_information'], '
-						<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>
+						<span class="righttext"><a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_modification" class="shd_help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '"></a></span>
 					</h3>
 				</div>
 				<div class="windowbg nopadding">
@@ -74,9 +74,9 @@ function template_shd_admin()
 							<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="*" class="shd_icon_minihead"><strong>', $txt['shd_ticket_information'], ':</strong><br>
 							', $txt['shd_total_tickets'], ':
 						<em id="totalTickets">
-								<a href="javascript: shd_ticket_total_information();" >', $context['total_tickets'], '</a>
+								<a href="#">', $context['total_tickets'], '</a>
 						</em>
-						<div id="shd_ticket_total_information" style="display: none;">
+						<div id="shd_ticket_total_information" class="hidden">
 							&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>
@@ -102,9 +101,8 @@ function template_shd_admin()
 		<div id="sd_credits">
 			<div class="title_bar">
 				<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>
+					<a href="', $scripturl, '?action=helpadmin;help=shd_admin_help_credits" class="shd_help"><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>
 			</div>';
 
@@ -159,7 +157,7 @@ function template_shd_admin()
 		</div>';
 
 	// The below functions include all the scripts needed from the simpledesk.net site. The language and format are passed for internationalization.
-	if (empty($modSettings['disable_smf_js']))
+	if (empty($modSettings['disable_smf_js']) && empty($modSettings['disable_sd_js']))
 		echo '
 		<script type="text/javascript" src="https://www.simpledesk.net/sd/current-version.js"></script>
 		<script type="text/javascript" src="https://www.simpledesk.net/sd/latest-news.js"></script>';
@@ -199,17 +193,17 @@ function template_shd_admin()
 				sUpdateNotificationDefaultTitle: ', JavaScriptEscape($txt['shd_update_available']), ',
 				sUpdateNotificationDefaultMessage: ', JavaScriptEscape($txt['shd_update_message']), ',
 				sUpdateNotificationTemplate: ', JavaScriptEscape('
-					<div class="cat_bar" id="update_title">
+					<div class="cat_bar hidden" id="update_title">
 						<h3 class="catbg">
 							<img src="' . $settings['default_images_url'] . '/simpledesk/update.png" alt="">
 							%title%
-							<span class="righttext"><a href="' . $scripturl . '?action=helpadmin;help=shd_admin_help_update" onclick="return reqWin(this.href);"><img src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '"></a></span>
+							<span class="righttext"><a href="' . $scripturl . '?action=helpadmin;help=shd_admin_help_update" class="shd_help"><img src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '"></a></span>
 						</h3>
 					</div>
 					<div class="windowbg" id="update_container">
 						<div class="content" id="update_content">
-							<p id="update_critical_alert" class="alert" style="display: none;">!!</p>
-							<h3 id="update_critical_title" class="alert" style="display: none;">%criticaltitle%</h3>
+							<p id="update_critical_alert" class="alert hidden">!!</p>
+							<h3 id="update_critical_title" class="alert hidden">%criticaltitle%</h3>
 							<div id="update_message" class="smalltext">
 								<p>
 									%message%
@@ -220,6 +214,8 @@ function template_shd_admin()
 				'), ',
 				sUpdateNotificationLink: ', JavaScriptEscape($scripturl . '?action=admin;area=packages;pgdownload;auto;package=%package%;' . $context['session_var'] . '=' . $context['session_id']), ',
 				sUpdateInformationLink: \'%information%\',
+				sTotalTicketsContainerId: \'totalTickets\',
+				sTotalTicketsInfoContainerID: \'shd_ticket_total_information\',
 			});
 		// ]]></script>';
 }
@@ -247,39 +243,9 @@ function template_shd_show_settings()
 		echo '
 					<div class="errorbox">', sprintf($txt['settings_not_saved'], $context['saved_failed']), '</div>';
 
-	echo '
-	<script type="text/javascript"><!-- // --><![CDATA[
-		function invertList(state, id_list)
-		{
-			for (i in id_list)
-			{
-				var chk = document.getElementById(id_list[i]);
-				if (chk && chk.disabled == false)
-					chk.checked = state;
-			}
-		}';
-
 	if (!empty($context['settings_pre_javascript']))
-		echo $context['settings_pre_javascript'];
-
-	// If we have BBC selection we have a bit of JS.
-	if (!empty($context['bbc_sections']))
-	{
-		echo '
-		function toggleBBCDisabled(section, disable)
-		{
-			for (var i = 0; i < document.forms.bbcForm.length; i++)
-			{
-				if (typeof(document.forms.bbcForm[i].name) == "undefined" || (document.forms.bbcForm[i].name.substr(0, 11) != "enabledTags") || (document.forms.bbcForm[i].name.indexOf(section) != 11))
-					continue;
-
-				document.forms.bbcForm[i].disabled = disable;
-			}
-			document.getElementById("bbc_" + section + "_select_all").disabled = disable;
-		}';
-	}
 		echo '
-	// ]]></script>';
+	<script type="text/javascript"><!-- // --><![CDATA[', $context['settings_pre_javascript'], '// ]]></script>';
 
 	if (!empty($context['settings_insert_above']))
 		echo $context['settings_insert_above'];
@@ -323,7 +289,7 @@ function template_shd_show_settings()
 				echo '
 					<div class="cat_bar">
 						<h3 class="', !empty($config_var['class']) ? $config_var['class'] : 'catbg', '"', !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', '>
-							', ($config_var['help'] ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $config_var['help'] . '" onclick="return reqWin(this.href);" class="help"><img src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '"></a>' : ''), '
+							', ($config_var['help'] ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $config_var['help'] . '" class="help shd_help"><img src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '"></a>' : ''), '
 							', $config_var['label'], '
 						</h3>
 					</div>';
@@ -362,27 +328,6 @@ function template_shd_show_settings()
 			if ($config_var['type'] == 'hidden')
 				echo '
 						<input type="hidden" name="', $config_var['name'], '" value="', $config_var['value'], '">';
-			// A check-all option?
-			elseif ($config_var['type'] == 'checkall')
-			{
-				$array = array();
-				foreach ($config_var['data'] as $k => $v)
-					$array[] = JavaScriptEscape($v[1]);
-
-				echo '
-					<dt></dt>
-					<dd>
-						<input type="checkbox" name="all" id="', $config_var['name'], '" value="" onclick="invert_', $config_var['name'], '(this);" class="floatleft">
-						<label for="check_all" class="floatleft">', $txt['check_all'], '</label>
-					</dd>
-					<script type="text/javascript"><!-- // --><![CDATA[
-					function invert_', $config_var['name'], '(obj)
-					{
-						var checks = [' . implode(',', $array), '];
-						invertList(obj.checked, checks);
-					}
-					// ]]></script>';
-			}
 			// Is this a span like a message?
 			elseif (in_array($config_var['type'], array('message', 'warning')))
 				echo '
@@ -393,7 +338,7 @@ function template_shd_show_settings()
 			else
 			{
 				echo '
-						<dt', is_array($config_var) && !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', is_array($config_var) && !empty($config_var['invisible']) ? ' style="display:none;"' : '', '>';
+						<dt', is_array($config_var) && !empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '"' : '', is_array($config_var) && !empty($config_var['invisible']) ? ' class="hidden"' : '', '>';
 
 				// Some quick helpers...
 				$javascript = $config_var['javascript'];
@@ -403,7 +348,7 @@ function template_shd_show_settings()
 				// Show the [?] button.
 				if ($config_var['help'])
 					echo '
-							<a id="setting_', $config_var['name'], '" href="', $scripturl, '?action=helpadmin;help=', $config_var['help'], '" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" border="0"></a><span', ($config_var['disabled'] ? ' class="disabled"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label id="label_', $config_var['name'], '" for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>
+							<a id="setting_', $config_var['name'], '" href="', $scripturl, '?action=helpadmin;help=', $config_var['help'], '" class="help shd_help"><img src="', $settings['images_url'], '/helptopics.png" alt="', $txt['help'], '" border="0"></a><span', ($config_var['disabled'] ? ' class="disabled"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label id="label_', $config_var['name'], '" for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>
 						</dt>';
 				else
 					echo '
@@ -411,7 +356,7 @@ function template_shd_show_settings()
 						</dt>';
 
 				echo '
-						<dd', (!empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '_dd"' : ''), (is_array($config_var) && !empty($config_var['invisible']) ? ' style="display:none;"' : ''), '>',
+						<dd', (!empty($config_var['force_div_id']) ? ' id="' . $config_var['force_div_id'] . '_dd"' : ''), (is_array($config_var) && !empty($config_var['invisible']) ? ' class="hidden"' : ''), '>',
 							$config_var['preinput'];
 
 				// Show a check box.
@@ -453,7 +398,7 @@ function template_shd_show_settings()
 						foreach ($bbcColumn as $bbcTag)
 							echo '
 										<li class="list_bbc align_left shd_bbc_list">
-											<input type="checkbox" name="', $config_var['name'], '_enabledTags[]" id="tag_', $config_var['name'], '_', $bbcTag['tag'], '" value="', $bbcTag['tag'], '"', in_array($bbcTag['tag'], $context['enabled_tags'][$config_var['name']]) ? ' checked="checked"' : '', ' > <label for="tag_', $config_var['name'], '_', $bbcTag['tag'], '">', $bbcTag['tag'], '</label>', $bbcTag['show_help'] ? ' (<a href="' . $scripturl . '?action=helpadmin;help=tag_' . $bbcTag['tag'] . '" onclick="return reqWin(this.href);">?</a>)' : '', '
+											<input type="checkbox" name="', $config_var['name'], '_enabledTags[]" id="tag_', $config_var['name'], '_', $bbcTag['tag'], '" value="', $bbcTag['tag'], '"', in_array($bbcTag['tag'], $context['enabled_tags'][$config_var['name']]) ? ' checked="checked"' : '', '><label for="tag_', $config_var['name'], '_', $bbcTag['tag'], '">', $bbcTag['tag'], '</label>', $bbcTag['show_help'] ? ' (<a href="' . $scripturl . '?action=helpadmin;help=tag_' . $bbcTag['tag'] . '" class="shd_help">?</a>)' : '', '
 										</li>';
 
 					echo '			</ul>
@@ -485,7 +430,7 @@ function template_shd_show_settings()
 			else
 				echo '
 						<dd>
-							<strong>' . $config_var . '</strong>
+							<strong>', $config_var, '</strong>
 						</dd>';
 		}
 	}
@@ -550,38 +494,38 @@ function template_shd_action_log()
 			<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', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog;sort=action', $context['sort'] == $sort_types['action'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_action'], '
 					</a>
-					', ($context['sort'] == $sort_types['action'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['action'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td width="20%">
 					<img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog', $context['sort'] == $sort_types['time'] && !isset($_REQUEST['asc']) ? ';sort=time;asc' : ';sort=time', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog;sort=time', $context['sort'] == $sort_types['time'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_date'], '
 					</a>
-					', ($context['sort'] == $sort_types['time'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['time'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td width="16%">
 					<img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog', $context['sort'] == $sort_types['member'] && !isset($_REQUEST['asc']) ? ';sort=member;asc' : ';sort=member', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog;sort=member', $context['sort'] == $sort_types['member'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_member'], '
 					</a>
-					', ($context['sort'] == $sort_types['member'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['member'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td width="16%">
 					<img src="', $settings['default_images_url'], '/simpledesk/position.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog', $context['sort'] == $sort_types['position'] && !isset($_REQUEST['asc']) ? ';sort=position;asc' : ';sort=position', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog;sort=position', $context['sort'] == $sort_types['position'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_position'], '
 					</a>
-					', ($context['sort'] == $sort_types['position'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['position'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td width="10%">
 					<img src="', $settings['default_images_url'], '/simpledesk/ip.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog', $context['sort'] == $sort_types['ip'] && !isset($_REQUEST['asc']) ? ';sort=ip;asc' : ';sort=ip', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=actionlog;sort=ip', $context['sort'] == $sort_types['ip'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_ip'], '
 					</a>
-					', ($context['sort'] == $sort_types['ip'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png' ) . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['ip'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td width="2%">&nbsp;</td>
 			</tr>';
@@ -640,38 +584,38 @@ function template_shd_admin_log()
 			<tr class="title_bar">
 				<td class="shd_33">
 					<img src="', $settings['default_images_url'], '/simpledesk/action.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog', $context['sort'] == $sort_types['action'] && !isset($_REQUEST['asc']) ? ';sort=action;asc' : ';sort=action', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog;sort=action', $context['sort'] == $sort_types['action'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_action'], '
 					</a>
-					', ($context['sort'] == $sort_types['action'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['action'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td class="shd_20">
 					<img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog', $context['sort'] == $sort_types['time'] && !isset($_REQUEST['asc']) ? ';sort=time;asc' : ';sort=time', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog;sort=time', $context['sort'] == $sort_types['time'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_date'], '
 					</a>
-					', ($context['sort'] == $sort_types['time'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['time'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td class="shd_20">
 					<img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog', $context['sort'] == $sort_types['member'] && !isset($_REQUEST['asc']) ? ';sort=member;asc' : ';sort=member', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog;sort=member', $context['sort'] == $sort_types['member'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_member'], '
 					</a>
-					', ($context['sort'] == $sort_types['member'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['member'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td class="shd_10">
 					<img src="', $settings['default_images_url'], '/simpledesk/position.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog', $context['sort'] == $sort_types['position'] && !isset($_REQUEST['asc']) ? ';sort=position;asc' : ';sort=position', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog;sort=position', $context['sort'] == $sort_types['position'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_position'], '
 					</a>
-					', ($context['sort'] == $sort_types['position'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['position'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				<td class="shd_10" ', $context['can_delete'] ? 'colspan="2"' : '', '>
 					<img src="', $settings['default_images_url'], '/simpledesk/ip.png" class="shd_smallicon" alt="">
-					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog', $context['sort'] == $sort_types['ip'] && !isset($_REQUEST['asc']) ? ';sort=ip;asc' : ';sort=ip', '">
+					<a href="', $scripturl, '?action=admin;area=helpdesk_info;sa=adminlog;sort=ip', $context['sort'] == $sort_types['ip'] && !isset($_REQUEST['asc']) ? ';asc' : '', '">
 						', $txt['shd_admin_actionlog_ip'], '
 					</a>
-					', ($context['sort'] == $sort_types['ip'] ? '<img src="' . $settings['default_images_url'] . '/' . (isset($_REQUEST['asc']) ? 'simpledesk/move_up.png' : 'simpledesk/move_down.png') . '" alt="">' : ''), '
+					', ($context['sort'] == $sort_types['ip'] ? '<img src="' . $settings['default_images_url'] . '/simpledesk/move_' . (isset($_REQUEST['asc']) ? 'up' : 'down') . '.png" alt="">' : ''), '
 				</td>
 				', $context['can_delete'] ? '<td class="shd_5">&nbsp;</td>' : '', '
 			</tr>';

sd_template/SimpleDesk-AdminCannedReplies.template.php

View file @ 1d762ea

@@ -134,11 +134,11 @@ function template_shd_edit_canned_category()
 					<dt><strong>', $txt['shd_admin_cannedreplies_categoryname'], '</strong></dt>
 					<dd><input type="text" name="catname" id="catname" size="30" value="', $context['category_name'], '"></dd>
 				</dl>
-				<input type="submit" value="', $context['page_title'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">';
+				<input type="submit" value="', $context['page_title'], '" accesskey="s" class="button save">';
 
 	if ($context['canned_category'] != 'new')
 		echo '
-				<input type="submit" name="delete" value="', $txt['shd_admin_cannedreplies_deletecat'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_admin_cannedreplies_delete_confirm']), ') && submitThisOnce(this);" class="button">';
+				<input type="submit" name="delete" value="', $txt['shd_admin_cannedreplies_deletecat'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_admin_cannedreplies_delete_confirm']), ')" class="button save">';
 
 	echo '
 				<input type="hidden" name="cat" value="', $context['canned_category'], '">
@@ -164,7 +164,7 @@ function template_shd_edit_canned_reply()
 		<div class="information">
 			', $txt['shd_admin_cannedreplies_homedesc'], '
 		</div>
-		<form action="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=savereply" method="post" accept-charset="', $context['character_set'], '" name="cannedreply" id="cannedreply" onsubmit="', 'submitonce(this);smc_saveEntities(\'cannedreply\', [\'title\', \'', $context['post_box_name'], '\']);" enctype="multipart/form-data" style="margin: 0;">
+		<form action="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=savereply" method="post" accept-charset="', $context['character_set'], '" name="cannedreply" id="cannedreply" onsubmit="', 'smc_saveEntities(\'cannedreply\', [\'title\', \'', $context['post_box_name'], '\']);" enctype="multipart/form-data">
 			<div class="cat_bar">
 				<h3 class="catbg">
 					<img src="', $settings['default_images_url'], '/simpledesk/additional_information.png" alt="*">
@@ -204,21 +204,19 @@ function template_shd_edit_canned_reply()
 				<dl class="settings">';
 
 	foreach ($context['canned_reply']['depts_available'] as $dept_id => $dept_name)
-	{
 		echo '
 					<dt><strong>', $dept_name, '</strong></dt>
 					<dd><input type="checkbox" name="dept_', $dept_id, '"', in_array($dept_id, $context['canned_reply']['depts_selected']) ? ' checked="checked"' : '', '></dd>';
-	}
 
 	echo '
 				</dl>
 			</div>
 			<br>
-			<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['save'], '" tabindex="', $context['tabindex']++, '" accesskey="s" class="button">';
+			<input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['save'], '" tabindex="', $context['tabindex']++, '" accesskey="s" class="button save">';
 
 	if ($context['canned_reply']['id'] != 'new')
 		echo '
-			<input type="submit" name="delete" value="', $txt['shd_admin_cannedreplies_deletereply'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_admin_cannedreplies_deletereply_confirm']), ') && submitThisOnce(this);" class="button">';
+			<input type="submit" name="delete" value="', $txt['shd_admin_cannedreplies_deletereply'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_admin_cannedreplies_deletereply_confirm']), ');" class="button save">';
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -264,7 +262,7 @@ function template_shd_move_reply_cat()
 						</select>
 					</dd>
 				</dl>
-				<input type="submit" value="', $txt['shd_admin_cannedreplies_movereply'], '" onclick="return submitThisOnce(this);" class="button">
+				<input type="submit" value="', $txt['shd_admin_cannedreplies_movereply'], '" class="button save">
 				<input type="hidden" name="reply" value="', $context['canned_reply_id'], '">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">

sd_template/SimpleDesk-AdminCustomField.template.php

View file @ 1d762ea

@@ -93,74 +93,59 @@ function template_shd_custom_field_edit()
 {
 	global $context, $settings, $txt, $modSettings, $scripturl;
 
+	// !!! TOOD: Move this to admin.js
 	echo '
 				<script type="text/javascript"><!-- // --><![CDATA[
 				function set_fieldicon(filename)
 				{
-					document.getElementById("cf_fieldicon_icon").style.background = "url(" + ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk/cf/'), ' + filename + ") no-repeat left";
+					$("#cf_fieldicon_icon").css("background", "url(" + ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk/cf/'), ' + filename + ") no-repeat left");
 				}
+
 				function update_field_type(ftype)
 				{
-					var icons = new Array();';
-	foreach ($context['field_types'] as $field => $details)
-	{
-		list($field_desc, $class) = $details;
+					var icons = {';
+
+	foreach ($context['field_types'] as $field => list($field_desc, $class))
 		echo '
-					icons[', $field, '] = ', JavaScriptEscape('cf_ui_' . $class), ';';
-	}
+						', $field, ': ', JavaScriptEscape('cf_ui_' . $class), ',';
 
 	echo '
-					document.getElementById("cf_fieldtype_icon").setAttribute("class", icons[ftype]);
-
-					document.getElementById("max_length_dt").style.display = ftype == ', CFIELD_TYPE_TEXT, ' || ftype == ', CFIELD_TYPE_LARGETEXT, ' ? "" : "none";
-					document.getElementById("max_length_dd").style.display = ftype == ', CFIELD_TYPE_TEXT, ' || ftype == ', CFIELD_TYPE_LARGETEXT, ' ? "" : "none";
-					document.getElementById("dimension_dt").style.display = ftype == ', CFIELD_TYPE_LARGETEXT, ' ? "" : "none";
-					document.getElementById("dimension_dd").style.display = ftype == ', CFIELD_TYPE_LARGETEXT, ' ? "" : "none";
-					document.getElementById("bbc_dt").style.display = ftype == ', CFIELD_TYPE_TEXT, ' || ftype == ', CFIELD_TYPE_LARGETEXT, ' ? "" : "none";
-					document.getElementById("bbc_dd").style.display = ftype == ', CFIELD_TYPE_TEXT, ' || ftype == ', CFIELD_TYPE_LARGETEXT, ' ? "" : "none";
-					document.getElementById("options_dt").style.display = ftype == ', CFIELD_TYPE_SELECT, ' || ftype == ', CFIELD_TYPE_RADIO, ' || ftype == ', CFIELD_TYPE_MULTI, ' ? "" : "none";
-					document.getElementById("options_dd").style.display = ftype == ', CFIELD_TYPE_SELECT, ' || ftype == ', CFIELD_TYPE_RADIO, ' || ftype == ', CFIELD_TYPE_MULTI, ' ? "" : "none";
-					document.getElementById("default_dt").style.display = ftype == ', CFIELD_TYPE_CHECKBOX, ' ? "" : "none";
-					document.getElementById("default_dd").style.display = ftype == ', CFIELD_TYPE_CHECKBOX, ' ? "" : "none";
-
-					var disp_radio = ftype != ', CFIELD_TYPE_MULTI, ' ? "" : "none";
-					var disp_multi = ftype == ', CFIELD_TYPE_MULTI, ' ? "" : "none";
-					for (i = 1; i <= startOptID; i++)
-					{
-						if (d = document.getElementById("radio_" + i))
-						{
-							d.style.display = disp_radio;
-							document.getElementById("multi_" + i).style.display = disp_multi;
-						}
-					}
-					document.getElementById("radio_0").style.display = disp_radio;
-					document.getElementById("radio_text_0").style.display = disp_radio;
-					document.getElementById("cf_options_radio_default").style.display = disp_radio;
-					document.getElementById("cf_options_multi_default").style.display = disp_multi;';
+					};
+					$("#cf_fieldtype_icon").attr("class", icons[ftype]);';
+
+	$options = array(
+		'max_length' => array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT),
+		'dimension' => array(CFIELD_TYPE_LARGETEXT),
+		'bbc' => array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT),
+		'options' => array(CFIELD_TYPE_SELECT, CFIELD_TYPE_RADIO, CFIELD_TYPE_MULTI),
+		'default' => array(CFIELD_TYPE_CHECKBOX)
+	);
+	foreach ($options as $elId => $ftype)
+		echo '
+					$("#', $elId, '_dt, #', $elId, '_dd").css("display", ftype == ', implode(' || ftype == ', $ftype), ' ? "" : "none");';
+
 	if (!empty($context['dept_fields']))
-	{
 		echo '
 					var field_list = [', implode(',', array_keys($context['dept_fields'])), '];
-					var cbstyle = ftype != ', CFIELD_TYPE_CHECKBOX, ' ? "" : "none";
-					for (i = 0, n = field_list.length; i < n; i++)
-					{
-						document.getElementById("required_dept" + field_list[i] + "_span").style.display = "";
-						document.getElementById("required_dept" + field_list[i]).style.display = ftype == ', CFIELD_TYPE_MULTI, ' ? "none" : "";
-						document.getElementById("required_dept_multi_" + field_list[i]).style.display = ftype != ', CFIELD_TYPE_MULTI, ' ? "none" : "";
-					}';
-	}
+					$(field_list).each(function(index, deptID){
+						$("#required_dept" + deptID + "_span").css("display", "");
+						$("#required_dept" + deptID).css("display", ftype == ', CFIELD_TYPE_MULTI, ' ? "none" : "");
+						$("#required_dept_multi_" + deptID).css("display", ftype != ', CFIELD_TYPE_MULTI, ' ? "none" : "");
+					});';
+
 	echo '
 				}
+
 				function updateDeptHidden(id)
 				{
-					var state = !document.getElementById("present_dept" + id).checked;
-					document.getElementById("required_dept" + id).disabled = state;
-					document.getElementById("required_dept_multi_" + id).disabled = state;
+					var state = !$("#present_dept" + id).is(":checked");
+					$("#required_dept" + id + ", #required_dept_multi_" + id).prop("disabled", state);
 				}
+
 				var startOptID = ', !empty($context['custom_field']['options']['order']) ? count($context['custom_field']['options']['order']) + 1 : 1, ';
 				function add_option()
 				{
-					var ftype = document.getElementById("cf_fieldtype").value;
+					var ftype = $("#cf_fieldtype").val();
 					var newHTML = \'<br id="break_\' + startOptID + \'"><input type="radio" id="radio_\' + startOptID + \'" name="default_select" value="\' + startOptID + \'" id="\' + startOptID + \'"\';
 					if (ftype == ', CFIELD_TYPE_MULTI, ')
 						newHTML += \' style="display:none;"\';
@@ -170,8 +155,8 @@ function template_shd_custom_field_edit()
 						newHTML += \' style="display:none;"\';
 					newHTML += \'><input type="text" id="option_\' + startOptID + \'" name="select_option[\' + startOptID + \']" value="">\' + "\n";
 					newHTML += \'<span id="order_\' + startOptID + \'" class="custom_field_order"><input id="order_\' + startOptID + \'_input" type="hidden" name="order[\' + startOptID + \']" value="\' + (startOptID - 1) + \'" data-key="\' + startOptID + \'">\' + "\n";
-					newHTML += \'<a href="#" class="custom_field_move_up" data-key="\' + startOptID + \'"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" class="icon" alt="', $txt['custom_edit_order_up'], '" title="', $txt['custom_edit_order_up'], '"/></a>\';
-					newHTML += \'<a href="#" class="custom_field_move_down" data-key="\' + startOptID + \'"><img src="', $settings['default_images_url'], '/simpledesk/move_down.png" class="icon" alt="', $txt['custom_edit_order_down'], '" title="', $txt['custom_edit_order_down'], '"/></a>\';
+					newHTML += \'<a href="#" class="custom_field_move_up" data-key="\' + startOptID + \'"><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" class="icon" alt="', $txt['custom_edit_order_up'], '" title="', $txt['custom_edit_order_up'], '"></a>\';
+					newHTML += \'<a href="#" class="custom_field_move_down" data-key="\' + startOptID + \'"><img src="', $settings['default_images_url'], '/simpledesk/move_down.png" class="icon" alt="', $txt['custom_edit_order_down'], '" title="', $txt['custom_edit_order_down'], '"></a>\';
 					newHTML += \'</span>\' + "\n";
 
 					newHTML += \'<span id="addopt"></span>\';
@@ -181,38 +166,39 @@ function template_shd_custom_field_edit()
 
 					optionsOrder.resortNew();
 				}
+
 				function update_default_label(defstate)
 				{
-					if (defstate)
-						document.getElementById("default_label").innerHTML = "', $txt['shd_admin_default_state_on'], '";
-					else
-						document.getElementById("default_label").innerHTML = "', $txt['shd_admin_default_state_off'], '";
+					$("#default_label").html(defstate ? "', $txt['shd_admin_default_state_on'], '" : "', $txt['shd_admin_default_state_off'], '");
 				}
+
 				function update_required(state)
 				{
 					if (state)
 					{
-						document.getElementById("cf_display_empty").disabled = "disabled";
-						document.getElementById("cf_display_empty").checked = "";
-						document.getElementById("display_empty_dt").className = "disabled";
+						$("#cf_display_empty").css("disabled", "disabled").attr("checked", "");
+						$("#display_empty_dt").attr("class", "disabled");
 					}
 					else
 					{
-						document.getElementById("cf_display_empty").disabled = "";
-						document.getElementById("display_empty_dt").className = "";
+						$("#cf_display_empty").css("disabled", "");
+						$("#display_empty_dt").attr("className", "");
 					}
 				}
+
 				function update_permissions(state,role)
 				{
-					document.getElementById("edit_" + role).disabled = state == "on" ? "" : "disabled";
-					document.getElementById("edit_" + role).checked = state == "on" ? "" : "";
+					$("#edit_" + role).prop("disabled", state == "on" ? true : false);
+					$("#edit_" + role).attr("checked", state == "on" ? "" : "");
 				}
+
 				function update_field_location(loc)
 				{
-					document.getElementById("placement_dt").style.display = loc == ', CFIELD_TICKET, ' || loc == ', (CFIELD_TICKET | CFIELD_REPLY), ' ? "" : "none";
-					document.getElementById("placement_dd").style.display = loc == ', CFIELD_TICKET, ' || loc == ', (CFIELD_TICKET | CFIELD_REPLY), ' ? "" : "none";
+					$("#placement_dt").css("display", loc == ', CFIELD_TICKET, ' || loc == ', (CFIELD_TICKET | CFIELD_REPLY), ' ? "" : "none");
+					$("#placement_dd").css("display", loc == ', CFIELD_TICKET, ' || loc == ', (CFIELD_TICKET | CFIELD_REPLY), ' ? "" : "none");
 				}
 				// ]', ']></script>
+
 				<form action="', $scripturl, '?action=admin;area=helpdesk_customfield;sa=save', !empty($context['new_field']) ? ';new' : '', '" method="post">
 					<div class="cat_bar">
 						<h3 class="catbg">
@@ -242,12 +228,9 @@ function template_shd_custom_field_edit()
 								<span id="cf_fieldicon_icon"', $context['field_icon_value'] != '' ? ' style="background: url(' . $settings['images_url'] . '/simpledesk/cf/' . $context['field_icon_value'] . ') no-repeat left;"' : '', '></span>
 								<select name="field_icon" id="cf_fieldicon" onchange="javascript:set_fieldicon(this.value);">';
 
-	foreach ($context['field_icons'] as $icon)
-	{
-		list($file, $desc) = $icon;
+	foreach ($context['field_icons'] as list($file, $desc))
 		echo '
 									<option value="', $file, '"', $context['field_icon_value'] == $file ? ' selected="selected"' : '', '>', $desc, '</option>';
-	}
 
 	echo '
 								</select>
@@ -261,8 +244,8 @@ function template_shd_custom_field_edit()
 									<option value="', (CFIELD_TICKET | CFIELD_REPLY), '"', ($context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY) ? ' selected="selected"' : ''), '>', $txt['shd_admin_custom_fields_visible_both'], '</option>
 								</select>
 							</dd>
-							<dt id="placement_dt"', (($context['field_loc'] == CFIELD_TICKET || $context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY)) ? '' : ' style="display: none;"'), '><strong>', $txt['shd_admin_custom_field_placement'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_placement_desc'], '</span></dt>
-							<dd id="placement_dd"', (($context['field_loc'] == CFIELD_TICKET || $context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY)) ? '' : ' style="display: none;"'), '>
+							<dt id="placement_dt"', (($context['field_loc'] == CFIELD_TICKET || $context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY)) ? '' : ' class="hidden"'), '><strong>', $txt['shd_admin_custom_field_placement'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_placement_desc'], '</span></dt>
+							<dd id="placement_dd"', (($context['field_loc'] == CFIELD_TICKET || $context['field_loc'] == (CFIELD_TICKET | CFIELD_REPLY)) ? '' : ' class="hidden"'), '>
 								<select name="placement" id="cf_placement">
 									<option id="details" value="', CFIELD_PLACE_DETAILS, '"', ($context['placement'] == CFIELD_PLACE_DETAILS ? ' selected="selected"' : ''), '>', $txt['shd_admin_custom_field_placement_details'], '</option>
 									<option id="place_info" value="', CFIELD_PLACE_INFO, '"', ($context['placement'] == CFIELD_PLACE_INFO ? ' selected="selected"' : ''), '>', $txt['shd_admin_custom_field_placement_information'], '</option>
@@ -272,15 +255,15 @@ function template_shd_custom_field_edit()
 							</dd>
 							<dt><strong>', $txt['shd_admin_custom_field_can_see'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_can_see_desc'], '</span></dt>
 							<dd>
-								<input type="checkbox" name="see_users"', !empty($context['custom_field']['can_see'][0]) && $context['custom_field']['can_see'][0] == 1 ? ' checked="checked"' : '', ' onchange="javascript:update_permissions(this.value,\'users\');"/> <img src="', $settings['default_images_url'], '/simpledesk/user.png" class="icon" alt="', $txt['shd_admin_custom_field_users'], '" title="', $txt['shd_admin_custom_field_users'], '"/>
-								<input type="checkbox" name="see_staff"', !empty($context['custom_field']['can_see'][1]) && $context['custom_field']['can_see'][1] == 1 ? ' checked="checked"' : '', ' onchange="javascript:update_permissions(this.value,\'staff\');"/> <img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="icon" alt="', $txt['shd_admin_custom_field_staff'], '" title="', $txt['shd_admin_custom_field_staff'], '"/>
+								<input type="checkbox" name="see_users"', !empty($context['custom_field']['can_see'][0]) && $context['custom_field']['can_see'][0] == 1 ? ' checked="checked"' : '', ' onchange="javascript:update_permissions(this.value,\'users\');"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="icon" alt="', $txt['shd_admin_custom_field_users'], '" title="', $txt['shd_admin_custom_field_users'], '">
+								<input type="checkbox" name="see_staff"', !empty($context['custom_field']['can_see'][1]) && $context['custom_field']['can_see'][1] == 1 ? ' checked="checked"' : '', ' onchange="javascript:update_permissions(this.value,\'staff\');"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="icon" alt="', $txt['shd_admin_custom_field_staff'], '" title="', $txt['shd_admin_custom_field_staff'], '">
 								<input type="checkbox" name="see_admin" checked="checked" disabled="disabled"><img src="', $settings['default_images_url'], '/simpledesk/admin.png" class="icon" alt="', $txt['shd_admin_custom_field_admins'], '" title="', $txt['shd_admin_custom_field_admins'], '">
 							</dd>
 							<dt><strong>', $txt['shd_admin_custom_field_can_edit'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_can_edit_desc'], '</span></dt>
 							<dd>
-								<input type="checkbox" name="edit_users" id="edit_users"', !empty($context['custom_field']['can_edit'][0]) && $context['custom_field']['can_edit'][0] == 1 ? ' checked="checked"' : '', !empty($context['custom_field']['can_see'][0]) && $context['custom_field']['can_see'][0] == 1 ? '' : ' disabled="disabled"', '/> <img src="', $settings['default_images_url'], '/simpledesk/user.png" class="icon" alt="', $txt['shd_admin_custom_field_users'], '" title="', $txt['shd_admin_custom_field_users'], '"/>
-								<input type="checkbox" name="edit_staff" id="edit_staff"  ', !empty($context['custom_field']['can_edit'][1]) && $context['custom_field']['can_edit'][1] == 1 ? 'checked="checked"' : '', !empty($context['custom_field']['can_see'][1]) && $context['custom_field']['can_see'][1] == 1 ? '' : ' disabled="disabled"', '/> <img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="icon" alt="', $txt['shd_admin_custom_field_staff'], '" title="', $txt['shd_admin_custom_field_staff'], '"/>
-								<input type="checkbox" name="edit_admin"  checked="checked" disabled="disabled"> <img src="', $settings['default_images_url'], '/simpledesk/admin.png" class="icon" alt="', $txt['shd_admin_custom_field_admins'], '" title="', $txt['shd_admin_custom_field_admins'], '"/>
+								<input type="checkbox" name="edit_users" id="edit_users"', !empty($context['custom_field']['can_edit'][0]) && $context['custom_field']['can_edit'][0] == 1 ? ' checked="checked"' : '', !empty($context['custom_field']['can_see'][0]) && $context['custom_field']['can_see'][0] == 1 ? '' : ' disabled="disabled"', '><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="icon" alt="', $txt['shd_admin_custom_field_users'], '" title="', $txt['shd_admin_custom_field_users'], '">
+								<input type="checkbox" name="edit_staff" id="edit_staff"', !empty($context['custom_field']['can_edit'][1]) && $context['custom_field']['can_edit'][1] == 1 ? ' checked="checked"' : '', !empty($context['custom_field']['can_see'][1]) && $context['custom_field']['can_see'][1] == 1 ? '' : ' disabled="disabled"', '><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="icon" alt="', $txt['shd_admin_custom_field_staff'], '" title="', $txt['shd_admin_custom_field_staff'], '">
+								<input type="checkbox" name="edit_admin" checked="checked" disabled="disabled"><img src="', $settings['default_images_url'], '/simpledesk/admin.png" class="icon" alt="', $txt['shd_admin_custom_field_admins'], '" title="', $txt['shd_admin_custom_field_admins'], '">
 							</dd>
 						</dl>
 					</div>
@@ -297,42 +280,39 @@ function template_shd_custom_field_edit()
 								<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);">';
 
-	foreach ($context['field_types'] as $field => $details)
-	{
-		list($field_desc,) = $details;
+	foreach ($context['field_types'] as $field => list($field_desc,))
 		echo '
 									<option value="', $field, '"', ($context['field_type_value'] == $field ? ' selected="selected"' : ''), '>', $field_desc, '</option>';
-	}
 
 	echo '
 								</select>
 							</dd>
-							<dt id="max_length_dt"', in_array($context['field_type_value'], array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT)) ? '' : ' style="display: none;"', '><strong>', $txt['shd_admin_custom_field_maxlength'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_maxlength_desc'], '</span></dt>
-							<dd id="max_length_dd"', in_array($context['field_type_value'], array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT)) ? '' : ' style="display: none;"', '>
+							<dt id="max_length_dt"', in_array($context['field_type_value'], array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT)) ? '' : ' class="hidden"', '><strong>', $txt['shd_admin_custom_field_maxlength'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_maxlength_desc'], '</span></dt>
+							<dd id="max_length_dd"', in_array($context['field_type_value'], array(CFIELD_TYPE_TEXT, CFIELD_TYPE_LARGETEXT)) ? '' : ' class="hidden"', '>
 								<input type="text" value="', isset($context['custom_field']['field_length']) ? $context['custom_field']['field_length'] : 255, '" size="7" maxlength="6" name="field_length" id="cf_field_length">
 							</dd>
-							<dt id="dimension_dt"', $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' style="display: none;"', '>
+							<dt id="dimension_dt"', $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' class="hidden"', '>
 								<strong>', $txt['shd_admin_custom_field_dimensions'], ':</strong>
 							</dt>
-							<dd id="dimension_dd"', $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' style="display: none;"', '>
+							<dd id="dimension_dd"', $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' class="hidden"', '>
 								<strong>', $txt['shd_admin_custom_field_dimensions_rows'], ':</strong><input type="text" name="rows" value="', !empty($context['custom_field']['dimensions'][0]) ? $context['custom_field']['dimensions'][0] : 4, '" size="5" maxlength="3">
 								<strong>', $txt['shd_admin_custom_field_dimensions_columns'], ':</strong><input type="text" name="cols" value="', !empty($context['custom_field']['dimensions'][1]) ? $context['custom_field']['dimensions'][1] : 30, '" size="5" maxlength="3">
 							</dd>
-							<dt id="bbc_dt"', $context['field_type_value'] == CFIELD_TYPE_TEXT || $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' style="display: none;"', '><strong', empty($modSettings['shd_allow_ticket_bbc']) ? ' class="disabled"' : '', '>', $txt['shd_admin_custom_field_bbc'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_bbc_note'], '</span><br>', empty($modSettings['shd_allow_ticket_bbc']) ? '<span class="smalltext error">' . sprintf($txt['shd_admin_custom_field_bbc_off'], $scripturl . '?action=admin;area=helpdesk_options;sa=posting'). '</span>' : '', '</dt>
-							<dd id="bbc_dd"', $context['field_type_value'] == CFIELD_TYPE_TEXT || $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' style="display: none;"', '>
+							<dt id="bbc_dt"', $context['field_type_value'] == CFIELD_TYPE_TEXT || $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' class="hidden"', '><strong', empty($modSettings['shd_allow_ticket_bbc']) ? ' class="disabled"' : '', '>', $txt['shd_admin_custom_field_bbc'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_bbc_note'], '</span><br>', empty($modSettings['shd_allow_ticket_bbc']) ? '<span class="smalltext error">' . sprintf($txt['shd_admin_custom_field_bbc_off'], $scripturl . '?action=admin;area=helpdesk_options;sa=posting'). '</span>' : '', '</dt>
+							<dd id="bbc_dd"', $context['field_type_value'] == CFIELD_TYPE_TEXT || $context['field_type_value'] == CFIELD_TYPE_LARGETEXT ? '' : ' class="hidden"', '>
 								<input type="checkbox" name="bbc" id="cf_bbc"',empty($modSettings['shd_allow_ticket_bbc']) ? ' disabled="disabled"' : (!empty($context['custom_field']['bbc']) ? ' checked="checked"' : ''), '>
 							</dd>
-							<dt id="options_dt"', in_array($context['field_type_value'], array(CFIELD_TYPE_SELECT, CFIELD_TYPE_RADIO, CFIELD_TYPE_MULTI)) ? '' : ' style="display: none;"', '>
+							<dt id="options_dt"', in_array($context['field_type_value'], array(CFIELD_TYPE_SELECT, CFIELD_TYPE_RADIO, CFIELD_TYPE_MULTI)) ? '' : ' class="hidden"', '>
 								<strong>', $txt['shd_admin_custom_field_options'], ':</strong>
 								<div class="smalltext">
 									', $txt['shd_admin_custom_field_options_desc'], '
-									<span id="cf_options_radio_default"', $context['field_type_value'] == CFIELD_TYPE_SELECT || $context['field_type_value'] == CFIELD_TYPE_RADIO ? ' style=""' : ' style="display:none;"', '>', $txt['shd_admin_custom_field_options_radio'], '</span>
-									<span id="cf_options_multi_default"', $context['field_type_value'] == CFIELD_TYPE_MULTI ? ' style=""' : ' style="display:none;"', '>', $txt['shd_admin_custom_field_options_multi'], '</span>
+									<span id="cf_options_radio_default"', $context['field_type_value'] == CFIELD_TYPE_SELECT || $context['field_type_value'] == CFIELD_TYPE_RADIO ? '' : ' class="hidden"', '>', $txt['shd_admin_custom_field_options_radio'], '</span>
+									<span id="cf_options_multi_default"', $context['field_type_value'] == CFIELD_TYPE_MULTI ? '' : ' class="hidden"', '>', $txt['shd_admin_custom_field_options_multi'], '</span>
 								</div>
 							</dt>
-							<dd id="options_dd"', in_array($context['field_type_value'], array(CFIELD_TYPE_SELECT, CFIELD_TYPE_RADIO, CFIELD_TYPE_MULTI)) ? '' : ' style="display: none;"', '>								
-								<input type="radio" id="radio_0" name="default_select" value="0"', $context['custom_field']['default_value'] == 0 ? ' checked="checked"' : '', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' style="display:none;"', '>
-								<span id="radio_text_0"', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' style="display:none;"', '>', $txt['shd_admin_custom_field_no_selected_default'], '</span>
+							<dd id="options_dd"', in_array($context['field_type_value'], array(CFIELD_TYPE_SELECT, CFIELD_TYPE_RADIO, CFIELD_TYPE_MULTI)) ? '' : ' class="hidden"', '>								
+								<input type="radio" id="radio_0" name="default_select" value="0"', $context['custom_field']['default_value'] == 0 ? ' checked="checked"' : '', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' class="hidden"', '>
+								<span id="radio_text_0"', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' class="hidden"', '>', $txt['shd_admin_custom_field_no_selected_default'], '</span>
 								<div id="custom_fields_list">';
 
 	// Convert it to an array for displaying the main doodah
@@ -347,13 +327,13 @@ function template_shd_custom_field_edit()
 
 		echo '
 									<br id="break_', $k, '">
-									<input type="radio" id="radio_', $k, '" name="default_select" value="', $k, '"', $context['field_type_value'] != CFIELD_TYPE_MULTI && $context['custom_field']['default_value'] == $k ? ' checked="checked"' : '', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' style="display:none;"', '>
-									<input type="checkbox" id="multi_', $k, '" name="default_select_multi[', $k, ']" value="', $k, '"', $context['field_type_value'] == CFIELD_TYPE_MULTI && in_array($k, $context['custom_field']['default_value']) ? ' checked="checked"' : '', $context['field_type_value'] == CFIELD_TYPE_MULTI ? '' : ' style="display:none;"', '>
+									<input type="radio" id="radio_', $k, '" name="default_select" value="', $k, '"', $context['field_type_value'] != CFIELD_TYPE_MULTI && $context['custom_field']['default_value'] == $k ? ' checked="checked"' : '', $context['field_type_value'] != CFIELD_TYPE_MULTI ? '' : ' class="hidden"', '>
+									<input type="checkbox" id="multi_', $k, '" name="default_select_multi[', $k, ']" value="', $k, '"', $context['field_type_value'] == CFIELD_TYPE_MULTI && in_array($k, $context['custom_field']['default_value']) ? ' checked="checked"' : '', $context['field_type_value'] == CFIELD_TYPE_MULTI ? '' : ' class="hidden"', '>
 									<input type="text" id="option_', $k, '" name="select_option[', $k, ']" value="', $option, '">
 									<span id="order_', $k, '" class="custom_field_order"><input id="order_', $k, '_input" type="hidden" name="order[', $k, ']" value="', $order, '" data-key="', $k, '">';
 
-			echo '<a href="#" class="custom_field_move_up" data-key="', $k, '"', $context['custom_field']['order_first'] == $k ? ' style="display:none;"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" class="icon" alt="', $txt['custom_edit_order_up'], '" title="', $txt['custom_edit_order_up'], '"/></a>';
-			echo '<a href="#" class="custom_field_move_down" data-key="', $k, '"', $context['custom_field']['order_last'] == $k ? ' style="display:none;"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/move_down.png" class="icon" alt="', $txt['custom_edit_order_down'], '" title="', $txt['custom_edit_order_down'], '"/></a>';
+			echo '<a href="#" class="custom_field_move_up" data-key="', $k, '"', $context['custom_field']['order_first'] == $k ? ' style="display:none;"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/move_up.png" class="icon" alt="', $txt['custom_edit_order_up'], '" title="', $txt['custom_edit_order_up'], '"></a>';
+			echo '<a href="#" class="custom_field_move_down" data-key="', $k, '"', $context['custom_field']['order_last'] == $k ? ' style="display:none;"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/move_down.png" class="icon" alt="', $txt['custom_edit_order_down'], '" title="', $txt['custom_edit_order_down'], '"></a>';
 
 		echo '</span>';
 
@@ -364,16 +344,16 @@ function template_shd_custom_field_edit()
 								</div>
 								<span id="addopt_link">[<a href="" onclick="add_option(); return false;">', $txt['more'], '</a>]</span>
 							</dd>
-							<dt id="default_dt"', $context['field_type_value'] == CFIELD_TYPE_CHECKBOX ? '' : ' style="display: none;"', '>
+							<dt id="default_dt"', $context['field_type_value'] == CFIELD_TYPE_CHECKBOX ? '' : ' class="hidden"', '>
 								<strong>', $txt['shd_admin_custom_field_default_state'], ':</strong>
 							</dt>
-							<dd id="default_dd"', $context['field_type_value'] == CFIELD_TYPE_CHECKBOX ? '' : ' style="display: none;"', '>
+							<dd id="default_dd"', $context['field_type_value'] == CFIELD_TYPE_CHECKBOX ? '' : ' class="hidden"', '>
 								<input type="checkbox" name="default_check" ',($context['custom_field']['default_value'] == 1 ? ' checked="checked"' : ''), ' onclick="update_default_label(this.checked);">
 								<span class="smalltext" id="default_label">', $txt['shd_admin_default_state_' . ($context['custom_field']['default_value'] == 1 ? 'on' : 'off')], '</span>
 							</dd>
 							<dt id="display_empty_dt"><strong>', $txt['shd_admin_custom_field_display_empty'], ':</strong><br><span class="smalltext">', $txt['shd_admin_custom_field_display_empty_desc'], '</span></dt>
 							<dd id="display_empty_dd">
-								<input type="checkbox" ', (!empty($context['custom_field']['display_empty']) && $context['custom_field']['display_empty'] == 1 ? ' checked="checked"' : ''), ' name="display_empty" id="cf_display_empty"', (!empty($context['custom_field']['required']) && $context['custom_field']['required'] == 1 ? ' disabled="disabled"' : ''), '/>
+								<input type="checkbox" ', (!empty($context['custom_field']['display_empty']) && $context['custom_field']['display_empty'] == 1 ? ' checked="checked"' : ''), ' name="display_empty" id="cf_display_empty"', (!empty($context['custom_field']['required']) && $context['custom_field']['required'] == 1 ? ' disabled="disabled"' : ''), '>
 							</dd>
 						</dl>
 					</div>';

sd_template/SimpleDesk-AdminDepartments.template.php

View file @ 1d762ea

@@ -130,7 +130,7 @@ function template_shd_create_dept()
 					<dd><textarea name="dept_desc" rows="3" cols="35" style="width: 99%"></textarea></dd>
 					<dt><strong>', $txt['shd_dept_boardindex_cat'], '</strong></dt>
 					<dd>
-						<select name="dept_cat" id="dept_cat" onchange="document.getElementById(\'dept_beforeafter\').disabled = (this.value == 0);">';
+						<select name="dept_cat" id="dept_cat" onchange="$(\'#dept_beforeafter\').attr(\'disabled\' ? (this.value == 0));">';
 
 	foreach ($context['shd_cat_list'] as $id_cat => $cat_name)
 		echo '
@@ -180,10 +180,10 @@ function template_shd_edit_dept()
 					<dt><strong>', $txt['shd_department_name'], '</strong></dt>
 					<dd><input type="text" name="dept_name" id="dept_name" value="', $context['shd_dept']['dept_name'], '" size="30"></dd>
 					<dt><strong>', $txt['shd_dept_description'], '</strong></dt>
-					<dd><textarea name="dept_desc" rows="3" cols="35" style="width: 99%">', $context['shd_dept']['description'], '</textarea></dd>
+					<dd><textarea name="dept_desc" rows="3" cols="35">', $context['shd_dept']['description'], '</textarea></dd>
 					<dt><strong>', $txt['shd_dept_boardindex_cat'], '</strong></dt>
 					<dd>
-						<select name="dept_cat" id="dept_cat" onchange="document.getElementById(\'dept_beforeafter\').disabled = (this.value == 0);">';
+						<select name="dept_cat" id="dept_cat" onchange="$(\'#dept_beforeafter\').attr(\'disabled\' ? (this.value == 0));">';
 
 	foreach ($context['shd_cat_list'] as $id_cat => $cat_name)
 		echo '
@@ -263,7 +263,7 @@ function template_shd_edit_dept()
 				<br>
 			</div>
 			<div class="floatleft">
-				<input type="submit" value="', $txt['shd_edit_dept'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+				<input type="submit" value="', $txt['shd_edit_dept'], '" accesskey="s" class="button save">
 				<input type="submit" value="', $txt['shd_delete_dept'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_delete_dept_confirm']) . ');" name="delete" class="button">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				<input type="hidden" name="dept" value="', $context['shd_dept']['id_dept'], '">

sd_template/SimpleDesk-AdminMaint.template.php

View file @ 1d762ea

@@ -40,40 +40,9 @@ function template_shd_admin_maint_home()
 
 		function checkAttributeValidity()
 		{
-			origText = \'', $txt['shd_reattribute_confirm'], '\';
-			origTextStarter = \'', $txt['shd_reattribute_confirm_starter'], '\';
-			valid = true;
 
-			// Do all the fields!
-			if (!document.getElementById(\'to\').value)
-				valid = false;
-			warningMessage = origText.replace(/%member_to%/, document.getElementById(\'to\').value);
-
-			if (document.getElementById(\'type_email\').checked)
-			{
-				if (!document.getElementById(\'from_email\').value)
-					valid = false;
-				warningMessage = warningMessage.replace(/%type%/, \'', addcslashes($txt['shd_reattribute_confirm_email'], "'"), '\').replace(/%find%/, document.getElementById(\'from_email\').value);
-			}
-			else if (document.getElementById(\'type_starter\').checked)
-			{
-				if (!document.getElementById(\'from_starter\').value)
-					valid = false;
-				warningMessage = origTextStarter.replace(/%member_to%/, document.getElementById(\'to\').value).replace(/%find%/, document.getElementById(\'from_starter\').value);			
-			}
-			else
-			{
-				if (!document.getElementById(\'from_name\').value)
-					valid = false;
-				warningMessage = warningMessage.replace(/%type%/, \'', addcslashes($txt['shd_reattribute_confirm_username'], "'"), '\').replace(/%find%/, document.getElementById(\'from_name\').value);
 		}
-
-			document.getElementById(\'do_attribute\').disabled = valid ? \'\' : \'disabled\';
-
-			setTimeout("checkAttributeValidity();", 500);
-			return valid;
-		}
-		setTimeout("checkAttributeValidity();", 500);
+		/*setTimeout("checkAttributeValidity();", 500);*/
 		// ]]></script>
 		<div class="cat_bar">
 			<h3 class="catbg">
@@ -92,19 +62,21 @@ function template_shd_admin_maint_home()
 						<label for="type_email"><input type="radio" name="type" id="type_email" value="email" checked="checked">', $txt['shd_admin_maint_reattribute_posts_email'], '</label>
 					</dt>
 					<dd>
-						<input type="text" name="from_email" id="from_email" value="" onclick="document.getElementById(\'type_email\').checked = \'checked\'; document.getElementById(\'from_name\').value = \'\'; document.getElementById(\'from_starter\').value = \'\';">
+						<input type="text" name="from_email" id="from_email" value="">
 					</dd>
+
 					<dt>
 						<label for="type_name"><input type="radio" name="type" id="type_name" value="name">', $txt['shd_admin_maint_reattribute_posts_user'], '</label>
 					</dt>
 					<dd>
-						<input type="text" name="from_name" id="from_name" value="" onclick="document.getElementById(\'type_name\').checked = \'checked\'; document.getElementById(\'from_email\').value = \'\'; document.getElementById(\'from_starter\').value = \'\';" >
+						<input type="text" name="from_name" id="from_name" value="">
 					</dd>
+
 					<dt>
 						<label for="type_name"><input type="radio" name="type" id="type_starter" value="starter">', $txt['shd_admin_maint_reattribute_posts_starter'], '</label>
 					</dt>
 					<dd>
-						<input type="text" name="from_starter" id="from_starter" value="" onclick="document.getElementById(\'type_starter\').checked = \'checked\'; document.getElementById(\'from_email\').value = \'\'; document.getElementById(\'from_name\').value = \'\';" >
+						<input type="text" name="from_starter" id="from_starter" value="">
 					</dd>
 				</dl>
 				<dl class="settings">
@@ -115,32 +87,47 @@ function template_shd_admin_maint_home()
 						<input type="text" name="to" id="to" value="">
 					</dd>
 				</dl>
-				<input type="submit" id="do_attribute" value="', $txt['shd_admin_maint_reattribute_btn'], '" onclick="if (!checkAttributeValidity()) return false; return confirm(warningMessage);" class="button">
+				<input type="submit" id="do_attribute" value="', $txt['shd_admin_maint_reattribute_btn'], '" onclicks="if (!checkAttributeValidity()) return false; return confirm(warningMessage);" class="button">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</form>
 		</div>
 		<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?rc5"></script>
 		<script type="text/javascript"><!-- // --><![CDATA[
 			var oAttributeMemberSuggest = new smc_AutoSuggest({
-				sSelf: \'oAttributeMemberSuggest\',
-				sSessionId: \'', $context['session_id'], '\',
-				sSessionVar: \'', $context['session_var'], '\',
-				sSuggestId: \'attributeMember\',
-				sControlId: \'to\',
-				sSearchType: \'member\',
-				sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
+				sSelf: "oAttributeMemberSuggest",
+				sSessionId: "', $context['session_id'], '",
+				sSessionVar: "', $context['session_var'], '",
+				sSuggestId: "attributeMember",
+				sControlId: "to",
+				sSearchType: "member",
+				sTextDeleteItem: ', JavaScriptEscape($txt['autosuggest_delete_item']), ',
 				bItemList: false
 			});
 			var oAttributeMemberSuggestStarter = new smc_AutoSuggest({
-				sSelf: \'oAttributeMemberSuggestStarter\',
-				sSessionId: \'', $context['session_id'], '\',
-				sSessionVar: \'', $context['session_var'], '\',
-				sSuggestId: \'attributeStarter\',
-				sControlId: \'from_starter\',
-				sSearchType: \'member\',
-				sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
+				sSelf: "oAttributeMemberSuggestStarter",
+				sSessionId: "', $context['session_id'], '",
+				sSessionVar: "', $context['session_var'], '",
+				sSuggestId: "attributeStarter",
+				sControlId: "from_starter",
+				sSearchType: "member",
+				sTextDeleteItem: ', JavaScriptEscape($txt['autosuggest_delete_item']), ',
 				bItemList: false
 			});
+
+			var oAttributeValidator = new shd_AttributeValidate({
+				sOrigText: ', JavaScriptEscape($txt['shd_reattribute_confirm']), ',
+				sOrigTextStarter: ', JavaScriptEscape($txt['shd_reattribute_confirm_starter']), ',
+				sDoAttributeContainerId: "do_attribute",
+				sToContainerId: "to",
+				sTypeEmailContainerId: "type_email",
+				sEmailContainerId: "from_email",
+				sEmailConfirmText: ', JavaScriptEscape($txt['shd_reattribute_confirm_email']), ',
+				sTypeStarterContainerId: "type_starter",
+				sStarterContainerId: "from_starter",
+				sTypeFromContainerId: "type_name",
+				sFromContainerId: "from_name",
+				sFromConfirmText: ', JavaScriptEscape($txt['shd_reattribute_confirm_username']), ',
+			});
 		// ]]></script>';
 
 	// Moving home?
@@ -184,7 +171,7 @@ function template_shd_admin_maint_home()
 					<dt><input type="checkbox" id="movelast_less" name="movelast_less"> ', sprintf($txt['shd_admin_maint_massdeptmove_lastupd_less'], '<input type="text" name="movelast_less_days" value="30" size="3">'), '</dt>
 					<dt><input type="checkbox" id="movelast_more" name="movelast_more"> ', sprintf($txt['shd_admin_maint_massdeptmove_lastupd_more'], '<input type="text" name="movelast_more_days" value="30" size="3">'), '</dt>
 				</dl>
-				<input type="submit" value="', $txt['shd_admin_maint_massdeptmove'], '" onclick="return submitThisOnce(this);" class="button">
+				<input type="submit" value="', $txt['shd_admin_maint_massdeptmove'], '" class="button save">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</form>
 		</div>';
@@ -195,16 +182,14 @@ function template_shd_admin_maint_findrepairdone()
 {
 	global $context, $settings, $txt, $scripturl;
 
-	if (empty($context['maintenance_result']))
-	{
 	// Yay everything was fine.
+	if (empty($context['maintenance_result']))
 		echo '
 		<div class="windowbg">
 			', $txt['maintain_no_errors'], '
 			<br>
 			<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
 		</div>';
-	}
 	else
 	{
 		echo '
@@ -214,27 +199,10 @@ function template_shd_admin_maint_findrepairdone()
 
 		// Heh, super squeeky buns time!
 		// Each test has potentially its own feedback to give. So we'll handle each one separately.
-		if (!empty($context['maintenance_result']['zero_tickets']))
-			echo '
-				<p class="padding">', sprintf($txt['shd_maint_zero_tickets'], $context['maintenance_result']['zero_tickets']), '</p>';
-		if (!empty($context['maintenance_result']['zero_msgs']))
-			echo '
-				<p class="padding">', sprintf($txt['shd_maint_zero_msgs'], $context['maintenance_result']['zero_msgs']), '</p>';
-		if (!empty($context['maintenance_result']['deleted']))
-			echo '
-				<p class="padding">', sprintf($txt['shd_maint_deleted'], $context['maintenance_result']['deleted']), '</p>';
-		if (!empty($context['maintenance_result']['first_last']))
-			echo '
-				<p class="padding">', sprintf($txt['shd_maint_first_last'], $context['maintenance_result']['first_last']), '</p>';
-		if (!empty($context['maintenance_result']['status']))
-			echo '
-				<p class="padding">', sprintf($txt['shd_maint_status'], $context['maintenance_result']['status']), '</p>';
-		if (!empty($context['maintenance_result']['starter_updater']))
-			echo '
-				<p class="padding">', sprintf($txt['shd_maint_starter_updater'], $context['maintenance_result']['starter_updater']), '</p>';
-		if (!empty($context['maintenance_result']['invalid_dept']))
+		foreach (array('zero_tickets', 'zero_msgs', 'deleted', 'first_last', 'status', 'starter_updater', 'invalid_dept') as $maintResult)
+			if (!empty($context['maintenance_result'][$maintResult]))
 				echo '
-				<p class="padding">', sprintf($txt['shd_maint_invalid_dept'], $context['maintenance_result']['invalid_dept']), '</p>';
+				<p class="padding">', sprintf($txt['shd_maint_' . $maintTxt], $context['maintenance_result'][$maintResult]), '</p>';
 
 		echo '
 				<p class="padding">
@@ -319,7 +287,7 @@ function template_shd_admin_maint_search()
 						<input type="text" name="shd_search_max_size" size="4" value="', $modSettings['shd_search_max_size'], '">
 					</dd>
 					<dt>
-						<a id="setting_shd_search_prefix_size" href="', $scripturl, '?action=helpadmin;help=shd_search_prefix_size_help" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="?"></a>
+						<a id="setting_shd_search_prefix_size" href="', $scripturl, '?action=helpadmin;help=shd_search_prefix_size_help" class="help shd_help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="?"></a>
 						<span>', $txt['shd_search_prefix_size'], '</span>
 					</dt>
 					<dd>

sd_template/SimpleDesk-AdminPermissions.template.php

View file @ 1d762ea

@@ -43,7 +43,6 @@ function template_shd_permissions_home()
 			</tr>';
 
 	foreach ($context['shd_permissions']['roles'] as $role_id => $role_details)
-	{
 		echo '
 			<tr class="windowbg">
 				<td>', !empty($role_details['icon']) ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/' . $role_details['icon'] . '" alt="">') : '', '</td>
@@ -53,7 +52,6 @@ function template_shd_permissions_home()
 				</td>
 				', template_shd_display_permission_list($role_details['permissions']), '
 			</tr>';
-	}
 
 	echo '
 		</table>
@@ -75,12 +73,10 @@ function template_shd_permissions_home()
 			</tr>';
 
 	if (empty($context['shd_permissions']['user_defined_roles']))
-	{
 		echo '
 			<tr class="windowbg">
 				<td colspan="', count($context['shd_permissions']['group_display']) + 4, '" class="centertext">', $txt['shd_no_defined_roles'], '</td>
 			</tr>';
-	}
 	else
 	{
 		foreach ($context['shd_permissions']['user_defined_roles'] as $role => $role_details)
@@ -136,13 +132,11 @@ function template_shd_display_permission_list($permissions)
 	global $context, $txt, $settings;
 	$permission_set = array();
 
-	foreach ($context['shd_permissions']['permission_list'] as $permission => $details)
+	foreach ($context['shd_permissions']['permission_list'] as $permission => list($ownany, $group, $icon))
 	{
-		list($ownany, $group, $icon) = $details;
 		if (empty($icon))
 			continue;
-
-		if (empty($permission_set[$group]))
+		elseif (empty($permission_set[$group]))
 			$permission_set[$group] = array();
 
 		$permtitle = '';
@@ -161,10 +155,8 @@ function template_shd_display_permission_list($permissions)
 			}
 		}
 		else
-		{
 			if (!empty($permissions[$permission]) && $permissions[$permission] == ROLEPERM_ALLOW)
 				$permtitle = empty($txt['permissionname_' . $permission]) ? '' : $txt['permissionname_' . $permission];
-		}
 
 		if (!empty($permtitle))
 			$permission_set[$group][] = '<img src="' . shd_image_url($icon) . '" alt="" title="' . $permtitle . '">';
@@ -176,10 +168,8 @@ function template_shd_display_permission_list($permissions)
 							<td class="shd_valign_top">';
 
 		foreach ($rows as $rowitem => $rowicon)
-		{
 			if (!empty($permission_set[$rowitem]))
 				echo $txt['shd_permgroup_short_' . $rowitem], ': ', implode(' ', $permission_set[$rowitem]), '<br>';
-		}
 
 		echo '</td>';
 	}
@@ -221,7 +211,7 @@ function template_shd_create_role()
 					<dt><strong>', $txt['shd_create_name'], '</strong></dt>
 					<dd><input type="text" name="rolename" id="rolename" value="" size="30"></dd>
 				</dl>
-				<input type="submit" value="', $txt['shd_create_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+				<input type="submit" value="', $txt['shd_create_role'], '" accesskey="s" class="button save">
 				<input type="hidden" name="template" value="', $context['role_template_id'], '">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">
@@ -253,45 +243,8 @@ function template_shd_edit_role()
 			', $txt['shd_admin_permissions_homedesc'], '
 		</div>
 		<script type="text/javascript"><!-- // --><![CDATA[
-		function shd_chicon(obj)
-		{
-			var sSelect = document.getElementById(obj.id).value;
-			var newClass = "";
-			switch(sSelect)
-			{
-				case "disallow":
-					newClass = "shd_no"; break;
-				case "allow":
-					newClass = "shd_yes"; break;
-				case "allow_own":
-					newClass = "shd_own"; break;
-				case "allow_any":
-					newClass = "shd_any"; break;
-				default:
-					newClass = ""; break;
-			}
-			document.getElementById(obj.id + "_icon").setAttribute("class", newClass);
-		}
 
-		function shd_toggleblock(block)
-		{
-			var collapsed = (document.getElementById("permheader_" + block).getAttribute("class") == "cat_bar");
-			if (collapsed)
-			{
-				document.getElementById("permheader_" + block).setAttribute("class", "cat_bar cat_collapsed");
-				document.getElementById("permcontent_" + block).style.display = "";
-				document.getElementById("permfooter_" + block).style.display = "";
-				document.getElementById("permexpandicon_" + block).src = ', JavaScriptEscape($settings['images_url'] . '/selected_open.png'), ';
-			}
-			else
-			{
-				document.getElementById("permheader_" + block).setAttribute("class", "cat_bar");
-				document.getElementById("permcontent_" + block).style.display = "none";
-				document.getElementById("permfooter_" + block).style.display = "none";
-				document.getElementById("permexpandicon_" + block).src = ', JavaScriptEscape($settings['images_url'] . '/selected.png'), ';
-			}
-			document.getElementById("permexpandicon_" + block).style.display = "";
-		}
+
 
 		// ]', ']></script>
 		<form action="', $scripturl, '?action=admin;area=helpdesk_permissions;sa=saverole" method="post">
@@ -317,13 +270,10 @@ function template_shd_edit_role()
 	// Get ready to display the actual permissions
 	$permission_set = array();
 	foreach ($context['shd_permissions']['permission_list'] as $permission => $details)
-	{
 		if (!empty($details[2]))
 			$permission_set[$details[1]][] = $permission;
-	}
 
 	$displayed_sets = array();
-
 	foreach ($context['shd_permissions']['group_display'] as $cell => $rows)
 	{
 		echo '
@@ -340,12 +289,12 @@ function template_shd_edit_role()
 				<div class="cat_bar" id="permheader_', $rowitem, '">
 					<h3 class="catbg">
 						<span class="floatright">
-							<a class="permcollapse" href="#" onclick="shd_toggleblock(\'', $rowitem, '\'); return false;">
+							<a class="permcollapse" href="#" data-block="', $rowitem, '">
 								<img src="', $settings['images_url'], '/selected_open.png" id="permexpandicon_', $rowitem, '" style="display:none;">
 							</a>
 						</span>
 						<img src="', $settings['default_images_url'], '/simpledesk/', $rowicon, '" alt="*">
-						<a href="#" onclick="shd_toggleblock(\'', $rowitem, '\'); return false;">', $txt['shd_permgroup_' . $rowitem], '</a>
+						<a href="#" data-block="', $rowitem, '">', $txt['shd_permgroup_' . $rowitem], '</a>
 					</h3>
 				</div>
 				<div class="roundframe" id="permcontent_', $rowitem, '">
@@ -377,20 +326,16 @@ function template_shd_edit_role()
 						<dt', (empty($txt['permissionhelp_' . $permission]) ? '' : ' title="' . $txt['permissionhelp_' . $permission] . '"') . '><img src="', shd_image_url($icon), '" alt="*">', $txt['permissionname_' . $permission], '</dt>
 						<dd>
 							<span id="perm_', $permission, '_icon" class="', $perm_class, '"></span>
-							<select name="perm_', $permission, '" id="perm_', $permission, '" onchange="javascript:shd_chicon(this);">
+							<select name="perm_', $permission, '" id="perm_', $permission, '">
 								<option value="disallow"', ($perm_value == 'disallow' ? ' selected="selected"' : ''), '>', (empty($txt['permissionname_' . $permission . '_no']) ? $txt['shd_roleperm_disallow'] : $txt['permissionname_' . $permission . '_no']), '&nbsp;</option>';
 
 				if ($ownany)
-				{
 					echo '
 								<option value="allow_own"', ($perm_value == 'allow_own' ? ' selected="selected"' : ''), '>', $txt['permissionname_' . $permission . '_own'], '&nbsp;</option>
 								<option value="allow_any"', ($perm_value == 'allow_any' ? ' selected="selected"' : ''), '>', $txt['permissionname_' . $permission . '_any'], '&nbsp;</option>';
-				}
 				else
-				{
 					echo '
 								<option value="allow"', ($perm_value == 'allow' ? ' selected="selected"' : ''), '>', (empty($txt['permissionname_' . $permission . '_yes']) ? $txt['shd_roleperm_allow'] : $txt['permissionname_' . $permission . '_yes']), '&nbsp;</option>';
-				}
 
 				echo '
 							</select>
@@ -408,25 +353,8 @@ function template_shd_edit_role()
 			</div>';
 	}
 
-	if (!empty($displayed_sets))
-	{
-		echo '
-				<script type="text/javascript"><!-- // --><![CDATA[';
-
-		if (!empty($displayed_sets))
-			echo '
-				var hidden_blocks = ["', implode('","', $displayed_sets), '"];
-				for (i in hidden_blocks)
-				{
-					shd_toggleblock(hidden_blocks[i]);
-				}';
-
-		echo '
-				// ]', ']></script>';
-	}
-
 	echo '
-		<div class="floatleft" style="width: 100%;">
+		<div class="floatleft">
 			<div class="cat_bar">
 				<h3 class="catbg">
 					<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*">
@@ -484,22 +412,40 @@ function template_shd_edit_role()
 					</tr>';
 
 	foreach ($context['role_depts'] as $id_dept => $dept)
-	{
 		echo '
 					<tr class="windowbg">
 						<td>', $dept['dept_name'], '</td>
 						<td><input type="checkbox" name="dept', $id_dept, '"', !empty($dept['is_role']) ? ' checked="checked"' : '', '></td>
 					</tr>';
-	}
 
 	echo '
 				</table>
 			</div>
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			<input type="hidden" name="role" value="', $context['shd_role_id'], '">
-			<input type="submit" value="', $txt['shd_edit_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
-			<input type="submit" value="', $txt['shd_delete_role'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_delete_role_confirm']) . ');" name="delete" class="button">
-		</form>';
+			<input type="submit" value="', $txt['shd_edit_role'], '" accesskey="s" class="button save">
+			<input type="submit" value="', $txt['shd_delete_role'], '" name="delete" class="button" id="delete" onclick="return confirm(\"Shall\");">
+		</form>
+
+		<script type="text/javascript"><!-- // --><![CDATA[
+			var oRoles = new shd_role({
+				sPermissionDisallowClass: "shd_no",
+				sPermissionAllowClass: "shd_yes",
+				sPermissionAllowOwnClass: "shd_own",
+				sPermissionAllowAnyClass: "shd_any",
+
+				oHiddenBlocks: [', !empty($displayed_sets) ? '"' . implode('","', $displayed_sets) . '"' : '', '],
+				sBlockHeader: "permheader_%block%",
+				sBlockContent: "permcontent_%block%",
+				sBlockFooter: "permfooter_%block%",
+				sBlockIcon: "permexpandicon_%block%",
+				sBlockIconExpandedImg: ', JavaScriptEscape($settings['images_url'] . '/selected_open.png'), ',
+				sBlockIconCollapsedImg: ', JavaScriptEscape($settings['images_url'] . '/selected.png'), ',
+
+				sDeleteContainerId: "delete",
+				sDeleteConfirmText: ', JavaScriptEscape($txt['shd_delete_role_confirm']), ',
+			});
+		// ]]></script>';
 }
 
 /**
@@ -540,7 +486,7 @@ function template_shd_copy_role()
 					<dt><strong>', $txt['shd_copy_role_groups'], '</strong></dt>
 					<dd><input type="checkbox" name="copygroups" id="copygroups" value="1"></dd>
 				</dl>
-				<input type="submit" value="', $txt['shd_copy_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+				<input type="submit" value="', $txt['shd_copy_role'], '" accesskey="s" class="button save">
 				<input type="hidden" name="role" value="', $context['shd_role_id'], '">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">

sd_template/SimpleDesk-AdminPlugins.template.php

View file @ 1d762ea

@@ -51,18 +51,17 @@ function template_shd_plugin_listing()
 	foreach ($context['plugins'] as $id => $plugin)
 	{
 		echo '
-			<div class="windowbg">
+			<div class="windowbg shd_plugins">
 				<div class="features">';
 
 		if (!empty($plugin['installable']))
 			echo '
 					<div class="features_switch" id="js_feature_', $id, '" style="display: none;">
-						<a href="', $scripturl, '?action=admin;area=helpdesk_plugins;save;', $context['session_var'], '=', $context['session_id'], ';toggle=', $id, ';state=', $plugin['enabled'] ? 0 : 1, '" onclick="return toggleItem(\'', $id, '\', \'', $settings['images_url'], '\', \'', $txt['shd_admin_plugins_on'], '\',  \'', $txt['shd_admin_plugins_off'], '\');">
-							<input type="hidden" name="feature_', $id, '" id="feature_', $id, '" value="', $plugin['enabled'] ? 1 : 0, '"><img src="', $settings['images_url'], '/simpledesk/switch_', $plugin['enabled'] ? 'on' : 'off', '.png" id="switch_', $id, '" style="margin-top: 1.3em;" alt="', $txt['shd_admin_plugins_' . ($plugin['enabled'] ? 'off' : 'on')], '" title="', $txt['shd_admin_plugins_' . ($plugin['enabled'] ? 'off' : 'on')], '">
+						<a href="', $scripturl, '?action=admin;area=helpdesk_plugins;save;', $context['session_var'], '=', $context['session_id'], ';toggle=', $id, ';state=', $plugin['enabled'] ? 0 : 1, '" data-plugin="', $id, '">
+							<input type="hidden" name="feature_', $id, '" id="feature_', $id, '" value="', $plugin['enabled'] ? 1 : 0, '"><img src="', $settings['images_url'], '/simpledesk/switch_', $plugin['enabled'] ? 'on' : 'off', '.png" id="switch_', $id, '" alt="', $txt['shd_admin_plugins_' . ($plugin['enabled'] ? 'off' : 'on')], '" title="', $txt['shd_admin_plugins_' . ($plugin['enabled'] ? 'off' : 'on')], '">
 						</a>
 					</div>';
 		else
-		{
 			echo '
 					<div class="features_switch" id="js_feature_', $id, '">
 						<div class="error">', $txt['shd_admin_plugins_wrong_version'], '</div>
@@ -71,18 +70,17 @@ function template_shd_plugin_listing()
 							<li>', implode('</li><li>', $plugin['details']['compatibility']), '</li>
 						</ul>
 					</div>';
-		}
 
 		if (!empty($plugin['languages']))
 		{
 			echo '
 					<div class="langblock">', $txt['shd_admin_plugins_languages'], ':<br>';
+
 			foreach ($plugin['languages'] as $language)
-			{
 				if (!empty($txt['shd_admin_plugins_lang_' . $language]))
 					echo '
 						<img src="', $settings['default_images_url'], '/simpledesk/flags/', $language, '.png" alt="', $txt['shd_admin_plugins_lang_' . $language], '" title="', $txt['shd_admin_plugins_lang_' . $language], '">';
-			}
+
 			echo '
 					</div>';
 		}
@@ -116,14 +115,27 @@ function template_shd_plugin_listing()
 		</form>
 	</div>
 	<script type="text/javascript"><!-- // --><![CDATA[
-		document.getElementById(\'js_worked\').value = "1";';
+		var installablePlugins = [];';
+
 		foreach ($context['plugins'] as $id => $plugin)
-		{
 			if (!empty($plugin['installable']))
 				echo '
-		document.getElementById(\'js_feature_', $id, '\').style.display = "";
-		document.getElementById(\'plain_feature_', $id, '\').style.display = "none";';
-		}
+		installablePlugins.push(', JavaScriptEscape($id), ');';
+
 	echo '
+		var oPlugins = new shd_plugins({
+			sJSworkedID: "js_worked",
+			sJSFeatureClass: "js_feature_%itemid%",
+			sJSPlainFeatureClass: "plain_feature_%itemid%",
+			oJSInstallablePlugins: installablePlugins,
+			sFeaturesSwitchClass: "features_switch",
+			sFeatureClass: "feature_%itemid%",
+			sSwitchClass: "switch_%itemid%",
+			sPluginOffText: ', JavaScriptEscape($txt['shd_admin_plugins_off']), ',
+			sPluginOnText: ', JavaScriptEscape($txt['shd_admin_plugins_on']), ',
+			sPluginOnImg: ', JavaScriptEscape($settings['images_url'] . '/simpledesk/switch_on.png'), ',
+			sPluginOffImg: ', JavaScriptEscape($settings['images_url'] . '/simpledesk/switch_off.png'), ',
+
+		});
 	// ]]></script>';
 }
\ No newline at end of file

sd_template/SimpleDesk-Assign.template.php

View file @ 1d762ea

@@ -36,7 +36,7 @@ function template_assign()
 		</h3>
 	</div>
 	<div class="roundframe">
-		<form action="', $scripturl, '?action=helpdesk;sa=assign2;ticket=', $context['ticket_id'], '" method="post" onsubmit="submitonce(this);">
+		<form action="', $scripturl, '?action=helpdesk;sa=assign2;ticket=', $context['ticket_id'], '" method="post">
 			<dl class="settings">
 				<dt>
 					<strong>', $txt['shd_ticket_assignedto'], ':</strong>
@@ -58,8 +58,8 @@ function template_assign()
 					</select>
 				</dd>
 			</dl>
-			<input type="submit" name="cancel" value="', ($context['shd_return_to'] == 'home' ? $txt['shd_cancel_home'] : $txt['shd_cancel_ticket']), '" accesskey="c" class="button">
-			<input type="submit" value="', $txt['shd_ticket_assign_ticket'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+			<input type="submit" name="cancel" value="', ($context['shd_return_to'] == 'home' ? $txt['shd_cancel_home'] : $txt['shd_cancel_ticket']), '" accesskey="c" class="button save">
+			<input type="submit" value="', $txt['shd_ticket_assign_ticket'], '" accesskey="s" class="button save">
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	if ($context['shd_return_to'] == 'home')

sd_template/SimpleDesk-Display.template.php

View file @ 1d762ea

@@ -26,33 +26,29 @@ function template_viewticket()
 {
 	global $context, $txt, $scripturl, $settings, $modSettings, $options;
 
-	// Back to the helpdesk.
-	template_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']));
-
+	// SMF style icons go first.
 	if ($modSettings['shd_ticketnav_style'] == 'smf')
-	{
 		template_button_strip($context['ticket_navigation'], 'right');
-	}
+
+	// Back to the helpdesk.
+	template_button_strip(array($context['navigation']['back'], $context['navigation']['replies'], $context['navigation']['ticketlog']));
 
 	echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatright smalltext shd_ticketlinks" id="ticket">';
 
+	// SimpleDesk style Icons go here.
 	if ($modSettings['shd_ticketnav_style'] == 'sd')
-	{
 		foreach ($context['ticket_navigation'] as $button)
 			if (!empty($button['display']))
 				echo '
 					<a href="', $button['url'], '"', (!empty($button['is_last']) ? ' id="last"' : ''), '', (!empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : ''), '><img src="', $settings['default_images_url'], '/simpledesk/', $button['icon'], '.png" alt="', $button['alt'], '" title="', $txt[$button['text']], '"> ', $txt[$button['text']], '</a>';
-	}
 	elseif ($modSettings['shd_ticketnav_style'] == 'sdcompact')
-	{
 		foreach ($context['ticket_navigation'] as $button)
 			if (!empty($button['display']))
 				echo '
 					<a href="', $button['url'], '"', (!empty($button['is_last']) ? ' id="last"' : ''), '', (!empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : ''), '><img src="', $settings['default_images_url'], '/simpledesk/', $button['icon'], '.png" alt="', $button['alt'], '" title="', $txt[$button['text']], '"></a>';
-	}
 
 	echo '
 				</span>
@@ -82,9 +78,9 @@ function template_viewticket()
 						<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><span id="assigned_button"></span></dd>
 						<dt class="shd_assignees_list">
-							<ul id="assigned_list" style="display:none;"></ul>
+							<ul id="assigned_list" class="hidden"></ul>
 						</dt>
-						<dt><img src="', $settings['default_images_url'], '/simpledesk/status.png" alt="" class="shd_smallicon"/> ', $txt['shd_ticket_status'], ':</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>
 						<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>';
@@ -128,7 +124,7 @@ function template_viewticket()
 						{
 							echo '
 								<li>
-									<dl>
+									<dl class="stats">
 										<dt>', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="" class="shd_smallicon">' : '', ' ', $field['name'], ':</dt>
 										<dd>';
 
@@ -178,7 +174,7 @@ function template_viewticket()
 				if ($content)
 				{
 					echo '
-					<div class="information shd_additional_details">
+					<div class="shd_additional_details">
 						<strong><img src="', $settings['default_images_url'], '/simpledesk/additional_details.png" alt="" class="shd_smallicon shd_icon_minihead"> ', $txt['shd_ticket_additional_details'], '</strong>
 						<hr>
 							<ul>';
@@ -273,12 +269,10 @@ function template_viewticket()
 							', $context['ticket']['body'];
 
 			if (!empty($modSettings['show_modify']) && !empty($context['ticket']['modified']))
-			{
 				echo '
 						<div class="smalltext shd_modified">
 							&#171; <em>', sprintf($txt['last_edit_by'], $context['ticket']['modified']['time'], $context['ticket']['modified']['link']), '</em> &#187;
 						</div>';
-			}
 
 			echo '
 					</div>';
@@ -292,7 +286,7 @@ function template_viewticket()
 			if ($context['can_quote'])
 				echo '
 					<div class="information shd_quotebutton floatright" id="shd_quotebutton">
-						<a onclick="return oQuickReply.quote(', $context['ticket']['first_msg'], ', \'', $context['session_id'], '\', \'', $context['session_var'], '\', true);" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';quote=', $context['ticket']['first_msg'], ';num_replies=', $context['ticket']['num_replies'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_quote'], '</a><br>
+						<a data-id="', $context['ticket']['first_msg'], '" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';quote=', $context['ticket']['first_msg'], ';num_replies=', $context['ticket']['num_replies'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_quote'], '</a><br>
 					</div>';
 
 			template_inline_attachments($context['ticket']['first_msg']);
@@ -322,23 +316,8 @@ function template_viewticket()
 	// The ticket action log, lastly.
 	template_ticketactionlog();
 
-	// And lastly, the Javascript for AJAX assignment. Since this is onload stuff, it needs to know the HTML already exists.
-	if (!empty($context['ajax_assign']))
-		echo '
-	<script type="text/javascript"><!-- // --><![CDATA[
-	var oAjaxAssign = new AjaxAssign({
-		sSelf: "oAjaxAssign",
-		sScriptUrl: smf_scripturl,
-		iTicketId: ' . $context['ticket_id'] . ',
-		sId: "assigned_button",
-		sListId: "assigned_list",
-		sAssignedSpan: "assigned_to",
-		sImagesUrl: "' . $settings['default_images_url'] . '/simpledesk",
-		sImageCollapsed: "ajax_assign.png",
-		sImageExpanded: "ajax_assign_cancel.png"
-	});
-	// ]' . ']></script>';
-
+	// Javascript?
+	template_scripts_footer();
 }
 
 /**
@@ -368,14 +347,12 @@ function template_ticket_leftcolumn()
 	$context['leftcolumndone'] = true; // for the rest of the template later
 
 	echo '
+		<br class="clear">
 		<div class="shd_ticket_leftcolumn floatleft">
 			<div class="shd_attachmentcolumn">';
 
 	foreach ($context['leftcolumn_templates'] as $template)
-	{
-		$var = 'template_' . $template;
-		$var();
-	}
+		call_user_func('template_' . $template);
 
 	echo '
 			</div>
@@ -393,8 +370,6 @@ function template_viewticketattach()
 {
 	global $context, $settings, $txt, $scripturl;
 
-	$remove_txt = JavaScriptEscape($txt['shd_delete_attach_confirm']);
-
 	if (!empty($context['ticket_attach']['ticket']))
 	{
 		echo '
@@ -428,7 +403,7 @@ function template_viewticketattach()
 
 			if (!empty($attachment['can_delete']))
 				echo '
-							<a href="', $scripturl, '?action=helpdesk;sa=deleteattach;ticket=', $context['ticket_id'], ';attach=', $attachment['id'], '" onclick="return confirm(', $remove_txt, ');"><img src="', $settings['default_images_url'], '/simpledesk/delete.png" title="', $txt['shd_delete_attach'], '" alt="', $txt['shd_delete_attach'], '"></a>';
+							<a href="', $scripturl, '?action=helpdesk;sa=deleteattach;ticket=', $context['ticket_id'], ';attach=', $attachment['id'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_delete_attach_confirm']), ');"><img src="', $settings['default_images_url'], '/simpledesk/delete.png" title="', $txt['shd_delete_attach'], '" alt="', $txt['shd_delete_attach'], '"></a>';
 
 			echo '
 						</span>
@@ -577,19 +553,18 @@ function template_additional_fields()
 		echo '
 			<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>
-					<img src="', $settings['default_images_url'], '/simpledesk/additional_information.png" alt="x">
-					<a href="javascript:oCustomFields.infoswap();">', $txt['shd_ticket_additional_information'], '</a>
+					<span class="toggle_up floatright" id="shd_custom_fields_swap"></span>
+					<a href="#" id="shd_custom_fields_swap_link">', $txt['shd_ticket_additional_information'], '</a>
 				</h3>
 			</div>
-			<div class="roundframe" id="additional_info">';
+			<div id="additional_info">';
 
 			foreach ($context['ticket']['custom_fields']['information'] as $field)
 			{
 				if ($field['display_empty'] || !empty($field['value']) || $field['type'] == CFIELD_TYPE_CHECKBOX)
 				{
 					echo '
-					<div class="information">
+					<div class="roundframe">
 						', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="" class="shd_smallicon">' : '', '
 						<strong>', $field['name'], ':</strong><hr>';
 
@@ -637,27 +612,23 @@ function template_quickreply()
 {
 	global $context, $scripturl, $options, $txt, $settings;
 
-	if ($context['can_reply'] && !empty($options['display_quick_reply']))
-	{
 	echo '
 		<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>
+				<span class="floatright"><a href="#" onclick="oQuickReply.swap(); return false;"><img src="', $settings['images_url'], '/selected_open.png" alt="+" id="quickReplyExpand" class="icon" style="display:none;"></a></span>
 				<img src="', $settings['default_images_url'], '/simpledesk/respond.png" alt="x">
 				<a href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';num_replies=', $context['ticket']['num_replies'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="oQuickReply.swap(); return false;">', $txt['shd_reply_ticket'], '</a>
 			</h3>
 		</div>
-			<div class="roundframe" id="quickReplyOptions"', $options['display_quick_reply'] != 2 ? ' style="display: none"' : '', '>
+		<div class="roundframe" id="quickReplyOptions">
 			<div class="content">
-					<form action="', $scripturl, '?action=helpdesk;sa=savereply" method="post" accept-charset="', $context['character_set'], '" name="postreply" id="postreply" onsubmit="submitonce(this);smc_saveEntities(\'postreply\', [\'shd_reply\'], \'field\');" enctype="multipart/form-data" style="margin: 0;">';
+				<form action="', $scripturl, '?action=helpdesk;sa=savereply" method="post" accept-charset="', $context['character_set'], '" name="postreply" id="postreply" onsubmit="smc_saveEntities(\'postreply\', [\'shd_reply\'], \'field\');" enctype="multipart/form-data" style="margin: 0;">';
 
 	if ($context['can_go_advanced'])
-		{
 		echo '
-					<div class="information shd_advancedbutton floatright" id="shd_goadvancedbutton" style="display:none;">
-						<a onclick="goAdvanced(); return false;" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_go_advanced'], '</a><br>
+				<div class="information shd_advancedbutton floatright" id="shd_goadvancedbutton">
+					<a href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_go_advanced'], '</a><br>
 				</div>';
-		}
 
 	template_ticket_postbox();
 	template_ticket_meta();
@@ -666,12 +637,7 @@ function template_quickreply()
 				</form>
 			</div>
 		</div>
-			<span id="quickreplyfooter" ', $options['display_quick_reply'] == 2 ? '' : ' style="display: none"', '></span>
-		<script type="text/javascript"><!-- // --><![CDATA[
-		document.getElementById("quickReplyExpand").style.display = "";
-		document.getElementById("shd_goadvancedbutton").style.display = "";
-		// ]]></script>';
-	}
+		<span id="quickreplyfooter"></span>';
 }
 
 /**
@@ -770,10 +736,8 @@ function template_viewreplies()
 		<div id="replies">';
 
 	if (empty($reply_request))
-	{
 		echo '
 			<div class="roundframe">', $txt['shd_no_replies'], '</div>';
-	}
 	else
 	{
 		while ($reply = $context['get_replies']())
@@ -809,9 +773,10 @@ function template_viewreplies()
 						<div class="shd_replyarea">
 							<div class="smalltext">
 								<span class="floatright shd_ticketlinks">';
+
 			if ($context['can_quote'])
 				echo '
-									<img src="', $settings['default_images_url'], '/simpledesk/quote.png" class="shd_smallicon" alt="*"><a onclick="return oQuickReply.quote(', $reply['id'], ', \'', $context['session_id'], '\', \'', $context['session_var'], '\', true);" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';quote=', $reply['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_quote_short'], '</a>';
+									<img src="', $settings['default_images_url'], '/simpledesk/quote.png" class="shd_smallicon" alt="*"><a class="quick_reply" data-id="', $reply['id'], '" href="', $scripturl, '?action=helpdesk;sa=reply;ticket=', $context['ticket_id'], ';quote=', $reply['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_quote_short'], '</a>';
 			if ($reply['can_edit'])
 				echo '
 									<img src="', $settings['default_images_url'], '/simpledesk/edit.png" class="shd_smallicon" alt="*"><a href="', $scripturl, '?action=helpdesk;sa=editreply;ticket=', $context['ticket_id'], ';msg=', $reply['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_ticket_edit'], '</a>';
@@ -871,12 +836,10 @@ function template_viewreplies()
 		}
 
 			if (!empty($settings['show_modify']) && !empty($reply['modified']))
-			{
 				echo '
 							<div class="smalltext shd_modified" style="margin-top:20px;">
 								&#171; <em>', $txt['last_edit'], ': ', $reply['modified']['time'], ' ', $txt['by'], ' ', $reply['modified']['link'], '</em> &#187;
 							</div>';
-			}
 
 			template_inline_attachments($reply['id']);
 
@@ -961,7 +924,7 @@ function template_viewrelationships()
 					<input type="text" name="otherticket" value="" size="5">
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 					<input type="hidden" name="ticket" value="', $context['ticket_id'], '">
-					<input type="submit" class="button" value="', $txt['shd_go'], '">
+					<input type="submit" class="button save" value="', $txt['shd_go'], '">
 				</form>';
 		}
 
@@ -982,14 +945,14 @@ function template_ticketactionlog()
 {
 	global $context, $settings, $txt, $scripturl;
 
-	if (!empty($context['display_ticket_log']))
-	{
+	if (empty($context['display_ticket_log']))
+		return;
+
 	echo '
-			<div class="cat_bar" id="ticket_log_header">
+		<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>
-					<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="toggle_up floatright" id="shd_ActionLogToggle"></span>
+				<span id="shd_ActionLogLink"><img src="', $settings['default_images_url'], '/simpledesk/log.png" class="icon" alt="*"> ', $txt['shd_ticket_log'], '</span>
 				<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>
@@ -1015,9 +978,7 @@ function template_ticketactionlog()
 				<td colspan="3" class="shd_noticket">', $txt['shd_ticket_log_none'], '</td>
 			</tr>';
 	else
-		{
 		foreach ($context['ticket_log'] as $action)
-			{
 			echo '
 			<tr class="windowbg">
 				<td class="smalltext">', $action['time'], '</td>
@@ -1027,8 +988,6 @@ function template_ticketactionlog()
 					', $action['action_text'], '
 				</td>
 			</tr>';
-			}
-		}
 
 	echo '
 			<tr class="bot_page">
@@ -1037,19 +996,7 @@ function template_ticketactionlog()
 					', !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>
-			</table>
-			<script type="text/javascript"><!-- // --><![CDATA[
-			var ActionLog = new ActionLog({
-				sImagesUrl: "', $settings['images_url'], '",
-				sContainerId: "ticket_log",
-				sImageId: "shd_ticket_log_expand",
-				sImageCollapsed: "selected_open.png",
-				sImageExpanded: "selected.png",
-				sHeaderId: "ticket_log_header",
-			});
-			ActionLog.swap();
-			// ]', ']></script>';
-	}
+		</table>';
 }
 
 /**
@@ -1072,5 +1019,224 @@ function template_shd_display_nojs_above()
 */
 function template_shd_display_nojs_below()
 {
+}
+
+/**
+ *	All of the Javascript we have.
+ *
+ *	@since 2.1
+*/
+function template_scripts_footer()
+{
+	global $context;
+
+	$jsTemplates = array(
+		'privacy' => !empty($context['ticket']['privacy']['can_change']),
+		'urgency' => !empty($context['ticket']['urgency']['increase']) || !empty($context['ticket']['urgency']['decrease']),
+		'ajax_assign' => !empty($context['ajax_assign']),
+		'quickreply' => true,
+		'custom_fields_display' => true,
+		'action_log' => !empty($context['display_ticket_log']),
+		'advanced_quickreply' => !empty($context['can_go_advanced']),
+	);
+
+	echo '
+	<script type="text/javascript"><!-- // --><![CDATA[';
+
+	foreach ($jsTemplates as $template => $enabled)
+		if ($enabled)
+			call_user_func('template_shd_js_' . $template);
+
+	echo '
+	// ]' . ']></script>';
+}
+
+/**
+ *	Javascript for Privacy
+ *
+ *	@since 2.1
+*/
+function template_shd_js_privacy()
+{
+	global $context, $txt;
+
+	echo '
+		var shd_ajax_problem = ', JavaScriptEscape($txt['shd_ajax_problem']), ';
+		var privacyCtl = new shd_privacyControl({
+			ticket: ', $context['ticket_id'], ',
+			sUrl: smf_scripturl + "?action=helpdesk;sa=ajax;op=privacy;ticket=', $context['ticket_id'], '",
+			sSession: smf_session_var + "=" + smf_session_id,
+			sSrcA: "privlink",
+			sDestSpan: "privacy"
+		});';
+}
+
+/**
+ *	Javascript for Urgency
+ *
+ *	@since 2.1
+*/
+function template_shd_js_urgency()
+{
+	global $context;
+
+	echo '
+		var urgencyCtl = new shd_urgencyControl({
+			ticket: ', $context['ticket_id'], ',
+			sUrl: smf_scripturl + "?action=helpdesk;sa=ajax;op=urgency;ticket=', $context['ticket_id'], ';change=",
+			sSession: smf_session_var + "=" + smf_session_id,
+			sDestSpan: "urgency",
+			aButtons: ["up", "down"],
+			aButtonOps: { up: "increase", down: "decrease" }
+		});';
+}
+
+/**
+ *	Javascript for Quick Reply
+ *
+ *	@since 2.1
+*/
+function template_shd_js_quickreply()
+{
+	global $context, $settings;
 
+	echo '
+		var oQuickReply = new QuickReply({
+			iTicketId: ', $context['ticket_id'], ',
+			sScriptUrl: smf_scripturl,
+			sJumpAnchor: "quickReplyOptions",
+			sSession: smf_session_var + "=" + smf_session_id,
+			sRepliesSelector: "span.shd_ticketlinks a.quick_reply",
+			sFirstPostSelector: "div#shd_quotebutton a"
+		});';
+}
+
+/**
+ *	Javascript for Ajax Assign
+ *
+ *	@since 2.1
+*/
+function template_shd_js_custom_fields_display()
+{
+	global $context, $options, $txt;
+
+	echo '
+		var oCustomFields = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: ', empty($options['collapse_shd_customFields']) ? 'false' : 'true', ',
+			aSwappableContainers: [
+				\'additional_info\'
+			],
+			aSwapImages: [
+				{
+					sId: \'shd_custom_fields_swap\',
+				}
+			],
+			aSwapLinks: [
+				{
+					sId: \'shd_custom_fields_swap_link\',
+					msgCollapsed: ', JavaScriptEscape($txt['shd_ticket_additional_information']), ',
+					msgExpanded: ', JavaScriptEscape($txt['shd_ticket_additional_information']), ',
+				},
+			],
+			oThemeOptions: {
+				bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
+				sOptionName: \'collapse_shd_customFields\',
+				sSessionId: smf_session_id,
+				sSessionVar: smf_session_var,
+			},
+			oCookieOptions: {
+				bUseCookie: false,
+				sCookieName: \'shd_customFields\'
+			}
+		});';
+}
+
+/**
+ *	Javascript for Ajax Assign
+ *
+ *	@since 2.1
+*/
+function template_shd_js_ajax_assign()
+{
+	global $context, $settings;
+
+	echo '
+		var oAjaxAssign = new AjaxAssign({
+			sSelf: "oAjaxAssign",
+			sScriptUrl: smf_scripturl,
+			iTicketId: ' . $context['ticket_id'] . ',
+			sId: "assigned_button",
+			sListId: "assigned_list",
+			sAssignedSpan: "assigned_to",
+			sImagesUrl: ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk'), ',
+			sImageCollapsed: ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk/ajax_assign.png'), ',
+			sImageExpanded: ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk/ajax_assign_cancel.png'), ',
+			sImageAdmin: ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk/admin.png'), ',
+			sImageStaff: ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk/staff.png'), ',
+			sSession: smf_session_var + "=" + smf_session_id,
+		});';
+}
+
+/**
+ *	Javascript for Action Log
+ *
+ *	@since 2.1
+*/
+function template_shd_js_action_log()
+{
+	global $context, $options, $settings, $txt;
+
+	echo '
+		var oActionLog = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: ', empty($options['collapse_shd_actionLog']) ? 'false' : 'true', ',
+			aSwappableContainers: [
+				\'ticket_log\'
+			],
+			aSwapImages: [
+				{ sId: \'shd_ActionLogToggle\',},
+			],
+			aSwapLinks: [
+				{
+					sId: \'shd_ActionLogLink\',
+					msgCollapsed: ', JavaScriptEscape('<img src="' . $settings['default_images_url'] . '/simpledesk/log.png" class="icon" alt="*"> ' . $txt['shd_ticket_log']), ',
+					msgExpanded: ', JavaScriptEscape('<img src="' . $settings['default_images_url'] . '/simpledesk/log.png" class="icon" alt="*"> ' . $txt['shd_ticket_log']), ',
+				},
+			],
+			oThemeOptions: {
+				bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
+				sOptionName: \'collapse_shd_actionLog\',
+				sSessionId: smf_session_id,
+				sSessionVar: smf_session_var,
+			},
+			oCookieOptions: {
+				bUseCookie: false,
+				sCookieName: \'shd_customFields\'
+			}
+		});';
+}
+
+/**
+ *	Javascript for Advanced QuickRely
+ *
+ *	@since 2.1
+*/
+function template_shd_js_advanced_quickreply()
+{
+	global $context, $modSettings;
+
+	echo '
+		var oGoAdvanced = new goAdvanced({
+			sBbcContainerId: "shd_bbcbox",
+			sBbcContainerEditorClass: "sceditor-group",
+			sSmileyContainerId: "shd_smileybox",
+			sSmileyContainerEditorClass: "sceditor-insertemoticon",
+			sAttachContainerId: "shd_attach_container",
+			sAdvancedContainerId: "shd_goadvancedbutton",
+			sAdditionalOptionsContainerId: "shd_additional_options_box",
+			bAllowBBC: ', !empty($modSettings['shd_allow_ticket_bbc']) ? 'true' : 'false', ',
+			bAllowSmileys: ', !empty($modSettings['shd_allow_ticket_smileys']) ? 'true' : 'false', ',
+			bAllowAttach: ', !empty($context['ticket_form']['do_attach']) ? 'true' : 'false', ',
+		});';
 }
\ No newline at end of file

sd_template/SimpleDesk-MoveDept.template.php

View file @ 1d762ea

@@ -35,7 +35,7 @@ function template_movedept()
 		</h3>
 	</div>
 	<div class="roundframe">
-		<form action="', $scripturl, '?action=helpdesk;sa=movedept2;ticket=', $context['ticket_id'], '" method="post" onsubmit="submitonce(this);">
+		<form action="', $scripturl, '?action=helpdesk;sa=movedept2;ticket=', $context['ticket_id'], '" method="post">
 			<dl class="settings">
 				<dt>
 					<strong>', $txt['shd_current_dept'], ':</strong>
@@ -63,7 +63,7 @@ function template_movedept()
 					<strong>', $txt['shd_move_send_pm'], ':</strong>
 				</dt>
 				<dd>
-					<input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="document.getElementById(\'pm_message\').style.display = this.checked ? \'block\' : \'none\';" >
+					<input type="checkbox" name="send_pm" id="send_pm" checked="checked">
 				</dd>
 			</dl>
 			<fieldset id="pm_message">
@@ -84,7 +84,10 @@ function template_movedept()
 
 	echo '
 			<input type="submit" name="cancel" value="', ($context['shd_return_to'] == 'home' ? $txt['shd_cancel_home'] : $txt['shd_cancel_ticket']), '" accesskey="c" class="button">
-			<input type="submit" value="', $txt['shd_ticket_move'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+			<input type="submit" value="', $txt['shd_ticket_move'], '" accesskey="s" class="button save">
 		</form>
-	</div>';
+	</div>
+	<script type="text/javascript"><!-- // --><![CDATA[
+		$("#send_pm").on("change", function(){$("#pm_message").toggle();});
+	// ]' . ']></script>';
 }
\ No newline at end of file

sd_template/SimpleDesk-Post.template.php

View file @ 1d762ea

@@ -65,11 +64,11 @@ function template_ticket_option($option)
 	{
 		echo '
 								<select name="shd_' . $option . '">';
+
 		foreach ($context['ticket_form'][$option]['options'] as $value => $caption)
-		{
 			echo '
 									<option value="', $value, '"', ($value == $context['ticket_form'][$option]['setting'] ? ' selected="selected"' : ''), '>', $txt[$caption], '</option>';
-		}
+
 		echo '
 								</select>';
 	}
@@ -82,7 +81,7 @@ function template_ticket_info()
 	global $context, $txt, $scripturl, $settings, $modSettings, $options;
 
 	echo '
-			<form action="', $context['ticket_form']['form_action'], '" method="post" accept-charset="', $context['character_set'], '" name="postmodify" id="postmodify" onsubmit="', 'submitonce(this);smc_saveEntities(\'postmodify\', [\'subject\', \'', $context['post_box_name'], '\'], \'field\');" enctype="multipart/form-data" style="margin: 0;">
+			<form action="', $context['ticket_form']['form_action'], '" method="post" accept-charset="', $context['character_set'], '" name="postmodify" id="postmodify" onsubmit="smc_saveEntities(\'postmodify\', [\'subject\', \'', $context['post_box_name'], '\'], \'field\');" enctype="multipart/form-data">
 			<div class="cat_bar">
 				<h3 class="catbg">
 					<img src="', $settings['default_images_url'], '/simpledesk/ticket.png" alt="x"> ', $context['ticket_form']['form_title'], '
@@ -119,7 +118,7 @@ function template_ticket_info()
 							<li><img src="', $settings['default_images_url'], '/simpledesk/staff.png" alt="" class="shd_smallicon"> ', $txt['shd_ticket_assignedto'], ': ', !empty($context['ticket_form']['assigned']['link']) ? $context['ticket_form']['assigned']['link'] : '<span class="error">' . $txt['shd_unassigned'] . '</span>', '</li>';
 
 	echo '
-							<li><img src="', $settings['default_images_url'], '/simpledesk/status.png" alt="" class="shd_smallicon"/> ', $txt['shd_ticket_status'], ': ', $txt['shd_status_' . $context['ticket_form']['status']], '</li>';
+							<li><img src="', $settings['default_images_url'], '/simpledesk/status.png" alt="" class="shd_smallicon"> ', $txt['shd_ticket_status'], ': ', $txt['shd_status_' . $context['ticket_form']['status']], '</li>';
 
 	if (!empty($context['display_private']))
 		echo '
@@ -151,12 +150,12 @@ function template_ticket_custom_fields()
 
 	echo '
 				<br class="clear">
-				<div class="title_bar"', empty($context['ticket_form']['dept']) ? ' style="display:none;"' : '', '>
+				<div  id="shd_customfields_title" class="title_bar', empty($context['ticket_form']['dept']) ? ' hidden' : '', '">
 					<h3 class="titlebg">
 						<a href="#">', $txt['shd_ticket_additional_details'], '</a>
 					</h3>
 				</div>
-				<div class="shd_customfields" id="shd_customfields"', empty($context['ticket_form']['dept']) ? ' style="display:none;"' : '', '>';
+				<div class="shd_customfields', empty($context['ticket_form']['dept']) ? ' hidden' : '', '" id="shd_customfields">';
 
 		// Loop through each custom field
 		// See also template_ticket_subjectbox() for the department selector which affects these.
@@ -180,13 +179,13 @@ function template_ticket_custom_fields()
 				if ($field['value'] == $field['default_value'])
 					$field['value'] = '';
 				echo '
-					<div id="field_', $field['id'], '_container"', $field['hidden'] ? ' style="display:none;"' : '', '>
+					<div id="field_', $field['id'], '_container"', $field['hidden'] ? ' class="hidden"' : '', '>
 						<dl class="settings">
-							<dt id="field-' . $field['id'] . '" style="width:98%;">
+							<dt id="field-' . $field['id'] . '" class="shd_cust_fields_largetext">
 								', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="">' : '', '
 								<strong>' . $field['name'] . ': </strong><br>
 								<span class="smalltext">' . $field['desc'] . '</span><br>
-								<textarea name="field-', $field['id'], '"', !empty($field['default_value']) ? ' rows="' . $field['default_value'][0] . '" cols="' . $field['default_value'][1] . '" ' : '', ' style="width:auto; height:auto;">', $field['value'], '</textarea>
+								<textarea name="field-', $field['id'], '"', !empty($field['default_value']) ? ' rows="' . $field['default_value'][0] . '" cols="' . $field['default_value'][1] . '" ' : '', '>', $field['value'], '</textarea>
 							</dt>
 						</dl>
 						<hr>
@@ -195,7 +194,7 @@ function template_ticket_custom_fields()
 			else
 			{
 				echo '
-					<div id="field_', $field['id'], '_container"', $field['hidden'] ? ' style="display:none;"' : '', '>
+					<div id="field_', $field['id'], '_container"', $field['hidden'] ? ' class="hidden"' : '', '>
 						<dl class="settings">
 							<dt id="field-' . $field['id'] . '">
 								', !empty($field['icon']) ? '<img src="' . $settings['default_images_url'] . '/simpledesk/cf/' . $field['icon'] . '" alt="">' : '', '
@@ -205,22 +204,16 @@ function template_ticket_custom_fields()
 
 				// Text
 				if ($field['type'] == CFIELD_TYPE_TEXT)
-				{
 					echo '
 							<dd><input type="text" name="field-', $field['id'], '" value="', $field['value'], '"></dd>';
-				}
 				// Integers only
 				elseif ($field['type'] == CFIELD_TYPE_INT)
-				{
 					echo '
 							<dd><input name="field-', $field['id'], '" value="', $field['value'], '" size="10"></dd>';
-				}
 				// Floating numbers
 				elseif ($field['type'] == CFIELD_TYPE_FLOAT)
-				{
 					echo '
 							<dd><input name="field-', $field['id'], '" value="', $field['value'], '" size="10"></dd>';
-				}
 				// Select boxes
 				elseif ($field['type'] == CFIELD_TYPE_SELECT)
 				{
@@ -246,10 +239,8 @@ function template_ticket_custom_fields()
 				}
 				// Checkboxes!
 				elseif ($field['type'] == CFIELD_TYPE_CHECKBOX)
-				{
 					echo '
 							<dd><input name="field-', $field['id'], '" type="checkbox"', !empty($field['value']) ? ' checked="checked"' : '', '></dd>';
-				}
 				// Magical multi-select!
 				elseif ($field['type'] == CFIELD_TYPE_MULTI)
 				{
@@ -324,7 +315,7 @@ function template_ticket_posterrors()
 		$context['shd_errors'] = array();
 
 	echo '
-						<div class="errorbox" id="errors"', empty($context['shd_errors']) ? ' style="display:none;"' : '', '>
+						<div class="errorbox', empty($context['shd_errors']) ? ' hidden' : '', '" id="errors">
 							<dl>
 								<dt>
 									<strong style="" id="error_serious">', $txt['shd_ticket_post_error'], ':</strong>
@@ -358,8 +350,9 @@ function template_ticket_subjectbox()
 		echo '
 						<br>
 						<img src="', $settings['default_images_url'], '/simpledesk/departments.png" alt="" class="shd_smallicon"><strong>', $txt['shd_ticket_dept'], '</strong>
-						<select name="newdept" onchange="updateDeptCFs(this.value)">
+						<select id="newdept" name="newdept">
 							<option value="0">', $txt['shd_select_dept'], '</option>';
+
 		foreach ($context['postable_dept_list'] as $id => $dept)
 			echo '
 							<option value="', $id, '"', $context['ticket_form']['dept'] == $id ? ' selected="selected"' : '', '>', $dept, '</option>';
@@ -367,49 +360,16 @@ function template_ticket_subjectbox()
 		echo '
 						</select>';
 
-		if (!empty($context['ticket_form']['custom_fields'][$context['ticket_form']['custom_fields_context']]))
-		{
-			echo '
-						<script type="text/javascript"><!-- // --><![CDATA[
-						var fields = new Array();';
-			foreach ($context['ticket_form']['custom_fields'][$context['ticket_form']['custom_fields_context']] as $field)
-			{
-				if (!$field['editable'])
-					continue;
-				echo '
-						fields[', $field['id'], '] = [', implode(',', $field['depts']), '];';
-			}
-			echo '
-						function updateDeptCFs(dept)
-						{
-							var displayed = 0;
-							for (i in fields)
-							{
-								if (dept != 0 && in_array(dept, fields[i]))
-								{
-									document.getElementById("field_" + i + "_container").style.display = "";
-									displayed++;
-								}
-								else
-								{
-									document.getElementById("field_" + i + "_container").style.display = "none";
-								}
-								document.getElementById("shd_customfields").style.display = (displayed == 0) ? "none" : "";
-							}
-						}
-						// ]', ']></script>';
-		}
+		template_shd_js_custom_fields();
 	}
 
 	// Are we dealing with proxy tickets?
 	if (!empty($context['can_post_proxy']))
-	{
 		echo '
 						<br>
 						<input type="hidden" name="proxy" value="">
 						<img src="', $settings['default_images_url'], '/simpledesk/proxy.png" alt="" class="shd_smallicon"><strong>', $txt['shd_ticket_proxy'], ':</strong>
 						<input type="text" name="proxy_author" id="proxy_author" size="50" maxlength="100" value="', (empty($context['ticket_form']['proxy']) ? '' : $context['ticket_form']['proxy']), '" tabindex="', $context['tabindex']++, '">';
-	}
 
 	echo '
 						<hr><br>';
@@ -451,13 +412,11 @@ function template_ticket_content()
 							', $context['ticket_form']['message'];
 
 	if (!empty($settings['show_modify']) && !empty($context['ticket']['modified']))
-	{
 		echo '
 						<div class="smalltext shd_modified" style="margin-top:20px;">
 							&#171; <em>', $txt['last_edit'], ': ', $context['ticket']['modified']['time'], ' ', $txt['by'], ' ', $context['ticket']['modified']['link'], '</em> &#187;
 						</div>';
 }
-}
 
 function template_ticket_meta()
 {
@@ -515,8 +474,8 @@ function template_ticket_postbox()
 
 	// The postbox
 	echo '
-						<div id="shd_bbcbox"', ((empty($modSettings['shd_allow_ticket_bbc']) || !empty($context['shd_display'])) ? ' style="display:none;"' : ''), '></div>
-						<div id="shd_smileybox"', ((empty($modSettings['shd_allow_ticket_smileys']) || !empty($context['shd_display'])) ? ' style="display:none;"' : ''), '></div>';
+						<div id="shd_bbcbox"', ((empty($modSettings['shd_allow_ticket_bbc']) || !empty($context['shd_display'])) ? ' class="hidden"' : ''), '></div>
+						<div id="shd_smileybox"', ((empty($modSettings['shd_allow_ticket_smileys']) || !empty($context['shd_display'])) ? ' class="hidden"' : ''), '></div>';
 
 	if ($editor_context['width'] == ((int) $editor_context['width']) . '%')
 	{
@@ -553,8 +512,8 @@ function template_ticket_cannedreplies()
 		return;
 
 	echo '
-					<div id="canned_replies" style="display:none;">
-						<div style="font-weight:bold; padding: 0.5em;">', $txt['canned_replies'], '</div>
+					<div id="canned_replies" class="hidden">
+						<div id="canned_title">', $txt['canned_replies'], '</div>
 						<select id="canned_replies_select">
 							<option value="0">', $txt['canned_replies_select'], '</option>';
 
@@ -573,16 +532,10 @@ function template_ticket_cannedreplies()
 
 	echo '
 						</select>
-						<input type="button" class="button" value="', $txt['canned_replies_insert'], '" onclick="oCannedReplies.getReply();">
-					</div>
-					<script type="text/javascript"><!-- // --><![CDATA[
-					var oCannedReplies = new CannedReply({
-						iTicketId: ', $context['ticket_id'], ',
-						sScriptUrl: smf_scripturl,
-						sSessionVar: "', $context['session_var'], '",
-						sSessionId: "', $context['session_id'], '"
-					});
-					// ]]></script>';
+						<input type="button" class="button" value="', $txt['canned_replies_insert'], '">
+					</div>';
+
+	template_shd_js_canned_replies();
 }
 
 function template_ticket_footer()
@@ -590,12 +543,10 @@ function template_ticket_footer()
 	global $settings, $context, $txt;
 
 	if (!empty($settings['show_modify']) && !empty($context['ticket_form']['modified']))
-	{
 		echo '
-						<div class="smalltext shd_modified" style="margin-top:20px;">
+						<div class="smalltext shd_modified">
 							&#171; <em>', $txt['last_edit'], ': ', $context['ticket_form']['modified']['time'], ' ', $txt['by'], ' ', $context['ticket_form']['modified']['link'], '</em> &#187;
 						</div>';
-	}
 
 	echo '
 					</div>
@@ -609,8 +560,9 @@ function template_preview()
 {
 	global $context, $txt, $settings;
 
-	if (!empty($context['ticket_form']['preview']))
-	{
+	if (empty($context['ticket_form']['preview']))
+		return;
+
 	echo '
 		<div class="tborder">
 		<div class="title_bar">
@@ -627,13 +579,13 @@ function template_preview()
 		</div>
 		<br>';
 }
-}
 
 function template_ticket_additional_options()
 {
 	global $context, $options, $txt, $modSettings, $settings;
 
 	echo '
+				<div id="shd_additional_options_box">
 					<br class="clear">
 					<div class="title_bar">
 						<h3 class="titlebg">
@@ -645,11 +597,9 @@ function template_ticket_additional_options()
 						<ul class="post_options">';
 
 	foreach ($context['ticket_form']['additional_opts'] as $key => $details)
-	{
 		if (!empty($details['show']))
 			echo '
 							<li><label for="', $key, '"><input type="checkbox" name="', $key, '" id="', $key, '"', (!empty($details['checked']) ? ' checked="checked"' : ''), ' value="1"> ', $details['text'], '</label></li>';
-	}
 
 	echo '
 						</ul>';
@@ -659,33 +609,13 @@ function template_ticket_additional_options()
 	template_add_attachments();
 
 	echo '
-					</div>
-					<script>
-						var oAdditionalOptionsToggle = new smc_Toggle({
-							bToggleEnabled: true,
-							bCurrentlyCollapsed: ', empty($options['collapse_shd_additionalOptions']) ? 'false' : 'true', ',
-							aSwappableContainers: [
-								\'postAdditionalOptionsHeader\'
-							],
-							aSwapImages: [
-								{
-									sId: \'shd_additionalOptionsToggle\',
-								}
-							],
-							oThemeOptions: {
-								bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
-								sOptionName: \'collapse_shd_additionalOptions\',
-								sSessionId: smf_session_id,
-								sSessionVar: smf_session_var,
-							},
-							oCookieOptions: {
-								bUseCookie: false,
-								sCookieName: \'shd_additionalOptions\'
-							}
-						});
-					</script>';
+					</div>';
 
+	tempalte_shd_js_additional_options();
 	template_singleton_email();
+
+	echo '
+				</div>';
 }
 
 /**
@@ -730,11 +660,9 @@ function template_show_attachments()
 							</dd>';
 	}
 	else
-	{
 		foreach ($context['current_attachments'] as $attachment)
 			echo '
 							<dd class="smalltext">', $attachment['name'], '</dd>';
-	}
 
 	echo '
 						</dl>';
@@ -784,28 +712,7 @@ function template_add_attachments()
 							</dd>
 						</dl>';
 
-	echo '
-					<script type="text/javascript"><!-- // --><![CDATA[
-	var oAttach = new shd_attach_select({
-		file_item: "shd_attach",
-		file_container: "shd_attachlist_container",
-		max: ', $context['ticket_form']['num_allowed_attachments'], ',
-		message_txt_delete: ', JavaScriptEscape($txt['remove']);
-
-	if (!empty($modSettings['attachmentExtensions']) && !empty($modSettings['attachmentCheckExtensions']))
-	{
-		$ext = explode(',', $modSettings['attachmentExtensions']);
-		foreach ($ext as $k => $v)
-			$ext[$k] = JavaScriptEscape($v);
-
-		echo ',
-		message_ext_error: ', JavaScriptEscape(str_replace('{attach_exts}', $context['allowed_extensions'], $txt['shd_cannot_attach_ext'])), ',
-		attachment_ext: [', implode(',', $ext), ']';
-	}
-
-	echo '
-	});
-					// ]]></script>';
+	tempalte_shd_js_attachments();
 }
 
 /**
@@ -822,7 +729,7 @@ function template_singleton_email()
 		return;
 
 	echo '
-						<div id="shd_notifications_div" style="display:none;">
+						<div id="shd_notifications_div" class="hidden">
 							<a href="#" id="shd_getAjaxNotifications">', $txt['shd_select_notifications'], '</a>';
 
 	if (!empty($context['notification_ping_list']))
@@ -831,26 +738,9 @@ function template_singleton_email()
 
 	echo '
 							<br class="clear">
-						</div>
-						<script type="text/javascript"><!-- // --><![CDATA[
-	var shd_oNotifications = new shd_notifications(', $context['ticket_id'], ', {
-		sContainerId: "shd_notifications_div",
-		sLinkId: "shd_getAjaxNotifications",
-		sPinglist: "', (!empty($context['notification_ping_list']) ? $context['notification_ping_list'] : ''), '",
-		sSessionId: smf_session_id,
-		sSessionVar: smf_session_var,
-		oMainTemplate: ', JavaScriptEscape('
-			<span class=\'shd_ajax_head\'>%title%</span><br>%subtemplate%<br>
-							'), ',
-		oNotifiedTemplate: ', JavaScriptEscape('%name%, '), ',
-		oOptionalTemplate: ', JavaScriptEscape('
-				<div class=\'shd_ajaxnotify\'><input type=\'checkbox\' name=\'notify[%index%]\' value=\'%index%\'%checked%>%name%</div>
-								'), ',
-		oOptionalOffTemplate: ', JavaScriptEscape('
-				<div class=\'shd_ajaxnotify\'><input type=\'checkbox\' name=\'notify[%index%]\' value=\'%index%\'%checked%>%name%</div>
-								'), ',
-	});
-						// ]]></script>';
+						</div>';
+
+	tempalte_shd_js_notifications();
 }
 
 function template_ticket_begin_replies()
@@ -877,9 +767,19 @@ function template_ticket_do_replies()
 			<div class="content">';
 
 	if (!empty($reply_request))
-	{
 		while ($reply = $context['get_replies']())
+			template_ticket_do_single_reply($reply);
+
+	echo '
+				</div>
+			</div>
+		</div>';
+}
+
+function template_ticket_do_single_reply($reply)
 {
+	global $context, $modSettings, $settings, $txt;
+
 	echo '
 					<div class="windowbg" id="reply', $reply['id'], '">
 						<div class="poster">
@@ -916,12 +816,10 @@ function template_ticket_do_replies()
 							<br><br>';
 
 	if (!empty($settings['show_modify']) && !empty($reply['modified']))
-			{
 		echo '
-							<div class="smalltext shd_modified" style="margin-top:20px;">
+							<div class="smalltext shd_modified">
 								&#171; <em>', $txt['last_edit'], ': ', $reply['modified']['time'], ' ', $txt['by'], ' ', $reply['modified']['link'], '</em> &#187;
 							</div>';
-			}
 
 	if (!empty($context['ticket_attach']['reply'][$reply['id']]))
 	{
@@ -950,13 +848,6 @@ function template_ticket_do_replies()
 						<br>
 					</div>';
 }
-	}
-
-	echo '
-				</div>
-			</div>
-		</div>';
-}
 
 function template_ticket_end_replies()
 {
@@ -998,6 +888,166 @@ function template_shd_thank_posting()
 	<br>';
 }
 
+/**
+ *	Javascript for Custom Fields
+ *
+ *	@since 2.1
+*/
+function template_shd_js_custom_fields()
+{
+	global $context;
+
+	if (empty($context['ticket_form']['custom_fields'][$context['ticket_form']['custom_fields_context']]))
+		return;
+
+	echo '
+						<script type="text/javascript"><!-- // --><![CDATA[
+						var fields = new Array();';
+
+	foreach ($context['ticket_form']['custom_fields'][$context['ticket_form']['custom_fields_context']] as $field)
+		if ($field['editable'])
+			echo '
+						fields[', $field['id'], '] = [', implode(',', $field['depts']), '];';
+
+	echo '
+						var oDeptSelector = new shd_dept_filter({
+							sSelectContainerId: "newdept",
+							sCustomFieldsContainerId: "shd_customfields",
+							sCustomFieldsTitleContainerId: "shd_customfields_title",
+							oFields: fields,
+						});
+						// ]', ']></script>';
+}
+
+/**
+ *	Javascript for Canned repleis
+ *
+ *	@since 2.1
+*/
+function template_shd_js_canned_replies()
+{
+	global $context;
+
+	echo '
+					<script type="text/javascript"><!-- // --><![CDATA[
+					var oCannedReplies = new CannedReply({
+						iTicketId: ', $context['ticket_id'], ',
+						sScriptUrl: smf_scripturl,
+						sSessionVar: "', $context['session_var'], '",
+						sSessionId: "', $context['session_id'], '",
+						sCannedRepliesContainerId: "canned_replies",
+						sSelectContainerId: "canned_replies_select",
+					});
+					// ]]></script>';
+}
+
+/**
+ *	Javascript for Additional Options
+ *
+ *	@since 2.1
+*/
+function tempalte_shd_js_additional_options()
+{
+	global $context, $options, $txt;
+
+	echo '
+					<script>
+						var oAdditionalOptionsToggle = new smc_Toggle({
+							bToggleEnabled: true,
+							bCurrentlyCollapsed: ', empty($options['collapse_shd_additionalOptions']) ? 'false' : 'true', ',
+							aSwappableContainers: [
+								\'postAdditionalOptionsHeader\'
+							],
+							aSwapImages: [
+								{
+									sId: \'shd_additionalOptionsToggle\',
+								}
+							],
+							aSwapLinks: [
+								{
+									sId: \'shd_additionalOptionsLink\',
+									msgCollapsed: ', JavaScriptEscape($txt['shd_ticket_additional_information']), ',
+									msgExpanded: ', JavaScriptEscape($txt['shd_ticket_additional_information']), ',
+								},
+							],
+							oThemeOptions: {
+								bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
+								sOptionName: \'collapse_shd_additionalOptions\',
+								sSessionId: smf_session_id,
+								sSessionVar: smf_session_var,
+							},
+							oCookieOptions: {
+								bUseCookie: false,
+								sCookieName: \'shd_additionalOptions\'
+							}
+						});
+					</script>';
+}
+
+/**
+ *	Javascript for Attachments
+ *
+ *	@since 2.1
+*/
+function tempalte_shd_js_attachments()
+{
+	global $context, $modSettings, $txt;
+
+	echo '
+					<script type="text/javascript"><!-- // --><![CDATA[
+	var oAttach = new shd_attach_select({
+		file_item: "shd_attach",
+		file_container: "shd_attachlist_container",
+		max: ', $context['ticket_form']['num_allowed_attachments'], ',
+		message_txt_delete: ', JavaScriptEscape($txt['remove']);
+
+	if (!empty($modSettings['attachmentExtensions']) && !empty($modSettings['attachmentCheckExtensions']))
+	{
+		$ext = explode(',', $modSettings['attachmentExtensions']);
+		foreach ($ext as $k => $v)
+			$ext[$k] = JavaScriptEscape($v);
+
+		echo ',
+		message_ext_error: ', JavaScriptEscape(str_replace('{attach_exts}', $context['allowed_extensions'], $txt['shd_cannot_attach_ext'])), ',
+		attachment_ext: [', implode(',', $ext), ']';
+	}
+
+	echo '
+	});
+					// ]]></script>';
+}
+
+/**
+ *	Javascript for Notifications
+ *
+ *	@since 2.1
+*/
+function tempalte_shd_js_notifications()
+{
+	global $context;
+
+	echo '
+						<script type="text/javascript"><!-- // --><![CDATA[
+	var shd_oNotifications = new shd_notifications(', $context['ticket_id'], ', {
+		sContainerId: "shd_notifications_div",
+		sLinkId: "shd_getAjaxNotifications",
+		sPinglist: "', (!empty($context['notification_ping_list']) ? $context['notification_ping_list'] : ''), '",
+		sSessionId: smf_session_id,
+		sSessionVar: smf_session_var,
+		oMainTemplate: ', JavaScriptEscape('
+			<span class=\'shd_ajax_head\'>%title%</span><br>%subtemplate%<br>
+							'), ',
+		oNotifiedTemplate: ', JavaScriptEscape('%name%, '), ',
+		oOptionalTemplate: ', JavaScriptEscape('
+				<div class=\'shd_ajaxnotify\'><input type=\'checkbox\' name=\'notify[%index%]\' value=\'%index%\'%checked%>%name%</div>
+								'), ',
+		oOptionalOffTemplate: ', JavaScriptEscape('
+				<div class=\'shd_ajaxnotify\'><input type=\'checkbox\' name=\'notify[%index%]\' value=\'%index%\'%checked%>%name%</div>
+								'), ',
+	});
+						// ]]></script>';
+}
+
 /**
  *	Displays a header that Javascript should be enabled while in the administration panel area of SimpleDesk.
  *

sd_template/SimpleDesk-Profile.template.php

View file @ 1d762ea

@@ -72,10 +73,6 @@ function template_shd_profile_main()
 					<dt>', $txt['username'], ': </dt>
 					<dd>', $context['member']['username'], '</dd>';
 
-		// Is this member requiring activation and/or banned?
-		if (!empty($context['activate_message']) || !empty($context['member']['bans']))
-		{
-
 		// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
 		if (!empty($context['activate_message']))
 			echo '
@@ -85,8 +82,8 @@ function template_shd_profile_main()
 		if (!empty($context['member']['bans']))
 		{
 			echo '
-					<dt class="clear"><span class="alert">', $txt['user_is_banned'], '</span>&nbsp;[<a href="#" onclick="document.getElementById(\'ban_info\').style.display = document.getElementById(\'ban_info\').style.display == \'none\' ? \'\' : \'none\';return false;">' . $txt['view_ban'] . '</a>]</dt>
-					<dt class="clear" id="ban_info" style="display: none;">
+					<dt class="clear"><span class="alert">', $txt['user_is_banned'], '</span>&nbsp;[<a href="#" onclick="$(\'#ban_info\').toggle();">' . $txt['view_ban'] . '</a>]</dt>
+					<dt class="clear hidden" id="ban_info">
 						<strong>', $txt['user_banned_by_following'], ':</strong>';
 
 			foreach ($context['member']['bans'] as $ban)
@@ -96,7 +93,6 @@ function template_shd_profile_main()
 			echo '
 					</dt>';
 		}
-		}
 
 		echo '
 					<dt>', $txt['date_registered'], ': </dt>
@@ -166,8 +162,8 @@ function template_shd_profile_preferences()
 				</div>';
 
 	echo '
-				<div class="cat_bar">
-					<h3 class="catbg">
+				<div class="title_bar">
+					<h3 class="titlebg">
 						<img src="', $settings['default_images_url'], '/simpledesk/preferences.png" class="icon" alt="*">
 						', sprintf($txt['shd_profile_preferences_header'], $context['member']['name']), '
 					</h3>
@@ -194,9 +190,6 @@ function template_shd_profile_preferences()
 				<form action="', $scripturl, '?action=profile;area=hd_prefs;u=', $context['member']['id'], ';save" method="post">';
 
 	$display_save = false;
-	$displayed_groups = array();
-	$checkall_items = array();
-
 	foreach ($context['shd_preferences_options']['groups'] as $group => $details)
 	{
 		if (empty($details['groups']))
@@ -208,13 +201,9 @@ function template_shd_profile_preferences()
 		echo '<br>
 						<div class="cat_bar" id="prefheader_', $group, '">
 							<h3 class="catbg">
-								<span id="prefexpand_', $group, '" class="floatright toggle_up" onclick="shd_toggleblock(\'', $group, '\'); return false;">&nbsp;<!--
-									<a class="permcollapse" href="#" onclick="shd_toggleblock(\'', $group, '\'); return false;">
-										<img src="', $settings['images_url'], '/selected_open.png" id="prefexpandicon_', $group, '" style="display:none;">
-									</a>-->
-								</span>
+								<span class="toggle_up floatright" id="prefexpandicon_', $group, '"></span>
 								<img src="', shd_image_url($details['icon']), '" class="icon" alt="*">
-								<a class="prefcollapse" href="#prefheader_', $group, '" onclick="shd_toggleblock(\'', $group, '\'); return false;">', $txt['shd_pref_group_' . $group], '</a>
+								<a class="prefcollapse" href="#prefheader_', $group, '" id="prefexpand_', $group, '_swap_link">', $txt['shd_pref_group_' . $group], '</a>
 							</h3>
 						</div>
 						<div class="roundframe noup" id="prefgroup_', $group, '">
@@ -261,14 +250,11 @@ function template_shd_profile_preferences()
 
 		// Only display if the preference group is set to actually have said option, and if 3+ were actually being displayed, otherwise it looks stupid.
 		if (!empty($details['check_all']) && count($details['groups']) > 2)
-		{
 			echo '
-								<div id="checkall_div_', $group, '" style="display:none;">
+								<div id="checkall_div_', $group, '">
 									<input type="checkbox" name="all" id="check_all" value="" onclick="invertAll(this, this.form, \'', $group, '\');" class="floatleft">
 									<label for="check_all" class="floatleft">', $txt['check_all'], '</label>
 								</div>';
-			$checkall_items[] = $group;
-		}
 
 		echo '
 							</div>
@@ -276,37 +262,11 @@ function template_shd_profile_preferences()
 						<span id="preffooter_', $group, '"></span>';
 	}
 
-	// And the JS required to hide everything.
-	if (!empty($displayed_groups) || !empty($checkall_items))
-	{
-		echo '
-						<script type="text/javascript"><!-- // --><![CDATA[';
-
-		if (!empty($displayed_groups))
-			echo '
-						var hidden_blocks = ["', implode('","', $displayed_groups), '"];
-						for (i in hidden_blocks)
-						{
-							shd_toggleblock(hidden_blocks[i]);
-						}';
-
-		if (!empty($checkall_items))
-			echo '
-						var checkall_items = ["', implode('","', $checkall_items), '"];
-						for (i in checkall_items)
-						{
-							document.getElementById("checkall_div_" + checkall_items[i]).style.display = "";
-						}';
-
-		echo '
-						// ]', ']></script>';
-	}
-
 	if ($display_save)
 		echo '
 						<br>
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
-						<input type="submit" value="', $txt['shd_profile_save_prefs'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">';
+						<input type="submit" value="', $txt['shd_profile_save_prefs'], '" accesskey="s" class="button save">';
 	else
 		echo '
 						<br>
@@ -325,6 +285,8 @@ function template_shd_profile_preferences()
 
 	echo '
 				</form>';
+
+	template_shd_profile_js_preferences();
 }
 
 function template_shd_profile_show_tickets()
@@ -350,7 +312,7 @@ function template_shd_profile_show_tickets()
 	<div class="tborder">
 		<div class="title_bar">
 			<h3 class="titlebg">
-				<img src="', $settings['default_images_url'], '/simpledesk/', $context['can_haz_replies'] ? 'replies' : 'ticket', '.png" class="floatright shd_icon_fullhead" alt=""/>
+				<img src="', $settings['default_images_url'], '/simpledesk/', $context['can_haz_replies'] ? 'replies' : 'ticket', '.png" class="floatright shd_icon_fullhead" alt="">
 				<span class="smalltext">', $context['page_index'], '</span>
 			</h3>
 		</div>';
@@ -384,7 +346,7 @@ function template_shd_profile_show_tickets()
 	echo '
 		<div class="title_bar">
 			<h3 class="titlebg">
-				<img src="', $settings['default_images_url'], '/simpledesk/', $context['can_haz_replies'] ? 'replies' : 'ticket', '.png" class="floatright shd_icon_fullhead" alt=""/>
+				<img src="', $settings['default_images_url'], '/simpledesk/', $context['can_haz_replies'] ? 'replies' : 'ticket', '.png" class="floatright shd_icon_fullhead" alt="">
 				<span class="smalltext">', $context['page_index'], '</span>
 			</h3>
 		</div>
@@ -422,16 +384,12 @@ function template_shd_profile_show_notify_override()
 					</tr>';
 
 	if (empty($context['tickets']))
-	{
 		echo '
 					<tr class="windowbg">
 						<td colspan="7">', $txt['shd_error_no_tickets'], '</td>
 					</tr>';
-	}
 	else
-	{
 		foreach ($context['tickets'] as $ticket)
-		{
 			echo '
 						<tr class="windowbg">
 							<td width="4%" class="smalltext">', $ticket['id_ticket_display'], '</td>
@@ -442,8 +400,6 @@ function template_shd_profile_show_notify_override()
 							<td class="smalltext">', $txt['shd_urgency_' . $ticket['urgency']], '</td>
 							<td class="smalltext">', $ticket['updated'], '</td>
 						</tr>';
-		}
-	}
 
 	echo '
 					</table>';
@@ -462,9 +418,9 @@ function template_shd_profile_permissions()
 						</h3>
 					</div>';
 
+	// Whoa, this dude's special. Tidy up and BAIL!
 	if (!empty($context['member']['has_all_permissions']))
 	{
-		// Whoa, this dude's special. Tidy up and BAIL!
 		echo '
 					<p class="information">
 						', $txt['shd_profile_permissions_all_admin'], '
@@ -520,12 +477,10 @@ function template_shd_profile_permissions()
 						</tr>';
 
 	if (empty($context['member_roles']))
-	{
 		echo '
 						<tr class="windowbg">
 							<td colspan="3" class="centertext">', $txt['shd_profile_no_roles'], '</td>
 						</tr>';
-	}
 	else
 	{
 		foreach ($context['member_roles'] as $role)
@@ -698,9 +654,7 @@ function template_shd_profile_actionlog()
 							<td colspan="2" class="shd_noticket">', $txt['shd_profile_log_none'], '</td>
 						</tr>';
 	else
-	{
 		foreach ($context['action_log'] as $action)
-		{
 			echo '
 						<tr class="windowbg">
 							<td class="smalltext">', $action['time'], '</td>
@@ -709,8 +663,6 @@ function template_shd_profile_actionlog()
 								', $action['action_text'], '
 							</td>
 						</tr>';
-		}
-	}
 
 	echo '
 						<tr class="titlebg">
@@ -731,18 +683,15 @@ function template_shd_profile_navigation_above()
 			<div class="tborder shd_profile_navigation">
 				<div class="roundframe">
 					<ul class="', !empty($options['use_sidebar_menu']) ? 'shd_profile_nav_inline' : 'shd_profile_nav_list', '">';
+
 	foreach ($context['shd_profile_menu'] as $menuitem)
-	{
 		if (!empty($menuitem['show']))
-		{
 			echo '
 						<li', (!empty($menuitem['is_last']) ? ' class="shd_inline_last"' : ''), '>
 							<img src="', $settings['default_images_url'], '/simpledesk/', $menuitem['image'], '" alt="x" class="floatright">
 							<a href="', $menuitem['link'], '"><strong>', $menuitem['text'], '</strong></a>
 							', (empty($options['use_sidebar_menu']) && empty($menuitem['is_last'])) ? '<hr>' : '', '
 						</li>';
-		}
-	}
 
 	echo '
 					</ul>
@@ -842,3 +791,52 @@ function template_profile_shd_theme_settings()
 						<dl>
 							<dd></dd>';
 }
+
+/**
+ *	Javascript for Preferences
+ *
+ *	@since 2.1
+*/
+function template_shd_profile_js_preferences()
+{
+	global $context, $options, $txt;
+
+	echo '
+	<script type="text/javascript"><!-- // --><![CDATA[';
+
+	foreach ($context['shd_preferences_options']['groups'] as $group => $details)
+		echo '
+		var oPreferences', $group, ' = new smc_Toggle({
+			bToggleEnabled: true,
+			bCurrentlyCollapsed: ', empty($options['collapse_shd_profile_' . $group]) ? 'false' : 'true', ',
+			aSwappableContainers: [
+				\'prefgroup_', $group, '\'
+			],
+			aSwapImages: [
+				{
+					sId: \'prefexpandicon_', $group, '\',
+				}
+			],
+			aSwapLinks: [
+				{
+					sId: \'prefexpand_', $group, '_swap_link\',
+					msgCollapsed: ', JavaScriptEscape($txt['shd_pref_group_' . $group]), ',
+					msgExpanded: ', JavaScriptEscape($txt['shd_pref_group_' . $group]), ',
+				},
+			],
+			oThemeOptions: {
+				bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
+				sOptionName: \'collapse_shd_profile_', $group, '\',
+				sSessionId: smf_session_id,
+				sSessionVar: smf_session_var,
+			},
+			oCookieOptions: {
+				bUseCookie: false,
+				sCookieName: \'collapse_shd_profile_', $group, '\'
+			}
+		});';
+
+	echo '
+	// ]' . ']></script>';
+
+}
\ No newline at end of file

sd_template/SimpleDesk-Search.template.php

View file @ 1d762ea

@@ -66,11 +66,8 @@ function template_search()
 				</dl>';
 
 	if (count($context['dept_list']) == 1)
-	{
-		$array = array_keys($context['dept_list']);
 		echo '
-					<input type="hidden" name="search_dept[]" value="', $array[0], '">';
-	}
+					<input type="hidden" name="search_dept[]" value="', array_keys($context['dept_list'])[0], '">';
 	else
 	{
 		echo '
@@ -140,40 +137,14 @@ function template_search()
 						<input type="text" name="assignee_name" id="assignee_name" size="40" maxlength="100" value="">
 						<div id="assignee_name_container"></div>
 					</dd>
-				</dl>
+				</dl>';
 
-				<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?20fin"></script>
-				<script type="text/javascript"><!-- // --><![CDATA[
-					var oTicketStarter = new smc_AutoSuggest({
-						sSelf: \'oTicketStarter\',
-						sSessionId: \'', $context['session_id'], '\',
-						sSessionVar: \'', $context['session_var'], '\',
-						sControlId: \'starter_name\',
-						sSuggestId: \'starter\',
-						sSearchType: \'member\',
-						sPostName: \'starter_name_form\',
-						sURLMask: \'action=profile;u=%item_id%\',
-						bItemList: true,
-						sItemListContainerId: \'starter_name_container\',
-						aListItems: []
-					});
-					var oTicketAssignee = new smc_AutoSuggest({
-						sSelf: \'oTicketAssignee\',
-						sSessionId: \'', $context['session_id'], '\',
-						sSessionVar: \'', $context['session_var'], '\',
-						sControlId: \'assignee_name\',
-						sSuggestId: \'assignee\',
-						sSearchType: \'member\',
-						sPostName: \'assigned_name_form\',
-						sURLMask: \'action=profile;u=%item_id%\',
-						bItemList: true,
-						sItemListContainerId: \'assignee_name_container\',
-						aListItems: []
-					});
-				// ]', ']></script>
+	template_shd_js_search();
+
+	echo '
 				<hr>
 				<br>
-				<input type="submit" value="', $txt['shd_search'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+				<input type="submit" value="', $txt['shd_search'], '" accesskey="s" class="button save">
 			</div>
 		</form>
 	</div>';
@@ -319,7 +290,7 @@ function template_search_results()
 	<div class="search_results_posts">
 		<div class="windowbg core_posts">
 			<div class="content flow_auto">
-				<div class="topic_details floatleft" style="width: 94%">
+				<div class="topic_details floatleft">
 					<div class="counter">', $result['result'], '</div>
 					<h5>', $result['dept_link'], '<a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $result['id_ticket'], '">', sprintf($result['is_ticket'] ? $txt['shd_search_result_ticket'] : $txt['shd_search_result_reply'], $result['display_id']), '</a> - ', $result['subject'], ' (', $txt['shd_search_last_updated'], ' ', timeformat($result['last_updated']), ')</h5>
 					<span class="smalltext">&#171;&nbsp;<strong>', $result['is_ticket'] ? $txt['shd_search_ticket_opened_by'] : $txt['shd_search_ticket_replied_by'], ' ', shd_profile_link($result['poster_name'], $result['id_member']), '</strong>&nbsp;', $txt['on'], '&nbsp;<em>', timeformat($result['poster_time']), '</em>&nbsp;&#187;</span>
@@ -370,11 +341,8 @@ function template_search_navigation($page = 'next')
 
 	// Departments.
 	if (count($context['dept_list']) == 1)
-	{
-		$array = array_keys($context['dept_list']);
 		echo '
-		<input type="hidden" name="search_dept[]" value="', $array[0], '">';
-	}
+		<input type="hidden" name="search_dept[]" value="', array_keys($context['dept_list'])[0], '">';
 	elseif (isset($context['search_params']['visible_depts']))
 		foreach ($context['search_params']['visible_depts'] as $dept)
 		echo '
@@ -412,15 +380,55 @@ function template_search_navigation($page = 'next')
 	if ($page === 'prev')
 		echo '
 		<input type="hidden" name="page" value="', $context['prev_page'], '">
-		<input type="submit" value="Previous" onclick="return submitThisOnce(this);" class="button floatleft">';
+		<input type="submit" value="Previous" class="button save floatleft">';
 	elseif (is_int($page) && $page > 0)
 		echo '
 		<input type="hidden" name="page" value="', $page, '">
-		<input type="submit" value="Page ', $page, '" onclick="return submitThisOnce(this);" class="button floatleft', $context['current_page'] == $page ? ' active' : '', '">';
+		<input type="submit" value="Page ', $page, '" class="button save floatleft', $context['current_page'] == $page ? ' active' : '', '">';
 	else
 		echo '
 		<input type="hidden" name="page" value="', $context['next_page'], '">
-		<input type="submit" value="Next" onclick="return submitThisOnce(this);" class="button">';
+		<input type="submit" value="Next" class="button save">';
 
 	echo '</form>';
 }
+
+/**
+ *	Javascript for Search
+ *
+ *	@since 2.1
+*/
+function template_shd_js_search()
+{
+	global $context, $settings;
+
+	echo '
+				<script type="text/javascript"><!-- // --><![CDATA[
+					var oTicketStarter = new smc_AutoSuggest({
+						sSelf: \'oTicketStarter\',
+						sSessionId: \'', $context['session_id'], '\',
+						sSessionVar: \'', $context['session_var'], '\',
+						sControlId: \'starter_name\',
+						sSuggestId: \'starter\',
+						sSearchType: \'member\',
+						sPostName: \'starter_name_form\',
+						sURLMask: \'action=profile;u=%item_id%\',
+						bItemList: true,
+						sItemListContainerId: \'starter_name_container\',
+						aListItems: []
+					});
+					var oTicketAssignee = new smc_AutoSuggest({
+						sSelf: \'oTicketAssignee\',
+						sSessionId: \'', $context['session_id'], '\',
+						sSessionVar: \'', $context['session_var'], '\',
+						sControlId: \'assignee_name\',
+						sSuggestId: \'assignee\',
+						sSearchType: \'member\',
+						sPostName: \'assigned_name_form\',
+						sURLMask: \'action=profile;u=%item_id%\',
+						bItemList: true,
+						sItemListContainerId: \'assignee_name_container\',
+						aListItems: []
+					});
+				// ]', ']></script>';
+}
\ No newline at end of file

sd_template/SimpleDesk-TicketTopicMove.template.php

View file @ 1d762ea

@@ -36,7 +36,7 @@ function template_shd_tickettotopic()
 			</h3>
 		</div>
 		<div class="roundframe noup">
-		<form action="', $scripturl, '?action=helpdesk;sa=tickettotopic2;ticket=', $context['ticket_id'], '" method="post" onsubmit="submitonce(this);">
+		<form action="', $scripturl, '?action=helpdesk;sa=tickettotopic2;ticket=', $context['ticket_id'], '" method="post">
 				<dl class="settings">
 					<dt>
 						<strong>', $txt['shd_ticket_board'], ':</strong>
@@ -63,10 +63,10 @@ function template_shd_tickettotopic()
 						<strong>', $txt['shd_change_ticket_subject'], ':</strong>
 					</dt>
 					<dd>
-						<input type="checkbox" name="change_subject" id="change_subject" onclick="document.getElementById(\'new_subject\').style.display = this.checked ? \'block\' : \'none\';" >
+						<input type="checkbox" name="change_subject" id="change_subject" onclick="$(\'#new_subject\').toggle();">
 					</dd>
 				</dl>
-				<dl class="settings" style="display: none;" id="new_subject">
+				<dl class="settings hidden" id="new_subject">
 					<dt>
 						<strong>', $txt['shd_new_subject'], ':</strong>
 					</dt>
@@ -79,7 +79,7 @@ function template_shd_tickettotopic()
 						<strong>', $txt['shd_move_send_pm'], ':</strong>
 					</dt>
 					<dd>
-						<input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="document.getElementById(\'pm_message\').style.display = this.checked ? \'block\' : \'none\';" >
+						<input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="$(\'#pm_message\').toggle();">
 					</dd>
 				</dl>
 				<fieldset id="pm_message">
@@ -94,7 +94,6 @@ function template_shd_tickettotopic()
 				</fieldset>';
 
 	if (!empty($context['deleted_prompt']))
-	{
 		echo '
 				<fieldset id="deleted_replies">
 					<dl class="settings">
@@ -110,7 +109,6 @@ function template_shd_tickettotopic()
 						</dd>
 					</dl>
 				</fieldset>';
-	}
 
 	if (!empty($context['custom_fields']))
 	{
@@ -181,7 +179,7 @@ function template_shd_tickettotopic()
 	}
 
 	echo '
-				<input type="submit" value="', $txt['shd_move_ticket'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+				<input type="submit" value="', $txt['shd_move_ticket'], '" accesskey="s" class="button save">
 				<input type="submit" name="cancel" value="', $txt['shd_cancel_ticket'], '" accesskey="c" class="button">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">
@@ -217,10 +215,10 @@ function template_shd_topictoticket()
 						<strong>', $txt['shd_change_topic_subject'], ':</strong>
 					</dt>
 					<dd>
-						<input type="checkbox" name="change_subject" id="change_subject" onclick="document.getElementById(\'new_subject\').style.display = this.checked ? \'block\' : \'none\';" >
+						<input type="checkbox" name="change_subject" id="change_subject" onclick="$(\'#new_subject\').toggle();">
 					</dd>
 				</dl>
-				<dl class="settings" style="display: none;" id="new_subject">
+				<dl class="settings hidden" id="new_subject">
 					<dt>
 						<strong>', $txt['shd_new_subject'], ':</strong>
 					</dt>
@@ -233,7 +231,7 @@ function template_shd_topictoticket()
 						<strong>', $txt['shd_move_send_pm_topic'], ':</strong>
 					</dt>
 					<dd>
-						<input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="document.getElementById(\'pm_message\').style.display = this.checked ? \'block\' : \'none\';" >
+						<input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="$(\'#pm_message\').toggle();">
 					</dd>
 				</dl>
 				<fieldset id="pm_message">
@@ -247,16 +245,13 @@ function template_shd_topictoticket()
 					</dl>
 				</fieldset>';
 
-	if (count($context['dept_list']) == 1)
-	{
-		$dept = array_keys($context);
 	// We can only see one department, so that's the one we will use.
+	if (count($context['dept_list']) == 1)
 		echo '
 				<dl class="settings">
 					<dt>', $context['ttm_move_dept'], '</dt>
-					<input type="hidden" name="dept" value="', $dept[0], '">
+					<input type="hidden" name="dept" value="', array_keys($context)[0], '">
 				</dl>';
-	}
 	else
 	{
 		// We can see multiple departments, so tell the moderator and also provide a list to pick from.
@@ -280,7 +275,7 @@ function template_shd_topictoticket()
 	}
 
 	echo '
-				<input type="submit" value="', $txt['shd_move_topic'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
+				<input type="submit" value="', $txt['shd_move_topic'], '" accesskey="s" class="button save">
 				<input type="submit" name="cancel" value="', $txt['shd_cancel_topic'], '" accesskey="c" class="button">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 				<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">

sd_template/SimpleDesk-Unread.template.php

View file @ 1d762ea

@@ -51,16 +51,12 @@ function template_shd_unread_below()
 						</tr>';
 
 	if (empty($context['shd_unread_info']))
-	{
 		echo '
 					<tr class="windowbg">
 							<td colspan="7">', $txt['shd_error_no_tickets'], '</td>
 						</tr>';
-	}
 	else
-	{
 		foreach ($context['shd_unread_info'] as $ticket)
-		{
 			echo '
 					<tr class="windowbg">
 							<td width="4%" class="smalltext">', $ticket['id_ticket_display'], '</td>
@@ -72,9 +68,6 @@ function template_shd_unread_below()
 							<td class="smalltext">', $ticket['updated'], '</td>
 						</tr>';
 
-		}
-	}
-
 	echo '
 				</table>';
 }
\ No newline at end of file


...	...	@@ -912,7 +912,8 @@ function shd_credits()
912	912	'desc' => $txt['shd_credits_devs_desc'],
913	913	'icon' => 'devs.png',
914	914	'members' => array(
915		- array('Peter "Arantor" Spicer', false),
	915	+ array('Jeremy "SleePy" Darwood', false),
	916	+ array('Peter "Arantor" Spicer', true),
916	917	array('Jason "JBlaze" Clemons', true),
917	918	array('Marcus "cσσкιє мσηѕтєя" Forsberg', true),
918	919	),
...	...	@@ -922,8 +923,7 @@ function shd_credits()
922	923	'desc' => $txt['shd_credits_projectsupport_desc'],
923	924	'icon' => 'managers.png',
924	925	'members' => array(
925		- array('Graeme "Trekkie101" Spence', false),
926		- array('Jeremy "SleePy" Darwood', false),
	926	+ array('Graeme "Trekkie101" Spence', true),
927	927	),
928	928	),
929	929	array(
...	...	@@ -931,7 +931,7 @@ function shd_credits()
931	931	'desc' => $txt['shd_credits_marketing_desc'],
932	932	'icon' => 'marketers.png',
933	933	'members' => array(
934		- array('Brannon "Bª" Hall', false),
	934	+ array('Brannon "Bª" Hall', true),
935	935	),
936	936	),
937	937	array(
...	...	@@ -957,9 +957,9 @@ function shd_credits()
957	957	'desc' => $txt['shd_credits_qualityassurance_desc'],
958	958	'icon' => 'qa.png',
959	959	'members' => array(
960		- array('Sinan "[SiNaN]" Çevik', false),
961		- array('Paul "tfs" Laufer', false),
962		- array('Shomari "spoogs" Scott', false),
	960	+ array('Sinan "[SiNaN]" Çevik', true),
	961	+ array('Paul "tfs" Laufer', true),
	962	+ array('Shomari "spoogs" Scott', true),
963	963	array('Alex "Cleo" Tokar', true),
964	964	),
965	965	),
...	...	@@ -968,21 +968,21 @@ function shd_credits()
968	968	'desc' => $txt['shd_credits_beta_desc'],
969	969	'icon' => 'testers.png',
970	970	'members' => array(
971		- array('Chris "ccbtimewiz" Batista', false),
972		- array('Wade "ѕησω" Poulsen', false),
973		- array('Edwin "Dismal Shadow" Mendez', false),
974		- array('Treznax', false),
975		- array('Mark "KiLLuMiNaTi−7−" Longworth', false),
976		- array('NIBOGO', false),
977		- array('Robert "Robbo" Clancy', false),
978		- array('Yağizcan Arslan', false),
979		- array('MultiformeIngegno', false),
980		- array('flapjack', false),
981		- array('feline', false),
982		- array('Sordell Media', false),
983		- array('[FailSafe]', false),
984		- array('chilly', false),
985		- array('Tah Zonemaster', false),
	971	+ array('Chris "ccbtimewiz" Batista', true),
	972	+ array('Wade "ѕησω" Poulsen', true),
	973	+ array('Edwin "Dismal Shadow" Mendez', true),
	974	+ array('Treznax', true),
	975	+ array('Mark "KiLLuMiNaTi−7−" Longworth', true),
	976	+ array('NIBOGO', true),
	977	+ array('Robert "Robbo" Clancy', true),
	978	+ array('Yağizcan Arslan', true),
	979	+ array('MultiformeIngegno', true),
	980	+ array('flapjack', true),
	981	+ array('feline', true),
	982	+ array('Sordell Media', true),
	983	+ array('[FailSafe]', true),
	984	+ array('chilly', true),
	985	+ array('Tah Zonemaster', true),
986	986	),
987	987	),
988	988	array(

...	...	@@ -7,15 +7,6 @@
7	7	}
8	8
9	9	/* SimpleDesk icons */
10		-.shd_smallicon {
11		- width: 16px;
12		- height: 20px;
13		- margin-right: 4px;
14		-}
15		-.shd_icon_minihead {
16		- position: relative;
17		- top: 3px;
18		-}
19	10	.shd_icon {
20	11	position: relative;
21	12	top: 3px;
...	...	@@ -204,9 +195,6 @@ form#postmodify .shd_ticket_roundframe {
204	195	position: relative;
205	196	left: 4px;
206	197	}
207		-#shd_custom_fields_swap {
208		- margin-top: 8px;
209		-}
210	198	.shd_customfields input[type="text"]
211	199	{
212	200	width: 85%;
...	...	@@ -253,8 +241,6 @@ form#postmodify .shd_ticket_roundframe {
253	241	}
254	242	/* Go advanced! */
255	243	.shd_advancedbutton {
256		- margin-top: 10px;
257		- height: 15px;
258	244	background: url(../images/simpledesk/advanced.png) no-repeat left;
259	245	background-position: 10px;
260	246	padding: 10px;
...	...	@@ -263,6 +249,8 @@ form#postmodify .shd_ticket_roundframe {
263	249	font-weight: bold;
264	250	font-size: 100%;
265	251	margin-right: 10px;
	252	+ border-top: 1px solid #ddd;
	253	+ border-radius: 7px;
266	254	}
267	255
268	256	/* Edit settings*/
...	...	@@ -337,6 +325,10 @@ form#postmodify .shd_ticket_roundframe {
337	325	margin-right: 5%;
338	326	float: left;
339	327	}
	328	+dl.settings dt.shd_cust_fields_largetext, .shd_cust_fields_largetext textarea {
	329	+ width: 100%;
	330	+}
	331	+
340	332
341	333	/**********************************
342	334	* Attachment stuff *
...	...	@@ -412,6 +404,9 @@ form#postmodify .shd_ticket_roundframe {
412	404	#canned_replies {
413	405	margin-top: 1em;
414	406	}
	407	+#canned_replies #canned_title {
	408	+ font-weight:bold;
	409	+}
415	410
416	411	/**********************************
417	412	* General actions *

...	...	@@ -42,7 +42,7 @@
42	42
43	43	}
44	44	.shd_former_contributor {
45		- color: #696969;
	45	+ color: #6969E7;
46	46	}
47	47	.shd_bbc_list {
48	48	width: 33%;

...	...	@@ -1,17 +1,24 @@
1	1	// Handle the JavaScript surrounding the admin center.
	2	+$(document).ready(function(){
	3	+ $('.shd_help').on('click', function(e) {
	4	+ e.preventDefault();
	5	+ return reqOverlayDiv(this.href);
	6	+ });
	7	+
	8	+ /* If we have a submit with a save class, default the submitOnce check */
	9	+ $('input[type="submit"].save').parent('form').on('submit', function(){
	10	+ submitonce(this.currentTarget);
	11	+ });
	12	+ $('input[type="submit"].save').on('click', function(e){
	13	+ submitThisOnce(this.currentTarget);
	14	+ });
	15	+});
	16	+
2	17	function sd_AdminIndex(oOptions)
3	18	{
4	19	this.opt = oOptions;
5		- this.init();
6		-}
7	20
8		-sd_AdminIndex.prototype.init = function ()
9		-{
10		- window.adminIndexInstanceRef = this;
11		- var fHandlePageLoaded = function () {
12		- window.adminIndexInstanceRef.loadAdminIndex();
13		- }
14		- addLoadEvent(fHandlePageLoaded);
	21	+ $(document).ready(this.loadAdminIndex.bind(this));
15	22	}
16	23
17	24	sd_AdminIndex.prototype.loadAdminIndex = function ()
...	...	@@ -27,19 +34,21 @@ sd_AdminIndex.prototype.loadAdminIndex = function ()
27	34	// Load the text box that sais there's a new version available.
28	35	if (this.opt.bLoadUpdateNotification)
29	36	this.checkUpdateAvailable();
30		-}
31	37
	38	+ // Totoal Tickets link.
	39	+ $('#' + this.opt.sTotalTicketsContainerId + ' a').on('click', this.TickekTotals.bind(this));
	40	+}
32	41
33	42	sd_AdminIndex.prototype.setAnnouncements = function ()
34	43	{
35		- if (!('sdAnnouncements' in window) \|\| !('length' in window.sdAnnouncements))
	44	+ if (!$('#sdAnnouncements').length)
36	45	return;
37	46
38	47	var sMessages = '';
39	48	for (var i = 0; i < window.sdAnnouncements.length; i++)
40	49	sMessages += this.opt.sAnnouncementMessageTemplate.replace('%href%', window.sdAnnouncements[i].href).replace('%subject%', window.sdAnnouncements[i].subject).replace('%time%', window.sdAnnouncements[i].time).replace('%message%', window.sdAnnouncements[i].message).replace('%author%', window.sdAnnouncements[i].author).replace('%readmore%', window.sdAnnouncements[i].href);
41	50
42		- setInnerHTML(document.getElementById(this.opt.sAnnouncementContainerId), this.opt.sAnnouncementTemplate.replace('%content%', sMessages));
	51	+ $('#' + this.opt.sAnnouncementContainerId).html(this.opt.sAnnouncementTemplate.replace('%content%', sMessages));
43	52	}
44	53
45	54	sd_AdminIndex.prototype.showCurrentVersion = function ()
...	...	@@ -47,18 +56,17 @@ sd_AdminIndex.prototype.showCurrentVersion = function ()
47	56	if (!('sdVersion' in window))
48	57	return;
49	58
50		- var oSdVersionContainer = document.getElementById(this.opt.sSdVersionContainerId);
51		- var oYourVersionContainer = document.getElementById(this.opt.sYourVersionContainerId);
	59	+ var oSdVersionContainer = $('#' + this.opt.sSdVersionContainerId);
	60	+ var oYourVersionContainer = $('#' + this.opt.sYourVersionContainerId);
52	61
53	62	// Handle a developer version cleaner.
54		- if (this.opt.bDeveloperMode && 'sdDevVersion' in window)
55		- setInnerHTML(oSdVersionContainer, window.sdDevVersion);
56		- else
57		- setInnerHTML(oSdVersionContainer, window.sdVersion);
	63	+ oSdVersionContainer.html((this.opt.bDeveloperMode && 'sdDevVersion' in window) ? window.sdDevVersion : window.sdVersion)
58	64
59		- var sCurrentVersion = getInnerHTML(oYourVersionContainer);
60		- if (sCurrentVersion != window.sdVersion && !this.opt.bDeveloperMode)
61		- setInnerHTML(oYourVersionContainer, this.opt.sVersionOutdatedTemplate.replace('%currentVersion%', sCurrentVersion));
	65	+ var sCurrentVersion = oYourVersionContainer.html();
	66	+ if (this.opt.bDeveloperMode && 'sdDevVersion' in window && sCurrentVersion != window.sdDevVersion)
	67	+ oYourVersionContainer.html(this.opt.sVersionOutdatedTemplate.replace('%currentVersion%', sCurrentVersion));
	68	+ else if (sCurrentVersion != window.sdVersion && !this.opt.bDeveloperMode)
	69	+ oYourVersionContainer.html(this.opt.sVersionOutdatedTemplate.replace('%currentVersion%', sCurrentVersion));
62	70	}
63	71
64	72	sd_AdminIndex.prototype.checkUpdateAvailable = function ()
...	...	@@ -67,59 +75,71 @@ sd_AdminIndex.prototype.checkUpdateAvailable = function ()
67	75	return;
68	76
69	77	// We don't handle developer mode stuff here, best to get any developer edition to a supported edition.
70		-
71		- var oContainer = document.getElementById(this.opt.sUpdateNotificationContainerId);
	78	+ var oContainer = $('#' + this.opt.sUpdateNotificationContainerId);
72	79
73	80	// Are we setting a custom title and message?
74	81	var sTitle = 'sdUpdateTitle' in window ? window.sdUpdateTitle : this.opt.sUpdateNotificationDefaultTitle;
75	82	var sMessage = 'sdUpdateNotice' in window ? window.sdUpdateNotice : this.opt.sUpdateNotificationDefaultMessage;
76	83
77		- setInnerHTML(oContainer, this.opt.sUpdateNotificationTemplate.replace('%title%', sTitle).replace('%message%', sMessage).replace('%criticaltitle%', sTitle));
	84	+ oContainer.html(this.opt.sUpdateNotificationTemplate.replace('%title%', sTitle).replace('%message%', sMessage).replace('%criticaltitle%', sTitle));
78	85
79	86	// Parse in the package download URL if it exists in the string.
80		- document.getElementById('update-link').href = this.opt.sUpdateNotificationLink.replace('%package%', window.sdUpdatePackage);
	87	+ $('#update-link').attr('href', this.opt.sUpdateNotificationLink.replace('%package%', window.sdUpdatePackage));
81	88
82	89	if ('sdUpdateInformation' in window)
83	90	{
84		- document.getElementById('information-link-span').style.display = 'block';
85		- document.getElementById('information-link').href = this.opt.sUpdateInformationLink.replace('%information%', window.sdUpdateInformation);
	91	+ $('#information-link-span').css('display', 'block');
	92	+ $('#information-link').attr('href', this.opt.sUpdateInformationLink.replace('%information%', window.sdUpdateInformation));
86	93	}
87	94
88	95	// If we decide to override life into "red" mode, do it.
89	96	if ('sdUpdateCritical' in window && window.sdUpdateCritical === true)
90	97	{
91		- document.getElementById('update_container').className = 'errorbox';
92		- document.getElementById('update_critical_title').style.display = 'block';
93		- document.getElementById('update_critical_alert').style.display = 'block';
94		- document.getElementById('update_title').style.display = 'none';
95		- document.getElementById('update_content').className = '';
	98	+ $('#update_container').removeClass().addClass('errorbox');
	99	+ $('#update_critical_title').show();
	100	+ $('#update_critical_alert').show();
	101	+ $('#update_title').hide();
96	102	}
97	103
98		- document.getElementById('sd_update_section').style.display = 'block';
	104	+ $('#sd_update_section').show();
99	105	}
100	106
101	107	// Ticket number information...
102		-function shd_ticket_total_information()
	108	+sd_AdminIndex.prototype.TickekTotals = function ()
103	109	{
104		- var infocontainer = document.getElementById('shd_ticket_total_information');
105		-
106		- if (infocontainer.style.display == 'none')
107		- infocontainer.style.display = 'block';
108		- else
109		- infocontainer.style.display = 'none';
	110	+ var infocontainer = $('#' + this.opt.sTotalTicketsInfoContainerID).toggle();
110	111	}
111	112
112	113	// Modified, SMF 2.0 ToggleItem
113		-function toggleItem(itemID, theme_url, txt_on, txt_off)
	114	+function shd_plugins(oOptions)
	115	+{
	116	+ this.opt = oOptions;
	117	+
	118	+ $('#' + this.opt.sJSworkedID).val(1);
	119	+ $('.' + this.opt.sFeaturesSwitchClass + ' a').on('click', this.togglePlugin.bind(this));
	120	+ $(this.opt.oJSInstallablePlugins).each(this.setupPlugins.bind(this));
	121	+}
	122	+
	123	+shd_plugins.prototype.setupPlugins = function (index, itemID)
	124	+{
	125	+ $('#' + this.opt.sJSFeatureClass.replace('%itemid%', itemID)).css('display', '');
	126	+ $('#' + this.opt.sJSPlainFeatureClass.replace('%itemid%', itemID)).css('display', 'none');
	127	+}
	128	+
	129	+shd_plugins.prototype.togglePlugin = function (e)
114	130	{
	131	+ e.preventDefault();
	132	+ itemID = e.currentTarget.dataset.plugin;
	133	+
115	134	// Toggle the hidden item.
116		- var itemValueHandle = document.getElementById("feature_" + itemID);
117		- itemValueHandle.value = itemValueHandle.value === 1 ? 0 : 1;
	135	+ this.oItemValueHandle = $('#' + this.opt.sFeatureClass.replace('%itemid%', itemID));
	136	+ this.bItemValue = this.oItemValueHandle.val() == 0 ? 1 : 0;
118	137
119	138	// Change the image, alternative text and the title.
120		- document.getElementById("switch_" + itemID).src = theme_url + '/simpledesk/switch_' + (itemValueHandle.value === 1 ? 'on' : 'off') + '.png';
121		- document.getElementById("switch_" + itemID).alt = itemValueHandle.value === 1 ? txt_off : txt_on;
122		- document.getElementById("switch_" + itemID).title = itemValueHandle.value === 1 ? txt_off : txt_on;
	139	+ $('#' + this.opt.sSwitchClass.replace('%itemid%', itemID)).attr('src', this.bItemValue === 1 ? this.opt.sPluginOnImg : this.opt.sPluginOffImg);
	140	+ $('#' + this.opt.sSwitchClass.replace('%itemid%', itemID)).attr('alt', this.bItemValue === 1 ? this.opt.sPluginOnText : this.opt.sPluginOffText);
	141	+ $('#' + this.opt.sSwitchClass.replace('%itemid%', itemID)).attr('title', this.bItemValue === 1 ? this.opt.sPluginOnText : this.opt.sPluginOffText);
	142	+ $('#' + this.opt.sFeatureClass.replace('%itemid%', itemID)).val(this.bItemValue);
123	143
124	144	// Don't reload.
125	145	return false;
...	...	@@ -250,3 +271,151 @@ shd_custom_field_order.prototype.resort = function (currentOrder)
250	271	$('#option_' + key).val($('#option_' + key).attr('data-value-input'));
251	272	});
252	273	}
	274	+
	275	+/* Reattribute Posts */
	276	+function shd_AttributeValidate(oOptions)
	277	+{
	278	+ this.opt = oOptions;
	279	+
	280	+ this.init();
	281	+}
	282	+
	283	+/* Reattribute Posts: Bind the events */
	284	+shd_AttributeValidate.prototype.init = function ()
	285	+{
	286	+ /* Changing the radio */
	287	+ $('#' + this.opt.sTypeEmailContainerId + ', #' + this.opt.sTypeStarterContainerId + ', #' + this.opt.sTypeFromContainerId).change(this.validator.bind(this));
	288	+
	289	+ /* Clicking into a field, special as we update the radio */
	290	+ $('#' + this.opt.sEmailContainerId + ', #' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId + ', #' + this.opt.sToContainerId).focus(this.focusValidator.bind(this));
	291	+
	292	+ /* After typing a key */
	293	+ $('#' + this.opt.sEmailContainerId + ', #' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId + ', #' + this.opt.sToContainerId).keyup(this.validator.bind(this));
	294	+}
	295	+
	296	+/* Reattribute Posts: Does a radio change and processes the validator */
	297	+shd_AttributeValidate.prototype.focusValidator = function (e)
	298	+{
	299	+ if (e.currentTarget.id == this.opt.sEmailContainerId)
	300	+ $('#' + this.opt.sTypeEmailContainerId).prop('checked', true);
	301	+ else if (e.currentTarget.id == this.opt.sStarterContainerId)
	302	+ $('#' + this.opt.sTypeStarterContainerId).prop('checked', true);
	303	+ else if (e.currentTarget.id == this.opt.sFromContainerId)
	304	+ $('#' + this.opt.sTypeFromContainerId).prop('checked', true);
	305	+
	306	+ this.validator();
	307	+}
	308	+
	309	+/* Reattribute Posts: Validate if we can start the process to reattribute */
	310	+shd_AttributeValidate.prototype.validator = function ()
	311	+{
	312	+ origText = this.opt.sOrigText;
	313	+ origTextStarter = this.opt.sOrigTextStarter;
	314	+ valid = true;
	315	+
	316	+ // Do all the fields!
	317	+ if (!$('#' + this.opt.sToContainerId).val())
	318	+ valid = false;
	319	+
	320	+ warningMessage = origText.replace(/%member_to%/, $('#' + this.opt.sToContainerId).value);
	321	+
	322	+ if ($('#' + this.opt.sTypeEmailContainerId).is(":checked"))
	323	+ {
	324	+ $('#' + this.opt.sStarterContainerId + ', #' + this.opt.sFromContainerId).val("");
	325	+ valid = $('#' + this.opt.sEmailContainerId).val() != '';
	326	+ warningMessage = warningMessage.replace(/%type%/, this.opt.sEmailConfirmText).replace(/%find%/, $('#' + this.opt.sEmailContainerId).val());
	327	+ }
	328	+ else if ($('#' + this.opt.sTypeStarterContainerId).is(":checked"))
	329	+ {
	330	+ $('#' + this.opt.sEmailContainerId + ' #' + this.opt.sFromContainerId).val("");
	331	+
	332	+ valid = $('#' + this.opt.sStarterContainerId).val() != '';
	333	+ warningMessage = origTextStarter.replace(/%member_to%/, $('#' + this.opt.sToContainerId).val()).replace(/%find%/, $('#' + this.opt.sStarterContainerId).val());
	334	+ }
	335	+ else
	336	+ {
	337	+ $('#' + this.opt.sEmailContainerId + ' #' + this.opt.sStarterContainerId).val("");
	338	+
	339	+ valid = $('#' + this.opt.sFromContainerId).val() != '';
	340	+ warningMessage = warningMessage.replace(/%type%/, this.opt.sFromConfirmText).replace(/%find%/, $('#' + this.opt.sFromContainerId).val());
	341	+ }
	342	+
	343	+ $('#' + this.opt.sDoAttributeContainerId).prop("disabled", valid ? false : true);
	344	+}
	345	+
	346	+/* Roles Management */
	347	+function shd_role(oOptions)
	348	+{
	349	+ this.opt = oOptions;
	350	+
	351	+ this.init();
	352	+}
	353	+
	354	+/* Roles Management: Bind the events */
	355	+shd_role.prototype.init = function ()
	356	+{
	357	+ /* When they change a permission, change the icon */
	358	+ this.iconInit();
	359	+
	360	+ this.toggleBlockInt();
	361	+}
	362	+
	363	+/* Roles Management: Bind the events */
	364	+shd_role.prototype.iconInit = function ()
	365	+{
	366	+ this.iconSelector = {
	367	+ disallow: this.opt.sPermissionDisallowClass,
	368	+ allow: this.opt.sPermissionAllowClass,
	369	+ allow_own: this.opt.sPermissionAllowOwnClass,
	370	+ allow_any: this.opt.sPermissionAllowAnyClass
	371	+ };
	372	+
	373	+ $('dl.permsettings dd select[id*="perm_"]').on('change', this.icon.bind(this));
	374	+}
	375	+
	376	+/* Roles Management: Handle changing the icon */
	377	+shd_role.prototype.icon = function (e)
	378	+{
	379	+ $('#' + e.currentTarget.id + '_icon').attr('class', this.iconSelector[e.currentTarget.value] ? this.iconSelector[e.currentTarget.value] : '');
	380	+}
	381	+
	382	+shd_role.prototype.toggleBlockInt = function ()
	383	+{
	384	+ $(this.opt.oHiddenBlocks).each(this.toggleBlock.bind(this));
	385	+
	386	+ $('div.cat_bar h3.catbg a').on('click', this.toggleBlock.bind(this));
	387	+ $('input#' + this.opt.sDeleteContainerId).on('click', this.formConfirm.bind(this))
	388	+}
	389	+
	390	+shd_role.prototype.toggleBlock = function (e, block)
	391	+{
	392	+ if (typeof e.currentTarget !== 'undefined')
	393	+ {
	394	+ e.preventDefault();
	395	+ block = e.currentTarget.dataset.block;
	396	+ }
	397	+
	398	+ if ($('#' + this.opt.sBlockHeader.replace('%block%', block)).hasClass('cat_collapsed'))
	399	+ {
	400	+ $('#' + this.opt.sBlockHeader.replace('%block%', block)).attr('class', 'cat_bar');
	401	+ $('#' + this.opt.sBlockContent.replace('%block%', block)).css('display', '');
	402	+ $('#' + this.opt.sBlockFooter.replace('%block%', block)).css('display', '');
	403	+ $('#' + this.opt.sBlockIcon.replace('%block%', block)).attr('src', this.opt.sBlockIconExpandedImg);
	404	+ }
	405	+ else
	406	+ {
	407	+ $('#' + this.opt.sBlockHeader.replace('%block%', block)).attr('class', 'cat_bar cat_collapsed');
	408	+ $('#' + this.opt.sBlockContent.replace('%block%', block)).css('display', 'none');
	409	+ $('#' + this.opt.sBlockFooter.replace('%block%', block)).css('display', 'none');
	410	+ $('#' + this.opt.sBlockIcon.replace('%block%', block)).attr('src', this.opt.sBlockIconCollapsedImg);
	411	+ }
	412	+
	413	+ $('#' + this.opt.sBlockIcon.replace('%block%', block)).css('display', '');
	414	+}
	415	+
	416	+shd_role.prototype.formConfirm = function (e)
	417	+{
	418	+ e.preventDefault();
	419	+
	420	+ return confirm(this.opt.sDeleteConfirmText);
	421	+}

...	...	@@ -528,7 +528,7 @@ function shd_ajax_assign2()
528	528	return array('error' => $txt['shd_no_ticket']);
529	529
530	530	if (!isset($_GET['to_user']) \|\| !is_numeric($_GET['to_user']))
531		- return array('success' => false, 'error' => $txt['shd_assigned_not_permitted'] . 'line459');
	531	+ return array('success' => false, 'error' => $txt['shd_assigned_not_permitted']);
532	532
533	533	if (!shd_allowed_to('shd_assign_ticket_any', $dept) \|\| $status == TICKET_STATUS_CLOSED \|\| $status == TICKET_STATUS_DELETED)
534	534	return array('success' => false, 'error' => $txt['shd_cannot_assign']);

...	...	@@ -398,10 +398,12 @@ function shd_view_ticket()
398	398	);
399	399	if (!empty($field['options']) && empty($field['options']['inactive']))
400	400	$field['options']['inactive'] = array();
	401	+ if (!empty($field['options']) && empty($field['options']['order']))
	402	+ $field['options']['order'] = array();
401	403
402	404	if (in_array($field['type'], array(CFIELD_TYPE_RADIO, CFIELD_TYPE_SELECT, CFIELD_TYPE_MULTI)))
403	405	foreach ($field['options'] as $k => $v)
404		- if ($k != 'inactive' && strpos($v, '[') !== false)
	406	+ if ($k != 'inactive' && $k != 'order' && strpos($v, '[') !== false)
405	407	$field['options'][$k] = parse_bbc($v, false);
406	408
407	409	if (($row['field_loc'] & CFIELD_REPLY) && $field['editable'])
...	...	@@ -668,78 +670,8 @@ function shd_view_ticket()
668	670	$context['can_ping'] = $context['can_reply'] && shd_allowed_to('shd_singleton_email', $context['ticket']['dept']);
669	671
670	672	// Set up the fancy editor
671		- shd_postbox('shd_message', '', array('post_button' => $txt['shd_reply_ticket']));
672		-
673		- // Lastly, our magic AJAX stuff ;D and we know we already made html_headers exist in SimpleDesk.php, score!
674		- $context['html_headers'] .= '
675		- <script type="text/javascript"><!-- // --><![CDATA[
676		- var sSessI = "' . $context['session_id'] . '";
677		- var sSessV = "' . $context['session_var'] . '";';
678		-
679		- if ($context['ticket']['privacy']['can_change'])
680		- $context['html_headers'] .= '
681		- var shd_ajax_problem = ' . JavaScriptEscape($txt['shd_ajax_problem']) . ';
682		- var privacyCtl = new shd_privacyControl({
683		- ticket: ' . $context['ticket_id'] . ',
684		- sUrl: smf_scripturl + "?action=helpdesk;sa=ajax;op=privacy;ticket=' . $context['ticket_id'] . '",
685		- sSession: sSessV + "=" + sSessI,
686		- sSrcA: "privlink",
687		- sDestSpan: "privacy"
688		- });';
689		-
690		- if ($context['ticket']['urgency']['increase'] \|\| $context['ticket']['urgency']['decrease'])
691		- $context['html_headers'] .= '
692		- var urgencyCtl = new shd_urgencyControl({
693		- ticket: ' . $context['ticket_id'] . ',
694		- sUrl: smf_scripturl + "?action=helpdesk;sa=ajax;op=urgency;ticket=' . $context['ticket_id'] . ';change=",
695		- sSession: sSessV + "=" + sSessI,
696		- sDestSpan: "urgency",
697		- aButtons: ["up", "down"],
698		- aButtonOps: { up: "increase", down: "decrease" }
699		- });';
700		-
701		- if (!empty($options['display_quick_reply']))
702		- $context['html_headers'] .= '
703		- var oQuickReply = new QuickReply({
704		- bDefaultCollapsed: ' . (!empty($options['display_quick_reply']) && $options['display_quick_reply'] == 2 ? 'false' : 'true') . ',
705		- iTicketId: ' . $context['ticket_id'] . ',
706		- iStart: ' . $context['start'] . ',
707		- sScriptUrl: smf_scripturl,
708		- sImagesUrl: "' . $settings['images_url'] . '",
709		- sContainerId: "quickReplyOptions",
710		- sImageId: "quickReplyExpand",
711		- sImageCollapsed: "collapse.png",
712		- sImageExpanded: "expand.png",
713		- sJumpAnchor: "quickreply",
714		- sHeaderId: "quickreplyheader",
715		- sFooterId: "quickreplyfooter"
716		- });';
717		-
718		- $context['html_headers'] .= '
719		- var oCustomFields = new CustomFields({
720		- sImagesUrl: "' . $settings['images_url'] . '",
721		- sContainerId: "additional_info",
722		- sImageId: "shd_custom_fields_swap",
723		- sImageCollapsed: "collapse.png",
724		- sImageExpanded: "expand.png",
725		- sHeaderId: "additionalinfoheader",
726		- sFooterId: "additional_info_footer",
727		- });';
728		-
729		- if (!empty($options['display_quick_reply']) && $context['can_go_advanced'])
730		- $context['html_headers'] .= '
731		- function goAdvanced()
732		- {
733		- document.getElementById("shd_bbcbox").style.display = ' . (!empty($modSettings['shd_allow_ticket_bbc']) ? '""' : '"none"') . ';
734		- document.getElementById("shd_smileybox").style.display = ' . (!empty($modSettings['shd_allow_ticket_smileys']) ? '""' : '"none"') . ';
735		- document.getElementById("shd_attach_container").style.display = ' . (!empty($context['ticket_form']['do_attach']) ? '""' : '"none"') . ';
736		- document.getElementById("shd_goadvancedbutton").style.display = "none";' . (!empty($context['controls']['richedit']['shd_message']['rich_active']) ? '
737		- oEditorHandle_shd_message.toggleView(true);' : '') . '
738		- }
739		- ';
	673	+ shd_postbox('shd_message', '', array('post_button' => $txt['shd_reply_ticket']), '100%');
740	674
741		- $context['html_headers'] .= '
742		- // ]' . ']></script>';
743	675	$context['shd_display'] = true;
744	676	$context['controls']['richedit']['shd_message']['rich_active'] = 0; // we don't want it by default!
745	677

...	...	@@ -33,7 +33,9 @@ function shd_profile_main($memID)
33	33	global $context, $txt, $scripturl, $sourcedir, $user_info, $settings, $user_profile, $modSettings;
34	34
35	35	// Load the profile details
36		- loadTemplate('sd_template/SimpleDesk-Profile', array('helpdesk', 'helpdesk_admin'));
	36	+ loadTemplate('sd_template/SimpleDesk-Profile', array('helpdesk'));
	37	+ loadJavascriptFile('helpdesk.js', array('defer' => false, 'minimize' => false), 'helpdesk');
	38	+
37	39	shd_load_language('sd_language/SimpleDeskProfile');
38	40	$context['shd_preferences'] = shd_load_user_prefs();
39	41	shd_load_plugin_files('hdprofile');

...	...	@@ -36,6 +36,7 @@ function shd_search()
36	36	global $context, $smcFunc, $txt, $modSettings, $scripturl;
37	37
38	38	shd_is_allowed_to('shd_search', 0);
	39	+ loadJavascriptFile('suggest.js', array('defer' => false, 'minimize' => false), 'suggest');
39	40
40	41	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
41	42	return fatal_lang_error('loadavg_search_disabled', false);

...	...	@@ -218,7 +218,10 @@ function shd_tickettotopic()
218	218	{
219	219	// Didn't we have any values? If not, prune it, not interested.
220	220	if (empty($field['values']))
	221	+ {
221	222	unset($context['custom_fields'][$field_id]);
	223	+ continue;
	224	+ }
222	225
223	226	// If the user is an administrator, they can always see the fields.
224	227	if ($is_admin)

...	...	@@ -1145,8 +1145,7 @@ function shd_helpdesk_listing()
1145	1145	if (!empty($row['field_options']))
1146	1146	{
1147	1147	$row['field_options'] = smf_json_decode($row['field_options'], true);
1148		- if (isset($row['field_options']['inactive']))
1149		- unset($row['field_options']['inactive']);
	1148	+ unset($row['field_options']['inactive'], $row['field_options']['order']);
1150	1149	foreach ($row['field_options'] as $k => $v)
1151	1150	if (strpos($v, '[') !== false)
1152	1151	$row['field_options'][$k] = parse_bbc($v);

...	...	@@ -134,11 +134,11 @@ function template_shd_edit_canned_category()
134	134	<dt><strong>', $txt['shd_admin_cannedreplies_categoryname'], '</strong></dt>
135	135	<dd><input type="text" name="catname" id="catname" size="30" value="', $context['category_name'], '"></dd>
136	136	</dl>
137		- <input type="submit" value="', $context['page_title'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">';
	137	+ <input type="submit" value="', $context['page_title'], '" accesskey="s" class="button save">';
138	138
139	139	if ($context['canned_category'] != 'new')
140	140	echo '
141		- <input type="submit" name="delete" value="', $txt['shd_admin_cannedreplies_deletecat'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_admin_cannedreplies_delete_confirm']), ') && submitThisOnce(this);" class="button">';
	141	+ <input type="submit" name="delete" value="', $txt['shd_admin_cannedreplies_deletecat'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_admin_cannedreplies_delete_confirm']), ')" class="button save">';
142	142
143	143	echo '
144	144	<input type="hidden" name="cat" value="', $context['canned_category'], '">
...	...	@@ -164,7 +164,7 @@ function template_shd_edit_canned_reply()
164	164	<div class="information">
165	165	', $txt['shd_admin_cannedreplies_homedesc'], '
166	166	</div>
167		- <form action="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=savereply" method="post" accept-charset="', $context['character_set'], '" name="cannedreply" id="cannedreply" onsubmit="', 'submitonce(this);smc_saveEntities(\'cannedreply\', [\'title\', \'', $context['post_box_name'], '\']);" enctype="multipart/form-data" style="margin: 0;">
	167	+ <form action="', $scripturl, '?action=admin;area=helpdesk_cannedreplies;sa=savereply" method="post" accept-charset="', $context['character_set'], '" name="cannedreply" id="cannedreply" onsubmit="', 'smc_saveEntities(\'cannedreply\', [\'title\', \'', $context['post_box_name'], '\']);" enctype="multipart/form-data">
168	168	<div class="cat_bar">
169	169	<h3 class="catbg">
170	170	<img src="', $settings['default_images_url'], '/simpledesk/additional_information.png" alt="*">
...	...	@@ -204,21 +204,19 @@ function template_shd_edit_canned_reply()
204	204	<dl class="settings">';
205	205
206	206	foreach ($context['canned_reply']['depts_available'] as $dept_id => $dept_name)
207		- {
208	207	echo '
209	208	<dt><strong>', $dept_name, '</strong></dt>
210	209	<dd><input type="checkbox" name="dept_', $dept_id, '"', in_array($dept_id, $context['canned_reply']['depts_selected']) ? ' checked="checked"' : '', '></dd>';
211		- }
212	210
213	211	echo '
214	212	</dl>
215	213	</div>
216	214	<br>
217		- <input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['save'], '" tabindex="', $context['tabindex']++, '" accesskey="s" class="button">';
	215	+ <input type="submit" value="', isset($editor_context['labels']['post_button']) ? $editor_context['labels']['post_button'] : $txt['save'], '" tabindex="', $context['tabindex']++, '" accesskey="s" class="button save">';
218	216
219	217	if ($context['canned_reply']['id'] != 'new')
220	218	echo '
221		- <input type="submit" name="delete" value="', $txt['shd_admin_cannedreplies_deletereply'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_admin_cannedreplies_deletereply_confirm']), ') && submitThisOnce(this);" class="button">';
	219	+ <input type="submit" name="delete" value="', $txt['shd_admin_cannedreplies_deletereply'], '" onclick="return confirm(', JavaScriptEscape($txt['shd_admin_cannedreplies_deletereply_confirm']), ');" class="button save">';
222	220
223	221	echo '
224	222	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
...	...	@@ -264,7 +262,7 @@ function template_shd_move_reply_cat()
264	262	</select>
265	263	</dd>
266	264	</dl>
267		- <input type="submit" value="', $txt['shd_admin_cannedreplies_movereply'], '" onclick="return submitThisOnce(this);" class="button">
	265	+ <input type="submit" value="', $txt['shd_admin_cannedreplies_movereply'], '" class="button save">
268	266	<input type="hidden" name="reply" value="', $context['canned_reply_id'], '">
269	267	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
270	268	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">

...	...	@@ -130,7 +130,7 @@ function template_shd_create_dept()
130	130	<dd><textarea name="dept_desc" rows="3" cols="35" style="width: 99%"></textarea></dd>
131	131	<dt><strong>', $txt['shd_dept_boardindex_cat'], '</strong></dt>
132	132	<dd>
133		- <select name="dept_cat" id="dept_cat" onchange="document.getElementById(\'dept_beforeafter\').disabled = (this.value == 0);">';
	133	+ <select name="dept_cat" id="dept_cat" onchange="$(\'#dept_beforeafter\').attr(\'disabled\' ? (this.value == 0));">';
134	134
135	135	foreach ($context['shd_cat_list'] as $id_cat => $cat_name)
136	136	echo '
...	...	@@ -180,10 +180,10 @@ function template_shd_edit_dept()
180	180	<dt><strong>', $txt['shd_department_name'], '</strong></dt>
181	181	<dd><input type="text" name="dept_name" id="dept_name" value="', $context['shd_dept']['dept_name'], '" size="30"></dd>
182	182	<dt><strong>', $txt['shd_dept_description'], '</strong></dt>
183		- <dd><textarea name="dept_desc" rows="3" cols="35" style="width: 99%">', $context['shd_dept']['description'], '</textarea></dd>
	183	+ <dd><textarea name="dept_desc" rows="3" cols="35">', $context['shd_dept']['description'], '</textarea></dd>
184	184	<dt><strong>', $txt['shd_dept_boardindex_cat'], '</strong></dt>
185	185	<dd>
186		- <select name="dept_cat" id="dept_cat" onchange="document.getElementById(\'dept_beforeafter\').disabled = (this.value == 0);">';
	186	+ <select name="dept_cat" id="dept_cat" onchange="$(\'#dept_beforeafter\').attr(\'disabled\' ? (this.value == 0));">';
187	187
188	188	foreach ($context['shd_cat_list'] as $id_cat => $cat_name)
189	189	echo '
...	...	@@ -263,7 +263,7 @@ function template_shd_edit_dept()
263	263	<br>
264	264	</div>
265	265	<div class="floatleft">
266		- <input type="submit" value="', $txt['shd_edit_dept'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
	266	+ <input type="submit" value="', $txt['shd_edit_dept'], '" accesskey="s" class="button save">
267	267	<input type="submit" value="', $txt['shd_delete_dept'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_delete_dept_confirm']) . ');" name="delete" class="button">
268	268	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
269	269	<input type="hidden" name="dept" value="', $context['shd_dept']['id_dept'], '">

...	...	@@ -40,40 +40,9 @@ function template_shd_admin_maint_home()
40	40
41	41	function checkAttributeValidity()
42	42	{
43		- origText = \'', $txt['shd_reattribute_confirm'], '\';
44		- origTextStarter = \'', $txt['shd_reattribute_confirm_starter'], '\';
45		- valid = true;
46	43
47		- // Do all the fields!
48		- if (!document.getElementById(\'to\').value)
49		- valid = false;
50		- warningMessage = origText.replace(/%member_to%/, document.getElementById(\'to\').value);
51		-
52		- if (document.getElementById(\'type_email\').checked)
53		- {
54		- if (!document.getElementById(\'from_email\').value)
55		- valid = false;
56		- warningMessage = warningMessage.replace(/%type%/, \'', addcslashes($txt['shd_reattribute_confirm_email'], "'"), '\').replace(/%find%/, document.getElementById(\'from_email\').value);
57		- }
58		- else if (document.getElementById(\'type_starter\').checked)
59		- {
60		- if (!document.getElementById(\'from_starter\').value)
61		- valid = false;
62		- warningMessage = origTextStarter.replace(/%member_to%/, document.getElementById(\'to\').value).replace(/%find%/, document.getElementById(\'from_starter\').value);
63		- }
64		- else
65		- {
66		- if (!document.getElementById(\'from_name\').value)
67		- valid = false;
68		- warningMessage = warningMessage.replace(/%type%/, \'', addcslashes($txt['shd_reattribute_confirm_username'], "'"), '\').replace(/%find%/, document.getElementById(\'from_name\').value);
69	44	}
70		-
71		- document.getElementById(\'do_attribute\').disabled = valid ? \'\' : \'disabled\';
72		-
73		- setTimeout("checkAttributeValidity();", 500);
74		- return valid;
75		- }
76		- setTimeout("checkAttributeValidity();", 500);
	45	+ /setTimeout("checkAttributeValidity();", 500);/
77	46	// ]]></script>
78	47	<div class="cat_bar">
79	48	<h3 class="catbg">
...	...	@@ -92,19 +62,21 @@ function template_shd_admin_maint_home()
92	62	<label for="type_email"><input type="radio" name="type" id="type_email" value="email" checked="checked">', $txt['shd_admin_maint_reattribute_posts_email'], '</label>
93	63	</dt>
94	64	<dd>
95		- <input type="text" name="from_email" id="from_email" value="" onclick="document.getElementById(\'type_email\').checked = \'checked\'; document.getElementById(\'from_name\').value = \'\'; document.getElementById(\'from_starter\').value = \'\';">
	65	+ <input type="text" name="from_email" id="from_email" value="">
96	66	</dd>
	67	+
97	68	<dt>
98	69	<label for="type_name"><input type="radio" name="type" id="type_name" value="name">', $txt['shd_admin_maint_reattribute_posts_user'], '</label>
99	70	</dt>
100	71	<dd>
101		- <input type="text" name="from_name" id="from_name" value="" onclick="document.getElementById(\'type_name\').checked = \'checked\'; document.getElementById(\'from_email\').value = \'\'; document.getElementById(\'from_starter\').value = \'\';" >
	72	+ <input type="text" name="from_name" id="from_name" value="">
102	73	</dd>
	74	+
103	75	<dt>
104	76	<label for="type_name"><input type="radio" name="type" id="type_starter" value="starter">', $txt['shd_admin_maint_reattribute_posts_starter'], '</label>
105	77	</dt>
106	78	<dd>
107		- <input type="text" name="from_starter" id="from_starter" value="" onclick="document.getElementById(\'type_starter\').checked = \'checked\'; document.getElementById(\'from_email\').value = \'\'; document.getElementById(\'from_name\').value = \'\';" >
	79	+ <input type="text" name="from_starter" id="from_starter" value="">
108	80	</dd>
109	81	</dl>
110	82	<dl class="settings">
...	...	@@ -115,32 +87,47 @@ function template_shd_admin_maint_home()
115	87	<input type="text" name="to" id="to" value="">
116	88	</dd>
117	89	</dl>
118		- <input type="submit" id="do_attribute" value="', $txt['shd_admin_maint_reattribute_btn'], '" onclick="if (!checkAttributeValidity()) return false; return confirm(warningMessage);" class="button">
	90	+ <input type="submit" id="do_attribute" value="', $txt['shd_admin_maint_reattribute_btn'], '" onclicks="if (!checkAttributeValidity()) return false; return confirm(warningMessage);" class="button">
119	91	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
120	92	</form>
121	93	</div>
122	94	<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?rc5"></script>
123	95	<script type="text/javascript"><!-- // --><![CDATA[
124	96	var oAttributeMemberSuggest = new smc_AutoSuggest({
125		- sSelf: \'oAttributeMemberSuggest\',
126		- sSessionId: \'', $context['session_id'], '\',
127		- sSessionVar: \'', $context['session_var'], '\',
128		- sSuggestId: \'attributeMember\',
129		- sControlId: \'to\',
130		- sSearchType: \'member\',
131		- sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
	97	+ sSelf: "oAttributeMemberSuggest",
	98	+ sSessionId: "', $context['session_id'], '",
	99	+ sSessionVar: "', $context['session_var'], '",
	100	+ sSuggestId: "attributeMember",
	101	+ sControlId: "to",
	102	+ sSearchType: "member",
	103	+ sTextDeleteItem: ', JavaScriptEscape($txt['autosuggest_delete_item']), ',
132	104	bItemList: false
133	105	});
134	106	var oAttributeMemberSuggestStarter = new smc_AutoSuggest({
135		- sSelf: \'oAttributeMemberSuggestStarter\',
136		- sSessionId: \'', $context['session_id'], '\',
137		- sSessionVar: \'', $context['session_var'], '\',
138		- sSuggestId: \'attributeStarter\',
139		- sControlId: \'from_starter\',
140		- sSearchType: \'member\',
141		- sTextDeleteItem: \'', $txt['autosuggest_delete_item'], '\',
	107	+ sSelf: "oAttributeMemberSuggestStarter",
	108	+ sSessionId: "', $context['session_id'], '",
	109	+ sSessionVar: "', $context['session_var'], '",
	110	+ sSuggestId: "attributeStarter",
	111	+ sControlId: "from_starter",
	112	+ sSearchType: "member",
	113	+ sTextDeleteItem: ', JavaScriptEscape($txt['autosuggest_delete_item']), ',
142	114	bItemList: false
143	115	});
	116	+
	117	+ var oAttributeValidator = new shd_AttributeValidate({
	118	+ sOrigText: ', JavaScriptEscape($txt['shd_reattribute_confirm']), ',
	119	+ sOrigTextStarter: ', JavaScriptEscape($txt['shd_reattribute_confirm_starter']), ',
	120	+ sDoAttributeContainerId: "do_attribute",
	121	+ sToContainerId: "to",
	122	+ sTypeEmailContainerId: "type_email",
	123	+ sEmailContainerId: "from_email",
	124	+ sEmailConfirmText: ', JavaScriptEscape($txt['shd_reattribute_confirm_email']), ',
	125	+ sTypeStarterContainerId: "type_starter",
	126	+ sStarterContainerId: "from_starter",
	127	+ sTypeFromContainerId: "type_name",
	128	+ sFromContainerId: "from_name",
	129	+ sFromConfirmText: ', JavaScriptEscape($txt['shd_reattribute_confirm_username']), ',
	130	+ });
144	131	// ]]></script>';
145	132
146	133	// Moving home?
...	...	@@ -184,7 +171,7 @@ function template_shd_admin_maint_home()
184	171	<dt><input type="checkbox" id="movelast_less" name="movelast_less"> ', sprintf($txt['shd_admin_maint_massdeptmove_lastupd_less'], '<input type="text" name="movelast_less_days" value="30" size="3">'), '</dt>
185	172	<dt><input type="checkbox" id="movelast_more" name="movelast_more"> ', sprintf($txt['shd_admin_maint_massdeptmove_lastupd_more'], '<input type="text" name="movelast_more_days" value="30" size="3">'), '</dt>
186	173	</dl>
187		- <input type="submit" value="', $txt['shd_admin_maint_massdeptmove'], '" onclick="return submitThisOnce(this);" class="button">
	174	+ <input type="submit" value="', $txt['shd_admin_maint_massdeptmove'], '" class="button save">
188	175	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
189	176	</form>
190	177	</div>';
...	...	@@ -195,16 +182,14 @@ function template_shd_admin_maint_findrepairdone()
195	182	{
196	183	global $context, $settings, $txt, $scripturl;
197	184
198		- if (empty($context['maintenance_result']))
199		- {
200	185	// Yay everything was fine.
	186	+ if (empty($context['maintenance_result']))
201	187	echo '
202	188	<div class="windowbg">
203	189	', $txt['maintain_no_errors'], '
204	190	<br>
205	191	<a href="', $scripturl, '?action=admin;area=helpdesk_maint;', $context['session_var'], '=', $context['session_id'], '">', $txt['shd_admin_maint_back'], '</a>
206	192	</div>';
207		- }
208	193	else
209	194	{
210	195	echo '
...	...	@@ -214,27 +199,10 @@ function template_shd_admin_maint_findrepairdone()
214	199
215	200	// Heh, super squeeky buns time!
216	201	// Each test has potentially its own feedback to give. So we'll handle each one separately.
217		- if (!empty($context['maintenance_result']['zero_tickets']))
218		- echo '
219		- <p class="padding">', sprintf($txt['shd_maint_zero_tickets'], $context['maintenance_result']['zero_tickets']), '</p>';
220		- if (!empty($context['maintenance_result']['zero_msgs']))
221		- echo '
222		- <p class="padding">', sprintf($txt['shd_maint_zero_msgs'], $context['maintenance_result']['zero_msgs']), '</p>';
223		- if (!empty($context['maintenance_result']['deleted']))
224		- echo '
225		- <p class="padding">', sprintf($txt['shd_maint_deleted'], $context['maintenance_result']['deleted']), '</p>';
226		- if (!empty($context['maintenance_result']['first_last']))
227		- echo '
228		- <p class="padding">', sprintf($txt['shd_maint_first_last'], $context['maintenance_result']['first_last']), '</p>';
229		- if (!empty($context['maintenance_result']['status']))
230		- echo '
231		- <p class="padding">', sprintf($txt['shd_maint_status'], $context['maintenance_result']['status']), '</p>';
232		- if (!empty($context['maintenance_result']['starter_updater']))
233		- echo '
234		- <p class="padding">', sprintf($txt['shd_maint_starter_updater'], $context['maintenance_result']['starter_updater']), '</p>';
235		- if (!empty($context['maintenance_result']['invalid_dept']))
	202	+ foreach (array('zero_tickets', 'zero_msgs', 'deleted', 'first_last', 'status', 'starter_updater', 'invalid_dept') as $maintResult)
	203	+ if (!empty($context['maintenance_result'][$maintResult]))
236	204	echo '
237		- <p class="padding">', sprintf($txt['shd_maint_invalid_dept'], $context['maintenance_result']['invalid_dept']), '</p>';
	205	+ <p class="padding">', sprintf($txt['shd_maint_' . $maintTxt], $context['maintenance_result'][$maintResult]), '</p>';
238	206
239	207	echo '
240	208	<p class="padding">
...	...	@@ -319,7 +287,7 @@ function template_shd_admin_maint_search()
319	287	<input type="text" name="shd_search_max_size" size="4" value="', $modSettings['shd_search_max_size'], '">
320	288	</dd>
321	289	<dt>
322		- <a id="setting_shd_search_prefix_size" href="', $scripturl, '?action=helpadmin;help=shd_search_prefix_size_help" onclick="return reqWin(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="?"></a>
	290	+ <a id="setting_shd_search_prefix_size" href="', $scripturl, '?action=helpadmin;help=shd_search_prefix_size_help" class="help shd_help"><img src="', $settings['images_url'], '/helptopics.png" class="icon" alt="?"></a>
323	291	<span>', $txt['shd_search_prefix_size'], '</span>
324	292	</dt>
325	293	<dd>

...	...	@@ -43,7 +43,6 @@ function template_shd_permissions_home()
43	43	</tr>';
44	44
45	45	foreach ($context['shd_permissions']['roles'] as $role_id => $role_details)
46		- {
47	46	echo '
48	47	<tr class="windowbg">
49	48	<td>', !empty($role_details['icon']) ? ('<img src="' . $settings['default_images_url'] . '/simpledesk/' . $role_details['icon'] . '" alt="">') : '', '</td>
...	...	@@ -53,7 +52,6 @@ function template_shd_permissions_home()
53	52	</td>
54	53	', template_shd_display_permission_list($role_details['permissions']), '
55	54	</tr>';
56		- }
57	55
58	56	echo '
59	57	</table>
...	...	@@ -75,12 +73,10 @@ function template_shd_permissions_home()
75	73	</tr>';
76	74
77	75	if (empty($context['shd_permissions']['user_defined_roles']))
78		- {
79	76	echo '
80	77	<tr class="windowbg">
81	78	<td colspan="', count($context['shd_permissions']['group_display']) + 4, '" class="centertext">', $txt['shd_no_defined_roles'], '</td>
82	79	</tr>';
83		- }
84	80	else
85	81	{
86	82	foreach ($context['shd_permissions']['user_defined_roles'] as $role => $role_details)
...	...	@@ -136,13 +132,11 @@ function template_shd_display_permission_list($permissions)
136	132	global $context, $txt, $settings;
137	133	$permission_set = array();
138	134
139		- foreach ($context['shd_permissions']['permission_list'] as $permission => $details)
	135	+ foreach ($context['shd_permissions']['permission_list'] as $permission => list($ownany, $group, $icon))
140	136	{
141		- list($ownany, $group, $icon) = $details;
142	137	if (empty($icon))
143	138	continue;
144		-
145		- if (empty($permission_set[$group]))
	139	+ elseif (empty($permission_set[$group]))
146	140	$permission_set[$group] = array();
147	141
148	142	$permtitle = '';
...	...	@@ -161,10 +155,8 @@ function template_shd_display_permission_list($permissions)
161	155	}
162	156	}
163	157	else
164		- {
165	158	if (!empty($permissions[$permission]) && $permissions[$permission] == ROLEPERM_ALLOW)
166	159	$permtitle = empty($txt['permissionname_' . $permission]) ? '' : $txt['permissionname_' . $permission];
167		- }
168	160
169	161	if (!empty($permtitle))
170	162	$permission_set[$group][] = '<img src="' . shd_image_url($icon) . '" alt="" title="' . $permtitle . '">';
...	...	@@ -176,10 +168,8 @@ function template_shd_display_permission_list($permissions)
176	168	<td class="shd_valign_top">';
177	169
178	170	foreach ($rows as $rowitem => $rowicon)
179		- {
180	171	if (!empty($permission_set[$rowitem]))
181	172	echo $txt['shd_permgroup_short_' . $rowitem], ': ', implode(' ', $permission_set[$rowitem]), '<br>';
182		- }
183	173
184	174	echo '</td>';
185	175	}
...	...	@@ -221,7 +211,7 @@ function template_shd_create_role()
221	211	<dt><strong>', $txt['shd_create_name'], '</strong></dt>
222	212	<dd><input type="text" name="rolename" id="rolename" value="" size="30"></dd>
223	213	</dl>
224		- <input type="submit" value="', $txt['shd_create_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
	214	+ <input type="submit" value="', $txt['shd_create_role'], '" accesskey="s" class="button save">
225	215	<input type="hidden" name="template" value="', $context['role_template_id'], '">
226	216	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
227	217	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">
...	...	@@ -253,45 +243,8 @@ function template_shd_edit_role()
253	243	', $txt['shd_admin_permissions_homedesc'], '
254	244	</div>
255	245	<script type="text/javascript"><!-- // --><![CDATA[
256		- function shd_chicon(obj)
257		- {
258		- var sSelect = document.getElementById(obj.id).value;
259		- var newClass = "";
260		- switch(sSelect)
261		- {
262		- case "disallow":
263		- newClass = "shd_no"; break;
264		- case "allow":
265		- newClass = "shd_yes"; break;
266		- case "allow_own":
267		- newClass = "shd_own"; break;
268		- case "allow_any":
269		- newClass = "shd_any"; break;
270		- default:
271		- newClass = ""; break;
272		- }
273		- document.getElementById(obj.id + "_icon").setAttribute("class", newClass);
274		- }
275	246
276		- function shd_toggleblock(block)
277		- {
278		- var collapsed = (document.getElementById("permheader_" + block).getAttribute("class") == "cat_bar");
279		- if (collapsed)
280		- {
281		- document.getElementById("permheader_" + block).setAttribute("class", "cat_bar cat_collapsed");
282		- document.getElementById("permcontent_" + block).style.display = "";
283		- document.getElementById("permfooter_" + block).style.display = "";
284		- document.getElementById("permexpandicon_" + block).src = ', JavaScriptEscape($settings['images_url'] . '/selected_open.png'), ';
285		- }
286		- else
287		- {
288		- document.getElementById("permheader_" + block).setAttribute("class", "cat_bar");
289		- document.getElementById("permcontent_" + block).style.display = "none";
290		- document.getElementById("permfooter_" + block).style.display = "none";
291		- document.getElementById("permexpandicon_" + block).src = ', JavaScriptEscape($settings['images_url'] . '/selected.png'), ';
292		- }
293		- document.getElementById("permexpandicon_" + block).style.display = "";
294		- }
	247	+
295	248
296	249	// ]', ']></script>
297	250	<form action="', $scripturl, '?action=admin;area=helpdesk_permissions;sa=saverole" method="post">
...	...	@@ -317,13 +270,10 @@ function template_shd_edit_role()
317	270	// Get ready to display the actual permissions
318	271	$permission_set = array();
319	272	foreach ($context['shd_permissions']['permission_list'] as $permission => $details)
320		- {
321	273	if (!empty($details[2]))
322	274	$permission_set[$details[1]][] = $permission;
323		- }
324	275
325	276	$displayed_sets = array();
326		-
327	277	foreach ($context['shd_permissions']['group_display'] as $cell => $rows)
328	278	{
329	279	echo '
...	...	@@ -340,12 +289,12 @@ function template_shd_edit_role()
340	289	<div class="cat_bar" id="permheader_', $rowitem, '">
341	290	<h3 class="catbg">
342	291	<span class="floatright">
343		- <a class="permcollapse" href="#" onclick="shd_toggleblock(\'', $rowitem, '\'); return false;">
	292	+ <a class="permcollapse" href="#" data-block="', $rowitem, '">
344	293	<img src="', $settings['images_url'], '/selected_open.png" id="permexpandicon_', $rowitem, '" style="display:none;">
345	294	</a>
346	295	</span>
347	296	<img src="', $settings['default_images_url'], '/simpledesk/', $rowicon, '" alt="*">
348		- <a href="#" onclick="shd_toggleblock(\'', $rowitem, '\'); return false;">', $txt['shd_permgroup_' . $rowitem], '</a>
	297	+ <a href="#" data-block="', $rowitem, '">', $txt['shd_permgroup_' . $rowitem], '</a>
349	298	</h3>
350	299	</div>
351	300	<div class="roundframe" id="permcontent_', $rowitem, '">
...	...	@@ -377,20 +326,16 @@ function template_shd_edit_role()
377	326	<dt', (empty($txt['permissionhelp_' . $permission]) ? '' : ' title="' . $txt['permissionhelp_' . $permission] . '"') . '><img src="', shd_image_url($icon), '" alt="*">', $txt['permissionname_' . $permission], '</dt>
378	327	<dd>
379	328	<span id="perm_', $permission, '_icon" class="', $perm_class, '"></span>
380		- <select name="perm_', $permission, '" id="perm_', $permission, '" onchange="javascript:shd_chicon(this);">
	329	+ <select name="perm_', $permission, '" id="perm_', $permission, '">
381	330	<option value="disallow"', ($perm_value == 'disallow' ? ' selected="selected"' : ''), '>', (empty($txt['permissionname_' . $permission . '_no']) ? $txt['shd_roleperm_disallow'] : $txt['permissionname_' . $permission . '_no']), ' </option>';
382	331
383	332	if ($ownany)
384		- {
385	333	echo '
386	334	<option value="allow_own"', ($perm_value == 'allow_own' ? ' selected="selected"' : ''), '>', $txt['permissionname_' . $permission . '_own'], ' </option>
387	335	<option value="allow_any"', ($perm_value == 'allow_any' ? ' selected="selected"' : ''), '>', $txt['permissionname_' . $permission . '_any'], ' </option>';
388		- }
389	336	else
390		- {
391	337	echo '
392	338	<option value="allow"', ($perm_value == 'allow' ? ' selected="selected"' : ''), '>', (empty($txt['permissionname_' . $permission . '_yes']) ? $txt['shd_roleperm_allow'] : $txt['permissionname_' . $permission . '_yes']), ' </option>';
393		- }
394	339
395	340	echo '
396	341	</select>
...	...	@@ -408,25 +353,8 @@ function template_shd_edit_role()
408	353	</div>';
409	354	}
410	355
411		- if (!empty($displayed_sets))
412		- {
413		- echo '
414		- <script type="text/javascript"><!-- // --><![CDATA[';
415		-
416		- if (!empty($displayed_sets))
417		- echo '
418		- var hidden_blocks = ["', implode('","', $displayed_sets), '"];
419		- for (i in hidden_blocks)
420		- {
421		- shd_toggleblock(hidden_blocks[i]);
422		- }';
423		-
424		- echo '
425		- // ]', ']></script>';
426		- }
427		-
428	356	echo '
429		- <div class="floatleft" style="width: 100%;">
	357	+ <div class="floatleft">
430	358	<div class="cat_bar">
431	359	<h3 class="catbg">
432	360	<img src="', $settings['default_images_url'], '/simpledesk/roles.png" alt="*">
...	...	@@ -484,22 +412,40 @@ function template_shd_edit_role()
484	412	</tr>';
485	413
486	414	foreach ($context['role_depts'] as $id_dept => $dept)
487		- {
488	415	echo '
489	416	<tr class="windowbg">
490	417	<td>', $dept['dept_name'], '</td>
491	418	<td><input type="checkbox" name="dept', $id_dept, '"', !empty($dept['is_role']) ? ' checked="checked"' : '', '></td>
492	419	</tr>';
493		- }
494	420
495	421	echo '
496	422	</table>
497	423	</div>
498	424	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
499	425	<input type="hidden" name="role" value="', $context['shd_role_id'], '">
500		- <input type="submit" value="', $txt['shd_edit_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
501		- <input type="submit" value="', $txt['shd_delete_role'], '" onclick="return confirm(' . JavaScriptEscape($txt['shd_delete_role_confirm']) . ');" name="delete" class="button">
502		- </form>';
	426	+ <input type="submit" value="', $txt['shd_edit_role'], '" accesskey="s" class="button save">
	427	+ <input type="submit" value="', $txt['shd_delete_role'], '" name="delete" class="button" id="delete" onclick="return confirm(\"Shall\");">
	428	+ </form>
	429	+
	430	+ <script type="text/javascript"><!-- // --><![CDATA[
	431	+ var oRoles = new shd_role({
	432	+ sPermissionDisallowClass: "shd_no",
	433	+ sPermissionAllowClass: "shd_yes",
	434	+ sPermissionAllowOwnClass: "shd_own",
	435	+ sPermissionAllowAnyClass: "shd_any",
	436	+
	437	+ oHiddenBlocks: [', !empty($displayed_sets) ? '"' . implode('","', $displayed_sets) . '"' : '', '],
	438	+ sBlockHeader: "permheader_%block%",
	439	+ sBlockContent: "permcontent_%block%",
	440	+ sBlockFooter: "permfooter_%block%",
	441	+ sBlockIcon: "permexpandicon_%block%",
	442	+ sBlockIconExpandedImg: ', JavaScriptEscape($settings['images_url'] . '/selected_open.png'), ',
	443	+ sBlockIconCollapsedImg: ', JavaScriptEscape($settings['images_url'] . '/selected.png'), ',
	444	+
	445	+ sDeleteContainerId: "delete",
	446	+ sDeleteConfirmText: ', JavaScriptEscape($txt['shd_delete_role_confirm']), ',
	447	+ });
	448	+ // ]]></script>';
503	449	}
504	450
505	451	/**
...	...	@@ -540,7 +486,7 @@ function template_shd_copy_role()
540	486	<dt><strong>', $txt['shd_copy_role_groups'], '</strong></dt>
541	487	<dd><input type="checkbox" name="copygroups" id="copygroups" value="1"></dd>
542	488	</dl>
543		- <input type="submit" value="', $txt['shd_copy_role'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
	489	+ <input type="submit" value="', $txt['shd_copy_role'], '" accesskey="s" class="button save">
544	490	<input type="hidden" name="role" value="', $context['shd_role_id'], '">
545	491	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
546	492	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">

...	...	@@ -51,18 +51,17 @@ function template_shd_plugin_listing()
51	51	foreach ($context['plugins'] as $id => $plugin)
52	52	{
53	53	echo '
54		- <div class="windowbg">
	54	+ <div class="windowbg shd_plugins">
55	55	<div class="features">';
56	56
57	57	if (!empty($plugin['installable']))
58	58	echo '
59	59	<div class="features_switch" id="js_feature_', $id, '" style="display: none;">
60		- <a href="', $scripturl, '?action=admin;area=helpdesk_plugins;save;', $context['session_var'], '=', $context['session_id'], ';toggle=', $id, ';state=', $plugin['enabled'] ? 0 : 1, '" onclick="return toggleItem(\'', $id, '\', \'', $settings['images_url'], '\', \'', $txt['shd_admin_plugins_on'], '\', \'', $txt['shd_admin_plugins_off'], '\');">
61		- <input type="hidden" name="feature_', $id, '" id="feature_', $id, '" value="', $plugin['enabled'] ? 1 : 0, '"><img src="', $settings['images_url'], '/simpledesk/switch_', $plugin['enabled'] ? 'on' : 'off', '.png" id="switch_', $id, '" style="margin-top: 1.3em;" alt="', $txt['shd_admin_plugins_' . ($plugin['enabled'] ? 'off' : 'on')], '" title="', $txt['shd_admin_plugins_' . ($plugin['enabled'] ? 'off' : 'on')], '">
	60	+ <a href="', $scripturl, '?action=admin;area=helpdesk_plugins;save;', $context['session_var'], '=', $context['session_id'], ';toggle=', $id, ';state=', $plugin['enabled'] ? 0 : 1, '" data-plugin="', $id, '">
	61	+ <input type="hidden" name="feature_', $id, '" id="feature_', $id, '" value="', $plugin['enabled'] ? 1 : 0, '"><img src="', $settings['images_url'], '/simpledesk/switch_', $plugin['enabled'] ? 'on' : 'off', '.png" id="switch_', $id, '" alt="', $txt['shd_admin_plugins_' . ($plugin['enabled'] ? 'off' : 'on')], '" title="', $txt['shd_admin_plugins_' . ($plugin['enabled'] ? 'off' : 'on')], '">
62	62	</a>
63	63	</div>';
64	64	else
65		- {
66	65	echo '
67	66	<div class="features_switch" id="js_feature_', $id, '">
68	67	<div class="error">', $txt['shd_admin_plugins_wrong_version'], '</div>
...	...	@@ -71,18 +70,17 @@ function template_shd_plugin_listing()
71	70	<li>', implode('</li><li>', $plugin['details']['compatibility']), '</li>
72	71	</ul>
73	72	</div>';
74		- }
75	73
76	74	if (!empty($plugin['languages']))
77	75	{
78	76	echo '
79	77	<div class="langblock">', $txt['shd_admin_plugins_languages'], ':<br>';
	78	+
80	79	foreach ($plugin['languages'] as $language)
81		- {
82	80	if (!empty($txt['shd_admin_plugins_lang_' . $language]))
83	81	echo '
84	82	<img src="', $settings['default_images_url'], '/simpledesk/flags/', $language, '.png" alt="', $txt['shd_admin_plugins_lang_' . $language], '" title="', $txt['shd_admin_plugins_lang_' . $language], '">';
85		- }
	83	+
86	84	echo '
87	85	</div>';
88	86	}
...	...	@@ -116,14 +115,27 @@ function template_shd_plugin_listing()
116	115	</form>
117	116	</div>
118	117	<script type="text/javascript"><!-- // --><![CDATA[
119		- document.getElementById(\'js_worked\').value = "1";';
	118	+ var installablePlugins = [];';
	119	+
120	120	foreach ($context['plugins'] as $id => $plugin)
121		- {
122	121	if (!empty($plugin['installable']))
123	122	echo '
124		- document.getElementById(\'js_feature_', $id, '\').style.display = "";
125		- document.getElementById(\'plain_feature_', $id, '\').style.display = "none";';
126		- }
	123	+ installablePlugins.push(', JavaScriptEscape($id), ');';
	124	+
127	125	echo '
	126	+ var oPlugins = new shd_plugins({
	127	+ sJSworkedID: "js_worked",
	128	+ sJSFeatureClass: "js_feature_%itemid%",
	129	+ sJSPlainFeatureClass: "plain_feature_%itemid%",
	130	+ oJSInstallablePlugins: installablePlugins,
	131	+ sFeaturesSwitchClass: "features_switch",
	132	+ sFeatureClass: "feature_%itemid%",
	133	+ sSwitchClass: "switch_%itemid%",
	134	+ sPluginOffText: ', JavaScriptEscape($txt['shd_admin_plugins_off']), ',
	135	+ sPluginOnText: ', JavaScriptEscape($txt['shd_admin_plugins_on']), ',
	136	+ sPluginOnImg: ', JavaScriptEscape($settings['images_url'] . '/simpledesk/switch_on.png'), ',
	137	+ sPluginOffImg: ', JavaScriptEscape($settings['images_url'] . '/simpledesk/switch_off.png'), ',
	138	+
	139	+ });
128	140	// ]]></script>';
129	141	}
130	142	\ No newline at end of file

...	...	@@ -36,7 +36,7 @@ function template_assign()
36	36	</h3>
37	37	</div>
38	38	<div class="roundframe">
39		- <form action="', $scripturl, '?action=helpdesk;sa=assign2;ticket=', $context['ticket_id'], '" method="post" onsubmit="submitonce(this);">
	39	+ <form action="', $scripturl, '?action=helpdesk;sa=assign2;ticket=', $context['ticket_id'], '" method="post">
40	40	<dl class="settings">
41	41	<dt>
42	42	<strong>', $txt['shd_ticket_assignedto'], ':</strong>
...	...	@@ -58,8 +58,8 @@ function template_assign()
58	58	</select>
59	59	</dd>
60	60	</dl>
61		- <input type="submit" name="cancel" value="', ($context['shd_return_to'] == 'home' ? $txt['shd_cancel_home'] : $txt['shd_cancel_ticket']), '" accesskey="c" class="button">
62		- <input type="submit" value="', $txt['shd_ticket_assign_ticket'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
	61	+ <input type="submit" name="cancel" value="', ($context['shd_return_to'] == 'home' ? $txt['shd_cancel_home'] : $txt['shd_cancel_ticket']), '" accesskey="c" class="button save">
	62	+ <input type="submit" value="', $txt['shd_ticket_assign_ticket'], '" accesskey="s" class="button save">
63	63	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
64	64
65	65	if ($context['shd_return_to'] == 'home')

...	...	@@ -35,7 +35,7 @@ function template_movedept()
35	35	</h3>
36	36	</div>
37	37	<div class="roundframe">
38		- <form action="', $scripturl, '?action=helpdesk;sa=movedept2;ticket=', $context['ticket_id'], '" method="post" onsubmit="submitonce(this);">
	38	+ <form action="', $scripturl, '?action=helpdesk;sa=movedept2;ticket=', $context['ticket_id'], '" method="post">
39	39	<dl class="settings">
40	40	<dt>
41	41	<strong>', $txt['shd_current_dept'], ':</strong>
...	...	@@ -63,7 +63,7 @@ function template_movedept()
63	63	<strong>', $txt['shd_move_send_pm'], ':</strong>
64	64	</dt>
65	65	<dd>
66		- <input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="document.getElementById(\'pm_message\').style.display = this.checked ? \'block\' : \'none\';" >
	66	+ <input type="checkbox" name="send_pm" id="send_pm" checked="checked">
67	67	</dd>
68	68	</dl>
69	69	<fieldset id="pm_message">
...	...	@@ -84,7 +84,10 @@ function template_movedept()
84	84
85	85	echo '
86	86	<input type="submit" name="cancel" value="', ($context['shd_return_to'] == 'home' ? $txt['shd_cancel_home'] : $txt['shd_cancel_ticket']), '" accesskey="c" class="button">
87		- <input type="submit" value="', $txt['shd_ticket_move'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
	87	+ <input type="submit" value="', $txt['shd_ticket_move'], '" accesskey="s" class="button save">
88	88	</form>
89		- </div>';
	89	+ </div>
	90	+ <script type="text/javascript"><!-- // --><![CDATA[
	91	+ $("#send_pm").on("change", function(){$("#pm_message").toggle();});
	92	+ // ]' . ']></script>';
90	93	}
91	94	\ No newline at end of file

...	...	@@ -72,10 +73,6 @@ function template_shd_profile_main()
72	73	<dt>', $txt['username'], ': </dt>
73	74	<dd>', $context['member']['username'], '</dd>';
74	75
75		- // Is this member requiring activation and/or banned?
76		- if (!empty($context['activate_message']) \|\| !empty($context['member']['bans']))
77		- {
78		-
79	76	// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
80	77	if (!empty($context['activate_message']))
81	78	echo '
...	...	@@ -85,8 +82,8 @@ function template_shd_profile_main()
85	82	if (!empty($context['member']['bans']))
86	83	{
87	84	echo '
88		- <dt class="clear"><span class="alert">', $txt['user_is_banned'], '</span> [<a href="#" onclick="document.getElementById(\'ban_info\').style.display = document.getElementById(\'ban_info\').style.display == \'none\' ? \'\' : \'none\';return false;">' . $txt['view_ban'] . '</a>]</dt>
89		- <dt class="clear" id="ban_info" style="display: none;">
	85	+ <dt class="clear"><span class="alert">', $txt['user_is_banned'], '</span> [<a href="#" onclick="$(\'#ban_info\').toggle();">' . $txt['view_ban'] . '</a>]</dt>
	86	+ <dt class="clear hidden" id="ban_info">
90	87	<strong>', $txt['user_banned_by_following'], ':</strong>';
91	88
92	89	foreach ($context['member']['bans'] as $ban)
...	...	@@ -96,7 +93,6 @@ function template_shd_profile_main()
96	93	echo '
97	94	</dt>';
98	95	}
99		- }
100	96
101	97	echo '
102	98	<dt>', $txt['date_registered'], ': </dt>
...	...	@@ -166,8 +162,8 @@ function template_shd_profile_preferences()
166	162	</div>';
167	163
168	164	echo '
169		- <div class="cat_bar">
170		- <h3 class="catbg">
	165	+ <div class="title_bar">
	166	+ <h3 class="titlebg">
171	167	<img src="', $settings['default_images_url'], '/simpledesk/preferences.png" class="icon" alt="*">
172	168	', sprintf($txt['shd_profile_preferences_header'], $context['member']['name']), '
173	169	</h3>
...	...	@@ -194,9 +190,6 @@ function template_shd_profile_preferences()
194	190	<form action="', $scripturl, '?action=profile;area=hd_prefs;u=', $context['member']['id'], ';save" method="post">';
195	191
196	192	$display_save = false;
197		- $displayed_groups = array();
198		- $checkall_items = array();
199		-
200	193	foreach ($context['shd_preferences_options']['groups'] as $group => $details)
201	194	{
202	195	if (empty($details['groups']))
...	...	@@ -208,13 +201,9 @@ function template_shd_profile_preferences()
208	201	echo '<br>
209	202	<div class="cat_bar" id="prefheader_', $group, '">
210	203	<h3 class="catbg">
211		- <span id="prefexpand_', $group, '" class="floatright toggle_up" onclick="shd_toggleblock(\'', $group, '\'); return false;"> <!--
212		- <a class="permcollapse" href="#" onclick="shd_toggleblock(\'', $group, '\'); return false;">
213		- <img src="', $settings['images_url'], '/selected_open.png" id="prefexpandicon_', $group, '" style="display:none;">
214		- </a>-->
215		- </span>
	204	+ <span class="toggle_up floatright" id="prefexpandicon_', $group, '"></span>
216	205	<img src="', shd_image_url($details['icon']), '" class="icon" alt="*">
217		- <a class="prefcollapse" href="#prefheader_', $group, '" onclick="shd_toggleblock(\'', $group, '\'); return false;">', $txt['shd_pref_group_' . $group], '</a>
	206	+ <a class="prefcollapse" href="#prefheader_', $group, '" id="prefexpand_', $group, '_swap_link">', $txt['shd_pref_group_' . $group], '</a>
218	207	</h3>
219	208	</div>
220	209	<div class="roundframe noup" id="prefgroup_', $group, '">
...	...	@@ -261,14 +250,11 @@ function template_shd_profile_preferences()
261	250
262	251	// Only display if the preference group is set to actually have said option, and if 3+ were actually being displayed, otherwise it looks stupid.
263	252	if (!empty($details['check_all']) && count($details['groups']) > 2)
264		- {
265	253	echo '
266		- <div id="checkall_div_', $group, '" style="display:none;">
	254	+ <div id="checkall_div_', $group, '">
267	255	<input type="checkbox" name="all" id="check_all" value="" onclick="invertAll(this, this.form, \'', $group, '\');" class="floatleft">
268	256	<label for="check_all" class="floatleft">', $txt['check_all'], '</label>
269	257	</div>';
270		- $checkall_items[] = $group;
271		- }
272	258
273	259	echo '
274	260	</div>
...	...	@@ -276,37 +262,11 @@ function template_shd_profile_preferences()
276	262	<span id="preffooter_', $group, '"></span>';
277	263	}
278	264
279		- // And the JS required to hide everything.
280		- if (!empty($displayed_groups) \|\| !empty($checkall_items))
281		- {
282		- echo '
283		- <script type="text/javascript"><!-- // --><![CDATA[';
284		-
285		- if (!empty($displayed_groups))
286		- echo '
287		- var hidden_blocks = ["', implode('","', $displayed_groups), '"];
288		- for (i in hidden_blocks)
289		- {
290		- shd_toggleblock(hidden_blocks[i]);
291		- }';
292		-
293		- if (!empty($checkall_items))
294		- echo '
295		- var checkall_items = ["', implode('","', $checkall_items), '"];
296		- for (i in checkall_items)
297		- {
298		- document.getElementById("checkall_div_" + checkall_items[i]).style.display = "";
299		- }';
300		-
301		- echo '
302		- // ]', ']></script>';
303		- }
304		-
305	265	if ($display_save)
306	266	echo '
307	267	<br>
308	268	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
309		- <input type="submit" value="', $txt['shd_profile_save_prefs'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">';
	269	+ <input type="submit" value="', $txt['shd_profile_save_prefs'], '" accesskey="s" class="button save">';
310	270	else
311	271	echo '
312	272	<br>
...	...	@@ -325,6 +285,8 @@ function template_shd_profile_preferences()
325	285
326	286	echo '
327	287	</form>';
	288	+
	289	+ template_shd_profile_js_preferences();
328	290	}
329	291
330	292	function template_shd_profile_show_tickets()
...	...	@@ -350,7 +312,7 @@ function template_shd_profile_show_tickets()
350	312	<div class="tborder">
351	313	<div class="title_bar">
352	314	<h3 class="titlebg">
353		- <img src="', $settings['default_images_url'], '/simpledesk/', $context['can_haz_replies'] ? 'replies' : 'ticket', '.png" class="floatright shd_icon_fullhead" alt=""/>
	315	+ <img src="', $settings['default_images_url'], '/simpledesk/', $context['can_haz_replies'] ? 'replies' : 'ticket', '.png" class="floatright shd_icon_fullhead" alt="">
354	316	<span class="smalltext">', $context['page_index'], '</span>
355	317	</h3>
356	318	</div>';
...	...	@@ -384,7 +346,7 @@ function template_shd_profile_show_tickets()
384	346	echo '
385	347	<div class="title_bar">
386	348	<h3 class="titlebg">
387		- <img src="', $settings['default_images_url'], '/simpledesk/', $context['can_haz_replies'] ? 'replies' : 'ticket', '.png" class="floatright shd_icon_fullhead" alt=""/>
	349	+ <img src="', $settings['default_images_url'], '/simpledesk/', $context['can_haz_replies'] ? 'replies' : 'ticket', '.png" class="floatright shd_icon_fullhead" alt="">
388	350	<span class="smalltext">', $context['page_index'], '</span>
389	351	</h3>
390	352	</div>
...	...	@@ -422,16 +384,12 @@ function template_shd_profile_show_notify_override()
422	384	</tr>';
423	385
424	386	if (empty($context['tickets']))
425		- {
426	387	echo '
427	388	<tr class="windowbg">
428	389	<td colspan="7">', $txt['shd_error_no_tickets'], '</td>
429	390	</tr>';
430		- }
431	391	else
432		- {
433	392	foreach ($context['tickets'] as $ticket)
434		- {
435	393	echo '
436	394	<tr class="windowbg">
437	395	<td width="4%" class="smalltext">', $ticket['id_ticket_display'], '</td>
...	...	@@ -442,8 +400,6 @@ function template_shd_profile_show_notify_override()
442	400	<td class="smalltext">', $txt['shd_urgency_' . $ticket['urgency']], '</td>
443	401	<td class="smalltext">', $ticket['updated'], '</td>
444	402	</tr>';
445		- }
446		- }
447	403
448	404	echo '
449	405	</table>';
...	...	@@ -462,9 +418,9 @@ function template_shd_profile_permissions()
462	418	</h3>
463	419	</div>';
464	420
	421	+ // Whoa, this dude's special. Tidy up and BAIL!
465	422	if (!empty($context['member']['has_all_permissions']))
466	423	{
467		- // Whoa, this dude's special. Tidy up and BAIL!
468	424	echo '
469	425	<p class="information">
470	426	', $txt['shd_profile_permissions_all_admin'], '
...	...	@@ -520,12 +477,10 @@ function template_shd_profile_permissions()
520	477	</tr>';
521	478
522	479	if (empty($context['member_roles']))
523		- {
524	480	echo '
525	481	<tr class="windowbg">
526	482	<td colspan="3" class="centertext">', $txt['shd_profile_no_roles'], '</td>
527	483	</tr>';
528		- }
529	484	else
530	485	{
531	486	foreach ($context['member_roles'] as $role)
...	...	@@ -698,9 +654,7 @@ function template_shd_profile_actionlog()
698	654	<td colspan="2" class="shd_noticket">', $txt['shd_profile_log_none'], '</td>
699	655	</tr>';
700	656	else
701		- {
702	657	foreach ($context['action_log'] as $action)
703		- {
704	658	echo '
705	659	<tr class="windowbg">
706	660	<td class="smalltext">', $action['time'], '</td>
...	...	@@ -709,8 +663,6 @@ function template_shd_profile_actionlog()
709	663	', $action['action_text'], '
710	664	</td>
711	665	</tr>';
712		- }
713		- }
714	666
715	667	echo '
716	668	<tr class="titlebg">
...	...	@@ -731,18 +683,15 @@ function template_shd_profile_navigation_above()
731	683	<div class="tborder shd_profile_navigation">
732	684	<div class="roundframe">
733	685	<ul class="', !empty($options['use_sidebar_menu']) ? 'shd_profile_nav_inline' : 'shd_profile_nav_list', '">';
	686	+
734	687	foreach ($context['shd_profile_menu'] as $menuitem)
735		- {
736	688	if (!empty($menuitem['show']))
737		- {
738	689	echo '
739	690	<li', (!empty($menuitem['is_last']) ? ' class="shd_inline_last"' : ''), '>
740	691	<img src="', $settings['default_images_url'], '/simpledesk/', $menuitem['image'], '" alt="x" class="floatright">
741	692	<a href="', $menuitem['link'], '"><strong>', $menuitem['text'], '</strong></a>
742	693	', (empty($options['use_sidebar_menu']) && empty($menuitem['is_last'])) ? '<hr>' : '', '
743	694	</li>';
744		- }
745		- }
746	695
747	696	echo '
748	697	</ul>
...	...	@@ -842,3 +791,52 @@ function template_profile_shd_theme_settings()
842	791	<dl>
843	792	<dd></dd>';
844	793	}
	794	+
	795	+/**
	796	+ * Javascript for Preferences
	797	+ *
	798	+ * @since 2.1
	799	+*/
	800	+function template_shd_profile_js_preferences()
	801	+{
	802	+ global $context, $options, $txt;
	803	+
	804	+ echo '
	805	+ <script type="text/javascript"><!-- // --><![CDATA[';
	806	+
	807	+ foreach ($context['shd_preferences_options']['groups'] as $group => $details)
	808	+ echo '
	809	+ var oPreferences', $group, ' = new smc_Toggle({
	810	+ bToggleEnabled: true,
	811	+ bCurrentlyCollapsed: ', empty($options['collapse_shd_profile_' . $group]) ? 'false' : 'true', ',
	812	+ aSwappableContainers: [
	813	+ \'prefgroup_', $group, '\'
	814	+ ],
	815	+ aSwapImages: [
	816	+ {
	817	+ sId: \'prefexpandicon_', $group, '\',
	818	+ }
	819	+ ],
	820	+ aSwapLinks: [
	821	+ {
	822	+ sId: \'prefexpand_', $group, '_swap_link\',
	823	+ msgCollapsed: ', JavaScriptEscape($txt['shd_pref_group_' . $group]), ',
	824	+ msgExpanded: ', JavaScriptEscape($txt['shd_pref_group_' . $group]), ',
	825	+ },
	826	+ ],
	827	+ oThemeOptions: {
	828	+ bUseThemeSettings: ', $context['user']['is_guest'] ? 'false' : 'true', ',
	829	+ sOptionName: \'collapse_shd_profile_', $group, '\',
	830	+ sSessionId: smf_session_id,
	831	+ sSessionVar: smf_session_var,
	832	+ },
	833	+ oCookieOptions: {
	834	+ bUseCookie: false,
	835	+ sCookieName: \'collapse_shd_profile_', $group, '\'
	836	+ }
	837	+ });';
	838	+
	839	+ echo '
	840	+ // ]' . ']></script>';
	841	+
	842	+}
845	843	\ No newline at end of file

...	...	@@ -66,11 +66,8 @@ function template_search()
66	66	</dl>';
67	67
68	68	if (count($context['dept_list']) == 1)
69		- {
70		- $array = array_keys($context['dept_list']);
71	69	echo '
72		- <input type="hidden" name="search_dept[]" value="', $array[0], '">';
73		- }
	70	+ <input type="hidden" name="search_dept[]" value="', array_keys($context['dept_list'])[0], '">';
74	71	else
75	72	{
76	73	echo '
...	...	@@ -140,40 +137,14 @@ function template_search()
140	137	<input type="text" name="assignee_name" id="assignee_name" size="40" maxlength="100" value="">
141	138	<div id="assignee_name_container"></div>
142	139	</dd>
143		- </dl>
	140	+ </dl>';
144	141
145		- <script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/suggest.js?20fin"></script>
146		- <script type="text/javascript"><!-- // --><![CDATA[
147		- var oTicketStarter = new smc_AutoSuggest({
148		- sSelf: \'oTicketStarter\',
149		- sSessionId: \'', $context['session_id'], '\',
150		- sSessionVar: \'', $context['session_var'], '\',
151		- sControlId: \'starter_name\',
152		- sSuggestId: \'starter\',
153		- sSearchType: \'member\',
154		- sPostName: \'starter_name_form\',
155		- sURLMask: \'action=profile;u=%item_id%\',
156		- bItemList: true,
157		- sItemListContainerId: \'starter_name_container\',
158		- aListItems: []
159		- });
160		- var oTicketAssignee = new smc_AutoSuggest({
161		- sSelf: \'oTicketAssignee\',
162		- sSessionId: \'', $context['session_id'], '\',
163		- sSessionVar: \'', $context['session_var'], '\',
164		- sControlId: \'assignee_name\',
165		- sSuggestId: \'assignee\',
166		- sSearchType: \'member\',
167		- sPostName: \'assigned_name_form\',
168		- sURLMask: \'action=profile;u=%item_id%\',
169		- bItemList: true,
170		- sItemListContainerId: \'assignee_name_container\',
171		- aListItems: []
172		- });
173		- // ]', ']></script>
	142	+ template_shd_js_search();
	143	+
	144	+ echo '
174	145	<hr>
175	146	<br>
176		- <input type="submit" value="', $txt['shd_search'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
	147	+ <input type="submit" value="', $txt['shd_search'], '" accesskey="s" class="button save">
177	148	</div>
178	149	</form>
179	150	</div>';
...	...	@@ -319,7 +290,7 @@ function template_search_results()
319	290	<div class="search_results_posts">
320	291	<div class="windowbg core_posts">
321	292	<div class="content flow_auto">
322		- <div class="topic_details floatleft" style="width: 94%">
	293	+ <div class="topic_details floatleft">
323	294	<div class="counter">', $result['result'], '</div>
324	295	<h5>', $result['dept_link'], '<a href="', $scripturl, '?action=helpdesk;sa=ticket;ticket=', $result['id_ticket'], '">', sprintf($result['is_ticket'] ? $txt['shd_search_result_ticket'] : $txt['shd_search_result_reply'], $result['display_id']), '</a> - ', $result['subject'], ' (', $txt['shd_search_last_updated'], ' ', timeformat($result['last_updated']), ')</h5>
325	296	<span class="smalltext">« <strong>', $result['is_ticket'] ? $txt['shd_search_ticket_opened_by'] : $txt['shd_search_ticket_replied_by'], ' ', shd_profile_link($result['poster_name'], $result['id_member']), '</strong> ', $txt['on'], ' <em>', timeformat($result['poster_time']), '</em> »</span>
...	...	@@ -370,11 +341,8 @@ function template_search_navigation($page = 'next')
370	341
371	342	// Departments.
372	343	if (count($context['dept_list']) == 1)
373		- {
374		- $array = array_keys($context['dept_list']);
375	344	echo '
376		- <input type="hidden" name="search_dept[]" value="', $array[0], '">';
377		- }
	345	+ <input type="hidden" name="search_dept[]" value="', array_keys($context['dept_list'])[0], '">';
378	346	elseif (isset($context['search_params']['visible_depts']))
379	347	foreach ($context['search_params']['visible_depts'] as $dept)
380	348	echo '
...	...	@@ -412,15 +380,55 @@ function template_search_navigation($page = 'next')
412	380	if ($page === 'prev')
413	381	echo '
414	382	<input type="hidden" name="page" value="', $context['prev_page'], '">
415		- <input type="submit" value="Previous" onclick="return submitThisOnce(this);" class="button floatleft">';
	383	+ <input type="submit" value="Previous" class="button save floatleft">';
416	384	elseif (is_int($page) && $page > 0)
417	385	echo '
418	386	<input type="hidden" name="page" value="', $page, '">
419		- <input type="submit" value="Page ', $page, '" onclick="return submitThisOnce(this);" class="button floatleft', $context['current_page'] == $page ? ' active' : '', '">';
	387	+ <input type="submit" value="Page ', $page, '" class="button save floatleft', $context['current_page'] == $page ? ' active' : '', '">';
420	388	else
421	389	echo '
422	390	<input type="hidden" name="page" value="', $context['next_page'], '">
423		- <input type="submit" value="Next" onclick="return submitThisOnce(this);" class="button">';
	391	+ <input type="submit" value="Next" class="button save">';
424	392
425	393	echo '</form>';
426	394	}
	395	+
	396	+/**
	397	+ * Javascript for Search
	398	+ *
	399	+ * @since 2.1
	400	+*/
	401	+function template_shd_js_search()
	402	+{
	403	+ global $context, $settings;
	404	+
	405	+ echo '
	406	+ <script type="text/javascript"><!-- // --><![CDATA[
	407	+ var oTicketStarter = new smc_AutoSuggest({
	408	+ sSelf: \'oTicketStarter\',
	409	+ sSessionId: \'', $context['session_id'], '\',
	410	+ sSessionVar: \'', $context['session_var'], '\',
	411	+ sControlId: \'starter_name\',
	412	+ sSuggestId: \'starter\',
	413	+ sSearchType: \'member\',
	414	+ sPostName: \'starter_name_form\',
	415	+ sURLMask: \'action=profile;u=%item_id%\',
	416	+ bItemList: true,
	417	+ sItemListContainerId: \'starter_name_container\',
	418	+ aListItems: []
	419	+ });
	420	+ var oTicketAssignee = new smc_AutoSuggest({
	421	+ sSelf: \'oTicketAssignee\',
	422	+ sSessionId: \'', $context['session_id'], '\',
	423	+ sSessionVar: \'', $context['session_var'], '\',
	424	+ sControlId: \'assignee_name\',
	425	+ sSuggestId: \'assignee\',
	426	+ sSearchType: \'member\',
	427	+ sPostName: \'assigned_name_form\',
	428	+ sURLMask: \'action=profile;u=%item_id%\',
	429	+ bItemList: true,
	430	+ sItemListContainerId: \'assignee_name_container\',
	431	+ aListItems: []
	432	+ });
	433	+ // ]', ']></script>';
	434	+}
427	435	\ No newline at end of file

...	...	@@ -36,7 +36,7 @@ function template_shd_tickettotopic()
36	36	</h3>
37	37	</div>
38	38	<div class="roundframe noup">
39		- <form action="', $scripturl, '?action=helpdesk;sa=tickettotopic2;ticket=', $context['ticket_id'], '" method="post" onsubmit="submitonce(this);">
	39	+ <form action="', $scripturl, '?action=helpdesk;sa=tickettotopic2;ticket=', $context['ticket_id'], '" method="post">
40	40	<dl class="settings">
41	41	<dt>
42	42	<strong>', $txt['shd_ticket_board'], ':</strong>
...	...	@@ -63,10 +63,10 @@ function template_shd_tickettotopic()
63	63	<strong>', $txt['shd_change_ticket_subject'], ':</strong>
64	64	</dt>
65	65	<dd>
66		- <input type="checkbox" name="change_subject" id="change_subject" onclick="document.getElementById(\'new_subject\').style.display = this.checked ? \'block\' : \'none\';" >
	66	+ <input type="checkbox" name="change_subject" id="change_subject" onclick="$(\'#new_subject\').toggle();">
67	67	</dd>
68	68	</dl>
69		- <dl class="settings" style="display: none;" id="new_subject">
	69	+ <dl class="settings hidden" id="new_subject">
70	70	<dt>
71	71	<strong>', $txt['shd_new_subject'], ':</strong>
72	72	</dt>
...	...	@@ -79,7 +79,7 @@ function template_shd_tickettotopic()
79	79	<strong>', $txt['shd_move_send_pm'], ':</strong>
80	80	</dt>
81	81	<dd>
82		- <input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="document.getElementById(\'pm_message\').style.display = this.checked ? \'block\' : \'none\';" >
	82	+ <input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="$(\'#pm_message\').toggle();">
83	83	</dd>
84	84	</dl>
85	85	<fieldset id="pm_message">
...	...	@@ -94,7 +94,6 @@ function template_shd_tickettotopic()
94	94	</fieldset>';
95	95
96	96	if (!empty($context['deleted_prompt']))
97		- {
98	97	echo '
99	98	<fieldset id="deleted_replies">
100	99	<dl class="settings">
...	...	@@ -110,7 +109,6 @@ function template_shd_tickettotopic()
110	109	</dd>
111	110	</dl>
112	111	</fieldset>';
113		- }
114	112
115	113	if (!empty($context['custom_fields']))
116	114	{
...	...	@@ -181,7 +179,7 @@ function template_shd_tickettotopic()
181	179	}
182	180
183	181	echo '
184		- <input type="submit" value="', $txt['shd_move_ticket'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
	182	+ <input type="submit" value="', $txt['shd_move_ticket'], '" accesskey="s" class="button save">
185	183	<input type="submit" name="cancel" value="', $txt['shd_cancel_ticket'], '" accesskey="c" class="button">
186	184	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
187	185	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">
...	...	@@ -217,10 +215,10 @@ function template_shd_topictoticket()
217	215	<strong>', $txt['shd_change_topic_subject'], ':</strong>
218	216	</dt>
219	217	<dd>
220		- <input type="checkbox" name="change_subject" id="change_subject" onclick="document.getElementById(\'new_subject\').style.display = this.checked ? \'block\' : \'none\';" >
	218	+ <input type="checkbox" name="change_subject" id="change_subject" onclick="$(\'#new_subject\').toggle();">
221	219	</dd>
222	220	</dl>
223		- <dl class="settings" style="display: none;" id="new_subject">
	221	+ <dl class="settings hidden" id="new_subject">
224	222	<dt>
225	223	<strong>', $txt['shd_new_subject'], ':</strong>
226	224	</dt>
...	...	@@ -233,7 +231,7 @@ function template_shd_topictoticket()
233	231	<strong>', $txt['shd_move_send_pm_topic'], ':</strong>
234	232	</dt>
235	233	<dd>
236		- <input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="document.getElementById(\'pm_message\').style.display = this.checked ? \'block\' : \'none\';" >
	234	+ <input type="checkbox" name="send_pm" id="send_pm" checked="checked" onclick="$(\'#pm_message\').toggle();">
237	235	</dd>
238	236	</dl>
239	237	<fieldset id="pm_message">
...	...	@@ -247,16 +245,13 @@ function template_shd_topictoticket()
247	245	</dl>
248	246	</fieldset>';
249	247
250		- if (count($context['dept_list']) == 1)
251		- {
252		- $dept = array_keys($context);
253	248	// We can only see one department, so that's the one we will use.
	249	+ if (count($context['dept_list']) == 1)
254	250	echo '
255	251	<dl class="settings">
256	252	<dt>', $context['ttm_move_dept'], '</dt>
257		- <input type="hidden" name="dept" value="', $dept[0], '">
	253	+ <input type="hidden" name="dept" value="', array_keys($context)[0], '">
258	254	</dl>';
259		- }
260	255	else
261	256	{
262	257	// We can see multiple departments, so tell the moderator and also provide a list to pick from.
...	...	@@ -280,7 +275,7 @@ function template_shd_topictoticket()
280	275	}
281	276
282	277	echo '
283		- <input type="submit" value="', $txt['shd_move_topic'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
	278	+ <input type="submit" value="', $txt['shd_move_topic'], '" accesskey="s" class="button save">
284	279	<input type="submit" name="cancel" value="', $txt['shd_cancel_topic'], '" accesskey="c" class="button">
285	280	<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
286	281	<input type="hidden" name="seqnum" value="', $context['form_sequence_number'], '">

...	...	@@ -51,16 +51,12 @@ function template_shd_unread_below()
51	51	</tr>';
52	52
53	53	if (empty($context['shd_unread_info']))
54		- {
55	54	echo '
56	55	<tr class="windowbg">
57	56	<td colspan="7">', $txt['shd_error_no_tickets'], '</td>
58	57	</tr>';
59		- }
60	58	else
61		- {
62	59	foreach ($context['shd_unread_info'] as $ticket)
63		- {
64	60	echo '
65	61	<tr class="windowbg">
66	62	<td width="4%" class="smalltext">', $ticket['id_ticket_display'], '</td>
...	...	@@ -72,9 +68,6 @@ function template_shd_unread_below()
72	68	<td class="smalltext">', $ticket['updated'], '</td>
73	69	</tr>';
74	70
75		- }
76		- }
77		-
78	71	echo '
79	72	</table>';
80	73	}
81	74	\ No newline at end of file
82	75