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

* task #8043, improve UI of header buttons.

Browse Source
This commit is contained in:
Catouse
2020-09-23 17:25:00 +08:00
parent 8953a6170b
commit e0143c553c
11 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/model.php
+1 -1
View File
@@ -373,7 +373,7 @@ class customModel extends model
$current = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? 'Scrum' : $this->lang->custom->waterfallCommon;
$link = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? html::a(helper::createLink('custom', 'setwaterfall'), $this->lang->custom->waterfallCommon) : html::a(helper::createLink('custom', 'setscrum'), 'Scrum');
$output = "<div class='btn-group' id='swapper'><button data-toggle='dropdown' type='button' class='btn btn-limit' title='{$current}'>{$current} <i class='icon icon-swap'></i></button>";
$output = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' title='{$current}'>{$current} <span class='caret'></span></button>";
$output .= "<ul class='dropdown-menu'><li>" . $link . "</li></ul>";
$output .= "</div>";
module/product/model.php
+1 -1
View File
@@ -440,7 +440,7 @@ class productModel extends model
}
$dropMenuLink = helper::createLink('product', 'ajaxGetDropMenu', "objectID=$productID&module=$currentModule&method=$currentMethod&extra=$extra");
$output .= "<div class='btn-group' id='swapper'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProductName}'>{$currentProductName} <i class='icon icon-swap'></i></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output .= "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProductName}'>{$currentProductName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
$output .= "</div></div>";
module/program/model.php
+14 -14
View File
@@ -28,8 +28,8 @@ class programModel extends model
if(empty($programs)) return array();
$programIdList = array_keys($programs);
$hours = $this->dao->select('program,
cast(sum(consumed) as decimal(10,2)) as consumed,
$hours = $this->dao->select('program,
cast(sum(consumed) as decimal(10,2)) as consumed,
cast(sum(estimate) as decimal(10,2)) as estimate')
->from(TABLE_TASK)
->where('program')->in($programIdList)
@@ -211,10 +211,10 @@ class programModel extends model
public function setPGMViewMenu($programID = 0)
{
foreach($this->lang->program->viewMenu as $label => $menu)
{
foreach($this->lang->program->viewMenu as $label => $menu)
{
$this->lang->program->viewMenu->$label = is_array($menu) ? sprintf($menu['link'], $programID) : sprintf($menu, $programID);
}
}
$this->lang->program->menu = $this->lang->program->viewMenu;
}
@@ -393,7 +393,7 @@ class programModel extends model
*/
public function getPGMCommonAction($programID = 0)
{
$output = "<div class='btn-group' id='pgmCommonAction'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$this->lang->program->PGMCommon}'>{$this->lang->program->PGMCommon} <i class='icon icon-sort-down'></i></button>";
$output = "<div class='btn-group header-angle-btn' id='pgmCommonAction'><button data-toggle='dropdown' type='button' class='btn' title='{$this->lang->program->PGMCommon}'>{$this->lang->program->PGMCommon} <i class='icon icon-sort-down'></i></button>";
$output .= '<ul class="dropdown-menu">';
$output .= '<li>' . html::a(helper::createLink('program', 'pgmindex'), "<i class='icon icon-home'></i> " . $this->lang->program->PGMIndex) . '</li>';
$output .= '<li>' . html::a(helper::createLink('program', 'pgmbrowse'), "<i class='icon icon-cards-view'></i> " . $this->lang->program->PGMBrowse) . '</li>';
@@ -432,7 +432,7 @@ class programModel extends model
}
$dropMenuLink = helper::createLink('program', 'ajaxGetPGMDropMenu', "objectID=$programID&module=$currentModule&method=$currentMethod");
$output = "<div class='btn-group' id='swapper'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProgramName}'>{$currentProgramName} <i class='icon icon-swap'></i></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProgramName}'>{$currentProgramName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>'; $output .= "</div></div>";
return $output;
@@ -492,7 +492,7 @@ class programModel extends model
/**
* Get children by program id.
*
* @param int $programID
* @param int $programID
* @access private
* @return void
*/
@@ -605,7 +605,7 @@ class programModel extends model
/**
* Get program parent pairs
*
* @param string $model
* @param string $model
* @access public
* @return array
*/
@@ -696,7 +696,7 @@ class programModel extends model
*/
public function printPRJCommonAction()
{
$output = "<div class='btn-group' id='pgmCommonAction'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$this->lang->program->PRJAll}'>{$this->lang->program->PRJAll} <i class='icon icon-sort-down'></i></button>";
$output = "<div class='btn-group header-angle-btn' id='pgmCommonAction'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$this->lang->program->PRJAll}'>{$this->lang->program->PRJAll} <span class='caret'></span></button>";
$output .= '<ul class="dropdown-menu">';
$output .= '<li>' . html::a(helper::createLink('program', 'prjbrowse'), "<i class='icon icon-cards-view'></i> " . $this->lang->program->PRJAll) . '</li>';
$output .= '<li>' . html::a(helper::createLink('program', 'prjcreate'), "<i class='icon icon-plus'></i> " . $this->lang->program->PRJCreate) . '</li>';
@@ -729,7 +729,7 @@ class programModel extends model
}
$dropMenuLink = helper::createLink('program', 'ajaxGetPRJDropMenu', "objectID=$projectID&module=$currentModule&method=$currentMethod");
$output = "<div class='btn-group' id='swapper'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProjectName}'>{$currentProjectName} <i class='icon icon-swap'></i></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProjectName}'>{$currentProjectName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
$output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
$output .= "</div></div>";
@@ -796,7 +796,7 @@ class programModel extends model
/**
* Get a project by id.
*
*
* @param int $projectID
* @access public
* @return object
@@ -812,7 +812,7 @@ class programModel extends model
/**
* Get project name.
*
*
* @param int $projectID
* @access public
* @return object
@@ -838,7 +838,7 @@ class programModel extends model
/**
* Build the query.
*
*
* @param int $projectID
* @access public
* @return object
www/theme/blackberry/style.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/classic/style.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/default/style.css
-3
View File
@@ -54,6 +54,3 @@ a.showMoreImage:hover {opacity: 1;}
#menuNav> .nav > li > span {padding: 8px; line-height: 20px; cursor: pointer; color: #fff; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; -khtml-user-select: none; user-select:none;}
#morePRJ {display:none; max-height: 420px; position: fixed; bottom: 0; left: 100px; z-index: 999; background: white; padding: 20px 10px; height: 420px; margin-bottom: 40px; border: 1px solid #efefef}
#morePRJ > .list-group {height: 400px; min-width: 150px; max-width:200px;}
#pgmCommonAction>.btn { height: 50px; padding: 10px 15px; margin: 0; line-height: 30px; font-size: 14px; font-weight: 700; color: #fff; background: 0 0; border: none; }
#pgmCommonAction>.btn>.icon{ position: relative; top: -4px; display: inline-block; font-size: 18px; font-weight: 400; vertical-align: middle; }
www/theme/green/style.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/pink/style.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/purple/style.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/red/style.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long