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

* adjust the UI.

Browse Source
This commit is contained in:
wangchunsheng
2009-12-18 09:02:35 +00:00
parent 5bfdb95961
commit d5aecda907
20 changed files with 153 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/module/bug/view/edit.html.php
View File

@@ -122,7 +122,7 @@ function setDuplicate(resolution)
</div>
</div>
<div class='yui-doc3 yui-t7'>
<div class='yui-d0'>
<div class='yui-g'>
<div class='yui-u first'>

7
trunk/module/company/control.php
View File

@@ -44,6 +44,8 @@ class company extends control
$this->lang->set('menugroup.company', 'company');
$childDeptIds = $this->dept->getAllChildID($deptID);
$this->company->setMenu($deptID);
$header['title'] = $this->lang->company->index . $this->lang->colon . $this->lang->dept->common;
$position[] = $this->lang->dept->common;
@@ -52,6 +54,7 @@ class company extends control
$this->assign('users', $this->dept->getUsers($childDeptIds));
$this->assign('deptTree', $this->dept->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createMemberLink')));
$this->assign('parentDepts', $this->dept->getParents($deptID));
$this->assign('deptID', $deptID);
$this->display();
}
@@ -66,6 +69,8 @@ class company extends control
}
$this->lang->set('menugroup.company', 'admin');
$this->lang->company->menu = $this->lang->admin->menu;
$header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->company->create;
$position[] = html::a($this->createLink('admin', 'browsecompany'), $this->lang->admin->company);
$position[] = $this->lang->company->create;
@@ -85,6 +90,8 @@ class company extends control
}
$this->lang->set('menugroup.company', 'admin');
$this->lang->company->menu = $this->lang->admin->menu;
$header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->company->edit;
$position[] = html::a($this->createLink('admin', 'browsecompany'), $this->lang->admin->company);
$position[] = $this->lang->company->edit;

3
trunk/module/company/lang/zh-cn.php
View File

@@ -44,3 +44,6 @@ $lang->company->website = '公司网站';
$lang->company->backyard = '内网网址';
$lang->company->pms = 'PMS网站';
$lang->company->guest = '匿名登陆';
$lang->company->guestList[0] = '不允许';
$lang->company->guestList[1] = '允许';

6
trunk/module/company/model.php
View File

