From 1b8230f6455a0694adaf47db802468ad02f3ff45 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 18 Mar 2014 09:19:57 +0800 Subject: [PATCH] * ajusted ui of module 'my'. --- lib/front/front.class.php | 14 +- module/common/control.php | 2 +- module/my/js/common.js | 1 - module/my/view/bug.html.php | 40 ++--- module/my/view/changepassword.html.php | 46 +++--- module/my/view/dynamic.html.php | 30 ++-- module/my/view/profile.html.php | 214 ++++++++++++------------- module/my/view/project.html.php | 4 +- module/my/view/story.html.php | 44 ++--- module/my/view/task.html.php | 50 +++--- module/my/view/testcase.html.php | 41 +++-- module/my/view/testtask.html.php | 25 ++- module/my/view/todo.html.php | 13 +- www/js/my.full.js | 51 +----- www/theme/default/style.css | 33 +++- 15 files changed, 290 insertions(+), 318 deletions(-) diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 3d62b2f702..25faa21c39 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -411,14 +411,14 @@ EOT; * @access public * @return string the submit button tag. */ - public static function submitButton($label = '', $misc = '') + public static function submitButton($label = '', $misc = '', $class = '') { if(empty($label)) { global $lang; $label = $lang->save; } - return " "; + return " "; } /** @@ -428,10 +428,14 @@ EOT; * @access public * @return string the reset button tag. */ - public static function resetButton() + public static function resetButton($label = '', $misc = '', $class = '') { - global $lang; - return " "; + if(empty($label)) + { + global $lang; + $label = $lang->reset; + } + return " "; } /** diff --git a/module/common/control.php b/module/common/control.php index 9a18cb6864..e6b3328759 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -334,7 +334,7 @@ class common extends control { if($type == 'list') { - echo ""; + echo ""; } } } diff --git a/module/my/js/common.js b/module/my/js/common.js index 65ecb791b2..f46639f309 100644 --- a/module/my/js/common.js +++ b/module/my/js/common.js @@ -1,4 +1,3 @@ $(function() { - if(typeof(listName) != 'undefined') setModal4List('iframe', listName, function(){$(".colorbox").colorbox({width:960, height:550, iframe:true, transition:'none'});}); }); diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index cc65a51666..a787c333b8 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -11,22 +11,22 @@ */ ?> -
-
+
my->bug;?>
+
+
'> - +
- + @@ -41,26 +41,26 @@ - - + - + - @@ -69,8 +69,8 @@
idAB);?> bug->severityAB);?> priAB);?>
+
createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?> bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]) ? $lang->bug->severityList[$bug->severity] : $bug->severity;?> bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]) ? $lang->bug->priList[$bug->pri] : $bug->pri?> bug->typeList[$bug->type]?>createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?>createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> resolvedBy];?> bug->resolutionList[$bug->resolution];?> + id"; - common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true); - common::printIcon('bug', 'assignTo', $params, '', 'list', '', '', 'iframe', true); - common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true); - common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true); - common::printIcon('bug', 'edit', $params, '', 'list'); + common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true); + common::printIcon('bug', 'assignTo', $params, '', 'list', 'hand-right', '', 'iframe', true); + common::printIcon('bug', 'resolve', $params, $bug, 'list', 'ok-sign', '', 'iframe', true); + common::printIcon('bug', 'close', $params, $bug, 'list', 'off', '', 'iframe text-danger', true); + common::printIcon('bug', 'edit', $params, '', 'list', 'pencil'); ?>
-
- edit);?> +
+ " . html::selectAll() . html::selectReverse() . '
' . html::submitButton(" " . $lang->edit);?>
show();?> diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php index 1734623ffa..5fd1de8951 100755 --- a/module/my/view/changepassword.html.php +++ b/module/my/view/changepassword.html.php @@ -11,24 +11,30 @@ */ ?> - - - - - - - - - - - - - - - - - - -
my->changePassword;?>
user->account;?>account . html::hidden('account',$user->account);?>
user->password;?>
user->password2;?>
- +
+
+
my->changePassword;?>
+
+
+ + + + + + + + + + + + + + + + + +
user->account;?>account . html::hidden('account',$user->account);?>
user->password;?>
user->password2;?>
+
+
+ diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php index ac6162f3ed..70eecc30a7 100644 --- a/module/my/view/dynamic.html.php +++ b/module/my/view/dynamic.html.php @@ -11,21 +11,23 @@ */ ?> -
- ' . html::a(inlink('dynamic', "type=today"), $lang->action->dynamic->today) . ''; - echo '' . html::a(inlink('dynamic', "type=yesterday"), $lang->action->dynamic->yesterday) . ''; - echo '' . html::a(inlink('dynamic', "type=twodaysago"), $lang->action->dynamic->twoDaysAgo) . ''; - echo '' . html::a(inlink('dynamic', "type=thisweek"), $lang->action->dynamic->thisWeek) . ''; - echo '' . html::a(inlink('dynamic', "type=lastweek"), $lang->action->dynamic->lastWeek) . ''; - echo '' . html::a(inlink('dynamic', "type=thismonth"), $lang->action->dynamic->thisMonth) . ''; - echo '' . html::a(inlink('dynamic', "type=lastmonth"), $lang->action->dynamic->lastMonth) . ''; - echo '' . html::a(inlink('dynamic', "type=all"), $lang->action->dynamic->all) . ''; - ?> +
my->dynamic;?>
+
- +
@@ -40,13 +42,13 @@ objectType == 'case' ? 'testcase' : $action->objectType;?> - + - + diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index c66abfb58f..c2e0a95d30 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -11,113 +11,109 @@ */ ?> - -
date;?> user->realname;?> actionLabel;?> action->objectTypes[$action->objectType];?> objectID;?>objectLink, $action->objectName);?>objectLink, $action->objectName);?>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
my->profile;?>
-
createLink('my', 'editprofile'), $lang->user->editProfile);?>
-
user->dept;?> - $dept) - { - if($dept->name) echo $dept->name; - if(isset($deptPath[$key + 1])) echo $lang->arrow; - } - } - ?> -
user->account;?>account;?>
user->realname;?>realname;?>
user->role;?>user->roleList[$user->role];?>
group->priv;?>name . ' '; ?>
user->commiter;?>commiter;?>
user->email;?>email;?>
user->join;?>join;?>
user->visits;?>visits;?>
user->ip;?>ip;?>
user->last;?>last;?>
user->skype;?>skype) echo html::a("callto://$user->skype", $user->skype);?>
user->qq;?>qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>
user->yahoo;?>yahoo;?>
user->gtalk;?>gtalk;?>
user->wangwang;?>wangwang;?>
user->mobile;?>mobile;?>
user->phone;?>phone;?>
user->address;?>address;?>
user->zipcode;?>zipcode;?>
+
+
+
my->profile;?>
+
+ createLink('my', 'editprofile'), " " . $lang->user->editProfile, '', "class='btn btn-primary'");?> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
user->dept;?> + $dept) + { + if($dept->name) echo $dept->name; + if(isset($deptPath[$key + 1])) echo $lang->arrow; + } + } + ?> +
user->account;?>account;?>
user->realname;?>realname;?>
user->role;?>user->roleList[$user->role];?>
group->priv;?>name . ' '; ?>
user->commiter;?>commiter;?>
user->email;?>email;?>
user->join;?>join;?>
user->visits;?>visits;?>
user->ip;?>ip;?>
user->last;?>last;?>
user->skype;?>skype) echo html::a("callto://$user->skype", $user->skype);?>
user->qq;?>qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>
user->yahoo;?>yahoo;?>
user->gtalk;?>gtalk;?>
user->wangwang;?>wangwang;?>
user->mobile;?>mobile;?>
user->phone;?>phone;?>
user->address;?>address;?>
user->zipcode;?>zipcode;?>
+
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 7be3392277..d9c1c46425 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -13,9 +13,7 @@
-
- my->myProject;?> -
+
my->myProject;?>
" . $lang->my->home->createProject, '', "class='btn'") ?>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 22e49befd8..44b553cf2b 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -11,22 +11,22 @@ */ ?> -
-
+
my->story;?>
+
+
- +
- + @@ -46,7 +46,7 @@ ?> $story):?> createLink('story', 'view', "id=$story->id");?> - + - + - @@ -75,22 +75,22 @@ -
idAB);?> priAB);?> story->product);?>
@@ -55,19 +55,19 @@ pri;?>'>pri?> productTitle;?>title);?>title);?> planTitle;?> openedBy];?> estimate;?> story->statusList[$story->status];?> story->stageList[$story->stage];?> + id", $story, 'list'); - common::printIcon('story', 'review', "storyID=$story->id", $story, 'list'); - common::printIcon('story', 'close', "storyID=$story->id", $story, 'list'); - common::printIcon('story', 'edit', "storyID=$story->id", $story, 'list'); - common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=¶m=0&storyID=$story->id", '', 'list', 'createCase'); + common::printIcon('story', 'change', "storyID=$story->id", $story, 'list', 'random'); + common::printIcon('story', 'review', "storyID=$story->id", $story, 'list', 'search'); + common::printIcon('story', 'close', "storyID=$story->id", $story, 'list', 'off', 'text-danger'); + common::printIcon('story', 'edit', "storyID=$story->id", $story, 'list', 'pencil'); + common::printIcon('story', 'createCase', "productID=$story->product&moduleID=0&from=¶m=0&storyID=$story->id", '', 'list', 'usecase'); ?>
-
+
+
" . html::selectAll() . html::selectReverse() . '
'; if($canBatchEdit) { $actionLink = $this->createLink('story', 'batchEdit'); - echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\""); + echo html::commonButton(" " . $lang->edit, "onclick=\"setFormAction('$actionLink')\""); } if($canBatchClose) { $actionLink = $this->createLink('story', 'batchClose'); - echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink')\""); + echo html::commonButton(" " . $lang->close, "onclick=\"setFormAction('$actionLink')\""); } } ?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 4eab60d20e..02f001dedb 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -11,24 +11,24 @@ */ ?> -
-
+
my->task;?>
+
    " . html::a(inlink('task', "type=assignedTo"), $lang->my->taskMenu->assignedToMe) . ""; - echo "" . html::a(inlink('task', "type=openedBy"), $lang->my->taskMenu->openedByMe) . ""; - echo "" . html::a(inlink('task', "type=finishedBy"), $lang->my->taskMenu->finishedByMe) . ""; - echo "" . html::a(inlink('task', "type=closedBy"), $lang->my->taskMenu->closedByMe) . ""; - echo "" . html::a(inlink('task', "type=canceledBy"), $lang->my->taskMenu->canceledByMe) . ""; + echo "
  • " . html::a(inlink('task', "type=assignedTo"), $lang->my->taskMenu->assignedToMe) . "
    • "; + echo "
  • " . html::a(inlink('task', "type=openedBy"), $lang->my->taskMenu->openedByMe) . "
    • "; + echo "
  • " . html::a(inlink('task', "type=finishedBy"), $lang->my->taskMenu->finishedByMe) . "
    • "; + echo "
  • " . html::a(inlink('task', "type=closedBy"), $lang->my->taskMenu->closedByMe) . "
    • "; + echo "
  • " . html::a(inlink('task', "type=canceledBy"), $lang->my->taskMenu->canceledByMe) . "
    • "; ?> -
