From d7f4d75c1623c4bd3336875a39c57ba18877e896 Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 10 Apr 2014 20:42:44 +0800 Subject: [PATCH] * ajusted views of module 'admin', 'bug', 'doc', 'task' & 'testcase'. --- module/admin/view/bind.html.php | 39 +++++--- module/admin/view/register.html.php | 104 ++++++++++++-------- module/bug/css/report.css | 4 +- module/bug/view/report.html.php | 72 ++++++++------ module/doc/view/create.html.php | 2 +- module/task/css/report.css | 4 +- module/task/view/report.html.php | 73 ++++++++------ module/testcase/view/exporttemplet.html.php | 32 ++++-- www/theme/default/style.css | 2 +- 9 files changed, 200 insertions(+), 132 deletions(-) diff --git a/module/admin/view/bind.html.php b/module/admin/view/bind.html.php index 2ab2bc4406..91953432f1 100644 --- a/module/admin/view/bind.html.php +++ b/module/admin/view/bind.html.php @@ -11,20 +11,27 @@ */ ?> -
- - - - - - - - - - - - - -
admin->bind->caption;?>
user->account;?>
user->password;?>
-
+
+
+
+ + admin->bind->caption;?> +
+
+
+ + + + + + + + + + + + +
user->account;?>
user->password;?>
+
+
diff --git a/module/admin/view/register.html.php b/module/admin/view/register.html.php index cdb91c64f2..4b14e3c5d5 100644 --- a/module/admin/view/register.html.php +++ b/module/admin/view/register.html.php @@ -11,47 +11,65 @@ */ ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
admin->register->caption;?>
user->account;?>*' . $lang->admin->register->lblAccount;?>
user->realname;?>*';?>
user->company;?>company, "class='form-control'");?>
user->phone;?>
user->email;?> - email, "class='form-control'") . '*';?>
user->password;?>*' . $lang->admin->register->lblPasswd;?>
user->password2;?> - *';?>
- - admin->register->submit) . html::hidden('sn', $sn); - echo "" . sprintf($lang->admin->register->bind, html::a(inlink('bind'), $lang->admin->register->click)) . ""; - ?> -
-
+
+
+
+ + admin->register->caption;?> +
+
+
+
admin->bind->caption, '', "class='btn btn-success'");?>
+ +
+ admin->register->bind, html::a(inlink('bind'), $lang->admin->register->click));?> +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
user->account;?> +
+ +
admin->register->lblAccount;?>
+
user->realname;?>
user->company;?>company, "class='form-control'");?>
user->phone;?>
user->email;?>
email, "class='form-control'");?>
user->password;?> +
+ +
admin->register->lblPasswd;?>
+
user->password2;?>*';?>
+ admin->register->submit) . html::hidden('sn', $sn);?> +
+
+
diff --git a/module/bug/css/report.css b/module/bug/css/report.css index 9c3849153e..83f749b531 100644 --- a/module/bug/css/report.css +++ b/module/bug/css/report.css @@ -1 +1,3 @@ -.side span {display:block} +.table-bordered caption {border: 1px solid #ddd;} +.table-bordered tr > th:first-child, .table-bordered tr > td:first-child {border-left: 1px solid #ddd!important} +.table-bordered tr > th:last-child, .table-bordered tr > td:last-child {border-right: 1px solid #ddd!important} diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php index 59498042e2..08eafdf7c4 100644 --- a/module/bug/view/report.html.php +++ b/module/bug/view/report.html.php @@ -11,40 +11,54 @@ */ ?> - - - - - - - + diff --git a/module/task/css/report.css b/module/task/css/report.css index 9c3849153e..83f749b531 100644 --- a/module/task/css/report.css +++ b/module/task/css/report.css @@ -1 +1,3 @@ -.side span {display:block} +.table-bordered caption {border: 1px solid #ddd;} +.table-bordered tr > th:first-child, .table-bordered tr > td:first-child {border-left: 1px solid #ddd!important} +.table-bordered tr > th:last-child, .table-bordered tr > td:last-child {border-right: 1px solid #ddd!important} diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php index 1de33032d4..ea7441aaef 100644 --- a/module/task/view/report.html.php +++ b/module/task/view/report.html.php @@ -11,41 +11,54 @@ */ ?> - -
-
bug->report->select;?>
-
-
- bug->report->charts, $checkedCharts);?> - - -

