Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix xuanxuan 84's bug

Browse Source
This commit is contained in:
chaideqing
2021-12-07 09:27:40 +08:00
parent e4df2494bd
commit 9a2148a540
22 changed files with 150 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
module/bug/css/x.browse.css
View File

@@ -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;}

19
module/bug/css/x.view.css
View File

@@ -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;}
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);}

2
module/bug/js/x.view.js
View File

@@ -31,7 +31,7 @@ $(function()
if(xuanAction != "<div class='xuancard-actions fixed'>")
{
var params = window.location.search;
if(params.indexOf('displayNotice=card') == -1)
if(params.indexOf('isNotice=1') == -1)
{
xuanAction += '</div>';
$('body').append(xuanAction);

12
module/bug/view/browse.html.php
View File

@@ -191,7 +191,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<strong>
<?php echo $this->product->getByID($productID)->name ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -299,7 +299,8 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<?php
foreach($setting as $value)
{
if($value->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();})
<?php if(isset($config->qa->homepage) and $config->qa->homepage != 'browse' and $config->global->flow == 'full'):?>
$(function(){$('#modulemenu .nav li:last').after("<li class='right'><a style='font-size:12px' href='javascript:setHomepage(\"qa\", \"browse\")'><i class='icon icon-cog'></i> <?php echo $lang->homepage?></a></li>")});
<?php endif;?>
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);
}
</script>
<?php include '../../common/view/footer.html.php';?>

11
module/bug/view/view.html.php
View File

@@ -14,10 +14,10 @@
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('sysurl', common::getSysUrl());?>
<?php $browseLink = $app->session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'displayNotice=card') === false):?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
<div id="mainMenu" class="clearfix">
<?php if($this->app->getViewType() == 'xhtml'):?>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -428,11 +428,10 @@
<?php common::printPreAndNext($preAndNext);?>
</div>
<script>
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);
}
</script>
<?php include '../../common/view/syntaxhighlighter.html.php';?>

11
module/execution/css/story.css
View File

@@ -1,13 +1,12 @@
#linkButton {border-radius: 4px !important;}
tbody > tr > td > .btn-icon {margin-right: 4px;}
.table td.c-estimate {padding-right: 12px;}
#linkButton {border-radius: 4px !important; cursor: pointer;}
#batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;}
#modules a.active {color: #0c64eb;}
@media (max-width: 1200px) {#storyList .c-user, #storyList .c-estimate {display: none !important;};}
@media (max-width: 1000px) {#storyList .c-status, #storyList .c-pri {display: none !important;};}
@media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none !important;};}
#batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;}
th.c-pri{width:50px;}
.c-estimate {width: 50px;}
tbody > tr > td > .btn-icon {margin-right: 4px;}
th.c-pri, .c-estimate {width:50px;}
.table td.c-estimate {padding-right: 12px;}
.c-status, .c-user {width: 70px;}
.c-category {width: 80px;}
.c-actions-7 {width: 190px;}

20
module/execution/css/x.bug.css
View File

@@ -1,22 +1,18 @@
#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;}
#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;}
#mainMenu, #sidebar, .dropdown, .table-footer > .table-actions, .table-footer>.table-statistic, .pager > li > .pager-size-menu {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
.main-table a {pointer-events: none;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li * {color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 40px; 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;}

26
module/execution/css/x.story.css
View File

@@ -1,28 +1,20 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.c-sort, .c-category, .c-user, .c-estimate, .c-stage, .c-count, .c-actions-7, .c-actions {display: none;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {margin-bottom: 0px !important;}
#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;}
#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;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
.main-col .table-responsive {height: 420px; margin-bottom: 0px;}
#storyList > thead > tr > .c-status {display: table-cell !important;}
#storyList > thead > tr > .c-pri {display: table-cell !important;}
#storyList > tbody > tr > .c-status {display: table-cell !important;}
#storyList > tbody > tr > .c-pri {display: table-cell !important;}
.main-table a {pointer-events: none;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li *{color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 40px; 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;}

21
module/execution/css/x.task.css
View File

@@ -1,22 +1,19 @@
#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;}
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; 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;}
.main-table a {pointer-events: none;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li * {color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 40px; 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;}

9
module/execution/view/bug.html.php
View File

@@ -34,7 +34,7 @@
<strong>
<?php echo ($this->project->getById($execution->project)->name . ' / ' . $this->execution->getByID($execution->id)->name) ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -206,11 +206,10 @@
<?php js::set('replaceID', 'bugList');?>
<?php js::set('browseType', $type);?>
<script>
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);
}
</script>
<?php include '../../common/view/footer.html.php';?>

9
module/execution/view/story.html.php
View File

@@ -142,7 +142,7 @@
<strong>
<?php echo ($this->project->getById($execution->project)->name . ' / ' . $this->execution->getByID($execution->id)->name) ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -479,11 +479,10 @@ $(function()
}
});
});
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);
}
</script>
<?php if(commonModel::isTutorialMode()): ?>

