diff --git a/CHANGELOG.md b/CHANGELOG.md index 04a0a3ece..75c0a8c42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ This file documents all notable changes made to ITFlow. +## [25.03.5] + +### Fixed +- Fixed the user listing issue when copying a trip. +- Corrected the display of recurring invoice amounts on the dashboard. +- Fixed the linking of entities with assets and contacts. +- Resolved the issue with displaying the correct mobile country code in the contact listing. +- Set the default date to `9999-12-31` to ensure future items (like invoices) are displayed by default. +- Fixed the display issue where file folders were not showing properly during document creation. +- Migrated from Dragula to SortableJS for a more modern, mobile-friendly solution. +- Added Handlebars icons for drag-and-drop items. +- Changed behavior to open Contact and Asset Details pages directly instead of using a modal. + ## [25.03.4] ### Fixed diff --git a/README.md b/README.md index 4863620df..d5c52ebe4 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,7 @@ If you want to improve ITFlow, feel free to fork the repo and create a pull requ We’re incredibly grateful to the organizations and individuals who support the project - a big thank you to: - CompuMatter - F1 for HELP +- JetBrains (PhpStorm) ## License ITFlow is distributed "as is" under the GPL License, WITHOUT WARRANTY OF ANY KIND. See [`LICENSE`](https://github.com/itflow-org/itflow/blob/master/LICENSE) for details. diff --git a/admin_settings_ticket.php b/admin_settings_ticket.php index 2d6d4efd5..f91cd4c48 100644 --- a/admin_settings_ticket.php +++ b/admin_settings_ticket.php @@ -72,6 +72,31 @@ + +
+ +
+
+ +
+ +
+
+
+ +
+ value="1" id="ticketOrderingSwitch"> + +
+
+ value="1" id="ticketMovingColumnsSwitch"> + +
+
diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php index 03ad6fa0b..b8280aed0 100644 --- a/admin_ticket_template_details.php +++ b/admin_ticket_template_details.php @@ -30,156 +30,139 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id ORDER BY task_template_order ASC, task_template_id ASC"); ?> - - -
    -
  1. - Home -
    2. -
  2. - Admin -
    3. -
  3. - Ticket Templates -
    4. -
    5. -
- -
-
- -
-
-

-
- -
-

-
-
+ +
    +
  1. + Home +
    2. +
  2. + Admin +
    3. +
  3. + Ticket Templates +
    4. +
    5. +
+ +
+
+ +
+
+

+
+ +
+

+
-

-
-
-
-
-
- +

+
+
- +
+
+ +
-
+
-
-
-
Tasks
-
-
-
- -
-
-
- -
- -
- -
+
+ +
+
+
Tasks
+
+
+ + +
+
+
+ +
+ +
+
- - - - - - - + + +
- - m - - - - -
-
- -
- - Edit - -
- - Delete - -
+
+ + + + + + - - -
+ + m + - + +
+
+ +
+ + Edit + +
+ + Delete +
-
-
+ +
-
- - - +
+ + + + + 1 AND user_archived_at IS NULL ORDER BY user_name ASC" + WHERE user_role_id > 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); while ($row = mysqli_fetch_array($sql_users)) { $user_id_select = intval($row['user_id']); diff --git a/asset_details.php b/asset_details.php index b7a03b5d8..066f1eec7 100644 --- a/asset_details.php +++ b/asset_details.php @@ -244,7 +244,7 @@ data-ajax-id=""> -

+

asset_photo"> @@ -405,7 +405,7 @@
-

Network Interfaces

+

Interfaces

