diff --git a/module/group/css/manageview.css b/module/group/css/manageview.css index 7aebd9c221..4172a89d01 100644 --- a/module/group/css/manageview.css +++ b/module/group/css/manageview.css @@ -1,5 +1,5 @@ .group-item {display:block; width:90px; float:left; margin-top:5px;} -.action-item {display:block; width:180px; float:left; margin-top:5px;} +.action-item {display:block; width:200px; float:left; margin-top:5px;} .pl-0px {padding-left:0px !important;} .pt-0px {padding-top:0px !important;} diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index f59c4d9135..b19b22ed9b 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -18,10 +18,8 @@ group->browse;?>
- - - createLink('group', 'managePriv', 'type=byModule', '', true), $lang->group->managePrivByModule, '', 'class="btn btn-primary iframe"');?> - + createLink('group', 'managePriv', 'type=byModule', '', true), $lang->group->managePrivByModule, '', 'class="btn btn-link iframe"');?> + createLink('group', 'create', '', '', true), ' ' . $lang->group->create, '', 'class="btn btn-primary iframe" data-width="550"');?>
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index 71f47d1568..d6e677e0f7 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -21,9 +21,8 @@
- + getClientLang() == 'en' ? 'w-130px' : 'w-100px';?> +
- group->viewList;?> - group->viewList;?> menu as $menuKey => $menu):?> diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 92f9c618ff..f95026e135 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -17,7 +17,7 @@ $lang->user->account = 'Account'; $lang->user->password = 'Password'; $lang->user->password2 = 'Repeat Password'; $lang->user->role = 'Role'; -$lang->user->group = 'Group'; +$lang->user->group = 'Privilege Group'; $lang->user->realname = 'Name'; $lang->user->nickname = 'Nickname'; $lang->user->commiter = 'SVN/GIT Account'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 93c046d2ac..79ccda0220 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -17,7 +17,7 @@ $lang->user->account = '用户名'; $lang->user->password = '密码'; $lang->user->password2 = '请重复密码'; $lang->user->role = '职位'; -$lang->user->group = '分组'; +$lang->user->group = '权限分组'; $lang->user->realname = '真实姓名'; $lang->user->nickname = '昵称'; $lang->user->commiter = '源代码帐号'; diff --git a/www/theme/lang/en.css b/www/theme/lang/en.css index b1d07a2c71..dd899e2e1b 100644 --- a/www/theme/lang/en.css +++ b/www/theme/lang/en.css @@ -1 +1,7 @@ .btn-toolbar>.btn, .btn-toolbar>.btn-group, .btn-toolbar>.dropdown {margin-right: 5px !important;} + +.main-actions .btn-toolbar .btn { padding-right: 5px !important; padding-left: 5px !important;} +.main-actions .btn-toolbar .divider { margin-right: 5px !important; margin-left: 5px !important;} +.main-actions .btn-toolbar .btn+.btn { margin-left: 0px !important;} +.main-actions .btn-toolbar .btn+.btn-group {margin-left: 5px !important;} +.main-actions .btn-toolbar { padding: 4px 5px;}