@@ -25,6 +25,12 @@
<?php
class companyModel extends model
{
public function setMenu($dept = 0)
{
common::setMenuVars($this->lang->company->menu, 'addUser', array($this->app->company->id, $dept));
}
/* <20><><EFBFBD>ù<EFBFBD>˾<EFBFBD>б<EFBFBD><D0B1><EFBFBD>*/
function getList()
{

67
trunk/module/company/view/browse.html.php
View File

@@ -22,40 +22,30 @@
* @link http://www.zentao.cn
*/
?>
<?php include '../../common/header.html.php';?>
<?php include '../../common/treeview.html.php';?>
<?php include '../../common/tablesorter.html.php';?>
<div class="yui-d0 yui-t3">
<?php
include '../../common/header.html.php';
include '../../common/treeview.html.php';
include '../../common/tablesorter.html.php';
?>
<div class="yui-d0 yui-t7">
<div class="yui-b">
<table class='table-1'>
<caption><?php echo $lang->dept->common;?></caption>
<tr>
<td>
<div id='main'><?php echo $deptTree;?></div>
<div class='a-right'>
<?php if(common::hasPriv('dept', 'browse')) echo html::a($this->createLink('dept', 'browse'), $lang->dept->manage);?>
<?php if(common::hasPriv('user', 'create')) echo html::a($this->createLink('user', 'create', "companyID={$this->app->company->id}&from=company"), $lang->user->create);?>
</div>
</td>
</tr>
</table>
<div class='box-title'><?php echo $lang->dept->common;?></div>
<div class='box-content'>
<?php echo $deptTree;?>
<div class='a-right'>
<?php
common::printLink('dept', 'browse', '', $lang->dept->manage);
common::printLink('user', 'create', "companyID={$this->app->company->id}&from=company", $lang->user->create);
common::printLink('company', 'browse', '', $lang->user->allUsers);
?>
</div>
</div>
<div class="yui-main">
</div>
<div class="yui-main">
<div class="yui-b">
<table align='center' class='table-1 tablesorter'>
<caption>
<?php
echo html::a($this->createLink('company', 'browse'), $app->company->name) . $lang->arrow;
foreach($parentDepts as $dept)
{
echo html::a($this->createLink('company', 'browse', "deptID=$dept->id"), $dept->name) . $lang->arrow;
}
echo $lang->dept->users;
?>
</caption>
<table class='table-1 tablesorter'>
<thead>
<tr>
<tr class='colhead'>
<th><?php echo $lang->user->id;?></th>
<th><?php echo $lang->user->realname;?></th>
<th><?php echo $lang->user->account;?></th>
@@ -71,28 +61,25 @@
<tbody>
<?php foreach($users as $user):?>
<tr class='a-center'>
<td class='a-right'><?php echo $user->id;?></td>
<td><?php if(common::hasPriv('user', 'view')) echo html::a($this->createLink('user', 'view', "account=$user->account"), $user->realname); else echo $user->realname;?></td>
<td><?php echo $user->id;?></td>
<td><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname)) echo $user->realname;?></td>
<td><?php echo $user->account;?></td>
<td><?php echo $user->nickname;?></td>
<td><?php echo html::mailto($user->email);?></td>
<td class='a-center'><?php if(isset($lang->user->gendarList->{$user->gendar})) echo $lang->user->gendarList->{$user->gendar};?></td>
<td><?php if(isset($lang->user->gendarList->{$user->gendar})) echo $lang->user->gendarList->{$user->gendar};?></td>
<td><?php echo $user->phone;?></td>
<td class='a-center'><?php echo $user->join;?></td>
<td><?php echo $user->join;?></td>
<td><?php echo $user->visits;?></td>
<td>
<?php if(common::hasPriv('user', 'edit')) echo html::a($this->createLink('user', 'edit', "userID=$user->id&from=company"), $lang->user->edit);?>
<?php if(common::hasPriv('user', 'delete')) echo html::a($this->createLink('user', 'delete', "userID=$user->id"), $lang->user->delete, "hiddenwin");?>
<?php common::printLink('user', 'edit', "userID=$user->id&from=company", $lang->user->edit);?>
<?php common::printLink('user', 'delete', "userID=$user->id", $lang->user->delete, "hiddenwin");?>
</td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<div class='a-right'>
<?php
?>
</div>
</div>
</div>
</div>
<script lanugage='Javascript'>$('#dept<?php echo $deptID;?>').addClass('active');</script>
<?php include '../../common/footer.html.php';?>

26
trunk/module/company/view/create.html.php
View File

@@ -23,49 +23,47 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div id='doc3'>
<div class='yui-d0'>
<form method='post'>
<table align='center' class='table-3 a-left'>
<table align='center' class='table-5'>
<caption><?php echo $lang->company->create;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->company->name;?></th>
<td><input type='text' name='name' /></td>
<td><input type='text' name='name' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->phone;?></th>
<td><input type='text' name='phone' /></td>
<td><input type='text' name='phone' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->fax;?></th>
<td><input type='text' name='fax' /></td>
<td><input type='text' name='fax' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->address;?></th>
<td><input type='text' name='address' /></td>
<td><input type='text' name='address' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->zipcode;?></th>
<td><input type='text' name='zipcode' /></td>
<td><input type='text' name='zipcode' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->website;?></th>
<td><input type='text' name='website' /></td>
<td><input type='text' name='website' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->backyard;?></th>
<td><input type='text' name='backyard' /></td>
<td><input type='text' name='backyard' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->pms;?></th>
<td><input type='text' name='pms' /></td>
<td><input type='text' name='pms' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->guest;?></th>
<td><input type='text' name='guest' /></td>
<td><?php echo html::radio('gust', $lang->company->guestList);?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><input type='submit' /></td>
</tr>
<tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
</div>

26
trunk/module/company/view/edit.html.php
View File

@@ -23,49 +23,47 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div id='doc3'>
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-3 a-left'>
<table align='center' class='table-5 a-left'>
<caption><?php echo $lang->company->create;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->company->name;?></th>
<td><input type='text' name='name' value='<?php echo $company->name;?>' /></td>
<td><input type='text' name='name' value='<?php echo $company->name;?>' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->phone;?></th>
<td><input type='text' name='phone' value='<?php echo $company->phone;?>' /></td>
<td><input type='text' name='phone' value='<?php echo $company->phone;?>' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->fax;?></th>
<td><input type='text' name='fax' value='<?php echo $company->fax;?>' /></td>
<td><input type='text' name='fax' value='<?php echo $company->fax;?>' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->address;?></th>
<td><input type='text' name='address' value='<?php echo $company->address;?>' /></td>
<td><input type='text' name='address' value='<?php echo $company->address;?>' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->zipcode;?></th>
<td><input type='text' name='zipcode' value='<?php echo $company->zipcode;?>' /></td>
<td><input type='text' name='zipcode' value='<?php echo $company->zipcode;?>' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->website;?></th>
<td><input type='text' name='website' value='<?php echo $company->website;?>' /></td>
<td><input type='text' name='website' value='<?php echo $company->website;?>' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->backyard;?></th>
<td><input type='text' name='backyard' value='<?php echo $company->backyard;?>' /></td>
<td><input type='text' name='backyard' value='<?php echo $company->backyard;?>' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->pms;?></th>
<td><input type='text' name='pms' value='<?php echo $company->pms;?>' /></td>
<td><input type='text' name='pms' value='<?php echo $company->pms;?>' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->company->guest;?></th>
<td><input type='text' name='guest' value='<?php echo $company->guest;?>' /></td>
<td><?php echo html::radio('gust', $lang->company->guestList, $company->guest);?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><input type='submit' /></td>
</tr>
<tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
</div>

2
trunk/module/dept/model.php
View File

@@ -147,7 +147,7 @@ class deptModel extends model
/* 生成用户链接。*/
function createMemberLink($dept)
{
$linkHtml = html::a(helper::createLink('company', 'browse', "dept={$dept->id}"), $dept->name);
$linkHtml = html::a(helper::createLink('company', 'browse', "dept={$dept->id}"), $dept->name, '_self', "id='dept{$dept->id}'");
return $linkHtml;
}

8
trunk/module/dept/view/browse.html.php
View File

@@ -28,15 +28,11 @@
<div class="yui-b">
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('dept', 'updateOrder');?>'>
<table class='table-1'>
<caption>
<?php echo $header['title'];?>
</caption>
<caption><?php echo $header['title'];?></caption>
<tr>
<td>
<div id='main'><?php echo $depts;?></div>
<div class='a-center'>
<input type='submit' value='<?php echo $lang->dept->updateOrder;?>' />
</div>
<div class='a-center'><?php echo html::submitButton($lang->dept->updateOrder);?></div>
</td>
</tr>
</table>

38
trunk/module/group/control.php
View File

