* Finish task #84582.

module/project/lang/de.php

@@ -272,6 +272,7 @@ $lang->project->modelList['scrum']     = "Scrum";
 if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 $lang->project->modelList['agileplus'] = "Agile +";
+if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfallplus'] = "Waterfall +";
 
 $lang->project->featureBar['browse']['all']       = 'All';
 $lang->project->featureBar['browse']['undone']    = 'Unfinished';
@@ -325,10 +326,11 @@ $lang->project->endList[186] = 'Half year';
 $lang->project->endList[365] = 'One year';
 $lang->project->endList[999] = 'Longtime';
 
-$lang->project->scrumTitle     = 'Agile Development Management';
-$lang->project->waterfallTitle = 'CMMI';
-$lang->project->kanbanTitle    = 'Kanban Project Management';
-$lang->project->agileplusTitle = 'Integrating Agile and Kanban Project Management';
+$lang->project->scrumTitle         = 'Agile Development Management';
+$lang->project->waterfallTitle     = 'CMMI';
+$lang->project->kanbanTitle        = 'Kanban Project Management';
+$lang->project->agileplusTitle     = 'Agile + Kanban Project Management';
+$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management';
 
 $lang->project->empty                  = 'No project.';
 $lang->project->nextStep               = 'Next step';
@@ -340,6 +342,7 @@ $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = 'CMMI';
 $lang->project->agileplus              = 'Agile +';
+$lang->project->waterfallplus          = 'Waterfall +';
 $lang->project->cannotCreateChild      = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
 $lang->project->emptyPM                = 'No manager';
 $lang->project->emptyBranch            = 'Branch can not be empty!';

module/project/lang/en.php

@@ -272,6 +272,7 @@ $lang->project->modelList['scrum']     = "Scrum";
 if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 $lang->project->modelList['agileplus'] = "Agile +";
+if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfallplus'] = "Waterfall +";
 
 $lang->project->featureBar['browse']['all']       = 'All';
 $lang->project->featureBar['browse']['undone']    = 'Unfinished';
@@ -325,10 +326,11 @@ $lang->project->endList[186] = 'Half year';
 $lang->project->endList[365] = 'One year';
 $lang->project->endList[999] = 'Longtime';
 
-$lang->project->scrumTitle     = 'Agile Development Management';
-$lang->project->waterfallTitle = 'Waterfall Project Management';
-$lang->project->kanbanTitle    = 'Kanban Project Management';
-$lang->project->agileplusTitle = 'Integrating Agile and Kanban Project Management';
+$lang->project->scrumTitle         = 'Agile Development Management';
+$lang->project->waterfallTitle     = 'Waterfall Project Management';
+$lang->project->kanbanTitle        = 'Kanban Project Management';
+$lang->project->agileplusTitle     = 'Agile + Kanban Project Management';
+$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management';
 
 $lang->project->empty                  = 'No project.';
 $lang->project->nextStep               = 'Next step';
@@ -340,6 +342,7 @@ $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = 'Waterfall';
 $lang->project->agileplus              = 'Agile +';
+$lang->project->waterfallplus          = 'Waterfall +';
 $lang->project->cannotCreateChild      = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
 $lang->project->emptyPM                = 'No manager';
 $lang->project->emptyBranch            = 'Branch can not be empty!';

module/project/lang/fr.php

@@ -272,6 +272,7 @@ $lang->project->modelList['scrum']     = "Scrum";
 if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "CMMI";
 $lang->project->modelList['kanban']    = "Kanban";
 $lang->project->modelList['agileplus'] = "Agile +";
+if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfallplus'] = "Waterfall +";
 
 $lang->project->featureBar['browse']['all']       = 'All';
 $lang->project->featureBar['browse']['undone']    = 'Non Terminées';
@@ -325,10 +326,11 @@ $lang->project->endList[186] = 'Half year';
 $lang->project->endList[365] = 'One year';
 $lang->project->endList[999] = 'Longtime';
 
-$lang->project->scrumTitle     = 'Agile Development Management';
-$lang->project->waterfallTitle = 'Waterfall Project Management';
-$lang->project->kanbanTitle    = 'Kanban Project Management';
-$lang->project->agileplusTitle = 'Integrating Agile and Kanban Project Management';
+$lang->project->scrumTitle         = 'Agile Development Management';
+$lang->project->waterfallTitle     = 'Waterfall Project Management';
+$lang->project->kanbanTitle        = 'Kanban Project Management';
+$lang->project->agileplusTitle     = 'Agile + Kanban Project Management';
+$lang->project->waterfallplusTitle = 'Waterfall + Agile + Kanban Project Management';
 
 $lang->project->empty                  = 'No project.';
 $lang->project->nextStep               = 'Next step';
@@ -340,6 +342,7 @@ $lang->project->ongoingStage           = 'Ongoing stage';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = 'CMMI';
 $lang->project->agileplus              = 'Agile +';
+$lang->project->waterfallplus          = 'Waterfall +';
 $lang->project->cannotCreateChild      = 'It is not empty, so you cannot add a child. You can add a parent for it, and then create a child.';
 $lang->project->emptyPM                = 'No manager';
 $lang->project->emptyBranch            = 'Branch can not be empty!';

module/project/lang/zh-cn.php

