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:
jinianlan
2019-07-16 08:51:59 +08:00
parent e2a7da40af cb87a2b0cf
commit f26fb45064
91 changed files with 212 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -105,6 +105,7 @@ zentaoxx:
sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js
sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php
cp tools/en2de.php zentaoxx/tools; cd zentaoxx/tools; php en2de.php ../
rm -rf zentaoxx/tools
zip -rqm -9 zentaoxx.$(VERSION).zip zentaoxx/*
rm -rf xuan.zip xuan zentaoxx
doc/CHANGELOG
+1
View File
@@ -124,6 +124,7 @@
4068 用例等待评审翻译调整
4067 用例不需要评审翻译调整
4066 用户性别添加的时候不要使用缩写
2019-06-26 11.5.2
完善登录禅道弱口令检查
增加禅道安全性
framework/router.class.php
+2 -2
View File
@@ -112,8 +112,8 @@ class router extends baseRouter
$productProject = $productProject->value;
list($productCommon, $projectCommon) = explode('_', $productProject);
}
$lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productCommon]) ? $this->config->productCommonList[$this->clientLang][(int)$productCommon] : $this->config->productCommonList['zh-cn'][0];
$lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['zh-cn'][0];
$lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productCommon]) ? $this->config->productCommonList[$this->clientLang][(int)$productCommon] : $this->config->productCommonList['en'][0];
$lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['en'][0];
}
parent::loadLang($moduleName, $appName);
module/action/model.php
+1 -1
View File
@@ -1052,7 +1052,7 @@ class actionModel extends model
foreach($actions as $action)
{
$timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date);
$date = $this->app->getClientLang() == 'en' ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp);
$date = common::checkEnLang() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp);
$action->time = date(DT_TIME2, $timeStamp);
$dateGroup[$date][] = $action;
}
module/admin/view/safe.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<form class="load-indicator main-form form-ajax" method='post'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-300px' : 'w-130px';?>
<?php $colWidth = common::checkEnLang() ? 'w-300px' : 'w-130px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->admin->safe->password?></th>
<td class='w-250px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
<td><?php echo $lang->admin->safe->noticeMode?></td>
module/backup/view/index.html.php
+1 -1
View File
@@ -36,7 +36,7 @@
<th class='w-150px'><?php echo $lang->backup->time?></th>
<th><?php echo $lang->backup->files?></th>
<th class='w-150px'><?php echo $lang->backup->size?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-140px' : 'w-110px';?>
<?php $colWidth = common::checkEnLang() ? 'w-140px' : 'w-110px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->actions?></th>
</tr>
</thead>
module/block/lang/en.php
+1 -1
View File
@@ -13,7 +13,7 @@ $lang->block = new stdclass();
$lang->block->common = 'Block';
$lang->block->name = 'Name';
$lang->block->style = 'Style';
$lang->block->grid = 'Grid';
$lang->block->grid = 'Position';
$lang->block->color = 'Color';
$lang->block->reset = 'Reset Layout';
module/block/view/projectblock.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
<th class='c-name text-left'><?php echo $lang->project->name;?></th>
<th class="c-date"><?php echo $lang->project->end;?></th>
<?php if($longBlock):?>
<?php $thClass = ($app->getClientLang() == 'en') ? 'w-85px' : 'c-hours';?>
<?php $thClass = common::checkEnLang() ? 'w-85px' : 'c-hours';?>
<th class="c-status"><?php echo $lang->statusAB;?></th>
<th class='<?php echo $thClass?>'><?php echo $lang->project->totalEstimate;?></th>
<th class="c-hours"><?php echo $lang->project->totalConsumed;?></th>
module/block/view/todoblock.html.php
+1 -1
View File
@@ -41,7 +41,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
<form class="form-horizontal todoes-form layer" method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'create', 'date=today&account=&from=block');?>'>
<h3><?php echo $lang->todo->create;?></h3>
<div class="form-group">
<?php $leftWidth = $app->getClientLang() == 'en' ? 'col-sm-3' : 'col-sm-2';?>
<?php $leftWidth = common::checkEnLang() ? 'col-sm-3' : 'col-sm-2';?>
<label for="todoName" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->name?></label>
<div class="col-sm-9 required"><input type="text" class="form-control" autocomplete="off" name="name"></div>
</div>
module/branch/model.php
+2 -2
View File
@@ -46,7 +46,7 @@ class branchModel extends model
$product = $this->loadModel('product')->getById($productID);
if(!$product or $product->type == 'normal') return array();
$space = $this->app->getClientLang() == 'en' ? ' ' : '';
$space = common::checkEnLang() ? ' ' : '';
$branches = array('0' => $this->lang->branch->all . $space . $this->lang->product->branchName[$product->type]) + $branches;
}
return $branches;
@@ -107,7 +107,7 @@ class branchModel extends model
}
}
$space = $this->app->getClientLang() == 'en' ? ' ' : '';
$space = common::checkEnLang() ? ' ' : '';
foreach($products as $product)
{
if($product->type == 'normal') continue;
module/bug/config.php
+1 -1
View File
@@ -184,7 +184,7 @@ $config->bug->datatable->fieldList['pri']['required'] = 'no';
$config->bug->datatable->fieldList['confirmed']['title'] = 'confirmedAB';
$config->bug->datatable->fieldList['confirmed']['fixed'] = 'left';
$config->bug->datatable->fieldList['confirmed']['width'] = '60';
$config->bug->datatable->fieldList['confirmed']['width'] = '50';
$config->bug->datatable->fieldList['confirmed']['required'] = 'no';
$config->bug->datatable->fieldList['title']['title'] = 'title';
module/bug/lang/zh-cn.php
+1 -1
View File
@@ -34,7 +34,7 @@ $lang->bug->activatedCount = '激活次数';
$lang->bug->activatedCountAB = '激活次数';
$lang->bug->activatedDate = '激活日期';
$lang->bug->confirmed = '是否确认';
$lang->bug->confirmedAB = '已确认';
$lang->bug->confirmedAB = '确认';
$lang->bug->toTask = '转任务';
$lang->bug->toStory = '转需求';
$lang->bug->mailto = '抄送给';
module/bug/view/browse.html.php
+4 -4
View File
@@ -116,7 +116,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
?>
</ul>
</div>
<?php if($app->getClientLang() != 'en'):?>
<?php if(!common::checkEnLang()):?>
<?php
common::printLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID", "<i class='icon icon-plus'></i>" . $lang->bug->batchCreate, '', "class='btn btn-secondary'");
if(commonModel::isTutorialMode())
@@ -208,9 +208,9 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
{
if($value->show)
{
if($this->app->getClientLang() == 'en' and $value->id == 'severity') $value->name = $lang->bug->severity;
if($this->app->getClientLang() == 'en' and $value->id == 'pri') $value->name = $lang->bug->pri;
if($this->app->getClientLang() == 'en' and $value->id == 'confirmed') $value->name = $lang->bug->confirmed;
if(common::checkEnLang() and $value->id == 'severity') $value->name = $lang->bug->severity;
if(common::checkEnLang() and $value->id == 'pri') $value->name = $lang->bug->pri;
if(common::checkEnLang() and $value->id == 'confirmed') $value->name = $lang->bug->confirmed;
$this->datatable->printHead($value, $orderBy, $vars);
$columns ++;
}
module/bug/view/edit.html.php
+2 -2
View File
@@ -211,7 +211,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->openedBy;?></th>
<td><?php echo $users[$bug->openedBy];?></td>
</tr>
@@ -265,7 +265,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr class='text-top'>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->linkBug;?></th>
<td><?php echo html::a($this->createLink('bug', 'linkBugs', "bugID=$bug->id", '', true), $lang->bug->linkBugs, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
</tr>
module/bug/view/resolve.html.php
+1 -1
View File
@@ -32,7 +32,7 @@ js::set('productID' , $bug->product);
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-130px' : 'w-100px';?>
<?php $colWidth = common::checkEnLang() ? 'w-130px' : 'w-100px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->resolution;?></th>
<td class='w-p35-f'><?php echo html::select('resolution', $lang->bug->resolutionList, '', "class='form-control chosen' onchange=setDuplicate(this.value)");?></td>
<td></td>
module/bug/view/view.html.php
+2 -2
View File
@@ -99,7 +99,7 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendBasicInfo'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-110px' : 'w-70px';?>
<?php $widthClass = common::checkEnLang() ? 'w-110px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<tr valign='middle'>
@@ -268,7 +268,7 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendLife'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-100px' : 'w-90px';?>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-90px';?>
<table class="table table-data">
<tbody>
<tr>
module/common/lang/en.php
+1 -1
View File
@@ -27,7 +27,7 @@ $lang->login = 'Login';
$lang->help = 'Help';
$lang->aboutZenTao = 'About';
$lang->profile = 'Profile';
$lang->changePassword = 'Change Password';
$lang->changePassword = 'Password';
$lang->runInfo = "<div class='row'><div class='u-1 a-center' id='debugbar'>Time %s MS, Memory %s KB, Query %s. </div></div>";
$lang->agreement = "I have read and agreed to the terms and conditions of <a href='http://zpl.pub/page/zplv12.html' target='_blank'> Z PUBLIC LICENSE 1.2 </a>. <span class='text-danger'>Without authorization, I should not remove, hide or cover any logos/links of ZenTao.</span>";
$lang->designedByAIUX = "<a href='http://aiuxstudio.com/' class='link-aiux' target='_blank'>Designed by <strong>AIUX</strong></a>";
module/common/lang/menuOrder.php
+3 -2
View File
@@ -66,8 +66,9 @@ $lang->qa->menuOrder[10] = 'index';
$lang->qa->menuOrder[15] = 'bug';
$lang->qa->menuOrder[20] = 'testcase';
$lang->qa->menuOrder[25] = 'testtask';
$lang->qa->menuOrder[30] = 'testsuite';
$lang->qa->menuOrder[35] = 'testreport';
$lang->qa->menuOrder[30] = 'report';
$lang->qa->menuOrder[35] = 'testsuite';
$lang->qa->menuOrder[40] = 'caselib';
$lang->bug->menuOrder = $lang->qa->menuOrder;
$lang->testcase->menuOrder = $lang->bug->menuOrder;
$lang->testtask->menuOrder = $lang->testcase->menuOrder;
module/common/model.php
+13
View File
@@ -1726,6 +1726,19 @@ EOD;
return $this->get->token == md5(md5($queryString) . $entry->key);
}
/**
* Check English Lang.
*
* @static
* @access public
* @return bool
*/
public static function checkEnLang()
{
global $app;
return strpos('|zh-cn|zh-tw|', '|' . $app->getClientLang() . '|') === false;
}
/**
* Response.
*
module/common/view/header.lite.html.php
+3 -1
View File
@@ -36,7 +36,9 @@ $onlybody = zget($_GET, 'onlybody', 'no');
}
else
{
css::import($defaultTheme . $this->cookie->lang . '.' . $this->cookie->theme . '.css');
$minCssFile = $defaultTheme . $this->cookie->lang . '.' . $this->cookie->theme . '.css';
if(!file_exists($this->app->getThemeRoot() . 'default/' . $this->cookie->lang . '.' . $this->cookie->theme . '.css')) $minCssFile = $defaultTheme . 'en.' . $this->cookie->theme . '.css';
css::import($minCssFile);
js::import($jsRoot . 'all.js');
}
if($this->app->getViewType() == 'xhtml') css::import($defaultTheme . 'x.style.css');
module/company/view/dynamic.html.php
+1 -1
View File
@@ -40,7 +40,7 @@
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php
if($this->app->getClientLang() == 'en')
if(common::checkEnLang())
{
$isToday = date('M d') == $date;
}
module/company/view/edit.html.php
+1 -1
View File
@@ -23,7 +23,7 @@
<form class='main-form' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-120px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->company->name;?></th>
<td><?php echo html::input('name', $company->name, "class='form-control'");?></td>
</tr>
module/custom/lang/de.php
+4 -4
View File
@@ -5,9 +5,9 @@ $lang->custom->set = 'Customize';
$lang->custom->restore = 'Reset to Default';
$lang->custom->key = 'Key';
$lang->custom->value = 'Value';
$lang->custom->flow = 'Workflow';
$lang->custom->flow = 'Concept';
$lang->custom->working = 'WorkStyle';
$lang->custom->select = 'Select Workflow';
$lang->custom->select = 'Select Concept';
$lang->custom->branch = 'Multi Branch';
$lang->custom->owner = 'Owner';
$lang->custom->module = 'Module';
@@ -53,7 +53,7 @@ $lang->custom->bug->fields['browserList'] = 'Browser';
$lang->custom->bug->fields['typeList'] = 'Type';
$lang->custom->bug->fields['resolutionList'] = 'Solution';
$lang->custom->bug->fields['statusList'] = 'Status';
$lang->custom->bug->fields['longlife'] = 'Shelved Days';
$lang->custom->bug->fields['longlife'] = 'Stalled Days';
$lang->custom->testcase = new stdClass();
$lang->custom->testcase->fields['priList'] = 'Priority';
@@ -127,7 +127,7 @@ $lang->custom->productProject->relation['0_0'] = 'Product - Project';
$lang->custom->productProject->relation['0_1'] = 'Product - Sprint';
$lang->custom->productProject->relation['1_1'] = 'Project - Sprint';
$lang->custom->productProject->notice = 'Please select according to your team.';
$lang->custom->productProject->notice = 'Please select a concept according to your team.';
$lang->custom->workingList['full'] = 'Full Management of Dev';
$lang->custom->workingList['onlyTest'] = 'Test Management';
module/custom/lang/en.php
+5 -5
View File
@@ -5,16 +5,16 @@ $lang->custom->set = 'Customize';
$lang->custom->restore = 'Reset';
$lang->custom->key = 'Key';
$lang->custom->value = 'Value';
$lang->custom->flow = 'Workflow';
$lang->custom->flow = 'Concept';
$lang->custom->working = 'Mode';
$lang->custom->select = 'Select Workflow';
$lang->custom->select = 'Select Concept';
$lang->custom->branch = 'Multi-Branch';
$lang->custom->owner = 'Owner';
$lang->custom->module = 'Module';
$lang->custom->section = 'Section';
$lang->custom->lang = 'Language';
$lang->custom->setPublic = 'Set Public';
$lang->custom->required = 'Required Fields';
$lang->custom->required = 'Required Field';
$lang->custom->score = 'Point';
$lang->custom->timezone = 'Timezone';
$lang->custom->scoreReset = 'Reset Points';
@@ -94,7 +94,7 @@ $lang->custom->notice->forceReview = '%s review is required for committ
$lang->custom->notice->forceNotReview = "%s review is not required for committers selected.";
$lang->custom->notice->longlife = 'Define stalled bugs.';
$lang->custom->notice->invalidNumberKey = 'The key should be =< 255.';
$lang->custom->notice->invalidStringKey = 'The key should be a combination of lowercase letters, numbers or underlines.';
$lang->custom->notice->invalidStringKey = 'The key should be lowercase letters, numbers or underlines.';
$lang->custom->notice->cannotSetTimezone = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
$lang->custom->notice->noClosedBlock = 'You have no blocks that are closed permanently.';
$lang->custom->notice->required = 'The selected field is required.';
@@ -127,7 +127,7 @@ $lang->custom->productProject->relation['0_0'] = 'Product - Project';
$lang->custom->productProject->relation['0_1'] = 'Product - Sprint';
$lang->custom->productProject->relation['1_1'] = 'Project - Sprint';
$lang->custom->productProject->notice = 'Select the work mode that fits your team.';
$lang->custom->productProject->notice = 'Select a concept that fits your team.';
$lang->custom->workingList['full'] = 'Application Lifecycle Management';
$lang->custom->workingList['onlyTest'] = 'Test Management';
module/custom/view/required.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
</div>
</div>
<table class='table table-form mw-800px'>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-250px' : 'w-120px';?>
<?php $colWidth = common::checkEnLang() ? 'w-250px' : 'w-120px';?>
<?php $i = 0;?>
<?php foreach($requiredFields as $method => $requiredField):?>
<tr>
module/custom/view/set.html.php
+1 -1
View File
@@ -54,7 +54,7 @@ EOT;
<?php if(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
<table class='table table-form mw-800px'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-140px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-140px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->custom->storyReview;?></th>
<td><?php echo html::radio('needReview', $lang->custom->reviewList, $needReview);?></td>
<td></td>
module/dept/view/edit.html.php
+1 -1
View File
@@ -23,7 +23,7 @@ $jsRoot = $webRoot . "js/";
<form action="<?php echo inlink('edit', 'deptID=' . $dept->id);?>" target='hiddenwin' method='post' class='mt-10px' id='dataform'>
<table class='table table-form' style='width:100%'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-130px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-130px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->dept->parent;?></th>
<td><?php echo html::select('parent', $optionMenu, $dept->parent, "class='form-control chosen'");?></td>
</tr>
module/doc/lang/zh-cn.php
+2 -2
View File
@@ -26,8 +26,8 @@ $lang->doc->url = '文档URL';
$lang->doc->files = '附件';
$lang->doc->addedBy = '由谁添加';
$lang->doc->addedDate = '添加时间';
$lang->doc->editedBy = '由谁编辑';
$lang->doc->editedDate = '编辑时间';
$lang->doc->editedBy = '由谁更新';
$lang->doc->editedDate = '更新时间';
$lang->doc->version = '版本号';
$lang->doc->basicInfo = '基本信息';
$lang->doc->deleted = '已删除';
module/doc/view/alllibsbylist.html.php
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="panel-title font-normal">
<?php $panelTitle = zget($lang->doclib->tabList, $type);?>
<i class="icon icon-folder-open-o text-muted"></i> <?php echo $panelTitle;?>
<div class="btn-group">
<div class="btn-group pull-right">
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
</div>
module/doc/view/browse.html.php
+1 -1
View File
@@ -96,7 +96,7 @@ var browseType = '<?php echo $browseType;?>';
<th class="c-user"><?php echo $lang->doc->addedBy;?></th>
<th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
<th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
<th class="w-90px"><?php echo $lang->actions;?></th>
<th class="w-90px text-center"><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/doc/view/index.html.php
+1 -1
View File
@@ -125,7 +125,7 @@
<div class="col-sm-7">
<div class="panel block-files block-sm" style="height: 290px;">
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->project->undone . ($app->getClientLang() == 'en' ? ' ' : '') .($app->getClientLang()=='en'? "{$lang->projectCommon}s": "$lang->projectCommon");?></div>
<div class="panel-title"><?php echo $lang->project->undone . (common::checkEnLang() ? ' ' : '') . (common::checkEnLang() ? "{$lang->projectCommon}s" : "$lang->projectCommon");?></div>
<nav class="panel-actions nav nav-default">
<li><?php echo html::a($this->createLink('doc', 'allLibs', 'type=project'), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
</nav>
module/doc/view/objectlibsbylist.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
<tr>
<th class="c-name"><?php echo $lang->doc->libName;?></th>
<th class="c-num"><?php echo $lang->doc->num;?></th>
<th class="w-120px"><?php echo $lang->actions;?></th>
<th class="w-90px text-center"><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/doc/view/side.html.php
+1 -1
View File
@@ -12,7 +12,7 @@ if($this->methodName != 'browse')
$moduleID = '';
}
if(empty($type)) $type = 'product';
$sideWidth = $app->getClientLang() == 'en' ? '270' : '238';
$sideWidth = common::checkEnLang() ? '270' : '238';
?>
<div class="side-col" style="width:<?php echo $sideWidth;?>px" data-min-width="<?php echo $sideWidth;?>">
<div class="cell">
module/editor/control.php
+1 -1
View File
@@ -16,7 +16,7 @@ class editor extends control
parent::__construct($moduleName, $methodName, $appName);
$remoteIP = helper::getRemoteIp();
if($remoteIP != '127.0.0.1') die("<html><head><meta chatset='utf-8'></head><body>{$this->lang->editor->onlyLocalVisit}</body></html>");
if($remoteIP != '127.0.0.1') die($this->display('editor', 'deny'));
}
/**
module/editor/view/deny.html.php
+18
View File
@@ -0,0 +1,18 @@
<?php
/**
* The deny view file of editor module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Yidong Wang <yidong@cnezsoft.com>
* @package editor
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../dev/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='alert alert-warning'><?php echo $this->lang->editor->onlyLocalVisit;?></div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/group/view/manageview.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
<form class="load-indicator main-form form-ajax" id="manageViewForm" method="post" target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-130px' : 'w-100px';?>
<?php $colWidth = common::checkEnLang() ? 'w-130px' : 'w-100px';?>
<th class='text-bottom <?php echo $colWidth;?>'><?php echo $lang->group->viewList;?></th>
<td class='text-bottom'>
<?php foreach($lang->menu as $menuKey => $menu):?>
module/group/view/privbygroup.html.php
+3 -3
View File
@@ -26,7 +26,7 @@
</tr>
</thead>
<tr class='<?php echo cycle('even, bg-gray');?>'>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-160px' : 'w-150px';?>
<?php $colWidth = common::checkEnLang() ? 'w-160px' : 'w-150px';?>
<th class='text-right <?php echo $colWidth;?>'><?php echo $lang->my->common;?></th>
<td id='my' class='pv-10px'>
<div class='checkbox-primary'>
@@ -73,7 +73,7 @@
<table class='table table-hover table-striped table-bordered' id='privList'>
<thead>
<tr class='text-center'>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-160px' : 'w-150px';?>
<?php $colWidth = common::checkEnLang() ? 'w-160px' : 'w-150px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->group->module;?></th>
<th><?php echo $lang->group->method;?></th>
</tr>
@@ -98,7 +98,7 @@
}
?>
<tr class='<?php echo cycle('even, bg-gray');?>'>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-160px' : 'w-150px';?>
<?php $colWidth = common::checkEnLang() ? 'w-160px' : 'w-150px';?>
<th class='text-middle text-right <?php echo $colWidth;?>'>
<div class="checkbox-primary checkbox-inline checkbox-right check-all">
<input type='checkbox' id='allChecker<?php echo $moduleName;?>'>
module/mail/view/index.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
<table class='table table-form' id='selectmta'>
<tr>
<td class='text-center'>
<?php if($this->app->getClientLang() != 'en' and common::hasPriv('mail', 'ztCloud')):?>
<?php if(!common::checkEnLang() and common::hasPriv('mail', 'ztCloud')):?>
<?php echo html::a(inlink('ztCloud'), $lang->mail->ztCloud, '', "class='btn w-120px'")?>
<?php endif;?>
<?php if(common::hasPriv('mail', 'detect')):?>
module/message/model.php
+1 -1
View File
@@ -123,7 +123,7 @@ class messageModel extends model
if($toList == $this->app->user->account) return false;
$moduleName = $objectType == 'case' ? 'testcase' : $objectType;
$space = $this->app->getClientLang() == 'en' ? ' ' : '';
$space = common::checkEnLang() ? ' ' : '';
$data = $this->app->user->realname . $space . $this->lang->action->label->$actionType . $space . $this->lang->action->objectTypes[$objectType];
$data .= ' ' . html::a(helper::createLink($moduleName, 'view', "id=$objectID"), "[#{$objectID}::{$object->$field}]");
module/misc/lang/en.php
+6 -6
View File
@@ -125,7 +125,7 @@ $lang->misc->feature->all['11.2.stable'][] = array('title'=>'Optimize details an
$lang->misc->feature->all['11.1.stable'][] = array('title'=>'Fix Bug.', 'desc' => '');
$lang->misc->feature->all['11.0.stable'][] = array('title'=>'ZenTao integrate Xuanxuan', 'desc' => '');
$lang->misc->feature->all['11.0.stable'][] = array('title'=>'ZenTao integrated desktop.', 'desc' => '');
$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Adjust backup mechanism', 'desc' => '<p>Increase backup settings and make backup more flexible</p><p>Show backup progress</p><p>Change the backup directory</p>');
$lang->misc->feature->all['10.6.stable'][] = array('title'=>'Optimize and adjust menu', 'desc' => '<p>Adjust admin menu</p><p>Adjust the secondary menu of My and Project</p>');
@@ -138,7 +138,7 @@ $lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user mach
$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrade existing interface mechanisms', 'desc' => '');
$lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => '');
$lang->misc->feature->all['10.2.stable'][] = array('title'=>'Xuan.im is integrated!', 'desc' => '');
$lang->misc->feature->all['10.2.stable'][] = array('title'=>'ZenTao desktop is integrated!', 'desc' => '');
$lang->misc->feature->all['10.0.stable'][] = array('title'=>'New UI/UX and new experience', 'desc' => '<ol><li>My Dashboard</li><li>Dynamics</li><li>Product Home</li><li>Product Overview</li><li>Roadmap</li><li>Project Home</li><li>Project overview</li><li>QA Home</li><li>Document Home</li><li>Added work report on My Dashboard</li><li>Add/Edit/Finish todos on My Dashboard</li><li>Add prodcut report on Product Home</li><li>Add prodcut overview on Product Home</li><li>Add project report on Project Home</li><li>Add project overview on Project Home</li><li>Add Testing report on QA Home</li><li>All Product/product Home/All Project/Project Home/QA Home is moved from the right of the secondary Navbar to the left.</li><li>Kanban/Burndown/Tree/ByGroup of Project/Task has been moved from the third Navbar to the secondary one; Tree/ByGroup/Task List has been integrated to a drop-down.</li><li>Bug/Build of Project on the secondary Navbar has been integrated to a drop-down.</li><li>Display build and list by group, which is more reasonable.</li><li>Added tree to display document on the left of the page.</li><li>Added quick entry to document, including Last Update, My Doc and My Favorite</li><li>Added My Favorite to Doc module.</li></ol>');
@@ -154,12 +154,12 @@ $lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Point', 'desc'
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added multiple user task and child tasks to Project', 'desc' => '');
$lang->misc->feature->all['9.6.stable'][] = array('title'=>'Added Product line management to Product', 'desc' => '');
$lang->misc->feature->all['9.5.1'][] = array('title'=>'added Restricted Operation', 'desc' => '');
$lang->misc->feature->all['9.5.1'][] = array('title'=>'Added restricted actions.', 'desc' => '');
$lang->misc->feature->all['9.3.beta'][] = array('title'=>'upgraded framework，Enhanced security', 'desc' => '');
$lang->misc->feature->all['9.3.beta'][] = array('title'=>'Upgraded ZenTao framework，enhanced security', 'desc' => '');
$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => '<p>added TestSuite, CaseLibrary and QA Report</p>');
$lang->misc->feature->all['9.1.stable'][] = array('title'=>'support Group steps of TestCase', 'desc' => '');
$lang->misc->feature->all['9.1.stable'][] = array('title'=>'optimize Test View', 'desc' => '<p>Added TestSuite, CaseLibrary and QA Report</p>');
$lang->misc->feature->all['9.1.stable'][] = array('title'=>'Support Group steps of TestCase', 'desc' => '');
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'ZenTao CloudMail has been added.', 'desc' => '<p>ZenTao CloudMail is a free Email service launched jointly with SendCloud. Once binded with ZenTao and passed verification, users can use this service.</p>');
$lang->misc->feature->all['9.0.beta'][] = array('title'=>'Optimized Rich Text Editor and Markdown Editor.', 'desc' => '');
module/misc/view/changelog.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<?php $idx++; ?>
<?php endforeach; ?>
</div>
<?php if($detailed and $this->app->getClientLang() != 'en'):?>
<?php if($detailed and !common::checkEnLang()):?>
<div id="details" class='article-content'>
<a href='###' class="btn btn-link text-primary btn-block text-left" onclick="$('#details').toggleClass('show-details')"><i class="icon icon-angle-right"></i> <?php echo $lang->misc->feature->detailed;?></a>
<div class='details-list'><?php echo $detailed;?></div>
module/my/view/changepassword.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
</div>
<form method='post' target='hiddenwin'>
<table align='center' class='table table-form w-320px'>
<?php $thWidth = ($app->getClientLang() == 'en') ? 'w-130px' : 'w-90px';?>
<?php $thWidth = common::checkEnLang() ? 'w-130px' : 'w-90px';?>
<tr>
<th class='rowhead <?php echo $thWidth?>'><?php echo $lang->user->account;?></th>
<td><?php echo $user->account . html::hidden('account',$user->account);?></td>
module/product/view/browse.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
?>
</ul>
</div>
<?php if($app->getClientLang() != 'en'):?>
<?php if(!common::checkEnLang()):?>
<?php if(common::hasPriv('story', 'batchCreate')) echo html::a($this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID"), "<i class='icon icon-plus'></i> {$lang->story->batchCreate}", '', "class='btn btn btn-secondary'");?>
<?php
if(commonModel::isTutorialMode())
module/product/view/dynamic.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php
if($this->app->getClientLang() == 'en')
if(common::checkEnLang())
{
$isToday = date('M d') == $date;
}
module/product/view/roadmap.html.php
+1 -1
View File
@@ -52,7 +52,7 @@
<?php $groupRoadmaps = zget($yearRoadmaps, $branchKey, array());?>
<div class="release-path">
<div class="release-head">
<div class="title text-primary"><?php echo $year . (is_numeric($year) ? ($this->app->getClientLang() == 'en' ? '' : $lang->year) : '');?></div>
<div class="title text-primary"><?php echo $year . (is_numeric($year) ? (common::checkEnLang() ? '' : $lang->year) : '');?></div>
<div class="subtitle"><?php echo sprintf($lang->product->iterationInfo, count($groupRoadmaps, 1) - count($groupRoadmaps));?></div>
</div>
<?php $i = 0;?>
module/product/view/view.html.php
+1 -1
View File
@@ -196,7 +196,7 @@
<div class="detail-content">
<table class="table table-data data-basic">
<tbody>
<?php $space = $this->app->getClientLang() == 'en' ? ' ' : '';?>
<?php $space = common::checkEnLang() ? ' ' : '';?>
<tr>
<th><?php echo $lang->story->statusList['active'] . $space . $lang->story->common;?></th>
<td><em><?php echo $product->stories['active']?></em></td>
module/project/control.php
+1 -1
View File
@@ -902,7 +902,7 @@ class project extends control
$chartData = $this->project->buildBurnData($projectID, $dateList, $type);
/* Set a space when assemble the string for english. */
$space = $this->app->getClientLang() == 'en' ? ' ' : '';
$space = common::checkEnLang() ? ' ' : '';
$dayList = array_fill(1, floor($project->days / $this->config->project->maxBurnDay) + 5, '');
foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . $space . ($key + 1) . $space . $this->lang->day;
module/project/lang/en.php
+1 -1
View File
@@ -194,7 +194,7 @@ $lang->project->groups['closedBy'] = 'Group by ClosedBy';
$lang->project->groups['type'] = 'Group by Type';
$lang->project->groupFilter['story']['all'] = 'All';
$lang->project->groupFilter['story']['linked'] = 'Tasks of linked story';
$lang->project->groupFilter['story']['linked'] = 'Tasks linked to stories';
$lang->project->groupFilter['pri']['all'] = 'All';
$lang->project->groupFilter['pri']['noset'] = 'Not Set';
$lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished';
module/project/view/all.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
</th>
<th><?php common::printOrderLink('name', $orderBy, $vars, $lang->project->name);?></th>
<th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->project->code);?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-130px' : '1-100px';?>
<?php $colWidth = common::checkEnLang() ? 'w-130px' : '1-100px';?>
<th class='<?php echo $colWidth;?>'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
<th class='w-90px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->project->end);?></th>
<th class='w-90px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->project->status);?></th>
module/project/view/build.html.php
+2 -5
View File
@@ -38,8 +38,8 @@
<table class="table text-center" id='buildList'>
<thead>
<tr>
<th class="w-200px text-left"><?php echo $lang->build->product;?></th>
<th class="c-id-sm"><?php echo $lang->build->id;?></th>
<th class="w-200px text-left"><?php echo $lang->build->product;?></th>
<th class="c-name text-left"><?php echo $lang->build->name;?></th>
<th class="c-url"><?php echo $lang->build->scmPath;?></th>
<th class="c-url"><?php echo $lang->build->filePath;?></th>
@@ -50,13 +50,10 @@
</thead>
<tbody>
<?php foreach($projectBuilds as $productID => $builds):?>
<?php $total = count($builds);?>
<?php foreach($builds as $index => $build):?>
<tr data-id="<?php echo $productID;?>">
<?php if($index == 0):?>
<td rowspan="<?php echo $total;?>" class="text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>
<?php endif;?>
<td class="c-id-sm text-muted"><?php echo html::a(helper::createLink('build', 'view', "buildID=$build->id"), sprintf('%03d', $build->id));?></td>
<td class="text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>
<td class="c-name">
<?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
<?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?>
module/project/view/burn.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
echo $lang->project->howToUpdateBurn;
?>
<?php if($interval):?>
<div class='input-control <?php echo $this->app->getClientLang() == 'en' ? "w-150px" : "w-120px" ?>'>
<div class='input-control <?php echo common::checkEnLang() ? "w-150px" : "w-120px" ?>'>
<?php echo html::select('interval', $dayList, $interval, "class='form-control chosen'");?>
</div>
<?php endif;?>
module/project/view/dynamic.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php
if($this->app->getClientLang() == 'en')
if(common::checkEnLang())
{
$isToday = date('M d') == $date;
}
module/project/view/task.html.php
+1 -1
View File
@@ -131,7 +131,7 @@ js::set('browseType', $browseType);
$checkObject = new stdclass();
$checkObject->project = $projectID;
?>
<?php if($app->getClientLang() != 'en'):?>
<?php if(common::checkEnLang()):?>
<?php
$link = $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
if(common::hasPriv('task', 'batchCreate', $checkObject)) echo html::a($link, "<i class='icon icon-plus'></i> {$lang->task->batchCreate}", '', "class='btn btn btn-secondary'");
module/project/view/team.html.php
+2 -2
View File
@@ -52,7 +52,7 @@
<th><?php echo $lang->team->hours;?></th>
<th><?php echo $lang->team->totalHours;?></th>
<th class='w-100px text-center'><?php echo $lang->team->limited;?></th>
<th class='c-actions-1 w-80px'><?php echo $lang->actions;?></th>
<th class='c-actions-1 w-80px text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -72,7 +72,7 @@
<td><?php echo $member->hours . $lang->project->workHour;?></td>
<td><?php echo $memberHours . $lang->project->workHour;?></td>
<td class="text-center"><?php echo $lang->team->limitedList[$member->limited];?></td>
<td class='c-actions'>
<td class='c-actions text-center'>
<?php
if (common::hasPriv('project', 'unlinkMember', $member))
{
module/project/view/treestory.html.php
+1 -1
View File
@@ -196,7 +196,7 @@
<div class="detail-content">
<table class="table table-data">
<tbody>
<?php $class = $this->app->getClientLang() == 'en' ? 'w-120px' : 'w-100px';?>
<?php $class = common::checkEnLang() ? 'w-120px' : 'w-100px';?>
<?php if($config->global->flow != 'onlyStory'):?>
<?php if(!empty($fromBug)):?>
<tr class='text-top'>
module/report/view/bugassign.html.php
+1 -1
View File
@@ -4,7 +4,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $this->app->getClientLang() == 'en'? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/report/view/bugcreate.html.php
+1 -1
View File
@@ -5,7 +5,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $this->app->getClientLang() == 'en'? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/report/view/productsummary.html.php
+2 -2
View File
@@ -1,5 +1,5 @@
<?php include '../../common/view/header.html.php';?>
<?php if($this->app->getClientLang() == 'en'):?>
<?php if(common::checkEnLang()):?>
<style>#conditions .col-xs { width: 126px; }</style>
<?php endif;?>
<div id='mainContent' class='main-row'>
@@ -7,7 +7,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $this->app->getClientLang() == 'en'? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/report/view/projectdeviation.html.php
+1 -1
View File
@@ -6,7 +6,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $this->app->getClientLang() == 'en'? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/report/view/workload.html.php
+1 -1
View File
@@ -5,7 +5,7 @@
<?php include 'blockreportlist.html.php';?>
<div class='panel panel-body' style='padding: 10px 6px'>
<div class='text proversion'>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo $this->app->getClientLang() == 'en'? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
</div>
</div>
</div>
module/search/view/buildform.html.php
+3 -3
View File
@@ -15,8 +15,8 @@ $jsRoot = $this->app->getWebRoot() . "js/";
include '../../common/view/datepicker.html.php';
include '../../common/view/chosen.html.php';
$formId = 'searchForm-' . uniqid('');
$fieldWidth = $app->getClientLang() == 'en' ? 'w-130px' : 'w-110px';
$operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-90px';
$fieldWidth = common::checkEnLang() ? 'w-130px' : 'w-110px';
$operatorWidth = common::checkEnLang() ? 'w-110px' : 'w-90px';
?>
<style>
#selectPeriod {padding: 4px 0; height: 197px; min-width: 120px}
@@ -25,7 +25,7 @@ $operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-90px';
#<?php echo $formId;?> > table {margin: 0 auto;}
#<?php echo $formId;?> > table > tbody > tr > td {padding: 8px;}
#<?php echo $formId;?> .form-actions {padding-bottom: 20px; padding-top: 0;}
<?php if($app->getClientLang() == 'en'):?>
<?php if(common::checkEnLang()):?>
#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-single {min-width: 70px;}
<?php else:?>
#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-single {min-width: 100px;}
module/story/view/close.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-150px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-150px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->story->closedReason;?></th>
<td class='w-p25-f'><?php echo html::select('closedReason', $lang->story->reasonList, '', 'class="form-control" onchange="setStory(this.value)"');?></td><td></td>
</tr>
module/story/view/create.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include './header.html.php';?>
<?php js::set('holders', $lang->story->placeholder); ?>
<?php if($this->app->getClientLang() == 'en'):?>
<?php if(common::checkEnLang()):?>
<style> .sourceTd > .input-group > .input-group > .input-group-addon:first-child{padding: 5px 18px} </style>
<?php endif;?>
<div id="mainContent" class="main-content">
module/story/view/edit.html.php
+2 -2
View File
@@ -66,7 +66,7 @@
<div class='detail-title'><?php echo $lang->story->legendBasicInfo;?></div>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->story->product;?></th>
<td>
<div class='input-group'>
@@ -207,7 +207,7 @@
</tr>
<?php endif;?>
<tr>
<?php $width = $this->app->getClientLang() == 'en' ? 'w-110px': 'w-70px'?>
<?php $width = common::checkEnLang() ? 'w-110px': 'w-70px'?>
<th class=<?php echo $width?>><?php echo $lang->story->linkStories;?></th>
<td><?php echo html::a($this->createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?></td>
</tr>
module/story/view/review.html.php
+1 -1
View File
@@ -27,7 +27,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-110px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->story->reviewedDate;?></th>
<td class='w-p25-f'><?php echo html::input('reviewedDate', helper::today(), "class='form-control form-date'");?></td><td></td>
</tr>
module/story/view/view.html.php
+2 -2
View File
@@ -229,7 +229,7 @@
</table>
</div>
<div class='tab-pane' id='legendLifeTime'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-100px' : 'w-70px';?>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<tr>
@@ -311,7 +311,7 @@
</div>
<?php endif;?>
<div class="tab-pane <?php if($config->global->flow == 'onlyStory') echo 'active';?>" id='legendRelated'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-110px' : 'w-70px';?>
<?php $widthClass = common::checkEnLang() ? 'w-110px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<?php if($config->global->flow != 'onlyStory'):?>
module/story/view/zerocase.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-p30'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
<th> <?php common::printOrderLink('plan', $orderBy, $vars, $lang->story->planAB);?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-90px';?>
<?php $colWidth = common::checkEnLang() ? 'w-120px' : 'w-90px';?>
<th class='<?php echo $colWidth;?>'><?php common::printOrderLink('source', $orderBy, $vars, $lang->story->source);?></th>
<th class='w-100px'><?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-100px'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
module/task/view/activate.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
<?php $colWidth = common::checkEnLang() ? 'w-90px' : 'w-70px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->task->assignedTo;?></th>
<td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td>
<td></td>
module/task/view/edit.html.php
+2 -2
View File
@@ -20,7 +20,7 @@
<?php js::set('confirmChangeProject', $lang->task->confirmChangeProject);?>
<?php js::set('changeProjectConfirmed', false);?>
<?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
<?php $thWidth = $this->app->getClientLang() == 'en' ? 'w-85px' : 'w-70px';?>
<?php $thWidth = common::checkEnLang() ? 'w-85px' : 'w-70px';?>
<div class='main-content' id='mainContent'>
<form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<div class='main-header'>
@@ -176,7 +176,7 @@
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->task->legendLife;?></div>
<?php $thWidth = $this->app->getClientLang() == 'en' ? 'w-120px' : 'w-70px';?>
<?php $thWidth = common::checkEnLang() ? 'w-120px' : 'w-70px';?>
<table class='table table-form'>
<tr>
<th class=<?php echo $thWidth;?>><?php echo $lang->task->openedBy;?></th>
module/task/view/finish.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-100px';?>
<?php $colWidth = common::checkEnLang() ? 'w-120px' : 'w-100px';?>
<th class='<?php echo $colWidth;?>'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
<td class='w-p25-f'><?php echo $task->consumed;?> <?php echo $lang->workingHour;?></td>
<td></td>
module/task/view/recordestimate.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
<?php $team = array_keys($task->team);?>
<?php js::set('confirmRecord', (!empty($team) && $task->assignedTo != end($team)) ? $lang->task->confirmTransfer : $lang->task->confirmRecord);?>
<?php js::set('noticeSaveRecord', $lang->task->noticeSaveRecord);?>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
<?php $colWidth = common::checkEnLang() ? 'w-90px' : 'w-70px';?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
module/task/view/view.html.php
+2 -2
View File
@@ -285,7 +285,7 @@
</table>
</div>
<div class='tab-pane' id='legendLife'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-100px' : 'w-70px';?>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-70px';?>
<table class='table table-data'>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->task->openedBy;?></th>
@@ -341,7 +341,7 @@
<summary class="detail-title"><?php echo $lang->task->legendEffort;?></summary>
<div class="detail-content">
<table class='table table-data'>
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
<?php $widthClass = common::checkEnLang() ? 'w-90px' : 'w-70px';?>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->task->estimate;?></th>
<td><?php echo $task->estimate . $lang->workingHour;?></td>
module/testcase/view/caseheader.html.php
+1 -1
View File
@@ -119,7 +119,7 @@
</ul>
</div>
<?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
<?php if($app->getClientLang() != 'en'):?>
<?php if(!common::checkEnLang()):?>
<?php
if(common::hasPriv('testcase', 'batchCreate'))
{
module/testcase/view/view.html.php
+3 -3
View File
@@ -128,7 +128,7 @@
<details class="detail" open>
<summary class="detail-title"><?php echo $lang->testcase->legendBasicInfo;?></summary>
<div class="detail-content">
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-90px' : 'w-60px';?>
<?php $widthClass = common::checkEnLang() ? 'w-90px' : 'w-60px';?>
<table class='table table-data'>
<?php if($isLibCase):?>
<tr>
@@ -272,7 +272,7 @@
<details class="detail" open>
<summary class="detail-title"><?php echo $lang->testcase->legendLinkBugs;?></summary>
<div class="detail-content">
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-90px' : 'w-60px';?>
<?php $widthClass = common::checkEnLang() ? 'w-90px' : 'w-60px';?>
<table class='table table-data'>
<?php if($case->fromBug):?>
<tr>
@@ -302,7 +302,7 @@
<details class="detail" open>
<summary class="detail-title"><?php echo $lang->testcase->legendOpenAndEdit;?></summary>
<div class="detail-content">
<?php $widthClass = $app->getClientLang() == 'en' ? 'w-100px' : 'w-60px';?>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-60px';?>
<table class='table table-data'>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->testcase->openedBy;?></th>
module/testreport/lang/en.php
+1 -1
View File
@@ -64,7 +64,7 @@ $lang->testreport->moreNotice = 'More features can be extended with referenc
$lang->testreport->exportNotice = "Exported By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTao</a>";
$lang->testreport->noReport = "No report has been generated. Please check it later.";
$lang->testreport->foundBugTip = "Bugs found in this build period and the affected build is in this test period.";
$lang->testreport->legacyBugTip = "Active bugs, or resolved bugs that are not in the test period.";
$lang->testreport->legacyBugTip = "Active bugs, or bugs that are not resolved in the test period.";
$lang->testreport->fromCaseBugTip = "Bugs found from the running of cases in the test period.";
$lang->testreport->errorTrunk = "You cannot create a Testing report for the trunk. Please modify the linked build!";
$lang->testreport->noTestTask = "No test requests for this {$lang->productCommon}, so no reports can be generated. Please go to {$lang->productCommon} which has test requests and then generate the report.";
module/todo/view/create.html.php
+2 -2
View File
@@ -22,7 +22,7 @@
<form method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-110px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->todo->date;?></th>
<td class='w-400px'>
<div class='input-group'>
@@ -76,7 +76,7 @@
</div>
</div>
<?php echo html::hidden('config[type]', 'day')?>
<div class='input-group' style='width:<?php echo $app->getClientLang() == 'en' ? '270px' : '200px';?>; padding-top:5px;'>
<div class='input-group' style='width:<?php echo common::checkEnLang() ? '270px' : '200px';?>; padding-top:5px;'>
<?php printf($lang->todo->beforeDays, html::input('config[beforeDays]', 0, "class='form-control'"));?>
</div>
</td>
module/todo/view/edit.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php if($app->getClientLang() == 'en'):?>
<?php if(common::checkEnLang()):?>
<style> label.col-sm-1{width:100px;} </style>
<?php endif;?>
<div class="modal-content">
module/todo/view/view.html.php
+2 -2
View File
@@ -93,7 +93,7 @@
<div class='detail-content'>
<table class='table table-data'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->todo->pri;?></th>
<td><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
</tr>
@@ -137,7 +137,7 @@
<div class='detail-content'>
<table class='table table-data'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->todo->beginAndEnd?></th>
<td><?php echo $todo->config->begin . " ~ " . $todo->config->end;?></td>
</tr>
module/translate/control.php
+2 -2
View File
@@ -27,7 +27,7 @@ class translate extends control
if($remoteIP != '127.0.0.1')
{
$this->app->loadLang('editor');
die("<html><head><meta chatset='utf-8'></head><body>{$this->lang->editor->onlyLocalVisit}</body></html>");
die($this->display('translate', 'deny'));
}
}
@@ -164,7 +164,7 @@ class translate extends control
if($statusFile)
{
$this->app->loadLang('editor');
$this->send(array('result' => 'fail', 'message' => str_replace('\n', '<br />', sprintf($this->lang->editor->noticeOkFile, $statusFile))));
$this->send(array('result' => 'fail', 'callback' => 'bootAlert("' . str_replace('\n', '<br />', sprintf($this->lang->editor->noticeOkFile, $statusFile) . '")')));
}
$this->translate->addTranslation($language, $module, $referLang);
module/translate/view/choosemodule.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
<?php if($config->translate->needReview):?>
<th class='w-90px'><?php echo $lang->translate->reviewedProgress;?></th>
<?php endif;?>
<th class='<?php echo $app->getClientLang() == 'en' ? 'w-150px' : 'w-110px';?>'><?php echo $lang->actions;?></th>
<th class='<?php echo common::checkEnLang() ? 'w-150px' : 'w-110px';?>'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody class='text-center'>
module/translate/view/deny.html.php
+18
View File
@@ -0,0 +1,18 @@
<?php
/**
* The deny view file of editor module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Yidong Wang <yidong@cnezsoft.com>
* @package editor
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='alert alert-warning'><?php echo $this->lang->editor->onlyLocalVisit;?></div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/translate/view/index.html.php
+1 -1
View File
@@ -47,7 +47,7 @@
<tr>
<th class='text-left'><?php echo $data->name;?></th>
<td class='text-progress text-center'><?php printf($lang->translate->progress, ($data->progress * 100) . '%');?></td>
<td class='actions <?php echo $app->getClientLang() == 'en' ? 'w-130px' : 'w-95px';?>'>
<td class='actions <?php echo common::checkEnLang() ? 'w-130px' : 'w-95px';?>'>
<?php
echo html::a(inlink('chooseModule', "language=$langKey"), $lang->translate->common, '', "class='btn btn-sm'");
echo html::a(inlink('export', "language=$langKey"), $lang->export, '', "class='btn btn-sm iframe'");
module/tree/view/edit.html.php
+1 -1
View File
@@ -23,7 +23,7 @@ js::set('type', $type);
<div class='modal-body'>
<form action="<?php echo inlink('edit', 'module=' . $module->id .'&type=' .$type);?>" target='hiddenwin' method='post' class='mt-10px' id='dataform'>
<table class='table table-form'>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
<?php $colWidth = common::checkEnLang() ? 'w-120px' : 'w-80px';?>
<?php if($showProduct):?>
<tr>
<th class='<?php echo $colWidth;?>'><?php echo $lang->tree->product;?></th>
module/user/view/batchcreate.html.php
+2 -2
View File
@@ -37,13 +37,13 @@
<tr class='text-center'>
<th class='w-40px'><?php echo $lang->idAB;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'><?php echo $lang->user->dept;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-200px' : 'w-180px';?>
<?php $colWidth = common::checkEnLang() ? 'w-200px' : 'w-180px';?>
<th class='<?php echo $colWidth;?> required'><?php echo $lang->user->account;?></th>
<th class='w-130px required'><?php echo $lang->user->realname;?></th>
<th class='w-120px'><?php echo $lang->user->role;?></th>
<th class='w-120px'><?php echo $lang->user->group;?></th>
<th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth)?>'><?php echo $lang->user->email;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-140px' : 'w-90px';?>
<?php $colWidth = common::checkEnLang() ? 'w-140px' : 'w-90px';?>
<th class='<?php echo $colWidth; echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
<th class="<?php echo $minWidth;?> required"><?php echo $lang->user->password;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
module/user/view/create.html.php
+1 -1
View File
@@ -23,7 +23,7 @@
</div>
<form class="load-indicator main-form form-ajax" id="createForm" method="post" target='hiddenwin'>
<table align='center' class="table table-form">
<?php $thClass = ($app->getClientLang() == 'en') ? 'w-enVerifyPassword' : 'w-verifyPassword';?>
<?php $thClass = common::checkEnLang() ? 'w-enVerifyPassword' : 'w-verifyPassword';?>
<tr>
<th class='<?php echo $thClass?>'><?php echo $lang->user->dept;?></th>
<td class='w-p40'><?php echo html::select('dept', $depts, $deptID, "class='form-control chosen'");?></td>
module/user/view/login.html.php
+1 -1
View File
@@ -27,7 +27,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
</header>
<div class="table-row">
<div class="col-4 text-center" id='logo-box'>
<img src="<?php echo $config->webRoot . 'theme/default/images/main/' . ($app->getClientLang() != 'en' ? 'zt-logo.png' : 'zt-logo-en.png');?>" alt="">
<img src="<?php echo $config->webRoot . 'theme/default/images/main/' . (common::checkEnLang() ? 'zt-logo.png' : 'zt-logo-en.png');?>" alt="">
</div>
<div class="col-8">
<form method='post' target='hiddenwin'>
module/webhook/view/create.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
<form id='webhookForm' method='post' class='form-ajax'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-90px';?>
<?php $colWidth = common::checkEnLang() ? 'w-120px' : 'w-90px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->webhook->type;?></th>
<td style="width:550px" ><?php echo html::select('type', $lang->webhook->typeList, '', "class='form-control'");?></td>
<td></td>
module/webhook/view/edit.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
<form id='webhookForm' method='post' class='form-ajax'>
<table class='table table-form'>
<tr>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-90px';?>
<?php $colWidth = common::checkEnLang() ? 'w-120px' : 'w-90px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->webhook->type;?></th>
<td><?php echo html::select('type', $lang->webhook->typeList, $webhook->type, "class='form-control'");?></td>
<td></td>
tools/en2de.php
Executable
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/env php
<?php
/* Set the extpath and cconv binary. */
if(empty($argv[1])) die("Must give the module path.\n");
$extPath = $argv[1];
foreach(glob("$extPath/module/*") as $moduleName)
{
/* Convert the main lang file. */
$moduleLangPath = realpath($moduleName) . '/lang/';
$defaultLangFile = $moduleLangPath . 'en.php';
$targetLangFile = $moduleLangPath . 'de.php';
if(file_exists($defaultLangFile)) system("cp -r $defaultLangFile $targetLangFile");
/* Convert the extened lang file. */
foreach(glob("$moduleName/ext/lang/en/*.php") as $extLangFile)
{
$pathOfTW = dirname(dirname($extLangFile)) . "/de";
$extFileName = basename($extLangFile);
if(!is_dir($pathOfTW)) mkdir($pathOfTW);
system("cp -r $extLangFile $pathOfTW/$extFileName");
}
}
www/js/my.full.js
+13
View File
@@ -763,6 +763,19 @@ function convertURL()
});
}
/**
* Alert message with bootbox.
*
* @param message $message
* @access public
* @return bool
*/
function bootAlert(message)
{
bootbox.alert(message);
return false;
}
/* Ping the server every some minutes to keep the session. */
needPing = true;
xuanxuan/module/admin/ext/lang/en/xuanxuan.php
+1 -1
View File
@@ -6,7 +6,7 @@ $lang->admin->xuanxuanSetting = 'Settings';
$lang->admin->fileSize = 'File Size';
$lang->admin->countUsers = 'Online Users';
$lang->admin->setServer = 'Sever Settings';
$lang->admin->setServer = 'Server Settings';
$lang->admin->totalUsers = 'Users';
$lang->admin->totalGroups = 'Groups';
$lang->admin->totalMessages = 'Messages';