From 88b05952904c74fb85d410138e13236852b4be23 Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 17 Nov 2016 17:32:10 +0800 Subject: [PATCH] * finish task #2734. --- module/tree/lang/en.php | 1 + module/tree/lang/zh-cn.php | 1 + module/tree/view/browse.html.php | 21 ++++++++++++++----- module/tree/view/browsetask.html.php | 21 ++++++++++++++----- module/tree/view/edit.html.php | 12 +++++------ www/js/my.full.js | 30 ++++++++++++++-------------- www/theme/default/style.css | 3 +-- 7 files changed, 55 insertions(+), 34 deletions(-) diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 0e4d8ba40e..c404dd1d86 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -30,6 +30,7 @@ $lang->tree->manageCaseChild = 'Manage Child Case'; $lang->tree->manageTaskChild = "Manage Child {$lang->projectCommon}"; $lang->tree->syncFromProduct = 'Copy'; $lang->tree->dragAndSort = "Drag and Sort"; +$lang->tree->sort = "Sort"; $lang->tree->addChild = "Add Child Module"; $lang->tree->confirmDelete = 'Do you want to delete this Module and its Child?'; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 19fb34a941..b3cb05d130 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -30,6 +30,7 @@ $lang->tree->manageCaseChild = '维护用例子模块'; $lang->tree->manageTaskChild = "维护{$lang->projectCommon}子模块"; $lang->tree->syncFromProduct = '复制'; $lang->tree->dragAndSort = "拖放排序"; +$lang->tree->sort = "排序"; $lang->tree->addChild = "增加子模块"; $lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？'; diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index f0ed70b033..c10aac7413 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -125,7 +125,7 @@ $(function() data: data, itemCreator: function($li, item) { - var link = item.id !== undefined ? ('' + item.name + '') : ('' + item.name + ''); + var link = item.id !== undefined ? ('' + item.name + '') : ('' + item.name + ''); var $toggle = $('' + link + ''); if(item.type === 'bug') $toggle.append('  [B]'); if(item.type === 'case') $toggle.append('  [C]'); @@ -138,19 +138,25 @@ $(function() sort: { title: 'tree->dragAndSort ?>', - template: '' + template: 'tree->sort ?>' }, edit: { linkTemplate: '', title: 'tree->edit ?>', - template: 'edit?>' + template: 'edit?>' }, "delete": { linkTemplate: '', title: 'tree->delete ?>', - template: 'delete?>' + template: 'delete?>' + }, + subModules: + { + linkTemplate: '', + title: 'tree->child ?>', + template: 'tree->child?>' } }, action: function(event) @@ -161,7 +167,8 @@ $(function() $target.modalTrigger( { type: 'ajax', - url: action.linkTemplate.format(item.id) + url: action.linkTemplate.format(item.id), + keyboard: true }).trigger('click'); } else if(action.type === 'delete') @@ -182,6 +189,10 @@ $(function() bootbox.alert(lang.timeout); }); } + else if(action.type === 'subModules') + { + window.location.href = action.linkTemplate.format(item.id, item.branch); + } } }; diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php index b49a1abf6b..b870129e66 100644 --- a/module/tree/view/browsetask.html.php +++ b/module/tree/view/browsetask.html.php @@ -114,7 +114,7 @@ $(function() var title = (item.type === 'product' ? ' ' : '') + item.name; - var link = item.id !== undefined ? ('' + title + '') : ('' + title + ''); + var link = item.id !== undefined ? ('' + title + '') : ('' + title + ''); var $toggle = $('' + link + ''); if(item.type === 'task') { @@ -131,19 +131,25 @@ $(function() sort: { title: 'tree->dragAndSort ?>', - template: '' + template: 'tree->sort ?>' }, edit: { linkTemplate: '', title: 'tree->edit ?>', - template: 'edit?>' + template: 'edit?>' }, "delete": { linkTemplate: '', title: 'tree->delete ?>', - template: 'delete?>' + template: 'delete?>' + }, + subModules: + { + linkTemplate: '', + title: 'tree->child ?>', + template: 'tree->child?>' } }, action: function(event) @@ -154,7 +160,8 @@ $(function() $target.modalTrigger( { type: 'ajax', - url: action.linkTemplate.format(item.id) + url: action.linkTemplate.format(item.id), + keyboard: true }).trigger('click'); } else if(action.type === 'delete') @@ -179,6 +186,10 @@ $(function() bootbox.alert(lang.timeout); }); } + else if(action.type === 'subModules') + { + window.location.href = action.linkTemplate.format(item.id, item.branch); + } } }; diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index 2c61975451..82b8684957 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -14,15 +14,13 @@ $webRoot = $this->app->getWebRoot(); $jsRoot = $webRoot . "js/"; ?> - +
+
+ +

tree->edit;?>

+
-
-
- icons['tree']);?> - icons['edit']);?> tree->edit;?> -
-
diff --git a/www/js/my.full.js b/www/js/my.full.js index 9cdcb668be..51a2900be7 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -992,15 +992,11 @@ function setModal() var options = $.extend( { url: url, - width: 800, - height: 'auto', - icon: '?', title: $e.attr('title') || $e.text(), - name: 'modalIframe', cssClass: $e.data('class'), - headerless: false, + icon: '?', center: true - }, $e.data()); + }, setting, $e.data()); if(options.icon == '?') { @@ -1008,19 +1004,23 @@ function setModal() options.icon = i.length ? i.attr('class').substring(5) : 'file-text'; } - showIframeModal($.extend(options, setting)); + showIframeModal(options); } else { initModalFrame(); $.get(url, function(data) { - var options = + var options = $.extend( { - width: $e.data('width') || 800, - icon: $e.data('icon') || '?', - title: $e.data('title') || $e.attr('title') || $e.text(), - }; + width: 800, + title: $e.attr('title') || $e.text(), + icon: '?', + backdrop: 'static', + keyboard: false, + show: true + }, setting, $e.data()); + var ajaxModal = $('#ajaxModal'); if(data.indexOf('modal-dialog') < 0) { @@ -1035,8 +1035,7 @@ function setModal() $ajaxModal.data('width', modalWidth).find('.modal-dialog').css('width', modalWidth); ajustModalPosition(); } - - ajaxModal.modal($.extend({backdrop: 'static', keyboard: false, show: true}, options)); + ajaxModal.modal(options); }); } @@ -1065,7 +1064,7 @@ function setModal() backdrop: 'static', keyboard: false, show: true - } + }; if(typeof(settings) == 'string') { @@ -1121,6 +1120,7 @@ function setModal() } showModal(options, modal, modalBody, dialog); } + console.log('iframe modal options', options); modal.modal(options); } diff --git a/www/theme/default/style.css b/www/theme/default/style.css index d7155fea45..3ac39f76cb 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -360,7 +360,7 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin /* === Layout === */ /* Background */ -body {font-size: 13px; color:#141414;padding-bottom: 40px;} +body {color:#141414; padding-bottom: 40px;} /* Header */ #header {padding: 12px 20px 0; background:#003366;} @@ -679,7 +679,6 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} /* Tree menu. */ .tree li:before {width: 8px; height: 8px; background: #f1f1f1; border: 1px solid #ccc; border-radius: 2px; top: 7px;left: 6px;} -.tree-lines ul>li:after {width: 15px} .tree-lines li > a.active{font-weight: bold;} /* Select all and select reverse. */