* code for task #2288.

This commit is contained in:
wangyidong
2015-09-02 10:13:15 +08:00
parent 645fe34e18
commit 79fea4c0b1
6 changed files with 29 additions and 13 deletions
+2 -2
View File
@@ -45,8 +45,8 @@ $lang->build->linkStories = '相关需求';
$lang->build->unlinkStory = '移除需求';
$lang->build->linkBugs = '相关Bug';
$lang->build->unlinkBug = '移除Bug';
$lang->build->stories = '已解决需求';
$lang->build->bugs = '已解决Bug';
$lang->build->stories = '需求';
$lang->build->bugs = 'Bug';
$lang->build->generatedBugs = '产生的Bug';
$lang->build->finishStories = ' 本次共完成 %s 个需求';
+6 -2
View File
@@ -1,4 +1,8 @@
<style>#actionbox a{font-weight:normal}</style>
<style>
#actionbox a{font-weight:normal}
.col-side fieldset#actionbox{padding-right:5px;}
.col-side #actionbox #historyItem li span.item{white-space:nowrap}
</style>
<script language='Javascript'>
var fold = '<?php echo $lang->fold;?>';
var unfold = '<?php echo $lang->unfold;?>';
@@ -132,7 +136,7 @@ $(function()
if($action->action == 'assigned' and isset($users[$action->extra]) ) $action->extra = $users[$action->extra];
if(strpos($action->actor, ':') !== false) $action->actor = substr($action->actor, strpos($action->actor, ':') + 1);
?>
<span>
<span class='item'>
<?php $this->action->printAction($action);?>
<?php if(!empty($action->history)) echo "<a id='switchButton$i' class='switch-btn btn-icon' onclick='switchChange($i)' href='javascript:;'><i class='change-show icon-'></i></a>";?>
</span>
+4 -4
View File
@@ -23,14 +23,14 @@ $lang->productplan->batchUnlink = "批量移除";
$lang->productplan->linkStory = "关联需求";
$lang->productplan->unlinkStory = "移除需求";
$lang->productplan->batchUnlinkStory = "批量移除需求";
$lang->productplan->linkedStories = '已关联需求列表';
$lang->productplan->unlinkedStories = '未关联需求列表';
$lang->productplan->linkedStories = '需求';
$lang->productplan->unlinkedStories = '未关联需求';
$lang->productplan->linkBug = "关联Bug";
$lang->productplan->unlinkBug = "移除Bug";
$lang->productplan->batchUnlinkBug = "批量移除Bug";
$lang->productplan->linkedBugs = '已关联Bug列表';
$lang->productplan->unlinkedBugs = '未关联Bug列表';
$lang->productplan->linkedBugs = 'Bug';
$lang->productplan->unlinkedBugs = '未关联Bug';
$lang->productplan->confirmDelete = "您确认删除该计划吗?";
$lang->productplan->confirmUnlinkStory = "您确认移除该需求吗?";
+4 -4
View File
@@ -40,8 +40,8 @@ $lang->release->linkStories = '相关需求';
$lang->release->unlinkStory = '移除需求';
$lang->release->linkBugs = '相关Bug';
$lang->release->unlinkBug = '移除Bug';
$lang->release->stories = '已完成需求';
$lang->release->bugs = '已解决Bug';
$lang->release->stories = '需求';
$lang->release->bugs = 'Bug';
$lang->release->generatedBugs = '遗留Bug';
$lang->release->finishStories = '本次共完成 %s 个需求';
$lang->release->resolvedBugs = '本次共解决 %s 个Bug';
@@ -52,6 +52,6 @@ $lang->release->filePath = '下载地址:';
$lang->release->scmPath = '版本库地址:';
$lang->release->exportTypeList['all'] = '所有';
$lang->release->exportTypeList['story'] = '已完成需求';
$lang->release->exportTypeList['bug'] = '已解决Bug';
$lang->release->exportTypeList['story'] = '需求';
$lang->release->exportTypeList['bug'] = 'Bug';
$lang->release->exportTypeList['newbug'] = '遗留Bug';
+12
View File
@@ -1323,12 +1323,24 @@ function computePasswordStrength(password)
return strength;
}
/**
* Check onlybody page when it is not open in modal then location to on onlybody page.
*
* @access public
* @return void
*/
function checkOnlybodyPage()
{
if(location.href == top.location.href) location.href = location.href.replace('onlybody=yes', '');
}
/* Ping the server every some minutes to keep the session. */
needPing = true;
/* When body's ready, execute these. */
$(document).ready(function()
{
if(onlybody == 'yes') checkOnlybodyPage();
$('body').addClass('m-{currentModule}-{currentMethod}'.format(config));
setModal();
+1 -1
View File
@@ -49,7 +49,7 @@ tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: righ
/* columns */
.row-table {display: table; width: 100%}
.col-side, .col-main {padding: 0; display: table-cell; vertical-align: top;}
.col-side {width: 350px; padding-left: 10px;}
.col-side {width: 350px; max-width:350px; padding-left: 10px;}
.col-main {padding-right: 10px;}
.row-table-side-left .col-side {padding-right: 10px; padding-left: 0;}
.row-table-side-left .col-main {padding-left: 10px; padding-right: 0;}