* ajusted views.
* changed css names.
This commit is contained in:
Catouse
+14
-12
@@ -169,13 +169,14 @@ class task extends control
|
||||
$position[] = $this->lang->task->common;
|
||||
$position[] = $this->lang->task->batchCreate;
|
||||
|
||||
$this->view->title = $title;
|
||||
$this->view->position = $position;
|
||||
$this->view->project = $project;
|
||||
$this->view->stories = $stories;
|
||||
$this->view->modules = $modules;
|
||||
$this->view->storyID = $storyID;
|
||||
$this->view->members = $members;
|
||||
$this->view->title = $title;
|
||||
$this->view->position = $position;
|
||||
$this->view->project = $project;
|
||||
$this->view->projectName = $project->name;
|
||||
$this->view->stories = $stories;
|
||||
$this->view->modules = $modules;
|
||||
$this->view->storyID = $storyID;
|
||||
$this->view->members = $members;
|
||||
$this->display();
|
||||
}
|
||||
|
||||
@@ -340,11 +341,12 @@ class task extends control
|
||||
if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
|
||||
|
||||
/* Assign. */
|
||||
$this->view->position[] = $this->lang->task->common;
|
||||
$this->view->position[] = $this->lang->task->batchEdit;
|
||||
$this->view->projectID = $projectID;
|
||||
$this->view->taskIDList = $taskIDList;
|
||||
$this->view->tasks = $tasks;
|
||||
$this->view->position[] = $this->lang->task->common;
|
||||
$this->view->position[] = $this->lang->task->batchEdit;
|
||||
$this->view->projectID = $projectID;
|
||||
$this->view->taskIDList = $taskIDList;
|
||||
$this->view->tasks = $tasks;
|
||||
$this->view->projectName = $project->name;
|
||||
|
||||
$this->display();
|
||||
}
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
textarea {height:16px}
|
||||
.icon-green-same:before {content: "\f105";}
|
||||
.sameAsStory{float:right;}
|
||||
.chosen-container-single .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
$(function() {
|
||||
for(i=0; i<batchCreateNum; i++) $("#story" + i).chosen({no_results_text: noResultsMatch});
|
||||
for(i=0; i<batchCreateNum; i++) $("#story" + i).chosen(defaultChosenOptions);
|
||||
})
|
||||
|
||||
/* Copy story title as task title. */
|
||||
|
||||
@@ -12,19 +12,19 @@
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/kindeditor.html.php';?>
|
||||
<form method='post' target='hiddenwin'>
|
||||
<table class='table-1'>
|
||||
<form class='form-condensed' method='post' target='hiddenwin'>
|
||||
<table class='table table-form'>
|
||||
<caption><?php echo $task->name;?></caption>
|
||||
<tr>
|
||||
<th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
|
||||
<th><?php echo $lang->task->assignedTo;?></th>
|
||||
<td><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control'");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class='rowhead'><?php echo $lang->task->left;?></th>
|
||||
<th><?php echo $lang->task->left;?></th>
|
||||
<td><?php echo html::input('left', '', "class='form-control'") . $lang->task->hour;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='rowhead'><?php echo $lang->comment;?></td>
|
||||
<td><?php echo $lang->comment;?></td>
|
||||
<td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -13,20 +13,28 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/chosen.html.php';?>
|
||||
<?php js::set('batchCreateNum', $config->task->batchCreate);?>
|
||||
<form method='post' target='hiddenwin'>
|
||||
<table class='table-1 fixed'>
|
||||
<caption><?php echo $lang->task->project . $lang->colon . $lang->task->batchCreate;?></caption>
|
||||
<tr>
|
||||
<th class='w-20px'><?php echo $lang->idAB;?></th>
|
||||
<th><?php echo $lang->task->story;?></th>
|
||||
<th class='red'><?php echo $lang->task->name;?></th>
|
||||
<th class='w-60px red'><?php echo $lang->typeAB;?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->module?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
|
||||
<th class='w-50px'><?php echo $lang->task->estimateAB;?></th>
|
||||
<th class='w-200px'><?php echo $lang->task->desc;?></th>
|
||||
<th class='w-50px'><?php echo $lang->task->pri;?></th>
|
||||
</tr>
|
||||
<div id='titlebar'>
|
||||
<div class='heading'>
|
||||
<span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
|
||||
<strong><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->task->common . $lang->colon . $lang->task->batchCreate;?></strong>
|
||||
<small class='text-muted'><?php echo html::icon($lang->icons['project']) . ' ' . $lang->task->project . $lang->colon . ' ' . $projectName;?></small>
|
||||
</div>
|
||||
</div>
|
||||
<form class='form-condensed' method='post' target='hiddenwin'>
|
||||
<table class='table table-fixed table-form'>
|
||||
<thead>
|
||||
<tr class='text-center'>
|
||||
<th class='w-30px'><?php echo $lang->idAB;?></th>
|
||||
<th><?php echo $lang->task->story;?></th>
|
||||
<th class='required'><?php echo $lang->task->name;?></th>
|
||||
<th class='w-70px required'><?php echo $lang->typeAB;?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->module?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
|
||||
<th class='w-50px'><?php echo $lang->task->estimateAB;?></th>
|
||||
<th class='w-p20'><?php echo $lang->task->desc;?></th>
|
||||
<th class='w-70px'><?php echo $lang->task->pri;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<?php
|
||||
$stories['ditto'] = $this->lang->task->ditto;
|
||||
@@ -49,20 +57,27 @@
|
||||
}
|
||||
?>
|
||||
<?php $pri = 3;?>
|
||||
<tr class='text-center'>
|
||||
<td><?php echo $i+1;?></td>
|
||||
<td class='text-left' style='overflow:visible'>
|
||||
<?php
|
||||
echo html::select("story[$i]", $stories, $story, "class='select-1'");
|
||||
echo html::a("javascript:copyStoryTitle($i)", "<i class='icon-green-same'></i>", '', "class='sameAsStory' title='{$lang->task->copyStoryTitle}'");
|
||||
?>
|
||||
<tr>
|
||||
<td class='text-center'><?php echo $i+1;?></td>
|
||||
<td style='overflow: visible'>
|
||||
<?php echo html::select("story[$i]", $stories, $story, "class='form-control'");?>
|
||||
</td>
|
||||
<td>
|
||||
<div class='input-group'>
|
||||
<span class='input-group-btn'>
|
||||
<a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-double-angle-right'></i></a>
|
||||
</span>
|
||||
<?php echo html::input("name[$i]", '', 'class=form-control');?>
|
||||
</div>
|
||||
</td>
|
||||
<td><?php echo html::input("name[$i]", '', 'class=form-control');?></td>
|
||||
<td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
|
||||
<td><?php echo html::select("module[$i]", $modules, $module, 'class=form-control')?></td>
|
||||
<td><?php echo html::select("assignedTo[$i]", $members, $member, 'class=form-control');?></td>
|
||||
<td><?php echo html::input("estimate[$i]", '', 'class=form-control');?></td>
|
||||
<td><?php echo html::textarea("desc[$i]", '', "rows='1' class=text-1");?></td>
|
||||
<td><?php echo html::input("estimate[$i]", '', 'class=form-control text-center');?></td>
|
||||
<td>
|
||||
<div class='form-control' contenteditable='true' data-sync-target='#desc\[<?php echo $i;?>\]'></div>
|
||||
<?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control hidden'");?>
|
||||
</td>
|
||||
<td><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
|
||||
</tr>
|
||||
<?php endfor;?>
|
||||
|
||||
@@ -11,24 +11,33 @@
|
||||
*/
|
||||
?>
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
|
||||
<table class='table-1 fixed'>
|
||||
<caption><?php echo $lang->task->common . $lang->colon . $lang->task->batchEdit;?></caption>
|
||||
<tr>
|
||||
<th class='w-30px'><?php echo $lang->idAB;?></th>
|
||||
<th class='red'> <?php echo $lang->task->name?></th>
|
||||
<th class='w-150px'><?php echo $lang->task->module?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
|
||||
<th class='w-60px red'><?php echo $lang->typeAB;?></th>
|
||||
<th class='w-70px'><?php echo $lang->task->status;?></th>
|
||||
<th class='w-50px'><?php echo $lang->task->pri;?></th>
|
||||
<th class='w-30px red'><?php echo $lang->task->estimateAB;?></th>
|
||||
<th class='w-60px red'><?php echo $lang->task->consumedThisTime?></th>
|
||||
<th class='w-30px red'><?php echo $lang->task->leftAB?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->finishedBy;?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->closedBy;?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->closedReason;?></th>
|
||||
</tr>
|
||||
<div id='titlebar'>
|
||||
<div class='heading'>
|
||||
<span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
|
||||
<strong><small class='text-muted'><?php echo html::icon($lang->icons['batchEdit']);?></small> <?php echo $lang->task->common . $lang->colon . $lang->task->batchEdit;?></strong>
|
||||
<small class='text-muted'><?php echo html::icon($lang->icons['project']) . ' ' . $lang->task->project . $lang->colon . ' ' . $projectName;?></small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
|
||||
<table class='table table-fixed table-form'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='w-30px'><?php echo $lang->idAB;?></th>
|
||||
<th class='required'> <?php echo $lang->task->name?></th>
|
||||
<th class='w-150px'><?php echo $lang->task->module?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
|
||||
<th class='w-70px required'><?php echo $lang->typeAB;?></th>
|
||||
<th class='w-80px'><?php echo $lang->task->status;?></th>
|
||||
<th class='w-60px'><?php echo $lang->task->pri;?></th>
|
||||
<th class='w-40px required'><?php echo $lang->task->estimateAB;?></th>
|
||||
<th class='w-60px required'><?php echo $lang->task->consumedThisTime?></th>
|
||||
<th class='w-40px required'><?php echo $lang->task->leftAB?></th>
|
||||
<th class='w-90px'><?php echo $lang->task->finishedBy;?></th>
|
||||
<th class='w-90px'><?php echo $lang->task->closedBy;?></th>
|
||||
<th class='w-90px'><?php echo $lang->task->closedReason;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<?php foreach($taskIDList as $taskID):?>
|
||||
<?php
|
||||
if(!isset($project))
|
||||
@@ -45,9 +54,9 @@
|
||||
<td><?php echo html::select("types[$taskID]", $lang->task->typeList, $tasks[$taskID]->type, 'class=form-control');?></td>
|
||||
<td><?php echo html::select("statuses[$taskID]", $lang->task->statusList, $tasks[$taskID]->status, 'class=form-control');?></td>
|
||||
<td><?php echo html::select("pris[$taskID]", (array)$lang->task->priList, $tasks[$taskID]->pri, 'class=form-control');?></td>
|
||||
<td><?php echo html::input("estimates[$taskID]", $tasks[$taskID]->estimate, "class='text-1 a-center'");?></td>
|
||||
<td><?php echo html::input("consumeds[$taskID]", '', "class='text-1 a-center'");?></td>
|
||||
<td><?php echo html::input("lefts[$taskID]", $tasks[$taskID]->left, "class='text-1 a-center'");?></td>
|
||||
<td><?php echo html::input("estimates[$taskID]", $tasks[$taskID]->estimate, "class='form-control text-center'");?></td>
|
||||
<td><?php echo html::input("consumeds[$taskID]", '', "class='form-control text-center'");?></td>
|
||||
<td><?php echo html::input("lefts[$taskID]", $tasks[$taskID]->left, "class='form-control text-center'");?></td>
|
||||
<td><?php echo html::select("finishedBys[$taskID]", $members, $tasks[$taskID]->finishedBy, 'class=form-control');?></td>
|
||||
<td><?php echo html::select("closedBys[$taskID]", $members, $tasks[$taskID]->closedBy, 'class=form-control');?></td>
|
||||
<td><?php echo html::select("closedReasons[$taskID]", $lang->task->reasonList, $tasks[$taskID]->closedReason, 'class=form-control');?></td>
|
||||
|
||||
@@ -36,11 +36,11 @@
|
||||
</div>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->task->desc;?></legend>
|
||||
<?php echo html::textarea('desc', $task->desc, "rows='8' class='area-1'");?>
|
||||
<?php echo html::textarea('desc', $task->desc, "rows='8' class='form-control'");?>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->comment;?></legend>
|
||||
<?php echo html::textarea('comment', '', "rows='5' class='area-1'");?>
|
||||
<?php echo html::textarea('comment', '', "rows='5' class='form-control'");?>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend><?php echo $lang->files;?></legend>
|
||||
|
||||
@@ -17,19 +17,19 @@
|
||||
<table class='table-1 a-left'>
|
||||
<caption><?php echo $lang->task->editEstimate;?></caption>
|
||||
<tr>
|
||||
<th class='rowhead'><?php echo $lang->task->date;?></th>
|
||||
<th><?php echo $lang->task->date;?></th>
|
||||
<td><?php echo html::input('date', $estimate->date, 'class="select-3 date"');?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class='rowhead'><?php echo $lang->task->record;?></th>
|
||||
<th><?php echo $lang->task->record;?></th>
|
||||
<td><?php echo html::input('consumed', $estimate->consumed, 'class="select-3"');?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class='rowhead'><?php echo $lang->task->left;?></th>
|
||||
<th><?php echo $lang->task->left;?></th>
|
||||
<td><?php echo html::input('left', $estimate->left, 'class="select-3"');?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th class='rowhead'><?php echo $lang->comment;?></th>
|
||||
<th><?php echo $lang->comment;?></th>
|
||||
<td><?php echo html::textarea('work', $estimate->work, "class=text-5");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php include '../../common/view/m.header.html.php';?>
|
||||
</div>
|
||||
<form method='post' target='hiddenwin'>
|
||||
<form class='form-condensed' method='post' target='hiddenwin'>
|
||||
<h3><?php echo $lang->task->assignTo . $this->lang->colon . $task->name;?></h3>
|
||||
<table class='table-1'>
|
||||
<tr>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php include '../../common/view/m.header.html.php';?>
|
||||
</div>
|
||||
<form method='post' target='hiddenwin'>
|
||||
<form class='form-condensed' method='post' target='hiddenwin'>
|
||||
<h3><?php echo $lang->task->recordEstimate . $this->lang->colon . $task->name;?></h3>
|
||||
<?php
|
||||
$allConsumed = 0;
|
||||
|
||||
Reference in New Issue
Block a user