From cece89e621d1f93bf00870251d40d5498f7c44df Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 17 Sep 2013 10:56:19 +0800 Subject: [PATCH] * replace style of icons. --- module/bug/view/browse.html.php | 11 +++++------ module/common/control.php | 17 ++++++++--------- module/common/view/action.html.php | 2 +- module/product/view/browse.html.php | 9 ++++----- module/project/view/taskheader.html.php | 12 +++++------- module/testcase/view/browse.html.php | 11 +++++------ www/theme/default/style.css | 11 ++++------- 7 files changed, 32 insertions(+), 41 deletions(-) diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index b3c2b97943..6be9a305d8 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -40,14 +40,13 @@ js::set('customed', $customed); '; - echo html::a("#", " ", '', "id='exportAction' class='icon-green-common-export' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); - echo html::a("#", $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); + echo html::a("#", " " . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); echo ''; - common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID"); - common::printIcon('bug', 'customFields'); - common::printIcon('bug', 'batchCreate', "productID=$productID&projectID=0&moduleID=$moduleID"); - common::printIcon('bug', 'create', "productID=$productID&extra=moduleID=$moduleID"); + common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'button', 'icon-bar-chart'); + common::printIcon('bug', 'customFields', '', '', 'button', 'icon-wrench'); + common::printIcon('bug', 'batchCreate', "productID=$productID&projectID=0&moduleID=$moduleID", '', 'button', 'icon-plus-sign'); + common::printIcon('bug', 'create', "productID=$productID&extra=moduleID=$moduleID", '', 'button', 'icon-plus'); ?> diff --git a/module/common/control.php b/module/common/control.php index 87386cdc45..186d03ca28 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -240,7 +240,7 @@ class common extends control if(!common::hasPriv($module, 'edit')) return false; echo ""; - echo html::a('#commentBox', ' ', '', "class='icon-green-common-comment' title='$lang->comment' onclick='setComment()'"); + echo html::a('#commentBox', '', '', "title='$lang->comment' onclick='setComment()'"); echo ""; } @@ -298,9 +298,9 @@ class common extends control /* set the class. */ if(!$icon) $icon = $method; if(strpos(',edit,copy,report,export,delete,', ",$icon,") !== false) $module = 'common'; - $color = $type == 'button' ? 'green' : ($clickable ? 'green' : 'gray'); + $disabled = $type == 'button' ? '' : ($clickable ? '' : 'disabled'); $extraClass = strpos(',export,customFields,', ",$method,") !== false ? $method : $extraClass; - $class = $extraClass ? "icon-$color-$module-$icon $extraClass" : "icon-$color-$module-$icon"; + $class = $extraClass ? "$icon $disabled $extraClass" : "$icon $disabled"; /* Create the icon link. */ if($clickable) @@ -313,16 +313,15 @@ class common extends control if($type == 'button') { echo ""; - echo html::a($link, ' ', $target, "class='$class' title='$title'", true); if($method != 'edit' and $method != 'copy' and $method != 'delete') { - echo html::a($link, $title, $target, "class='$extraClass'", true); + echo html::a($link, " " . $title, $target, "class='$extraClass'", true); } echo ""; } else { - echo html::a($link, ' ', $target, "class='$class' title='$title'", false); + echo html::a($link, '', $target, "class='icon-link' title='$title'", false); } } else @@ -349,7 +348,7 @@ class common extends control if(isonlybody()) return false; echo ""; - echo html::a($backLink, ' ', '', "class='icon-goback' title={$lang->goback}"); + echo html::a($backLink, '', '', "title={$lang->goback}"); echo ""; if(isset($preAndNext->pre) and $preAndNext->pre) @@ -358,7 +357,7 @@ class common extends control $title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name; $title = '#' . $preAndNext->pre->$id . ' ' . $title; echo ""; - echo html::a(inLink('view', "ID={$preAndNext->pre->$id}"), ' ', '', "id='pre' class='icon-pre' title='{$title}'"); + echo html::a(inLink('view', "ID={$preAndNext->pre->$id}"), '', '', "id='pre' title='{$title}'"); echo ""; } if(isset($preAndNext->next) and $preAndNext->next) @@ -367,7 +366,7 @@ class common extends control $title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name; $title = '#' . $preAndNext->next->$id . ' ' . $title; echo ""; - echo html::a(inLink('view', "ID={$preAndNext->next->$id}"), ' ', '', "id='next' class='icon-next' title='$title'"); + echo html::a(inLink('view', "ID={$preAndNext->next->$id}"), '', '', "id='next' title='$title'"); echo ""; } } diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index cd2f2c0e57..79c5233e2a 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -138,7 +138,7 @@ $(function(){ action->printChanges($action->objectType, $action->history);?> - id)'")?> + ', '', "onclick='toggleComment($action->id)'")?> comment) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 4d032241d1..639d2c1285 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -31,13 +31,12 @@
'; - echo html::a("#", " ", '', "id='exportAction' class='icon-green-common-export' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); - echo html::a("#", $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); + echo html::a("#", " " . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); echo ''; - common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID"); - common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID"); - common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID"); + common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'button', 'icon-bar-chart'); + common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID", '', 'button', 'icon-plus-sign'); + common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID", '', 'button', 'icon-plus'); ?>
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php index b0291824b9..5b105b3ba0 100644 --- a/module/project/view/taskheader.html.php +++ b/module/project/view/taskheader.html.php @@ -21,20 +21,18 @@ '; - echo html::a("#", " ", '', "id='exportAction' class='icon-green-common-export' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); - echo html::a("#", $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); + echo html::a("#", " " . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); echo ''; echo ''; - echo html::a("#", " ", '', "id='importAction' class='icon-green-task-import' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->import}'"); - echo html::a("#", $lang->import, '', "id='importAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->import}'"); + echo html::a("#", " " . $lang->import, '', "id='importAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->import}'"); echo ''; - common::printIcon('task', 'batchCreate', "projectID=$projectID"); - common::printIcon('task', 'create', "project=$projectID"); + common::printIcon('task', 'batchCreate', "projectID=$projectID", '', 'button', 'icon-plus-sign'); + common::printIcon('task', 'create', "project=$projectID", '', 'button', 'icon-plus'); ?> diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index ff27ab0591..5dd8080d15 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -31,15 +31,14 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
'; - echo html::a("#", " ", '', "id='exportAction' class='icon-green-common-export' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); - echo html::a("#", $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); + echo ''; + echo html::a("#", "" . $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'"); echo ''; - common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID"); - common::printIcon('testcase', 'create', "productID=$productID&moduleID=$moduleID"); + common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID", '', 'button', 'icon-plus-sign'); + common::printIcon('testcase', 'create', "productID=$productID&moduleID=$moduleID", '', 'button', 'icon-plus'); ?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 6bcde62064..52a84b9626 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -339,11 +339,10 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #projectID {background:#e5e5e5; border:1px solid #e5e5e5} /* Feature bar. */ -#featurebar {height:30px; line-height:30px;background-color: #edf3fe; padding:10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;} +#featurebar {height:34px; line-height:34px;background-color: #edf3fe; padding:8px 10px; border-bottom: 1px solid #e7edf7;margin: -20px -20px 20px -20px;} #featurebar span {font-size:14px;} -#featurebar a {text-decoration:none; display: inline-block;padding: 2px 7px; font-size:14px;-webkit-transition: all .2s;-o-transition: all .2s;-moz-transition: all .2s;transition: all .2s;} +#featurebar a {text-decoration:none; display: inline-block;padding: 0px 7px; line-height: 34px;height: 34px; font-size:14px;-webkit-transition: all .2s;-o-transition: all .2s;-moz-transition: all .2s;transition: all .2s;} #featurebar a:hover {color:#000;background-color: #e5e5e5;} -#featurebar .f-right a {border-right:none; padding:5px 5px 5px 0px;} #featurebar #bysearchTab a {border:none;} #featurebar select {font-size:12px; height:22px; margin-top:3px;} @@ -593,10 +592,8 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #featurebar .f-right .icon-green-testcase-create {padding:2px 8px; background:url(images/main/zt-icons.png) 0px -320px;} #featurebar .f-right .icon-green-testcase-batchCreate {padding:2px 8px; background:url(images/main/zt-icons.png) -20px -320px;} -.link-button {padding:7px 0px 7px 0px; margin-left:-1px; } -.link-button:hover {background:RGB(200, 200, 200)} -.link-button a{color:black; font-weight:normal; font-size:14px;} -.link-button a:hover {color:RGB(234, 0, 0);} +.link-button a{color:#036; font-weight:normal; font-size:14px;} +.link-button a:hover {color:#000;} /* Testtask icons. */ .icon-green-testtask-create {padding:2px 8px; background:url(images/main/zt-icons.png) 0px -202px;}