@@ -272,6 +272,7 @@ $lang->project->modelList['scrum']       = "Scrum";
 if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfall'] = "瀑布";
 $lang->project->modelList['kanban']      = "看板";
 $lang->project->modelList['agileplus']   = "融合敏捷";
+if(helper::hasFeature('waterfall')) $lang->project->modelList['waterfallplus'] = "融合瀑布";
 
 $lang->project->featureBar['browse']['all']       = '全部';
 $lang->project->featureBar['browse']['undone']    = '未完成';
@@ -325,10 +326,11 @@ $lang->project->endList[186] = '半年';
 $lang->project->endList[365] = '一年';
 $lang->project->endList[999] = '长期';
 
-$lang->project->scrumTitle       = '敏捷开发全流程项目管理';
-$lang->project->waterfallTitle   = '瀑布式项目管理';
-$lang->project->kanbanTitle      = '专业研发看板项目管理';
-$lang->project->agileplusTitle   = '融合敏捷开发与看板项目管理';
+$lang->project->scrumTitle         = '敏捷开发全流程项目管理';
+$lang->project->waterfallTitle     = '瀑布式项目管理';
+$lang->project->kanbanTitle        = '专业研发看板项目管理';
+$lang->project->agileplusTitle     = '敏捷+看板项目管理';
+$lang->project->waterfallplusTitle = '瀑布+敏捷+看板项目管理';
 
 $lang->project->empty                  = '暂时没有项目';
 $lang->project->nextStep               = '下一步';
@@ -340,6 +342,7 @@ $lang->project->ongoingStage           = '进行中的阶段';
 $lang->project->scrum                  = 'Scrum';
 $lang->project->waterfall              = '瀑布';
 $lang->project->agileplus              = '融合敏捷';
+$lang->project->waterfallplus          = '融合瀑布';
 $lang->project->cannotCreateChild      = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
 $lang->project->emptyPM                = '暂无';
 $lang->project->emptyBranch            = '分支不能为空！';

module/project/view/createguide.html.php

@@ -5,16 +5,18 @@
 <?php endif;?>
 <div class='modal-dialog' id='guideDialog'>
   <style>
-  #guideDialog {width: 780px}
-  #guideDialog h2 {margin: 10px 0 30px 0; font-size: 16px; font-weight: normal}
-  #guideDialog h3 {margin: 5px 0; font-size: 20px;}
+  #guideDialog {width: 600px}
+  #guideDialog .row {margin-left: 0px;margin-right: 0px;}
+  #guideDialog h2 {margin: 0px 0 20px 0; font-size: 16px; font-weight: normal}
+  #guideDialog h3 {margin: 5px 0; font-size: 15px;}
+  #guideDialog p {font-size: 13px;}
   #guideDialog .modal-footer {border-top: none; text-align: center; padding-top: 10px; padding-bottom: 40px;}
   #guideDialog .modal-footer .btn + .btn {margin-left: 20px}
-  #guideDialog .project-type {padding: 0 40px}
-  #guideDialog .project-type-img {width: 280px; border: 1px solid #CBD0DB; border-radius: 2px; margin-bottom: 10px; cursor: pointer; margin-top: 1px}
+  #guideDialog .project-type {padding: 0 5px}
+  #guideDialog .project-type-img {width: 280px; border: 1px solid #CBD0DB; border-radius: 4px; margin-bottom: 10px; cursor: pointer; margin-top: 1px}
   #guideDialog .project-type-img:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,0,.25);}
   #guideDialog .project-type.active img {border-color: #006AF1; border-width: 2px; margin-top: 0}
-  .col {width: 50%}
+  #guideDialog .col:nth-child(-n+3) {margin-bottom: 15px;}
   </style>
   <div class='modal-content'>
     <div class='modal-body'>
@@ -51,11 +53,18 @@
         </div>
         <div class='col col-xs-4'>
           <div class='project-type text-center'>
-            <?php echo html::a($this->createLink("project", "create", "model=agileplus&programID=$programID&copyProjectID=0&extra=productID=$productID,branchID=$branchID"), "<img class='project-type-img' data-type='kanban' src='{$config->webRoot}theme/default/images/main/kanban.png'>", '', "data-app='{$tab}' class='createButton'")?>
+            <?php echo html::a($this->createLink("project", "create", "model=agileplus&programID=$programID&copyProjectID=0&extra=productID=$productID,branchID=$branchID"), "<img class='project-type-img' data-type='kanban' src='{$config->webRoot}theme/default/images/main/agileplus.png'>", '', "data-app='{$tab}' class='createButton'")?>
             <h3><?php echo $lang->project->agileplus;?></h3>
             <p><?php echo $lang->project->agileplusTitle;?></p>
           </div>
         </div>
+        <div class='col col-xs-4'>
+          <div class='project-type text-center'>
+            <?php echo html::a($this->createLink("project", "create", "model=waterfallplus&programID=$programID&copyProjectID=0&extra=productID=$productID,branchID=$branchID"), "<img class='project-type-img' data-type='kanban' src='{$config->webRoot}theme/default/images/main/waterfallplus.png'>", '', "data-app='{$tab}' class='createButton'")?>
+            <h3><?php echo $lang->project->waterfallplus;?></h3>
+            <p><?php echo $lang->project->waterfallplusTitle;?></p>
+          </div>
+        </div>
       </div>
     </div>
   </div>