* finish task #69706

This commit is contained in:
lanzongjun
2022-09-20 15:38:00 +08:00
parent 429a08cb1a
commit d3cec62717
12 changed files with 226 additions and 204 deletions
+2 -1
View File
@@ -216,7 +216,8 @@ class install extends control
else
{
$this->app->loadLang('upgrade');
$this->view->title = $this->lang->install->selectMode;
$this->view->edition = $this->config->edition;
$this->view->title = $this->lang->install->selectMode;
$this->display();
}
}
+75 -69
View File
@@ -42,75 +42,81 @@
</tr>
</thead>
<tbody>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->usage;?></td>
<td colspan='2'><?php echo $this->lang->upgrade->leanUsage;?></td>
<td colspan='2'><?php echo $this->lang->upgrade->newUsage;?></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->program;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->productRR;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->productUR;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->productLine;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->projectScrum;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->scrumDetail;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->projectWaterfull;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->projectKanban;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->execution;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->assetlib;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->oa;?></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-2x icon-check"></i></td>
</tr>
<tr>
<td colspan='2' style="font-weight:bold;"><?php echo $this->lang->upgrade->selectUsage;?></td>
<td colspan='2' class="text-center"><button class="btn" type="button" id='useLean'><?php echo $this->lang->upgrade->useLean;?></button></td>
<td colspan='2' class="text-center"><button class="btn" type="button" id='useNew'><?php echo $this->lang->upgrade->useNew;?></button></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->remark;?></td>
<td colspan='4' class="text-center"><?php echo $this->lang->upgrade->remarkDesc;?></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->usage;?></td>
<td colspan='2' class="text-center"><?php echo $this->lang->upgrade->leanUsage;?></td>
<td colspan='2' class="text-center"><?php echo $this->lang->upgrade->newUsage;?></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->program;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->productRR;?></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->productUR;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->productLine;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->projectScrum;?></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php if($edition == 'max'):?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->scrumDetail;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php endif;?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->projectWaterfall;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->projectKanban;?></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->execution;?></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php if($edition == 'max'):?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->assetlib;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php endif;?>
<?php if($edition == 'biz' or $edition == 'max'):?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->oa;?></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php endif;?>
<tr>
<td colspan='2' style="font-weight:bold;font-size:14px;"><?php echo $this->lang->upgrade->selectUsage;?></td>
<td colspan='2' class="text-center"><button class="btn" type="button" id='useLean'><?php echo $this->lang->upgrade->useLean;?></button></td>
<td colspan='2' class="text-center"><button class="btn" type="button" id='useNew'><?php echo $this->lang->upgrade->useNew;?></button></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->remark;?></td>
<td colspan='4'><?php echo $this->lang->upgrade->remarkDesc;?></td>
</tr>
</tbody>
<?php echo html::hidden('mode','')?>
</table>
+8 -49
View File
@@ -187,54 +187,6 @@ class upgrade extends control
$this->display();
}
/**
* Guide to 15 version.
*
* @param string $fromVersion
* @access public
* @return void
*/
public function to15Guide($fromVersion)
{
if($_POST)
{
$mode = fixer::input('post')->get('mode');
$this->loadModel('setting')->setItem('system.common.global.mode', $mode);
/* Update sprint concept. */
$sprintConcept = 0;
if(isset($this->config->custom->sprintConcept))
{
if($this->config->custom->sprintConcept == 2 and $mode == 'new') $sprintConcept = 1;
}
elseif(isset($this->config->custom->productProject))
{
list($productConcept, $projectConcept) = explode('_', $this->config->custom->productProject);
if($mode == 'classic') $sprintConcept = $projectConcept;
if($mode == 'new' and $projectConcept == 2) $sprintConcept = 1;
}
$this->setting->setItem('system.custom.sprintConcept', $sprintConcept);
if($mode == 'classic') $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
if($mode == 'new') $this->locate(inlink('mergeTips'));
}
$title = $this->lang->upgrade->toPMS15Guide;
if($this->config->edition == 'max')
{
$this->lang->upgrade->to15Desc = str_replace('15.0', $this->lang->maxName, $this->lang->upgrade->to15Desc);
$title = $this->lang->upgrade->toMAXGuide;
}
elseif($this->config->edition == 'biz')
{
$this->lang->upgrade->to15Desc = str_replace('15', $this->lang->bizName . '5', $this->lang->upgrade->to15Desc);
$title = $this->lang->upgrade->toBIZ5Guide;
}
$this->view->title = $title;
$this->display();
}
/**
* Guide to 18 version.
*
@@ -278,7 +230,14 @@ class upgrade extends control
if($mode == 'new') $this->locate(inlink('selectMergeMode', "fromVersion=$fromVersion&mode=new"));
}
$this->view->title = $this->lang->upgrade->selectMode;
$checkHistoryResult = $this->upgrade->checkHistoryDataForLeanMode();
$this->view->ur = $checkHistoryResult['ur'];
$this->view->cmmi = $checkHistoryResult['cmmi'];
$this->view->waterfall = $checkHistoryResult['waterfall'];
$this->view->assetlib = $checkHistoryResult['assetlib'];
$this->view->title = $this->lang->upgrade->selectMode;
$this->view->edition = $this->config->edition;
$this->display();
}
-2
View File
@@ -1,2 +0,0 @@
#selectedModeTips {padding-top: 10px}
#upgradeTips {padding-bottom: 10px;}
+4 -3
View File
@@ -185,16 +185,17 @@ $lang->upgrade->productRR = 'Product - R&D requirements';
$lang->upgrade->productUR = 'Product - User requirements';
$lang->upgrade->productLine = 'Product - Product Line';
$lang->upgrade->projectScrum = 'Project - Scrum model';
$lang->upgrade->scrumDetail = 'Scrum - Issues, risks, opportunities, processes, QA, meetings';$lang->upgrade->projectWaterfull = 'Project - Waterfall model';
$lang->upgrade->scrumDetail = 'Scrum - Issues, risks, opportunities, processes, QA, meetings';
$lang->upgrade->projectWaterfall = 'Project - waterfall model';
$lang->upgrade->projectKanban = 'Project - Kanban model';
$lang->upgrade->execution = 'Execute, test, DevOps, Kanban, document, statistics, organize';
$lang->upgrade->assetlib = 'Assetlib';
$lang->upgrade->oa = 'OA, operation and maintenance, feedback, school, workflow, background';
$lang->upgrade->oa = 'OA, operation and maintenance, feedback, school, workflow';
$lang->upgrade->selectUsage = 'Select a scenario';
$lang->upgrade->useLean = 'Use Lean mode';
$lang->upgrade->useNew = 'User New mode';
$lang->upgrade->remark = 'Remark';
$lang->upgrade->remarkDesc = 'You can also switch between the background customization of the system later';
$lang->upgrade->remarkDesc = 'You can also switch the mode in the background customization of the system.';
$lang->upgrade->to18Mode['lean'] = 'Lean Mode';
$lang->upgrade->to18Mode['new'] = 'Program Mode';
+3 -3
View File
@@ -186,16 +186,16 @@ $lang->upgrade->productUR = 'Product - User requirements';
$lang->upgrade->productLine = 'Product - Product Line';
$lang->upgrade->projectScrum = 'Project - Scrum model';
$lang->upgrade->scrumDetail = 'Scrum - Issues, risks, opportunities, processes, QA, meetings';
$lang->upgrade->projectWaterfull = 'Project - Waterfall model';
$lang->upgrade->projectWaterfall = 'Project - Waterfall model';
$lang->upgrade->projectKanban = 'Project - Kanban model';
$lang->upgrade->execution = 'Execute, test, DevOps, Kanban, document, statistics, organize';
$lang->upgrade->assetlib = 'Assetlib';
$lang->upgrade->oa = 'OA, operation and maintenance, feedback, school, workflow, background';
$lang->upgrade->oa = 'OA, operation and maintenance, feedback, school, workflow';
$lang->upgrade->selectUsage = 'Select a scenario';
$lang->upgrade->useLean = 'Use Lean mode';
$lang->upgrade->useNew = 'User New mode';
$lang->upgrade->remark = 'Remark';
$lang->upgrade->remarkDesc = 'You can also switch between the background customization of the system later';
$lang->upgrade->remarkDesc = 'You can also switch the mode in the background customization of the system.';
$lang->upgrade->to18Mode['lean'] = 'Lean Mode';
$lang->upgrade->to18Mode['new'] = 'Program Mode';
+4 -3
View File
@@ -185,16 +185,17 @@ $lang->upgrade->productRR = 'Product - R&D requirements';
$lang->upgrade->productUR = 'Product - User requirements';
$lang->upgrade->productLine = 'Product - Product Line';
$lang->upgrade->projectScrum = 'Project - Scrum model';
$lang->upgrade->scrumDetail = 'Scrum - Issues, risks, opportunities, processes, QA, meetings';$lang->upgrade->projectWaterfull = 'Project - Waterfall model';
$lang->upgrade->scrumDetail = 'Scrum - Issues, risks, opportunities, processes, QA, meetings';
$lang->upgrade->projectWaterfall = 'Project - Waterfall model';
$lang->upgrade->projectKanban = 'Project - Kanban model';
$lang->upgrade->execution = 'Execute, test, DevOps, Kanban, document, statistics, organize';
$lang->upgrade->assetlib = 'Assetlib';
$lang->upgrade->oa = 'OA, operation and maintenance, feedback, school, workflow, background';
$lang->upgrade->oa = 'OA, operation and maintenance, feedback, school, workflow';
$lang->upgrade->selectUsage = 'Select a scenario';
$lang->upgrade->useLean = 'Use Lean mode';
$lang->upgrade->useNew = 'User New mode';
$lang->upgrade->remark = 'Remark';
$lang->upgrade->remarkDesc = 'You can also switch between the background customization of the system later';
$lang->upgrade->remarkDesc = 'You can also switch the mode in the background customization of the system.';
$lang->upgrade->to18Mode['lean'] = 'Lean Mode';
$lang->upgrade->to18Mode['new'] = 'Program Mode';
+4 -4
View File
@@ -186,16 +186,16 @@ $lang->upgrade->productUR = '产品-用户需求';
$lang->upgrade->productLine = '产品-产品线';
$lang->upgrade->projectScrum = '项目-敏捷模型';
$lang->upgrade->scrumDetail = '敏捷项目-问题、风险、机会、过程、QA、会议';
$lang->upgrade->projectWaterfull = '项目-瀑布模型';
$lang->upgrade->projectWaterfall = '项目-瀑布模型';
$lang->upgrade->projectKanban = '项目-看板模型';
$lang->upgrade->execution = '执行、测试DevOps、看板、文档、统计、组织';
$lang->upgrade->execution = '执行、测试、DevOps、看板、文档、统计、组织';
$lang->upgrade->assetlib = '资产库';
$lang->upgrade->oa = '办公、运维、反馈、学堂、工作流、后台';
$lang->upgrade->oa = '办公、运维、反馈、学堂、工作流';
$lang->upgrade->selectUsage = '请选择使用场景';
$lang->upgrade->useLean = '使用迅捷模式';
$lang->upgrade->useNew = '使用综合模式';
$lang->upgrade->remark = '备注';
$lang->upgrade->remarkDesc = '后续您还可以在系统的后台自定义中进行切换。';
$lang->upgrade->remarkDesc = '后续您还可以在系统的后台自定义中进行模式切换。';
$lang->upgrade->to18Mode['lean'] = '迅捷模式';
$lang->upgrade->to18Mode['new'] = '综合模式';
+108
View File
@@ -7793,4 +7793,112 @@ class upgradeModel extends model
return true;
}
/**
* Check history data form lean mode.
* 简要迅捷模式历史数据是否存在
*
* @access public
* @return array
*/
public function checkHistoryDataForLeanMode()
{
$returnData = array(
'ur' => false,
'cmmi' => false,
'waterfall' => false,
'assetlib' => false,
);
if($this->config->systemMode == 'new')
{
/* User requriement */
$requirementStory = $this->dao->select('count(1) as total')->from(TABLE_STORY)->where('type')->eq('requirement')->andWhere('deleted')->eq('0')->fetch('total');
if($requirementStory > 0) $returnData['ur'] = true;
if($this->config->edition == 'max')
{
/* issue,risk,opportunity,process,QA,meeting */
$issue = $this->dao->select('count(1) as total')->from(TABLE_ISSUE)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->fetch('total');
if($issue > 0)
{
$returnData['cmmi'] = true;
goto next;
}
$risk = $this->dao->select('count(1) as total')->from(TABLE_RISK)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->fetch('total');
if($risk > 0)
{
$returnData['cmmi'] = true;
goto next;
}
$opportunity = $this->dao->select('count(1) as total')->from(TABLE_OPPORTUNITY)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->fetch('total');
if($opportunity > 0)
{
$returnData['cmmi'] = true;
goto next;
}
$process = $this->dao->select('count(1) as total')->from(TABLE_PROCESS)
->where('deleted')->eq(0)
->fetch('total');
if($process > 0)
{
$returnData['cmmi'] = true;
goto next;
}
$auditplans = $this->dao->select('count(1) as total')->from(TABLE_AUDITPLAN)
->where('deleted')->eq(0)
->fetch('total');
if($auditplans > 0)
{
$returnData['cmmi'] = true;
goto next;
}
$meeting = $this->dao->select('count(1) as total')->from(TABLE_MEETING)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->fetch('total');
if($meeting > 0)
{
$returnData['cmmi'] = true;
goto next;
}
}
next:
/* Waterfull mode */
$waterfull = $this->dao->select('count(1) as total')->from(TABLE_PROJECT)
->where('model')->eq('waterfall')
->andWhere('deleted')->eq(0)
->fetch('total');
if($waterfull > 0) $returnData['waterfall'] = true;
if($this->config->edition == 'max')
{
/* assetlib */
$assetlib = $this->dao->select('count(1) as total')->from(TABLE_ASSETLIB)
->where('deleted')->eq(0)
->fetch('total');
if($assetlib > 0) $returnData['assetlib'] = true;
}
}
return $returnData;
}
}
-2
View File
@@ -5461,7 +5461,6 @@
,upgrade/css/index.html,
,upgrade/css/mergeprogram.css,
,upgrade/css/mergerepo.css,
,upgrade/css/to15guide.css,
,upgrade/ext/config/bizext.php,
,upgrade/ext/config/zentaobiz.php,
,upgrade/ext/config/zentaomax.php,
@@ -5534,7 +5533,6 @@
,upgrade/view/mergetips.html.php,
,upgrade/view/renameobject.html.php,
,upgrade/view/selectversion.html.php,
,upgrade/view/to15guide.html.php,
,user/config.php,
,user/control.php,
,user/css/batchcreate.css,
-60
View File
@@ -1,60 +0,0 @@
<?php
/**
* The to20 view file of upgrade module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
* @author Yidong Wang <yidong@cnezsoft.com>
* @package upgrade
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<div class='container'>
<div class='panel' style='padding:50px; margin:50px 300px;'>
<form method='post'>
<div class='panel-title text-center'>
<?php
if($config->edition == 'max')
{
echo $lang->upgrade->toMAXGuide;
}
elseif($config->edition == 'biz')
{
echo $lang->upgrade->toBIZ5Guide;
}
else
{
echo $lang->upgrade->toPMS15Guide;
}
?>
</div>
<div class='panel-body'>
<div style='max-width:900px; margin: auto;'>
<?php echo $lang->upgrade->to15Desc;?>
<?php $systemMode = isset($lang->upgrade->to15Mode['classic']) ? 'classic' : 'new';?>
<?php echo html::radio('mode', $lang->upgrade->to15Mode, $systemMode);?>
<div id='selectedModeTips' class='text-info'><?php echo $lang->upgrade->selectedModeTips[$systemMode];?></div>
</div>
</div>
<hr/>
<div class='panel-footer text-center'>
<div id='upgradeTips' class='text-danger hidden'><?php echo $lang->upgrade->upgradeTips;?></div>
<?php echo html::submitButton($lang->upgrade->start . (strpos($this->app->getClientLang(), 'zh') === false ? ' ' : '') . $lang->upgrade->common);?>
</div>
</form>
</div>
</div>
<?php js::set('selectedModeTips', $lang->upgrade->selectedModeTips);?>
<script>
$(function()
{
$('[name=mode]').change(function()
{
$('#selectedModeTips').html(selectedModeTips[$(this).val()]);
$(this).val() == 'new' ? $('#upgradeTips').removeClass('hidden') : $('#upgradeTips').addClass('hidden');
})
})
</script>
<?php include '../../common/view/footer.lite.html.php';?>
+18 -8
View File
@@ -28,8 +28,8 @@
<tbody>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->usage;?></td>
<td colspan='2'><?php echo $this->lang->upgrade->leanUsage;?></td>
<td colspan='2'><?php echo $this->lang->upgrade->newUsage;?></td>
<td colspan='2' class="text-center"><?php echo $this->lang->upgrade->leanUsage;?></td>
<td colspan='2' class="text-center"><?php echo $this->lang->upgrade->newUsage;?></td>
</tr>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->program;?></td>
@@ -41,9 +41,10 @@
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php $icon = $ur ? 'icon-check' : 'icon-close'?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->productUR;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<tr>
@@ -56,14 +57,18 @@
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php if($edition == 'max'):?>
<?php $icon = $cmmi ? 'icon-check' : 'icon-close'?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->scrumDetail;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php endif;?>
<?php $icon = $waterfall ? 'icon-check' : 'icon-close'?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->projectWaterfull;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2'><?php echo $this->lang->upgrade->projectWaterfall;?></td>
<td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<tr>
@@ -76,18 +81,23 @@
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php if($edition == 'max'):?>
<?php $icon = $assetlib ? 'icon-check' : 'icon-close'?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->assetlib;?></td>
<td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
<td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php endif;?>
<?php if($edition == 'biz' or $edition == 'max'):?>
<tr>
<td colspan='2'><?php echo $this->lang->upgrade->oa;?></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
<td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
</tr>
<?php endif;?>
<tr>
<td colspan='2' style="font-weight:bold;"><?php echo $this->lang->upgrade->selectUsage;?></td>
<td colspan='2' style="font-weight:bold;font-size:14px;"><?php echo $this->lang->upgrade->selectUsage;?></td>
<td colspan='2' class="text-center"><button class="btn" type="button" id='useLean'><?php echo $this->lang->upgrade->useLean;?></button></td>
<td colspan='2' class="text-center"><button class="btn" type="button" id='useNew'><?php echo $this->lang->upgrade->useNew;?></button></td>
</tr>