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

* Adjust icon.

Browse Source
This commit is contained in:
leiyong
2020-12-25 10:45:39 +08:00
parent 7e6c988351
commit d6236fe3b2
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/common/lang/zh-cn.php
View File

@@ -131,7 +131,7 @@ $lang->common->common = '公有模块';
$lang->mainNav = new stdclass(); $lang->mainNav = new stdclass();
$lang->mainNav->my = '<i class="icon icon-menu-my"></i> 地盘|my|index|'; $lang->mainNav->my = '<i class="icon icon-menu-my"></i> 地盘|my|index|';
$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> 项目集|program|pgmbrowse|'; $lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> 项目集|program|pgmbrowse|';
$lang->mainNav->product = '<i class="icon icon-menu-project"></i> 产品|product|index|'; $lang->mainNav->product = '<i class="icon icon-product"></i> 产品|product|index|';
$lang->mainNav->project = '<i class="icon icon-file"></i> 项目|program|prjbrowse|'; $lang->mainNav->project = '<i class="icon icon-file"></i> 项目|program|prjbrowse|';
$lang->mainNav->system = '<i class="icon icon-menu-users"></i> 组织|subject|browse|'; $lang->mainNav->system = '<i class="icon icon-menu-users"></i> 组织|subject|browse|';
$lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> 后台|admin|index|'; $lang->mainNav->admin = '<i class="icon icon-menu-backend"></i> 后台|admin|index|';
@@ -793,7 +793,7 @@ $lang->datepicker->monthNames = array('一月', '二月', '三月', '四月',
/* Common action icons 通用动作图标 */ /* Common action icons 通用动作图标 */
$lang->icons['todo'] = 'check'; $lang->icons['todo'] = 'check';
$lang->icons['product'] = 'cube'; $lang->icons['product'] = 'product';
$lang->icons['bug'] = 'bug'; $lang->icons['bug'] = 'bug';
$lang->icons['task'] = 'check-sign'; $lang->icons['task'] = 'check-sign';
$lang->icons['tasks'] = 'tasks'; $lang->icons['tasks'] = 'tasks';

10
module/product/view/ajaxgetdropmenu.html.php
View File

@@ -25,19 +25,19 @@ foreach($products as $product)
{ {
$objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id; $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
$linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id); $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
$myProductsHtml .= html::a($linkHtml, "<i class='icon icon-cube'></i> " . $product->name, '', "class='text-important' title='{$product->name}' data-key='" . zget($productsPinYin, $product->name, '') . "'"); $myProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $product->name, '', "class='text-important' title='{$product->name}' data-key='" . zget($productsPinYin, $product->name, '') . "'");
} }
else if($product->status == 'normal' and !($product->PO == $this->app->user->account)) else if($product->status == 'normal' and !($product->PO == $this->app->user->account))
{ {
$objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id; $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
$linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id); $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
$normalProductsHtml .= html::a($linkHtml, "<i class='icon icon-cube'></i> " . $product->name, '', "title='{$product->name}' data-key='" . zget($productsPinYin, $product->name, '') . "'"); $normalProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $product->name, '', "title='{$product->name}' data-key='" . zget($productsPinYin, $product->name, '') . "'");
} }
else if($product->status == 'closed') else if($product->status == 'closed')
{ {
$objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id; $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
$linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $objectID); $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $objectID);
$closedProductsHtml .= html::a($linkHtml, "<i class='icon icon-cube'></i> " . $product->name, '', "title='{$product->name}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "'"); $closedProductsHtml .= html::a($linkHtml, html::icon($lang->icons['product']) . ' ' . $product->name, '', "title='{$product->name}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "'");
} }
} }
?> ?>
@@ -65,9 +65,7 @@ foreach($products as $product)
</div> </div>
<div class="table-col col-right"> <div class="table-col col-right">
<div class='list-group'> <div class='list-group'>
<?php <?php echo $closedProductsHtml;?>
echo $closedProductsHtml;
?>
</div> </div>
</div> </div>
</div> </div>

6
module/program/model.php
View File

@@ -381,7 +381,7 @@ class programModel extends model
while($program = $stmt->fetch()) while($program = $stmt->fetch())
{ {
$link = $from == 'program' ? helper::createLink('program', 'pgmproduct', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars); $link = $from == 'program' ? helper::createLink('program', 'pgmproduct', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars);
$linkHtml = html::a($link, "<i class='icon-folder-open-o'></i> " . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name"); $linkHtml = html::a($link, html::icon($this->lang->icons['program']) . ' ' . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name");
if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id])) if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id]))
{ {
@@ -1203,8 +1203,8 @@ class programModel extends model
public function createPRJManageLink($project) public function createPRJManageLink($project)
{ {
$link = $project->type == 'program' ? helper::createLink('program', 'PRJbrowse', "programID={$project->id}") : helper::createLink('program', 'index', "projectID={$project->id}", '', '', $project->id); $link = $project->type == 'program' ? helper::createLink('program', 'PRJbrowse', "programID={$project->id}") : helper::createLink('program', 'index', "projectID={$project->id}", '', '', $project->id);
$icon = $project->type == 'program' ? '<i class="icon-folder-open-o"></i> ' : '<i class="icon icon-file"></i> '; $icon = $project->type == 'program' ? html::icon($this->lang->icons['program']) : html::icon($this->lang->icons['project']);
return html::a($link, $icon . $project->name, '_self', "id=project{$project->id} title='{$project->name}' class='text-ellipsis'"); return html::a($link, $icon . ' ' . $project->name, '_self', "id=project{$project->id} title='{$project->name}' class='text-ellipsis'");
} }
/** /**