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

Merge branch 'zui'

Browse Source 
Conflicts:
	module/bug/view/activate.html.php
	module/bug/view/assignto.html.php
	module/bug/view/confirmbug.html.php
	module/bug/view/edit.html.php
	module/bug/view/resolve.html.php
	module/build/view/create.html.php
	module/build/view/edit.html.php
	module/common/model.php
	module/common/view/header.lite.html.php
	module/file/view/edit.html.php
	module/my/view/bug.html.php
	module/product/view/browse.html.php
	module/product/view/close.html.php
	module/product/view/edit.html.php
	module/productplan/view/edit.html.php
	module/project/view/activate.html.php
	module/project/view/batchedit.html.php
	module/project/view/burn.html.php
	module/project/view/close.html.php
	module/project/view/edit.html.php
	module/project/view/putoff.html.php
	module/project/view/start.html.php
	module/project/view/story.html.php
	module/project/view/suspend.html.php
	module/project/view/taskheader.html.php
	module/release/view/edit.html.php
	module/search/view/buildform.html.php
	module/story/view/batchclose.html.php
	module/story/view/change.html.php
	module/task/control.php
	module/task/css/batchcreate.css
	module/task/view/activate.html.php
	module/task/view/assignto.html.php
	module/task/view/batchcreate.html.php
	module/task/view/cancel.html.php
	module/task/view/close.html.php
	module/task/view/create.html.php
	module/task/view/edit.html.php
	module/task/view/finish.html.php
	module/task/view/start.html.php
	module/testtask/view/close.html.php
	module/testtask/view/edit.html.php
	module/testtask/view/start.html.php
	www/theme/default/style.css
