diff --git a/module/bug/js/create.js b/module/bug/js/create.js index ae0891a742..ef4c921464 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -6,15 +6,17 @@ */ function loadAllUsers() { - link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val()); - $('#assignedToBox').load(link, function() + var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val()); + $.get(link, function(data) { - moduleID = $('#module').val(); - productID = $('#product').val(); - setAssignedTo(moduleID, productID); - $('#assignedTo').chosen(defaultChosenOptions); + if (data) + { + var moduleID = $('#module').val(); + var productID = $('#product').val(); + setAssignedTo(moduleID, productID); + $('#assignedTo').empty().append($(data).find('option')).trigger('chosen:updated').trigger('chosen:activate'); + } }); - } /** @@ -26,7 +28,7 @@ function loadAllUsers() */ function loadProjectTeamMembers(productID) { - link = createLink('bug', 'ajaxLoadProjectTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val()); + var link = createLink('bug', 'ajaxLoadProjectTeamMembers', 'productID=' + productID + '&selectedUser=' + $('#assignedTo').val()); $('#assignedToBox').load(link, function(){$('#assignedTo').chosen(defaultChosenOptions);}); } @@ -38,8 +40,8 @@ function loadProjectTeamMembers(productID) */ function loadModuleRelated() { - moduleID = $('#module').val(); - productID = $('#product').val(); + var moduleID = $('#module').val(); + var productID = $('#product').val(); setAssignedTo(moduleID, productID); setStories(moduleID, productID); } @@ -54,7 +56,7 @@ function setAssignedTo(moduleID, productID) { if(typeof(productID) == 'undefined') productID = $('#product').val(); if(typeof(moduleID) == 'undefined') moduleID = $('#module').val(); - link = createLink('bug', 'ajaxGetModuleOwner', 'moduleID=' + moduleID + '&productID=' + productID); + var link = createLink('bug', 'ajaxGetModuleOwner', 'moduleID=' + moduleID + '&productID=' + productID); $.get(link, function(owner) { $('#assignedTo').val(owner); @@ -67,7 +69,7 @@ function setTemplate(templateID) { $('#tplBox .list-group-item.active').removeClass('active'); $('#tplTitleBox' + templateID).closest('.list-group-item').addClass('active'); - steps = $('#template' + templateID).html(); + var steps = $('#template' + templateID).html(); editor['#'].html(steps); } @@ -122,7 +124,7 @@ $(function() var adjustBugTypeGroup = function() { var $group = $('#bugTypeInputGroup'); - var width = ($group.parent().width() - 10), addonWidth = 0; + var width = ($group.parent().width()), addonWidth = 0; var $controls = $group.find('.chosen-single'); $group.children('.input-group-addon').each(function() { diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 15d60a3739..e098bb35e5 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -139,7 +139,7 @@ $lang->bug->lblAssignedTo = 'Assignee'; $lang->bug->lblMailto = 'Mail To'; $lang->bug->lblLastEdited = 'Last Edited'; $lang->bug->lblResolved = 'Resolved By'; -$lang->bug->allUsers = 'All User'; +$lang->bug->allUsers = 'Load All User'; $lang->bug->allBuilds = 'All'; $lang->bug->createBuild = 'New'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 3a647035e7..a8cd3c51a4 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -139,7 +139,7 @@ $lang->bug->lblAssignedTo = '当前指派'; $lang->bug->lblMailto = '抄送给'; $lang->bug->lblLastEdited = '最后修改'; $lang->bug->lblResolved = '由谁解决'; -$lang->bug->allUsers = '所有用户'; +$lang->bug->allUsers = '加载所有用户'; $lang->bug->allBuilds = '所有'; $lang->bug->createBuild = '新建'; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 14f481c570..fc4222185a 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -68,7 +68,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow -
'>
+
'>
@@ -413,7 +413,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index c90adac05a..bd36b32558 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -10,7 +10,7 @@ * @link http://www.zentao.net */ ?> -
+
id}&browseType=$browseType¶m=$param");?>'>
@@ -76,6 +76,6 @@ diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index d5e0f504ea..8fcf860d4a 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -72,7 +72,7 @@ tbody tr td:first-child input{display:none;}
-
+
  • >icons['story'], 'green') . ' ' . $lang->build->stories;?>
    • @@ -83,7 +83,7 @@ tbody tr td:first-child input{display:none;}
    ' id='stories'> -
    id, \"story\")", ' ' . $lang->build->linkStory, '', "class='btn btn-sm btn-primary'");?>
    +
    id, \"story\")", ' ' . $lang->build->linkStory, '', "class='btn btn-primary'");?>
    id}")?>' id='linkedStoriesForm'> @@ -121,7 +121,7 @@ tbody tr td:first-child input{display:none;} story->priList, $story->pri, $story->pri);?> - title, '', "class='preview'");?> + title, '', "class='iframe' data-width='1000'");?> openedBy];?> estimate;?> @@ -159,7 +159,7 @@ tbody tr td:first-child input{display:none;}
    ' id='bugs'> -
    id, \"bug\")", ' ' . $lang->build->linkBug, '', "class='btn btn-sm btn-primary'");?>
    +
    id, \"bug\")", ' ' . $lang->build->linkBug, '', "class='btn btn-primary'");?>
    id");?>" id='linkedBugsForm'> @@ -195,7 +195,7 @@ tbody tr td:first-child input{display:none;} id);?> - title, '', "class='preview'");?> + title, '', "class='iframe' data-width='1000'");?> @@ -255,7 +255,7 @@ tbody tr td:first-child input{display:none;} - title, '', "class='preview'");?> + title, '', "class='iframe' data-width='1000'");?> diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js index 7adfaebb4c..6d2c1b6e56 100644 --- a/module/doc/js/browse.js +++ b/module/doc/js/browse.js @@ -5,7 +5,7 @@ function browseByModule() $('#bymoduleTab').addClass('active'); $('#allTab').removeClass('active'); $('#bysearchTab').removeClass('active'); - $('#querybox').removeClass('show'); + $('#queryBox').removeClass('show'); } function browseBySearch() @@ -14,7 +14,7 @@ function browseBySearch() $('#bymoduleTab').removeClass('active'); $('#allTab').addClass('active'); $('#bysearchTab').addClass('active'); - $('#querybox').addClass('show'); + $('#queryBox').addClass('show'); } function setBrowseType(type) diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index cc9fdce086..7bc13baf3c 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -31,7 +31,7 @@
    - + diff --git a/module/project/view/fixfirst.html.php b/module/project/view/fixfirst.html.php index 7b2ec1f4a6..0984650808 100644 --- a/module/project/view/fixfirst.html.php +++ b/module/project/view/fixfirst.html.php @@ -28,13 +28,13 @@ - +
    build->product;?> build->id;?> build->name;?>
    -
    project->totalEstimate . ' : ' . $project->totalEstimate . $lang->project->workHour;?>
    +
    project->totalEstimate;?> : totalEstimate;?> project->workHour;?>
    diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php index 06a66162c1..d554475ddd 100755 --- a/module/project/view/importbug.html.php +++ b/module/project/view/importbug.html.php @@ -22,8 +22,10 @@ var browseType = ''; {$lang->project->importBug}", '', "class='btn btn-link btn-active-text'");?>
    -
    -
    +
    +
    +
    +
    @@ -70,10 +72,12 @@ var browseType = '';
    -
    - import, '', 'btn');?> +
    + ' . $lang->import, '', 'btn btn-secondary');?> +
    +
    +
    - show('right', 'pagerjs');?>
    diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php index ffed2895f3..19f7bcf252 100644 --- a/module/project/view/importtask.html.php +++ b/module/project/view/importtask.html.php @@ -21,7 +21,7 @@
    -
    +
    @@ -87,7 +87,7 @@
    -
    project->importTask, '', 'btn');?>
    +
    ' . $lang->project->importTask, '', 'btn btn-secondary btn-wide');?>
    diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php index 39d4de8a4c..3bcd3361c5 100644 --- a/module/project/view/taskheader.html.php +++ b/module/project/view/taskheader.html.php @@ -132,16 +132,14 @@ $misc = common::hasPriv('task', 'batchCreate', $project) ? '' : "disabled"; $link = common::hasPriv('task', 'batchCreate', $project) ? $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#'; ?> - +
      " . html::a($link, $lang->task->batchCreate, '', "class='$misc'") . "";?>
    -
    '>
    +
    '>
    -
    '>
    +
    '>
    -
    +
    diff --git a/module/testreport/css/common.css b/module/testreport/css/common.css index cce95976f3..e69de29bb2 100644 --- a/module/testreport/css/common.css +++ b/module/testreport/css/common.css @@ -1,6 +0,0 @@ -.none-data{padding:8px !important;} -.main #stories{margin-bottom:10px} -.main .table-report{border:0px;} - -.detail > table {border: 1px solid #ddd;} -.detail-title {background:#f1f1f1; padding:8px 10px; border: none;} diff --git a/module/testreport/css/create.css b/module/testreport/css/create.css new file mode 100644 index 0000000000..a342dc12d9 --- /dev/null +++ b/module/testreport/css/create.css @@ -0,0 +1,4 @@ +#mainContent .detail {border: 1px solid #e5e5e5; margin: 20px 0 0; padding: 0;} +#mainContent .detail-title {background: #eee; padding: 10px;} +#mainContent .detail-content {padding: 0;} +#mainContent .detail .form-actions {padding-bottom: 20px;} \ No newline at end of file diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php index ba8a06c190..4e275f9eb2 100644 --- a/module/testreport/view/create.html.php +++ b/module/testreport/view/create.html.php @@ -22,93 +22,105 @@
    testreport->legendBasic?>
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    testreport->startEnd?> -
    - - ~ - - id) . html::hidden('tasks', $tasks); - echo html::hidden('objectID', $objectID) . html::hidden('objectType', $objectType); - ?> -
    -     		-
    - testreport->owner?> - -
    -
    testreport->members?>
    testreport->title?>
    testreport->goal?>desc?>
    testreport->profile?> - ' . $storySummary . '

    '; - echo '

    ' . sprintf($lang->testreport->buildSummary, empty($builds) ? 1 : count($builds)) . $caseSummary . '

    '; - echo '

    ' . sprintf($lang->testreport->bugSummary, $bugInfo['foundBugs'], count($legacyBugs), $bugInfo['countBugByTask'], $bugInfo['bugConfirmedRate'] . '%', $bugInfo['bugCreateByCaseRate'] . '%') . '

    '; - unset($bugInfo['countBugByTask']); unset($bugInfo['bugConfirmedRate']); unset($bugInfo['bugCreateByCaseRate']); unset($bugInfo['foundBugs']); - ?> -
    testreport->report?>
    files?>fetch('file', 'buildform');?>
    - - -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    testreport->startEnd?> +
    + + ~ + + id) . html::hidden('tasks', $tasks); + echo html::hidden('objectID', $objectID) . html::hidden('objectType', $objectType); + ?> +
    +     		+
    + testreport->owner?> + +
    +
    testreport->members?>
    testreport->title?>
    testreport->goal?>desc?>
    testreport->profile?> + ' . $storySummary . ''; + echo '
    ' . sprintf($lang->testreport->buildSummary, empty($builds) ? 1 : count($builds)) . $caseSummary . '
    '; + echo '
    ' . sprintf($lang->testreport->bugSummary, $bugInfo['foundBugs'], count($legacyBugs), $bugInfo['countBugByTask'], $bugInfo['bugConfirmedRate'] . '%', $bugInfo['bugCreateByCaseRate'] . '%') . '
    '; + unset($bugInfo['countBugByTask']); unset($bugInfo['bugConfirmedRate']); unset($bugInfo['bugCreateByCaseRate']); unset($bugInfo['foundBugs']); + ?> +
    testreport->report?>
    files?>fetch('file', 'buildform');?>
    + + +
    +
    testreport->legendStoryAndBug?>
    - - +
    + + +
    testreport->legendBuild?>
    - +
    + +
    testreport->legendCase?>
    - +
    + +
    testreport->legendLegacyBugs?>
    - +
    + +
    testreport->legendReport?>
    - +
    + +
    diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php index d91ddde7b4..6be6a9986d 100644 --- a/module/testsuite/view/library.html.php +++ b/module/testsuite/view/library.html.php @@ -65,7 +65,7 @@ js::set('flow', $this->config->global->flow);
-
'>
+
'>
@@ -104,7 +104,7 @@ js::set('flow', $this->config->global->flow); " . $lang->testcase->batchCreate, '', "class='btn btn-secondary'");?> " . $lang->testcase->create, '', "class='btn btn-primary'");?>
-
'>
+
'>