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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2016-02-23 15:43:37 +08:00
parent ea56bf4d25 98e7f59798
commit ae4fd31b3d
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/common/lang/en.php
View File

@@ -70,6 +70,9 @@ $lang->duplicate = '%s has the same title';
$lang->unfold = '+';
$lang->fold = '-';
$lang->preShortcutKey = '[Shortcut key:←]';
$lang->nextShortcutKey = '[Shortcut key:→]';
$lang->selectAll = 'All';
$lang->selectReverse = 'Inverse';
$lang->notFound = 'Sorry, the object not found.';

3
module/common/lang/zh-cn.php
View File

@@ -70,6 +70,9 @@ $lang->duplicate = '已有相同标题的%s';
$lang->unfold = '+';
$lang->fold = '-';
$lang->preShortcutKey = '[快捷键:←]';
$lang->nextShortcutKey = '[快捷键:→]';
$lang->selectAll = '全选';
$lang->selectReverse = '反选';
$lang->notFound = '抱歉，您访问的对象并不存在！';

4
module/common/model.php
View File

@@ -845,7 +845,7 @@ class commonModel extends model
{
$id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->pre->case)) ? 'case' : 'id';
$title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
$title = '#' . $preAndNext->pre->$id . ' ' . $title;
$title = $lang->preShortcutKey . '#' . $preAndNext->pre->$id . ' ' . $title;
$link = $linkTemplate ? sprintf($linkTemplate, $preAndNext->pre->$id) : inLink('view', "ID={$preAndNext->pre->$id}");
echo html::a($link, '<i class="icon-pre icon-chevron-left"></i>', '', "id='pre' class='btn' title='{$title}'");
}
@@ -853,7 +853,7 @@ class commonModel extends model
{
$id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->next->case)) ? 'case' : 'id';
$title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name;
$title = '#' . $preAndNext->next->$id . ' ' . $title;
$title = $lang->nextShortcutKey . '#' . $preAndNext->next->$id . ' ' . $title;
$link = $linkTemplate ? sprintf($linkTemplate, $preAndNext->next->$id) : inLink('view', "ID={$preAndNext->next->$id}");
echo html::a($link, '<i class="icon-pre icon-chevron-right"></i>', '', "id='next' class='btn' title='$title'");
}

9
module/common/view/action.html.php
View File

@@ -2,6 +2,7 @@
#actionbox a{font-weight:normal}
.col-side fieldset#actionbox{padding-right:5px;}
.col-side #actionbox #historyItem li span.item{white-space:nowrap}
.changes blockquote{font-family: monospace, serif;}
</style>
<script language='Javascript'>
var fold = '<?php echo $lang->fold;?>';
@@ -29,15 +30,15 @@ function switchChange(historyID)
function toggleStripTags(obj)
{
var btn = $(obj);
var diffTag = btn.find('.diff-all');
var diffTag = btn.find('.icon-file-code');
if(diffTag.length)
{
diffTag.removeClass('diff-all').addClass('diff-short');
diffTag.removeClass('icon-file-code').addClass('diff-short');
btn.attr('title', '<?php echo $lang->action->textDiff?>');
}
else
{
btn.find('.diff-short').removeClass('diff-short').addClass('diff-all');
btn.find('.diff-short').removeClass('diff-short').addClass('icon-file-code');
btn.attr('title', '<?php echo $lang->action->original?>');
}
var boxObj = $(obj).next();
@@ -89,7 +90,7 @@ function toggleComment(actionID)
$(function()
{
var diffButton = "<a href='javascript:;' onclick='toggleStripTags(this)' class='changeDiff btn-icon' style='display:none;' title='<?php echo $lang->action->original?>'><i class='icon- diff-all'></i></a>";
var diffButton = "<a href='javascript:;' onclick='toggleStripTags(this)' class='changeDiff btn-icon' style='display:none;' title='<?php echo $lang->action->original?>'><i class='icon- icon-file-code'></i></a>";
var newBoxID = ''
var oldBoxID = ''
$('blockquote').each(function()