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

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

Browse Source
This commit is contained in:
xia0ta0
2014-06-25 11:38:38 +08:00
parent 60bcd3bdef edfafc1047
commit c3dac010d7
16 changed files with 19 additions and 1238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
6.0.beta1
6.0.stable
module/action/lang/zh-cn.php
+1 -1
View File
@@ -128,7 +128,7 @@ $lang->action->label->linked2project = '关联项目';
$lang->action->label->unlinkedfromproject = '移除项目';
$lang->action->label->started = '开始了';
$lang->action->label->recordestimate = '记录了工时';
$lang->action->label->editestimate = '编辑工时';
$lang->action->label->editestimate = '编辑了工时';
$lang->action->label->canceled = '取消了';
$lang->action->label->finished = '完成了';
$lang->action->label->login = '登录系统';
module/action/lang/zh-tw.php
+1 -1
View File
@@ -128,7 +128,7 @@ $lang->action->label->linked2project = '關聯項目';
$lang->action->label->unlinkedfromproject = '移除項目';
$lang->action->label->started = '開始了';
$lang->action->label->recordestimate = '記錄了工時';
$lang->action->label->editestimate = '編輯工時';
$lang->action->label->editestimate = '編輯了工時';
$lang->action->label->canceled = '取消了';
$lang->action->label->finished = '完成了';
$lang->action->label->login = '登錄系統';
module/bug/view/browse.html.php
+1 -1
View File
@@ -61,7 +61,7 @@ js::set('moduleID', $moduleID);
<div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
</div>
<div class='side' id='treebox'>
<a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>
<a class='side-handle' data-id='bugTree'><i class='icon-caret-left'></i></a>
<div class='side-body'>
<div class='panel panel-sm'>
<div class='panel-heading nobr'>
module/common/lang/en.php
+1 -1
View File
@@ -9,7 +9,7 @@
* @version $Id: en.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->arrow = '&nbsp;<span class="icon-angle-right"></span>';
$lang->arrow = '&nbsp;<i class="icon-angle-right"></i>&nbsp;';
$lang->colon = '::';
$lang->comma = ',';
$lang->dot = '.';
module/common/lang/zh-cn.php
+1 -1
View File
@@ -9,7 +9,7 @@
* @version $Id: zh-cn.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->arrow = '&nbsp;<span class="icon-angle-right"></span>';
$lang->arrow = '&nbsp;<i class="icon-angle-right"></i>&nbsp;';
$lang->colon = '::';
$lang->comma = '，';
$lang->dot = '。';
module/common/lang/zh-tw.php
+1 -1
View File
@@ -9,7 +9,7 @@
* @version $Id: zh-tw.php 5116 2013-07-12 06:37:48Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->arrow = '&nbsp;<span class="icon-angle-right"></span>';
$lang->arrow = '&nbsp;<i class="icon-angle-right"></i>&nbsp;';
$lang->colon = '::';
$lang->comma = '，';
$lang->dot = '。';
module/project/view/task.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
<?php js::set('browseType', $browseType);?>
<div class='side' id='taskTree'>
<a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>
<a class='side-handle' data-id='projectTree'><i class='icon-caret-left'></i></a>
<div class='side-body'>
<div class='panel panel-sm'>
<div class='panel-heading nobr'>
module/testcase/view/browse.html.php
+1 -1
View File
@@ -55,7 +55,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
<div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
</div>
<div class='side' id='treebox'>
<a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>
<a class='side-handle' data-id='testcaseTree'><i class='icon-caret-left'></i></a>
<div class='side-body'>
<div class='panel panel-sm'>
<div class='panel-heading nobr'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $productName;?></strong></div>
module/testtask/control.php
+2 -2
View File
@@ -205,7 +205,7 @@ class testtask extends control
* @access public
* @return void
*/
public function cases($taskID, $browseType = 'byModule', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function cases($taskID, $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save the session. */
$this->app->loadLang('testcase');
@@ -268,7 +268,7 @@ class testtask extends control
$caseQuery = $this->loadModel('search')->replaceDynamic($caseQuery);
$caseQuery = preg_replace('/`(\w+)`/', 't2.`$1`', $caseQuery);
$this->view->runs = $this->dao->select('t2.*,t1.*')->from(TABLE_TESTRUN)->alias('t1')
$this->view->runs = $this->dao->select('t2.*,t1.*, t2.version as caseVersion')->from(TABLE_TESTRUN)->alias('t1')
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
->where($caseQuery)
->andWhere('t1.task')->eq($taskID)
module/testtask/js/cases.js
-22
View File
@@ -1,19 +1,3 @@
function browseByModule(active)
{
$('#bymoduleTab').addClass('active');
$('#' + active + 'Tab').removeClass('active');
$('#querybox').addClass('hidden');
}
/* Swtich to search module. */
function browseBySearch(active)
{
$('#querybox').removeClass('hidden');
$('#' + active + 'Tab').removeClass('active');
$('#bysearchTab').addClass('active');
$('#bymoduleTab').removeClass('active');
}
$(document).ready(function()
{
setModal4List('runCase', 'caseList', function(){$(".iframe").modalTrigger({width:1024, type:'iframe'});}, 1024);
@@ -21,9 +5,3 @@ $(document).ready(function()
$('#module' + moduleID).addClass('active');
if(browseType == 'bysearch') ajaxGetSearchForm();
});
$(document).ready(function()
{
$('#' + browseType + 'Tab').addClass('active');
$('#module' + moduleID).addClass('active');
});
module/testtask/view/cases.html.php
+2 -3
View File
@@ -22,10 +22,9 @@ var moduleID = '<?php echo $moduleID;?>';
<div class='heading'><?php echo html::icon($lang->icons['usecase']);?></div>
<nav class='nav'>
<?php
echo "<li id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->testtask->byModule . "</a></li> ";
echo "<li id='allTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), $lang->testtask->allCases) . "</li>";
echo "<li id='assignedtomeTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), $lang->testtask->assignedToMe) . "</li>";
echo "<li id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></li> ";
echo "<li id='bysearchTab'><a href='#'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></li> ";
?>
</nav>
<div class='actions'>
@@ -42,7 +41,7 @@ var moduleID = '<?php echo $moduleID;?>';
<div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
</div>
<div class='side' id='casesbox'>
<a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>
<a class='side-handle' data-id='testtaskTree'><i class='icon-caret-left'></i></a>
<div class='side-body'>
<div class='panel panel-sm'>
<div class='panel-heading nobr'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $productName;?></strong></div>
module/user/control.php
+1
View File
@@ -857,6 +857,7 @@ class user extends control
$this->view->position[] = $this->lang->user->manageContacts;
$this->view->lists = $this->user->getContactLists($this->app->user->account);
$this->view->users = $users;
$this->view->listID = $listID;
$this->view->mode = $mode;
$this->display();
}
module/user/view/managecontacts.html.php
+3 -3
View File
@@ -16,9 +16,6 @@
<span class='prefix' title='COMPANY'><?php echo html::icon($lang->icons['company']);?></span>
<strong><small class='text-muted'><?php echo html::icon('cogs');?></small> <?php echo $lang->user->contacts->manage;?></strong>
</div>
<div class='actions'>
<?php if($mode != 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger'");?>
</div>
</div>
<div class='row'>
<div class='col-md-3 col-lg-2'>
@@ -38,6 +35,9 @@
<div class='panel panel-sm'>
<div class='panel-heading'>
<i class='icon-cogs'></i> <strong><?php echo $lang->user->contacts->manage;?></strong>
<div class='panel-actions pull-right'>
<?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger'");?>
</div>
</div>
<div class='panel-body'>
<table class='table table-form table-fixed'>
www/js/my.min.js
Vendored
+1 -1199
View File
File diff suppressed because it is too large Load Diff
www/theme/default/style.css
+1
View File
@@ -432,6 +432,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
.sub-featurebar > .nav > li.active > a {color: #333; font-weight: bold;}
#featurebar.with-sub > .nav > li.active > a {border: 1px solid #ddd; position: relative; border-bottom: none; background: #fff; padding: 2px 15px 5px}
.treeview > li > a.active { font-weight:bold;}
/* Title bar. */
#titlebar {margin: -20px -20px 20px; background: #F8FAFE; border-bottom: 1px solid #e5e5e5; min-height: 46px; min-height: 20px\0; padding: 13px 20px; vertical-align: bottom; position: relative;}