diff --git a/module/bug/js/create.js b/module/bug/js/create.js index e7ec1fe87d..3e258bd9be 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -75,8 +75,22 @@ function setTemplate(templateID) function deleteTemplate(templateID) { if(!templateID) return; - hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID); - $('#tplBox' + templateID).addClass('hidden'); + if (confirm("您确认要删除该模板吗?")){ + hiddenwin.location.href = createLink('bug', 'deleteTemplate', 'templateID=' + templateID); + $('#tplBox' + templateID).addClass('hidden'); + } +} + +/*visbile template x icon*/ +function mouseOver(delTempID) +{ + $('#delTemp'+delTempID).removeClass('hidden'); +} + +/*hidden template x icon*/ +function mouseOut(delTempID) +{ + $('#delTemp'+delTempID).addClass('hidden'); } $(function() diff --git a/module/bug/view/buildtemplates.html.php b/module/bug/view/buildtemplates.html.php index 8adfc3ff34..41422936f9 100644 --- a/module/bug/view/buildtemplates.html.php +++ b/module/bug/view/buildtemplates.html.php @@ -1,11 +1,11 @@ $template) { - echo "
  • "; + echo "
  • "; echo ""; if($template->public) echo "{$lang->public} "; echo $template->title . ""; - if(empty($template->public) or $template->account == $app->user->account)echo ""; + if(empty($template->public) or $template->account == $app->user->account)echo ""; echo ""; echo '
    • '; } diff --git a/module/cron/lang/en.php b/module/cron/lang/en.php index 11f27e2ea5..68f453754e 100644 --- a/module/cron/lang/en.php +++ b/module/cron/lang/en.php @@ -40,7 +40,7 @@ $lang->cron->introduction = <<This function need to be improved, so it is turned off by default.

    EOD; $lang->cron->confirmOpen = <<Do you want to turn it on?Turn On Planned Task

    +

    Do you want to turn it on?Turn On Planned Task

    EOD; $lang->cron->notice = new stdclass(); diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php index b43c0f29fa..3fb0e171d7 100644 --- a/module/cron/lang/zh-cn.php +++ b/module/cron/lang/zh-cn.php @@ -40,7 +40,7 @@ $lang->cron->introduction = <<该功能还有待完善，所以默认关闭该功能

    EOD; $lang->cron->confirmOpen = <<是否开启该功能？打开计划任务

    +

    是否开启该功能？打开计划任务

    EOD; $lang->cron->notice = new stdclass(); diff --git a/module/cron/lang/zh-tw.php b/module/cron/lang/zh-tw.php index 9db877b716..6dd6889e1e 100644 --- a/module/cron/lang/zh-tw.php +++ b/module/cron/lang/zh-tw.php @@ -40,7 +40,7 @@ $lang->cron->introduction = <<該功能還有待完善，所以預設關閉該功能

    EOD; $lang->cron->confirmOpen = <<是否開啟該功能？打開計劃任務

    +

    是否開啟該功能？打開計劃任務

    EOD; $lang->cron->notice = new stdclass(); diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index c82049eb97..1431bf99bb 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -79,28 +79,25 @@ testcase->precondition;?> precondition);?> -
    - testcase->stepDesc;?> - - - - - - - - - steps as $stepID => $step) - { - $stepID += 1; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
    testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>
    $stepID" . nl2br($step->desc) . "" . nl2br($step->expect) . "
    -
    + + + + + + + + + steps as $stepID => $step) + { + $stepID += 1; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
    testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>
    $stepID" . nl2br($step->desc) . "" . nl2br($step->expect) . "
    fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
    diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index d0c5bf2743..7644dbafe6 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -23,24 +23,25 @@ recTotal}&recPerPage={$pager->recPerPage}"; ?> - idAB);?> - testtask->name);?> - testtask->project . '/' . $lang->testtask->build;?> - testtask->owner);?> - testtask->begin);?> - testtask->end);?> - statusAB);?> - actions;?> + idAB);?> + testtask->name);?> + testtask->project . '/' . $lang->testtask->build;?> + testtask->owner);?> + testtask->begin);?> + testtask->end);?> + statusAB);?> + actions;?> - + id"), sprintf('%03d', $task->id));?> id"), $task->name);?> createLink('project', 'story', "projectID=$task->project"), $task->projectName) . '/'; + echo $task->projectName . '/'; + //echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName) . '/'; $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));; ?>