diff --git a/module/dept/css/browse.css b/module/dept/css/browse.css index 325275d19f..42caddf002 100644 --- a/module/dept/css/browse.css +++ b/module/dept/css/browse.css @@ -7,3 +7,4 @@ #addChildModal form > .form-control {margin-bottom: 8px;} #addChildModal .modal-dialog {max-width: 360px;} +#deptTree li {padding-left: 20px;} diff --git a/module/dept/model.php b/module/dept/model.php index 8c577fc42e..1db08e49d8 100644 --- a/module/dept/model.php +++ b/module/dept/model.php @@ -147,7 +147,7 @@ class deptModel extends model $deptMenu[$dept->parent] .= "\n"; } - $lastMenu = "\n"; + $lastMenu = "\n"; return $lastMenu; } diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php index 6babe903c2..3e43eb538b 100644 --- a/module/dept/view/browse.html.php +++ b/module/dept/view/browse.html.php @@ -23,7 +23,7 @@
- +
@@ -85,10 +85,19 @@ $(function() name: 'deptTree', initialState: 'preserve', data: data, + sortable: + { + lazy: true, + nested: true, + canMoveHere: function($ele, $target) + { + if($ele && $target && $ele.parent().closest('li').attr('data-id') !== $target.parent().closest('li').attr('data-id')) return false; + } + }, itemCreator: function($li, item) { var link = item.id !== undefined ? ('' + item.name + '') : ('' + item.name + ''); - var $toggle = $('' + link + ''); + var $toggle = $('' + link + ''); if(item.manager) { $toggle.append('  ' + item.managerName + ''); @@ -101,19 +110,19 @@ $(function() sort: { title: 'dept->dragAndSort ?>', - template: 'sort;?>' + template: 'sort;?>' }, edit: { linkTemplate: '', title: 'dept->edit ?>', - template: 'edit?>' + template: 'edit?>' }, "delete": { linkTemplate: '', title: 'dept->delete ?>', - template: 'delete?>' + template: 'delete?>' } }, action: function(event) @@ -163,8 +172,6 @@ $(function() $(this).addClass('hover'); e.stopPropagation(); }); - - $tree.find('[data-toggle="tooltip"]').tooltip(); }); diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 83b1569f42..21a162750f 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -186,8 +186,8 @@ $(function() { sort: { - title: 'tree->dragAndSort ?>', - template: 'tree->sort ?>' + title: 'tree->dragAndSort ?>', + template: 'tree->sort ?>' }, edit: { diff --git a/www/js/zui/min.js b/www/js/zui/min.js index e957ccfa34..4ebd5d4571 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -75,4 +75,4 @@ if(!t.fn.droppable)return void console.error("Sortable requires droppable.js");v * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ */ function(t){function e(e){if("string"==typeof e.data){var i=e.handler,n=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var s="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],o=String.fromCharCode(e.which).toLowerCase(),a="",r={};e.altKey&&"alt"!==s&&(a+="alt+"),e.ctrlKey&&"ctrl"!==s&&(a+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==s&&(a+="meta+"),e.shiftKey&&"shift"!==s&&(a+="shift+"),s?r[a+s]=!0:(r[a+o]=!0,r[a+t.hotkeys.shiftNums[o]]=!0,"shift+"===a&&(r[t.hotkeys.shiftNums[o]]=!0));for(var l=0,h=n.length;l","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var n;return t.isArray(e)&&(n={},t.each(e,function(e,i){t.isPlainObject(i)?n[i.action]=i:n[i]=!0}),e=n),t.isPlainObject(e)&&(n={},t.each(e,function(e,i){i?n[e]=t.extend({type:e},a[e],t.isPlainObject(i)?i:null):n[e]=!1}),e=n),i?t.extend(!0,{},i,e):e}function i(e,i,n){return i=i||e.type,t(n||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var n="zui.tree",s=0,o=function(e,i){this.name=n,this.$=t(e),this.getOptions(i),this._init()},a={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};o.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},o.prototype.add=function(e,i,n,s,o){var a,r=t(e),l=this.options;if(r.is("li")?(a=r.children("ul"),a.length||(a=t("