diff --git a/module/block/ui/bugblock.html.php b/module/block/ui/bugblock.html.php index 96c0f7b110..a534107c85 100644 --- a/module/block/ui/bugblock.html.php +++ b/module/block/ui/bugblock.html.php @@ -35,7 +35,7 @@ panel ), dtable ( - set::id('bug'), + set::id('bug-list'), set::height(318), set::bordered(false), set::horzScrollbarPos('inside'), diff --git a/module/bug/ui/browse.html.php b/module/bug/ui/browse.html.php index d632826cd8..d2c95a3e93 100644 --- a/module/bug/ui/browse.html.php +++ b/module/bug/ui/browse.html.php @@ -76,7 +76,7 @@ if(!isonlybody()) ))) : null, $canCreate && $canBatchCreate ? btngroup ( - btn(setClass('btn primary'), set::icon('plus'), set::url($createLink), $lang->bug->create), + btn(setClass('btn primary create-bug-btn'), set::icon('plus'), set::url($createLink), $lang->bug->create), dropdown ( btn(setClass('btn primary dropdown-toggle'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))), diff --git a/module/story/ui/create.html.php b/module/story/ui/create.html.php index 648f3fcf12..d35fde477a 100644 --- a/module/story/ui/create.html.php +++ b/module/story/ui/create.html.php @@ -22,7 +22,7 @@ jsVar('branchCount', isset($fields['branches']['options']) ? count($fields['bran formPanel ( - on::click('#saveButton', 'customSubmit'), + commonModel::isTutorialMode() ? '' : on::click('#saveButton', 'customSubmit'), on::click('#saveDraftButton', 'customSubmit'), set::id('dataform'), to::heading(div diff --git a/module/tutorial/js/index.js b/module/tutorial/js/index.js index c44c4f0869..88f20ba89e 100644 --- a/module/tutorial/js/index.js +++ b/module/tutorial/js/index.js @@ -198,6 +198,8 @@ $(function() html: true }, options); $e = $e.first(); + + console.log('showToolTip', $e, text, options); if($e.css('display') !== 'none') { if(!$e.data('zui.tooltip')) $e.addClass('tooltip-tutorial').attr('data-toggle', 'tooltip').tooltip(options); @@ -341,11 +343,15 @@ $(function() { finishTask(); } + console.log('阻止表单提交'); e.preventDefault(); e.stopPropagation(); return false; } console.log('task.nav.submit', task.nav.submit) + console.log('is a form ?', $form,$form.is('form'), $form.find('form')) + $form = $form.is('form') ? $form : $form.find('form').last(); + console.log('is a form ?', $form) if(task.nav.submit) $form.on('click.tutorial', task.nav.submit, onSubmit); else $form.submit(onSubmit); } diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index e38c44fad6..cea1c04e66 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -84,7 +84,18 @@ $lang->tutorial->tasks['createTask']['nav'] = array('app' => 'execution', 'modu $lang->tutorial->tasks['createTask']['desc'] = "
将执行{$lang->SRCommon}分解为任务:
在系统中提交一个Bug: