Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
reneeteng
2019-06-05 17:23:25 +08:00
parent de2725da3b a3de0b750a
commit ea44cee1f7
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/css/manageview.css
+1 -1
View File
@@ -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;}
module/group/view/browse.html.php
+2 -4
View File
@@ -18,10 +18,8 @@
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->group->browse;?></span></span>
</div>
<div class='btn-toolbar pull-right'>
<?php common::printIcon('group', 'create', '', '', 'button', '', '', 'btn btn-primary iframe', true, "data-width='550'");?>
<?php if(common::hasPriv('group', 'managePriv')):?>
<?php echo html::a($this->createLink('group', 'managePriv', 'type=byModule', '', true), $lang->group->managePrivByModule, '', 'class="btn btn-primary iframe"');?>
<?php endif;?>
<?php if(common::hasPriv('group', 'managePriv')) echo html::a($this->createLink('group', 'managePriv', 'type=byModule', '', true), $lang->group->managePrivByModule, '', 'class="btn btn-link iframe"');?>
<?php if(common::hasPriv('group', 'create')) echo html::a($this->createLink('group', 'create', '', '', true), '<i class="icon-plus"></i> ' . $lang->group->create, '', 'class="btn btn-primary iframe" data-width="550"');?>
</div>
</div>
<div id='mainContent' class='main-table'>
module/group/view/manageview.html.php
+2 -3
View File
@@ -21,9 +21,8 @@
<form class="load-indicator main-form form-ajax" id="manageViewForm" method="post" target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-110px'>
<?php echo $lang->group->viewList;?>
</th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-130px' : 'w-100px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->group->viewList;?></th>
<td>
<?php foreach($lang->menu as $menuKey => $menu):?>
<?php if(!is_string($menu)) continue;?>
module/user/lang/en.php
+1 -1
View File
@@ -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';
module/user/lang/zh-cn.php
+1 -1
View File
@@ -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 = '源代码帐号';
www/theme/lang/en.css
+6
View File
@@ -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;}