diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index 0358afcc4c..f6cb3d1e02 100755 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -37,8 +37,8 @@ $clientTheme = $this->app->getClientTheme(); if(commonModel::isTutorialMode()) { - $wizardModule = defined('WIZARD_MODULE') ? WIZARD_MODULE : ''; - $wizardMethod = defined('WIZARD_METHOD') ? WIZARD_METHOD : ''; + $wizardModule = defined('WIZARD_MODULE') ? WIZARD_MODULE : $this->moduleName; + $wizardMethod = defined('WIZARD_METHOD') ? WIZARD_METHOD : $this->methodName; $requiredFields = ''; if(isset($config->$wizardModule->$wizardMethod->requiredFields)) $requiredFields = str_replace(' ', '', $config->$wizardModule->$wizardMethod->requiredFields); echo ""; diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index 6598d8a5e1..741f7fab7d 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -25,7 +25,7 @@
-
+ diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 22cf129142..0ae05f3849 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -19,7 +19,17 @@ icons['team']);?> project->team;?>
- id", $lang->project->manageMembers, '', "class='btn btn-primary'");?> + id"); + common::printLink('tutorial', 'wizard', "module=project&method=managemembers¶ms=$wizardParams", $lang->project->manageMembers, '', "class='btn btn-primary manage-team-btn'"); + } + else + { + common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers, '', "class='btn btn-primary manage-team-btn'"); + } + ?>
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index e1784f5027..5ab5bcf498 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -27,7 +27,7 @@ $lang->tutorial->reloadTargetPage = 'Reload target page'; $lang->tutorial->target = 'Target'; $lang->tutorial->targetPageTip = 'Open【%s】page by this instruction'; $lang->tutorial->requiredTip = '【%s】is necessary'; -$lang->tutorial->congratulateTask = 'Congratulations!You have finished task【】!'; +$lang->tutorial->congratulateTask = 'Congratulations! You have finished task【】!'; $lang->tutorial->serverErrorTip = 'Some error has occurred.'; $lang->tutorial->ajaxSetError = 'Finished task must be defined. Set empty value to reset tasks.'; $lang->tutorial->novice = "You may use the ZenTao first, whether to enter the novice tutorial?"; @@ -50,6 +50,10 @@ $lang->tutorial->tasks['createProject'] = array('title' => 'Create a pro $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Project'); $lang->tutorial->tasks['createProject']['desc'] = "

Create a new project:

"; +$lang->tutorial->tasks['manageTeam'] = array('title' => 'Manage project team'); +$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); +$lang->tutorial->tasks['manageTeam']['desc'] = "

Manage project team members:

"; + $lang->tutorial->tasks['linkStory'] = array('title' => 'Link story'); $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Link Story'); $lang->tutorial->tasks['linkStory']['desc'] = "

Link stories to project:

"; diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index b537ea3eeb..cf3a9a49d2 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -50,6 +50,10 @@ $lang->tutorial->tasks['createProject'] = array('title' => '创建项目 $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '添加项目'); $lang->tutorial->tasks['createProject']['desc'] = "

在系统创建一个新的项目：

"; +$lang->tutorial->tasks['manageTeam'] = array('title' => '管理团队'); +$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理'); +$lang->tutorial->tasks['manageTeam']['desc'] = "

管理项目团队成员：

"; + $lang->tutorial->tasks['linkStory'] = array('title' => '关联需求'); $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => '关联需求'); $lang->tutorial->tasks['linkStory']['desc'] = "

将需求关联到项目：

"; diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php index ccfec394d2..a6e1f7a4c6 100644 --- a/module/tutorial/view/index.html.php +++ b/module/tutorial/view/index.html.php @@ -252,6 +252,7 @@ $(function() highlight($formWrapper); showToolTip($formWrapper, $formTarget.text()); var fieldSelector = ''; + var requiredFields = task.nav.requiredFields || pageConfig.requiredFields; if(task.nav.formType === 'table') { @@ -262,16 +263,17 @@ $(function() targetStatus.waitFeild = $checkboxes.filter(':not(:checked):first').closest('td'); } } - else if(pageConfig.requiredFields) + else if(requiredFields) { targetStatus.form = true; - var requiredFields = pageConfig.requiredFields.split(','); + requiredFields = requiredFields.split(','); $.each(requiredFields, function(idx, requiredId) { fieldSelector += ',' + '#' + requiredId; var $required = $$('#' + requiredId); if($required.length) { + console.log($required, $required.val()); var val = $required.val(); if(val === undefined || val === null || val === '') {