diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js index 8403b5ff6f..f5427fdb6b 100644 --- a/module/doc/js/browse.js +++ b/module/doc/js/browse.js @@ -16,7 +16,6 @@ function browseBySearch() $(function() { if(browseType == 'bysearch') return; - $('#pageActions ul.dropdown-menu').css('left', '67px'); if(browseType == 'byediteddate' || browseType == 'openedbyme' || browseType == 'collectedbyme') { $('#pageActions ul.dropdown-menu').css('left', '0px'); diff --git a/module/doc/js/common.js b/module/doc/js/common.js index b5603a84e4..dba17c5d23 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -24,6 +24,7 @@ function setBrowseType(type) $(document).ready(function() { + $('#pageActions ul.dropdown-menu').css('left', '67px'); $('.libs-group.sort').sortable( { trigger: '.lib', diff --git a/module/story/js/review.js b/module/story/js/review.js index d44a6b7135..14126ccacd 100644 --- a/module/story/js/review.js +++ b/module/story/js/review.js @@ -4,11 +4,15 @@ function switchShow(result) { $('#rejectedReasonBox').show(); $('#preVersionBox').hide(); + $('#priBox').hide(); + $('#estimateBox').hide(); $('#assignedTo').val('closed'); $('#assignedTo').trigger("chosen:updated"); } - else if(result == 'revert') + else if(result == 'clarify') { + $('#priBox').hide(); + $('#estimateBox').hide(); $('#preVersionBox').show(); $('#rejectedReasonBox').hide(); $('#duplicateStoryBox').hide(); @@ -18,6 +22,8 @@ function switchShow(result) } else { + $('#priBox').show(); + $('#estimateBox').show(); $('#preVersionBox').hide(); $('#rejectedReasonBox').hide(); $('#duplicateStoryBox').hide(); diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index 469749a8b6..468947cd06 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -38,6 +38,14 @@ var assignedTo = 'lastEditedBy ? print($story->lastEditedBy) : pri
| testcase->stepID;?> | +testcase->stepID;?> | testcase->stepDesc;?> | testcase->stepExpect;?> | actions;?> |
|---|