diff --git a/module/common/control.php b/module/common/control.php index 3bb97106e5..0beead2468 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -252,11 +252,14 @@ class common extends control * @param string $type button|list * @param string $icon * @param string $target + * @param string $extraClass + * @param bool $onlyBody + * @param string $misc * @static * @access public * @return void */ - public static function printIcon($module, $method, $vars = '', $object = '', $type = 'button', $icon = '', $target = '', $extraClass = '', $onlyBody = false) + public static function printIcon($module, $method, $vars = '', $object = '', $type = 'button', $icon = '', $target = '', $extraClass = '', $onlyBody = false, $misc = '') { if(isonlybody() and strpos($extraClass, 'showinonlybody') === false) return false; @@ -316,23 +319,23 @@ class common extends control { if($method != 'edit' and $method != 'copy' and $method != 'delete') { - echo html::a($link, " " . $title, $target, "class='btn $extraClass'", true); + echo html::a($link, " " . $title, $target, "class='btn $extraClass' $misc", true); } else { - echo html::a($link, "", $target, "class='btn $extraClass' title='$title'", false); + echo html::a($link, "", $target, "class='btn $extraClass' title='$title' $misc", false); } } else { - echo html::a($link, "", $target, "class='btn-icon $extraClass' title='$title'", false); + echo html::a($link, "", $target, "class='btn-icon $extraClass' title='$title' $misc", false); } } else { if($type == 'list') { - echo ""; + echo ""; } } } diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 95a577bff5..34eca08189 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -420,7 +420,10 @@ $lang->icons['dynamic'] = 'volume-up'; $lang->icons['build'] = 'tag'; $lang->icons['test'] = 'check'; $lang->icons['testtask']= 'check'; +$lang->icons['group'] = 'group'; $lang->icons['team'] = 'group'; +$lang->icons['company'] = 'building'; +$lang->icons['dept'] = 'sitemap'; $lang->icons['usecase'] = 'usecase'; $lang->icons['testcase']= 'smile'; $lang->icons['result'] = 'flag-checkered'; @@ -456,5 +459,6 @@ $lang->icons['suspend'] = 'pause'; $lang->icons['cancel'] = 'ban-circle'; $lang->icons['recordEstimate'] = 'time'; $lang->icons['customFields'] = 'cogs'; +$lang->icons['manage'] = 'cog'; include (dirname(__FILE__) . '/menuOrder.php'); diff --git a/module/company/js/view.js b/module/company/js/view.js index 3bba3a1eb3..e69de29bb2 100644 --- a/module/company/js/view.js +++ b/module/company/js/view.js @@ -1,4 +0,0 @@ -$(function() -{ - if(onlybody != 'yes') $('#editCompany').colorbox({width:750, height:500, iframe:true, transition:'none'}); -}); diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index 7625eab2ba..aaf52abce1 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -13,96 +13,98 @@ user->confirmDelete); ?> - - - - - - - -
-
dept->common;?>
-
- -
dept->manage);?>
-
- 		- - - - recTotal}&recPerPage={$pager->recPerPage}";?> - - - - - - - - - - - - - - - - ' method='post' id='userListForm'> +
+
icons['company']);?> company->browse;?>
+
+
+
+ +
icons['company']);?> dept->common;?>
+
+ +
dept->manage);?>
+
+
+
+' method='post' id='userListForm'> +
idAB);?>user->realname);?>user->account);?>user->role);?>user->email);?>user->gender);?>user->phone);?>user->qq);?>user->join);?>user->last);?>user->visits);?>actions;?>
+ + + recTotal}&recPerPage={$pager->recPerPage}";?> + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - -
idAB);?>user->realname);?>user->account);?>user->role);?>user->email);?>user->gender);?>user->phone);?>user->qq);?>user->join);?>user->last);?>user->visits);?>actions;?>
account'> "; + printf('%03d', $user->id); ?> - -
- account'> "; - printf('%03d', $user->id); - ?> - account", $user->realname)) echo $user->realname;?>account;?>user->roleList[$user->role];?>email);?>user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?>phone;?>qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>join;?>last) echo date('Y-m-d', $user->last);?>visits;?> - id&from=company", '', 'list'); - if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) - { - $deleteURL = $this->createLink('user', 'delete', "userID=$user->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '', '', "title='{$lang->user->delete}'"); - } - 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"); - } - ?> -
- edit, 'onclick=batchEdit()'); - if($canManageContacts) echo html::submitButton($lang->user->contacts->manage, 'onclick=manageContacts()'); - $pager->show(); - ?> -
-
+ + account", $user->realname)) echo $user->realname;?> + account;?> + user->roleList[$user->role];?> + email);?> + user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?> + phone;?> + qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?> + join;?> + last) echo date('Y-m-d', $user->last);?> + visits;?> + + id&from=company", '', 'list'); + if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) + { + $deleteURL = $this->createLink('user', 'delete', "userID=$user->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '', '', "title='{$lang->user->delete}' class='btn-icon'"); + } + 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"); + } + ?> + + + + + + + +
+ " . html::selectAll() . html::selectReverse() . '
'; + if($canBatchEdit) echo html::submitButton($lang->edit, 'onclick=batchEdit()', 'btn-default'); + if($canManageContacts) echo html::submitButton($lang->user->contacts->manage, 'onclick=manageContacts()'); + ?> + + show();?> + + + + + + diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index c08fc1e2d0..d127ed824e 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -16,23 +16,27 @@ var browseType = '';
- ' . html::a(inlink('dynamic', "browseType=today"), $lang->action->dynamic->today) . ''; - echo '' . html::a(inlink('dynamic', "browseType=yesterday"), $lang->action->dynamic->yesterday) . ''; - echo '' . html::a(inlink('dynamic', "browseType=twodaysago"), $lang->action->dynamic->twoDaysAgo) . ''; - echo '' . html::a(inlink('dynamic', "browseType=thisweek"), $lang->action->dynamic->thisWeek) . ''; - echo '' . html::a(inlink('dynamic', "browseType=lastweek"), $lang->action->dynamic->lastWeek) . ''; - echo '' . html::a(inlink('dynamic', "browseType=thismonth"), $lang->action->dynamic->thisMonth) . ''; - echo '' . html::a(inlink('dynamic', "browseType=lastmonth"), $lang->action->dynamic->lastMonth) . ''; - echo '' . html::a(inlink('dynamic', "browseType=all"), $lang->action->dynamic->all) . ''; - echo "" . html::select('account', $users, $account, 'onchange=changeUser(this.value)') . ''; - echo "" . html::select('product', $products, $product, 'onchange=changeProduct(this.value)') . ''; - echo "" . html::select('project', $projects, $project, 'onchange=changeProject(this.value)') . ''; - echo "" . html::a('#', ' ' . $lang->action->dynamic->search) . ""; - ?> +
icons['dynamic']);?>
+ +
'>
-
'>
- + +
diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php index a626307cc4..abde650c1a 100644 --- a/module/company/view/edit.html.php +++ b/module/company/view/edit.html.php @@ -11,11 +11,17 @@ */ ?> - -
action->date;?>
- +
+
+ icons['company']) . ' #' . $company->id;?> + name;?> + company->edit;?> icons['edit']);?> +
+
+ +
company->edit;?>
- + @@ -46,7 +52,7 @@ - +
company->name;?>company->name;?> name, "class='form-control'");?>
company->guest;?> company->guestList, $company->guest);?>
diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php index e68c8db4ac..584a96f575 100644 --- a/module/company/view/view.html.php +++ b/module/company/view/view.html.php @@ -11,40 +11,47 @@ */ ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
company->view;?>
company->name;?>name;?>
company->phone;?>phone;?>
company->fax;?>fax;?>
company->address;?>address;?>
company->zipcode;?>zipcode;?>
company->website;?>website;?>
company->backyard;?>backyard;?>
company->guest;?>company->guestList[$company->guest];?>
' . $lang->edit, '', 'id="editCompany" class="btn"', true, true);?>
+
+
+
icons['company']);?> company->view;?>
+
+ ' . $lang->edit, '', 'id="editCompany" class="btn btn-primary iframe" data-width="580"', true, true);?> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
company->name;?>name;?>
company->phone;?>phone;?>
company->fax;?>fax;?>
company->address;?>address;?>
company->zipcode;?>zipcode;?>
company->website;?>website;?>
company->backyard;?>backyard;?>
company->guest;?>company->guestList[$company->guest];?>
+
diff --git a/module/dept/css/browse.css b/module/dept/css/browse.css index 088f5954e5..b276b32b53 100644 --- a/module/dept/css/browse.css +++ b/module/dept/css/browse.css @@ -1 +1,4 @@ -.table-1 input{margin-bottom:3px} +.table.table-form {width: auto;} +.table-form > tbody > tr > td .form-control {position: relative; z-index: 99} +.table-form > tbody > tr > td .form-control + .form-control {margin-top: -1px;} +.table-form > tbody > tr > td .form-control + .form-control:focus {z-index: 9999} diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php index 57b09e684e..fcce39bcea 100644 --- a/module/dept/view/browse.html.php +++ b/module/dept/view/browse.html.php @@ -12,62 +12,72 @@ ?> - - - - - + + + + + + + +
-
'> - - - - - -
-
-
dept->updateOrder);?>
-
-
- 		-
'> - - - - - -
dept->manageChild;?>
- - createLink('dept', 'browse'), $this->app->company->name); - echo $lang->arrow; - foreach($parentDepts as $dept) - { - echo html::a($this->createLink('dept', 'browse', "deptID=$dept->id"), $dept->name); +
+
icons['dept']);?> dept->common;?>
+
+
+
+
+
+
+ icons['dept']);?> +
+
+ '> +
+
dept->updateOrder);?>
+ +
+
+
+
+
+
+ dept->manageChild;?> +
+
+
' class='form-condensed'> + + + - - - - - - -
+ + createLink('dept', 'browse'), $this->app->company->name); echo $lang->arrow; - } - ?> - - - order > $maxOrder) $maxOrder = $sonDept->order; - echo html::input("depts[id$sonDept->id]", $sonDept->name) . '
'; - } - for($i = 0; $i < DEPT::NEW_CHILD_COUNT ; $i ++) echo html::input("depts[]") . '
'; - ?> -
- - -
-
-
+ foreach($parentDepts as $dept) + { + echo html::a($this->createLink('dept', 'browse', "deptID=$dept->id"), $dept->name); + echo $lang->arrow; + } + ?> + +
+ order > $maxOrder) $maxOrder = $sonDept->order; + echo html::input("depts[id$sonDept->id]", $sonDept->name, "class='form-control'"); + } + for($i = 0; $i < DEPT::NEW_CHILD_COUNT ; $i ++) echo html::input("depts[]", '', "class='form-control'"); + ?> +
+ + +
+ + + + + + + diff --git a/module/group/css/managemeber.css b/module/group/css/managemeber.css deleted file mode 100644 index ae9db7ee82..0000000000 --- a/module/group/css/managemeber.css +++ /dev/null @@ -1 +0,0 @@ -#users span{display:block; width:100px; float:left} diff --git a/module/group/css/managemember.css b/module/group/css/managemember.css new file mode 100644 index 0000000000..dcea2625de --- /dev/null +++ b/module/group/css/managemember.css @@ -0,0 +1,2 @@ +.group-item {display:block; width:100px; float:left} +.outer .table th {vertical-align: top;} diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css index 41ab0d6978..0aab5245ba 100644 --- a/module/group/css/managepriv.css +++ b/module/group/css/managepriv.css @@ -1,4 +1 @@ -.table-6 select{width:200px; height:200px} -#version {margin-left:10px;} -tr {border:1px solid #eee} -.tips {font-weight:normal} +.form-condensed select.form-control {height:250px} diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index cacd2bb39a..1508372244 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -13,19 +13,24 @@ group->confirmDelete);?> - - +
+
icons['group']);?> group->browse;?>
+
+ + + group->managePrivByModule, '', 'class="btn btn-primary iframe"');?> + +
+
+
-
group->browse;?>
-
-
- - - - - - - + + + + + + + @@ -37,26 +42,21 @@ - - - - -
group->id;?>group->name;?>group->desc;?>group->users;?>actions;?>
group->id;?>group->name;?>group->desc;?>group->users;?>actions;?>
group->managepriv = $lang->group->managePrivByGroup;?> - id", '', 'list');?> + id", '', 'list', 'lock');?> group->managemember = $lang->group->manageMember;?> - id", '', 'list');?> - id", '', 'list');?> - id", '', 'list');?> + id", '', 'list', 'group', '', 'iframe', yes);?> + id", '', 'list', '', '', 'iframe', yes, "data-width='550'");?> + id", '', 'list', '', '', 'iframe', yes, "data-width='550'");?> createLink('group', 'delete', "groupID=$group->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '', '', "title='{$lang->group->delete}'"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"groupList\",confirmDelete)", '', '', "title='{$lang->group->delete}' class='btn-icon'"); } ?>
group->managePrivByModule, inlink('managePriv', 'type=byModule'));?>
diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php index 61b783e836..6b6ab7753b 100644 --- a/module/group/view/copy.html.php +++ b/module/group/view/copy.html.php @@ -11,17 +11,24 @@ */ ?> -
- - +
+
+ icons['group']);?> + group->copy;?> + icons['copy']);?> +
+
+ + +
group->copy;?>
- + - + - + diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php index 20c3abed62..1d42a52876 100644 --- a/module/group/view/create.html.php +++ b/module/group/view/create.html.php @@ -11,16 +11,21 @@ */ ?> - -
group->name;?>group->name;?> name, "class='form-control'");?>
group->desc;?> desc, "rows='5' class='form-control'");?>
group->option;?> group->copyOptions);?>
- +
+
+ icons['group']);?> + icons['create']);?> group->create;?> +
+
+ +
group->create;?>
- + - +
group->name;?>group->name;?>
group->desc;?>
diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php index 3d6a93fee5..9c4baf5a2b 100644 --- a/module/group/view/edit.html.php +++ b/module/group/view/edit.html.php @@ -11,11 +11,18 @@ */ ?> - - - +
+
+ icons['group']) . ' #' . $group->id;?> + name;?> + group->edit;?> icons['edit']);?> +
+
+ + +
group->edit;?>
- + diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php index e29dc9b52a..04d79702dd 100644 --- a/module/group/view/managemember.html.php +++ b/module/group/view/managemember.html.php @@ -11,16 +11,22 @@ */ ?> - -
group->name;?>group->name;?> name, "class='form-control'");?>
- +
+
+ icons['group']) . ' #' . $group->id;?> + name;?> + group->manageMember;?> icons['manage']);?> +
+
+ + +
name . $lang->colon . $lang->group->manageMember;?>
- + @@ -29,8 +35,7 @@ diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php index bf30d16bf4..fbf4cdb059 100644 --- a/module/group/view/privbymodule.html.php +++ b/module/group/view/privbymodule.html.php @@ -10,27 +10,34 @@ * @link http://www.zentao.net */ ?> - -
group->inside;?> group->inside;?> $realname):?> -
' . html::checkbox('members', array($account => $realname), $account) . '';?>
- "; $i ++;?> +
$realname), $account);?>
group->outside;?> $realname):?> -
' . html::checkbox('members', array($account => $realname), '') . '';?>
- "; $i ++;?> +
$realname), '');?>
- - - - - - +
+
+ + group->managePriv ;?> +
+
group->byModuleTips; ?>
  
