diff --git a/module/admin/view/cleardata.html.php b/module/admin/view/cleardata.html.php index b9d76391fb..5453492deb 100755 --- a/module/admin/view/cleardata.html.php +++ b/module/admin/view/cleardata.html.php @@ -17,7 +17,7 @@ admin->clearDataDesc);?> - lang->admin->pleaseInputYes . html::input('sure', '', "class='text-2' onkeyup='showClearButton()' autocomplete='off'");?> + lang->admin->pleaseInputYes . html::input('sure', '', "class='form-control' onkeyup='showClearButton()' autocomplete='off'");?> admin->clearData, "class='hidden btn btn-danger'");?> diff --git a/module/project/css/managemembers.css b/module/project/css/managemembers.css index 3f8b0d18f9..07e5232c91 100644 --- a/module/project/css/managemembers.css +++ b/module/project/css/managemembers.css @@ -1 +1,12 @@ -.active-result, .chzn-single{text-align:left;} +#importTeams {padding: 0} +#importTeams {padding: 0 2px} +#importTeams > div {position: relative;} +#importTeams a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0} +#importTeams a > i {display: inline-block; margin-right: 5px;} +#importTeams a:hover {border:1px solid #39B3D7; background-color: #E5F9FF; text-decoration: none} +#importTeams a.active {border-color: #229F24; color: #229F24; background-color: #E5FFE6} +#importTeams a.active:after {position: absolute; content: '\e60d'; font-family: ZenIcon; font-size: 20px; right: 25px;} +#importTeams a.cancel {color: #D2322D} + +.outer .container .table-form {margin-top: 0;} +.outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 5px;} diff --git a/module/project/js/managemembers.js b/module/project/js/managemembers.js index e3659b4486..f324425b3b 100644 --- a/module/project/js/managemembers.js +++ b/module/project/js/managemembers.js @@ -4,9 +4,10 @@ * @access public * @return void */ -function importTeam() +function importTeam(val) { - location.href = createLink('project', 'manageMembers', 'project=' + projectID + '&teamImport=' + $('#teams2Import').val()); + if(val == undefined) val = $('#teams2Import').val(); + location.href = createLink('project', 'manageMembers', 'project=' + projectID + '&teamImport=' + val); } /** @@ -23,3 +24,10 @@ function setRole(account, roleID) roleOBJ = $('#role' + roleID); // get role object. roleOBJ.val(role) // set the role. } + +$(function() +{ + $('#itBtn').click(function(){$('#importTeamModal').modal('show')}); + $('#importTeams a').click(function(){importTeam($(this).data('id')); $('#importTeamModal').modal('hide')}); +}); + diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index ea69675cf0..4f79f03b41 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -182,11 +182,13 @@ $lang->project->whyNoStories = "看起来没有需求可以关联。请检查 $lang->project->doneProjects = '已结束'; $lang->project->unDoneProjects = '未结束'; $lang->project->copyTeam = '复制团队'; +$lang->project->copyFromTeam = '复制自项目团队： %s'; $lang->project->noMatched = '找不到包含"%s"的项目'; $lang->project->copyTitle = '请选择一个项目来复制'; +$lang->project->copyTeamTitle = '请选择一个已有的项目团队'; $lang->project->copyNoProject = '没有可用的项目来复制'; $lang->project->copyFromProject = '复制自项目： %s'; -$lang->project->reCopyProject = '重新复制'; +$lang->project->reCopy = '重新复制'; $lang->project->cancelCopy = '取消复制'; $lang->project->byPeriod = '按时间段'; diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 2218f2d4c1..da82baeb69 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -53,7 +53,7 @@ $(document).ready(function() {$('#tipsModal').modal('show');});
icons['cancel']) . ' ' . $lang->project->cancelCopy;?> ? - +
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index 057f3b4a65..f8d8484435 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -13,70 +13,120 @@ id);?> -
- - - - - - - - - - - account])) continue; $realname = substr($users[$member->account], 2);?> - account]);?> - - - - - - - - +
+
+
+ icons['team']);?> + project->manageMembers;?> + +
+
+ +
+ project->copyFromTeam, html::icon($lang->icons['group']) . ' ' . $teams2Import[$team2Import]);?> +
+
+ icons['cancel']) . ' ' . $lang->project->cancelCopy;?> ? + +
+ + + +
+
+ +
-
project->manageMembers;?>
-
-
team->account;?>team->role;?>team->days;?>team->hours;?>
- - - -
+ + + + + + + + + + + account])) continue; $realname = substr($users[$member->account], 2);?> + account]);?> + + + + + + + + - - - - - - - - - + + + + + + + + + - PROJECTMODEL::LINK_MEMBERS_ONE_TIME) $count = PROJECTMODEL::LINK_MEMBERS_ONE_TIME; - ?> + PROJECTMODEL::LINK_MEMBERS_ONE_TIME) $count = PROJECTMODEL::LINK_MEMBERS_ONE_TIME; + ?> - - - - - - - - - - - - -
team->account;?>team->role;?>team->days;?>team->hours;?>
+ + + +
account, "class='select-2 chosen' onchange='setRole(this.value, $i)'");?> - - -
account, "class='select-2 chosen' onchange='setRole(this.value, $i)'");?> + + +
- - -
- -
-
+ + + + + + + + + + + + + + + + + + + + + diff --git a/module/story/config.php b/module/story/config.php index af4cc83745..19bf4576cf 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -5,7 +5,7 @@ $config->story->batchCreate = 10; $config->story->affectedFixedNum = 7; $config->story->batchEdit = new stdclass(); -$config->story->batchEdit->columns = 10; +$config->story->batchEdit->columns = 11; $config->story->batchClose = new stdclass(); $config->story->batchClose->columns = 10; diff --git a/module/story/css/batchclose.css b/module/story/css/batchclose.css index 9683fd56a2..8b13789179 100644 --- a/module/story/css/batchclose.css +++ b/module/story/css/batchclose.css @@ -1 +1 @@ -select,div.f-left input{border:1px solid #ccc} + diff --git a/module/story/css/batchcreate.css b/module/story/css/batchcreate.css index be445f9d41..e69de29bb2 100644 --- a/module/story/css/batchcreate.css +++ b/module/story/css/batchcreate.css @@ -1,6 +0,0 @@ -.w-300px{width:300px} -.w-280px{width:280px} -.w-180px{width:180px} -.half-left {text-align:right} -.half-right{text-align:left} -textarea {height:16px} diff --git a/module/story/css/batchedit.css b/module/story/css/batchedit.css index 9683fd56a2..f4aace4f45 100644 --- a/module/story/css/batchedit.css +++ b/module/story/css/batchedit.css @@ -1 +1 @@ -select,div.f-left input{border:1px solid #ccc} +#suhosinInfo {margin-bottom: 0;} diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index bb9c8ae8a1..b79fc98fe9 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -20,7 +20,7 @@
"> - +
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index d78fdaf52b..6fbc9a8188 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -81,7 +81,7 @@ - +
idAB;?>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index c7eddb7050..298f2298dc 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -66,7 +66,7 @@
- +
diff --git a/module/user/view/managecontacts.html.php b/module/user/view/managecontacts.html.php index 9612ed3ed5..67ced9f127 100644 --- a/module/user/view/managecontacts.html.php +++ b/module/user/view/managecontacts.html.php @@ -52,11 +52,11 @@ echo html::select('list2Append', array('' => '') + $lists, '', "class='select-2'") . $lang->user->contacts->or; } echo $lang->user->contacts->createList; - echo html::input('newList', '', "class='text-2'"); + echo html::input('newList', '', "class='form-control'"); } else { - echo html::input('listName', $list->listName, "class='text-2'"); + echo html::input('listName', $list->listName, "class='form-control'"); echo html::hidden('listID', $list->id); } ?>