* ajusted views.

* fixed iframe modal method in 'my.full.js'.
This commit is contained in:
Catouse
2014-03-28 11:06:06 +08:00
parent fc322ea3cf
commit 561f39afe8
15 changed files with 275 additions and 261 deletions
+111 -105
View File
@@ -13,109 +13,115 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<form method='post' target='hiddenwin' id='dataform' enctype='multipart/form-data'>
<table class='table-1 fixed'>
<caption><?php echo $lang->build->create;?></caption>
<tr>
<th><?php echo $lang->build->product;?></th>
<td><?php echo html::select('product', $products, '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->build->name;?></th>
<td>
<?php echo html::input('name', '', "class='form-control'");?>
<?php if($lastBuild) echo '<span class="gray">(' . $lang->build->last . ': ' . $lastBuild->name . ')</span>';?>
</td>
</tr>
<tr>
<th><?php echo $lang->build->builder;?></th>
<td><?php echo html::select('builder', $users, $app->user->account, 'class="select-3"');?></td>
</tr>
<tr>
<th><?php echo $lang->build->date;?></th>
<td><?php echo html::input('date', helper::today(), "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->build->scmPath;?></th>
<td><?php echo html::input('scmPath', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->build->packageType;?></th>
<td><?php echo html::radio('packageType', $lang->build->packageTypeList, 'path');?></td>
</tr>
<tr>
<th><?php echo $lang->build->filePath;?></th>
<td><?php echo html::input('filePath', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->build->files;?></th>
<td><?php echo $this->fetch('file', 'buildForm', array('fileCount' => 1));?></td>
</tr>
<tr>
<th><?php echo $lang->build->linkStoriesAndBugs;?></th>
<td>
<table class='bd-none' style='margin-bottom:0px;width:91%'>
<tr>
<td class='w-p50' style='padding-left:0px;padding-right:8px;'>
<table class='mainTable'>
<caption style='padding-left:3px'><?php echo html::selectAll('story', 'checkbox') . ' ' . $lang->build->linkStories;?></caption>
<tr style='border-bottom:none'>
<td style='border-bottom:none; padding:0px'>
<div class='contentDiv'>
<table class='table-1 fixed bd-none' id='story'>
<?php foreach($stories as $key => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true); ?>
<tr class='text-center'>
<td class='w-id a-left'>
<input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?>
</td>
<td class='a-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
<td class='<?php echo $story->status;?> w-50px'><?php echo $lang->story->statusList[$story->status];?></td>
<td class='w-80px'><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>
<?php endforeach;?>
</table>
</div>
</td>
</tr>
</table>
</td>
<td class='w-p50' style='padding-left:0px;padding-right:5px;'>
<table class='mainTable'>
<caption style='padding-left:3px'><?php echo html::selectAll('bug', 'checkbox') . ' ' . $lang->build->linkBugs;?></caption>
<tr style='border-bottom:none'>
<td style='border-bottom:none; padding:0px'>
<div class='contentDiv'>
<table class='table-1 fixed bd-none' id='bug'>
<?php foreach($bugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td class='w-id a-left'>
<input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?>> <?php echo sprintf('%03d', $bug->id);?>
</td>
<td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
<td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
<td class='w-80px' style='padding:0px'><?php echo $bug->status == 'resolved' ? substr($users[$bug->resolvedBy], 2) : html::select('resolvedBy[]', $users, $this->app->user->account, "class='w-70px'");?></td>
</tr>
<?php endforeach;?>
</table>
</div>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<th><?php echo $lang->build->desc;?></th>
<td><?php echo html::textarea('desc', '', "rows='10' class='form-control'");?></td>
</tr>
<tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</table>
</form>
<div class='container'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['build']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->build->create;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform' enctype='multipart/form-data'>
<table class='table table-form'>
<tr>
<th class='w-110px'><?php echo $lang->build->product;?></th>
<td class='w-p45'><?php echo html::select('product', $products, '', "class='form-control'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->build->name;?></th>
<td>
<?php echo html::input('name', '', "class='form-control'");?>
</td>
<td>
<?php if($lastBuild):?>
<div class='help-block'> &nbsp; <?php echo $lang->build->last . ': <strong>' . $lastBuild->name . '</strong>';?></div>
<?php endif;?>
</td>
</tr>
<tr>
<th><?php echo $lang->build->builder;?></th>
<td><?php echo html::select('builder', $users, $app->user->account, 'class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->build->date;?></th>
<td><?php echo html::input('date', helper::today(), "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->build->scmPath;?></th>
<td colspan='2'><?php echo html::input('scmPath', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->build->packageType;?></th>
<td colspan='2'><?php echo html::radio('packageType', $lang->build->packageTypeList, 'path');?></td>
</tr>
<tr>
<th><?php echo $lang->build->filePath;?></th>
<td colspan='2'><?php echo html::input('filePath', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->build->files;?></th>
<td colspan='2'><?php echo $this->fetch('file', 'buildForm', array('fileCount' => 1));?></td>
</tr>
<tr>
<th><?php echo $lang->build->linkStoriesAndBugs;?></th>
<td colspan='2'>
<div class='row pd-0' style='margin: 0 0 0 -15px'>
<div class='col-md-6'>
<div class='panel panel-sm contentDiv'>
<div class='panel-heading'><?php echo html::icon($lang->icons['story']) . ' ' . $lang->build->linkStories;?></div>
<table class='table table table-borderless table-condensed table-hover'>
<thead>
<tr class='text-center'>
<th class='w-id text-left'><?php echo html::selectAll('story', 'checkbox') . ' ' . $lang->idAB;?></th>
<th><?php echo $lang->story->title;?></th>
<th class='w-hour'><?php echo $lang->statusAB;?></th>
<th class='w-100px'><?php echo $lang->story->stageAB;?></th>
</tr>
</thead>
<?php foreach($stories as $key => $story):?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id", '', true);?>
<tr class='text-center'>
<td class='w-id text-left' id='story'><input type='checkbox' name='stories[]' value="<?php echo $story->id;?>" <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?>> <?php echo sprintf('%03d', $story->id);?></td>
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title, '', "class='preview iframe'");?></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;?>
</table>
</div>
</div>
<div class='col-md-6'>
<div class='panel panel-sm contentDiv'>
<div class='panel-heading'><?php echo html::icon($lang->icons['bug']) . ' ' . $lang->build->linkBugs;?></div>
<table class='table table table-borderless table-condensed table-hover'>
<thead>
<tr class='text-center'>
<th class='w-id text-left'><?php echo html::selectAll('bug', 'checkbox') . ' ' . $lang->idAB;?></th>
<th><?php echo $lang->bug->title;?></th>
<th class='w-100px'><?php echo $lang->bug->status;?></th>
<th class='w-80px'><?php echo $lang->bug->resolvedBy;?></th>
</tr>
</thead>
<?php foreach($bugs as $bug):?>
<?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
<tr class='text-center'>
<td class='w-id text-left' id='bug'><input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'resolved' or $bug->status == 'closed') echo "checked";?>> <?php echo sprintf('%03d', $bug->id);?></td>
<td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview iframe'");?></td>
<td><?php echo $lang->bug->statusList[$bug->status];?></td>
<td><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? substr($users[$bug->resolvedBy], 2) : html::select('resolvedBy[]', $users, $this->app->user->account, "class='w-70px'");?></td>
</tr>
<?php endforeach;?>
</table>
</div>
</div>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->build->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control'");?></td>
</tr>
<tr><td></td><td colspan='2'><?php echo html::submitButton() . html::backButton();?></td></tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>