+
- +
- + @@ -46,28 +46,28 @@ - - + - - + + - @@ -77,18 +77,18 @@
idAB);?> priAB);?> task->project);?>
+
createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> task->priList[$task->pri];?>'>task->priList[$task->pri]) ? $lang->task->priList[$task->pri] : $task->pri;?>createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?>createLink('task', 'view', "taskID=$task->id"), $task->name);?>createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?>createLink('task', 'view', "taskID=$task->id"), $task->name);?> estimate;?> consumed;?> left;?> '>deadline, 0, 4) > 0) echo $task->deadline;?> task->statusList[$task->status];?> openedBy];?> + project&taskID=$task->id", $task, 'list', '', '', 'iframe', true); - common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); - common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); - common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); - common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); - common::printIcon('task', 'edit', "taskID=$task->id", '', 'list'); + common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', 'hand-right', '', 'iframe', true); + common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', 'play', '', 'iframe', true); + common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'off', '', 'iframe text-danger', true); + common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', 'ok-sign', '', 'iframe', true); + common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', 'remove', '', 'iframe', true); + common::printIcon('task', 'edit', "taskID=$task->id", '', 'list', 'pencil'); ?>
-
+
" . html::selectAll() . html::selectReverse() . '
'; if($canBatchEdit) { $actionLink = $this->createLink('task', 'batchEdit', "projectID=0&orderBy=$orderBy"); - echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\""); + echo html::commonButton(" " . $lang->edit, "onclick=\"setFormAction('$actionLink')\""); } if($canBatchClose) { $actionLink = $this->createLink('task', 'batchClose'); - echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink','hiddenwin')\""); + echo html::commonButton(" " . $lang->close, "onclick=\"setFormAction('$actionLink','hiddenwin')\""); } ?>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index d1878fa407..36707b7119 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -14,24 +14,23 @@ testcase->confirmDelete)?>
-
+
my->testCase;?>
+
+
- - +
app->loadLang('testtask'); ?> - + @@ -50,33 +49,33 @@ $canBatchRun = common::hasPriv('testtask', 'batchRun'); ?> - + + - @@ -86,18 +85,18 @@
idAB);?> priAB);?> testcase->title);?>
createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?> pri?>'>pri?> - createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?>createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?> testcase->typeList[$case->type];?> openedBy];?> lastRunner];?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> testcase->statusList[$case->status];?> + id&version=$case->version", '', 'list', '', '', 'iframe'); - common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'iframe'); - common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); + common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', 'play', '', 'iframe'); + common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'flag-checkered', '', 'iframe'); + common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list', 'pencil'); common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy'); if(common::hasPriv('testcase', 'delete')) { $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testcase->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='btn-icon' title='{$lang->testcase->delete}'"); } - common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug'); + common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug'); ?>
-
+
" . html::selectAll() . html::selectReverse() . '
'; if($canBatchEdit) { $actionLink = $this->createLink('testcase', 'batchEdit'); - echo html::submitButton($lang->edit, "onclick=setFormAction('$actionLink')"); + echo html::submitButton(" " . $lang->edit, "onclick=setFormAction('$actionLink')"); } if($canBatchRun) { $actionLink = $this->createLink('testtask', 'batchRun', "productID=0&orderBy=$orderBy&from=testcase"); - echo html::submitButton($lang->testtask->runCase, "onclick=setFormAction('$actionLink')"); + echo html::submitButton(" " . $lang->testtask->runCase, "onclick=setFormAction('$actionLink')"); } ?>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index ce7925922b..5a948bea66 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -11,22 +11,21 @@ */ ?> - testtask->confirmDelete)?>
-
+
my->testTask;?>
+
+
- +
- + @@ -39,17 +38,17 @@ - + - + -
idAB);?> testtask->name);?> testtask->project);?>
createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>createLink('testtask', 'view', "taskID=$task->id"), $task->name);?>createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> projectName?> build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> begin?> end?> testtask->statusList[$task->status];?> + id", '', 'list'); + common::printIcon('testtask', 'cases', "taskID=$task->id", 'play', 'list'); common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list'); common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list'); diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 1b0681f638..32f8cadcc1 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -15,11 +15,7 @@ todo->confirmDelete)?>
-
- " . $lang->todo->export, '', "class='btn'") ?> - " . $lang->todo->batchCreate, '', "class='btn'") ?> - " . $lang->todo->create, '', "class='btn'") ?> -
+
my->todo;?>
    todo->periods as $period => $label) @@ -43,7 +39,12 @@ } ?> -
