* ajusted views.

This commit is contained in:
Catouse
2014-04-11 09:44:44 +08:00
parent d7f4d75c16
commit 955e6183ee
11 changed files with 143 additions and 110 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
<strong><?php echo $lang->convert->common;?></strong>
</div>
</div>
<div class='alert'>
<div class='alert mg-0 bd-0'>
<div class='content'>
<?php echo nl2br($lang->convert->desc);?>
<div class='text-center pdt-20'>
+2 -2
View File
@@ -44,8 +44,8 @@ EOT;
?>
</ul>
</div>
<div class='container'>
<div class='row'>
<div class='container bd-0'>
<div class='row pd-0'>
<div class='col-sm-4 col-md-3'>
<div class='panel panel-sm'>
<div class='panel-heading'>
+1 -1
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../extension/view/header.html.php';?>
<div class='container'>
<div class='container bd-0'>
<table class='w-p100'>
<tr>
<td class='w-200px'>
+2 -2
View File
@@ -12,8 +12,8 @@
?>
<?php include 'header.html.php';?>
<?php include '../../common/view/treeview.html.php';?>
<div class='container'>
<div class='row'>
<div class='container bd-0'>
<div class='row pd-0'>
<div class='col-md-4 col-lg-3'>
<form class='side-search mgb-20' method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
<div class="input-group">
+1 -1
View File
@@ -26,7 +26,7 @@
<div id='bugList'>
<form method='post' id='unlinkedBugsForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong> (<?php echo count($allBugs);?>)</caption>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedBugs;?></strong></caption>
<thead>
<tr class='colhead'>
<th class='w-id {sorter:"currency"}'><?php echo $lang->idAB;?></th>
+1 -1
View File
@@ -24,7 +24,7 @@
<div id='storyList'>
<form method='post' id='unlinkedStoriesForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed'>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong> (<?php echo count($allStories);?>)</caption>
<caption class='text-left text-special'><?php echo html::icon('unlink');?> &nbsp;<strong><?php echo $lang->productplan->unlinkedStories;?></strong></caption>
<thead>
<tr>
<th class='w-id {sorter:"currency"}'><?php echo $lang->idAB;?></th>
+1 -1
View File
@@ -1 +1 @@
.instruction {margin-top:15px; margin-left: 20px; padding:20px 30px;}
.instruction {margin-top:5px; margin-left: 20px; padding:20px 30px;}
+3 -1
View File
@@ -1 +1,3 @@
.side span {display:block}
.table-bordered caption {border: 1px solid #ddd;}
.table-bordered tr > th:first-child, .table-bordered tr > td:first-child {border-left: 1px solid #ddd!important}
.table-bordered tr > th:last-child, .table-bordered tr > td:last-child {border-right: 1px solid #ddd!important}
+44 -30
View File
@@ -11,39 +11,53 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<table class='cont-lt1'>
<tr valign='top'>
<td class='side'>
<div class='box-title'><?php echo $lang->story->report->select;?></div>
<div class='box-content'>
<form method='post'>
<?php echo html::checkBox('charts', $lang->story->report->charts, $checkedCharts);?>
<?php echo html::selectAll();?>
<?php echo html::selectReverse();?>
<br /><br />
<?php echo html::submitButton($lang->story->report->create);?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['report']);?></small> <?php echo $lang->story->report->common;?></strong>
</div>
<div class='actions'>
<?php echo html::a($this->createLink('product', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback, '', "class='btn'");?>
</div>
</div>
<div class='row'>
<div class='col-md-3 col-lg-2'>
<div class='panel panel-sm'>
<div class='panel-heading'>
<strong><?php echo $lang->story->report->select;?></strong>
</div>
</td>
<td class='divider'></td>
<td>
<table class='table-1'>
<caption>
<div class='f-left'><?php echo $lang->story->report->common;?></div>
<div class='text-right'><?php echo html::a($this->createLink('product', 'browse', "productID=$productID&browseType=$browseType&moduleID=$moduleID"), $lang->goback); ?></div>
</caption>
<div class='panel-body' style='padding-top:0'>
<form method='post'>
<?php echo html::checkBox('charts', $lang->story->report->charts, $checkedCharts, '', 'block');?>
<div class='btn-group'>
<?php echo html::selectAll(); ?>
<?php echo html::selectReverse(); ?>
<?php echo html::submitButton($lang->story->report->create);?>
</div>
</form>
</div>
</div>
</div>
<div class='col-md-9 col-lg-10'>
<div class='panel panel-sm'>
<div class='panel-heading'>
<strong><?php echo $lang->story->report->common;?></strong>
</div>
<table class='table active-disabled'>
<?php foreach($charts as $chartType => $chartContent):?>
<tr valign='top'>
<td><?php echo $chartContent;?></td>
<td width='300'>
<div style="height:<?php echo $lang->story->report->options->height . 'px';?>; overflow:auto">
<table class='table-1 colored'>
<caption><?php echo $lang->story->report->charts[$chartType];?></caption>
<tr>
<th><?php echo $lang->story->report->$chartType->item;?></th>
<th><?php echo $lang->story->report->value;?></th>
<th><?php echo $lang->report->percent;?></th>
</tr>
<table class='table table-condensed table-hover table-striped table-bordered'>
<caption class='text-left'><?php echo $lang->story->report->charts[$chartType];?></caption>
<thead>
<tr>
<th><?php echo $lang->story->report->$chartType->item;?></th>
<th><?php echo $lang->story->report->value;?></th>
<th><?php echo $lang->report->percent;?></th>
</tr>
</thead>
<?php foreach($datas[$chartType] as $key => $data):?>
<tr class='text-center'>
<td><?php echo $data->name;?></td>
@@ -57,8 +71,8 @@
</tr>
<?php endforeach;?>
</table>
</td>
</tr>
</table>
</div>
</div>
</div>
<?php echo $renderJS;?>
<?php include '../../common/view/footer.html.php';?>
+30 -20
View File
@@ -13,38 +13,48 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/chosen.html.php';?>
<?php js::set('roleGroup', $roleGroup);?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['user']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->user->batchCreate;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table class='table-1 fixed'>
<caption><?php echo $lang->user->batchCreate;?></caption>
<tr>
<th class='w-20px'><?php echo $lang->idAB;?></th>
<th class='w-150px'><?php echo $lang->user->dept;?></th>
<th class='w-130px red'><?php echo $lang->user->account;?></th>
<th class='w-130px red'><?php echo $lang->user->realname;?></th>
<th class='w-100px red'><?php echo $lang->user->role;?></th>
<th class='w-100px'><?php echo $lang->user->group;?></th>
<th><?php echo $lang->user->email;?></th>
<th class='w-70px'><?php echo $lang->user->gender;?></th>
<th class="red"><?php echo $lang->user->password;?></th>
</tr>
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-40px'><?php echo $lang->idAB;?></th>
<th class='w-150px'><?php echo $lang->user->dept;?></th>
<th class='w-130px red'><?php echo $lang->user->account;?></th>
<th class='w-130px red'><?php echo $lang->user->realname;?></th>
<th class='w-100px red'><?php echo $lang->user->role;?></th>
<th class='w-100px'><?php echo $lang->user->group;?></th>
<th><?php echo $lang->user->email;?></th>
<th class='w-90px'><?php echo $lang->user->gender;?></th>
<th class="red"><?php echo $lang->user->password;?></th>
</tr>
</thead>
<?php $depts = $depts + array('ditto' => $lang->user->ditto)?>
<?php $lang->user->roleList = $lang->user->roleList + array('ditto' => $lang->user->ditto)?>
<?php $groupList = $groupList + array('ditto' => $lang->user->ditto)?>
<?php for($i = 0; $i < $config->user->batchCreate; $i++):?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control'");?>
<td><?php echo html::input("account[$i]", '', "class='text-1 account_$i' autocomplete='off' onchange='changeEmail($i)'");?></td>
<td><?php echo html::select("dept[$i]", $depts, $i > 0 ? 'ditto' : $deptID, "class='form-control'");?></td>
<td><?php echo html::input("account[$i]", '', "class='form-control account_$i' autocomplete='off' onchange='changeEmail($i)'");?></td>
<td><?php echo html::input("realname[$i]", '', "class='form-control'");?></td>
<td><?php echo html::select("role[$i]", $lang->user->roleList, $i > 0 ? 'ditto' : '', "class='form-control' onchange='changeGroup(this.value, $i)'");?></td>
<td><?php echo html::select("group[$i]", $groupList, $i > 0 ? 'ditto' : '', "class='form-control'");?></td>
<td><?php echo html::input("email[$i]", '', "class='text-1 email_$i' onchange='setDefaultEmail($i)'");?></td>
<td><?php echo html::input("email[$i]", '', "class='form-control email_$i' onchange='setDefaultEmail($i)'");?></td>
<td><?php echo html::radio("gender[$i]", (array)$lang->user->genderList, 'm');?></td>
<td align='left'>
<?php
echo html::input("password[$i]", '', "class='w-p70' autocomplete='off' onkeyup='toggleCheck(this, $i)'");
if($i != 0) echo "<input type='checkbox' name='ditto[$i]' id='ditto$i' " . ($i> 0 ? "checked" : '') . " /> {$lang->user->ditto}";
?>
<div class='input-group'>
<?php
echo html::input("password[$i]", '', "class='form-control' autocomplete='off' onkeyup='toggleCheck(this, $i)'");
if($i != 0) echo "<span class='input-group-addon'><input type='checkbox' name='ditto[$i]' id='ditto$i' " . ($i> 0 ? "checked" : '') . " /> {$lang->user->ditto}</span>";
?>
</div>
</td>
</tr>
<?php endfor;?>
+57 -50
View File
@@ -14,55 +14,62 @@
<?php include '../../common/view/datepicker.html.php';?>
<?php js::set('holders', $lang->user->placeholder);?>
<?php js::set('roleGroup', $roleGroup);?>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table align='center' class='table-5'>
<caption><?php echo $lang->user->create;?></caption>
<tr>
<th><?php echo $lang->user->dept;?></th>
<td><?php echo html::select('dept', $depts, $deptID, "class='form-control'");?>
</tr>
<tr>
<th><?php echo $lang->user->account;?></th>
<td><?php echo html::input('account', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->realname;?></th>
<td><?php echo html::input('realname', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->password;?></th>
<td><?php echo html::password('password1', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->password2;?></th>
<td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->role;?></th>
<td><?php echo html::select('role', $lang->user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->group;?></th>
<td><?php echo html::select('group', $groupList, '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->email;?></th>
<td><?php echo html::input('email', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->commiter;?></th>
<td><?php echo html::input('commiter', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->join;?></th>
<td><?php echo html::input('join', '', "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->gender;?></th>
<td><?php echo html::radio('gender', (array)$lang->user->genderList, 'm');?></td>
</tr>
<div class='container mw-600px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['user']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->user->create;?></strong>
</div>
</div>
<form class='form-condensed mw-500px' method='post' target='hiddenwin' id='dataform'>
<table align='center' class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->user->dept;?></th>
<td><?php echo html::select('dept', $depts, $deptID, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->account;?></th>
<td><?php echo html::input('account', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->realname;?></th>
<td><?php echo html::input('realname', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->password;?></th>
<td><?php echo html::password('password1', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->password2;?></th>
<td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->role;?></th>
<td><?php echo html::select('role', $lang->user->roleList, '', "class='form-control' onchange='changeGroup(this.value)'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->group;?></th>
<td><?php echo html::select('group', $groupList, '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->email;?></th>
<td><?php echo html::input('email', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->commiter;?></th>
<td><?php echo html::input('commiter', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->join;?></th>
<td><?php echo html::input('join', '', "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->gender;?></th>
<td><?php echo html::radio('gender', (array)$lang->user->genderList, 'm');?></td>
</tr>
<tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</table>
</form>
<tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>