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:01:18 +00:00
parent 956c6ea5d0
commit fb5ec89ec9
12 changed files with 298 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/control.php
+35 -4
View File
@@ -39,15 +39,18 @@ class user extends control
}
/* 用户的todo列表。*/
public function todo($account, $date = 'today', $status = 'all')
public function todo($account, $type = 'today', $status = 'all')
{
/* 加载todo model。*/
$this->loadModel('todo');
$this->lang->set('menugroup.user', 'company');
$user = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
$todos = $this->todo->getList($date, $account, $status);
if((int)$date == 0) $date = $this->todo->today();
/* 设置菜单。*/
$this->user->setMenu($this->user->getPairs($this->app->company->id, 'noempty|noclosed'), $account);
$todos = $this->todo->getList($type, $account, $status);
$date = (int)$type == 0 ? $this->todo->today() : $type;
/* 设定header和position信息。*/
$header['title'] = $this->lang->company->orgView . $this->lang->colon . $this->lang->user->todo;
@@ -61,6 +64,8 @@ class user extends control
$this->assign('date', $date);
$this->assign('todos', $todos);
$this->assign('user', $user);
$this->assign('account', $account);
$this->assign('type', $type);
$this->display();
}
@@ -72,6 +77,9 @@ class user extends control
$this->loadModel('task');
$this->lang->set('menugroup.user', 'company');
$user = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
/* 设置菜单。*/
$this->user->setMenu($this->user->getPairs($this->app->company->id, 'noempty|noclosed'), $account);
/* 设定header和position信息。*/
$header['title'] = $this->lang->user->common . $this->lang->colon . $this->lang->user->task;
@@ -95,6 +103,9 @@ class user extends control
$this->lang->set('menugroup.user', 'company');
$user = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
/* 设置菜单。*/
$this->user->setMenu($this->user->getPairs($this->app->company->id, 'noempty|noclosed'), $account);
/* 设定header和position信息。*/
$header['title'] = $this->lang->user->common . $this->lang->colon . $this->lang->user->bug;
$position[] = $this->lang->user->bug;
@@ -117,6 +128,9 @@ class user extends control
$this->lang->set('menugroup.user', 'company');
$user = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
/* 设置菜单。*/
$this->user->setMenu($this->user->getPairs($this->app->company->id, 'noempty|noclosed'), $account);
/* 设定header和position信息。*/
$header['title'] = $this->lang->user->common . $this->lang->colon . $this->lang->user->project;
$position[] = $this->lang->user->project;
@@ -131,6 +145,21 @@ class user extends control
$this->display();
}
/* 查看个人档案。*/
public function profile($account)
{
$header['title'] = $this->lang->user->common . $this->lang->colon . $this->lang->user->profile;
$position[] = $this->lang->user->profile;
/* 设置菜单。*/
$this->user->setMenu($this->user->getPairs($this->app->company->id, 'noempty|noclosed'), $account);
$this->assign('header', $header);
$this->assign('position', $position);
$this->assign('user', $this->user->getById($account));
$this->display();
}
/* 设置referer信息。*/
private function setReferer($referer = 0)
@@ -146,7 +175,7 @@ class user extends control
}
/* 创建一个用户。*/
public function create($companyID = 0, $from = 'admin')
public function create($companyID = 0, $deptID = 0, $from = 'admin')
{
if($companyID == 0) $companyID = $this->app->company->id;
$this->lang->set('menugroup.user', $from);
@@ -171,6 +200,7 @@ class user extends control
$this->assign('header', $header);
$this->assign('position', $position);
$this->assign('depts', $this->dept->getOptionMenu());
$this->assign('deptID', $deptID);
$this->display();
}
@@ -179,6 +209,7 @@ class user extends control
public function edit($userID, $from = 'admin')
{
$this->lang->set('menugroup.user', $from);
$this->lang->user->menu = $this->lang->company->menu;
if(!empty($_POST))
{
$this->user->update($userID);
module/user/lang/zh-cn.php
+1
View File
@@ -39,6 +39,7 @@ $lang->user->confirmDelete = "您确认删除该用户吗？";
$lang->user->relogin = "重新登陆";
$lang->user->asGuest = "游客访问";
$lang->user->goback = "返回前一页";
$lang->user->allUsers = '全部用户';
$lang->user->profile = '用户档案';
$lang->user->project = '用户项目';
module/user/model.php
+25 -5
View File
@@ -25,6 +25,18 @@
<?php
class userModel extends model
{
/* 设置菜单。*/
public function setMenu($users, $account)
{
$selectHtml = html::select('account', $users, $account, "onchange=switchAccount(this.value)");
common::setMenuVars($this->lang->user->menu, 'account', $selectHtml);
common::setMenuVars($this->lang->user->menu, 'todo', $account);
common::setMenuVars($this->lang->user->menu, 'task', $account);
common::setMenuVars($this->lang->user->menu, 'bug', $account);
common::setMenuVars($this->lang->user->menu, 'project', $account);
common::setMenuVars($this->lang->user->menu, 'profile', $account);
}
/* 获得某一个公司的用户列表。*/
public function getList($companyID)
{
@@ -69,16 +81,23 @@ class userModel extends model
/* 新增一个用户。*/
function create($companyID)
{
/* 先检查密码是否符合规则。*/
if(!$this->checkPassword()) return;
$user = fixer::input('post')
->add('company', (int)$companyID)
->setDefault('join', '0000-00-00')
->setForce('password', md5($this->post->password))
->setIF($this->post->password1 != false, 'password', md5($this->post->password1))
->setIF($this->post->password1 == false, 'password', '')
->remove('password1, password2')
->get();
$this->dao->insert(TABLE_USER)->data($user)
->autoCheck()
->batchCheck('account, realname, password', 'notempty')
->check('account', 'unique')
->check('account', 'account')
->checkIF($this->post->email != false, 'email', 'email')
->exec();
}
@@ -92,15 +111,16 @@ class userModel extends model
$userID = (int)$userID;
$user = fixer::input('post')
->setDefault('join', '0000-00-00')
->setIF($this->post->password1 != '', 'password', md5($this->post->password1))
->setIF($this->post->password1 != false, 'password', md5($this->post->password1))
->remove('password1, password2')
->get();
$this->dao->update(TABLE_USER)->data($user)
->autoCheck()
->batchCheck('account, realname, password', 'notempty')
->batchCheck('account, realname', 'notempty')
->check('account', 'unique', "id != '$userID'")
->check('account', 'account')
->checkIF($this->post->email != false, 'email', 'email')
->where('id')->eq((int)$userID)
->exec();
}
@@ -110,8 +130,8 @@ class userModel extends model
{
if($this->post->password1 != false)
{
if($this->post->password1 != $this->post->password2) dao::$errors['password'] = $this->lang->error->passwordsame;
if(!validater::checkReg($this->post->password1, '|(.){6,}|')) dao::$errors['password'] = $this->lang->error->passwordrule;
if($this->post->password1 != $this->post->password2) dao::$errors['password'][] = $this->lang->error->passwordsame;
if(!validater::checkReg($this->post->password1, '|(.){6,}|')) dao::$errors['password'][] = $this->lang->error->passwordrule;
}
return !dao::isError();
}
module/user/view/bug.html.php
+31 -28
View File
@@ -22,31 +22,34 @@
* @link http://www.zentao.cn
*/
?>
<?php include './header.html.php';?>
<table class='table-1 tablesorter'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->bug->id;?></th>
<th><?php echo $lang->bug->severity;?></th>
<th><?php echo $lang->bug->title;?></th>
<th><?php echo $lang->bug->openedBy;?></th>
<th><?php echo $lang->bug->assignedTo;?></th>
<th><?php echo $lang->bug->resolvedBy;?></th>
<th><?php echo $lang->bug->resolution;?></th>
</tr>
</thead>
<tbody>
<?php foreach($bugs as $bug):?>
<tr class='a-center'>
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
<td><?php echo $bug->severity?></td>
<td width='50%' class='a-left'><?php echo $bug->title;?></td>
<td><?php echo $bug->openedBy;?></td>
<td><?php echo $bug->assignedTo;?></td>
<td><?php echo $bug->resolvedBy;?></td>
<td><?php echo $bug->resolution;?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php include './footer.html.php';?>
<?php include '../../common/header.html.php';?>
<?php include '../../common/tablesorter.html.php';?>
<div class='yui-d0'>
<table class='table-1 tablesorter'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->bug->id;?></th>
<th><?php echo $lang->bug->severity;?></th>
<th><?php echo $lang->bug->title;?></th>
<th><?php echo $lang->bug->openedBy;?></th>
<th><?php echo $lang->bug->assignedTo;?></th>
<th><?php echo $lang->bug->resolvedBy;?></th>
<th><?php echo $lang->bug->resolution;?></th>
</tr>
</thead>
<tbody>
<?php foreach($bugs as $bug):?>
<tr class='a-center'>
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
<td><?php echo $bug->severity?></td>
<td width='50%' class='a-left'><?php echo $bug->title;?></td>
<td><?php echo $bug->openedBy;?></td>
<td><?php echo $bug->assignedTo;?></td>
<td><?php echo $bug->resolvedBy;?></td>
<td><?php echo $bug->resolution;?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
<?php include '../../common/footer.html.php';?>
module/user/view/create.html.php
+9 -8
View File
@@ -23,15 +23,14 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div id='doc3'>
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-4 a-left'>
<table align='center' class='table-5'>
<caption><?php echo $lang->user->create;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->user->dept;?></th>
<td><?php echo html::select('dept', $depts);?>
<td><?php echo html::select('dept', $depts, $deptID);?>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->account;?></th>
<td><input type='text' name='account' /></td>
@@ -54,12 +53,14 @@
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password;?></th>
<td><input type='password' name='password' /></td>
<td><input type='password' name='password1' /></td>
</tr>
<tr>
<td colspan='2' class='a-center'>
<?php echo html::submitButton() . html::resetButton();?>
</td>
<th class='rowhead'><?php echo $lang->user->password2;?></th>
<td><input type='password' name='password2' /></td>
</tr>
<tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td>
</tr>
</table>
</form>
module/user/view/edit.html.php
+8 -4
View File
@@ -23,15 +23,14 @@
*/
?>
<?php include '../../common/header.html.php';?>
<div id='doc3'>
<div class='yui-d0'>
<form method='post' target='hiddenwin'>
<table align='center' class='table-4 a-left'>
<caption><?php echo $lang->user->create;?></caption>
<caption><?php echo $lang->user->edit;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->user->dept;?></th>
<td><?php echo html::select('dept', $depts, $user->dept);?>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->account;?></th>
<td><input type='text' name='account' value='<?php echo $user->account;?>' /></td>
@@ -54,8 +53,13 @@
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password;?></th>
<td><input type='password' name='password' /></td>
<td><input type='password' name='password1' /></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->password2;?></th>
<td><input type='password' name='password2' /></td>
</tr>
<tr>
<td colspan='2' class='a-center'>
<?php echo html::submitButton() . html::resetButton();?>
module/user/view/footer.html.php
-4
View File
@@ -1,4 +0,0 @@
</div>
</div>
</div>
<?php include '../../common/footer.html.php';?>
module/user/view/header.html.php
-103
View File
@@ -1,103 +0,0 @@
<?php
/**
* The header view file of dashboard module of ZenTaoMS.
*
* ZenTaoMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ZenTaoMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with ZenTaoMS. If not, see <http://www.gnu.org/licenses/>.
*
* @copyright Copyright: 2009 Chunsheng Wang
* @author Chunsheng Wang <wwccss@263.net>
* @package dashboard
* @version $Id$
* @link http://www.zentao.cn
*/
?>
<?php include '../../common/header.html.php';?>
<?php include '../../common/tablesorter.html.php';?>
<script language='Javascript'>
account='<?php echo $user->account;?>'
function changeDate(date)
{
link = createLink('user', 'todo', 'account=' + account + '&date=' + date);
location.href=link;
}
</script>
<div class="yui-d0 yui-t3">
<div class="yui-b">
<table class='table-1'>
<caption><?php echo $lang->user->profile;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->user->account;?></th>
<td><?php echo $user->account;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->realname;?></th>
<td><?php echo $user->realname;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->nickname;?></th>
<td><?php echo $user->nickname;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->join;?></th>
<td><?php echo $user->join;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->visits;?></th>
<td><?php echo $user->visits;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->ip;?></th>
<td><?php echo $user->ip;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->last;?></th>
<td><?php echo date('Y-m-d H:i:s', $user->last);?></td>
</tr>
</table>
<div class='a-right'>
<?php
if(common::hasPriv('user', 'edit')) echo html::a($this->createLink('user', 'edit', "userID=$user->id&from=company"), $lang->user->editProfile);
?>
</div>
</div>
<div class="yui-main">
<div class="yui-b">
<div id='tabbar' class='yui-d0' style='clear:right'>
<ul>
<?php
echo "<li><nobr>{$user->realname}</nobr></li>";
echo "<li id='todotab'><nobr>" . html::a($this->createLink('user', 'todo', "account=$user->account"), $lang->user->todo) . "</nobr></li>";
echo "<li id='tasktab'><nobr>" . html::a($this->createLink('user', 'task', "account=$user->account"), $lang->user->task) . "</nobr></li>";
echo "<li id='projecttab'><nobr>". html::a($this->createLink('user', 'project', "account=$user->account"), $lang->user->project) . "</nobr></li>";
echo "<li id='bugtab'><nobr>" . html::a($this->createLink('user', 'bug', "account=$user->account"), $lang->user->bug) . "</nobr></li>";
echo <<<EOT
<script language="Javascript">
$("#{$tabID}tab").addClass('active');
</script>
EOT;
?>
</ul>
</div>
<?php if($tabID == 'todo'):?>
<div id='subtab'>
<?php
echo html::a($this->createLink('user', 'todo', "account=$user->account&date=today"), $lang->todo->todayTodos);
echo html::a($this->createLink('user', 'todo', "account=$user->account&date=thisweek"), $lang->todo->thisWeekTodos);
echo html::a($this->createLink('user', 'todo', "account=$user->account&date=lastweek"), $lang->todo->lastWeekTodos);
echo html::a($this->createLink('user', 'todo', "account=$user->account&date=all"), $lang->todo->allDaysTodos);
echo html::a($this->createLink('user', 'todo', "account=$user->account&date=before&account={$user->account}&status=wait,doing"), $lang->todo->allUndone);
echo html::select('date', $dates, $date, 'onchange=changeDate(this.value)');
?>
</div>
<?php endif;?>
module/user/view/profile.html.php
+64
View File
@@ -0,0 +1,64 @@
<?php
/**
* The profile view file of user module of ZenTaoMS.
*
* ZenTaoMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* ZenTaoMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with ZenTaoMS. If not, see <http://www.gnu.org/licenses/>.
*
* @copyright Copyright: 2009 Chunsheng Wang
* @author Chunsheng Wang <wwccss@263.net>
* @package user
* @version $Id$
* @link http://www.zentao.cn
*/
?>
<?php include '../../common/header.html.php';?>
<?php include '../../common/tablesorter.html.php';?>
<div class='yui-d0'>
<table align='center' class='table-4'>
<caption><?php echo $lang->user->profile;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->user->account;?></th>
<td><?php echo $user->account;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->realname;?></th>
<td><?php echo $user->realname;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->nickname;?></th>
<td><?php echo $user->nickname;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->email;?></th>
<td><?php echo $user->email;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->join;?></th>
<td><?php echo $user->join;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->visits;?></th>
<td><?php echo $user->visits;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->ip;?></th>
<td><?php echo $user->ip;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->user->last;?></th>
<td><?php echo $user->last;?></td>
</tr>
</table>
</div>
<?php include '../../common/footer.html.php';?>
module/user/view/project.html.php
+33 -30
View File
@@ -22,33 +22,36 @@
* @link http://www.zentao.cn
*/
?>
<?php include './header.html.php';?>
<table class='table-1 tablesorter'>
<thead>
<tr class='rowhead'>
<th><?php echo $lang->project->name;?></th>
<th><?php echo $lang->project->code;?></th>
<th><?php echo $lang->project->begin;?></th>
<th><?php echo $lang->project->end;?></th>
<th><?php echo $lang->project->status;?></th>
<th><?php echo $lang->team->role;?></th>
<th><?php echo $lang->team->joinDate;?></th>
<th><?php echo $lang->team->workingHour;?></th>
</tr>
</thead>
<tbody>
<?php foreach($projects as $project):?>
<tr>
<td><?php echo html::a($this->createLink('project', 'browse', "projectID=$project->id"), $project->name);?></td>
<td><?php echo $project->code;?></td>
<td><?php echo $project->begin;?></td>
<td><?php echo $project->end;?></td>
<td><?php echo $project->status;?></td>
<td><?php echo $project->role;?></td>
<td><?php echo $project->joinDate;?></td>
<td><?php echo $project->workingHour;?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php include './footer.html.php';?>
<?php include '../../common/header.html.php';?>
<?php include '../../common/tablesorter.html.php';?>
<div class='yui-d0'>
<table class='table-1 tablesorter a-center'>
<thead>
<tr class='rowhead'>
<th><?php echo $lang->project->name;?></th>
<th><?php echo $lang->project->code;?></th>
<th><?php echo $lang->project->begin;?></th>
<th><?php echo $lang->project->end;?></th>
<th><?php echo $lang->project->status;?></th>
<th><?php echo $lang->team->role;?></th>
<th><?php echo $lang->team->joinDate;?></th>
<th><?php echo $lang->team->workingHour;?></th>
</tr>
</thead>
<tbody>
<?php foreach($projects as $project):?>
<tr>
<td><?php echo html::a($this->createLink('project', 'browse', "projectID=$project->id"), $project->name);?></td>
<td><?php echo $project->code;?></td>
<td><?php echo $project->begin;?></td>
<td><?php echo $project->end;?></td>
<td><?php echo $project->status;?></td>
<td><?php echo $project->role;?></td>
<td><?php echo $project->joinDate;?></td>
<td><?php echo $project->workingHour;?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
<?php include '../../common/footer.html.php';?>
module/user/view/task.html.php
+35 -30
View File
@@ -22,33 +22,38 @@
* @link http://www.zentao.cn
*/
?>
<?php include './header.html.php';?>
<table class='table-1 tablesorter'>
<thead>
<tr class='rowhead'>
<th><?php echo $lang->task->name;?></th>
<th><?php echo $lang->task->project;?></th>
<th><?php echo $lang->task->story;?></th>
<th><?php echo $lang->task->pri;?></th>
<th><?php echo $lang->task->estimate;?></th>
<th><?php echo $lang->task->consumed;?></th>
<th><?php echo $lang->task->status;?></th>
<th><?php echo $lang->action;?></th>
</tr>
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr>
<td><?php echo html::a($this->createLink('task', 'edit', "taskID=$task->id"), $task->name);?></td>
<td><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></th>
<td><?php echo $task->storyTitle;?></td>
<td><?php echo $task->pri;?></td>
<td><?php echo $task->estimate;?></td>
<td><?php echo $task->consumed;?></td>
<td><?php echo $lang->task->statusList->{$task->status};?></td>
<td><?php echo html::a($this->createLink('task', 'edit', "taskID=$task->id"), $lang->task->edit, '_blank');?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php include './footer.html.php';?>
<?php include '../../common/header.html.php';?>
<?php include '../../common/tablesorter.html.php';?>
<div class='yui-d0'>
<table class='table-1 tablesorter fixed' id='tasktable'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->task->id;?></th>
<th class='w-p30'><?php echo $lang->task->name;?></th>
<th class='w-p10'><?php echo $lang->task->project;?></th>
<th><?php echo $lang->task->pri;?></th>
<th><?php echo $lang->task->estimate;?></th>
<th><?php echo $lang->task->consumed;?></th>
<th class='w-p30'><?php echo $lang->task->story;?></th>
<th><?php echo $lang->task->status;?></th>
<th><?php echo $lang->action;?></th>
</tr>
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr class='a-center'>
<td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
<td class='a-left nobr'><?php echo $task->name;?></td>
<td class='nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></th>
<td><?php echo $task->pri;?></td>
<td><?php echo $task->estimate;?></td>
<td><?php echo $task->consumed;?></td>
<td class='a-left nobr'><?php if($task->storyID) echo html::a($this->createLink('story', 'view', "storyID=$task->storyID"), $task->storyTitle);?></td>
<td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList->{$task->status};?></td>
<td><?php echo html::a($this->createLink('task', 'edit', "taskID=$task->id"), $lang->task->edit, '_blank');?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
<?php include '../../common/footer.html.php';?>
module/user/view/todo.html.php
+57 -39
View File
@@ -22,42 +22,60 @@
* @link http://www.zentao.cn
*/
?>
<?php include './header.html.php';?>
<table class='table-1 tablesorter'>
<thead>
<tr>
<th><?php echo $lang->todo->id;?></th>
<th><?php echo $lang->todo->date;?></th>
<th><?php echo $lang->todo->type;?></th>
<th><?php echo $lang->todo->pri;?></th>
<th><?php echo $lang->todo->name;?></th>
<th><?php echo $lang->todo->begin;?></th>
<th><?php echo $lang->todo->end;?></th>
<!--<th><?php echo $lang->todo->desc;?></th>-->
<th><?php echo $lang->todo->status;?></th>
</tr>
</thead>
<tbody>
<?php foreach($todos as $todo):?>
<tr class='a-center'>
<td><?php echo $todo->id;?></td>
<td><?php echo $todo->date;?></td>
<td><?php echo $lang->todo->typeList->{$todo->type};?></td>
<td><?php echo $todo->pri;?></td>
<td class='a-left'>
<?php
$link = '';
if($todo->type == 'bug' and common::hasPriv('bug', 'view')) $link = $this->createLink('bug', 'view', "id={$todo->idvalue}");
if($todo->type == 'task' and common::hasPriv('task', 'edit')) $link = $this->createLink('task', 'edit', "id={$todo->idvalue}");
$link != '' ? print(html::a($link, $todo->name, '_blank')) : print($todo->name);
?>
</td>
<td><?php echo $todo->begin;?></td>
<td><?php echo $todo->end;?></td>
<!--<td><?php echo $todo->desc;?></td>-->
<td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList->{$todo->status};?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php include './footer.html.php';?>
<?php include '../../common/header.html.php';?>
<?php include '../../common/tablesorter.html.php';?>
<script language='Javascript'>
account='<?php echo $account;?>'
function changeDate(date)
{
link = createLink('user', 'todo', 'account=' + account + '&date=' + date);
location.href=link;
}
</script>
<div class='yui-d0'>
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
<div id='featurebar'>
<div class='f-left'>
<?php
echo '<span id="today">' . html::a($this->createLink('user', 'todo', "account=$account&date=today"), $lang->todo->todayTodos) . '</span>';
echo '<span id="thisweek">' . html::a($this->createLink('user', 'todo', "account=$account&date=thisweek"), $lang->todo->thisWeekTodos) . '</span>';
echo '<span id="lastweek">' . html::a($this->createLink('user', 'todo', "account=$account&date=lastweek"), $lang->todo->lastWeekTodos) . '</span>';
echo '<span id="all">' . html::a($this->createLink('user', 'todo', "account=$account&date=all"), $lang->todo->allDaysTodos) . '</span>';
echo '<span id="before">' . html::a($this->createLink('user', 'todo', "account=$account&date=before&account={$app->user->account}&status=wait,doing"), $lang->todo->allUndone) . '</span>';
echo "<span id='$date'>" . html::select('date', $dates, $date, 'onchange=changeDate(this.value)') . '</span>';
?>
<script>$('#<?php echo $type;?>').addClass('active')</script>
</div>
</div>
<table class='table-1 tablesorter'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->todo->id;?></th>
<th><?php echo $lang->todo->date;?></th>
<th><?php echo $lang->todo->type;?></th>
<th><?php echo $lang->todo->pri;?></th>
<th><?php echo $lang->todo->name;?></th>
<th><?php echo $lang->todo->begin;?></th>
<th><?php echo $lang->todo->end;?></th>
<th><?php echo $lang->todo->status;?></th>
</tr>
</thead>
<tbody>
<?php foreach($todos as $todo):?>
<tr class='a-center'>
<td><?php echo $todo->id;?></td>
<td><?php echo $todo->date;?></td>
<td><?php echo $lang->todo->typeList->{$todo->type};?></td>
<td><?php echo $todo->pri;?></td>
<td class='a-left'><?php echo $todo->name;?></td>
<td><?php echo $todo->begin;?></td>
<td><?php echo $todo->end;?></td>
<td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList->{$todo->status};?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</form>
</div>
<?php include '../../common/footer.html.php';?>