+ +
+ " . $lang->todo->export, '', "class='btn'") ?> + " . $lang->todo->batchCreate, '', "class='btn'") ?> + " . $lang->todo->create, '', "class='btn'") ?> +
diff --git a/www/js/my.full.js b/www/js/my.full.js index 33898c3c29..46d46c30c2 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -759,55 +759,6 @@ function selectItem(SelectID) } } -/** - * Set modal for list page. - * - * Open operation pages in modal for list pages, after the modal window close, reload the list content and repace the replaceID. - * - * @param string colorboxClass the class for colorbox binding. - * @param string replaceID the html object to be replaced. - * @access public - * @return void - */ -function setModal4List(colorboxClass, replaceID, callback, width, height) -{ - if(typeof(width) == 'undefined') width = 900 - if(typeof(height) == 'undefined') height = 500 - $('.' + colorboxClass).colorbox( - { - width: width, - height: height, - iframe: true, - transition: 'none', - - onCleanup:function() - { - var selfClose = $.cookie('selfClose'); - if(selfClose != 1) return; - saveWindowSize(); - - var link = self.location.href; - $('#' + replaceID).wrap("
"); - $('#tmpDiv').load(link + ' #' + replaceID, function() - { - $('#tmpDiv').replaceWith($('#tmpDiv').html()); - setModal4List(colorboxClass, replaceID, callback, width, height); - - try{$('.colored').colorize();}catch(err){} - $('tfoot td').css('background', 'white').unbind('click').unbind('hover'); - try - { - $(".date").datePicker({createButton:true, startDate:startDate}) - .dpSetPosition($.dpConst.POS_TOP, $.dpConst.POS_RIGHT) - } - catch(err){} - if(typeof(callback) == 'function') callback(); - $.cookie('selfClose', 0); - }); - } - }); -} - /** * Delete item use ajax. * @@ -900,7 +851,7 @@ function setModal() try { var $frame = $(window.frames[options.name].document); - modal.find('.modal-body').animate({height: $frame.find('body').addClass('body-modal').height()}, 200); + modal.find('.modal-body').animate({height: $frame.find('body').addClass('body-modal').height()}, 100); } catch(e){} }, 100); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 2403ac956d..412d274a7e 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -12,9 +12,9 @@ /* Width definitions */ .w-p5 {width: 5%} .w-p10 {width: 10%} .w-p15 {width: 15%} .w-p20 {width: 20%} .w-p25 {width: 25%} .w-p30 {width: 30%} .w-p35 {width: 35%} .w-p40 {width: 40%} .w-p45 {width: 45%} .w-p50 {width: 50%} .w-p55 {width: 55%} .w-p60 {width: 60%} .w-p65 {width: 65%} .w-p70 {width: 70%} .w-p75 {width: 75%} .w-p80 {width: 80%} .w-p85 {width: 85%} .w-p90 {width: 90%} .w-p94 {width: 94%} .w-p95 {width: 95%} .w-p98 {width: 98%} .w-p99 {width: 99%} .w-p100{width: 100%} -.w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-200px {width:200px} +.w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-200px {width:200px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} -.w-id {width:55px;} .w-pri {width:30px;} .w-severity {width:40px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:60px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px} +.w-id {width:60px;} .w-pri {width:30px;} .w-severity {width:50px;} .w-hour {width:48px;} .w-date {width:80px;} .w-user {width:60px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:60px} /* Height definitions */ .h-5px {height:5px} .h-10px {height:10px} .h-20px {height:20px} .h-30px {height:30px} .h-35px {height:35px} .h-40px {height:40px} .h-45px {height:45px} .h-50px {height:50px} .h-60px {height:60px} .h-70px {height:70px} .h-80px {height:80px} .h-100px {height:100px} .h-120px {height:120px} .h-130px {height:130px} .h-140px {height:140px} .h-150px {height:150px} .h-200px {height:200px} @@ -25,6 +25,7 @@ .text-middle,.text-middle td {vertical-align: middle !important;} tr.text-center > td, tr.text-center > th {text-align: center;} tr.text-center > td.text-left, tr.text-center > th.text-left {text-align: left;} +tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: right;} /* === Components === */ /* Table */ @@ -166,9 +167,11 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable .icon-green-task-create:before {content: "\e601";} /* Button icon */ -.btn-icon {border-radius: 4px; display: inline-block; width: 20px; height: 20px; line-height: 20px; font-size: 14px; border: none; background: none; padding: 0} +.btn-icon {border-radius: 2px; display: inline-block; width: 20px; height: 20px; line-height: 20px; font-size: 14px; border: none; background: none; padding: 0; color: #498CD0; text-align: center;} .btn-icon:hover {text-decoration: none; background: #145CCD; color: #fff;} -.btn-icon.disabled:hover {background: none; color: #ccc; cursor: default} +.btn-icon.disabled:hover, .btn-icon.disabled:hover > i {background: none!important; color: #ccc!important; cursor: default} +.btn-icon.text-danger {color: #D2322D} +.btn-icon.text-danger:hover {background: #D2322D; color: #fff} /* === Views === */ /* Table form */ @@ -183,6 +186,11 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable .table-form td > .row {margin-right: 0;} .table-form td > .row > [class*="col-"] {padding-right: 0;line-height: 34px} .table-form td .checkbox {margin: 0} +.table-form td .btn + .btn {margin-left: 8px;} + +/* Table data */ +.table-data th, .table-data td {padding: 5px;} +.table-data th {text-align: right;} /* Panel */ .panel > .table > thead > tr > th,.panel > form > .table > thead > tr > th {background-color: transparent;} @@ -234,6 +242,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} #topnav > a, #topnav > .dropdown > a, #companyname a {color:#d1e4f2;text-decoration:none;} #topnav > a:hover, #topnav > .dropdown > a:hover, #companyname a:hover {color: #fff;} #companyname {color:#ffcc00; font-weight: normal; margin: 0} +#companyname a {display: inline-block; margin-left: 4px;} #mainmenu {margin-top: 12px; width: 100%; position: relative;} #mainmenu li {float: left;} @@ -294,9 +303,10 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} /* Feature bar. */ #featurebar {padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px;} -#featurebar .heading {float: left; padding: 0 6px} -#featurebar .heading > i {color: #666} -#featurebar .heading + .nav, #featurebar .heading + .btn-group + .nav {border-left: 1px solid #ddd; padding-left: 5px;} +#featurebar .heading {float: left; padding: 0 5px; color: #666} +#featurebar .heading:after {content: "\e6e1"; font-family: ZenIcon; font-size: 14px; color: #999; display: inline-block; margin-left: 5px;} +#featurebar .heading > i {color: #808080} + #featurebar .nav {height: 30px; float: left;} #featurebar .nav > li {float: left; margin-right: 2px;} #featurebar .nav > li > .form-control {margin-left: 6px; padding: 1px 8px; height: 30px} @@ -306,9 +316,12 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} #featurebar .nav > li.active > .form-control, #featurebar .nav > li.active > .form-control:hover, #featurebar .nav > li.active > .form-control:active, #featurebar .nav > li.active > .form-control:focus {border-color: #009900} #featurebar .btn-group {margin-right: 5px;} #featurebar .btn {padding: 4px 12px} -#featurebar .btn > i {display: inline-block; margin-right: 2px; color: #666} +#featurebar .btn > i {display: inline-block; margin-right: 2px; opacity: 0.8} /* table in outer */ +.outer .table .btn-icon {margin-left: -2px} +.outer .table thead tr th {text-align: center;} +.outer .table tbody td {vertical-align: middle;} .outer .table th {vertical-align: middle;} .outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 15px} .outer .table tr > th:last-child, .outer .table tr > td:last-child {padding-right: 15px} @@ -319,8 +332,12 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} .outer .table tfoot .datepicker-wrapper:before {top: 5px} .outer .table tfoot .form-control.form-date {width: 110px} .outer .table tfoot .input-wrapper {display: inline-block;} +.table-actions {float: left;} .table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group {float: left; margin-right: 10px} .outer .table tfoot .pager {margin: 0;} +.outer .container {padding: 20px;} +.outer .container .table-form, .outer .container .table-data {margin-top: 10px;} + /* Pager. */ .pager {margin-bottom:0;line-height: 30px; color: #999}