SD-SimpleDesk

@@ -139,6 +139,10 @@ dl.permsettings img, dl.cannedsettings dd img.icon {

 	margin: 0 10px 0 0;

 }

+dl span.custom_field_order img {

+	margin-right: 0;	

+}

+

 h3 a.permcollapse img {

 	margin-top:8px;

 }

@@ -97,15 +97,15 @@

 		<hook hook="integrate_SSI" function="$sourcedir/SimpleDesk-SSI.php" />

 		<!-- database changes -->

-		<database>install.php</database>

+		<database>install-sd.php</database>

 		<redirect url="?action=admin;area=helpdesk_info" />

 	</install>

 	<uninstall for="2.1 Beta 3, 2.1 Beta 4">

 		<!-- database changes, undone -->

-		<database>uninstall-optional.php</database>

-		<code type="file">uninstall-required.php</code>

+		<database>uninstall-sd-optional.php</database>

+		<code type="file">uninstall-sd-required.php</code>

 		<!-- All the hooks -->

 			<!-- SMF Core -->

@@ -124,3 +124,132 @@ function toggleItem(itemID, theme_url, txt_on, txt_off)

 	// Don't reload.

 	return false;

 }

+

+/* Sort Custom Fields */

+function shd_custom_field_order(oOptions)

+{

+	this.opt = oOptions;

+

+	if (!this.opt.sFieldsContainer)

+		this.opt.sFieldsContainer = 'custom_fields_list';

+	if (!this.opt.sOptionsOrderClass)

+		this.opt.sOptionsOrderClass = 'custom_field_order';

+	if (!this.opt.sOptionsMoveDownClass)

+		this.opt.sOptionsMoveDownClass = 'custom_field_move_down';

+	if (!this.opt.sOptionsMoveUpClass)

+		this.opt.sOptionsMoveUpClass = 'custom_field_move_up';

+	if (!this.opt.aCustHTMLFields)

+		this.opt.aCustHTMLFields = ['break_{KEY}', 'radio_{KEY}', 'multi_{KEY}', 'option_{KEY}', 'order_{KEY}'];

+

+	this.currentOrder = new Array();

+	this.newOrder = new Array();

+

+	this.init();

+	return false;

+}

+

+shd_custom_field_order.prototype.init = function ()

+{

+	var self = this;

+

+	$(document).on('click', '#' + this.opt.sFieldsContainer + ' .' + this.opt.sOptionsMoveDownClass, function(e){

+		e.preventDefault();

+		var clickedKey = $(this).data('key');

+		var clickedOrder = $('#order_' + clickedKey + ' input').val();

+		self.move(clickedKey, clickedOrder, clickedOrder + 1);

+		return;

+	});

+	$(document).on('click', '#' + this.opt.sFieldsContainer + ' .' + this.opt.sOptionsMoveUpClass, function(e){

+		e.preventDefault();

+		var clickedKey = $(this).data('key');

+		var clickedOrder = $('#order_' + clickedKey + ' input').val();

+		self.move(clickedKey, clickedOrder, clickedOrder - 1);

+		return;

+	});

+}

+

+shd_custom_field_order.prototype.cloneArray = function (arraySource)

+{

+	return arraySource.slice(0);

+}

+

+shd_custom_field_order.prototype.move = function (clickedKey, clickedOrder, movedOrder)

