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:
chujilu
2014-08-21 20:46:14 +08:00
parent dffe80c44b f86236e92f
commit f0fab78987
22 changed files with 61 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
6.1.stable
6.2.stable
config/config.php
+1 -1
View File
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* Basic settings. */
$config = new config();
$config->version = '6.1'; // The version of zentaopms. Don't change it.
$config->version = '6.2'; // The version of zentaopms. Don't change it.
$config->charset = 'UTF-8'; // The charset of zentaopms.
$config->cookieLife = time() + 2592000; // The cookie life time.
$config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
module/action/lang/zh-cn.php
+1 -1
View File
@@ -137,7 +137,7 @@ $lang->action->label->recordestimate = '记录了工时';
$lang->action->label->editestimate = '编辑了工时';
$lang->action->label->canceled = '取消了';
$lang->action->label->finished = '完成';
$lang->action->label->paused = '暂停';
$lang->action->label->paused = '暂停了';
$lang->action->label->delayed = '延期';
$lang->action->label->suspended = '挂起';
$lang->action->label->login = '登录系统';
module/action/lang/zh-tw.php
+11
View File
@@ -91,10 +91,16 @@ $lang->action->desc->canceled = '$date, 由 <strong>$actor</strong> 取消
$lang->action->desc->svncommited = '$date, 由 <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>。' . "\n";
$lang->action->desc->gitcommited = '$date, 由 <strong>$actor</strong> 提交代碼，版本為<strong>#$extra</strong>。' . "\n";
$lang->action->desc->finished = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
$lang->action->desc->paused = '$date, 由 <strong>$actor</strong> 暫停。' . "\n";
$lang->action->desc->diff1 = '修改了 <strong><i>%s</i></strong>，舊值為 "%s"，新值為 "%s"。<br />' . "\n";
$lang->action->desc->diff2 = '修改了 <strong><i>%s</i></strong>，區別為：' . "\n" . "<blockquote>%s</blockquote>" . "\n<div class='hidden'>%s</div>";
$lang->action->desc->diff3 = '將檔案名 %s 改為 %s 。' . "\n";
$lang->action->desc->project = new stdclass();
$lang->action->desc->project->started = '$date, 由 <strong>$actor</strong> 啟動測試任務 <strong>$objectID</strong>。' . "\n";
$lang->action->desc->project->closed = '$date, 由 <strong>$actor</strong> 完成測試任務 <strong>$objectID</strong>。' . "\n";
$lang->action->desc->project->opened = '$date, 由 <strong>$actor</strong> 創建版本 <strong>$objectID</strong>。' . "\n";
/* 用來顯示動態信息。*/
$lang->action->label = new stdclass();
$lang->action->label->created = '創建';
@@ -131,8 +137,12 @@ $lang->action->label->recordestimate = '記錄了工時';
$lang->action->label->editestimate = '編輯了工時';
$lang->action->label->canceled = '取消了';
$lang->action->label->finished = '完成';
$lang->action->label->paused = '暫停';
$lang->action->label->delayed = '延期';
$lang->action->label->suspended = '掛起';
$lang->action->label->login = '登錄系統';
$lang->action->label->logout = "退出登錄";
$lang->action->label->deleteestimate = "刪除了工時";
/* 用來生成相應對象的連結。*/
$lang->action->label->product = '產品|product|view|productID=%s';
@@ -204,5 +214,6 @@ $lang->action->search->label['recordestimate'] = $lang->action->label->reco
$lang->action->search->label['editestimate'] = $lang->action->label->editestimate;
$lang->action->search->label['canceled'] = $lang->action->label->canceled;
$lang->action->search->label['finished'] = $lang->action->label->finished;
$lang->action->search->label['paused'] = $lang->action->label->paused;
$lang->action->search->label['login'] = $lang->action->label->login;
$lang->action->search->label['logout'] = $lang->action->label->logout;
module/bug/lang/zh-tw.php
+1
View File
@@ -113,6 +113,7 @@ $lang->bug->moduleBugs = '按模組';
$lang->bug->byQuery = '搜索';
$lang->bug->needConfirm = '需求變動';
$lang->bug->allProduct = '所有產品';
$lang->bug->ditto = '同上';
/* 頁面標籤。*/
$lang->bug->lblProductAndModule = '產品模組';
module/common/lang/zh-tw.php
+2 -1
View File
@@ -201,7 +201,7 @@ $lang->project->menu->doc = array('link' => '文檔|project|doc|porjectID=
$lang->project->menu->product = '產品|project|manageproducts|projectID=%s';
$lang->project->menu->view = array('link' => '概況|project|view|projectID=%s', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->menu->create = array('link' => '<i class="icon-plus"></i>&nbsp;添加項目|project|create', 'float' => 'right');
$lang->project->menu->all = array('link' => '<i class="icon-th-large"></i>&nbsp;所有項目|project|index|locate=no&status=all&projectID=%s', 'float' => 'right');
$lang->project->menu->all = array('link' => '<i class="icon-th-large"></i>&nbsp;所有項目|project|index|locate=no&status=undone&projectID=%s', 'float' => 'right');
$lang->task = new stdclass();
$lang->build = new stdclass();
@@ -460,6 +460,7 @@ $lang->icons['review'] = 'search';
$lang->icons['confirm'] = 'search';
$lang->icons['putoff'] = 'calendar';
$lang->icons['suspend'] = 'pause';
$lang->icons['pause'] = 'pause';
$lang->icons['cancel'] = 'ban-circle';
$lang->icons['recordEstimate'] = 'time';
$lang->icons['customFields'] = 'cogs';
module/common/view/kindeditor.html.php
+10 -3
View File
@@ -38,7 +38,7 @@ var fullTools =
$(document).ready(initKindeditor);
function initKindeditor(afterInit)
{
var nextFormControl = 'input:not([type="hidden"]), textarea';
var nextFormControl = 'input:not([type="hidden"]), textarea:not(.ke-edit-textarea), button[type="submit"], select';
$.each(editor.id, function(key, editorID)
{
editorTool = simpleTools;
@@ -112,10 +112,17 @@ function initKindeditor(afterInit)
var $next = $editor.next(nextFormControl);
if(!$next.length) $next = $editor.parent().next().find(nextFormControl);
if(!$next.length) $next = $editor.parent().parent().next().find(nextFormControl);
$next.first().focus();
$next = $next.first().focus();
var keditor = $next.data('keditor');
if(keditor) keditor.focus();
}
};
try {window.editor['#'] = window.editor[editorID] = K.create('#' + editorID, options);}
try
{
var keditor = K.create('#' + editorID, options);
window.editor['#'] = window.editor[editorID] = keditor;
$editor.data('keditor', keditor);
}
catch(e){}
});
module/custom/lang/zh-tw.php
+5
View File
@@ -21,6 +21,7 @@ $lang->custom->story->fields['reasonList'] = '關閉原因';
$lang->custom->story->fields['reviewResultList'] = '評審結果';
$lang->custom->story->fields['stageList'] = '階段';
$lang->custom->story->fields['statusList'] = '狀態';
$lang->custom->story->fields['review'] = '評審';
$lang->custom->task = new stdClass();
$lang->custom->task->fields['priList'] = '優先順序';
@@ -64,3 +65,7 @@ $lang->custom->confirmRestore = '是否要恢復預設語言配置？';
$lang->custom->notice = new stdclass();
$lang->custom->notice->userRole = '鍵的長度必須小於20個字元！';
$lang->custom->storyReview = '需求評審';
$lang->custom->reviewList[1] = '開啟';
$lang->custom->reviewList[0] = '關閉';
module/install/lang/zh-tw.php
+1 -2
View File
@@ -133,6 +133,5 @@ $lang->install->login = '登錄禪道管理系統';
$lang->install->register = '禪道社區註冊';
$lang->install->joinZentao = <<<EOT
<p>您已經成功安裝禪道管理系統%s，<strong class='text-danger'>請及時刪除install.php</strong>。</p>
<p>友情提示：為了您及時獲得禪道的最新動態，請在禪道社區(<a href='http://www.zentao.net' class='alert-link' target='_blank'>www.zentao.net</a>)進行登記。</p>
<p>您已經成功安裝禪道管理系統%s，<strong class='text-danger'>請及時刪除install.php</strong>。</p><p>友情提示：為了您及時獲得禪道的最新動態，請在禪道社區(<a href='http://www.zentao.net' class='alert-link' target='_blank'>www.zentao.net</a>)進行登記。</p>
EOT;
module/product/lang/zh-tw.php
+1
View File
@@ -76,6 +76,7 @@ $lang->product->activeStory = '激活';
$lang->product->changedStory = '已變更';
$lang->product->willClose = '待關閉';
$lang->product->closedStory = '已關閉';
$lang->product->unclosed = '未關閉';
$lang->product->allStory = '全部需求';
$lang->product->allProduct = '全部產品';
module/project/lang/zh-tw.php
+2
View File
@@ -55,6 +55,8 @@ $lang->project->noProduct = '無產品項目';
$lang->project->select = '--請選擇項目--';
$lang->project->createStory = "新增需求";
$lang->project->all = '所有';
$lang->project->undone = '未完成';
$lang->project->unclosed = '未關閉';
$lang->project->typeDesc = '運維項目禁用燃盡圖和需求。';
$lang->project->mine = '我負責：';
$lang->project->other = '其他：';
module/project/model.php
+1 -1
View File
@@ -854,7 +854,7 @@ class projectModel extends model
{
$this->loadModel('task');
$tasks = array();
$projectTasks = $this->task->getProjectTasks($fromProject, 'wait,doing,cancel');
$projectTasks = $this->task->getProjectTasks($fromProject, 'wait,doing,pause,cancel');
$tasks = array_merge($tasks, $projectTasks);
return $tasks;
}
module/release/lang/zh-tw.php
+1 -1
View File
@@ -32,7 +32,7 @@ $lang->release->linkStoriesAndBugs = '需求和Bug';
$lang->release->linkStories = '相關需求';
$lang->release->linkBugs = '相關Bug';
$lang->release->stories = '已關聯需求';
$lang->release->bugs = '已關聯Bugs';
$lang->release->bugs = '已關聯Bug';
$lang->release->ajaxGetStoriesAndBugs = '介面：獲得需求和Bug';
$lang->release->finishStories = '本次共完成需求%s個';
$lang->release->resolvedBugs = '本次共解決Bug%s個';
module/task/lang/zh-tw.php
+3
View File
@@ -22,6 +22,7 @@ $lang->task->logEfforts = "記錄工時";
$lang->task->record = "工時";
$lang->task->start = "開始";
$lang->task->finish = "完成";
$lang->task->pause = "暫停";
$lang->task->close = "關閉";
$lang->task->batchClose = "批量關閉";
$lang->task->cancel = "取消";
@@ -36,6 +37,7 @@ $lang->task->id = '編號';
$lang->task->project = '所屬項目';
$lang->task->module = '所屬模組';
$lang->task->story = '相關需求';
$lang->task->storySpec = '需求描述';
$lang->task->storyVersion = '需求版本';
$lang->task->name = '任務名稱';
$lang->task->type = '任務類型';
@@ -88,6 +90,7 @@ $lang->task->statusList[''] = '';
$lang->task->statusList['wait'] = '未開始';
$lang->task->statusList['doing'] = '進行中';
$lang->task->statusList['done'] = '已完成';
$lang->task->statusList['pause'] = '已暫停';
$lang->task->statusList['cancel'] = '已取消';
$lang->task->statusList['closed'] = '已關閉';
module/testcase/lang/zh-tw.php
+1
View File
@@ -45,6 +45,7 @@ $lang->testcase->allProduct = '所有產品';
$lang->testcase->fromBug = '來源Bug';
$lang->testcase->toBug = '生成Bug';
$lang->testcase->changed = '用例變更';
$lang->testcase->createBug = '轉Bug';
$lang->case = $lang->testcase; // 用於DAO檢查時使用。因為case是系統關鍵字，所以無法定義該模組為case，只能使用testcase，但表還是使用的case。
$lang->testcase->stepID = '編號';
module/testcase/view/browse.html.php
+1 -1
View File
@@ -75,7 +75,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
<td><?php echo $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='<?php if(isset($run)) echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
<td class='<?php if(isset($run)) echo $run->status;?> status-<?php echo $case->status?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
<td class='text-right'>
<?php
common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', 'play', '', 'runCase iframe');
module/testtask/view/browse.html.php
+1 -1
View File
@@ -44,7 +44,7 @@
<td><?php echo $users[$task->owner];?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td><?php echo $lang->testtask->statusList[$task->status];?></td>
<td class='status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
<td class='text-center'>
<?php
common::printIcon('testtask', 'cases', "taskID=$task->id", '', 'list', 'smile');
module/upgrade/lang/en.php
+1
View File
@@ -82,3 +82,4 @@ $lang->upgrade->fromVersions['5_2_1'] = '5.2.1';
$lang->upgrade->fromVersions['5_3'] = '5.3';
$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';
$lang->upgrade->fromVersions['6_0'] = '6.0';
$lang->upgrade->fromVersions['6_1'] = '6.1';
module/upgrade/lang/zh-cn.php
+1
View File
@@ -82,3 +82,4 @@ $lang->upgrade->fromVersions['5_2_1'] = '5.2.1';
$lang->upgrade->fromVersions['5_3'] = '5.3';
$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';
$lang->upgrade->fromVersions['6_0'] = '6.0';
$lang->upgrade->fromVersions['6_1'] = '6.1';
module/upgrade/lang/zh-tw.php
+1
View File
@@ -82,3 +82,4 @@ $lang->upgrade->fromVersions['5_2_1'] = '5.2.1';
$lang->upgrade->fromVersions['5_3'] = '5.3';
$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1';
$lang->upgrade->fromVersions['6_0'] = '6.0';
$lang->upgrade->fromVersions['6_1'] = '6.1';
module/upgrade/model.php
+3
View File
@@ -110,6 +110,8 @@ class upgradeModel extends model
case '6_0':
$this->execSQL($this->getUpgradeFile('6.0'));
$this->fixDataIndex();
case '6_1':
$this->execSQL($this->getUpgradeFile('6.1'));
default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
}
@@ -171,6 +173,7 @@ class upgradeModel extends model
case '5_3':
case '6_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('6.0.beta1'));
case '6_0': $confirmContent .= file_get_contents($this->getUpgradeFile('6.0'));
case '6_1': $confirmContent .= file_get_contents($this->getUpgradeFile('6.1'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
www/theme/default/style.css
+11 -7
View File
@@ -195,14 +195,21 @@ fieldset.actionbox ol {padding-top: 8px\0/;}
.stars-list {color: #E48600}
/* status in table */
td.done, td[class$="-done"], td.pass, td[class$="-pass"], td.resolved, td[class$="-resolved"] {color:#229f24;}
td.done, td[class$="-done"],
td.pass, td[class$="-pass"],
td.resolved, td[class$="-resolved"],
td.normal, td[class$="-normal"],
td.status-active, td[class$="-active"] {color:#229f24;}
td.wait, td[class$="-wait"] {color:#808080;}
td.cancel, td[class$="-cancel"] {color:#999;}
td.doing, td[class$="-doing"] {color:#d2322d;}
td.pause, td[class$="-pause"] {color:#E48600;}
td.closed, td[class$="-closed"],
td.cancel, td[class$="-cancel"] {color:#888;}
td.doing, td[class$="-doing"],
td.changed, td[class$="-changed"],
td.investigate, td[class$="-investigate"] {color:#d2322d;}
td.delayed, td[class$="-delayed"] {background:#e84e0f!important; color:white;}
td.blocked, td[class$="-blocked"] {background:yellow!important;}
td.fail, td[class$="-fail"] {color:#d2322d}
td.status-active, td[class$="-active"] {color: #e48600;}
td.draft, td[class$="-draft"] {color:#8957a1}
/* tabs */
@@ -320,9 +327,6 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin
.list-group-item.active,.list-group-item.active:hover {background: #fff; border-color: #ddd; background: #f1f1f1; color: #333; font-weight: bold;}
.list-group-item.active > a {color: #333}
/* Bug status */
.bug-closed, .bug-closed a {color: #808080; text-decoration: line-through;}
/* progressbar */
.progressbar {display: inline-block; height: 16px; background: #229F24; position: relative; top: 1px}