* adjust for page style.
This commit is contained in:
@@ -10,10 +10,13 @@
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
?>
|
||||
<?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/form.html.php';?>
|
||||
<div id='mainContent' class='main-content'>
|
||||
<div class='center-block mw-600px'>
|
||||
<div class='main-header'>
|
||||
<h2><?php echo $lang->webhook->setting;?></h2>
|
||||
</div>
|
||||
<div class='center-block mw-700px'>
|
||||
<form id='logForm' method='post' class='ajaxForm'>
|
||||
<table class='table table-form'>
|
||||
<tr>
|
||||
@@ -31,7 +34,4 @@
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$(function(){$('#mainMenu #webhookTab').addClass('btn-active-text');})
|
||||
</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -22,8 +22,9 @@
|
||||
<form class="load-indicator main-form form-ajax" method='post'>
|
||||
<table class='table table-form'>
|
||||
<tr>
|
||||
<th class='w-130px'><?php echo $lang->admin->safe->password?></th>
|
||||
<td class='w-200px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
|
||||
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-300px' : 'w-130px';?>
|
||||
<th class='<?php echo $colWidth;?>'><?php echo $lang->admin->safe->password?></th>
|
||||
<td class='w-230px'><?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>
|
||||
</tr>
|
||||
<tr id='mode1Rule' class='hidden'>
|
||||
|
||||
@@ -181,7 +181,7 @@ class bug extends control
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function report($productID, $browseType, $branchID, $moduleID, $chartType = '')
|
||||
public function report($productID, $browseType, $branchID, $moduleID, $chartType = 'default')
|
||||
{
|
||||
$this->loadModel('report');
|
||||
$this->view->charts = array();
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
<div class='cell'>
|
||||
<div class='btn-toolbar'>
|
||||
<?php foreach($lang->report->typeList as $type => $typeName):?>
|
||||
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-list-alt muted'></i> " : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
|
||||
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-list-alt muted'></i> " : "<i class='icon icon-chart-{$type} muted'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
|
||||
<?php endforeach;?>
|
||||
<div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
#product_chosen .chosen-single{border-right:0px;}
|
||||
@@ -262,7 +262,6 @@ $lang->task = new stdclass();
|
||||
$lang->build = new stdclass();
|
||||
$lang->task->menu = $lang->project->menu;
|
||||
$lang->build->menu = $lang->project->menu;
|
||||
$lang->build->menu->qa = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
|
||||
|
||||
/* QA menu settings. */
|
||||
$lang->qa = new stdclass();
|
||||
|
||||
@@ -262,7 +262,6 @@ $lang->task = new stdclass();
|
||||
$lang->build = new stdclass();
|
||||
$lang->task->menu = $lang->project->menu;
|
||||
$lang->build->menu = $lang->project->menu;
|
||||
$lang->build->menu->qa = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
|
||||
|
||||
/* QA视图菜单设置。*/
|
||||
$lang->qa = new stdclass();
|
||||
|
||||
@@ -23,7 +23,8 @@
|
||||
<form class='main-form' method='post' target='hiddenwin'>
|
||||
<table class='table table-form'>
|
||||
<tr>
|
||||
<th><?php echo $lang->company->name;?></th>
|
||||
<?php $colWidth = $app->getClientLang() == 'en' ? '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>
|
||||
<tr>
|
||||
|
||||
@@ -54,7 +54,8 @@ EOT;
|
||||
<?php if(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
|
||||
<table class='table table-form mw-800px'>
|
||||
<tr>
|
||||
<th class='w-80px'><?php echo $lang->custom->storyReview;?></th>
|
||||
<?php $colWidth = $app->getClientLang() == 'en' ? '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>
|
||||
</tr>
|
||||
|
||||
@@ -110,19 +110,19 @@ $(function()
|
||||
sort:
|
||||
{
|
||||
title: '<?php echo $lang->dept->dragAndSort ?>',
|
||||
template: '<a class="sort-handler" href="javascript:;"><?php echo $lang->sort;?></a>'
|
||||
template: '<a class="sort-handler"><i class="icon-move"></i></a>'
|
||||
},
|
||||
edit:
|
||||
{
|
||||
linkTemplate: '<?php echo helper::createLink('dept', 'edit', "deptid={0}"); ?>',
|
||||
title: '<?php echo $lang->dept->edit ?>',
|
||||
template: '<a href="javascript:;" data-width="600"><?php echo $lang->edit?></a>'
|
||||
template: '<a><i class="icon-edit"></i></a>'
|
||||
},
|
||||
"delete":
|
||||
{
|
||||
linkTemplate: '<?php echo helper::createLink('dept', 'delete', "deptid={0}"); ?>',
|
||||
title: '<?php echo $lang->dept->delete ?>',
|
||||
template: '<a href="javascript:;"><?php echo $lang->delete?></a>'
|
||||
template: '<a><i class="icon-trash"></i></a>'
|
||||
}
|
||||
},
|
||||
action: function(event)
|
||||
|
||||
@@ -809,7 +809,6 @@ class doc extends control
|
||||
}
|
||||
elseif($from == 'project')
|
||||
{
|
||||
$this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
|
||||
$this->lang->doc->menu = $this->lang->project->menu;
|
||||
$this->lang->doc->menuOrder = $this->lang->project->menuOrder;
|
||||
$this->project->setMenu($this->project->getPairs('nocode'), $objectID);
|
||||
|
||||
@@ -47,7 +47,12 @@
|
||||
?>
|
||||
<td>
|
||||
<?php
|
||||
echo html::checkbox("messageSetting[$type][setting][$objectType]", $availableActions, isset($messageSetting[$type]['setting'][$objectType]) ? join(',', $messageSetting[$type]['setting'][$objectType]) : '');
|
||||
$selected = isset($messageSetting[$type]['setting'][$objectType]) ? join(',', $messageSetting[$type]['setting'][$objectType]) : '';
|
||||
foreach($availableActions as $key => $value)
|
||||
{
|
||||
$checked = strpos(",$selected,", ",{$key},") !== false ? "checked='checked'" : '';
|
||||
echo "<div class='checkbox-primary' title='$value'><input type='checkbox' name='messageSetting[$type][setting][$objectType][]' value='$key' $checked id='messageSetting[$type][setting][$objectType]$key'> <label for='messageSetting[$type][setting][$objectType]$key'>$value</label></div>";
|
||||
}
|
||||
if(isset($config->message->condition[$type][$objectType]))
|
||||
{
|
||||
$moduleName = $objectType == 'case' ? 'testcase' : $objectType;
|
||||
|
||||
@@ -393,7 +393,7 @@ class my extends control
|
||||
{
|
||||
$this->user->updatePassword($this->app->user->id);
|
||||
if(dao::isError()) die(js::error(dao::getError()));
|
||||
die(js::locate($this->createLink('my', 'profile'), 'parent'));
|
||||
die(js::locate($this->createLink('my', 'profile'), 'parent.parent'));
|
||||
}
|
||||
|
||||
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->changePassword;
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
<?php endforeach;?>
|
||||
<?php endif;?>
|
||||
<dt><?php echo $lang->user->address;?></dt>
|
||||
<dd><?php echo $user->address;?></dd>
|
||||
<dd title='<?php echo $user->address;?>'><?php echo $user->address;?></dd>
|
||||
<dt><?php echo $lang->user->zipcode;?></dt>
|
||||
<dd><?php echo $user->zipcode;?></dd>
|
||||
</dl>
|
||||
|
||||
@@ -57,7 +57,7 @@ $lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
|
||||
$lang->product->accessDenied = "You have no access to the {$lang->productCommon}.";
|
||||
|
||||
$lang->product->id = 'ID';
|
||||
$lang->product->name = 'Product Name';
|
||||
$lang->product->name = "{$lang->productCommon} Name";
|
||||
$lang->product->code = 'Code';
|
||||
$lang->product->line = "{$lang->productCommon} Line";
|
||||
$lang->product->order = 'Rank';
|
||||
@@ -66,7 +66,7 @@ $lang->product->typeAB = 'Type';
|
||||
$lang->product->status = 'Status';
|
||||
$lang->product->desc = 'Description';
|
||||
$lang->product->manager = 'Managers';
|
||||
$lang->product->PO = 'Product Owner';
|
||||
$lang->product->PO = "{$lang->productCommon} Owner";
|
||||
$lang->product->QD = 'QA Manager';
|
||||
$lang->product->RD = 'Release Manager';
|
||||
$lang->product->acl = 'ACL';
|
||||
|
||||
@@ -194,6 +194,7 @@ $(function()
|
||||
shown: function(){$('.modal-iframe').addClass('with-titlebar').data('cancel-reload', true)},
|
||||
hidden: refresh
|
||||
});
|
||||
return false;
|
||||
return false;
|
||||
});
|
||||
setTimeout(function(){$('#kanban .c-side.has-btn').removeAttr('title');}, 500);
|
||||
});
|
||||
|
||||
@@ -36,6 +36,7 @@ $lang->project->release = 'Release';
|
||||
$lang->project->acl = 'ACL';
|
||||
$lang->project->teamname = 'Team Name';
|
||||
$lang->project->order = "Rank {$lang->projectCommon}";
|
||||
$lang->project->orderAB = "Rank";
|
||||
$lang->project->products = "Link {$lang->productCommon}";
|
||||
$lang->project->whitelist = 'Whitelist';
|
||||
$lang->project->totalEstimate = 'Estimates';
|
||||
|
||||
@@ -36,6 +36,7 @@ $lang->project->release = '发布';
|
||||
$lang->project->acl = '访问控制';
|
||||
$lang->project->teamname = '团队名称';
|
||||
$lang->project->order = $lang->projectCommon . '排序';
|
||||
$lang->project->orderAB = '排序';
|
||||
$lang->project->products = '相关' . $lang->productCommon;
|
||||
$lang->project->whitelist = '分组白名单';
|
||||
$lang->project->totalEstimate = '预计';
|
||||
|
||||
@@ -43,7 +43,8 @@
|
||||
</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>
|
||||
<th class='w-100px'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
|
||||
<?php $colWidth = $app->getClientLang() == 'en' ? '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>
|
||||
<th class='w-70px'><?php echo $lang->project->totalEstimate;?></th>
|
||||
@@ -52,7 +53,7 @@
|
||||
<th class='w-150px'><?php echo $lang->project->progress;?></th>
|
||||
<th class='w-100px'><?php echo $lang->project->burn;?></th>
|
||||
<?php if($canOrder):?>
|
||||
<th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->updateOrder);?></th>
|
||||
<th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
|
||||
<?php endif;?>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@@ -54,9 +54,9 @@
|
||||
<th class='w-80px'> <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
|
||||
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
|
||||
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
|
||||
<th class='w-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
|
||||
<th class='w-110px c-assignedTo'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
|
||||
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
|
||||
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
|
||||
<th class='w-110px c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
|
||||
<th class='c-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
|
||||
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
|
||||
<th class='c-actions-5'><?php echo $lang->actions;?></th>
|
||||
</tr>
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
<?php if($productType != 'normal'):?>
|
||||
<th class='w-80px'><?php echo $lang->product->branchName[$productType];?></th>
|
||||
<?php endif;?>
|
||||
<th class='w-user'><?php echo $lang->openedByAB;?></th>
|
||||
<th class='c-user'><?php echo $lang->openedByAB;?></th>
|
||||
<th class='w-80px text-center'><?php echo $lang->story->estimateAB;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@@ -27,16 +27,11 @@
|
||||
<?php $checked = 'checked';?>
|
||||
<div class='col-sm-4'>
|
||||
<div class='product <?php echo $checked . (isset($branchGroups[$productID]) ? ' has-branch' : '')?>'>
|
||||
<div class="checkbox-primary">
|
||||
<div class="checkbox-primary" title='<?php echo $productName;?>'>
|
||||
<?php echo "<input type='checkbox' name='products[$productID]' value='$productID' $checked id='products{$productID}'>";?>
|
||||
<label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';><?php echo $productName;?></label>
|
||||
<label class='text-ellipsis checkbox-inline' for='<?php echo 'products' . $productID;?>' title='<?php echo $productName;?>'><?php echo $productName;?></label>
|
||||
</div>
|
||||
<?php
|
||||
if(isset($branchGroups[$productID]))
|
||||
{
|
||||
echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");
|
||||
}
|
||||
?>
|
||||
<?php if(isset($branchGroups[$productID])) echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");?>
|
||||
</div>
|
||||
</div>
|
||||
<?php unset($allProducts[$productID]);?>
|
||||
@@ -50,16 +45,11 @@
|
||||
<?php foreach($allProducts as $productID => $productName):?>
|
||||
<div class='col-sm-4'>
|
||||
<div class='product<?php echo isset($branchGroups[$productID]) ? ' has-branch' : ''?>'>
|
||||
<div class="checkbox-primary">
|
||||
<div class="checkbox-primary" title='<?php echo $productName;?>'>
|
||||
<?php echo "<input type='checkbox' name='products[$productID]' value='$productID' id='products{$productID}'>";?>
|
||||
<label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';><?php echo $productName;?></label>
|
||||
<label class='text-ellipsis checkbox-inline' for='<?php echo 'products' . $productID;?>'><?php echo $productName;?></label>
|
||||
</div>
|
||||
<?php
|
||||
if(isset($branchGroups[$productID]))
|
||||
{
|
||||
echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");
|
||||
}
|
||||
?>
|
||||
<?php if(isset($branchGroups[$productID])) echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach;?>
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
|
||||
</th>
|
||||
<?php if($canOrder):?>
|
||||
<th class='w-80px c-sort {sorter:false}'> <?php common::printOrderLink('order', $orderBy, $vars, $lang->project->updateOrder);?></th>
|
||||
<th class='w-80px c-sort {sorter:false}'> <?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
|
||||
<?php endif;?>
|
||||
<th class='c-pri {sorter:false}'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
|
||||
<th class='c-name {sorter:false}'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
<?php $i++;?>
|
||||
<?php endforeach;?>
|
||||
<div class="col-xs-6">
|
||||
<?php common::printLink('doc', 'createLib', "type=project&objectID=$project->id", "<i class='icon icon-plus hl-primary text-primary'></i> " . $lang->doc->createLib, '', "class='text-muted iframe'");?>
|
||||
<?php common::printLink('doc', 'createLib', "type=project&objectID=$project->id", "<i class='icon icon-plus hl-primary text-primary'></i> " . $lang->doc->createLib, '', "class='text-muted iframe' data-width='1000px'");?>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
$list .= '|';
|
||||
list($label, $module, $method, $params) = explode('|', $list);
|
||||
$class = $label == $title ? 'selected' : '';
|
||||
if(common::hasPriv($module, $method)) echo html::a($this->createLink($module, $method, $params), '<i class="icon icon-file-text"></i> ' . $label, '', "class='$class'");
|
||||
if(common::hasPriv($module, $method)) echo html::a($this->createLink($module, $method, $params), '<i class="icon icon-file-text"></i> ' . $label, '', "class='$class' title='$label'");
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
|
||||
@@ -1200,7 +1200,7 @@ class task extends control
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function report($projectID, $browseType = 'all', $chartType = '')
|
||||
public function report($projectID, $browseType = 'all', $chartType = 'default')
|
||||
{
|
||||
$this->loadModel('report');
|
||||
$this->view->charts = array();
|
||||
|
||||
@@ -98,7 +98,7 @@ $lang->task->closedReason = 'CloseReason';
|
||||
$lang->task->lastEditedBy = 'ModifiedBy';
|
||||
$lang->task->lastEditedDate = 'ModifiedDate';
|
||||
$lang->task->lastEdited = 'Last Edited';
|
||||
$lang->task->recordEstimate = '%';
|
||||
$lang->task->recordEstimate = 'Effort';
|
||||
$lang->task->editEstimate = 'Edit Estimates';
|
||||
$lang->task->deleteEstimate = 'Delete Estimates';
|
||||
$lang->task->colorTag = 'Color';
|
||||
|
||||
@@ -41,8 +41,9 @@
|
||||
<tr class='text-center'>
|
||||
<th class="w-id"><?php echo $lang->idAB;?></th>
|
||||
<th class="w-120px"><?php echo $lang->task->date;?></th>
|
||||
<th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
|
||||
<th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
|
||||
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
|
||||
<th class="<?php echo $colWidth;?>"><?php echo $lang->task->consumed;?></th>
|
||||
<th class="<?php echo $colWidth;?>"><?php echo $lang->task->left;?></th>
|
||||
<th><?php echo $lang->comment;?></th>
|
||||
<th class='c-actions-2'><?php if(empty($task->team) or $task->assignedTo == $this->app->user->account) echo $lang->actions;?></th>
|
||||
</tr>
|
||||
|
||||
@@ -118,7 +118,7 @@ $config->testcase->datatable->fieldList['keywords']['required'] = 'no';
|
||||
|
||||
$config->testcase->datatable->fieldList['assignedTo']['title'] = 'assignedTo';
|
||||
$config->testcase->datatable->fieldList['assignedTo']['fixed'] = 'no';
|
||||
$config->testcase->datatable->fieldList['assignedTo']['width'] = '80';
|
||||
$config->testcase->datatable->fieldList['assignedTo']['width'] = '120';
|
||||
$config->testcase->datatable->fieldList['assignedTo']['required'] = 'no';
|
||||
|
||||
$config->testcase->datatable->fieldList['openedBy']['title'] = 'openedByAB';
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
$(document).ready(function()
|
||||
{
|
||||
$('#' + browseType + 'Tab').addClass('active');
|
||||
$('.c-side.has-btn').removeAttr('title');
|
||||
});
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
$visibleFields = array();
|
||||
foreach(explode(',', $showFields) as $field)
|
||||
{
|
||||
if(strpos(",{$config->user->customBatchCreateFields},", $field) === false) continue;
|
||||
if(strpos(",{$config->user->customBatchCreateFields},", ",{$field},") === false) continue;
|
||||
if($field) $visibleFields[$field] = '';
|
||||
}
|
||||
$minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
$visibleFields = array();
|
||||
foreach(explode(',', $showFields) as $field)
|
||||
{
|
||||
if(strpos(",{$config->user->customBatchEditFields},", $field) === false) continue;
|
||||
if(strpos(",{$config->user->customBatchEditFields},", ",{$field},") === false) continue;
|
||||
if($field)$visibleFields[$field] = '';
|
||||
}
|
||||
$minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
<?php endforeach;?>
|
||||
<?php endif;?>
|
||||
<dt><?php echo $lang->user->address;?></dt>
|
||||
<dd><?php echo $user->address;?></dd>
|
||||
<dd title='<?php echo $user->address;?>'><?php echo $user->address;?></dd>
|
||||
<dt><?php echo $lang->user->zipcode;?></dt>
|
||||
<dd><?php echo $user->zipcode;?></dd>
|
||||
</dl>
|
||||
|
||||
@@ -39,11 +39,11 @@
|
||||
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
|
||||
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
|
||||
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
|
||||
<th class='w-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
|
||||
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
|
||||
<th class='w-80px'> <?php common::printOrderLink('lastRunner', $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
|
||||
<th class='w-120px'> <?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
|
||||
<th class='w-80px'> <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
|
||||
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<div class='btn-toolbar pull-right'>
|
||||
<div class='btn-group'>
|
||||
<div class='btn-group' id='createActionMenu'>
|
||||
<?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'> </i>" . $lang->webhook->setting, '', "class='btn btn-primary'");?>
|
||||
<?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'> </i>" . $lang->webhook->setting, '', "class='btn btn-primary iframe'", '', true);?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
$lang->chat->common = 'Xuanxuan';
|
||||
$lang->chat->common = 'Desktop';
|
||||
$lang->chat->turnon = 'On';
|
||||
$lang->chat->help = 'Help';
|
||||
$lang->chat->settings = 'Settings';
|
||||
|
||||
Reference in New Issue
Block a user