-
- - Edit - -
- Delete +
+
+ +
+
+
+ +
+ + Edit + +
+ Delete +
+
- - + @@ -1178,38 +1185,23 @@ } - + diff --git a/js/tickets_kanban.js b/js/tickets_kanban.js index 419a0ee39..c614d0576 100644 --- a/js/tickets_kanban.js +++ b/js/tickets_kanban.js @@ -1,146 +1,126 @@ -$(document).ready(function() { - console.log('CONFIG_TICKET_MOVING_COLUMNS: ' + CONFIG_TICKET_MOVING_COLUMNS); - console.log('CONFIG_TICKET_ORDERING: ' + CONFIG_TICKET_ORDERING); - - // Function to detect touch devices - function isTouchDevice() { - return 'ontouchstart' in window || navigator.maxTouchPoints; - } - - // Initialize Dragula for the Kanban board - let boardDrake = dragula([ - document.querySelector('#kanban-board') - ], { - moves: function(el, container, handle) { - return handle.classList.contains('panel-title'); - }, - accepts: function(el, target, source, sibling) { - return CONFIG_TICKET_MOVING_COLUMNS === 1; - } - }); - - // Log the event of moving the column panel-title - boardDrake.on('drag', function(el) { - //console.log('Dragging column:', el.querySelector('.panel-title').innerText); - }); - - boardDrake.on('drop', function(el, target, source, sibling) { - //console.log('Dropped column:', el.querySelector('.panel-title').innerText); - - // Get all columns and their positions - let columns = document.querySelectorAll('#kanban-board .kanban-column'); - let columnPositions = []; - - columns.forEach(function(column, index) { - let statusId = $(column).data('status-id'); // Assuming you have a data attribute for status ID - columnPositions.push({ - status_id: statusId, +$(document).ready(function () { + console.log('CONFIG_TICKET_MOVING_COLUMNS:', CONFIG_TICKET_MOVING_COLUMNS); + console.log('CONFIG_TICKET_ORDERING:', CONFIG_TICKET_ORDERING); + + // ------------------------------- + // Drag: Kanban Columns (Statuses) + // ------------------------------- + new Sortable(document.querySelector('#kanban-board'), { + animation: 150, + handle: '.panel-title', + draggable: '.kanban-column', + onEnd: function () { + const columnPositions = Array.from(document.querySelectorAll('#kanban-board .kanban-column')).map((col, index) => ({ + status_id: $(col).data('status-id'), status_kanban: index - }); - }); - - // Send AJAX request to update all column positions - $.ajax({ - url: 'ajax.php', - type: 'POST', - data: { - update_kanban_status_position: true, - positions: columnPositions - }, - success: function(response) { - console.log('Ticket status kanban orders updated successfully.'); - // Optionally, you can refresh the page or update the UI here - }, - error: function(xhr, status, error) { - console.error('Error updating ticket status kanban orders:', error); + })); + + if (CONFIG_TICKET_MOVING_COLUMNS === 1) { + $.post('ajax.php', { + update_kanban_status_position: true, + positions: columnPositions + }).done(() => { + console.log('Ticket status kanban orders updated.'); + }).fail((xhr) => { + console.error('Error updating status order:', xhr.responseText); + }); } - }); + } }); - // Initialize Dragula for the Kanban Cards - let drake = dragula([ - ...document.querySelectorAll('#status') - ], { - moves: function(el, container, handle) { - if (isTouchDevice()) { - return handle.classList.contains('drag-handle-class'); - } else { - return true; // Allow dragging on the entire task element for desktop + // ------------------------------- + // Drag: Tasks within Columns + // ------------------------------- + document.querySelectorAll('.kanban-status').forEach(statusCol => { + new Sortable(statusCol, { + group: 'tickets', + animation: 150, + handle: isTouchDevice() ? '.drag-handle-class' : undefined, + onStart: () => hidePlaceholders(), + onEnd: function (evt) { + const target = evt.to; + const movedEl = evt.item; + + // Disallow reordering in same column if config says so + if (CONFIG_TICKET_ORDERING === 0 && evt.from === evt.to) { + evt.from.insertBefore(movedEl, evt.from.children[evt.oldIndex]); + showPlaceholders(); + return; + } + + const columnId = $(target).data('status-id'); + + const positions = Array.from(target.querySelectorAll('.task')).map((card, index) => { + const ticketId = $(card).data('ticket-id'); + const oldStatus = ticketId === $(movedEl).data('ticket-id') + ? $(movedEl).data('ticket-status-id') + : false; + + $(card).data('ticket-status-id', columnId); // update DOM + + return { + ticket_id: ticketId, + ticket_order: index, + ticket_oldStatus: oldStatus, + ticket_status: columnId + }; + }); + + $.post('ajax.php', { + update_kanban_ticket: true, + positions: positions + }).done(() => { + console.log('Updated kanban ticket positions.'); + }).fail((xhr) => { + console.error('Error updating ticket positions:', xhr.responseText); + }); + + // Refresh placeholders after update + showPlaceholders(); } - } + }); }); + // ------------------------------- + // 📱 Touch Support: Show drag handle on mobile + // ------------------------------- if (isTouchDevice()) { - const moveList = document.querySelectorAll('.task'); - moveList.forEach(task => { - task.querySelector('.drag-handle-class').style.display = 'inline'; - }); + $('.drag-handle-class').css('display', 'inline'); } - drake.on('drag', function(el) { - el.style.cursor = 'grabbing'; - }); - - drake.on('dragend', function(el) { - el.style.cursor = 'grab'; - }); - // Add event listener for the drop event - drake.on('drop', function (el, target, source, sibling) { - // Log the target ID to the console - //console.log('Dropped into:', target.getAttribute('data-column-name')); - - if (CONFIG_TICKET_ORDERING === 0 && source == target) { - drake.cancel(true); // Move the card back to its original position - return; - } - - // Get all cards in the target column and their positions - let cards = $(target).children('.task'); - let positions = []; - - //id of current status / column - let columnId = $(target).data('status-id'); - - let movedTicketId = $(el).data('ticket-id'); - let movedTicketStatusId = $(el).data('ticket-status-id'); - - cards.each(function(index, card) { - let ticketId = $(card).data('ticket-id'); - let statusId = $(card).data('ticket-status-id'); - - let oldStatus = false; - if (ticketId == movedTicketId) { - oldStatus = movedTicketStatusId; - } - - //update the status id of the card if needed - if (statusId != columnId) { - $(card).data('ticket-status-id', columnId); - statusId = columnId; + // ------------------------------- + // Placeholder Management + // ------------------------------- + function showPlaceholders() { + document.querySelectorAll('.kanban-status').forEach(status => { + const placeholderClass = 'empty-placeholder'; + + // Remove existing placeholder + const existing = status.querySelector(`.${placeholderClass}`); + if (existing) existing.remove(); + + // Only show if there are no tasks + if (status.querySelectorAll('.task').length === 0) { + const placeholder = document.createElement('div'); + placeholder.className = `${placeholderClass} text-muted text-center p-2`; + placeholder.innerText = 'Drop ticket here'; + placeholder.style.pointerEvents = 'none'; + status.appendChild(placeholder); } - positions.push({ - ticket_id: ticketId, - ticket_order: index, - ticket_oldStatus: oldStatus, - ticket_status: statusId ?? null// Get the new status ID from the target column - }); }); + } - //console.log(positions); - // Send AJAX request to update all ticket kanban orders and statuses - $.ajax({ - url: 'ajax.php', - type: 'POST', - data: { - update_kanban_ticket: true, - positions: positions - }, - success: function(response) { - //console.log('Ticket kanban orders and statuses updated successfully.'); - }, - error: function(xhr, status, error) { - console.error('Error updating ticket kanban orders and statuses:', error); - } - }); - }); -}); \ No newline at end of file + function hidePlaceholders() { + document.querySelectorAll('.empty-placeholder').forEach(el => el.remove()); + } + + // Run once on load + showPlaceholders(); + + // ------------------------------- + // Utility: Detect touch device + // ------------------------------- + function isTouchDevice() { + return 'ontouchstart' in window || navigator.maxTouchPoints > 0; + } +}); diff --git a/modals/asset_link_credential_modal.php b/modals/asset_link_credential_modal.php index 748133d22..8a1ca42bb 100644 --- a/modals/asset_link_credential_modal.php +++ b/modals/asset_link_credential_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/asset_link_document_modal.php b/modals/asset_link_document_modal.php index 63ffa0a42..52c6eb5d5 100644 --- a/modals/asset_link_document_modal.php +++ b/modals/asset_link_document_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/asset_link_file_modal.php b/modals/asset_link_file_modal.php index 09b4a1e1a..3c8f7e1fc 100644 --- a/modals/asset_link_file_modal.php +++ b/modals/asset_link_file_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/asset_link_service_modal.php b/modals/asset_link_service_modal.php index 7b86bb193..89f55ece9 100644 --- a/modals/asset_link_service_modal.php +++ b/modals/asset_link_service_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/asset_link_software_modal.php b/modals/asset_link_software_modal.php index 1af3fbf83..747d177e6 100644 --- a/modals/asset_link_software_modal.php +++ b/modals/asset_link_software_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/client_file_upload_modal.php b/modals/client_file_upload_modal.php index 313c1cda5..f0bcc73ab 100644 --- a/modals/client_file_upload_modal.php +++ b/modals/client_file_upload_modal.php @@ -37,7 +37,7 @@
diff --git a/modals/contact_link_asset_modal.php b/modals/contact_link_asset_modal.php index 698b9ea5f..2d957ad27 100644 --- a/modals/contact_link_asset_modal.php +++ b/modals/contact_link_asset_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_credential_modal.php b/modals/contact_link_credential_modal.php index daf0cd6b9..fb5e41c05 100644 --- a/modals/contact_link_credential_modal.php +++ b/modals/contact_link_credential_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_document_modal.php b/modals/contact_link_document_modal.php index 266a545f8..26973df73 100644 --- a/modals/contact_link_document_modal.php +++ b/modals/contact_link_document_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_file_modal.php b/modals/contact_link_file_modal.php index 0f134cc3c..e8cf363f1 100644 --- a/modals/contact_link_file_modal.php +++ b/modals/contact_link_file_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_service_modal.php b/modals/contact_link_service_modal.php index 74a4b51df..a65ecffdc 100644 --- a/modals/contact_link_service_modal.php +++ b/modals/contact_link_service_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/modals/contact_link_software_modal.php b/modals/contact_link_software_modal.php index b79014dd5..0afc59d46 100644 --- a/modals/contact_link_software_modal.php +++ b/modals/contact_link_software_modal.php @@ -8,7 +8,7 @@
- +
diff --git a/plugins/SortableJS/Sortable.min.js b/plugins/SortableJS/Sortable.min.js new file mode 100644 index 000000000..95423a649 --- /dev/null +++ b/plugins/SortableJS/Sortable.min.js @@ -0,0 +1,2 @@ +/*! Sortable 1.15.6 - MIT | git://github.com/SortableJS/Sortable.git */ +!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function e(e,t){var n,o=Object.keys(e);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(e),t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),o.push.apply(o,n)),o}function I(o){for(var t=1;tt.length)&&(e=t.length);for(var n=0,o=new Array(e);n"===e[0]&&(e=e.substring(1)),t))try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return}}function g(t){return t.host&&t!==document&&t.host.nodeType?t.host:t.parentNode}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"!==e[0]||t.parentNode===n)&&f(t,e)||o&&t===n)return t}while(t!==n&&(t=g(t)))}return null}var m,v=/\s+/g;function k(t,e,n){var o;t&&e&&(t.classList?t.classList[n?"add":"remove"](e):(o=(" "+t.className+" ").replace(v," ").replace(" "+e+" "," "),t.className=(o+(n?" "+e:"")).replace(v," ")))}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];o[e=!(e in o||-1!==e.indexOf("webkit"))?"-webkit-"+e:e]=n+("string"==typeof n?"":"px")}}function b(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform")}while(o&&"none"!==o&&(n=o+" "+n),!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function D(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i=n.left-e&&i<=n.right+e,e=r>=n.top-e&&r<=n.bottom+e;return o&&e?a=t:void 0}}),a);if(e){var n,o={};for(n in t)t.hasOwnProperty(n)&&(o[n]=t[n]);o.target=o.rootEl=e,o.preventDefault=void 0,o.stopPropagation=void 0,e[K]._onDragOver(o)}}var i,r,a}function Ft(t){Z&&Z.parentNode[K]._isOutsideThisEl(t.target)}function jt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[K]=this;var n,o,i={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return kt(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==jt.supportPointer&&"PointerEvent"in window&&(!u||c),emptyInsertThreshold:5};for(n in z.initializePlugins(this,t,i),i)n in e||(e[n]=i[n]);for(o in Rt(e),this)"_"===o.charAt(0)&&"function"==typeof this[o]&&(this[o]=this[o].bind(this));this.nativeDraggable=!e.forceFallback&&It,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?h(t,"pointerdown",this._onTapStart):(h(t,"mousedown",this._onTapStart),h(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(h(t,"dragover",this),h(t,"dragenter",this)),St.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,A())}function Ht(t,e,n,o,i,r,a,l){var s,c,u=t[K],d=u.options.onMove;return!window.CustomEvent||y||w?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),c=d?d.call(u,s,a):c}function Lt(t){t.draggable=!1}function Kt(){xt=!1}function Wt(t){return setTimeout(t,0)}function zt(t){return clearTimeout(t)}jt.prototype={constructor:jt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(vt=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,Z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(!function(t){Ot.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&Ot.push(o)}}(o),!Z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled)&&!s.isContentEditable&&(this.nativeDraggable||!u||!l||"SELECT"!==l.tagName.toUpperCase())&&!((l=P(l,t.draggable,o,!1))&&l.animated||et===l)){if(it=j(l),at=j(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return V({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),U("filter",n,{evt:e}),void(i&&e.preventDefault())}else if(c=c&&c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return V({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),U("filter",n,{evt:e}),!0}))return void(i&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;n&&!Z&&n.parentNode===r&&(o=X(n),J=r,$=(Z=n).parentNode,tt=Z.nextSibling,et=n,st=a.group,ut={target:jt.dragged=Z,clientX:(e||t).clientX,clientY:(e||t).clientY},ft=ut.clientX-o.left,gt=ut.clientY-o.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,Z.style["will-change"]="all",o=function(){U("delayEnded",i,{evt:t}),jt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!s&&i.nativeDraggable&&(Z.draggable=!0),i._triggerDragStart(t,e),V({sortable:i,name:"choose",originalEvent:t}),k(Z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){D(Z,t.trim(),Lt)}),h(l,"dragover",Bt),h(l,"mousemove",Bt),h(l,"touchmove",Bt),a.supportPointer?(h(l,"pointerup",i._onDrop),this.nativeDraggable||h(l,"pointercancel",i._onDrop)):(h(l,"mouseup",i._onDrop),h(l,"touchend",i._onDrop),h(l,"touchcancel",i._onDrop)),s&&this.nativeDraggable&&(this.options.touchStartThreshold=4,Z.draggable=!0),U("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(w||y)?o():jt.eventCanceled?this._onDrop():(a.supportPointer?(h(l,"pointerup",i._disableDelayedDrag),h(l,"pointercancel",i._disableDelayedDrag)):(h(l,"mouseup",i._disableDelayedDrag),h(l,"touchend",i._disableDelayedDrag),h(l,"touchcancel",i._disableDelayedDrag)),h(l,"mousemove",i._delayedDragTouchMoveHandler),h(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&h(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)))},_delayedDragTouchMoveHandler:function(t){t=t.touches?t.touches[0]:t;Math.max(Math.abs(t.clientX-this._lastX),Math.abs(t.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){Z&&Lt(Z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;p(t,"mouseup",this._disableDelayedDrag),p(t,"touchend",this._disableDelayedDrag),p(t,"touchcancel",this._disableDelayedDrag),p(t,"pointerup",this._disableDelayedDrag),p(t,"pointercancel",this._disableDelayedDrag),p(t,"mousemove",this._delayedDragTouchMoveHandler),p(t,"touchmove",this._delayedDragTouchMoveHandler),p(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?h(document,"pointermove",this._onTouchMove):h(document,e?"touchmove":"mousemove",this._onTouchMove):(h(Z,"dragend",this),h(J,"dragstart",this._onDragStart));try{document.selection?Wt(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){var n;Dt=!1,J&&Z?(U("dragStarted",this,{evt:e}),this.nativeDraggable&&h(document,"dragover",Ft),n=this.options,t||k(Z,n.dragClass,!1),k(Z,n.ghostClass,!0),jt.active=this,t&&this._appendGhost(),V({sortable:this,name:"start",originalEvent:e})):this._nulling()},_emulateDragOver:function(){if(dt){this._lastX=dt.clientX,this._lastY=dt.clientY,Xt();for(var t=document.elementFromPoint(dt.clientX,dt.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(dt.clientX,dt.clientY))!==e;)e=t;if(Z.parentNode[K]._isOutsideThisEl(t),e)do{if(e[K])if(e[K]._onDragOver({clientX:dt.clientX,clientY:dt.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}while(e=g(t=e));Yt()}},_onTouchMove:function(t){if(ut){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=Q&&b(Q,!0),a=Q&&r&&r.a,l=Q&&r&&r.d,e=At&&wt&&E(wt),a=(i.clientX-ut.clientX+o.x)/(a||1)+(e?e[0]-Tt[0]:0)/(a||1),l=(i.clientY-ut.clientY+o.y)/(l||1)+(e?e[1]-Tt[1]:0)/(l||1);if(!jt.active&&!Dt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))E.right+10||S.clientY>x.bottom&&S.clientX>x.left:S.clientY>E.bottom+10||S.clientX>x.right&&S.clientY>x.top)||m.animated)){if(m&&(t=n,e=r,C=X(B((_=this).el,0,_.options,!0)),_=L(_.el,_.options,Q),e?t.clientX<_.left-10||t.clientYe.left+G(e)/2);return n(u>e.top+J(e)/2)}:function(){var e,t,n,o=r.children.length;for(e=0;ei)return t;if(!c&&n.top+n.height/2>u)return t}return null})();function n(e){return e?Z(t):t}}}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./classes":1,"contra/emitter":5,crossvent:6}],3:[function(e,t,n){t.exports=function(e,t){return Array.prototype.slice.call(e,t)}},{}],4:[function(e,t,n){"use strict";var o=e("ticky");t.exports=function(e,t,n){e&&o(function(){e.apply(n||null,t||[])})}},{ticky:10}],5:[function(e,t,n){"use strict";var c=e("atoa"),a=e("./debounce");t.exports=function(r,e){var i=e||{},u={};return void 0===r&&(r={}),r.on=function(e,t){return u[e]?u[e].push(t):u[e]=[t],r},r.once=function(e,t){return t._once=!0,r.on(e,t),r},r.off=function(e,t){var n=arguments.length;if(1===n)delete u[e];else if(0===n)u={};else{e=u[e];if(!e)return r;e.splice(e.indexOf(t),1)}return r},r.emit=function(){var e=c(arguments);return r.emitterSnapshot(e.shift()).apply(this,e)},r.emitterSnapshot=function(o){var e=(u[o]||[]).slice(0);return function(){var t=c(arguments),n=this||r;if("error"===o&&!1!==i.throws&&!e.length)throw 1===t.length?t[0]:t;return e.forEach(function(e){i.async?a(e,t,n):e.apply(n,t),e._once&&r.off(o,e)}),r}},r}},{"./debounce":4,atoa:3}],6:[function(n,o,e){(function(r){"use strict";var i=n("custom-event"),u=n("./eventmap"),c=r.document,e=function(e,t,n,o){return e.addEventListener(t,n,o)},t=function(e,t,n,o){return e.removeEventListener(t,n,o)},a=[];function l(e,t,n){t=function(e,t,n){var o,r;for(o=0;o -
    @@ -326,27 +325,37 @@ = 2) { ?> -
    - -
    - - Edit - -
    - - Delete - +
    +
    + +
    +
    + +
    + +
    + + Edit + +
    + + Delete + +
    +
    - + @@ -992,38 +1001,23 @@ } - + diff --git a/recurring_invoice.php b/recurring_invoice.php index a510f522e..34271cd10 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -272,26 +272,34 @@ -
    - -
    - - Edit - -
    - Delete - - +
    +
    + +
    +
    + +
    + +
    + + Edit + +
    + Delete +
    +
    - + @@ -483,39 +491,23 @@ }); - - + diff --git a/ticket.php b/ticket.php index 3b28d0f2a..7f6fbcb50 100644 --- a/ticket.php +++ b/ticket.php @@ -341,7 +341,6 @@ $ticket_collaborators = nullable_htmlentities($row['user_names']); ?> -
      @@ -940,7 +939,7 @@ class="form-control tinymceTicket" - +
      " @@ -1207,41 +1207,23 @@ class="form-control tinymceTicket" }); - - + diff --git a/tickets_kanban.php b/tickets_kanban.php index b8593bfe2..e8b4dd3d0 100644 --- a/tickets_kanban.php +++ b/tickets_kanban.php @@ -1,4 +1,3 @@ -
      name); ?>
      -
      +
      tickets as $item){ if ($item['ticket_priority'] == "High") { @@ -106,7 +105,7 @@ class="task grab-cursor" -
      - - m - - - + + m + -
      = 2) { ?> +
      +