- bug->report->create);?> +
+
+ icons['bug']);?> + icons['report']);?> bug->report->common;?> +
+
+ createLink('bug', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback, '', "class='btn'");?> +
+
+
+
+
+
+ bug->report->select;?>
-
- - +
+ + bug->report->charts, $checkedCharts, '', 'block');?> +
+ + + bug->report->create);?> +
+ +
+ + +
+
+
+ bug->report->common;?> +
+
-
bug->report->common;?>
-
createLink('bug', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback);?>
-
$chartContent):?> - -
bug->report->$chartType, 'height', $lang->bug->report->options->height) . 'px'; ?>
- +
- - - - - + + + + + + + $data):?> @@ -58,8 +72,8 @@
bug->report->charts[$chartType];?>
report->item;?>report->value;?>report->percent;?>
report->item;?>report->value;?>report->percent;?>
name;?>
-
+ + + diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 0e76e0793e..934548d2ec 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -29,7 +29,7 @@
doc->project;?>doc->project;?>
- - - -
-
task->report->select;?>
-
+
+
+ icons['task']);?> + icons['report']);?> task->report->common;?> +
+
+ createLink('project', 'task', "projectID=$projectID&browseType=$browseType"), $lang->goback, '', "class='btn'");?> +
+
+
+
+
+
+ task->report->select;?> +
+
- task->report->charts, $checkedCharts)?> - - -

- task->report->create);?> + task->report->charts, $checkedCharts, '', 'block')?> +
+ + + task->report->create);?> +
-
- - + + +
+
+
+ task->report->common;?> +
+
-
task->report->common;?>
-
createLink('project', 'task', "projectID=$projectID&browseType=$browseType"), $lang->goback);?>
-
$chartContent):?> - -
task->report->$chartType, 'height', $lang->story->report->options->height) . 'px'; ?> -
- - - - - - - +
+
task->report->charts[$chartType];?>
task->report->$chartType->item;?>task->report->value;?>report->percent;?>
+ + + + + + + + $data):?> @@ -59,8 +72,8 @@
task->report->charts[$chartType];?>
task->report->$chartType->item;?>task->report->value;?>report->percent;?>
name;?>
-
+ + + diff --git a/module/testcase/view/exporttemplet.html.php b/module/testcase/view/exporttemplet.html.php index bf92089114..c6d652732f 100644 --- a/module/testcase/view/exporttemplet.html.php +++ b/module/testcase/view/exporttemplet.html.php @@ -19,17 +19,29 @@ function closeWindow() } } -
- - +
+
+ icons['export']);?> + testcase->exportTemplet;?> +
+
+ + +
testcase->exportTemplet?>
- + +
- testcase->num; - echo html::input('num', '10'); - echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8'); - echo html::submitButton(); - ?> + +
+ testcase->num;?> + +
+ 		+ charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?> + +
diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 4ed13912b1..ed9ac33132 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -395,6 +395,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} /* Main content in outer */ .outer .row {padding: 15px 20px;} .outer .main {margin-bottom: 20px;} +.outer .container > .main {margin: 0 15px 20px} .outer .main fieldset {margin-bottom: 15px; border: 1px solid #e5e5e5; padding: 10px 15px 15px;} .outer .main fieldset.fieldset-pure {background: none; padding: 0; border: none} .outer .main fieldset.collapsed {border: none} @@ -416,7 +417,6 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} .outer .main .nav-tabs > li {margin-bottom: -2px;} .outer .main .nav-tabs > li.active > a, .outer .main .nav-tabs > li.active > a:hover, .outer .main .nav-tabs > li.active > a:focus {color: #333; font-weight: bold;} .outer .main .tab-content {border: 1px solid #ddd; border-top: 0; padding: 10px 15px} -/*.outer .main .tab-pane > .table {margin: -10px -15px}*/ /* Table data in outer */ .outer .table-data.table-condensed td, .outer .table-data.table-condensed th {padding: 3px 8px}