@@ -31,6 +31,26 @@ class group extends control
$this->loadModel('user');
}
/* 分组列表。*/
public function browse($companyID = 0)
{
if($companyID == 0) $companyID = $this->app->company->id;
$header['title'] = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->browse;
$position[] = $this->lang->group->browse;
$groups = $this->group->getList($companyID);
$groupUsers = array();
foreach($groups as $group) $groupUsers[$group->id] = $this->group->getUserPairs($group->id);
$this->assign('header', $header);
$this->assign('position', $position);
$this->assign('groups', $groups);
$this->assign('groupUsers', $groupUsers);
$this->display();
}
/* 创建一个用户组。*/
public function create($companyID = 0)
{
@@ -38,11 +58,10 @@ class group extends control
if(!empty($_POST))
{
$this->group->create($companyID);
die(js::locate($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), 'parent'));
die(js::locate($this->createLink('group', 'browse'), 'parent'));
}
$header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->group->create;
$position[] = html::a($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), $this->lang->admin->group);
$header['title'] = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->create;
$position[] = $this->lang->group->create;
$this->assign('header', $header);
$this->assign('position', $position);
@@ -56,11 +75,10 @@ class group extends control
if(!empty($_POST))
{
$this->group->update($groupID);
die(js::locate($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), 'parent'));
die(js::locate($this->createLink('group', 'browse'), 'parent'));
}
$header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->group->edit;
$position[] = html::a($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), $this->lang->admin->group);
$header['title'] = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->edit;
$position[] = $this->lang->group->edit;
$this->assign('header', $header);
$this->assign('position', $position);
@@ -100,7 +118,7 @@ class group extends control
if(!empty($_POST))
{
$this->group->updateUser($groupID);
die(js::locate($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), 'parent'));
die(js::locate($this->createLink('group', 'browse'), 'parent'));
}
$group = $this->group->getById($groupID);
$groupUsers = $this->group->getUserPairs($groupID);
@@ -125,14 +143,12 @@ class group extends control
{
if($confirm == 'no')
{
echo js::confirm($this->lang->group->confirmDelete, $this->createLink('group', 'delete', "groupID=$groupID&confirm=yes"));
exit;
die(js::confirm($this->lang->group->confirmDelete, $this->createLink('group', 'delete', "groupID=$groupID&confirm=yes")));
}
else
{
$this->group->delete($groupID);
echo js::locate($this->createLink('admin', 'browsegroup', "companyID={$this->app->company->id}"), 'parent');
exit;
die(js::locate($this->createLink('group', 'browse'), 'parent'));
}
}
}

63
trunk/module/group/lang/zh-cn.php
View File