+{

+	var currentOrder = new Array();

+	var newOrder = new Array();

+

+	// Get our current Order items.

+	var self = this;

+	$('#' + this.opt.sFieldsContainer + ' .' + this.opt.sOptionsOrderClass + ' input').each(function() {

+		currentOrder[$(this).val()] = $(this).data('key');

+

+		// Capture the current input. attr is used here as data doesn't get retained.

+		$('#option_' + $(this).data('key')).attr('data-value-input', $('#option_' + $(this).data('key')).val());

+	});

+

+	// Make sure it can go that way.

+	if (

+		(clickedOrder > movedOrder && movedOrder < 0) ||

+		(clickedOrder < movedOrder && clickedOrder >= currentOrder.length - 1)

+	)

+		return;

+

+	// Put this into the right place.

+	newOrder = this.cloneArray(currentOrder);

+	newOrder.splice(clickedOrder, 1);

+	newOrder.splice(movedOrder, 0, clickedKey);

+

+	// Build up the new HTML and move it.

+	var newDiv = '';

+	$(newOrder).each(function(order, key) {

+		$(self.opt.aCustHTMLFields).each(function(order2, field) {

+			newDiv += $('#' + field.replace('{KEY}', key)).prop('outerHTML');

+		});

+	});

+	newDiv += '<span id="addopt"></span>';

+	$('#' + this.opt.sFieldsContainer).html(newDiv);

+

+	this.resort(newOrder);

+}

+

+shd_custom_field_order.prototype.resortNew = function ()

+{

+	var currentOrder = new Array();

+

+	$('#' + this.opt.sFieldsContainer + ' .' + this.opt.sOptionsOrderClass + ' input').each(function() {

+		currentOrder[$(this).val()] = $(this).data('key');

+

+		// Capture the current input. attr is used here as data doesn't get retained.

+		$('#option_' + $(this).data('key')).attr('data-value-input', $('#option_' + $(this).data('key')).val());

+	});

+

+	this.resort(currentOrder);

+}

+

+shd_custom_field_order.prototype.resort = function (currentOrder)

+{

+	// Find out the new orders.

+	var firstField = typeof currentOrder[0] === 'undefined' ? 0 : currentOrder[0];

+	var lastField = currentOrder[currentOrder.length - 1];

+

+	// Go through each possible option and reorder it, you can't do this first since outerHTML doesn't contain the updated information.

+	$(currentOrder).each(function(order, key) {

+		orderHTML = $('#order_' + key + '_input').val(order);

+

+		// First item, we hide the move up.

+		if (firstField == key)

+			$('#order_' + key + ' a.custom_field_move_up').hide();

+		else

+			$('#order_' + key + ' a.custom_field_move_up').show();

+

+		// Last item we hide the move down.

+		if (lastField == key)

+			$('#order_' + key + ' a.custom_field_move_down').hide();

+		else

+			$('#order_' + key + ' a.custom_field_move_down').show();

+

+		// Capture the current input.

+		if ($('#option_' + key).data('value-input'))

+			$('#option_' + key).val($('#option_' + key).attr('data-value-input'));

+	});

+}

\ No newline at end of file

@@ -125,7 +125,7 @@ function shd_admin_custom_new()

 		'placement' => CFIELD_PLACE_DETAILS,

 	));

-	$context['custom_field']['options'] = array(1 => '', '', '', 'inactive' => array());

+	$context['custom_field']['options'] = array(1 => '', '', '', 'inactive' => array(), 'order' => array());

 	$context['custom_field']['default_value'] = false;

 	// Get the list of departments, and whether a field is required in each department.

@@ -139,6 +139,8 @@ function shd_admin_custom_new()

 	while ($row = $smcFunc['db_fetch_assoc']($query))

 		$context['dept_fields'][$row['id_dept']] = $row;

 	$smcFunc['db_free_result']($query);

+

