Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
liugang
@@ -11,52 +11,48 @@
|
||||
*/
|
||||
?>
|
||||
<?php include '../../common/view/header.lite.html.php';?>
|
||||
<div id='titlebar'>
|
||||
<div class='heading'>
|
||||
<strong><?php echo $lang->project->kanbanSetting;?></strong>
|
||||
</div>
|
||||
</div>
|
||||
<form target='hiddenwin' method='post'>
|
||||
<table class='table'>
|
||||
<?php if(common::hasPriv('project', 'kanbanHideCols')):?>
|
||||
<tr>
|
||||
<th class='text-right'><?php echo $lang->project->kanbanHideCols?></th>
|
||||
<td><?php echo html::radio('allCols', $lang->kanbanSetting->optionList, $allCols)?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th class='w-180px text-right'><?php echo $lang->project->kanbanShowOption?></th>
|
||||
<td><?php echo html::radio('showOption', $lang->kanbanSetting->optionList, $showOption)?></td>
|
||||
</tr>
|
||||
<?php if(common::hasPriv('project', 'kanbanColsColor')):?>
|
||||
<tr>
|
||||
<th class='text-right'><?php echo $lang->project->kanbanColsColor?></th>
|
||||
<td>
|
||||
<div class='row-table'>
|
||||
<?php foreach($colorList as $status => $color):?>
|
||||
<div class='col-table'>
|
||||
<input type='hidden' id='color<?php echo $status?>' name="colorList[<?php echo $status?>]" data-provide='colorpicker' data-wrapper='input-group-btn' value='<?php echo $color;?>' data-colors='#333,#2B529C,#E48600,#D2323D,#229F24,#777,#D2691E,#008B8B,#2E8B57,#4169E1,#4B0082,#FA8072,#BA55D3,#2E8B57,#6B8E23'>
|
||||
<?php echo $lang->task->statusList[$status];?>
|
||||
</div>
|
||||
<?php endforeach;?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<td colspan='2' class='text-center'>
|
||||
<?php
|
||||
echo html::submitButton();
|
||||
echo html::a(inlink('ajaxResetKanban', "projectID=$projectID"), $lang->project->resetKanban, 'hiddenwin', "class='btn'");
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<script>
|
||||
$(function()
|
||||
{
|
||||
$('.col-table .colorpicker:last .dropdown-menu').addClass('pull-right');
|
||||
})
|
||||
</script>
|
||||
<div id='mainContent' class='main-content'>
|
||||
<div class='center-block'>
|
||||
<div class='main-header'>
|
||||
<h2><?php echo $lang->project->kanbanSetting;?></h2>
|
||||
</div>
|
||||
<form target='hiddenwin' method='post'>
|
||||
<table class='table'>
|
||||
<?php if(common::hasPriv('project', 'kanbanHideCols')):?>
|
||||
<tr>
|
||||
<th class='text-right'><?php echo $lang->project->kanbanHideCols?></th>
|
||||
<td><?php echo html::radio('allCols', $lang->kanbanSetting->optionList, $allCols)?></td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<th class='w-200px text-right'><?php echo $lang->project->kanbanShowOption?></th>
|
||||
<td><?php echo html::radio('showOption', $lang->kanbanSetting->optionList, $showOption)?></td>
|
||||
</tr>
|
||||
<?php if(common::hasPriv('project', 'kanbanColsColor')):?>
|
||||
<tr>
|
||||
<th class='text-right'><?php echo $lang->project->kanbanColsColor?></th>
|
||||
<td>
|
||||
<div class='row'>
|
||||
<?php foreach($colorList as $status => $color):?>
|
||||
<div class='col-sm-2'>
|
||||
<input type='hidden' id='color<?php echo $status?>' name="colorList[<?php echo $status?>]" data-provide='colorpicker' data-wrapper='input-group-btn' value='<?php echo $color;?>' data-colors='#333,#2B529C,#E48600,#D2323D,#229F24,#777,#D2691E,#008B8B,#2E8B57,#4169E1,#4B0082,#FA8072,#BA55D3,#2E8B57,#6B8E23'>
|
||||
<?php echo $lang->task->statusList[$status];?>
|
||||
</div>
|
||||
<?php endforeach;?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endif;?>
|
||||
<tr>
|
||||
<td colspan='2' class='text-center'>
|
||||
<?php
|
||||
echo html::submitButton();
|
||||
echo html::a(inlink('ajaxResetKanban', "projectID=$projectID"), $lang->project->resetKanban, 'hiddenwin', "class='btn'");
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<?php include '../../common/view/footer.lite.html.php';?>
|
||||
|
||||
@@ -13,15 +13,18 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<div id="mainMenu" class="clearfix">
|
||||
<div class="btn-toolbar pull-left">
|
||||
<?php
|
||||
echo html::a(inlink('dynamic', "projectID=$projectID&type=all"), "<span class='text'>{$lang->action->dynamic->all}</span> <span class='label label-light label-badge'>{$allCount}</span>", '', "class='btn btn-link " . ($type == 'all' ? 'btn-active-text' : '') . "'");
|
||||
echo html::a(inlink('dynamic', "projectID=$projectID&type=today"), "<span class='text'>{$lang->action->dynamic->today}</span>", '', "class='btn btn-link " . ($type == 'today' ? 'btn-active-text' : '') . "'");
|
||||
echo html::a(inlink('dynamic', "projectID=$projectID&type=yesterday"), "<span class='text'>{$lang->action->dynamic->yesterday}</span>", '', "class='btn btn-link " . ($type == 'yesterday' ? 'btn-active-text' : '') . "'");
|
||||
echo html::a(inlink('dynamic', "projectID=$projectID&type=thisweek"), "<span class='text'>{$lang->action->dynamic->thisWeek}</span>", '', "class='btn btn-link " . ($type == 'thisweek' ? 'btn-active-text' : '') . "'");
|
||||
echo html::a(inlink('dynamic', "projectID=$projectID&type=lastweek"), "<span class='text'>{$lang->action->dynamic->lastWeek}</span>", '', "class='btn btn-link " . ($type == 'lastweek' ? 'btn-active-text' : '') . "'");
|
||||
echo html::a(inlink('dynamic', "projectID=$projectID&type=thismonth"), "<span class='text'>{$lang->action->dynamic->thisMonth}</span>", '', "class='btn btn-link " . ($type == 'thismonth' ? 'btn-active-text' : '') . "'");
|
||||
echo html::a(inlink('dynamic', "projectID=$projectID&type=lastmonth"), "<span class='text'>{$lang->action->dynamic->lastMonth}</span>", '', "class='btn btn-link " . ($type == 'lastmonth' ? 'btn-active-text' : '') . "'");
|
||||
<?php foreach($lang->action->periods as $period => $label):?>
|
||||
<?php
|
||||
$label = "<span class='text'>$label</span>";
|
||||
$active = '';
|
||||
if($period == $type)
|
||||
{
|
||||
$active = 'btn-active-text';
|
||||
$label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
|
||||
}
|
||||
echo html::a(inlink('dynamic', "projectID=$projectID&type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
|
||||
?>
|
||||
<?php endforeach;?>
|
||||
<div class="input-control space w-150px">
|
||||
<?php echo html::select('account', $users, $account, "onchange='changeUser(this.value, $projectID)' class='form-control chosen'");?>
|
||||
</div>
|
||||
|
||||
@@ -9,7 +9,47 @@
|
||||
*/
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include './taskheader.html.php';?>
|
||||
<div id='mainMenu' class='clearfix'>
|
||||
<div class='btn-toolbar pull-right'>
|
||||
<?php echo html::a($this->createLink('project', 'ajaxKanbanSetting', "projectID=$projectID"), "<i class='icon-cog'></i> " . $lang->project->kanbanSetting, '', "class='iframe btn btn-link'");?>
|
||||
<?php if(common::hasPriv('project', 'printKanban')) echo html::a('###', "<i class='icon-print'></i> " . $lang->project->printKanban, '', "class='btn btn-link' id='printKanban' title='{$lang->project->printKanban}'");?>
|
||||
<div class='btn-group'>
|
||||
<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='exportAction'>
|
||||
<i class='icon-download-alt'></i> <?php echo $lang->export ?>
|
||||
<span class='caret'></span>
|
||||
</button>
|
||||
<ul class='dropdown-menu' id='exportActionMenu'>
|
||||
<?php
|
||||
$misc = common::hasPriv('task', 'export') ? "class='export iframe' data-width='700'" : "class=disabled";
|
||||
$link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
|
||||
echo "<li>" . html::a($link, $lang->task->export, '', $misc) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<div class='btn-group'>
|
||||
<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'>
|
||||
<i class='icon-upload-alt'></i> <?php echo $lang->import ?>
|
||||
<span class='caret'></span>
|
||||
</button>
|
||||
<ul class='dropdown-menu' id='importActionMenu'>
|
||||
<?php
|
||||
$misc = common::hasPriv('project', 'importTask') ? '' : "class=disabled";
|
||||
$link = common::hasPriv('project', 'importTask') ? $this->createLink('project', 'importTask', "project=$project->id") : '#';
|
||||
echo "<li>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
|
||||
|
||||
$misc = common::hasPriv('project', 'importBug') ? '' : "class=disabled";
|
||||
$link = common::hasPriv('project', 'importBug') ? $this->createLink('project', 'importBug', "project=$project->id") : '#';
|
||||
echo "<li>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
<?php
|
||||
$misc = common::hasPriv('task', 'create', $project) ? "class='btn btn-primary'" : "class='btn btn-primary disabled'";
|
||||
$link = common::hasPriv('task', 'create', $project) ? $this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#';
|
||||
echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->task->create, '', $misc);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<style>
|
||||
<?php foreach($colorList as $status => $color):?>
|
||||
<?php echo ".board-bug-$status, .board-task-$status {background: " . ($color ? $color : '#000') . ";}\n"?>
|
||||
@@ -20,7 +60,7 @@ $taskCols = array('wait', 'doing', 'pause', 'done');
|
||||
if($allCols) $taskCols = array('wait', 'doing', 'pause', 'done', 'cancel', 'closed');
|
||||
$account = $this->app->user->account
|
||||
?>
|
||||
<div id='kanban'>
|
||||
<div id='kanban' class='main-content'>
|
||||
<table class='boards-layout table' id='kanbanHeader'>
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -53,17 +93,6 @@ $account = $this->app->user->account
|
||||
<th class='col-<?php echo $col?>'><?php echo $lang->task->statusList[$col];?></th>
|
||||
<?php endforeach;?>
|
||||
<th class='col-<?php echo $lastCol?>'><?php echo $lang->task->statusList[$lastCol];?>
|
||||
<div class='actions'>
|
||||
<div class="dropdown">
|
||||
<button type="button" class="btn btn-mini btn-link dropdown-toggle" data-toggle="dropdown">
|
||||
<span class="icon-ellipsis-h"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu pull-right">
|
||||
<?php echo '<li>' . html::a($this->createLink('project', 'ajaxKanbanSetting', "projectID=$projectID"), "<i class='icon-cog'></i> " . $lang->project->kanbanSetting, '', "class='iframe'") . '</li>';?>
|
||||
<?php if(common::hasPriv('project', 'printKanban')) echo '<li>' . html::a('###', "<i class='icon-print'></i> " . $lang->project->printKanban, '', "id='printKanban' title='{$lang->project->printKanban}'") . '</li>';?>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@@ -10,19 +10,21 @@
|
||||
?>
|
||||
<?php if($_POST) die(include 'preview.html.php')?>
|
||||
<?php include '../../common/view/header.lite.html.php';?>
|
||||
<div id='titlebar'>
|
||||
<div class='heading'>
|
||||
<?php echo html::icon($lang->icons['task']);?> <strong><?php echo $lang->printKanban->common;?></strong>
|
||||
</div>
|
||||
</div>
|
||||
<form target='_blank' method='post'>
|
||||
<table class='table'>
|
||||
<tr>
|
||||
<td align='center' class='text-middle'>
|
||||
<?php echo $lang->printKanban->content . ' ： ' . html::radio('content', $lang->printKanban->typeList, 'all')?>
|
||||
<?php echo html::submitButton($lang->printKanban->print)?>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<div id='mainContent' class='main-content'>
|
||||
<div class='center-block'>
|
||||
<div class='main-header'>
|
||||
<h2><?php echo $lang->printKanban->common;?></h2>
|
||||
</div>
|
||||
<form target='_blank' method='post'>
|
||||
<table class='table'>
|
||||
<tr>
|
||||
<td class='text-center text-middle'>
|
||||
<?php echo $lang->printKanban->content . ' ： ' . html::radio('content', $lang->printKanban->typeList, 'all')?>
|
||||
<?php echo html::submitButton($lang->printKanban->print)?>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<?php include '../../common/view/footer.lite.html.php';?>
|
||||
|
||||
Reference in New Issue
Block a user