+
+ + +
group->managePriv . $lang->group->byModuleTips;?>
group->module;?>group->method;?>group->common;?>
+ + + + + - - + - +
group->module;?>group->method;?>group->common;?>
+ $moduleActions) { - echo html::select('actions[]', $moduleActions, '', "multiple='multiple' class='$class {$module}Actions'"); + echo html::select('actions[]', $moduleActions, '', "multiple='multiple' class='form-control $class {$module}Actions'"); $class = 'hidden'; } ?>
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index 30475283df..7c76377aeb 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -13,7 +13,7 @@
-
my->profile;?>
+
icons['user']);?> my->profile;?>
createLink('my', 'editprofile'), " " . $lang->user->editProfile, '', "class='btn btn-primary'");?>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 7c83637d9d..06289b4e2c 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -41,7 +41,7 @@ var moduleID = '';
'>
-
+
icons['product']);?>
diff --git a/www/js/my.full.js b/www/js/my.full.js index dbd0197cf6..764ff9025f 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -390,8 +390,6 @@ function setOuterBox() { var height = $(window).height() - $('#header').height() - $('#footer').height() - 33; $('#wrap .outer').css('min-height', height); - /* uncomment to ajust treebox height */ - // $('#treebox').css('min-height', height - $('#featurebar').height() - 18); } $(window).resize(resetOuterHeight); @@ -917,7 +915,7 @@ function setModal() */ function setTableBehavior() { - $('#wrap .table:not(.table-data, .table-form) tbody tr:not(.actie-disabled) td').click(function(){$(this).closest('tr').toggleClass('active');}); + $('#wrap .table:not(.table-data, .table-form, .active-disabled) tbody tr:not(.active-disabled) td').click(function(){$(this).closest('tr').toggleClass('active');}); $('#wrap .outer > .table, #wrap .outer > form > .table, #wrap .outer > .mian > .table, #wrap .outer > .mian > form > .table, #wrap .outer > .container > .table').not('.table-data, .table-form').addClass('table table-condensed table-hover table-striped table-borderless tablesorter'); } diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 2cb948e98c..a5b54e888d 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -23,6 +23,7 @@ /* paddings */ .pd-0 {padding: 0 !important} .mg-0 {margin: 0 !important} +.pdb-20 {padding-bottom: 20px !important} /* Style of text */ .text-latin {font-family: Arial;}