From 6b88e220eb84e3a4af9b8b153eddbdd246d9421f Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 19 Apr 2018 15:18:35 +0800 Subject: [PATCH 1/5] * Refact batch create page and batch edit page of user. --- module/user/css/batchcreate.css | 1 + module/user/css/batchedit.css | 1 + module/user/view/batchcreate.html.php | 181 +++++++++++++------------- module/user/view/batchedit.html.php | 167 ++++++++++++------------ 4 files changed, 181 insertions(+), 169 deletions(-) diff --git a/module/user/css/batchcreate.css b/module/user/css/batchcreate.css index 655a1401aa..dfd2b0a558 100644 --- a/module/user/css/batchcreate.css +++ b/module/user/css/batchcreate.css @@ -1 +1,2 @@ .chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important} +th.required:after {position: relative; right: 10px;} diff --git a/module/user/css/batchedit.css b/module/user/css/batchedit.css index 655a1401aa..dfd2b0a558 100644 --- a/module/user/css/batchedit.css +++ b/module/user/css/batchedit.css @@ -1 +1,2 @@ .chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important} +th.required:after {position: relative; right: 10px;} diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 9065295a57..3a7a5b0c93 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -11,98 +11,103 @@ */ ?> - -
-
- icons['user']);?> - icons['batchCreate']);?> user->batchCreate;?> -
- +
+
+

user->batchCreate;?>

+
+ createLink('custom', 'ajaxSaveCustomFields', 'module=user§ion=custom&key=batchCreateFields')?> +
-
- 5) ? 'w-150px' : ''; -?> -
- - - - - - - - - - - - - - - - - - - - - - - + 5) ? 'w-150px' : ''; + ?> + +
idAB;?>'>user->dept;?>user->account;?> user->realname;?> user->role;?> user->group;?>'>user->email;?>'>user->gender;?>user->password;?> '>user->commiter;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'>user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + $lang->user->ditto)?> + user->roleList = $lang->user->roleList + array('ditto' => $lang->user->ditto)?> + $lang->user->ditto)?> + user->batchCreate; $i++):?> + + + + + + + + + + + + + + + + + + + + + - - $lang->user->ditto)?> - user->roleList = $lang->user->roleList + array('ditto' => $lang->user->ditto)?> - $lang->user->ditto)?> - user->batchCreate; $i++):?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
idAB;?>'>user->dept;?>user->account;?>user->realname;?>user->role;?>user->group;?>'>user->email;?>'>user->gender;?>user->password;?>'>user->commiter;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'>user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
' style='overflow:visible'> 0 ? 'ditto' : $deptID, "class='form-control chosen'");?>user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?> 0 ? 'ditto' : '', "class='form-control chosen'");?>>>user->genderList, 'm');?> +
+ 0 ? "checked" : '') . " /> {$lang->user->ditto}"; + ?> +
+ 		'>'> '> '> '> '> '>'> '> '> '>
' style='overflow:visible'> 0 ? 'ditto' : $deptID, "class='form-control chosen'");?>user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?> 0 ? 'ditto' : '', "class='form-control chosen'");?>>>user->genderList, 'm');?> -
- 0 ? "checked" : '') . " /> {$lang->user->ditto}"; - ?> -
- - 		'>'> '> '> '> '> '>'> '> '> '>
user->verifyPassword?> -
- - user->placeholder->verify}'");?> -
-
+ + + user->verifyPassword?> + +
+ + user->placeholder->verify}'");?> + + + + + + + save, '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', "btn btn-wide");?> + + + + + +
-createLink('custom', 'ajaxSaveCustomFields', 'module=user§ion=custom&key=batchCreateFields')?> - diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index ee2624613e..35724b4248 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -11,90 +11,95 @@ */ ?> - -
-
- icons['user']);?> - icons['batchEdit']);?> user->batchEdit;?> -
- +
+
+

user->batchEdit;?>