11
module/execution/view/task.html.php
View File

@@ -183,7 +183,7 @@ body {margin-bottom: 25px;}
<strong>
<?php echo ($this->project->getById($execution->project)->name . ' / ' . $this->execution->getByID($execution->id)->name) ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -283,7 +283,9 @@ body {margin-bottom: 25px;}
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
{
$this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');
}
}?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
@@ -479,11 +481,10 @@ $(function()
}
})
});
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);
}
</script>
<?php include '../../common/view/footer.html.php';?>

21
module/product/css/x.browse.css
View File

@@ -1,22 +1,19 @@
#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;}
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; 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;}
.main-table a {pointer-events: none;}
.checkbox-primary, .table-footer .pager:before {display: none !important;}
.table-footer {position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li * {color: #838a9d !important;}
.linkButton {float: right; padding-right: 10px; line-height: 40px;}
.main-table a {pointer-events: none; color: unset !important;}
.pager a {pointer-events: unset;}
.table-responsive {margin-bottom: unset;}
.pager a {pointer-events: unset;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 40px; 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;}

13
module/product/view/browse.html.php
View File

@@ -236,7 +236,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
<strong>
<?php echo $this->product->getByID($productID)->name ?>
</strong>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -346,7 +346,9 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
foreach($setting as $key => $value)
{
if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
{
$this->story->printCell($value, $story, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table');
}
}?>
<?php else:?>
<?php foreach($setting as $key => $value) $this->story->printCell($value, $story, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table');?>
@@ -364,7 +366,9 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
foreach($setting as $key => $value)
{
if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
{
$this->story->printCell($value, $child, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType);
}
}?>
<?php else:?>
<?php foreach($setting as $key => $value) $this->story->printCell($value, $child, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType);?>
@@ -705,11 +709,10 @@ $(function()
}
});
});
function linkButtonClicked()
function handleLinkButtonClick()
{
$url = window.location.href;
$xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent($url.replace(/.display=card/, ''));
$newWindow = window.open($xxcUrl);
var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
window.open(xxcUrl);
}
</script>
<?php include '../../common/view/footer.html.php';?>

15
module/productplan/css/x.view.css
View File

@@ -1,19 +1,14 @@
#mainMenu, .actions, .pager-size-menu, .tab-btn-container ul li span {display: none;}
#main {min-width: unset; height:407px; overflow-y: overlay;}
.main-content {padding: 0;}
.actions{display: none;}
#mainMenu{display: none;}
#main {min-width: unset; height: calc(100% - 40px);}
.pager-size-menu{display: none;}
.table-footer {position: fixed; width: 100%; bottom: 0;}
.tab-btn-container {width: 100%; background-color: #f2f2f2;}
.tab-btn-container ul {display: flex; justify-content: center;}
.tab-btn-container ul li {list-style: none;}
.plan-title {position: absolute; top: 0; left: 0; padding: 8px 15px; font-weight: bolder;}
.tab-btn-container ul li span{display: none;}
.tab-btn-container ul li.active span {display: inline-block;}
.linkButton {float: right; padding-right: 10px; cursor: pointer;}
.linkButton i {font-size: 17px !important;}
.linkButton span {line-height: 36px; 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;}
.linkButton {position: absolute; top: 0px; right: 10px; line-height: 36px;}
html, body, .container, .main-content, .tabs, .tab-pane, .main-table {height: 100%;}
.tab-content {max-height: calc(100% - 36px); overflow: hidden}
.tab-content:hover {overflow: overlay}
.main-table > table {max-height: 100%;}

9
module/productplan/view/view.html.php
View File

@@ -54,7 +54,7 @@
<?php if($this->app->getViewType() == 'xhtml'):?>
<div class="plan-title"><?php echo $product->name . ' ' . $plan->title ?></div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -612,11 +612,10 @@
<?php js::set('orderBy', $orderBy)?>
<?php js::set('type', $type)?>
<script>
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);
}
</script>
<?php include '../../common/view/footer.html.php';?>

