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

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

Browse Source
This commit is contained in:
wangyidong
2014-10-27 08:16:39 +00:00
parent fba4010d06 3dd15f9ef8
commit be94a5a635
9 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/js/task.js
+8
View File
@@ -6,3 +6,11 @@ $(function()
$('#module' + moduleID).addClass('active');
$('#product' + productID).addClass('active');
$('table.datatable').datatable({
customizable: false,
checkable: false,
sortable: false,
fixedLeftWidth: '450px',
fixedRightWidth: '150px'
});
module/project/view/task.html.php
+15 -15
View File
@@ -39,32 +39,32 @@
</div>
<div class='main'>
<form method='post' id='projectTaskForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='taskList'>
<table class='table datatable' id='taskList'>
<?php $vars = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
<thead>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-p30'> <?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-70px'> <?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
<th data-width='80px'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th data-width='80px'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th data-width='auto'> <?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
<th data-width='80px' data-flex='true'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th data-width='80px' data-flex='true'> <?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
<?php if($this->cookie->windowWidth > $this->config->wideSize):?>
<th class='w-id'> <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->task->openedDateAB);?></th>
<th data-width='80px' data-flex='true'> <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->task->openedDateAB);?></th>
<?php endif;?>
<th class='w-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedToAB);?></th>
<th class='w-user'> <?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedByAB);?></th>
<th data-width='80px' data-flex='true'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedToAB);?></th>
<th data-width='80px' data-flex='true'> <?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedByAB);?></th>
<?php if($this->cookie->windowWidth > $this->config->wideSize):?>
<th class='w-50px'> <?php common::printOrderLink('finishedDate', $orderBy, $vars, $lang->task->finishedDateAB);?></th>
<th data-width='80px' data-flex='true'> <?php common::printOrderLink('finishedDate', $orderBy, $vars, $lang->task->finishedDateAB);?></th>
<?php endif;?>
<th class='w-35px'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
<th class='w-50px'> <?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th class='w-40px nobr'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<?php if($project->type == 'sprint') print '<th>' and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '</th>';?>
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
<th data-width='80px' data-flex='true'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
<th data-width='80px' data-flex='true'> <?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th data-width='80px' data-flex='true'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<?php if($project->type == 'sprint') print '<th data-width=\'80px\' data-flex=\'true\'>' and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '</th>';?>
<th data-width='150px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/story/view/view.html.php
+34 -33
View File
@@ -100,7 +100,7 @@
<div class='tabs'>
<ul class='nav nav-tabs'>
<li class='active'><a href='#legendBasicInfo' data-toggle='tab'><?php echo $lang->story->legendBasicInfo;?></a></li>
<li><a href='#legendProjectAndTask' data-toggle='tab'><?php echo $lang->story->legendProjectAndTask;?></a></li>
<li><a href='#legendLifeTime' data-toggle='tab'><?php echo $lang->story->legendLifeTime;?></a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendBasicInfo'>
@@ -162,38 +162,7 @@
</tr>
</table>
</div>
<div class='tab-pane' id='legendProjectAndTask'>
<ul class='list-unstyled'>
<?php
foreach($story->tasks as $projectTasks)
{
foreach($projectTasks as $task)
{
if(!isset($projects[$task->project])) continue;
$projectName = $projects[$task->project];
echo "<li title='$task->name'>" . html::a($this->createLink('task', 'view', "taskID=$task->id"), "#$task->id $task->name");
echo html::a($this->createLink('project', 'browse', "projectID=$task->project"), $projectName, '', "class='text-muted'") . '</li>';
}
}
if(count($story->tasks) == 0)
{
foreach($story->projects as $project)
{
echo "<li title='$project->name'>" . $project->name . '</li>';
}
}
?>
</ul>
</div>
</div>
</div>
<div class='tabs'>
<ul class='nav nav-tabs'>
<li class='active'><a href='#legendLifeTime' data-toggle='tab'><?php echo $lang->story->legendLifeTime;?></a></li>
<li><a href='#legendRelated' data-toggle='tab'><?php echo $lang->story->legendRelated;?></a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendLifeTime'>
<div class='tab-pane' id='legendLifeTime'>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th class='w-70px'><?php echo $lang->story->openedBy;?></th>
@@ -233,6 +202,38 @@
</tr>
</table>
</div>
</div>
</div>
<div class='tabs'>
<ul class='nav nav-tabs'>
<li class='active'><a href='#legendProjectAndTask' data-toggle='tab'><?php echo $lang->story->legendProjectAndTask;?></a></li>
<li><a href='#legendRelated' data-toggle='tab'><?php echo $lang->story->legendRelated;?></a></li>
</ul>
<div class='tab-content'>
<div class='tab-pane active' id='legendProjectAndTask'>
<ul class='list-unstyled'>
<?php
foreach($story->tasks as $projectTasks)
{
foreach($projectTasks as $task)
{
if(!isset($projects[$task->project])) continue;
$projectName = $projects[$task->project];
echo "<li title='$task->name'>" . html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), "#$task->id $task->name", '', "class='iframe' data-width='80%'");
echo html::a($this->createLink('project', 'browse', "projectID=$task->project"), $projectName, '', "class='text-muted'") . '</li>';
}
}
if(count($story->tasks) == 0)
{
foreach($story->projects as $project)
{
echo "<li title='$project->name'>" . $project->name . '</li>';
}
}
?>
</ul>
</div>
<div class='tab-pane' id='legendRelated'>
<table class='table table-data table-condensed table-borderless'>
<tr class='text-top'>
module/task/view/view.html.php
+6 -6
View File
@@ -120,7 +120,7 @@
<th><?php echo $lang->task->story;?></th>
<td>
<?php
if($task->storyTitle and !common::printLink('story', 'view', "storyID=$task->story", $task->storyTitle)) echo $task->storyTitle;
if($task->storyTitle and !common::printLink('story', 'view', "storyID=$task->story", $task->storyTitle, '', "class='iframe' data-width='80%'", true, true)) echo $task->storyTitle;
if($task->needConfirm)
{
echo "(<span class='warning'>{$lang->story->changed}</span> ";
@@ -129,19 +129,19 @@
}
?>
</td>
</tr>
</tr>
<tr>
<th><?php echo $lang->task->assignedTo;?></th>
<td><?php echo $task->assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : '';?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->task->type;?></th>
<td><?php echo $lang->task->typeList[$task->type];?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->task->status;?></th>
<td><?php $lang->show($lang->task->statusList, $task->status);?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->task->pri;?></th>
<td><?php $lang->show($lang->task->priList, $task->pri);?></td>
@@ -158,7 +158,7 @@
<tr>
<th class='w-80px'><?php echo $lang->task->estStarted;?></th>
<td><?php echo $task->estStarted;?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->task->realStarted;?></th>
<td><?php echo $task->realStarted; ?> </td>
www/favicon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

