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

* adjust the action history.

Browse Source
This commit is contained in:
wangchunsheng
2010-09-03 02:57:20 +00:00
parent f88128ab18
commit 90474e935f
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/view.html.php
+1 -1
View File
@@ -53,7 +53,7 @@
<div class='yui-b'>
<fieldset>
<legend><?php echo $lang->bug->legendSteps;?></legend>
<div class='content'><?php echo html::parseUBB($bug->steps);?></div>
<div class='steps'><?php echo html::parseUBB($bug->steps);?></div>
</fieldset>
<fieldset>
<legend><?php echo $lang->bug->legendAttatch;?></legend>
module/common/lang/en.php
+2 -1
View File
@@ -60,7 +60,8 @@ $lang->actions = 'Actions';
$lang->comment = 'Comment';
$lang->history = 'History';
$lang->attatch = 'Attatch';
$lang->reverse = '(Reverse)';
$lang->reverse = '[Reverse]';
$lang->switchDisplay= '[Toggle Show]';
$lang->addFiles = 'Add Files';
$lang->files = 'Files ';
module/common/lang/zh-cn.php
+2 -1
View File
@@ -60,7 +60,8 @@ $lang->actions = '操作';
$lang->comment = '备注';
$lang->history = '历史记录';
$lang->attatch = '附件';
$lang->reverse = '（切换顺序）';
$lang->reverse = '[切换顺序]';
$lang->switchDisplay= '[切换显示]';
$lang->addFiles = '上传了附件 ';
$lang->files = '附件 ';
module/common/view/action.html.php
+11 -5
View File
@@ -4,10 +4,16 @@
<?php if($actionTheme == 'fieldset'):?>
<div>
<fieldset>
<legend onclick='$("#historyItem li").reverseOrder();' class='hand'><?php echo $lang->history . $lang->reverse;?></legend>
<legend>
<span onclick='$("#historyItem li").reverseOrder();' class='hand'> <?php echo $lang->history . $lang->reverse;?></span>
<span onclick='$(".changes").toggle();' class='hand'><?php echo $lang->switchDisplay;?></span>
</legend>
<?php else:?>
<table class='table-1'>
<caption onclick='$("#historyItem li").reverseOrder();' class='hand'><?php echo $lang->history . $lang->reverse;?></caption>
<caption>
<span onclick='$("#historyItem li").reverseOrder();' class='hand'> <?php echo $lang->history . $lang->reverse;?></span>
<span onclick='$(".changes").toggle();' class='hand'><?php echo $lang->switchDisplay;?></span>
</caption>
<tr><td>
<?php endif;?>
@@ -21,10 +27,10 @@
?>
<span><?php $this->action->printAction($action);?>
<?php if(!empty($action->comment) or !empty($action->history)):?>
<div class='history'>
<div id='changes'><?php echo $this->action->printChanges($action->objectType, $action->history);?></div>
<?php if(!empty($action->comment)) echo "<div class='history'>";?>
<div class='changes'><?php echo $this->action->printChanges($action->objectType, $action->history);?></div>
<?php if($action->comment and $action->history) echo '<br />'; echo nl2br($action->comment);?>
</div>
<?php if(!empty($action->comment)) echo "</div>";?>
<?php endif;?>
</li>
<?php endforeach;?>
www/theme/default/style.css
+3 -1
View File
@@ -277,12 +277,14 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
#switcher {color:white; font-style:bold; background:red; cursor:pointer;}
/* 页面其他元素。*/
.history {border:1px solid #ccc; background:#f2f2f2; padding:10px; margin-top:10px; margin-bottom:10px; color:#333; line-height:20px;}
.history, .changes {border:1px solid #ccc; background:#f2f2f2; padding:10px; margin-top:10px; margin-bottom:10px; color:#333; line-height:20px;}
.history .changes {border:none; margin:0; padding:0}
.content {font-size:14px; padding:10px}
.roadmap {width:200px; margin:10px auto 10px auto; padding:10px; border:1px solid gray;}
.roadmap a{color:white;}
.release {background:darkgreen; color:white}
.plan {background:#9F9F5F;}
.steps {line-height:22px; font-size:14px}
/* 页脚。*/
#footer {width:100%; position:fixed; bottom:0; left:0; margin:0; color:#333; background-color:#CEE7F3; border-top:1px solid #59AED7;}