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

Merge branch 'cyy_optimize' into 'master'

Browse Source 
* Modify product plan desc style.

See merge request easycorp/zentaopms!5901
This commit is contained in:
李玉春
2022-10-27 05:52:41 +00:00
parent b77d022234 b2629d9464
commit 954e5e6b14
14 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/issueblock.html.php
+2 -2
View File
@@ -32,8 +32,8 @@
<td class='c-id-xs'><?php echo sprintf('%03d', $issue->id);?></td>
<td class='c-name' title='<?php echo $issue->title?>'><?php echo html::a($this->createLink('issue', 'view', "issueID=$issue->id", '', '', $issue->project), $issue->title)?></td>
<?php if($longBlock):?>
<td class='c-pri'><?php echo zget($lang->issue->priList, $issue->pri)?></td>
<td class='c-severity'><?php echo zget($lang->issue->severityList, $issue->severity)?></td>
<td class='c-pri'><span class="label-pri label-pri-<?php echo $issue->pri;?>"><?php echo zget($lang->issue->priList, $issue->pri)?></span></td>
<td class='c-severity severity-issue severity-<?php echo $issue->severity;?>'><?php echo zget($lang->issue->severityList, $issue->severity)?></td>
<td class='c-deadline'><?php echo $issue->deadline == '0000-00-00' ? '' : $issue->deadline;?></td>
<?php endif;?>
<?php $status = $this->processStatus('issue', $issue);?>
module/block/view/todolist.html.php
+1 -1
View File
@@ -41,7 +41,7 @@
</td>
<td class="c-pri"><span class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></span></td>
<td class="c-name" title='<?php echo $todo->name;?>'><?php echo html::a($viewLink, $todo->name);?></td>
<td class='c-status'><?php echo zget($lang->todo->statusList, $todo->status);?></td>
<td class='c-status status-<?php echo $todo->status;?>'><?php echo zget($lang->todo->statusList, $todo->status);?></td>
</tr>
<?php endforeach;?>
</tbody>
module/bug/css/create.css
+2
View File
@@ -56,3 +56,5 @@ html[lang='de'] #keywordsAddonLabel, .task {width: 73px;}
#projectLabel {display: inline;}
#openedBuildLabel {display: inline; position: relative; width: 50%; left: 14%;}
#bugTypeInputGroup > .table-col {width: 40% !important;}
.pri-text > .label-pri {padding: 1px 5px;}
module/doc/view/index.html.php
+3 -3
View File
@@ -20,7 +20,7 @@
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->doc->orderByEdit;?></div>
<nav class="panel-actions nav nav-default">
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=byediteddate"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=byediteddate"), strtoupper($lang->more), '', "title='{$lang->more}'");?></li>
</nav>
</div>
<?php if(empty($latestEditedDocs)):?>
@@ -132,7 +132,7 @@
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->doc->myDoc;?></div>
<nav class="panel-actions nav nav-default">
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=openedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=openedbyme"), strtoupper($lang->more), '', "title='{$lang->more}'");?></li>
</nav>
</div>
<?php if(empty($myDocs)):?>
@@ -170,7 +170,7 @@
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->doc->myCollection;?></div>
<nav class="panel-actions nav nav-default">
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=collectedbyme"), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
<li><?php echo html::a($this->createLink('doc', 'browse', "browseType=collectedbyme"), strtoupper($lang->more), '', "title='{$lang->more}'");?></li>
</nav>
</div>
<?php if(empty($collectedDocs)):?>
module/my/css/testcase.css
+2
View File
@@ -0,0 +1,2 @@
.c-status, .c-type {width: 70px;}
.c-user {width: 80px;}
module/productplan/js/browse.js
+3 -3
View File
@@ -18,7 +18,7 @@ $(function()
var content = $content.find('div').html();
if(content.indexOf('<br') >= 0 || content.indexOf('<img') >= 0)
{
$content.append("<a href='###' class='more'><i class='icon icon-angle-right'></i></a>");
$content.append("<a href='###' class='more'><i class='icon icon-angle-right rotate-down'></i></a>");
}
});
@@ -192,14 +192,14 @@ $(document).on('click', 'td.content .more', function(e)
$toggle.removeClass('open');
$toggle.closest('.content').find('div').css('height', '25px');
$toggle.css('padding-top', 0);
$toggle.find('i').removeClass('rotate-down');
$toggle.find('i').addClass('rotate-down');
}
else
{
$toggle.addClass('open');
$toggle.closest('.content').find('div').css('height', 'auto');
$toggle.css('padding-top', ($toggle.closest('.content').find('div').height() - $toggle.height()) / 2);
$toggle.find('i').addClass('rotate-down');
$toggle.find('i').removeClass('rotate-down');
}
});
module/story/model.php
+1 -1
View File
@@ -4781,7 +4781,7 @@ class storyModel extends model
echo "<i class='icon-move'>";
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $story->pri . "' title='" . zget($this->lang->story->priList, $story->pri, $story->pri) . "'>";
echo "<span class='" . ($story->pri ? "label-pri label-pri-" . $story->pri : '') . "' title='" . zget($this->lang->story->priList, $story->pri, $story->pri) . "'>";
echo zget($this->lang->story->priList, $story->pri, $story->pri);
echo "</span>";
break;
module/testreport/view/blockcases.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
<td><?php echo zget($users, $case->assignedTo);?></td>
<td><?php echo zget($users, $case->lastRunner);?></td>
<td><?php echo substr($case->lastRunDate, 2);?></td>
<td><?php echo zget($lang->testcase->resultList, $case->lastRunResult);?></td>
<td class='result-testcase <?php echo $case->lastRunResult;?>'><?php echo zget($lang->testcase->resultList, $case->lastRunResult);?></td>
<?php $status = $this->processStatus('testcase', $case);?>
<td title='<?php echo $status;?>'>
<span class="status-case status-<?php echo $case->status?>"><?php echo $status;?></span>
module/testtask/css/browse.css
+1
View File
@@ -3,3 +3,4 @@
.c-name {width: 200px;}
.c-id {width: 60px;}
.c-user, .c-status {width: 80px;}
.status-blocked {left: -5px;}
module/testtask/view/linkcase.html.php
+2 -2
View File
@@ -116,8 +116,8 @@
<td><?php echo zget($users, $case->openedBy);?></td>
<td><?php echo zget($users, $case->lastRunner);?></td>
<td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='case-<?php echo $case->status?>'><?php echo $this->processStatus('testcase', $case);?></td>
<td class='result-testcase <?php echo $case->lastRunResult;?>'><?php echo $case->lastRunResult ? $lang->testcase->resultList[$case->lastRunResult] : $lang->testcase->unexecuted;?></td>
<td class='status-testcase status-<?php echo $case->status?>'><?php echo $this->processStatus('testcase', $case);?></td>
</tr>
<?php endforeach;?>
</tbody>
module/user/view/bug.html.php
+2 -2
View File
@@ -53,8 +53,8 @@
<tr class='text-center'>
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
<td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='c-severity'><span class='label-severity <?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
<td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td><?php echo zget($lang->bug->typeList, $bug->type, '');?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
module/user/view/story.html.php
+1 -1
View File
@@ -65,7 +65,7 @@
<?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
<tr class='text-left'>
<td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
<td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><span class='<?php echo "label-pri label-pri-{$story->pri} pri" . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><?php echo $story->productTitle;?></td>
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
<?php if($storyType != 'requirement' and $this->config->vision != 'lite'):?>
module/user/view/testcase.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
<tr class='text-left'>
<td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?></td>
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?></td>
<td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td class='c-pri'><span class='<?php if($case->pri) echo 'label-pri label-pri-' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td class='status-testcase status-<?php echo $case->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
<td><?php echo zget($users, $case->openedBy);?></td>
www/theme/default/style.css
+5 -2
View File
@@ -165,7 +165,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.status-draft {color: #8166EE;}
.status-clarify {color: #8166EE;}
.status-testtask.status-blocked {left: 0;}
.status-blocked {left: 0;}
.status-testcase.status-wait {color: #18A6FD;}
.status-done .label-dot {background-color: #0DBB7D;}
.status-reviewing, .status-noreview {color: #18A6FD;}
@@ -186,7 +186,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.status-wait, .status-active, .status-active.status-bug, .status-normal, .status-asked, #workflowTable td.text-center.text-warning, .result-testcase, .c-lastRunResult span, .status-unconfirmed {color: #313C52;}
.severity-issue.severity-1, .c-severity .severity-1 {color: #FB2B2B;}
.severity-issue.severity-2, .c-severity .severity-2 {color: #FF9F44;}
.severity-issue.severity-2, .c-severity .severity-2 {color: #FF9F42;}
.severity-issue.severity-3, .c-severity .severity-3 {color: #18A6FD;}
.severity-issue.severity-4, .c-severity .severity-3 {color: #313C52;}
@@ -222,3 +222,6 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.flow-block .footerbar span.label-success {background-color: #0DBB7D;}
.flow-block .footerbar span.label-default {background-color: #9EA3B0;}
.flow-block .footerbar span.label-warning {background-color: #313C52;}
.btn.disabled {pointer-events: auto;}
.btn.disabled i {color: #313c52;}