+	loadLanguage('ManageSettings');

 }

 /**

@@ -154,7 +156,8 @@ function shd_admin_custom_edit()

 	$query = shd_db_query('', '

 		SELECT id_field, active, field_order, field_name, field_desc, field_loc, icon, field_type,

-		field_length, field_options, bbc, default_value, can_see, can_edit, display_empty, placement

+		field_length, field_options, bbc, default_value, can_see, can_edit,

+		display_empty, placement

 		FROM {db_prefix}helpdesk_custom_fields

 		WHERE id_field = {int:field}',

 		array(

@@ -174,6 +178,23 @@ function shd_admin_custom_edit()

 		if (empty($context['custom_field']['options']['inactive']))

 			$context['custom_field']['options']['inactive'] = array();

+		if (!isset($context['custom_field']['options']['order']))

+			$context['custom_field']['options']['order'] = array();

+

+		// If this option isn't in the order, make it so!

+		foreach ($context['custom_field']['options'] as $key => $val)

+			if (!in_array($key, array('inactive', 'order')) && !in_array($key, $context['custom_field']['options']['order']))

+				$context['custom_field']['options']['order'][] = $key;

+

+		// Make sure it exists in the order.

+		foreach ($context['custom_field']['options']['order'] as $key => $val)

+			if (!isset($context['custom_field']['options'][$val]))

+				unset($context['custom_field']['options']['order'][$val]);

+

+		// first and last order.

+		$context['custom_field']['order_first'] = current($context['custom_field']['options']['order']);

+		$context['custom_field']['order_last'] = end($context['custom_field']['options']['order']);

+

 		// If this is a textarea, we need to get its dimensions too.

 		if ($context['custom_field']['field_type'] == CFIELD_TYPE_LARGETEXT)

 			$context['custom_field']['dimensions'] = explode(',', $context['custom_field']['default_value']);

@@ -216,6 +237,8 @@ function shd_admin_custom_edit()

 		$smcFunc['db_free_result']($query);

 		fatal_lang_error('shd_admin_cannot_edit_custom_field', false);

 	}

+

+	loadLanguage('ManageSettings');

 }

 /**

@@ -373,6 +396,7 @@ function shd_admin_custom_save()

 	$defaultOptions = array();

 	if (!empty($_POST['select_option']) && ($_POST['field_type'] == CFIELD_TYPE_SELECT || $_POST['field_type'] == CFIELD_TYPE_RADIO || $_POST['field_type'] == CFIELD_TYPE_MULTI))

 	{

+		$optionsOrder = array();

 		foreach ($_POST['select_option'] as $k => $v)

 		{

 			// Clean, clean, clean...

@@ -391,7 +415,12 @@ function shd_admin_custom_save()

 			// Is it default?

 			if (isset($_POST['default_select']) && $_POST['default_select'] == $k)

 				$_POST['default_check'] = $k;

+

+			// Our order.

+			$optionsOrder[$_POST['order'][$k]] = $k;

 		}

+

+		$newOptions['order'] = $optionsOrder;

 		$options = json_encode($newOptions);

 	}

@@ -511,7 +540,7 @@ function shd_admin_custom_save()

 			// First, figure out what fields we had before.

 			foreach ($row['field_options'] as $k => $v)

 			{

-				if ($k == 'inactive')

+				if ($k == 'inactive' || $k == 'order')

 					continue;

 				if (!isset($newOptions[$k]))

 					$inactive[] = $k;

@@ -521,6 +550,7 @@ function shd_admin_custom_save()

 			foreach ($newOptions as $k => $v)

 				$new_fields[$k] = $v;

 			$new_fields['inactive'] = $inactive;

+			$new_fields['order'] = $optionsOrder;

 			$options = json_encode($new_fields);

 		}

@@ -833,7 +833,7 @@ function shd_load_custom_fields($is_ticket = true, $ticketContext = 0, $dept = 0

 			{

 				foreach ($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options'] as $k => $v)

 				{

-					if ($k != 'inactive')

+					if ($k != 'inactive' && $k != 'order')

 						$context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options'][$k] = (strpos($v, '[') !== false) ? trim(strip_tags(parse_bbc($v))) : trim($v);

 				}

 			}

@@ -842,6 +842,21 @@ function shd_load_custom_fields($is_ticket = true, $ticketContext = 0, $dept = 0

 		if (!empty($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']) && empty($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']['inactive']))

 			$context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']['inactive'] = array();

+		if (!empty($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']) && !isset($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']['order']))

+			$context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']['order'] = array();

+

+		// If this option isn't in the order, make it so!

+		if (!empty($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']))

+			foreach ($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options'] as $key => $val)

+				if (!in_array($key, array('inactive', 'order')) && !in_array($key, $context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']['order']))

+					$context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']['order'][] = $key;

+

+		// Make sure it exists in the order.

+		if (!empty($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']))

+			foreach ($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']['order'] as $key => $val)

+				if (!isset($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options'][$val]))

+					unset($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['options']['order'][$val]);

+

 		if (isset($field_values[$row['id_field']]))

 		{

 			if ($context['ticket_form']['custom_fields'][$loc][$row['id_field']]['type'] == CFIELD_TYPE_MULTI)

@@ -157,22 +157,29 @@ function template_shd_custom_field_edit()

 					document.getElementById("required_dept" + id).disabled = state;

 					document.getElementById("required_dept_multi_" + id).disabled = state;

 				}

-				var startOptID = ', count($context['custom_field']['options']), ';

+				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 newHTML = \'<br><input type="radio" id="radio_\' + startOptID + \'" name="default_select" value="\' + startOptID + \'" id="\' + startOptID + \'"\';

+					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;"\';

 					newHTML += \' >\' + "\n";

 					newHTML += \'<input type="checkbox" id="multi_\' + startOptID + \'" name="default_select_multi[\' + startOptID + \']" value="\' + startOptID + \'"\';

 					if (ftype != ', CFIELD_TYPE_MULTI, ')

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

-					newHTML += \' >\' + "\n";

-					newHTML += \'<input type="text" name="select_option[\' + startOptID + \']" value="" ><span id="addopt"></span>\';

+					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 += \'</span>\' + "\n";

+

+					newHTML += \'<span id="addopt"></span>\';

 					setOuterHTML(document.getElementById("addopt"), newHTML);

 					startOptID++;

+

+					optionsOrder.resortNew();

 				}

 				function update_default_label(defstate)

 				{

@@ -324,27 +331,38 @@ function template_shd_custom_field_edit()

 								</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>';

+								<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>

+								<div id="custom_fields_list">';

 	// Convert it to an array for displaying the main doodah

 	if ($context['field_type_value'] == CFIELD_TYPE_MULTI)

 		$context['custom_field']['default_value'] = explode(',', $context['custom_field']['default_value']);

-	foreach ($context['custom_field']['options'] as $k => $option)

+	foreach ($context['custom_field']['options']['order'] as $order => $k)

 	{

-		if ($k == 'inactive' || in_array($k, $context['custom_field']['options']['inactive']))

+		if ($k == 'order' || $k == 'inactive' || in_array($k, $context['custom_field']['options']['inactive']))

 			continue;

+		$option = $context['custom_field']['options'][$k];

 		echo '

-								<br>

+									<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="text" name="select_option[', $k, ']" value="', $option, '" >';

+									<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 '</span>';

+

 	}

 	echo '

 								<span id="addopt"></span>

-								[<a href="" onclick="add_option(); return false;">', $txt['more'], '</a>]

+								</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;"','>

 								<strong>', $txt['shd_admin_custom_field_default_state'], ':</strong>

@@ -394,5 +412,9 @@ function template_shd_custom_field_edit()

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

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

 					<input type="hidden" name="field" value="', empty($context['custom_field']['id_field']) ? 0 : $context['custom_field']['id_field'], '">

-				</form>';

+				</form>

+

+	<script type="text/javascript">

+		var optionsOrder = new shd_custom_field_order({});

+	</script>';

 }

\ No newline at end of file

@@ -229,11 +229,13 @@ function template_ticket_custom_fields()

 								<select name="field-', $field['id'], '">

 									<option value="0"', $field['value'] == 0 ? ' selected="selected"' : '', !empty($field['is_required']) ? ' disabled="disabled"' : '', '>', $txt['shd_choose_one'], '&nbsp;</option>';

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

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

 					{

-						if ($key == 'inactive' || in_array($key, $field['options']['inactive']))

+						if ($key == 'order' || $key == 'inactive' || in_array($key, $field['options']['inactive']))

 							continue;

+						$option = $field['options'][$key];

+

 						echo '

 									<option value="', $key, '"', $field['value'] == $key ? ' selected="selected"' : '', '>', $option, '&nbsp;</option>';

 					}