www/js/zui/min.js
+3 -3
View File
File diff suppressed because one or more lines are too long
www/theme/default/images/main/icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

www/theme/default/style.css
+2 -2
View File
@@ -411,7 +411,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#footer #poweredby {float: right; margin-right: 20px;}
#qrcodePopover.show {display: block; position: fixed; right: 5px; bottom: 40px; left: inherit; top: inherit; max-width: 300px}
#qrcodePopover.popover.top .arrow {left: inherit; right: 10px}
.icon-zentao, a .icon-zentao {background: url(images/main/icon.png) center no-repeat; display: inline-block; width: 14px; height: 14px; position: relative; top: 2px}
.icon-zentao, a .icon-zentao {background: url(images/main/icon.png) center no-repeat; display: inline-block; width: 16px; height: 16px; position: relative; top: 2px}
/* Feature bar. */
#featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px; min-height: 30px\0;}
@@ -457,7 +457,6 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#titlebar > .heading > .prefix {display: inline-block; margin-right: 5px; color: #666;}
#titlebar > .heading > .prefix > strong {font-weight: normal; border: 1px solid #aaa; padding: 0px 4px; background: #fff; text-align: center; min-width: 20px; color: #666; font-size: 12px}
#titlebar > .heading > .prefix > i {font-size: 14px; color: #808080; display: none}
#titlebar > .heading > strong {display: inline-block;}
#titlebar > .heading > strong a {color: #333}
#titlebar > .heading:hover > strong a {color: #03c}
#titlebar > .heading > strong a:hover {color: #1A53FF}
@@ -597,6 +596,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
.body-modal .outer > .container, .body-modal > .container{padding: 0; margin: 0; max-width: inherit !important; border: 0}
.body-modal #titlebar .actions {right: 40px}
.body-modal .outer, .body-modal #wrap{padding: 0!important; margin: 0!important;}
@-moz-document url-prefix(){.body-modal .outer .table {box-shadow: none}}
.body-modal .row-table {padding: 20px}
www/theme/zui/css/min.css
+3 -8
View File
File diff suppressed because one or more lines are too long