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
2018-05-18 10:33:49 +08:00
parent 61c2e0c6e7 44de16b021
commit da161f111b
27 changed files with 105 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
10.0.beta
10.0.alpha
config/config.php
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '10.0.beta'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '10.0.alpha'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
$config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php.
db/update10.0.beta.sql → db/update9.8.3.sql
View File
module/branch/lang/en.php
+1
View File
@@ -3,6 +3,7 @@ $lang->branch->common = 'Branch';
$lang->branch->manage = 'Manage a Branch';
$lang->branch->sort = 'Sort';
$lang->branch->delete = 'Delete Branch';
$lang->branch->add = 'Add';
$lang->branch->manageTitle = '%s Management';
$lang->branch->all = 'All';
module/bug/js/browse.js
+9 -11
View File
@@ -1,36 +1,34 @@
$(document).ready(function()
$(function()
{
if(browseType == 'bysearch') ajaxGetSearchForm();
if($('#bugList thead th.w-title').width() < 150) $('#bugList thead th.w-title').width(150);
if(flow == 'onlyTest')
{
$('#modulemenu > .nav').append($('#featurebar > .submenu').html());
toggleSearch();
$(".export").modalTrigger({width:650, type:'iframe'});
$('#modulemenu > .nav > li').removeClass('active');
$('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
$('#subNavbar > .nav > li').removeClass('active');
$('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
var navWidth = $('#modulemenu > .nav').width();
var navWidth = $('#subNavbar > .nav').width();
var leftWidth = 0;
var rightWidth = 0;
$rightNav = $('#modulemenu > .nav > li.right');
$rightNav = $('#subNavbar > .nav > li.right');
rightLength = $rightNav.length;
for(i = 0; i < rightLength; i++) rightWidth += $rightNav.eq(i).width();
var maxWidth = navWidth - $('#modulemenu > .nav > #bysearchTab').width() - rightWidth - 100;
var maxWidth = navWidth - $('#subNavbar > .nav > #bysearchTab').width() - rightWidth - 100;
$('#modulemenu > .nav > li:not(.right)').each(function()
$('#subNavbar > .nav > li:not(.right)').each(function()
{
if(leftWidth > maxWidth)
{
if($(this).attr('id') != 'moreMenus' && $(this).attr('id') != 'bysearchTab')
{
$('#moreMenus').removeClass('hidden');
$('#moreMenus > ul').append($(this)[0]);
$('#subNavbar').removeClass('hidden');
$('#subNavbar > ul').append($(this)[0]);
}
}
else
module/bug/view/edit.html.php
+7 -4
View File
@@ -65,10 +65,13 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<?php echo html::textarea('comment', '', "rows='5' class='form-control kindeditor' hidefocus='true'");?>
</div>
</div>
<div class='form-group'><?php echo $this->fetch('file', 'buildform');?></div>
<div class="detail">
<div class="detail-title"><?php echo $lang->files;?></div>
<div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
</div>
<div class='actions actions-form text-center'>
<?php
<?php
echo html::hidden('lastEditedDate', $bug->lastEditedDate);
echo html::submitButton('', '', 'btn btn-wide btn-primary');
$browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
@@ -98,7 +101,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<th><?php echo $lang->bug->module;?></th>
<td>
<div class='input-group' id='moduleIdBox'>
<?php
<?php
echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated()' class='form-control chosen'");
if(count($moduleOptionMenu) == 1)
{
@@ -125,7 +128,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<td>
<?php
/**
* Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task.
* Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task.
* These thress types if upgrade from bugfree2.x.
*/
if($bug->type != 'designchange') unset($lang->bug->typeList['designchange']);
module/common/lang/en.php
+1 -1
View File
@@ -244,7 +244,7 @@ $lang->project->subMenu->list->tree = 'Tree View|project|tree|projectID=%s'
$lang->project->subMenu->qa = new stdclass();
$lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s';
$lang->project->subMenu->qa->build = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build');
$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport');
$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
$lang->project->subMenu->action = new stdclass();
$lang->project->subMenu->action->dynamic = 'Dynamic|project|dynamic|projectID=%s';
module/common/lang/zh-cn.php
+1 -1
View File
@@ -244,7 +244,7 @@ $lang->project->subMenu->list->tree = '树状图|project|tree|projectID=%s'
$lang->project->subMenu->qa = new stdclass();
$lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s';
$lang->project->subMenu->qa->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport');
$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
$lang->project->subMenu->action = new stdclass();
$lang->project->subMenu->action->dynamic = '动态|project|dynamic|projectID=%s';
module/company/view/browse.html.php
+1 -1
View File
@@ -114,7 +114,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
<div class='table-footer'>
<?php if($canBatchEdit):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->edit);?></div>
<div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->edit, '', 'btn');?></div>
<?php endif;?>
<?php $pager->show('right', 'pagerjs');?>
</div>
module/doc/lang/en.php
+11 -6
View File
@@ -43,13 +43,21 @@ $lang->doc->download = 'Download';
$lang->doc->acl = 'Right';
$lang->doc->groups = 'Groups';
$lang->doc->users = 'Users';
$lang->doc->item = 'Item';
$lang->doc->searchResult = 'Search Result';
$lang->doc->moduleDoc = 'By Module';
$lang->doc->searchDoc = 'Search';
$lang->doc->fast = 'Fast access';
$lang->doc->allDoc = 'All';
$lang->doc->openedByMe = 'My';
$lang->doc->orderByOpen = 'Recently Added';
$lang->doc->orderByEdit = 'Recently Modifie';
$lang->doc->orderByEdit = 'Recently Modified';
$lang->doc->orderByVisit = 'Recently Visited';
$lang->doc->todayEdited = 'Today Modified';
$lang->doc->pastEdited = 'Past Modified';
$lang->doc->myDoc = 'My Doc';
$lang->doc->myCollection = 'My Collection';
/* 方法列表。*/
$lang->doc->index = 'Home';
@@ -65,6 +73,7 @@ $lang->doc->editType = 'Edit';
$lang->doc->deleteType = 'Delete';
$lang->doc->addType = 'Add';
$lang->doc->childType = 'Child';
$lang->doc->collect = 'Collect';
$lang->doc->libName = 'Name';
$lang->doc->libType = 'Category';
@@ -109,11 +118,7 @@ $lang->doc->contentTypeList['markdown'] = 'MarkDown';
$lang->doc->browseType = 'Categories';
$lang->doc->browseTypeList['list'] = 'List';
$lang->doc->browseTypeList['menu'] = 'Menu';
$lang->doc->browseTypeList['tree'] = 'Tree';
$lang->doc->browseTypeList['card'] = 'Card';
$lang->doc->orderByOpen = 'Recently Added';
$lang->doc->browseTypeList['grid'] = 'Card';
$lang->doc->fastMenuList['byediteddate'] = 'Recently Modified';
//$lang->doc->fastMenuList['visiteddate'] = 'Recently Visited';
module/extension/lang/en.php
+1
View File
@@ -105,6 +105,7 @@ $lang->extension->errorDownloadPathNotWritable = 'Extensiond ownload path <stron
$lang->extension->errorPackageFileExists = '<strong>%s</strong> has existed in the download path.<h5> Please %s it again, <a href="%s" class="alert-link">CLICK HERE</a></h5>';
$lang->extension->errorDownloadFailed = 'Download failed. Please try it again. If still not OK, try to download it manually and upload it to install.';
$lang->extension->errorMd5Checking = 'Incomplete File. Please download it again. If still not OK, try to download it manually and upload it to install.';
$lang->extension->errorCheckIncompatible = 'Incompatible with this version of ZenTao. It may not be used %s later.<h5>You can choose to <a href="%s" class="btn btn-sm">force%s</a> or <a href="#" onclick=parent.location.href="%s" class="btn btn-sm">cancel</a></h5>';
$lang->extension->errorFileConflicted = '<br />%s <h5> is conflicted with others. Choose <a href="%s" class="btn btn-sm">Override</a> or <a href="#" onclick=parent.location.href="%s" class="btn btn-sm">Cancel</a></h5>';
$lang->extension->errorPackageNotFound = '<strong>%s </strong> is not found. Downloading might be failed. Please download it again.';
$lang->extension->errorTargetPathNotWritable = '<strong>%s </strong> is not writable.';
module/group/lang/resource.php
+2
View File
@@ -691,6 +691,7 @@ $lang->resource->doc->allLibs = 'allLibs';
$lang->resource->doc->objectLibs = 'objectLibs';
$lang->resource->doc->showFiles = 'showFiles';
$lang->resource->doc->sort = 'sort';
$lang->resource->doc->collect = 'collect';
//$lang->resource->doc->diff = 'diff';
$lang->doc->methodOrder[0] = 'index';
@@ -706,6 +707,7 @@ $lang->doc->methodOrder[45] = 'allLibs';
$lang->doc->methodOrder[50] = 'showFiles';
$lang->doc->methodOrder[55] = 'objectLibs';
$lang->doc->methodOrder[60] = 'sort';
$lang->doc->methodOrder[65] = 'collect';
//$lang->doc->methodOrder[55] = 'diff';
/* mail. */
module/project/js/managemembers.js
+3 -3
View File
@@ -13,11 +13,11 @@ function setRole(account, roleID)
roleOBJ.val(role) // set the role.
}
function addItem()
function addItem(obj)
{
var item = $('#addItem').html().replace(/%i%/g, i);
$('#teamForm table tbody').append('<tr class="addedItem">' + item + '</tr>');
var accounts = $('#submit').closest('table').find('tr.addedItem:last').find('select:first')
$(obj).closest('tr').after('<tr class="addedItem">' + item + '</tr>');
var accounts = $('#hours' + i).closest('tr').find('select:first')
accounts.trigger('liszt:updated');
accounts.chosen();
i ++;
module/project/lang/en.php
+8
View File
@@ -23,6 +23,7 @@ $lang->project->days = 'Man-Day';
$lang->project->day = 'day';
$lang->project->workHour = 'Hour(s)';
$lang->project->totalHours = 'Working Hour(s)';
$lang->project->totalDays = 'Working Day(s)';
$lang->project->status = 'Status';
$lang->project->desc = 'Desc';
$lang->project->owner = 'Owner';
@@ -56,6 +57,8 @@ $lang->project->delayed = 'Delayed';
$lang->project->product = $lang->project->products;
$lang->project->readjustTime = 'Adjust project begin and end time';
$lang->project->readjustTask = 'Adjust task start date and deadline';
$lang->project->effort = 'Effort';
$lang->project->relatedMember = 'Related Member';
$lang->project->start = 'Start';
$lang->project->activate = 'Activate';
@@ -118,6 +121,7 @@ $lang->project->burnData = 'Burndown Data';
$lang->project->fixFirst = 'Edit Man-hour of 1st Day';
$lang->project->team = 'Team Member';
$lang->project->doc = 'Doc';
$lang->project->doclib = 'Doc Library';
$lang->project->manageProducts = 'Link ' . $lang->productCommon;
$lang->project->linkStory = 'Link Story';
$lang->project->linkStoryByPlan = 'Link Story From Plan';
@@ -187,6 +191,8 @@ $lang->project->aboveAllProject = "All the above {$lang->projectCommon}";
/* 页面提示。*/
$lang->project->selectProject = "Select {$lang->projectCommon}";
$lang->project->beginAndEnd = 'Duration';
$lang->project->begin = 'Begin';
$lang->project->end = 'End';
$lang->project->lblStats = 'Man-Hour Summary(h) : ';
$lang->project->stats = '<strong>%s</strong> Available, <strong>%s</strong> Total Estimated, <strong>%s</strong> Cost, <strong>%s</strong> Left.';
$lang->project->taskSummary = "Tasks on this page : <strong>%s</strong> Total, <strong>%s</strong> Wait, <strong>%s</strong> Doing; &nbsp;&nbsp;&nbsp; Hours : <strong>%s</strong> Est., <strong>%s</strong> Cost, <strong>%s</strong> Left.";
@@ -246,6 +252,8 @@ $lang->project->charts->burn->graph->formatNumber = 0;
$lang->project->charts->burn->graph->animation = 0;
$lang->project->charts->burn->graph->rotateNames = 1;
$lang->project->charts->burn->graph->showValues = 0;
$lang->project->charts->burn->graph->reference = 'Reference';
$lang->project->charts->burn->graph->actuality = 'Actuality';
$lang->project->placeholder = new stdclass();
$lang->project->placeholder->code = 'Abbreviation of project name';
module/project/view/managemembers.html.php
+6 -7
View File
@@ -58,8 +58,7 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, $member->limited);?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem()' class='disabled btn btn-link'><i class='icon icon-trash'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
</td>
</tr>
<?php $i ++; $memberCount ++;?>
@@ -76,7 +75,7 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-trash'></i></a>
</td>
</tr>
@@ -95,7 +94,7 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-trash'></i></a>
</td>
</tr>
@@ -114,15 +113,15 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-trash'></i></a>
</td>
</tr>
<?php $i ++; $memberCount ++;?>
<?php endfor;?>
</tbody>
<tfoot><tr><td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide'); ?></td></tr></tfoot>
</table>
<div class='table-footer text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide'); ?></div>
<?php js::set('i', $i);?>
</form>
</div>
@@ -139,7 +138,7 @@
</td>
<td><?php echo html::radio("limited[$i]", $lang->team->limitedList, $member->realname ? $member->limited : 'no');?></td>
<td class='c-actions'>
<a href='javascript:;' onclick='addItem()' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
<a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-trash'></i></a>
</td>
</tr>
module/project/view/team.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
</div>
</div>
<div id='mainContent'>
<form class='main-table' data-ride='table'>
<form class='main-table'>
<table class='table' id='memberList'>
<thead>
<tr>
module/search/lang/en.php
+1 -1
View File
@@ -17,7 +17,7 @@ $lang->search->group1 = 'Group 1';
$lang->search->group2 = 'Group 2';
$lang->search->buildForm = 'Search Form';
$lang->search->buildQuery = 'Execute Query';
$lang->search->saveQuery = 'Save Query';
$lang->search->savedQuery = 'Save Query';
$lang->search->deleteQuery = 'Delete Query';
$lang->search->setQueryTitle = 'Enter the query title. Save it After searching.';
$lang->search->select = 'Stories/Tasks Filter';
module/task/css/create.css
+1
View File
@@ -0,0 +1 @@
#copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/
module/task/js/create.js
+2
View File
@@ -75,6 +75,7 @@ function setPreview()
{
$('#preview').addClass('hidden');
$('#copyButton').addClass('hidden');
$('div.colorpicker').css('right', '1px');//Adjust for task #4151;
}
else
{
@@ -84,6 +85,7 @@ function setPreview()
$('#preview').removeClass('hidden');
$('#preview a').attr('href', storyLink);
$('#copyButton').removeClass('hidden');
$('div.colorpicker').css('right', '57px');//Adjust for task #4151;
}
setAfter();
module/task/lang/en.php
+9 -7
View File
@@ -110,13 +110,15 @@ $lang->task->parentAB = 'Parent Task';
$lang->task->lblPri = 'P';
$lang->task->lblHour = '(h)';
$lang->task->ditto = 'Ditto';
$lang->task->dittoNotice = "This Task does not belong to the Project as the previous one does!";
$lang->task->selectAllUser = 'All';
$lang->task->noStory = 'No Story';
$lang->task->noAssigned = 'Unassigned';
$lang->task->noFinished = 'Unfinished';
$lang->task->noClosed = 'Unclosed';
$lang->task->ditto = 'Ditto';
$lang->task->dittoNotice = "This Task does not belong to the Project as the previous one does!";
$lang->task->selectAllUser = 'All';
$lang->task->noStory = 'No Story';
$lang->task->noAssigned = 'Unassigned';
$lang->task->noFinished = 'Unfinished';
$lang->task->noClosed = 'Unclosed';
$lang->task->yesterdayFinished = 'Finishied Yesterday';
$lang->task->allTasks = 'All Tasks';
$lang->task->statusList[''] = '';
$lang->task->statusList['wait'] = 'Wait';
module/task/view/create.html.php
+2 -2
View File
@@ -66,13 +66,13 @@
<tr>
<th><?php echo $lang->task->name;?></th>
<td colspan='3'>
<div class="input-control has-icon-right">
<div class="input-control has-icon-left has-icon-right">
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
</ul>
<input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#name" data-provide="colorpicker">
<input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-left" data-update-color="#name" data-provide="colorpicker">
</div>
<?php echo html::input('name', $task->name, "class='form-control' autocomplete='off' required");?>
<?php if($this->config->global->flow != 'onlyTask'):?>
module/task/view/edit.html.php
+23 -18
View File
@@ -30,26 +30,31 @@
<div class='main-row'>
<div class='main-col col-8'>
<div class='cell'>
<div class='form-group'>
<div class='input-group'>
<div class="input-control has-icon-right">
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
</ul>
<input type="hidden" class="colorpicker" id="color" name="color" value="<?php echo $task->color ?>" data-icon="color" data-wrapper="input-control-icon-right" data-update-color=".task-name" data-provide="colorpicker">
<div class='detail'>
<div class='detail-title'><?php echo $lang->task->name;?></div>
<div class='detail-content'>
<div class='form-group'>
<div class='<?php if(empty($task->children) and empty($task->parent) and $task->type != 'affair') echo 'input-group';?>'>
<div class="input-control has-icon-right">
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" title="<?php echo $lang->task->colorTag ?>"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->task->colorTag;?><i class="icon icon-close"></i></li>
</ul>
<input type="hidden" class="colorpicker" id="color" name="color" value="<?php echo $task->color ?>" data-icon="color" data-wrapper="input-control-icon-right" data-update-color=".task-name" data-provide="colorpicker">
</div>
<?php echo html::input('name', $task->name, 'class="form-control task-name" autocomplete="off" placeholder="' . $lang->task->name . '"');?>
</div>
<?php if(empty($task->children) and empty($task->parent) and $task->type != 'affair'):?>
<span class='input-group-addon'>
<div class='checkbox-primary'>
<input type='checkBox' name='multiple' id='multiple' value='1' <?php echo empty($task->team) ? '' : 'checked';?> />
<label for='multiple'><?php echo $lang->task->multipleAB;?></label>
</div>
</span>
<?php endif;?>
</div>
<?php echo html::input('name', $task->name, 'class="form-control task-name" autocomplete="off" placeholder="' . $lang->task->name . '"');?>
</div>
<?php if(empty($task->children) and empty($task->parent) and $task->type != 'affair'):?>
<span class='input-group-addon'>
<div class='checkbox-primary'>
<input type='checkBox' name='multiple' id='multiple' value='1' <?php echo empty($task->team) ? '' : 'checked';?> />
<label for='multiple'><?php echo $lang->task->multipleAB;?></label>
</div>
</span>
<?php endif;?>
</div>
</div>
<div class='detail'>
module/testcase/js/browse.js
+3 -5
View File
@@ -21,20 +21,18 @@ function confirmBatchDelete(actionLink)
return false;
}
$(document).ready(function()
$(function()
{
if(browseType == 'bysearch') ajaxGetSearchForm();
if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150);
if(flow == 'onlyTest')
{
$('#modulemenu > .nav').append($('#mainMenu > .pull-left.btn-toolbar').html());
toggleSearch();
$('.export').modalTrigger({width:650, type:'iframe', afterShown: setCheckedCookie})
$('#modulemenu > .nav > li').removeClass('active');
$('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
$('#subNavbar > .nav > li').removeClass('active');
$('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
}
});
module/testcase/lang/en.php
+1 -1
View File
@@ -190,8 +190,8 @@ $lang->testcase->noFunction = 'Iconv and mb_convert_encoding is not found.
$lang->testcase->noRequire = "Row %s has“%s”which is a required field and it should not be blank.";
$lang->testcase->noLibrary = "No library exists. Please create one first.";
$lang->testcase->mustChooseResult = 'Review result is required.';
$lang->testcase->noCase = 'No Case. You could ';
$lang->testcase->noModule = '<div>You have no modules</div><div>Manage now</div>';
$lang->testcase->noCase = 'No Case. You could ';
$lang->testcase->searchStories = 'Enter to searcu Story';
$lang->testcase->selectLib = 'Select Library';
module/testcase/view/edit.html.php
+3 -2
View File
@@ -117,8 +117,9 @@
<div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
<div class='detail-content'><?php echo html::textarea('comment', '', "rows='5' class='form-control'");?></div>
</div>
<div class='detail'>
<?php echo $this->fetch('file', 'buildform');?>
<div class="detail">
<div class="detail-title"><?php echo $lang->files;?></div>
<div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
</div>
<div class='text-center detail'>
<?php echo html::hidden('lastEditedDate', $case->lastEditedDate);?>
module/todo/lang/en.php
+1 -8
View File
@@ -94,17 +94,10 @@ $lang->todo->lblClickCreate = "Clict to add todo";
$lang->todo->noTodo = 'No this type of Todo.';
$lang->todo->noAssignedTo = "The AssignedTo user can't be empty.";
$lang->todo->periods['today'] = 'Today';
$lang->todo->periods['yesterday'] = 'Yesterday';
$lang->todo->periods['thisWeek'] = 'ThisWeek';
$lang->todo->periods['lastWeek'] = 'LastWeek';
$lang->todo->periods['thisMonth'] = 'ThisMonth';
$lang->todo->periods['lastmonth'] = 'LastMonth';
$lang->todo->periods['thisSeason'] = 'ThisQuarter';
$lang->todo->periods['all'] = 'All';
$lang->todo->periods['thisYear'] = 'ThisYear';
$lang->todo->periods['future'] = 'Pending';
$lang->todo->periods['before'] = 'Unfinished';
$lang->todo->periods['all'] = 'All';
$lang->todo->periods['cycle'] = 'Cycle';
$lang->todo->action = new stdclass();
module/tree/view/ajaxgetdropmenu.html.php
+5
View File
@@ -6,6 +6,11 @@
<?php
foreach($modules as $moduleID => $module)
{
if(empty($module))
{
$module = '/';
$modulesPinyin[$module] = '';
}
echo html::a(sprintf($link, $productID, $moduleID), $module, '', "data-key='{$modulesPinyin[$module]}'");
}
?>