diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php index 4b5b79ac3e..d7cff9a3e1 100644 --- a/extension/lite/product/ext/view/browse.html.php +++ b/extension/lite/product/ext/view/browse.html.php @@ -591,7 +591,7 @@ function setBadgeStyle(obj, isShow) function handleLinkButtonClick() { - var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html')); + var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace('xhtml', 'html')); window.open(xxcUrl); } diff --git a/extension/lite/story/ext/view/view.html.php b/extension/lite/story/ext/view/view.html.php index bd48a2e3e3..8c64cb67f3 100644 --- a/extension/lite/story/ext/view/view.html.php +++ b/extension/lite/story/ext/view/view.html.php @@ -346,7 +346,7 @@ js::set('rawModule', $this->app->rawModule); diff --git a/module/bug/css/x.browse.css b/module/bug/css/x.browse.css index 385680384c..c0bf272b2d 100644 --- a/module/bug/css/x.browse.css +++ b/module/bug/css/x.browse.css @@ -1,6 +1,6 @@ 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; overflow-y: overlay;} +#main {min-width: unset; overflow-y: overlay; position: unset !important;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} diff --git a/module/bug/css/x.view.css b/module/bug/css/x.view.css index b18ef5ed1b..89810f61b0 100644 --- a/module/bug/css/x.view.css +++ b/module/bug/css/x.view.css @@ -1,5 +1,5 @@ body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} -#main {margin-bottom: 40px; min-width: unset;} +#main {margin-bottom: 40px; min-width: unset; position: unset !important;} #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;} diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 005a5fd1fa..c809ced659 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -462,7 +462,7 @@ $('#bugForm .table-footer .table-actions #assignedTo').closest('.btn-group.dropu function handleLinkButtonClick() { - var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html')); + 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 6ef9003823..10b13c2d9e 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -468,7 +468,7 @@ diff --git a/module/doc/css/x.view.css b/module/doc/css/x.view.css index 2e87c4aa0f..7014d2b1e0 100644 --- a/module/doc/css/x.view.css +++ b/module/doc/css/x.view.css @@ -1,4 +1,4 @@ -.side-col.col-4 {display: none;} +.side-col.col-4 {display: none; position: unset !important;} #main {margin-bottom: 40px;} #mainMenu {margin-top: 0px;} #mainMenu .btn {display: none;} diff --git a/module/execution/css/x.bug.css b/module/execution/css/x.bug.css index ae214a0d8a..ab6c8a986f 100644 --- a/module/execution/css/x.bug.css +++ b/module/execution/css/x.bug.css @@ -1,5 +1,5 @@ body {margin-bottom: 0px !important;} -#main {min-width: unset; overflow-y: overlay;} +#main {min-width: unset; overflow-y: overlay; position: unset !important;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} #mainMenu, #sidebar, .dropdown, .table-footer > .table-actions, .table-footer>.table-statistic, .pager > li > .pager-size-menu {display: none;} diff --git a/module/execution/css/x.story.css b/module/execution/css/x.story.css index 715f595609..5e9ce09e29 100644 --- a/module/execution/css/x.story.css +++ b/module/execution/css/x.story.css @@ -1,6 +1,6 @@ body {margin-bottom: 0px !important;} #main {min-width: unset; overflow-y: overlay;} -#main > .container {width: 100% !important;} +#main > .container {width: 100% !important; position: unset !important;} #mainContent > .main-col {margin-top: 0px;} #mainMenu, #sidebar, .dropdown, .c-sort, .c-category, .c-user, .c-estimate, .c-stage, .c-count, .c-actions-7, .c-actions, .table-footer > .table-statistic, .table-footer > .table-actions, .pager > li > .pager-size-menu {display: none;} #storyList > thead > tr > .c-status, #storyList > thead > tr > .c-pri, #storyList > tbody > tr > .c-status, #storyList > tbody > tr > .c-pri {display: table-cell !important;} diff --git a/module/execution/css/x.task.css b/module/execution/css/x.task.css index 1edfd18ad9..300514ffb8 100644 --- a/module/execution/css/x.task.css +++ b/module/execution/css/x.task.css @@ -1,7 +1,7 @@ body {margin-bottom: 0px !important;} td .task-toggle {pointer-events: auto !important;} #mainMenu, #sidebar, .dropdown, .table-footer > .table-actions, .table-footer > .table-statistic, .pager > li > .pager-size-menu {display: none;} -#main {min-width: unset; overflow-y: overlay;} +#main {min-width: unset; overflow-y: overlay; position: unset !important;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 36px;} diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php index 0c457dbf6c..e0e77ed7c5 100644 --- a/module/execution/view/bug.html.php +++ b/module/execution/view/bug.html.php @@ -210,7 +210,7 @@ $(function(){$('#executionBugForm').table();}) function handleLinkButtonClick() { - var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html')); + var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace('xhtml', 'html')); window.open(xxcUrl); } diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index 933e131229..0fd94dc27d 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -400,7 +400,7 @@ $(function() }); function handleLinkButtonClick() { - var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html')); + var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace('xhtml', 'html')); window.open(xxcUrl); } diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php index 9be2c7db19..c22f33ac04 100644 --- a/module/execution/view/task.html.php +++ b/module/execution/view/task.html.php @@ -477,7 +477,7 @@ $(function() app->getViewType() == 'xhtml'):?> function handleLinkButtonClick() { - var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html')); + var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace('xhtml', 'html')); window.open(xxcUrl); } diff --git a/module/product/css/x.browse.css b/module/product/css/x.browse.css index 1f1abfbddb..7486d97710 100644 --- a/module/product/css/x.browse.css +++ b/module/product/css/x.browse.css @@ -1,7 +1,7 @@ body {margin-bottom: 0px !important;} td .story-toggle {pointer-events: auto !important;} #mainMenu, #sidebar, .table-footer > .table-actions, .dropdown, .table-footer>.table-statistic, .pager > li > .pager-size-menu {display: none;} -#main {min-width: unset; overflow-y: overlay;} +#main {min-width: unset; overflow-y: overlay; position: unset !important;} #main > .container {width: 100% !important;} #mainContent > .main-col {margin-top: 0px;} #xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;} diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 770dd3c972..9b340e2ed5 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -749,7 +749,7 @@ function setBadgeStyle(obj, isShow) function handleLinkButtonClick() { - var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html')); + var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace('xhtml', 'html')); window.open(xxcUrl); } diff --git a/module/productplan/css/x.view.css b/module/productplan/css/x.view.css index ed93fc1ed9..0099dbac1e 100644 --- a/module/productplan/css/x.view.css +++ b/module/productplan/css/x.view.css @@ -1,6 +1,6 @@ #mainMenu, .actions, .pager-size-menu, .tab-btn-container ul li span {display: none;} -#main {min-width: unset; overflow-y: overlay;} -.main-content {padding: 0; } +#main {min-width: unset; overflow-y: overlay; position: unset !important;} +.main-content {padding: 0;} .main-table {margin-bottom: 40px;} .main-content, .main-table > .table, .main-table > .table-footer, .main-table > .table-header, .main-table > .table-responsive {box-shadow: none!important;} .table-footer {position: fixed; width: 100%; bottom: 0;} diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 4aaab515ba..584c631b62 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -609,7 +609,7 @@ diff --git a/module/task/css/x.view.css b/module/task/css/x.view.css index 5a96385b1f..94c67e8533 100644 --- a/module/task/css/x.view.css +++ b/module/task/css/x.view.css @@ -1,5 +1,5 @@ body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);} -#main {margin-bottom: 40px; min-width: unset;} +#main {margin-bottom: 40px; min-width: unset; position: unset !important;} #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;} diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index e2f4091aa7..0f6294d40c 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -442,7 +442,7 @@ diff --git a/module/testcase/css/x.view.css b/module/testcase/css/x.view.css index 8d3fc89b31..7e268496c8 100644 --- a/module/testcase/css/x.view.css +++ b/module/testcase/css/x.view.css @@ -1,5 +1,5 @@ .side-col.col-4 {display: none;} -#main {margin-bottom: 40px;} +#main {margin-bottom: 40px; position: unset !important;} #mainMenu {margin-top: 0px;} #mainMenu .btn {display: none;} #mainMenu .divider {display: none;}