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

* ajusted views of module project.

Browse Source 
* changed css names.
This commit is contained in:
Catouse
2014-03-27 17:57:35 +08:00
parent 285a010037
commit fc322ea3cf
14 changed files with 148 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/css/managemembers.css
+12 -1
View File
@@ -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;}
module/project/js/managemembers.js
+10 -2
View File
@@ -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')});
});
module/project/lang/zh-cn.php
+3 -1
View File
@@ -182,11 +182,13 @@ $lang->project->whyNoStories = "看起来没有需求可以关联。请检查
$lang->project->doneProjects = '已结束';
$lang->project->unDoneProjects = '未结束';
$lang->project->copyTeam = '复制团队';
$lang->project->copyFromTeam = '复制自项目团队： <strong>%s</strong>';
$lang->project->noMatched = '找不到包含"%s"的项目';
$lang->project->copyTitle = '请选择一个项目来复制';
$lang->project->copyTeamTitle = '请选择一个已有的项目团队';
$lang->project->copyNoProject = '没有可用的项目来复制';
$lang->project->copyFromProject = '复制自项目： <strong>%s</strong>';
$lang->project->reCopyProject = '重新复制';
$lang->project->reCopy = '重新复制';
$lang->project->cancelCopy = '取消复制';
$lang->project->byPeriod = '按时间段';
module/project/view/create.html.php
+1 -1
View File
@@ -53,7 +53,7 @@ $(document).ready(function() {$('#tipsModal').modal('show');});
</div>
<div class='btn-group'>
<a class='btn text-danger' href='javascript:setCopyProject("");'><?php echo html::icon($lang->icons['cancel']) . ' ' . $lang->project->cancelCopy;?> ?</a>
<button class='btn btn-primary' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->reCopyProject;?> ?</button>
<button class='btn btn-primary' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->reCopy;?> ?</button>
</div>
<?php else:?>
<button class='btn btn-primary' id='cpmBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copy;?> ?</button>
module/project/view/managemembers.html.php
+113 -63
View File
@@ -13,70 +13,120 @@
<?php include '../../common/view/header.html.php';?>
<?php js::set('projectID', $project->id);?>
<?php js::set('roles', $roles);?>
<form method='post'>
<table align='center' class='table-4 a-center'>
<caption>
<div class='f-left'><?php echo $lang->project->manageMembers;?></div>
<div class='text-right'><?php echo html::select('teams2Import', $teams2Import, $team2Import, 'onchange=importTeam()');?></div>
</caption>
<tr>
<th><?php echo $lang->team->account;?></th>
<th><?php echo $lang->team->role;?></th>
<th><?php echo $lang->team->days;?></th>
<th><?php echo $lang->team->hours;?></th>
</tr>
<?php $i = 1; $memberCount = 0;?>
<?php foreach($currentMembers as $member):?>
<?php if(!isset($users[$member->account])) continue; $realname = substr($users[$member->account], 2);?>
<?php unset($users[$member->account]);?>
<tr>
<td><input type='text' name='realnames[]' id='account<?php echo $i;?>' value='<?php echo $realname;?>' readonly class='text-2' /></td>
<td><input type='text' name='roles[]' id='role<?php echo $i;?>' value='<?php echo $member->role;?>' class='text-2' /></td>
<td><input type='text' name='days[] ' id='days<?php echo $i;?>' value='<?php echo $member->days;?>' class='text-2' /></td>
<td>
<input type='text' name='hours[]' id='hours<?php echo $i;?>' value='<?php echo $member->hours;?>' class='text-2' />
<input type='hidden' name='modes[]' value='update' />
<input type='hidden' name='accounts[]' value='<?php echo $member->account;?>' />
</td>
</tr>
<?php $i ++; $memberCount ++;?>
<?php endforeach;?>
<div class='container mw-700px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['team']);?></span>
<strong> <?php echo $lang->project->manageMembers;?></strong>
<small class='text-muted'><i class='icon icon-cogs'></i></small>
</div>
<div class='actions'>
<?php if($team2Import != 0):?>
<div class='text text-success'>
<i class='icon-ok-sign'></i> <?php printf($lang->project->copyFromTeam, html::icon($lang->icons['group']) . ' ' . $teams2Import[$team2Import]);?>
</div>
<div class='btn-group'>
<a class='btn text-danger' href='javascript:importTeam(0);'><?php echo html::icon($lang->icons['cancel']) . ' ' . $lang->project->cancelCopy;?> ?</a>
<button class='btn btn-primary' id='itBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->reCopy;?> ?</button>
</div>
<?php else:?>
<button class='btn btn-primary' id='itBtn'><?php echo html::icon($lang->icons['copy']) . ' ' . $lang->project->copyTeam;?> ?</button>
<?php endif; ?>
</div>
</div>
<form class='form-condensed' method='post'>
<table class='table table-form'>
<thead>
<tr class='text-center'>
<th><?php echo $lang->team->account;?></th>
<th><?php echo $lang->team->role;?></th>
<th class='w-100px'><?php echo $lang->team->days;?></th>
<th class='w-100px'><?php echo $lang->team->hours;?></th>
</tr>
</thead>
<?php $i = 1; $memberCount = 0;?>
<?php foreach($currentMembers as $member):?>
<?php if(!isset($users[$member->account])) continue; $realname = substr($users[$member->account], 2);?>
<?php unset($users[$member->account]);?>
<tr>
<td><input type='text' name='realnames[]' id='account<?php echo $i;?>' value='<?php echo $realname;?>' readonly class='form-control' /></td>
<td><input type='text' name='roles[]' id='role<?php echo $i;?>' value='<?php echo $member->role;?>' class='form-control' /></td>
<td><input type='text' name='days[] ' id='days<?php echo $i;?>' value='<?php echo $member->days;?>' class='form-control' /></td>
<td>
<input type='text' name='hours[]' id='hours<?php echo $i;?>' value='<?php echo $member->hours;?>' class='form-control' />
<input type='hidden' name='modes[]' value='update' />
<input type='hidden' name='accounts[]' value='<?php echo $member->account;?>' />
</td>
</tr>
<?php $i ++; $memberCount ++;?>
<?php endforeach;?>
<?php foreach($members2Import as $member2Import):?>
<tr>
<td><?php echo html::select("accounts[$memberCount]", $users, $member2Import->account, "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='text-2' value='<?php echo $member2Import->role;?>' /></td>
<td><input type='text' name='days[]' id='days<?php echo $i;?>' class='text-2' value='<?php echo $project->days?>'/></td>
<td>
<input type='text' name='hours[]' id='hours<?php echo $i;?>' class='text-2' value='<?php echo $member2Import->hours;?>' />
<input type='hidden' name='modes[]' value='create' />
</td>
</tr>
<?php $i ++; $memberCount ++;?>
<?php endforeach;?>
<?php foreach($members2Import as $member2Import):?>
<tr>
<td><?php echo html::select("accounts[$memberCount]", $users, $member2Import->account, "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->role;?>' /></td>
<td><input type='text' name='days[]' id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
<td>
<input type='text' name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->hours;?>' />
<input type='hidden' name='modes[]' value='create' />
</td>
</tr>
<?php $i ++; $memberCount ++;?>
<?php endforeach;?>
<?php
$count = count($users) - 1;
if($count > PROJECTMODEL::LINK_MEMBERS_ONE_TIME) $count = PROJECTMODEL::LINK_MEMBERS_ONE_TIME;
?>
<?php
$count = count($users) - 1;
if($count > PROJECTMODEL::LINK_MEMBERS_ONE_TIME) $count = PROJECTMODEL::LINK_MEMBERS_ONE_TIME;
?>
<?php for($j = 0; $j < $count; $j ++):?>
<tr>
<td><?php echo html::select("accounts[$memberCount]", $users, '', "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><input type='text' name='roles[]' id='role<?php echo ($i);?>' class='text-2' /></td>
<td><input type='text' name='days[]' id='days<?php echo ($i);?>' class='text-2' value='<?php echo $project->days?>'/></td>
<td>
<input type='text' name='hours[]' id='hours<?php echo ($i);?>' class='text-2' value='7' />
<input type='hidden' name='modes[]' value='create' />
</td>
</tr>
<?php $i ++; $memberCount ++;?>
<?php endfor;?>
<tr>
<td colspan='4'>
<input type='submit' name='submit' value='<?php echo $lang->save;?>' class='button-s' />
</td>
</tr>
</table>
</form>
<?php for($j = 0; $j < $count; $j ++):?>
<tr>
<td><?php echo html::select("accounts[$memberCount]", $users, '', "class='select-2 chosen' onchange='setRole(this.value, $i)'");?></td>
<td><input type='text' name='roles[]' id='role<?php echo ($i);?>' class='form-control' /></td>
<td><input type='text' name='days[]' id='days<?php echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
<td>
<input type='text' name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='7' />
<input type='hidden' name='modes[]' value='create' />
</td>
</tr>
<?php $i ++; $memberCount ++;?>
<?php endfor;?>
<tr>
<td colspan='4' class='text-center'>
<?php echo html::submitButton() ?>
</td>
</tr>
</table>
</form>
</div>
<div class='modal fade' id='importTeamModal'>
<div class='modal-dialog mw-700px'>
<div class='modal-header'>
<button type='button' class='close' data-dismiss='modal'>&times;</button>
<h4 class='modal-title' id='myModalLabel'><i class='icon-copy'></i> <?php echo $lang->project->copyTeam;?> <small><?php echo $lang->project->copyTeamTitle;?></small></h4>
</div>
<div class='modal-body'>
<?php if(count($teams2Import) == 1):?>
<div class='alert alert-warning'>
<i class='icon-info-sign'></i>
<div class='content'>
<p><?php echo $lang->project->copyNoProject;?></p>
</div>
</div>
<?php else:?>
<div id='importTeams' class='row'>
<?php foreach ($teams2Import as $id => $name):?>
<?php if(empty($id)):?>
<?php if($team2Import != 0):?>
<div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='' class='cancel'><?php echo html::icon($lang->icons['cancel']) . ' ' . $lang->project->cancelCopy;?></a></div>
<?php endif;?>
<?php else: ?>
<div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='<?php echo $id;?>' class='nobr <?php echo ($team2Import == $id) ? ' active' : '';?>'><?php echo html::icon($lang->icons['team'], 'text-muted') . ' ' . $name;?></a></div>
<?php endif; ?>
<?php endforeach;?>
</div>
<?php endif;?>
</div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>