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:
Yagami
2019-07-29 16:05:02 +08:00
parent ab6d63e87c b3b77d8b8d
commit 4e3df671e3
71 changed files with 246 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 = common::checkEnLang() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp);
$date = common::checkNotCN() ? 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 = common::checkEnLang() ? 'w-300px' : 'w-130px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-140px' : 'w-110px';?>
<?php $colWidth = common::checkNotCN() ? 'w-140px' : 'w-110px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->actions?></th>
</tr>
</thead>
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 = common::checkEnLang() ? 'w-85px' : 'c-hours';?>
<?php $thClass = common::checkNotCN() ? '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 = common::checkEnLang() ? 'col-sm-3' : 'col-sm-2';?>
<?php $leftWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? ' ' : '';
$space = common::checkNotCN() ? ' ' : '';
$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 = common::checkEnLang() ? ' ' : '';
$space = common::checkNotCN() ? ' ' : '';
foreach($products as $product)
{
if($product->type == 'normal') continue;
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(!common::checkEnLang()):?>
<?php if(!common::checkNotCN()):?>
<?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(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;
if(common::checkNotCN() and $value->id == 'severity') $value->name = $lang->bug->severity;
if(common::checkNotCN() and $value->id == 'pri') $value->name = $lang->bug->pri;
if(common::checkNotCN() 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
@@ -212,7 +212,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->bug->openedBy;?></th>
<td><?php echo $users[$bug->openedBy];?></td>
</tr>
@@ -266,7 +266,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<table class='table table-form'>
<tbody>
<tr class='text-top'>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-130px' : 'w-100px';?>
<?php $colWidth = common::checkNotCN() ? '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
@@ -102,7 +102,7 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendBasicInfo'>
<?php $widthClass = common::checkEnLang() ? 'w-110px' : 'w-70px';?>
<?php $widthClass = common::checkNotCN() ? 'w-110px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<tr valign='middle'>
@@ -271,7 +271,7 @@
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendLife'>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-90px';?>
<?php $widthClass = common::checkNotCN() ? 'w-100px' : 'w-90px';?>
<table class="table table-data">
<tbody>
<tr>
module/common/model.php
+2 -2
View File
@@ -1726,13 +1726,13 @@ EOD;
}
/**
* Check English Lang.
* Check Not CN Lang.
*
* @static
* @access public
* @return bool
*/
public static function checkEnLang()
public static function checkNotCN()
{
global $app;
return strpos('|zh-cn|zh-tw|', '|' . $app->getClientLang() . '|') === false;
module/company/view/dynamic.html.php
+1 -1
View File
@@ -40,7 +40,7 @@
<?php $firstAction = '';?>
<?php foreach($dateGroups as $date => $actions):?>
<?php
if(common::checkEnLang())
if(common::checkNotCN())
{
$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 = common::checkEnLang() ? 'w-120px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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/view/required.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
</div>
</div>
<table class='table table-form mw-800px'>
<?php $colWidth = common::checkEnLang() ? 'w-250px' : 'w-120px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-140px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-130px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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/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 . (common::checkEnLang() ? ' ' : '') . (common::checkEnLang() ? "{$lang->projectCommon}s" : "$lang->projectCommon");?></div>
<div class="panel-title"><?php echo $lang->project->undone . (common::checkNotCN() ? ' ' : '') . (common::checkNotCN() ? "{$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/side.html.php
+1 -1
View File
@@ -12,7 +12,7 @@ if($this->methodName != 'browse')
$moduleID = '';
}
if(empty($type)) $type = 'product';
$sideWidth = common::checkEnLang() ? '270' : '238';
$sideWidth = common::checkNotCN() ? '270' : '238';
?>
<div class="side-col" style="width:<?php echo $sideWidth;?>px" data-min-width="<?php echo $sideWidth;?>">
<div class="cell">
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 = common::checkEnLang() ? 'w-130px' : 'w-100px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-180px' : 'w-150px';?>
<?php $colWidth = common::checkNotCN() ? 'w-180px' : '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 = common::checkEnLang() ? 'w-180px' : 'w-150px';?>
<?php $colWidth = common::checkNotCN() ? 'w-180px' : '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 = common::checkEnLang() ? 'w-180px' : 'w-150px';?>
<?php $colWidth = common::checkNotCN() ? 'w-180px' : '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(!common::checkEnLang() and common::hasPriv('mail', 'ztCloud')):?>
<?php if(!common::checkNotCN() 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/css/setting.css
+1 -1
View File
@@ -1,6 +1,6 @@
.checkbox-primary + .checkbox-primary {margin:0px;}
.checkbox-primary {margin:0px; margin-right:10px !important; width:120px;display:inline-block}
.checkbox-primary label{white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
.checkbox-primary label{white-space:nowrap; overflow:visible; text-overflow:ellipsis;}
div.chosen-container + select + div.chosen-container > .chosen-choices {border-top:0px;}
.table-bordered thead .checkbox-primary{width:200px;}
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 = common::checkEnLang() ? ' ' : '';
$space = common::checkNotCN() ? ' ' : '';
$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/view/changelog.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<?php $idx++; ?>
<?php endforeach; ?>
</div>
<?php if($detailed and !common::checkEnLang()):?>
<?php if($detailed and !common::checkNotCN()):?>
<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 = common::checkEnLang() ? 'w-130px' : 'w-90px';?>
<?php $thWidth = common::checkNotCN() ? '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(!common::checkEnLang()):?>
<?php if(!common::checkNotCN()):?>
<?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(common::checkEnLang())
if(common::checkNotCN())
{
$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) ? (common::checkEnLang() ? '' : $lang->year) : '');?></div>
<div class="title text-primary"><?php echo $year . (is_numeric($year) ? (common::checkNotCN() ? '' : $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
@@ -200,7 +200,7 @@
<div class="detail-content">
<table class="table table-data data-basic">
<tbody>
<?php $space = common::checkEnLang() ? ' ' : '';?>
<?php $space = common::checkNotCN() ? ' ' : '';?>
<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 = common::checkEnLang() ? ' ' : '';
$space = common::checkNotCN() ? ' ' : '';
$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/view/all.html.php
+1 -1
View File
@@ -40,7 +40,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 = common::checkEnLang() ? 'w-130px' : 'w-100px';?>
<?php $colWidth = common::checkNotCN() ? 'w-130px' : 'w-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/burn.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
echo $lang->project->howToUpdateBurn;
?>
<?php if($interval):?>
<div class='input-control <?php echo common::checkEnLang() ? "w-150px" : "w-120px" ?>'>
<div class='input-control <?php echo common::checkNotCN() ? "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(common::checkEnLang())
if(common::checkNotCN())
{
$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(!common::checkEnLang()):?>
<?php if(!common::checkNotCN()):?>
<?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/treestory.html.php
+1 -1
View File
@@ -196,7 +196,7 @@
<div class="detail-content">
<table class="table table-data">
<tbody>
<?php $class = common::checkEnLang() ? 'w-120px' : 'w-100px';?>
<?php $class = common::checkNotCN() ? '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 common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $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 common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $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(common::checkEnLang()):?>
<?php if(common::checkNotCN()):?>
<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 common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $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 common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $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 common::checkEnLang() ? $lang->report->proVersionEn : $lang->report->proVersion; ?></span>
<strong class='text-danger small text-latin'>PRO</strong> &nbsp;<span class='text-important'><?php echo common::checkNotCN() ? $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 = common::checkEnLang() ? 'w-130px' : 'w-110px';
$operatorWidth = common::checkEnLang() ? 'w-110px' : 'w-90px';
$fieldWidth = common::checkNotCN() ? 'w-130px' : 'w-110px';
$operatorWidth = common::checkNotCN() ? 'w-110px' : 'w-90px';
?>
<style>
#selectPeriod {padding: 4px 0; height: 197px; min-width: 120px}
@@ -25,7 +25,7 @@ $operatorWidth = common::checkEnLang() ? '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(common::checkEnLang()):?>
<?php if(common::checkNotCN()):?>
#<?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 = common::checkEnLang() ? 'w-150px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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(common::checkEnLang()):?>
<?php if(common::checkNotCN()):?>
<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
@@ -67,7 +67,7 @@
<div class='detail-title'><?php echo $lang->story->legendBasicInfo;?></div>
<table class='table table-form'>
<tr>
<?php $colWidth = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? 'w-100px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->story->product;?></th>
<td>
<div class='input-group'>
@@ -210,7 +210,7 @@
</tr>
<?php endif;?>
<tr>
<?php $width = common::checkEnLang() ? 'w-110px': 'w-70px'?>
<?php $width = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-110px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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
@@ -232,7 +232,7 @@
</table>
</div>
<div class='tab-pane' id='legendLifeTime'>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-70px';?>
<?php $widthClass = common::checkNotCN() ? 'w-100px' : 'w-70px';?>
<table class="table table-data">
<tbody>
<tr>
@@ -314,7 +314,7 @@
</div>
<?php endif;?>
<div class="tab-pane <?php if($config->global->flow == 'onlyStory') echo 'active';?>" id='legendRelated'>
<?php $widthClass = common::checkEnLang() ? 'w-110px' : 'w-70px';?>
<?php $widthClass = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-120px' : 'w-90px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-90px' : 'w-70px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-85px' : 'w-70px';?>
<?php $thWidth = common::checkNotCN() ? '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'>
@@ -177,7 +177,7 @@
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->task->legendLife;?></div>
<?php $thWidth = common::checkEnLang() ? 'w-120px' : 'w-70px';?>
<?php $thWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-120px' : 'w-100px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-90px' : 'w-70px';?>
<?php $colWidth = common::checkNotCN() ? '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
@@ -288,7 +288,7 @@
</table>
</div>
<div class='tab-pane' id='legendLife'>
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-70px';?>
<?php $widthClass = common::checkNotCN() ? 'w-100px' : 'w-70px';?>
<table class='table table-data'>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->task->openedBy;?></th>
@@ -344,7 +344,7 @@
<summary class="detail-title"><?php echo $lang->task->legendEffort;?></summary>
<div class="detail-content">
<table class='table table-data'>
<?php $widthClass = common::checkEnLang() ? 'w-90px' : 'w-70px';?>
<?php $widthClass = common::checkNotCN() ? '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(!common::checkEnLang()):?>
<?php if(!common::checkNotCN()):?>
<?php
if(common::hasPriv('testcase', 'batchCreate'))
{
module/testcase/view/view.html.php
+3 -3
View File
@@ -132,7 +132,7 @@
<details class="detail" open>
<summary class="detail-title"><?php echo $lang->testcase->legendBasicInfo;?></summary>
<div class="detail-content">
<?php $widthClass = common::checkEnLang() ? 'w-90px' : 'w-60px';?>
<?php $widthClass = common::checkNotCN() ? 'w-90px' : 'w-60px';?>
<table class='table table-data'>
<?php if($isLibCase):?>
<tr>
@@ -276,7 +276,7 @@
<details class="detail" open>
<summary class="detail-title"><?php echo $lang->testcase->legendLinkBugs;?></summary>
<div class="detail-content">
<?php $widthClass = common::checkEnLang() ? 'w-90px' : 'w-60px';?>
<?php $widthClass = common::checkNotCN() ? 'w-90px' : 'w-60px';?>
<table class='table table-data'>
<?php if($case->fromBug):?>
<tr>
@@ -306,7 +306,7 @@
<details class="detail" open>
<summary class="detail-title"><?php echo $lang->testcase->legendOpenAndEdit;?></summary>
<div class="detail-content">
<?php $widthClass = common::checkEnLang() ? 'w-100px' : 'w-60px';?>
<?php $widthClass = common::checkNotCN() ? 'w-100px' : 'w-60px';?>
<table class='table table-data'>
<tr>
<th class='<?php echo $widthClass;?>'><?php echo $lang->testcase->openedBy;?></th>
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 = common::checkEnLang() ? 'w-110px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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 common::checkEnLang() ? '270px' : '200px';?>; padding-top:5px;'>
<div class='input-group' style='width:<?php echo common::checkNotCN() ? '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(common::checkEnLang()):?>
<?php if(common::checkNotCN()):?>
<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 = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-100px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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
+3 -3
View File
@@ -259,7 +259,7 @@ class translate extends control
{
if($result == 'pass')
{
$this->dao->update(TABLE_TRANSLATION)->set('status')->eq('reviewed')->set('reviewer')->eq($this->app->user->account)->set('reviewTime')->eq(helper::now())->where('id')->eq($translationID)->exec();
$this->dao->update(TABLE_TRANSLATION)->set('status')->eq('reviewed')->set('reviewer')->eq($this->app->user->account)->set('reviewedTime')->eq(helper::now())->where('id')->eq($translationID)->exec();
die(js::reload());
}
if($result == 'reject' and empty($_POST)) die($this->display());
@@ -267,7 +267,7 @@ class translate extends control
{
$data = fixer::input('post')->get();
if(empty($data->reason)) $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->error->notempty, $this->lang->translate->reason)));
$this->dao->update(TABLE_TRANSLATION)->set('status')->eq('rejected')->set('reviewer')->eq($this->app->user->account)->set('reviewTime')->eq(helper::now())->set('reason')->eq($data->reason)->where('id')->eq($translationID)->exec();
$this->dao->update(TABLE_TRANSLATION)->set('status')->eq('rejected')->set('reviewer')->eq($this->app->user->account)->set('reviewedTime')->eq(helper::now())->set('reason')->eq($data->reason)->where('id')->eq($translationID)->exec();
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.reloadStatus($translationID)"));
}
}
@@ -280,7 +280,7 @@ class translate extends control
*/
public function batchPass()
{
$this->dao->update(TABLE_TRANSLATION)->set('status')->eq('reviewed')->set('reviewer')->eq($this->app->user->account)->set('reviewTime')->eq(helper::now())->where('id')->in($this->post->idList)->exec();
$this->dao->update(TABLE_TRANSLATION)->set('status')->eq('reviewed')->set('reviewer')->eq($this->app->user->account)->set('reviewedTime')->eq(helper::now())->where('id')->in($this->post->idList)->exec();
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
}
module/translate/model.php
+13 -13
View File
@@ -71,11 +71,11 @@ class translateModel extends model
$translation->module = $moduleName;
$translation->key = $key;
$translation->value = $value;
$translation->refer = htmlspecialchars($translation->value);
$translation->referer = htmlspecialchars($translation->value);
$translation->status = 'waiting';
$translation->version = $this->config->version;
$translation->translator = $this->app->user->account;
$translation->translationTime = $now;
$translation->translatedTime = $now;
$translation->mode = $flow;
$this->dao->replace(TABLE_TRANSLATION)->data($translation)->exec();
}
@@ -354,10 +354,10 @@ class translateModel extends model
if($dbItem->value != $value)
{
$translation->value = $value;
$translation->refer = $refer;
$translation->referer = $refer;
$translation->status = 'translated';
$translation->translator = $this->app->user->account;
$translation->translationTime = $now;
$translation->translatedTime = $now;
if($translation->reason) $translation->reason = '';
}
elseif(!empty($_POST['values'][$i]) and strpos("waiting|changed", $translation->status) !== false)
@@ -372,10 +372,10 @@ class translateModel extends model
$translation->module = $module;
$translation->key = $key;
$translation->value = $value;
$translation->refer = $refer;
$translation->referer = $refer;
$translation->status = 'translated';
$translation->translator = $this->app->user->account;
$translation->translationTime = $now;
$translation->translatedTime = $now;
$translation->version = $this->config->version;
$translation->mode = $flow;
}
@@ -435,8 +435,8 @@ class translateModel extends model
{
$translators[$translation->translator] = $translation->translator;
$reviewers[$translation->reviewer] = $translation->reviewer;
if(empty($lastReviewTime)) $lastReviewTime = $translation->reviewTime;
if($lastReviewTime < $translation->reviewTime) $lastReviewTime = $translation->reviewTime;
if(empty($lastReviewTime)) $lastReviewTime = $translation->reviewedTime;
if($lastReviewTime < $translation->reviewedTime) $lastReviewTime = $translation->reviewedTime;
}
}
@@ -697,10 +697,10 @@ class translateModel extends model
$translation->module = $moduleName;
$translation->key = $langKey;
$translation->value = $langValue;
$translation->refer = htmlspecialchars($langValue);
$translation->referer = htmlspecialchars($langValue);
$translation->status = 'waiting';
$translation->translator = $this->app->user->account;
$translation->translationTime = helper::now();
$translation->translatedTime = helper::now();
$translation->version = $version;
$translation->mode = $flow;
$this->dao->replace(TABLE_TRANSLATION)->data($translation)->exec();
@@ -709,13 +709,13 @@ class translateModel extends model
{
if(!isset($translateIdList[$translation->id])) continue;
$specialedValue = htmlspecialchars($langValue);
if($specialedValue == $translation->refer)
if($specialedValue == $translation->referer)
{
$this->dao->update(TABLE_TRANSLATION)->set('version')->eq($version)->where('id')->eq($translation->id)->exec();
}
elseif($specialedValue != $translation->refer)
elseif($specialedValue != $translation->referer)
{
$this->dao->update(TABLE_TRANSLATION)->set('version')->eq($version)->set('status')->eq('changed')->set('refer')->eq($specialedValue)->where('id')->eq($translation->id)->exec();
$this->dao->update(TABLE_TRANSLATION)->set('version')->eq($version)->set('status')->eq('changed')->set('referer')->eq($specialedValue)->where('id')->eq($translation->id)->exec();
}
unset($translateIdList[$translation->id]);
}
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 common::checkEnLang() ? 'w-150px' : 'w-110px';?>'><?php echo $lang->actions;?></th>
<th class='<?php echo common::checkNotCN() ? 'w-150px' : 'w-110px';?>'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody class='text-center'>
module/translate/view/index.html.php
+1 -1
View File
@@ -48,7 +48,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 common::checkEnLang() ? 'w-130px' : 'w-95px';?>'>
<td class='actions <?php echo common::checkNotCN() ? 'w-130px' : 'w-95px';?>'>
<?php
echo html::a(inlink('chooseModule', "language=$langKey"), $lang->translate->common, '', "class='btn btn-sm $disabled'");
echo html::a(inlink('export', "language=$langKey"), $lang->export, '', "class='btn btn-sm iframe $disabled'");
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 = common::checkEnLang() ? 'w-120px' : 'w-80px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-200px' : 'w-180px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-140px' : 'w-90px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-enVerifyPassword' : 'w-verifyPassword';?>
<?php $thClass = common::checkNotCN() ? '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/' . (common::checkEnLang() ? 'zt-logo.png' : 'zt-logo-en.png');?>" alt="">
<img src="<?php echo $config->webRoot . 'theme/default/images/main/' . (common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-120px' : 'w-90px';?>
<?php $colWidth = common::checkNotCN() ? '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 = common::checkEnLang() ? 'w-120px' : 'w-90px';?>
<?php $colWidth = common::checkNotCN() ? '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>