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

* finish task #2088

Browse Source
This commit is contained in:
ChuJilu
2014-11-04 16:39:26 +08:00
parent b5fa7815ea
commit f4a092f574
3 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/lang/en.php
+1
View File
@@ -25,6 +25,7 @@ $lang->todo->browse = "Browse";
$lang->todo->import2Today = "Import to today";
$lang->todo->import = "Import to";
$lang->todo->changeStatus = "Change";
$lang->todo->legendBasic = "Basic Info";
$lang->todo->id = 'ID';
$lang->todo->account = 'Owner';
module/todo/lang/zh-cn.php
+1
View File
@@ -25,6 +25,7 @@ $lang->todo->browse = "浏览待办";
$lang->todo->import2Today = "导入到今天";
$lang->todo->import = "导入";
$lang->todo->changeStatus = "更改";
$lang->todo->legendBasic = "基本信息";
$lang->todo->id = '编号';
$lang->todo->account = '所有者';
module/todo/view/view.html.php
+71 -62
View File
@@ -19,72 +19,81 @@
<strong><?php echo $todo->name;?></strong>
</div>
</div>
<div class='main' style='margin-top: 10px'>
<div class='panel mg-0'>
<div class='panel-heading'>
<strong><?php
if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), $todo->name);
if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), $todo->name);
if($todo->type == 'custom') echo $todo->name;
?></strong>
<div class='panel-actions pull-right' title='<?php echo $lang->todo->beginAndEnd;?>' style='line-height: 35px'>
<?php echo $lang->todo->beginAndEnd;?>:
<?php
if(isset($times[$todo->begin])) echo $times[$todo->begin];
if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];
?>
</div>
<div title='<?php echo $lang->todo->status;?>' class='panel-actions todo-<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></div>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend>
<?php
echo $lang->todo->desc;
if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), ' BUG#' . $todo->idvalue);
if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), ' TASK#' . $todo->idvalue);
?>
</legend>
<div><?php echo $todo->desc;?></div>
</fieldset>
<?php $actionTheme = 'fieldset'; include '../../common/view/action.html.php';?>
</div>
<div class='panel-body'>
<div class='article-content'><?php echo $todo->desc;?></div>
<hr class='small'>
<table class='table table-data table-borderless'>
<tr>
<th class='w-80px'><?php echo $lang->todo->account;?></th>
<td><?php echo $todo->account;?></td>
<th class='w-80px'><?php echo $lang->todo->date;?></th>
<td><?php echo $todo->date == '20300101' ? $lang->todo->periods['future'] : date(DT_DATE1, strtotime($todo->date));?></td>
</tr>
<tr>
<th><?php echo $lang->todo->type;?></th>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
<th><?php echo $lang->todo->pri;?></th>
<td><?php echo $lang->todo->priList[$todo->pri];?></td>
</tr>
</table>
</div>
<div class='panel-footer text-center'>
<?php
if($this->session->todoList)
{
$browseLink = $this->session->todoList;
}
elseif($todo->account == $app->user->account)
{
$browseLink = $this->createLink('my', 'todo');
}
else
{
$browseLink = $this->createLink('user', 'todo', "account=$todo->account");
}
common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'button', '', 'hiddenwin', 'showinonlybody btn-success');
if($todo->account == $app->user->account)
{
common::printIcon('todo', 'edit', "todoID=$todo->id");
common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin');
}
common::printRPN($browseLink);
?>
</div>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->todo->legendBasic;?></legend>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th><?php echo $lang->todo->pri;?></th>
<td><?php echo $lang->todo->priList[$todo->pri];?></td>
</tr>
<tr>
<th><?php echo $lang->todo->status;?></th>
<td><?php echo $lang->todo->statusList[$todo->status];?></td>
</tr>
<tr>
<th><?php echo $lang->todo->type;?></th>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->todo->account;?></th>
<td><?php echo $todo->account;?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->todo->date;?></th>
<td><?php echo $todo->date == '20300101' ? $lang->todo->periods['future'] : date(DT_DATE1, strtotime($todo->date));?></td>
</tr>
<tr>
<th><?php echo $lang->todo->beginAndEnd;?></th>
<td><?php if(isset($times[$todo->begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?></td>
</tr>
</table>
</div>
</div>
</div>
<div class='main'>
<?php $actionTheme = 'table'; include '../../common/view/action.html.php';?>
<?php else:?>
<?php echo $lang->todo->thisIsPrivate;?>
<?php endif;?>
<div class='panel-footer text-center'>
<?php
if($this->session->todoList)
{
$browseLink = $this->session->todoList;
}
elseif($todo->account == $app->user->account)
{
$browseLink = $this->createLink('my', 'todo');
}
else
{
$browseLink = $this->createLink('user', 'todo', "account=$todo->account");
}
common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'button', '', 'hiddenwin', 'showinonlybody btn-success');
if($todo->account == $app->user->account)
{
common::printIcon('todo', 'edit', "todoID=$todo->id");
common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin');
}
common::printRPN($browseLink);
?>
</div>
</div>
<?php else:?>
<?php echo $lang->todo->thisIsPrivate;?>
<?php endif;?>
<?php include '../../common/view/footer.html.php';?>