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

* adjust for style.

Browse Source
This commit is contained in:
wangyidong
2019-06-11 10:04:25 +08:00
parent 3b54364860
commit 96d2cdca60
12 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/projectblock.html.php
+3 -2
View File
@@ -45,9 +45,10 @@
<?php if($longBlock):?>
<td class="c-status">
<?php if(isset($project->delay)):?>
<span class="status-project status-delayed"><?php echo $lang->project->delayed;?></span>
<span class="status-project status-delayed" title='<?php echo $lang->project->delayed;?>'><?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="status-project status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status, '');?></span>
<?php $statusName = zget($lang->project->statusList, $project->status, '');?>
<span class="status-project status-<?php echo $project->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
<?php endif;?>
</td>
<td class="c-hours"><?php echo $project->hours->totalEstimate;?></td>
module/dept/view/edit.html.php
+4 -3
View File
@@ -23,15 +23,16 @@ $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>
<th class='w-80px'><?php echo $lang->dept->parent;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? '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>
<tr>
<th class='w-80px'><?php echo $lang->dept->name;?></th>
<th><?php echo $lang->dept->name;?></th>
<td><?php echo html::input('name', $dept->name, "class='form-control'");?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->dept->manager;?></th>
<th><?php echo $lang->dept->manager;?></th>
<td><?php echo html::select('manager', $users, $dept->manager, "class='form-control chosen'", true);?></td>
</tr>
<tr>
module/group/lang/resource.php
+2 -2
View File
@@ -401,7 +401,7 @@ $lang->resource->task->assignTo = 'assign';
$lang->resource->task->start = 'start';
$lang->resource->task->pause = 'pause';
$lang->resource->task->restart = 'restart';
$lang->resource->task->finish = 'finish';
$lang->resource->task->finish = 'finishAction';
$lang->resource->task->cancel = 'cancel';
$lang->resource->task->close = 'close';
$lang->resource->task->batchCreate = 'batchCreate';
@@ -410,7 +410,7 @@ $lang->resource->task->batchClose = 'batchClose';
$lang->resource->task->batchCancel = 'batchCancel';
$lang->resource->task->batchAssignTo = 'batchAssignTo';
$lang->resource->task->batchChangeModule = 'batchChangeModule';
$lang->resource->task->activate = 'activate';
$lang->resource->task->activate = 'activateAction';
$lang->resource->task->delete = 'delete';
$lang->resource->task->view = 'view';
$lang->resource->task->export = 'export';
module/task/lang/en.php
+4 -2
View File
@@ -26,11 +26,13 @@ $lang->task->logEfforts = "Effort";
$lang->task->record = "Estimates";
$lang->task->start = "Start";
$lang->task->restart = "Continue";
$lang->task->finish = "Finish Task";
$lang->task->finishAction = "Finish Task";
$lang->task->finish = "Finish";
$lang->task->pause = "Pause";
$lang->task->close = "Close";
$lang->task->cancel = "Cancel";
$lang->task->activate = "Activate Task";
$lang->task->activateAction = "Activate Task";
$lang->task->activate = "Activate";
$lang->task->export = "Export";
$lang->task->reportChart = "Report Chart";
$lang->task->fromBug = 'From Bug';
module/task/lang/zh-cn.php
+3
View File
@@ -26,10 +26,12 @@ $lang->task->logEfforts = "记录工时";
$lang->task->record = "工时";
$lang->task->start = "开始";
$lang->task->restart = "继续";
$lang->task->finishAction = "完成任务";
$lang->task->finish = "完成";
$lang->task->pause = "暂停";
$lang->task->close = "关闭";
$lang->task->cancel = "取消";
$lang->task->activateAction = "激活任务";
$lang->task->activate = "激活";
$lang->task->export = "导出数据";
$lang->task->reportChart = "报表统计";
@@ -38,6 +40,7 @@ $lang->task->case = '相关用例';
$lang->task->confirmStoryChange = "确认需求变动";
$lang->task->storyChange = "需求变更";
$lang->task->progress = '进度';
$lang->task->progressAB = '%';
$lang->task->progressTips = '已消耗/(已消耗+剩余)';
$lang->task->copy = '复制任务';
$lang->task->waitTask = '未开始的任务';
module/testcase/config.php
+1 -1
View File
@@ -123,7 +123,7 @@ $config->testcase->datatable->fieldList['assignedTo']['required'] = 'no';
$config->testcase->datatable->fieldList['openedBy']['title'] = 'openedByAB';
$config->testcase->datatable->fieldList['openedBy']['fixed'] = 'no';
$config->testcase->datatable->fieldList['openedBy']['width'] = '80';
$config->testcase->datatable->fieldList['openedBy']['width'] = '90';
$config->testcase->datatable->fieldList['openedBy']['required'] = 'no';
$config->testcase->datatable->fieldList['openedDate']['title'] = 'openedDate';
module/testsuite/view/linkcase.html.php
+3 -3
View File
@@ -33,7 +33,7 @@
<table class='table tablesorter' id='testcaseList'>
<thead>
<tr>
<th class='w-id'>
<th class='c-id'>
<div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
<label></label>
</div>
@@ -43,8 +43,8 @@
<th class='w-pri text-center'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-type'><?php echo $lang->testcase->type;?></th>
<th class='w-user text-center'><?php echo $lang->openedByAB;?></th>
<th class='w-status text-center'><?php echo $lang->statusAB;?></th>
<th class='c-user text-center'><?php echo $lang->openedByAB;?></th>
<th class='c-status text-center'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<tbody>
module/todo/view/view.html.php
+2 -1
View File
@@ -93,7 +93,8 @@
<div class='detail-content'>
<table class='table table-data'>
<tr>
<th class='w-90px'><?php echo $lang->todo->pri;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? '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>
<tr>
module/tree/view/edit.html.php
+6 -5
View File
@@ -23,32 +23,33 @@ 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 if($showProduct):?>
<tr>
<th class='w-80px'><?php echo $lang->tree->product;?></th>
<th class='<?php echo $colWidth;?>'><?php echo $lang->tree->product;?></th>
<td><?php echo html::select('root', $products, $module->root, "class='form-control chosen'");?></td>
</tr>
<?php endif;?>
<?php $hidden = ($type != 'story' and $module->type == 'story');?>
<?php if($type == 'doc'):?>
<tr>
<th class='w-80px'><?php echo $lang->doc->lib;?></th>
<th class='<?php echo $colWidth;?>'><?php echo $lang->doc->lib;?></th>
<td><?php echo html::select('root', $libs, $module->root, "class='form-control chosen' onchange=loadDocModule(this.value)");?></td>
</tr>
<?php endif;?>
<?php if($module->type != 'line'):?>
<tr <?php if($hidden) echo "style='display:none'";?>>
<th class='w-80px'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->parentCate : $lang->tree->parent;?></th>
<th class='<?php echo $colWidth;?>'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->parentCate : $lang->tree->parent;?></th>
<td><?php echo html::select('parent', $optionMenu, $module->parent, "class='form-control chosen'");?></td>
</tr>
<?php endif;?>
<tr <?php if($hidden) echo "style='display:none'";?>>
<th class='w-80px'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->cate : $lang->tree->name;?></th>
<th class='<?php echo $colWidth;?>'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->cate : $lang->tree->name;?></th>
<td><?php echo html::input('name', $module->name, "class='form-control'");?></td>
</tr>
<?php if($type == 'bug'):?>
<tr>
<th class='w-80px'><?php echo $lang->tree->owner;?></th>
<th class='<?php echo $colWidth;?>'><?php echo $lang->tree->owner;?></th>
<td><?php echo html::select('owner', $users, $module->owner, "class='form-control chosen'", true);?></td>
</tr>
<?php endif;?>
module/user/view/batchcreate.html.php
+5 -2
View File
@@ -25,6 +25,7 @@
$visibleFields = array();
foreach(explode(',', $showFields) as $field)
{
if(strpos(",{$config->user->customBatchCreateFields},", $field) === false) continue;
if($field) $visibleFields[$field] = '';
}
$minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
@@ -36,12 +37,14 @@
<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>
<th class='w-180px required'><?php echo $lang->user->account;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? '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>
<th class='w-90px<?php echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? '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>
<th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'> <?php echo $lang->user->join;?></th>
module/user/view/batchedit.html.php
+1
View File
@@ -24,6 +24,7 @@
$visibleFields = array();
foreach(explode(',', $showFields) as $field)
{
if(strpos(",{$config->user->customBatchEditFields},", $field) === false) continue;
if($field)$visibleFields[$field] = '';
}
$minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
www/theme/lang/en.css
+2
View File
@@ -5,3 +5,5 @@
.main-actions .btn-toolbar .btn+.btn { margin-left: 0px !important;}
.main-actions .btn-toolbar .btn+.btn-group {margin-left: 5px !important;}
.main-actions .btn-toolbar { padding: 4px 5px;}
.c-user{width:90px !important;}