diff --git a/module/execution/css/batchedit.css b/module/execution/css/batchedit.css index 6051595822..5fb6ae17e4 100644 --- a/module/execution/css/batchedit.css +++ b/module/execution/css/batchedit.css @@ -2,3 +2,5 @@ .c-team-name {width: 120px;} .c-project, .c-user, .c-code, .c-desc, .c-days {width: 150px;} .c-method {width: 45px;} +.c-type > .icon-help {vertical-align: text-top;} +.c-type > .popover .popover-content {font-weight: 400;} diff --git a/module/execution/css/batchedit.en.css b/module/execution/css/batchedit.en.css index 1bc7227968..d4858d89b7 100644 --- a/module/execution/css/batchedit.en.css +++ b/module/execution/css/batchedit.en.css @@ -1,3 +1,4 @@ .c-user {width: 150px !important;} .c-date {width: 125px;} .c-method {width: 60px;} +.c-type {width: 130px;} diff --git a/module/execution/js/batchedit.js b/module/execution/js/batchedit.js index db84c6b085..603122e2bd 100644 --- a/module/execution/js/batchedit.js +++ b/module/execution/js/batchedit.js @@ -27,3 +27,8 @@ $('#executionForm').on('change input mousedown', '.has-error', function() $(this).parent().find('.text-danger').remove(); $(this).removeClass('has-error'); }) + +$(function() +{ + $('[data-toggle="popover"]').popover(); +}) diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js index 5527fd5b0b..58f5d31712 100644 --- a/module/execution/js/edit.js +++ b/module/execution/js/edit.js @@ -112,6 +112,8 @@ $(function() { $('.disabledBranch div[id^="branch"]').addClass('chosen-disabled'); } + + $('[data-toggle="popover"]').popover(); }) var lastProjectID = $("#project").val(); diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 2d31401b68..aacc1a5dba 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -152,7 +152,7 @@ $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; $lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; -$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; +$lang->execution->typeTip = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent."; $lang->execution->start = 'Start'; $lang->execution->activate = 'Aktivieren'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 420b5ea621..d8f522124d 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -152,7 +152,7 @@ $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; $lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; -$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; +$lang->execution->typeTip = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent."; $lang->execution->start = 'Start'; $lang->execution->activate = 'Activate'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index b9810ac1a4..46f9661aa7 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -152,7 +152,7 @@ $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; $lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; -$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; +$lang->execution->typeTip = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent."; $lang->execution->start = 'Démarrer'; $lang->execution->activate = 'Activer'; diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php index 5b95828e0f..d78ab1d11f 100755 --- a/module/execution/view/batchedit.html.php +++ b/module/execution/view/batchedit.html.php @@ -62,7 +62,10 @@ '>execution->PO;?> '>execution->QD;?> '>execution->RD;?> - '>execution->$type;?> + '> + execution->$type;?> + + execution->begin;?> execution->end;?> '>execution->$desc;?> diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index 6ade126e6e..d5d43fe019 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -98,6 +98,9 @@ } ?> + + + diff --git a/module/programplan/js/edit.js b/module/programplan/js/edit.js index c8854adfdc..e552fb8cc9 100644 --- a/module/programplan/js/edit.js +++ b/module/programplan/js/edit.js @@ -57,4 +57,6 @@ $(function() if(!result) return false; } }) + + $('[data-toggle="popover"]').popover(); }) diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php index ad7e3c569e..634d17b3d4 100644 --- a/module/programplan/view/edit.html.php +++ b/module/programplan/view/edit.html.php @@ -60,6 +60,9 @@ stage->typeList, $plan->attribute, "class='form-control'") : zget($lang->stage->typeList, $plan->attribute);?> + + + setMilestone):?>