+
+ createLink('custom', 'ajaxSaveCustomFields', 'module=user§ion=custom&key=batchEditFields')?> +
-
- 7) ? 'w-120px' : ''; -?> -
- - - - - - - - - - - - - - - - - - - - + 7) ? 'w-120px' : ''; + ?> + +
idAB;?>'> user->dept;?>user->account;?>user->realname;?>user->role;?>'>user->commiter;?>'> user->email;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'> user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
+ + + + + + + + + + + + + + + + + + + + + + + $lang->user->ditto) + $depts;?> + user->roleList = array('' => '', 'ditto' => $lang->user->ditto) + $lang->user->roleList;?> + + + dept)) ? 0 : (empty($user->dept) ? 'ditto' : $user->dept); + $role = ($first and empty($user->role)) ? 0 : (empty($user->role) ? 'ditto' : $user->role); + $first = false; + ?> + + + + + + + + + + + + + + + + + + - - $lang->user->ditto) + $depts;?> - user->roleList = array('' => '', 'ditto' => $lang->user->ditto) + $lang->user->roleList;?> - - - dept)) ? 0 : (empty($user->dept) ? 'ditto' : $user->dept); - $role = ($first and empty($user->role)) ? 0 : (empty($user->role) ? 'ditto' : $user->role); - $first = false; - ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
idAB;?>'> user->dept;?>user->account;?>user->realname;?>user->role;?>'>user->commiter;?>'> user->email;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'> user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
id;?>' style='overflow:visible'>id]", $depts, $dept, "class='form-control chosen'");?>id]", $user->account, "class='form-control' autocomplete='off'");?>id]", $user->realname, "class='form-control' autocomplete='off'");?>id]", $lang->user->roleList, $role, "class='form-control'");?>'>id]", $user->commiter, "class='form-control' autocomplete='off'");?>'> id]", $user->email, "class='form-control' autocomplete='off'");?>'> id]", $user->join, "class='form-control form-date'");?>'> id]", $user->skype, "class='form-control' autocomplete='off'");?>'> id]", $user->qq, "class='form-control' autocomplete='off'");?>'> id]", $user->yahoo, "class='form-control' autocomplete='off'");?>'> id]", $user->gtalk, "class='form-control' autocomplete='off'");?>'>id]", $user->wangwang, "class='form-control' autocomplete='off'");?>'> id]", $user->mobile, "class='form-control' autocomplete='off'");?>'> id]", $user->phone, "class='form-control' autocomplete='off'");?>'> id]", $user->address, "class='form-control' autocomplete='off'");?>'> id]", $user->zipcode, "class='form-control' autocomplete='off'");?>
id;?>' style='overflow:visible'>id]", $depts, $dept, "class='form-control chosen'");?>id]", $user->account, "class='form-control' autocomplete='off'");?>id]", $user->realname, "class='form-control' autocomplete='off'");?>id]", $lang->user->roleList, $role, "class='form-control'");?>'>id]", $user->commiter, "class='form-control' autocomplete='off'");?>'> id]", $user->email, "class='form-control' autocomplete='off'");?>'> id]", $user->join, "class='form-control form-date'");?>'> id]", $user->skype, "class='form-control' autocomplete='off'");?>'> id]", $user->qq, "class='form-control' autocomplete='off'");?>'> id]", $user->yahoo, "class='form-control' autocomplete='off'");?>'> id]", $user->gtalk, "class='form-control' autocomplete='off'");?>'>id]", $user->wangwang, "class='form-control' autocomplete='off'");?>'> id]", $user->mobile, "class='form-control' autocomplete='off'");?>'> id]", $user->phone, "class='form-control' autocomplete='off'");?>'> id]", $user->address, "class='form-control' autocomplete='off'");?>'> id]", $user->zipcode, "class='form-control' autocomplete='off'");?>
user->verifyPassword?> -
- - - user->placeholder->verify}'");?> -
-
+ + + user->verifyPassword?> + +
+ + + user->placeholder->verify}'");?> + + + + + + + save, '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', "btn btn-wide");?> + + + + + +
-createLink('custom', 'ajaxSaveCustomFields', 'module=user§ion=custom&key=batchEditFields')?> - From 87c717ff2e7ba7012562059de317eed02047c769 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Apr 2018 15:56:20 +0800 Subject: [PATCH 2/5] * Adjust style. --- module/project/view/edit.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index c3a50aba12..20adc39ff8 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -18,8 +18,8 @@

- icons['project']);?> id;?> - createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> + id;?> + createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> arrow . ' ' . $lang->project->edit;?>

From d12dc914379776d3c47e39e9f9d798dfdd40d0ad Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Apr 2018 15:59:28 +0800 Subject: [PATCH 3/5] * Rewrite close file of project. --- module/project/view/close.html.php | 35 ++++++++++++++++-------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php index ad9351e6a3..cca35dc7d6 100644 --- a/module/project/view/close.html.php +++ b/module/project/view/close.html.php @@ -12,26 +12,29 @@ ?> -
-
-
- icons['project']);?> id;?> - createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> - project->close;?> icons['close']);?> -
+
+
+

+ id;?> + createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> + arrow . $lang->project->close;?> +

-
+ - - - - - - - - + + + + + + + + + +
comment;?>
goback, $this->session->taskList); ?>
comment;?>
goback, $this->session->taskList); ?>
+
From d0388da4838dbb278da47c9232b14dcd926f434b Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Apr 2018 16:01:02 +0800 Subject: [PATCH 4/5] * Rewrite activate file of project. --- module/project/view/activate.html.php | 54 ++++++++++++++------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php index fb10dc0bcc..20b8a17436 100644 --- a/module/project/view/activate.html.php +++ b/module/project/view/activate.html.php @@ -14,46 +14,50 @@ -
-
-
- icons['project']);?> id;?> - createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> - project->activate;?> icons['activate']);?> -
+
+
+

+ id;?> + createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> + arrow . $lang->project->activate;?> +

-
+ - - + - - - - + + - +
project->beginAndEnd;?> -
- begin?> - ~ - end;?> -
+ 		project->beginAndEnd;?> +
begin . ' ~ ' . $project->end;?>
- - ~ - +
+ + ~ + +
- - + +
+
+
+
+
+
+
+
comment;?>comment;?>
goback, $this->session->taskList); ?>goback, $this->session->taskList); ?>
+