This commit is contained in:
xia0ta0
2014-03-27 16:27:43 +08:00
parent 870102ee0f 230ccd34b3
commit a954e09d53
341 changed files with 7909 additions and 7174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/view/edit.html.php
+90 -83
View File
@@ -17,141 +17,148 @@
<?php js::set('oldStoryID', $task->story); ?>
<?php js::set('confirmChangeProject', $lang->task->confirmChangeProject); ?>
<?php js::set('changeProjectConfirmed', false); ?>
<form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<div id='titlebar'>
<div id='main'>TASK #<?php echo $task->id . $lang->colon . html::input('name', $task->name, 'class="text-1"');?></div>
<div><?php echo html::submitButton();?></div>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['task']) . ' #' . $task->id;?></span>
<strong><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></strong>
<small><?php echo html::icon($lang->icons['edit']) . ' ' . $lang->task->edit;?></small>
</div>
<div class='actions'>
<?php echo html::submitButton(html::icon('save') . ' ' . $lang->save)?>
</div>
</div>
<table class='cont-rt5'>
<tr valign='top'>
<td>
<table class='table-1 bd-none'>
<tr class='bd-none'><td class='bd-none'>
<fieldset>
<legend><?php echo $lang->task->desc;?></legend>
<?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows='8' class='area-1'");?>
</fieldset>
<fieldset>
<legend><?php echo $lang->comment;?></legend>
<?php echo html::textarea('comment', '', "rows='5' class='area-1'");?>
</fieldset>
<fieldset>
<legend><?php echo $lang->files;?></legend>
<?php echo $this->fetch('file', 'buildform');?>
</fieldset>
</td></tr>
</table>
<div class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?></div>
<div class='row'>
<div class='col-md-8'>
<div class='main'>
<div class='form-group'>
<?php echo html::input('name', $task->name, 'class="form-control"');?>
</div>
<fieldset>
<legend><?php echo $lang->task->desc;?></legend>
<?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows='8' class='form-control'");?>
</fieldset>
<fieldset>
<legend><?php echo $lang->comment;?></legend>
<?php echo html::textarea('comment', '', "rows='5' class='form-control'");?>
</fieldset>
<fieldset>
<legend><?php echo $lang->files;?></legend>
<?php echo $this->fetch('file', 'buildform');?>
</fieldset>
<div class='actions'>
<?php echo html::submitButton(html::icon('save') . ' ' . $lang->save) . html::linkButton($lang->goback, $this->inlink('view', "taskID=$task->id")) .html::hidden('consumed', $task->consumed);?>
</div>
<?php include '../../common/view/action.html.php';?>
</td>
<td class='divider'></td>
<td class='side'>
</div>
</div>
<div class='col-md-4'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->task->legendBasic;?></legend>
<table class='table-1'>
<table class='table table-form'>
<tr>
<th class='rowhead w-p20'><?php echo $lang->task->project;?></th>
<td><?php echo html::select('project', $projects, $task->project, 'class="select-1" onchange="loadAll(this.value)"');?></td>
<th class='w-70px'><?php echo $lang->task->project;?></th>
<td><?php echo html::select('project', $projects, $task->project, 'class="form-control" onchange="loadAll(this.value)"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->module;?></th>
<td id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control" onchange="loadModuleRelated()"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->story;?></th>
<td><span id="storyIdBox"><?php echo html::select('story', $stories, $task->story, 'class=form-control');?></span></td>
</tr>
<tr>
<th><?php echo $lang->task->assignedTo;?></th>
<td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></span></td>
</tr>
<tr>
<th><?php echo $lang->task->type;?></th>
<td><?php echo html::select('type', $lang->task->typeList, $task->type, 'class=form-control');?></td>
</tr>
<tr>
<th class='rowhead w-p20'><?php echo $lang->task->module;?></th>
<td><span id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="select-1"');?></span></td>
<th><?php echo $lang->task->status;?></th>
<td><?php echo html::select('status', (array)$lang->task->statusList, $task->status, 'class=form-control');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->story;?></th>
<td><span id="storyIdBox"><?php echo html::select('story', $stories, $task->story, 'class=select-1');?></span></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
<td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='select-1 chosen'");?></span></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->type;?></th>
<td><?php echo html::select('type', $lang->task->typeList, $task->type, 'class=select-1');?></td>
<th><?php echo $lang->task->pri;?></th>
<td><?php echo html::select('pri', $lang->task->priList, $task->pri, 'class=form-control');?> </td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->status;?></th>
<td><?php echo html::select('status', (array)$lang->task->statusList, $task->status, 'class=select-1');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->pri;?></th>
<td><?php echo html::select('pri', $lang->task->priList, $task->pri, 'class=select-1');?>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->task->mailto;?></td>
<td><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $task->mailto), 'class="text-1" multiple');?></td>
<th><?php echo $lang->task->mailto;?></th>
<td><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?></td>
</tr>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->task->legendEffort;?></legend>
<table class='table-1'>
<table class='table table-form'>
<tr>
<th class='rowhead'><?php echo $lang->task->estStarted;?></th>
<td><?php echo html::input('estStarted', $task->estStarted, "class='text-1 date'");?></td>
<th class='w-70px'><?php echo $lang->task->estStarted;?></th>
<td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->realStarted;?></th>
<td><?php echo html::input('realStarted', $task->realStarted, "class='text-1 date'");?></td>
<th><?php echo $lang->task->realStarted;?></th>
<td><?php echo html::input('realStarted', $task->realStarted, "class='form-control form-date'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->deadline;?></th>
<td><?php echo html::input('deadline', $task->deadline, "class='text-1 date'");?></td>
<th><?php echo $lang->task->deadline;?></th>
<td><?php echo html::input('deadline', $task->deadline, "class='form-control form-date'");?></td>
</tr>
<tr>
<th class='rowhead w-p20'><?php echo $lang->task->estimate;?></th>
<td><?php echo html::input('estimate', $task->estimate, "class='text-1'");?></td>
<th><?php echo $lang->task->estimate;?></th>
<td><?php echo html::input('estimate', $task->estimate, "class='form-control'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->consumed;?></th>
<th><?php echo $lang->task->consumed;?></th>
<td><?php echo $task->consumed . ' '; common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->left;?></th>
<td><?php echo html::input('left', $task->left, "class='text-1'");?></td>
<th><?php echo $lang->task->left;?></th>
<td><?php echo html::input('left', $task->left, "class='form-control'");?></td>
</tr>
</table>
</fieldset>
<fieldset>
<legend><?php echo $lang->task->legendLife;?></legend>
<table class='table-1'>
<table class='table table-form'>
<tr>
<th class='rowhead w-p20'><?php echo $lang->task->openedBy;?></th>
<th class='w-70px'><?php echo $lang->task->openedBy;?></th>
<td><?php echo $users[$task->openedBy];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->finishedBy;?></th>
<td><?php echo html::select('finishedBy', $members, $task->finishedBy, 'class=select-1');?></td>
<th><?php echo $lang->task->finishedBy;?></th>
<td><?php echo html::select('finishedBy', $members, $task->finishedBy, 'class=form-control');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->finishedDate;?></th>
<td><?php echo html::input('finishedDate', $task->finishedDate, 'class="text-1"');?></td>
<th><?php echo $lang->task->finishedDate;?></th>
<td><?php echo html::input('finishedDate', $task->finishedDate, 'class="form-control"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->canceledBy;?></th>
<td><?php echo html::select('canceledBy', $users, $task->canceledBy, 'class="select-1"');?></td>
<th><?php echo $lang->task->canceledBy;?></th>
<td><?php echo html::select('canceledBy', $users, $task->canceledBy, 'class="form-control"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->canceledDate;?></th>
<td><?php echo html::input('canceledDate', $task->canceledDate, 'class="text-1"');?></td>
<th><?php echo $lang->task->canceledDate;?></th>
<td><?php echo html::input('canceledDate', $task->canceledDate, 'class="form-control"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->closedBy;?></th>
<td><?php echo html::select('closedBy', $users, $task->closedBy, 'class="select-1"');?></td>
<th><?php echo $lang->task->closedBy;?></th>
<td><?php echo html::select('closedBy', $users, $task->closedBy, 'class="form-control"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->closedReason;?></th>
<td><?php echo html::select('closedReason', $lang->task->reasonList, $task->closedReason, 'class="select-1"');?></td>
<th><?php echo $lang->task->closedReason;?></th>
<td><?php echo html::select('closedReason', $lang->task->reasonList, $task->closedReason, 'class="form-control"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->closedDate;?></th>
<td><?php echo html::input('closedDate', $task->closedDate, 'class="text-1"');?></td>
<th><?php echo $lang->task->closedDate;?></th>
<td><?php echo html::input('closedDate', $task->closedDate, 'class="form-control"');?></td>
</tr>
</table>
</fieldset>
</td>
</tr>
</table>
</div>
</div>
</div>
</form>
<?php include '../../common/view/footer.html.php';?>