* Adjust icons.

This commit is contained in:
leiyong
2021-01-01 15:49:59 +08:00
parent 2119015636
commit 5baf41d5e3
6 changed files with 27 additions and 49 deletions
+3 -3
View File
@@ -73,12 +73,12 @@
</ul>
</div>
<?php common::printIcon('program', 'PRJEdit', "projectID=$project->id", $project, 'list', 'edit');?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'persons');?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'group');?>
<?php common::printIcon('program', 'PRJGroup', "projectID=$project->id", $project, 'list', 'lock');?>
<div class='btn-group'>
<button type='button' class='btn icon-more-circle dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<button type='button' class='btn icon-chevron-double-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>" style="width: 16px; padding-left: 0px; border-radius: 4px;"></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$project->id", $project, 'list', 'menu-project');?>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$project->id", $project, 'list', 'link');?>
<?php common::printIcon('program', 'PRJWhitelist', "projectID=$project->id", $project, 'list', 'group');?>
<?php if(common::hasPriv('program','PRJDelete')) echo html::a($this->createLink("program", "PRJDelete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");?>
</ul>
+11 -22
View File
@@ -39,7 +39,7 @@ $config->program->sortFields->PRJBudget = 'budget';
global $lang;
$config->program->datatable = new stdclass();
$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJPGM', 'PM', 'begin', 'end', 'PRJStatus', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions');
$config->program->datatable->defaultField = array('idAB', 'PRJName', 'PRJPGM', 'PM', 'begin', 'end', 'PRJBudget', 'teamCount','PRJEstimate','PRJConsume', 'PRJProgress', 'actions');
$config->program->datatable->fieldList['idAB']['title'] = 'idAB';
$config->program->datatable->fieldList['idAB']['fixed'] = 'left';
@@ -54,67 +54,56 @@ $config->program->datatable->fieldList['PRJName']['sort'] = 'no';
$config->program->datatable->fieldList['PRJPGM']['title'] = 'PRJPGM';
$config->program->datatable->fieldList['PRJPGM']['fixed'] = 'left';
$config->program->datatable->fieldList['PRJPGM']['width'] = '200';
$config->program->datatable->fieldList['PRJPGM']['width'] = '140';
$config->program->datatable->fieldList['PRJPGM']['required'] = 'no';
$config->program->datatable->fieldList['PRJPGM']['sort'] = 'no';
$config->program->datatable->fieldList['PM']['title'] = 'PM';
$config->program->datatable->fieldList['PM']['fixed'] = 'no';
$config->program->datatable->fieldList['PM']['width'] = '100';
$config->program->datatable->fieldList['PM']['width'] = '80';
$config->program->datatable->fieldList['PM']['required'] = 'yes';
$config->program->datatable->fieldList['PM']['sort'] = 'no';
$config->program->datatable->fieldList['begin']['title'] = 'begin';
$config->program->datatable->fieldList['begin']['fixed'] = 'no';
$config->program->datatable->fieldList['begin']['width'] = '120';
$config->program->datatable->fieldList['begin']['width'] = '100';
$config->program->datatable->fieldList['begin']['required'] = 'no';
$config->program->datatable->fieldList['end']['title'] = 'end';
$config->program->datatable->fieldList['end']['fixed'] = 'no';
$config->program->datatable->fieldList['end']['width'] = '120';
$config->program->datatable->fieldList['end']['width'] = '100';
$config->program->datatable->fieldList['end']['required'] = 'no';
$config->program->datatable->fieldList['PRJStatus']['title'] = 'PRJStatus';
$config->program->datatable->fieldList['PRJStatus']['fixed'] = 'no';
$config->program->datatable->fieldList['PRJStatus']['width'] = '80';
$config->program->datatable->fieldList['PRJStatus']['required'] = 'yes';
$config->program->datatable->fieldList['PRJBudget']['title'] = 'PRJBudget';
$config->program->datatable->fieldList['PRJBudget']['fixed'] = 'no';
$config->program->datatable->fieldList['PRJBudget']['width'] = '100';
$config->program->datatable->fieldList['PRJBudget']['width'] = '80';
$config->program->datatable->fieldList['PRJBudget']['required'] = 'yes';
$config->program->datatable->fieldList['teamCount']['title'] = 'teamCount';
$config->program->datatable->fieldList['teamCount']['fixed'] = 'no';
$config->program->datatable->fieldList['teamCount']['width'] = '80';
$config->program->datatable->fieldList['teamCount']['width'] = '60';
$config->program->datatable->fieldList['teamCount']['required'] = 'no';
$config->program->datatable->fieldList['teamCount']['sort'] = 'no';
$config->program->datatable->fieldList['PRJEstimate']['title'] = 'PRJEstimate';
$config->program->datatable->fieldList['PRJEstimate']['fixed'] = 'no';
$config->program->datatable->fieldList['PRJEstimate']['width'] = '60';
$config->program->datatable->fieldList['PRJEstimate']['width'] = '50';
$config->program->datatable->fieldList['PRJEstimate']['required'] = 'no';
$config->program->datatable->fieldList['PRJEstimate']['sort'] = 'no';
$config->program->datatable->fieldList['PRJConsume']['title'] = 'PRJConsume';
$config->program->datatable->fieldList['PRJConsume']['fixed'] = 'no';
$config->program->datatable->fieldList['PRJConsume']['width'] = '60';
$config->program->datatable->fieldList['PRJConsume']['width'] = '50';
$config->program->datatable->fieldList['PRJConsume']['required'] = 'no';
$config->program->datatable->fieldList['PRJConsume']['sort'] = 'no';
$config->program->datatable->fieldList['PRJProgress']['title'] = 'PRJProgress';
$config->program->datatable->fieldList['PRJProgress']['fixed'] = 'right';
$config->program->datatable->fieldList['PRJProgress']['width'] = '80';
$config->program->datatable->fieldList['PRJProgress']['width'] = '60';
$config->program->datatable->fieldList['PRJProgress']['required'] = 'no';
$config->program->datatable->fieldList['PRJProgress']['sort'] = 'no';
$config->program->datatable->fieldList['PRJSurplus']['title'] = 'PRJSurplus';
$config->program->datatable->fieldList['PRJSurplus']['fixed'] = 'no';
$config->program->datatable->fieldList['PRJSurplus']['width'] = '80';
$config->program->datatable->fieldList['PRJSurplus']['required'] = 'no';
$config->program->datatable->fieldList['PRJSurplus']['sort'] = 'no';
$config->program->datatable->fieldList['actions']['title'] = 'actions';
$config->program->datatable->fieldList['actions']['fixed'] = 'right';
$config->program->datatable->fieldList['actions']['width'] = '180';
$config->program->datatable->fieldList['actions']['width'] = '170';
$config->program->datatable->fieldList['actions']['required'] = 'yes';
+5 -5
View File
@@ -1609,7 +1609,7 @@ class programModel extends model
$title = "title='{$PRJPGM}'";
}
echo "<td class='" . $class . "' $title>";
echo "<td class='c-name " . $class . "' $title>";
switch($id)
{
case 'idAB':
@@ -1660,7 +1660,7 @@ class programModel extends model
if($project->status == 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);
echo "<div class='btn-group'>";
echo "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'></button>";
echo "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px; border-radius: 4px;'></button>";
echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
common::printIcon('program', 'PRJSuspend', "projectID=$project->id", $project, 'list', 'pause', '', 'iframe btn-action', true);
if($project->status != 'doing') common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'list', 'off', '', 'iframe btn-action', true);
@@ -1669,13 +1669,13 @@ class programModel extends model
echo "</div>";
common::printIcon('program', 'PRJEdit', "projectID=$project->id", $project, 'list', 'edit');
common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'persons');
common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'group');
common::printIcon('program', 'PRJGroup', "projectID=$project->id&programID=$programID", $project, 'list', 'lock');
echo "<div class='btn-group'>";
echo "<button type='button' class='btn icon-more-circle dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'></button>";
echo "<button type='button' class='btn icon-chevron-double-down dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'></button>";
echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
common::printIcon('program', 'PRJManageProducts', "projectID=$project->id", $project, 'list', 'icon icon-menu-project', '', 'btn-action');
common::printIcon('program', 'PRJManageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action');
common::printIcon('program', 'PRJWhitelist', "projectID=$project->id", $project, 'list', 'group', '', 'btn-action');
if(common::hasPriv('program','PRJDelete')) echo html::a(inLink("PRJDelete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->program->PRJDelete}'");
echo "</ul>";
+5 -5
View File
@@ -62,7 +62,7 @@
<?php if($program->status == 'doing') common::printIcon('program', 'PGMClose', "programID=$program->id", $program, 'list', 'off', '', 'iframe', true);?>
<?php if($program->status == 'closed') common::printIcon('program', 'PGMActivate', "programID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
<div class='btn-group'>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>" style="width: 16px; padding-left: 0px;"></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<?php common::printIcon('program', 'PGMSuspend', "programID=$program->id", $program, 'list', 'pause', '', 'iframe', true, '', $this->lang->program->PGMSuspend);?>
<?php if($program->status != 'doing') common::printIcon('program', 'PGMClose', "programID=$program->id", $program, 'list', 'off', '', 'iframe', true);?>
@@ -78,7 +78,7 @@
<?php if($program->status == 'doing') common::printIcon('program', 'PRJClose', "projectID=$program->id", $program, 'list', 'off', '', 'iframe', true);?>
<?php if($program->status == 'closed') common::printIcon('program', 'PRJActivate', "projectID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
<div class='btn-group'>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>" style="width: 16px; padding-left: 0px;"></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<?php common::printIcon('program', 'PRJSuspend', "projectID=$program->id", $program, 'list', 'pause', '', 'iframe', true);?>
<?php if($program->status != 'doing') common::printIcon('program', 'PRJClose', "projectID=$program->id", $program, 'list', 'off', '', 'iframe', true);?>
@@ -86,12 +86,12 @@
</ul>
</div>
<?php common::printIcon('program', 'PRJEdit', "projectID=$program->id", $program, 'list', 'edit');?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'persons');?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'group');?>
<?php common::printIcon('program', 'PRJGroup', "projectID=$program->id", $program, 'list', 'lock');?>
<div class='btn-group'>
<button type='button' class='btn icon-more-circle dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<button type='button' class='btn icon-chevron-double-down dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$program->id", $program, 'list', 'menu-project');?>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$program->id", $program, 'list', 'link');?>
<?php common::printIcon('program', 'PRJWhitelist', "projectID=$program->id", $program, 'list', 'group');?>
<?php if(common::hasPriv('program','PRJDelete')) echo html::a($this->createLink("program", "PRJDelete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");?>
</ul>
+1 -5
View File
@@ -41,12 +41,10 @@ js::set('browseType', $browseType);
<?php else:?>
<form class='main-table' id='projectsForm' method='post' data-ride="table">
<?php
include '../../common/view/datatable.html.php';
$vars = "programID=$programID&browseType=$browseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";
$setting = $this->datatable->getSetting('program');
$widths = $this->datatable->setFixedFieldWidth($setting);
?>
<table class='table has-sort-head datatable' data-fixed-left-width='<?php echo $widths['leftWidth'];?>' data-fixed-right-width='<?php echo $widths['rightWidth'];?>'>
<table class='table has-sort-head'>
<thead>
<tr>
<?php
@@ -68,11 +66,9 @@ js::set('browseType', $browseType);
<?php endforeach;?>
</tbody>
</table>
<?php if($projectStats):?>
<div class='table-footer'>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
+2 -9
View File
@@ -60,12 +60,10 @@ js::set('browseType', $browseType);
<nav class="btn-toolbar pull-right"></nav>
</div>
<?php
include '../../common/view/datatable.html.php';
$vars = "programID=$programID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";
$vars = "programID=$programID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";
$setting = $this->datatable->getSetting('program');
$widths = $this->datatable->setFixedFieldWidth($setting);
?>
<table class='table has-sort-head datatable' data-fixed-left-width='<?php echo $widths['leftWidth'];?>' data-fixed-right-width='<?php echo $widths['rightWidth'];?>'>
<table class='table has-sort-head'>
<thead>
<tr>
<?php
@@ -84,16 +82,11 @@ js::set('browseType', $browseType);
<?php endforeach;?>
</tbody>
</table>
<?php if($projectStats):?>
<div class='table-footer'>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</form>
<?php endif;?>
</div>
</div>
<?php if($projectStats):?>
<script> $('.datatable').datatable(); </script>
<?php endif;?>
<?php include '../../common/view/footer.html.php';?>