@@ -45,6 +45,20 @@ $lang->group->priv = '权限';
$lang->resource->index->index = 'index';
$lang->resource->index->ping = 'ping';
$lang->resource->my->index = 'index';
$lang->resource->my->todo = 'todo';
$lang->resource->my->task = 'task';
$lang->resource->my->bug = 'bug';
$lang->resource->my->project = 'project';
$lang->resource->my->profile = 'profile';
$lang->resource->my->editProfile = 'editProfile';
$lang->resource->todo->create = 'create';
$lang->resource->todo->edit = 'edit';
$lang->resource->todo->delete = 'delete';
$lang->resource->todo->mark = 'mark';
$lang->resource->todo->import2Today = 'import2Today';
$lang->resource->product->index = 'index';
$lang->resource->product->browse = 'browse';
$lang->resource->product->create = 'create';
@@ -59,22 +73,9 @@ $lang->resource->story->view = 'view';
$lang->resource->story->tasks = 'tasks';
$lang->resource->story->ajaxGetProjectStories = 'ajaxGetProjectStories';
$lang->resource->story->ajaxGetProductStories = 'ajaxGetProductStories';
//$lang->resource->story->comment = 'comment';
//$lang->resource->release->index = 'index';
//$lang->resource->release->create = 'create';
//$lang->resource->release->read = 'read';
//$lang->resource->release->update = 'update';
//$lang->resource->release->delete = 'delete';
//$lang->resource->release->browse = 'browse';
$lang->resource->tree->browse = 'browse';
$lang->resource->tree->updateOrder = 'updateOrder';
$lang->resource->tree->manageChild = 'manageChild';
$lang->resource->tree->delete = 'delete';
$lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu';
$lang->resource->project->index = 'index';
$lang->resource->project->view = 'view';
$lang->resource->project->browse = 'browse';
$lang->resource->project->create = 'create';
$lang->resource->project->edit = 'edit';
@@ -82,14 +83,15 @@ $lang->resource->project->delete = 'delete';
$lang->resource->project->task = 'task';
$lang->resource->project->story = 'story';
$lang->resource->project->bug = 'bug';
$lang->resource->project->burn = 'burn';
$lang->resource->project->burnData = 'burnData';
$lang->resource->project->team = 'team';
$lang->resource->project->manageProducts = 'manageProducts';
$lang->resource->project->manageChilds = 'manageChilds';
$lang->resource->project->manageMembers = 'manageMembers';
$lang->resource->project->unlinkMember = 'unlinkMember';
$lang->resource->project->linkStory = 'linkStory';
$lang->resource->project->unlinkStory = 'unlinkStory';
$lang->resource->project->burn = 'burn';
$lang->resource->project->burnData = 'burnData';
$lang->resource->task->create = 'create';
$lang->resource->task->edit = 'edit';
@@ -116,11 +118,6 @@ $lang->resource->testcase->create = 'create';
$lang->resource->testcase->view = 'view';
$lang->resource->testcase->edit = 'edit';
$lang->resource->admin->index = 'index';
$lang->resource->admin->browseCompany = 'browseCompany';
$lang->resource->admin->browseUser = 'browseUser';
$lang->resource->admin->browseGroup = 'browseGroup';
$lang->resource->company->index = 'index';
$lang->resource->company->browse = 'browse';
$lang->resource->company->create = 'create';
@@ -132,6 +129,7 @@ $lang->resource->dept->updateOrder = 'updateOrder';
$lang->resource->dept->manageChild = 'manageChild';
$lang->resource->dept->delete = 'delete';
$lang->resource->group->browse = 'browse';
$lang->resource->group->create = 'create';
$lang->resource->group->edit = 'edit';
$lang->resource->group->delete = 'delete';
@@ -146,19 +144,18 @@ $lang->resource->user->todo = 'todo';
$lang->resource->user->task = 'task';
$lang->resource->user->bug = 'bug';
$lang->resource->user->project= 'project';
$lang->resource->user->profile= 'profile';
$lang->resource->my->index = 'index';
$lang->resource->my->editProfile = 'editProfile';
$lang->resource->my->todo = 'todo';
$lang->resource->my->task = 'task';
$lang->resource->my->bug = 'bug';
$lang->resource->my->project = 'project';
$lang->resource->todo->create = 'create';
$lang->resource->todo->edit = 'edit';
$lang->resource->todo->delete = 'delete';
$lang->resource->todo->mark = 'mark';
$lang->resource->todo->import2Today = 'import2Today';
$lang->resource->tree->browse = 'browse';
$lang->resource->tree->updateOrder = 'updateOrder';
$lang->resource->tree->manageChild = 'manageChild';
$lang->resource->tree->delete = 'delete';
$lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu';
$lang->resource->search->buildForm = 'buildForm';
$lang->resource->search->buildQuery = 'buildQuery';
$lang->resource->admin->index = 'index';
$lang->resource->admin->browseCompany = 'browseCompany';
$lang->resource->admin->browseUser = 'browseUser';
$lang->resource->admin->browseGroup = 'browseGroup';

12
trunk/module/group/view/create.html.php
View File

@@ -23,21 +23,19 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div id='doc3'>
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-3 a-left'>
<table align='center' class='table-4 a-left'>
<caption><?php echo $lang->group->create;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->group->name;?></th>
<td><input type='text' name='name' /></td>
<td><input type='text' name='name' class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->group->desc;?></th>
<td><textarea name='desc' rows='5' style='width:100%'></textarea></td>
<td><textarea name='desc' rows='5' class='area-1'></textarea></td>
</tr>
<tr>
<td colspan='2' class='a-center'><input type='submit' /></td>
</tr>
<tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
</div>

12
trunk/module/group/view/edit.html.php
View File

@@ -23,21 +23,19 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div id='doc3'>
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-3 a-left'>
<table align='center' class='table-4'>
<caption><?php echo $lang->group->edit;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->group->name;?></th>
<td><input type='text' name='name' value="<?php echo $group->name;?>" /></td>
<td><input type='text' name='name' value="<?php echo $group->name;?>" class='text-1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->group->desc;?></th>
<td><textarea name='desc' rows='5' style='width:100%'><?php echo $group->desc;?></textarea></td>
<td><textarea name='desc' rows='5' class='area-1'><?php echo $group->desc;?></textarea></td>
</tr>
<tr>
<td colspan='2' class='a-center'><input type='submit' /></td>
</tr>
<tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
</div>

15
trunk/module/group/view/managemember.html.php
View File

