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

* task#982, todo module.

Browse Source
This commit is contained in:
wangchunsheng
2012-12-11 05:51:16 +00:00
parent 489eeffde8
commit ca6cb09270
8 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/my/view/todo.html.php
View File

@@ -76,7 +76,7 @@
<?php echo $todo->id; ?>
</td>
<td><?php echo $todo->date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?></td>
<td><?php echo $lang->todo->typeList->{$todo->type};?></td>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
<td><span class='<?php echo 'pri' . $todo->pri;?>'><?php echo $todo->pri?></span></td>
<td class='a-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my"), $todo->name);?></td>
<td><?php echo $todo->begin;?></td>

7
module/todo/config.php
View File

@@ -1,6 +1,11 @@
<?php
$config->todo = new stdclass();
$config->todo->batchCreate = 8;
$config->todo->create = new stdclass();
$config->todo->edit = new stdclass();
$config->todo->dates = new stdclass();
$config->todo->times = new stdclass();
$config->todo->create->requiredFields = 'name';
$config->todo->edit->requiredFields = 'name';
$config->todo->dates->end = 15;
@@ -8,7 +13,9 @@ $config->todo->times->begin = 6;
$config->todo->times->end = 23;
$config->todo->times->delta = 10;
$config->todo->editor = new stdclass();
$config->todo->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
$config->todo->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools');
$config->todo->list = new stdclass();
$config->todo->list->exportFields = 'id, account, date, begin, end, type, idvalue, pri, name, desc, status, private';

8
module/todo/lang/en.php
View File

@@ -61,9 +61,9 @@ $lang->todo->priList[1] = '1';
$lang->todo->priList[2] = '2';
$lang->todo->priList[4] = '4';
$lang->todo->typeList->custom = 'Custom';
$lang->todo->typeList->bug = 'Bug';
$lang->todo->typeList->task = 'Task';
$lang->todo->typeList['custom'] = 'Custom';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = 'Task';
$lang->todo->confirmDelete = "Are you sure to delete this todo?";
$lang->todo->successMarked = "Successfully changed status";;
@@ -81,4 +81,6 @@ $lang->todo->lastmonthTodos = 'Last Month';
$lang->todo->thisseasonTodos = 'This Season';
$lang->todo->thisyearTodos = 'This Year';
$lang->todo->thismonthTodos = 'This Month';
$lang->todo->action = new stdclass();
$lang->todo->action->marked = array('main' => '$date, Change status to <stong>$extra</strong> by <strong>$actor</strong>。', 'extra' => $lang->todo->statusList);

8
module/todo/lang/zh-cn.php
View File

@@ -61,9 +61,9 @@ $lang->todo->priList[1] = '最高';
$lang->todo->priList[2] = '较高';
$lang->todo->priList[4] = '最低';
$lang->todo->typeList->custom = '自定义';
$lang->todo->typeList->bug = 'Bug';
$lang->todo->typeList->task = '项目任务';
$lang->todo->typeList['custom'] = '自定义';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = '项目任务';
$lang->todo->confirmDelete = "您确定要删除这个todo吗？";
$lang->todo->successMarked = "成功切换状态！";
@@ -81,4 +81,6 @@ $lang->todo->lastmonthTodos = '上月';
$lang->todo->thisseasonTodos = '本季';
$lang->todo->thisyearTodos = '本年';
$lang->todo->thismonthTodos = '本月';
$lang->todo->action = new stdclass();
$lang->todo->action->marked = array('main' => '$date, 由 <strong>$actor</strong> 标记为<strong>$extra</strong>。', 'extra' => $lang->todo->statusList);

2
module/todo/view/edit.html.php
View File

@@ -23,7 +23,7 @@
</tr>
<tr>
<th class='rowhead'><?php echo $lang->todo->type;?></th>
<td><input type='hidden' name='type' value='<?php echo $todo->type;?>' /><?php echo $lang->todo->typeList->{$todo->type};?></td>
<td><input type='hidden' name='type' value='<?php echo $todo->type;?>' /><?php echo $lang->todo->typeList[$todo->type];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->todo->pri;?></th>

2
module/todo/view/view.html.php
View File

@@ -24,7 +24,7 @@
</tr>
<tr>
<th class='rowhead'><?php echo $lang->todo->type;?></th>
<td><?php echo $lang->todo->typeList->{$todo->type};?></td>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->todo->pri;?></th>

4
module/user/config.php
View File

@@ -1,4 +1,8 @@
<?php
$config->user = new stdclass();
$config->user->create = new stdclass();
$config->user->edit = new stdclass();
$config->user->create->requiredFields = 'account,realname,password,password1,password2';
$config->user->edit->requiredFields = 'account,realname';
$config->user->failTimes = 6;

2
module/user/view/todo.html.php
View File

@@ -53,7 +53,7 @@
<tr class='a-center'>
<td><?php echo $todo->id;?></td>
<td><?php echo $todo->date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?></td>
<td><?php echo $lang->todo->typeList->{$todo->type};?></td>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
<td><span class='<?php echo 'pri' . $todo->pri;?>'><?php echo $todo->pri?></span></td>
<td class='a-left'><?php if(!common::printLink('todo', 'view', "todo=$todo->id", $todo->name)) echo $todo->name;?></td>
<td><?php echo $todo->begin;?></td>