From 955e6183ee5c5e9b5af8a787d8550875f6c8a9ec Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 11 Apr 2014 09:44:44 +0800 Subject: [PATCH] * ajusted views. --- module/convert/view/index.html.php | 2 +- module/custom/view/set.html.php | 4 +- module/editor/view/index.html.php | 2 +- module/extension/view/obtain.html.php | 4 +- module/productplan/view/linkbug.html.php | 2 +- module/productplan/view/linkstory.html.php | 2 +- module/sso/css/create.css | 2 +- module/story/css/report.css | 4 +- module/story/view/report.html.php | 74 ++++++++------ module/user/view/batchcreate.html.php | 50 ++++++---- module/user/view/create.html.php | 107 +++++++++++---------- 11 files changed, 143 insertions(+), 110 deletions(-) diff --git a/module/convert/view/index.html.php b/module/convert/view/index.html.php index 3aa7a07516..63a6e96cb4 100644 --- a/module/convert/view/index.html.php +++ b/module/convert/view/index.html.php @@ -17,7 +17,7 @@ convert->common;?> -
+
convert->desc);?>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 15d7498574..71e59aa735 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -44,8 +44,8 @@ EOT; ?>
-
-
+
+
diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php index 3bac080613..4c290b3486 100644 --- a/module/editor/view/index.html.php +++ b/module/editor/view/index.html.php @@ -11,7 +11,7 @@ */ ?> -
+
diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php index e68579da10..7bb7f6f08e 100644 --- a/module/extension/view/obtain.html.php +++ b/module/extension/view/obtain.html.php @@ -12,8 +12,8 @@ ?> -
-
+
+
'>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 7c5f98af0d..d26398d3a0 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -26,7 +26,7 @@
- + diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 58341a7af2..99028c3f6e 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -24,7 +24,7 @@
 productplan->unlinkedBugs;?> ()  productplan->unlinkedBugs;?>
idAB;?>
- + diff --git a/module/sso/css/create.css b/module/sso/css/create.css index d9259e62b2..58a0b29696 100644 --- a/module/sso/css/create.css +++ b/module/sso/css/create.css @@ -1 +1 @@ -.instruction {margin-top:15px; margin-left: 20px; padding:20px 30px;} +.instruction {margin-top:5px; margin-left: 20px; padding:20px 30px;} diff --git a/module/story/css/report.css b/module/story/css/report.css index 9c3849153e..83f749b531 100644 --- a/module/story/css/report.css +++ b/module/story/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/story/view/report.html.php b/module/story/view/report.html.php index 60facbc692..9f1b50a196 100644 --- a/module/story/view/report.html.php +++ b/module/story/view/report.html.php @@ -11,39 +11,53 @@ */ ?> - -
 productplan->unlinkedStories;?> ()  productplan->unlinkedStories;?>
idAB;?>
- - - - +
-
story->report->select;?>
-
- - story->report->charts, $checkedCharts);?> - - -

- story->report->create);?> +
+
+ icons['story']);?> + icons['report']);?> story->report->common;?> +
+
+ createLink('product', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback, '', "class='btn'");?> +
+
+
+
+
+
+ story->report->select;?>
-
- - +
+ + story->report->charts, $checkedCharts, '', 'block');?> +
+ + + story->report->create);?> +
+ +
+ + +
+
+
+ story->report->common;?> +
+
-
story->report->common;?>
-
createLink('product', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback); ?>
-
$chartContent):?> - -
- - - - - - - +
story->report->charts[$chartType];?>
story->report->$chartType->item;?>story->report->value;?>report->percent;?>
+ + + + + + + + $data):?> @@ -57,8 +71,8 @@
story->report->charts[$chartType];?>
story->report->$chartType->item;?>story->report->value;?>report->percent;?>
name;?>
-
+ + + diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 0dbd8f76ad..55a7bfe267 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -13,38 +13,48 @@ +
+
+ icons['user']);?> + icons['batchCreate']);?> user->batchCreate;?> +
+
+
- - - - - - - - - - - - - +
user->batchCreate;?>
idAB;?>user->dept;?>user->account;?>user->realname;?>user->role;?>user->group;?>user->email;?>user->gender;?>user->password;?>
+ + + + + + + + + + + + + $lang->user->ditto)?> user->roleList = $lang->user->roleList + array('ditto' => $lang->user->ditto)?> $lang->user->ditto)?> user->batchCreate; $i++):?> - + + - + diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 5e91b7d124..6b7c0d81e3 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -14,55 +14,62 @@ user->placeholder);?> - -
idAB;?>user->dept;?>user->account;?>user->realname;?>user->role;?>user->group;?>user->email;?>user->gender;?>user->password;?>
0 ? 'ditto' : $deptID, "class='form-control'");?> - 0 ? 'ditto' : $deptID, "class='form-control'");?> user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?> 0 ? 'ditto' : '', "class='form-control'");?> user->genderList, 'm');?> - 0 ? "checked" : '') . " /> {$lang->user->ditto}"; - ?> +
+ 0 ? "checked" : '') . " /> {$lang->user->ditto}"; + ?> +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+ icons['user']);?> + icons['create']);?> user->create;?> +
+
+ +
user->create;?>
user->dept;?> -
user->account;?>
user->realname;?>
user->password;?>
user->password2;?>
user->role;?>user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?>
user->group;?>
user->email;?>
user->commiter;?>
user->join;?>
user->gender;?>user->genderList, 'm');?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
user->dept;?>
user->account;?>
user->realname;?>
user->password;?>
user->password2;?>
user->role;?>user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?>
user->group;?>
user->email;?>
user->commiter;?>
user->join;?>
user->gender;?>user->genderList, 'm');?>
-
+
+ +