20
module/story/css/x.view.css
View File

@@ -1,21 +1,19 @@
#mainMenu .pull-left>a {display: none;}
#mainMenu .pull-left .divider {display: none;}
#mainMenu .pull-right {display: none;}
#mainContent .col-4 {display: none;}
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
#main {margin-bottom: 40px; min-width: unset;}
.main-actions {display: none;}
.col-8>.cell {min-height: 300px;}
.modal-dialog {width: 90%;}
#mainMenu {position: fixed; width: 100%; z-index: 999;}
#mainMenu .pull-left>a, #mainMenu .pull-left .divider, #mainMenu .pull-right, #mainContent .col-4, .main-actions {display: none;}
#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}
#scrollContent:hover {overflow: overlay;}
html, body, #main, .container { height: 100%;}
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
.btn span {line-height: 16px; vertical-align: middle;}
.col-8>.cell {min-height: 300px;}
.modal-dialog {width: 90%;}
.page-title {width: 100%;}
.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;}
.btn-toolbar {width: calc(100% - 30px);}
::-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);}

2
module/story/js/x.view.js
View File

@@ -32,7 +32,7 @@ $(function()
if(xuanAction != "<div class='xuancard-actions fixed'>")
{
var params = window.location.search;
if(params.indexOf('displayNotice=card') == -1)
if(params.indexOf('isNotice=1') == -1)
{
xuanAction += '</div>';
$('body').append(xuanAction);

11
module/story/view/view.html.php
View File

@@ -14,10 +14,10 @@
<?php include '../../common/view/kindeditor.html.php';?>
<?php $browseLink = $app->session->storyList ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product");?>
<?php js::set('sysurl', common::getSysUrl());?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'displayNotice=card') === false):?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
<div id="mainMenu" class="clearfix">
<?php if($this->app->getViewType() == 'xhtml'):?>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -600,11 +600,10 @@ js::set('cancel', $lang->cancel);
js::set('rawModule', $this->app->rawModule);
?>
<script>
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);
}
</script>
<?php include '../../common/view/syntaxhighlighter.html.php';?>

22
module/task/css/x.view.css
View File

@@ -1,21 +1,19 @@
#mainMenu .pull-left > a {display: none;}
#mainMenu .pull-left .divider {display: none;}
#mainMenu .pull-right {display: none;}
#mainContent .col-4 {display: none;}
body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
#main {margin-bottom: 40px; min-width: unset;}
.main-actions {display: none;}
.col-8 > .cell {min-height: 300px;}
.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;}
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;}
.col-8 > .cell {min-height: 300px;}
.modal-dialog {width: 90%;}
.page-title > .label-id {min-width: 25px; line-height: 13px;}
.page-title {width: 100%;}
.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;}
.btn-toolbar {width: calc(100% - 30px);}
::-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);}

2
module/task/js/x.view.js
View File

@@ -31,7 +31,7 @@ $(function()
if(xuanAction != "<div class='xuancard-actions fixed'>")
{
var params = window.location.search;
if(params.indexOf('displayNotice=card') == -1)
if(params.indexOf('isNotice=1') == -1)
{
xuanAction += '</div>';
$('body').append(xuanAction);

11
module/task/view/view.html.php
View File

@@ -14,10 +14,10 @@
<?php include '../../common/view/kindeditor.html.php';?>
<?php $browseLink = $app->session->taskList != false ? $app->session->taskList : $this->createLink('execution', 'browse', "executionID=$task->execution");?>
<?php js::set('sysurl', common::getSysUrl());?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'displayNotice=card') === false):?>
<?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
<div id="mainMenu" class="clearfix">
<?php if($this->app->getViewType() == 'xhtml'):?>
<div class="linkButton" onclick="linkButtonClicked()">
<div class="linkButton" onclick="handleLinkButtonClick()">
<span title="<?php echo $lang->viewDetails;?>">
<i class="icon icon-import icon-rotate-270"></i>
</span>
@@ -408,11 +408,10 @@
<?php common::printPreAndNext($preAndNext);?>
</div>
<script>
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);
}
</script>
<?php include '../../common/view/syntaxhighlighter.html.php';?>