diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index 3e0b6a5de3..7a57008d6a 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -38,8 +38,7 @@ id;?> - story->priList, $story->pri, $story->pri);?> - + story->priList, $story->pri, $story->pri)?> title?> estimate?> diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index ca58504d46..d56c78c7dd 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -66,7 +66,7 @@ js::set('confirmDelete', $lang->user->confirmDelete); user->qq);?> user->last);?> user->visits);?> - actions;?> + actions;?> @@ -87,20 +87,22 @@ js::set('confirmDelete', $lang->user->confirmDelete); phone;?> qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?> last) echo date('Y-m-d', $user->last);?> - visits;?> + visits;?>
- ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin", 'btn-link');?> + ranzhi) common::printIcon('user', 'unbind', "userID=$user->account", '', 'list', 'unlink', "hiddenwin"); + if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60) + { + common::printIcon('user', 'unlock', "userID=$user->account", '', 'list', '', "hiddenwin"); + } + ?>
id&from=company", '', 'button'); + common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list'); if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) { - echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn btn-link iframe'"); - } - if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60) - { - common::printIcon('user', 'unlock', "userID=$user->account", '', 'button', '', "hiddenwin"); + echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='btn iframe'"); } ?> diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 41312eee06..02ed975ed1 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -44,10 +44,10 @@ group->managepriv = $lang->group->managePrivByGroup;?> - id", $group, 'list', 'pencil');?> - id", $group, 'list', 'pencil');?> + id", $group, 'list', 'eye');?> + id", $group, 'list', 'lock');?> group->managemember = $lang->group->manageMember;?> - id", $group, 'list', 'pencil', '', 'iframe', 'yes');?> + id", $group, 'list', 'persons', '', 'iframe', 'yes', "data-width='750'");?> id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?> id", $group, 'list', '', '', 'iframe', 'yes', "data-width='550'");?>

- id;?> + id;?> name;?> arrow . $lang->group->edit;?>

diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index 5848d5a63a..9cd4733f7c 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -14,12 +14,12 @@

- id;?> + id;?> name;?>

-
+
icons['company']);?> dept->common;?>
diff --git a/module/user/view/delete.html.php b/module/user/view/delete.html.php index 12ba657cba..f42bcde2ae 100644 --- a/module/user/view/delete.html.php +++ b/module/user/view/delete.html.php @@ -12,24 +12,27 @@ ?> -
-
- user->delete;?> +
+
+

user->delete;?>

+
+ + + + + + + + + +
+ user->verifyPassword;?> + +
+ user->placeholder->verify}'");?> +
delete, '', 'btn btn-wide btn-primary');?>
+
-
- - - - - - -
- user->verifyPassword;?> - -
- user->placeholder->verify}'");?> -
delete);?>
-