diff --git a/module/bug/css/x.browse.css b/module/bug/css/x.browse.css index 0810fb1976..ac0fc90bd8 100644 --- a/module/bug/css/x.browse.css +++ b/module/bug/css/x.browse.css @@ -1,19 +1,16 @@ -#mainMenu {display: none;} -#sidebar {display: none;} -.table-footer>.table-statistic {display: none;} -.checkbox-primary {display: none !important;} -.dropdown {display: none;} -#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} body {margin-bottom: 0px !important;} +#mainMenu, #sidebar, .dropdown, .pager > li > .pager-size-menu, .table-footer > .table-actions, .table-footer>.table-statistic {display: none;} #main {min-width: unset; height: 427px; overflow-y: overlay;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} -.pager > li > .pager-size-menu {display: none;} -.table-footer > .table-actions {display: none;} +#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} +.checkbox-primary {display: none !important;} .table-footer{position: fixed; width: 100%; bottom: 0;} -.linkButton {float: right; padding-right: 10px; line-height: 34px;} -.main-table a {pointer-events: none; color: unset !important;} -.pager a {pointer-events: unset;} .table-responsive {margin-bottom: unset;} +.main-table a {pointer-events: none;} +.pager a {pointer-events: unset;} +.linkButton {float: right; padding-right: 10px; cursor: pointer;} +.linkButton i {font-size: 17px !important;} +.linkButton span {line-height: 34px; display: block;} ::-webkit-scrollbar {width: 10px; height: 10px;} ::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;} diff --git a/module/bug/css/x.view.css b/module/bug/css/x.view.css index fa64d76ab1..f7f7e9694e 100644 --- a/module/bug/css/x.view.css +++ b/module/bug/css/x.view.css @@ -1,20 +1,15 @@ -.main-actions {display: none;} +body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} #main {margin-bottom: 40px; min-width: unset;} -#mainMenu .pull-left>a {display: none;} -#mainMenu .pull-left .divider {display: none;} -#mainMenu .pull-right {display: none;} -#mainContent .col-4 {display: none;} -.modal-dialog {width: 90%;} +#mainMenu .pull-left>a, #mainMenu .pull-left .divider, #mainMenu .pull-right, #mainContent .col-4, .main-actions {display: none;} #mainMenu {position: fixed; width: 100%; z-index: 999;} #scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;} -#scrollContent:hover{overflow: overlay;} +#scrollContent:hover {overflow: overlay;} html, body, #main, .container { height: 100%;} -body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} -.page-title {width: 100%;} +.btn span {line-height: 16px; vertical-align: middle;} +.modal-dialog {width: 90%;} .page-title > .label-id {min-width: 25px; line-height: 13px;} -.page-title > .text {display: inline-block; width: calc(100% - 80px); text-overflow: ellipsis; white-space: nowrap; overflow: hidden; line-height: 13px;} +.linkButton {float: right; padding-right: 10px; cursor: pointer;} +.linkButton i {font-size: 17px !important;} +.linkButton span {line-height: 34px; display: block;} ::-webkit-scrollbar {width: 10px; height: 10px;} ::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;} -.btn span{line-height: 16px; vertical-align: middle;} -.linkButton {float: right; padding-right: 10px; line-height: 34px;} -.btn-toolbar {width: calc(100% - 30px);} \ No newline at end of file diff --git a/module/bug/js/x.view.js b/module/bug/js/x.view.js index 73015cc539..4c537a6720 100644 --- a/module/bug/js/x.view.js +++ b/module/bug/js/x.view.js @@ -31,7 +31,7 @@ $(function() if(xuanAction != "
") { var params = window.location.search; - if(params.indexOf('displayNotice=card') == -1) + if(params.indexOf('isNotice=1') == -1) { xuanAction += '
'; $('body').append(xuanAction); diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index c5c59f839c..5887f3fbe9 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -191,7 +191,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow product->getByID($productID)->name ?> -
+
@@ -299,7 +299,8 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status'){ + if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status') + { $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table'); } }?> @@ -488,11 +489,10 @@ $(function(){$('#bugForm').table();}) qa->homepage) and $config->qa->homepage != 'browse' and $config->global->flow == 'full'):?> $(function(){$('#modulemenu .nav li:last').after("
  • homepage?>
    • ")}); -function linkButtonClicked() +function handleLinkButtonClick() { - $url = window.location.href; - $xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent($url.replace(/.display=card/, '')); - window.open($xxcUrl); + var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html')); + window.open(xxcUrl); } diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index d0d403495e..b7d9e44740 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -14,10 +14,10 @@ session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?> - +