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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
liugang
2018-05-07 11:55:18 +08:00
parent 70dcc23aca 5bf160432b
commit 414282d005
5 changed files with 91 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/view/featurebar.html.php
+13 -11
View File
@@ -1,44 +1,46 @@
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
<div id='featurebar'>
<ul class='nav'>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php
if(!isset($type)) $type = 'today';
if(!isset($period)) $period = 'today';
$date = isset($date) ? $date : helper::today();
echo "<li class='w-150px'>" . $userList . '</li>';
if($config->global->flow == 'full')
{
echo "<li id='todoTab'>"; common::printLink('user', 'todo', "account=$account", $lang->user->todo); echo '</li>';
$label = "<span class='text'>{$lang->user->todo}</span>";
echo html::a($this->createLink('user', 'todo', "account=$account"), $label);
}
if($config->global->flow != 'onlyTask' and $config->global->flow != 'onlyTest')
{
echo "<li id='storyTab'>"; common::printLink('user', 'story', "account=$account", $lang->user->story); echo '</li>';
echo html::a($this->createLink('user', 'story', "account=$account"), $lang->user->story);
}
if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
{
echo "<li id='taskTab'>"; common::printLink('user', 'task', "account=$account", $lang->user->task); echo '</li>';
echo html::a($this->createLink('user', 'task', "account=$account"), $lang->user->task);
}
if($config->global->flow == 'full' or $config->global->flow == 'onlyTest')
{
echo "<li id='bugTab'>" ; common::printLink('user', 'bug', "account=$account", $lang->user->bug); echo '</li>';
echo "<li id='testTab'>"; common::printLink('user', 'testtask', "account=$account", $lang->user->test); echo '</li>';
echo html::a($this->createLink('user', 'bug', "account=$account"), $lang->user->bug);
echo html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->test);
}
echo "<li id='dynamicTab'>"; common::printLink('user', 'dynamic', "type=today&account=$account", $lang->user->dynamic); echo '</li>' ;
echo html::a($this->createLink('user', 'dynamic', "type=today&account=$account"), $lang->user->dynamic);
if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
{
echo "<li id='projectTab'>"; common::printLink('user', 'project', "account=$account", $lang->user->project); echo '</li>';
echo html::a($this->createLink('user', 'project', "account=$account"), $lang->user->project);
}
echo "<li id='profileTab'>"; common::printLink('user', 'profile', "account=$account", $lang->user->profile); echo '</li>';
echo html::a($this->createLink('user', 'profile', "account=$account"), $lang->user->profile);
$activedSpan = $this->app->getMethodName() . 'Tab';
echo "<script>$('#$activedSpan').addClass('active')</script>";
?>
</ul>
</div>
</div>
<script>
var type = '<?php echo $type;?>';
module/user/view/story.html.php
+36 -32
View File
@@ -23,37 +23,41 @@
?>
</ul>
</div>
<table class='table tablesorter table-fixed'>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th class='w-200px'> <?php echo $lang->story->product;?></th>
<th> <?php echo $lang->story->title;?></th>
<th class='w-150px'> <?php echo $lang->story->plan;?></th>
<th class='w-user'> <?php echo $lang->openedByAB;?></th>
<th class='w-hour'> <?php echo $lang->story->estimateAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='w-100px'> <?php echo $lang->story->stageAB;?></th>
</tr>
</thead>
<tbody>
<?php foreach($stories as $key => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
<tr class='text-center'>
<td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
<td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><?php echo $story->productTitle;?></td>
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
<td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $story->estimate;?></td>
<td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>
<?php endforeach;?>
</tbody>
<tfoot><tr><td colspan='9'><?php echo $pager->show();?></td></tr></tfoot>
</table>
<div id='mainContent'>
<table class='table has-sort-head table-fixed'>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th class='w-200px'> <?php echo $lang->story->product;?></th>
<th> <?php echo $lang->story->title;?></th>
<th class='w-150px'> <?php echo $lang->story->plan;?></th>
<th class='w-user'> <?php echo $lang->openedByAB;?></th>
<th class='w-hour'> <?php echo $lang->story->estimateAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='w-100px'> <?php echo $lang->story->stageAB;?></th>
</tr>
</thead>
<tbody>
<?php foreach($stories as $key => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "id=$story->id");?>
<tr class='text-center'>
<td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
<td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td><?php echo $story->productTitle;?></td>
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
<td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $story->estimate;?></td>
<td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>
<?php endforeach;?>
</tbody>
</table>
<?php if($stories):?>
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</div>
<script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
<?php include '../../common/view/footer.html.php';?>
module/user/view/todo.html.php
+38 -32
View File
@@ -26,38 +26,44 @@
?>
</ul>
</div>
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
<table class='table tablesorter'>
<?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-date'> <?php common::printOrderLink('date', $orderBy, $vars, $lang->todo->date);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->todo->type);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->todo->name);?></th>
<th class='w-hour'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->todo->beginAB);?></th>
<th class='w-hour'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->todo->endAB);?></th>
<th class='w-70px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
</tr>
</thead>
<tbody>
<?php foreach($todos as $todo):?>
<tr class='text-center'>
<td><?php echo $todo->id;?></td>
<td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
<td><span class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?></span></td>
<td class='text-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id", '', true), $todo->name, '', "class='iframe'");?></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>
<tfoot><tr><td colspan='8'><?php $pager->show();?></td></tr></tfoot>
</table>
</form>
<div id='mainContent'>
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform' class='main-table table-task'>
<table class='table has-sort-head table-fixed'>
<?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-date'> <?php common::printOrderLink('date', $orderBy, $vars, $lang->todo->date);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->todo->type);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->todo->name);?></th>
<th class='w-hour'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->todo->beginAB);?></th>
<th class='w-hour'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->todo->endAB);?></th>
<th class='w-70px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
</tr>
</thead>
<tbody>
<?php foreach($todos as $todo):?>
<tr class='text-center'>
<td><?php echo $todo->id;?></td>
<td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
<td><span class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?></span></td>
<td class='text-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id", '', true), $todo->name, '', "class='iframe'");?></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>
<?php if($todos):?>
<div class="table-footer"><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
</form>
</div>
<script type='text/javascript'>
$(function(){$('#<?php echo $type?>').addClass('active');})
</script>
www/js/zui/min.js
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long