From 0b83fffbe012e31d75ec74bc6f2620636931443d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Wed, 19 Sep 2018 07:41:28 +0800 Subject: [PATCH] * Finished task#4854 --- module/branch/view/manage.html.php | 4 ++-- module/bug/view/buildtemplates.html.php | 4 ++-- module/company/view/browse.html.php | 6 +++--- module/custom/view/set.html.php | 4 ++-- module/doc/view/alllibs.html.php | 2 +- module/doc/view/alllibsbylist.html.php | 2 +- module/doc/view/browse.html.php | 2 +- module/doc/view/browsebygrid.html.php | 2 +- module/doc/view/objectlibs.html.php | 2 +- module/doc/view/objectlibsbylist.html.php | 2 +- module/doc/view/showfiles.html.php | 4 ++-- module/doc/view/view.html.php | 2 +- module/entry/view/browse.html.php | 6 +++--- module/group/view/browse.html.php | 4 ++-- module/my/view/testtask.html.php | 2 +- module/my/view/todo.html.php | 2 +- module/product/view/build.html.php | 2 +- module/productplan/view/browse.html.php | 2 +- module/project/view/build.html.php | 2 +- module/project/view/managemembers.html.php | 8 ++++---- module/project/view/team.html.php | 4 ++-- module/project/view/testtask.html.php | 2 +- module/release/view/browse.html.php | 2 +- module/task/view/create.html.php | 2 +- module/task/view/edit.html.php | 4 ++-- module/testcase/view/create.html.php | 4 ++-- module/testcase/view/edit.html.php | 4 ++-- module/testsuite/view/browse.html.php | 2 +- module/testsuite/view/createcase.html.php | 4 ++-- module/testsuite/view/library.html.php | 6 +++--- module/testtask/view/browse.html.php | 2 +- module/todo/view/view.html.php | 2 +- module/tree/js/browse.js | 8 ++++---- module/tree/view/browse.html.php | 12 ++++++------ module/tree/view/browsetask.html.php | 12 ++++++------ module/webhook/view/browse.html.php | 2 +- 36 files changed, 68 insertions(+), 68 deletions(-) diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php index 4f2d7fba0d..f9dfd7a25d 100644 --- a/module/branch/view/manage.html.php +++ b/module/branch/view/manage.html.php @@ -29,7 +29,7 @@ - ", 'hiddenwin')?> + ", 'hiddenwin')?> @@ -39,7 +39,7 @@
- +
diff --git a/module/bug/view/buildtemplates.html.php b/module/bug/view/buildtemplates.html.php index ad5e38817f..59f831824f 100644 --- a/module/bug/view/buildtemplates.html.php +++ b/module/bug/view/buildtemplates.html.php @@ -1,11 +1,11 @@ - $template) { echo "
  • "; echo ""; if($template->public) echo "{$lang->public} "; echo $template->title . ""; - if(empty($template->public) or $template->account == $app->user->account)echo ""; + if(empty($template->public) or $template->account == $app->user->account)echo ""; echo ""; echo '
    • '; } diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index 109eee878e..455a4807c8 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ ?> -user->confirmDelete); @@ -123,11 +123,11 @@ js::set('confirmDelete', $lang->user->confirmDelete); common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list'); if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) { - echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn iframe'"); + echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn iframe'"); } else { - echo html::a('javascript:;', "", '', "class='btn disabled'"); + echo html::a('javascript:;', "", '', "class='btn disabled'"); } ?> diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 51d513e209..3cb46a3e05 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -23,7 +23,7 @@ $itemRow = << - + EOT; @@ -141,7 +141,7 @@ EOT; - + diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php index e5fc3b619a..0a483d2313 100644 --- a/module/doc/view/alllibs.html.php +++ b/module/doc/view/alllibs.html.php @@ -58,7 +58,7 @@ collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?> id&objectType=doclib");?>" title="" class='btn btn-link ajaxCollect'> id", "", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> - id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> + id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> id&type=doc", "", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?> diff --git a/module/doc/view/alllibsbylist.html.php b/module/doc/view/alllibsbylist.html.php index fcd5c50f25..46be1eb702 100644 --- a/module/doc/view/alllibsbylist.html.php +++ b/module/doc/view/alllibsbylist.html.php @@ -54,7 +54,7 @@ collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?> id&objectType=doclib");?>" title="" class='btn btn-link ajaxCollect'> id", "", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> - id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> + id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> id&type=doc", "", '', "title='{$lang->tree->manage}' class='btn btn-link'")?> diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index e1ed69b148..cc9899492e 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -126,7 +126,7 @@ var browseType = ''; id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'> id", "", '', "title='{$lang->edit}' class='btn btn-link'")?> - id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> + id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php index d3e18c7f59..e6b154e69f 100644 --- a/module/doc/view/browsebygrid.html.php +++ b/module/doc/view/browsebygrid.html.php @@ -57,7 +57,7 @@
    id}&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'> id}", "", '', "title='{$lang->edit}' class='btn btn-link'")?> - id}", "", '', "title='{$lang->delete}' class='btn btn-link'")?> + id}", "", '', "title='{$lang->delete}' class='btn btn-link'")?>
    diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php index 36155a33b8..41c57d24cd 100644 --- a/module/doc/view/objectlibs.html.php +++ b/module/doc/view/objectlibs.html.php @@ -80,7 +80,7 @@
    " title="" class='btn btn-link ajaxCollect'> ", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> - main)) common::printLink('doc', 'deleteLib', "libID=$libID", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> + main)) common::printLink('doc', 'deleteLib', "libID=$libID", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> ", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>
    diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php index 1e7768410d..9dc663cb61 100644 --- a/module/doc/view/objectlibsbylist.html.php +++ b/module/doc/view/objectlibsbylist.html.php @@ -61,7 +61,7 @@ collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?> " title="" class='btn btn-link ajaxCollect'> ", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> - main)) common::printLink('doc', 'deleteLib', "libID=$libID", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> + main)) common::printLink('doc', 'deleteLib', "libID=$libID", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> ", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?> diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php index d67ea12ed4..9c0c28b9f2 100644 --- a/module/doc/view/showfiles.html.php +++ b/module/doc/view/showfiles.html.php @@ -100,7 +100,7 @@ $imageSize = getimagesize($file->realPath); $imageWidth = $imageSize ? $imageSize[0] : 0; } - + $sessionString = $config->requestType == 'PATH_INFO' ? '?' : '&'; $sessionString .= session_name() . '=' . session_id(); $fileID = $file->id; @@ -134,7 +134,7 @@
    - id"); ?>' target='hiddenwin' title='delete?>' class='delete btn btn-link'> + id"); ?>' target='hiddenwin' title='delete?>' class='delete btn btn-link'>
    diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index 6a4e8817a5..1cab8a3403 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -88,7 +88,7 @@ id}");?>" alt="title?>"> - ", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");?> + ", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");?> files[$file->id]);?> diff --git a/module/entry/view/browse.html.php b/module/entry/view/browse.html.php index fce181238d..0aded85639 100644 --- a/module/entry/view/browse.html.php +++ b/module/entry/view/browse.html.php @@ -5,7 +5,7 @@ * @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Gang Liu - * @package entry + * @package entry * @version $Id$ * @link http://www.zentao.net */ @@ -37,13 +37,13 @@ ip;?> desc;?> - createLink('entry', 'delete', "entryID=$id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"entryList\",confirmDelete)", '', '', "title='{$lang->entry->delete}' class='btn'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"entryList\",confirmDelete)", '', '', "title='{$lang->entry->delete}' class='btn'"); } ?> diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 9e8497e1c6..044d34921c 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -55,11 +55,11 @@ if(common::hasPriv('group', 'delete') and $group->role != 'limited') { $deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '', '', "title='{$lang->group->delete}' class='btn'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '', '', "title='{$lang->group->delete}' class='btn'"); } else { - echo ""; + echo ""; } ?> diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index ffe71c1455..05b5ead832 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -63,7 +63,7 @@ if(common::hasPriv('testtask', 'delete', $task)) { $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'"); } ?> diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index d1c075096e..b53f1ca272 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -119,7 +119,7 @@ if(common::hasPriv('todo', 'delete')) { $deleteURL = $this->createLink('todo', 'delete', "todoID=$todo->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"todoList\",confirmDelete)", '', '', "class='btn' title='{$lang->todo->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"todoList\",confirmDelete)", '', '', "class='btn' title='{$lang->todo->delete}'"); } ?> diff --git a/module/product/view/build.html.php b/module/product/view/build.html.php index 9c77f5a3ed..99cd166262 100644 --- a/module/product/view/build.html.php +++ b/module/product/view/build.html.php @@ -60,7 +60,7 @@ if(common::hasPriv('build', 'delete')) { $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '', '', "class='btn' title='{$lang->build->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '', '', "class='btn' title='{$lang->build->delete}'"); } ?> diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 1688f0fe08..aec838d423 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -99,7 +99,7 @@ if(common::hasPriv('productplan', 'delete', $plan)) { $deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"productplanList\",confirmDelete)", '', '', "class='btn btn-icon' title='{$lang->productplan->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"productplanList\",confirmDelete)", '', '', "class='btn btn-icon' title='{$lang->productplan->delete}'"); } ?> diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index 2b95cc8255..5419737419 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -88,7 +88,7 @@ if(common::hasPriv('build', 'delete', $build)) { $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '', '', "class='btn' title='{$lang->build->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '', '', "class='btn' title='{$lang->build->delete}'"); } ?> diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index 45652db69a..781da07c51 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -76,7 +76,7 @@ team->limitedList, 'no');?> - + @@ -95,7 +95,7 @@ team->limitedList, 'no');?> - + @@ -114,7 +114,7 @@ team->limitedList, 'no');?> - + @@ -139,7 +139,7 @@ team->limitedList, $member->realname ? $member->limited : 'no');?> - + diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 4bd399692f..6d1fbcc580 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -61,7 +61,7 @@ - account", $member->realname)) print $member->realname; $memberHours = $member->days * $member->hours; $totalHours += $memberHours; @@ -78,7 +78,7 @@ if (common::hasPriv('project', 'unlinkMember', $member)) { $unlinkURL = $this->createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='btn' title='{$lang->project->unlinkMember}'"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='btn' title='{$lang->project->unlinkMember}'"); } ?> diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index a632dd35b2..806234617d 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -106,7 +106,7 @@ if(common::hasPriv('testtask', 'delete', $task)) { $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='btn' title='{$lang->testtask->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='btn' title='{$lang->testtask->delete}'"); } ?> diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 10caf0919e..44db360497 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -78,7 +78,7 @@ if(common::hasPriv('release', 'delete', $release)) { $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '', '', "class='btn' title='{$lang->release->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '', '', "class='btn' title='{$lang->release->delete}'"); } ?> diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 4ab7fa69b7..f04d952eea 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -194,7 +194,7 @@ - + diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 6ff6973c89..daa18c8c67 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -238,7 +238,7 @@ - + @@ -257,7 +257,7 @@ - + diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index d8a9f6f333..be05db82cf 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -167,7 +167,7 @@
    - +
    @@ -193,7 +193,7 @@
    - +
    diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index f7e8428ffb..d7e61f2974 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -78,7 +78,7 @@
    - +
    @@ -104,7 +104,7 @@
    - +
    diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php index fd1dc49a33..50deb44d4d 100644 --- a/module/testsuite/view/browse.html.php +++ b/module/testsuite/view/browse.html.php @@ -70,7 +70,7 @@ if(common::hasPriv('testsuite', 'delete', $suite)) { $deleteURL = $this->createLink('testsuite', 'delete', "suiteID=$suite->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"suiteList\",confirmDelete)", '', '', "title='{$lang->testsuite->delete}' class='btn'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"suiteList\",confirmDelete)", '', '', "title='{$lang->testsuite->delete}' class='btn'"); } ?> diff --git a/module/testsuite/view/createcase.html.php b/module/testsuite/view/createcase.html.php index c86a06a4e8..1cf10c239a 100644 --- a/module/testsuite/view/createcase.html.php +++ b/module/testsuite/view/createcase.html.php @@ -140,7 +140,7 @@
    - +
    @@ -170,7 +170,7 @@
    - +
    diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php index 51e26dd227..e2407361c4 100644 --- a/module/testsuite/view/library.html.php +++ b/module/testsuite/view/library.html.php @@ -45,10 +45,10 @@ js::set('flow', $config->global->flow); testcase->bySearch;?> " . $this->lang->testsuite->view, '', "class='btn btn-link'"); - } + } ?>
    @@ -146,7 +146,7 @@ js::set('flow', $config->global->flow); if(common::hasPriv('testcase', 'delete')) { $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "title='{$lang->testcase->delete}' class='btn'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "title='{$lang->testcase->delete}' class='btn'"); } ?> diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index 09342886a1..e3a5f0038c 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -107,7 +107,7 @@ $status = $this->session->testTaskVersionStatus; if(common::hasPriv('testtask', 'delete', $task)) { $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'"); } ?> diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index b5f534e11d..2f9d4295ba 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -126,7 +126,7 @@ if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'"); if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'"); common::printLink('todo', 'edit', "todoID=$todo->id", "", '', "title='{$lang->todo->edit}' class='btn showinonlybody'"); - common::printLink('todo', 'delete', "todoID=$todo->id", "", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'"); + common::printLink('todo', 'delete', "todoID=$todo->id", "", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'"); echo html::a('#commentModal', '', '', "title='{$lang->comment}' data-toggle='modal' class='btn'"); diff --git a/module/tree/js/browse.js b/module/tree/js/browse.js index a581c7bbed..5738cfee20 100644 --- a/module/tree/js/browse.js +++ b/module/tree/js/browse.js @@ -9,7 +9,7 @@ function syncModule(rootID, type) if(modules.length == 0) return false; $('.helplink').addClass('hidden'); - var $inputgroup = $('
    ').append($('.col-actions .icon-trash:first').closest('.table-row').clone()).html(); + var $inputgroup = $('
    ').append($('.col-actions .icon-close:first').closest('.table-row').clone()).html(); $.each(modules, function(key, module) { @@ -19,7 +19,7 @@ function syncModule(rootID, type) if(moduleName == module.name) modules[key] = null; if(!moduleName) $(this).closest('#sonModule > .table-row').not('.copy').remove(); }) - }); + }); $.each(modules, function(key, module) { @@ -54,9 +54,9 @@ function syncProductOrProject(obj, type) $('.helplink').addClass('hidden'); $('#' + type + 'Module').empty(); $.each(modules, function(key, value) - { + { $('#' + type + 'Module').append('
    - +
    @@ -130,7 +130,7 @@
    tree->short}' autocomplete='off'");?>
    - +
    @@ -147,7 +147,7 @@ - + @@ -163,7 +163,7 @@ $(function() { initialState: 'preserve', data: data, - sortable: + sortable: { lazy: true, nested: true, @@ -269,8 +269,8 @@ $(function() if(window.config.viewType == 'line') $('#modulemenu > .nav > li > a[href*=product][href*=all]').parent('li[data-id=all]').addClass('active'); }); - - +
    tree->name}'")?>
    tree->short}'")?>
    - +
    branch);?>
    @@ -98,7 +98,7 @@
    tree->short}'");?>
    - +
    branch);?> @@ -108,12 +108,12 @@ - session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList, '', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide'); echo html::hidden('parentModuleID', $currentModuleID); echo html::hidden('maxOrder', $maxOrder); - ?> + ?> @@ -147,7 +147,7 @@ $(function() if(item.nodeType) $li.addClass('tree-item-' + item.nodeType); return true; }, - actions: + actions: { sort: { diff --git a/module/webhook/view/browse.html.php b/module/webhook/view/browse.html.php index 508378752e..d15f6d307d 100644 --- a/module/webhook/view/browse.html.php +++ b/module/webhook/view/browse.html.php @@ -39,7 +39,7 @@ if(common::hasPriv('webhook', 'delete')) { $deleteURL = $this->createLink('webhook', 'delete', "webhookID=$id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '', '', "title='{$lang->webhook->delete}' class='btn'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '', '', "title='{$lang->webhook->delete}' class='btn'"); } ?>