@@ -23,19 +23,12 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div id='doc3'>
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-5 a-left'>
<table align='center' class='table-1 a-left'>
<caption><?php echo $group->name . $lang->colon . $lang->group->manageMember;?></caption>
<tr>
<td>
<?php
echo html::checkbox('members', $allUsers, $groupUsers);
?>
</td>
</tr>
<tr>
<td colspan='1' class='a-center'><input type='submit' name='submit' /></td>
<tr><td><?php echo html::checkbox('members', $allUsers, $groupUsers);?></td></tr>
<tr><td class='a-center'><?php echo html::submitButton();?></td></tr>
</tr>
</table>
</form>

9
trunk/module/group/view/managepriv.html.php
View File

@@ -23,11 +23,10 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div id='doc3'>
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-1 a-left'>
<caption><?php echo $group->name . $lang->colon . $lang->group->managePriv;?></caption>
<tr class='rowhead'>
<tr class='colhead'>
<th><?php echo $lang->group->module;?></th>
<th><?php echo $lang->group->method;?></th>
</tr>
@@ -41,9 +40,7 @@
</td>
</tr>
<?php endforeach;?>
<tr>
<td colspan='3' class='a-center'><input type='submit' name='submit' /></td>
</tr>
<tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
</div>

2
trunk/module/index/view/index.html.php
View File

@@ -22,7 +22,7 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div class="yui-d0 yui-t7">
<div class="yui-d0">
<?php foreach($projectGroups as $projects):?>
<div class="yui-gb">
<?php foreach($projects as $key => $project):?>

2
trunk/module/project/view/project.html.php
View File

@@ -1,4 +1,3 @@
<div class='bg-gray mb-10px padding-10px'>
<?php
$products = join(', ', $products);
printf($lang->project->oneLineStats,
@@ -11,4 +10,3 @@ printf($lang->project->oneLineStats,
$project->totalConsumed,
$project->totalLeft);
?>
</div>

4
trunk/module/project/view/task.html.php
View File

@@ -25,11 +25,13 @@
<?php include '../../common/header.html.php';?>
<div class="yui-d0">
<div id='featurebar'>
<div class='f-left'>
<?php include './project.html.php';?>
</div>
<div class='f-right'>
<?php if(common::hasPriv('task', 'create')) echo html::a($this->createLink('task', 'create', "project=$project->id"), $lang->task->create);?>
</div>
</div>
<?php include './project.html.php';?>
<table class='table-1 fixed'>
<?php $vars = "projectID=$project->id&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
<thead>

17
trunk/module/project/view/team.html.php
View File

@@ -24,22 +24,10 @@
?>
<?php include '../../common/header.html.php';?>
<?php include '../../common/colorbox.html.php';?>
<div class="yui-d0">
<div id='featurebar'>
<div class='f-left'>
</div>
<div class='f-right'>
<?php common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers);?>
</div>
</div>
</div>
<div class='yui-d0'>
<table align='center' class='table-1'>
<caption>
<?php echo $lang->project->team . $lang->colon . $project->team; ?>
</caption>
<table align='center' class='table-4'>
<thead>
<tr>
<tr class='colhead'>
<th><?php echo $lang->team->account;?></th>
<th><?php echo $lang->team->role;?></th>
<th><?php echo $lang->team->joinDate;?></th>
@@ -62,6 +50,7 @@
<?php if(common::hasPriv('project', 'unlinkmember')) echo "<td>" . html::a($this->createLink('project', 'unlinkmember', "projectID=$project->id&account=$member->account"), $lang->project->unlinkMember, 'hiddenwin') . '</td>';?>
</tr>
<?php endforeach;?>
<tr><td colspan='5' class='a-right'><?php common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers);?></td></tr>
</tbody>
</table>
<div class='a-right'>

2
trunk/module/testcase/view/edit.html.php
View File

@@ -60,7 +60,7 @@ function loadStory(productID)
</div>
</div>
<div class='yui-doc3 yui-t7'>
<div class='yui-d0 yui-t7'>
<div class='yui-g'>
<div class='yui-u first'>