Skip to content

Commit

Permalink
* ajusted views
Browse files Browse the repository at this point in the history
  • Loading branch information
@catouse
catouse committed Mar 22, 2014
1 parent 1e4d342 commit d4fae43
Show file tree
Hide file tree
Showing 23 changed files with 519 additions and 418 deletions.
2 changes: 1 addition & 1 deletion module/doc/view/create.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('holders ', $lang->doc->placeholder);?>
<div class='container w-900px'>
<div class='container mw-900px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['doc']);?></span>
Expand Down
4 changes: 2 additions & 2 deletions module/doc/view/edit.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
setType(type);
});
</script>
<div class='container w-900px'>
<div class='container mw-900px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['doc']) . ' #' . $doc->id;?></span>
<strong><?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title);?></strong>
<small class='text-muted'> <?php echo $lang->doc->edit;?> <i class='icon icon-pencil'></i></small>
<small class='text-muted'> <?php echo html::icon($lang->icons['edit']) . ' ' . $lang->doc->edit;?></small>
</div>
</div>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
Expand Down
10 changes: 5 additions & 5 deletions module/doc/view/view.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,23 +85,23 @@
<tr>
<th class='rowhead'><?php echo $lang->doc->type;?></th>
<td><?php echo $lang->doc->types[$doc->type];?></td>
</tr>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->doc->addedBy;?></th>
<td><?php echo $users[$doc->addedBy];?></td>
</tr>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->doc->addedDate;?></th>
<td><?php echo $doc->addedDate;?></td>
</tr>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->doc->editedBy;?></th>
<td><?php echo $users[$doc->editedBy];?></td>
</tr>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->doc->editedDate;?></th>
<td><?php echo $doc->editedDate;?></td>
</tr>
</tr>
</table>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion module/my/css/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.panel > .table > thead > tr > th, .panel > form > .table > thead > tr > th {background: #f1f1f1}
.panel-block td, .panel-block th {padding: 6px;}
.panel-block.dynamic td {padding: 6px 6px 5px}
.panel-block tr > td:first-child, .panel-block tr > th:first-child {padding-left: 10px;}
.panel-block tr > td:first-child, .panel-block tr > th:first-child, .outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 10px;}
.panel-block td .progressbar {display: inline-block; height: 16px; background: #229F24;}
.panel-block .icon {color: #666; display: inline-block; margin-right: 2px;}
#wrap .outer {padding: 20px 20px 0}
Expand Down
2 changes: 1 addition & 1 deletion module/my/view/blockproducts.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<table class='table table-condensed table-hover table-striped table-borderless'>
<thead>
<tr class='text-center'>
<th class='w-150px text-left'><div class='f-left'><i class="icon icon-cube"></i> <?php echo $lang->product->name;?></div></th>
<th class='w-150px text-left'><i class="icon icon-cube"></i> <?php echo $lang->product->name;?></th>
<th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['active'];?></th>
<th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['changed'];?></th>
<th title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['draft'];?></th>
Expand Down
2 changes: 1 addition & 1 deletion module/my/view/changepassword.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div class='container w-500px'>
<div class='container mw-500px'>
<div id='featurebar'>
<div class='heading'><i class='icon-key'></i> <?php echo $lang->my->changePassword;?></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion module/my/view/editprofile.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<div class='container w-800px'>
<div class='container mw-800px'>
<div id='featurebar'>
<div class='heading'><i class='icon-pencil'></i> <?php echo $lang->my->editProfile;?></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion module/my/view/profile.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div class='container w-600px'>
<div class='container mw-600px'>
<div id='featurebar'>
<div class='heading'><i class='icon-user'></i> <?php echo $lang->my->profile;?></div>
<div class='btn-group pull-right'>
Expand Down
1 change: 1 addition & 0 deletions module/product/lang/zh-cn.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
$lang->product->create = "新增产品";
$lang->product->read = "产品详情";
$lang->product->delete = "删除产品";
$lang->product->deleted = "已删除";
$lang->product->close = "关闭";
$lang->product->select = '--请选择产品--';
$lang->product->mine = '我负责：';
Expand Down
2 changes: 1 addition & 1 deletion module/product/view/index.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<div class='block' id='productbox'>
<?php if(empty($productStats)):?>
<div class='container w-500px'>
<div class='container mw-500px'>
<div class='alert'>
<i class='icon icon-info-sign'></i>
<div class='content'>
Expand Down
2 changes: 1 addition & 1 deletion module/product/view/roadmap.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div class='container w-900px'>
<div class='container mw-900px'>
<div id='featurebar'><div class='heading'><i class='icon-code-fork'></i> <?php echo $lang->product->roadmap;?></div></div>
<table class='table-grid w-p100'>
<?php
Expand Down
2 changes: 1 addition & 1 deletion module/product/view/view.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><i class='icon-cube'></i> #<?php echo $product->id;?></span>
<span class='prefix'><?php echo html::icon($lang->icons['product']) . ' #' . $product->id;?></span>
<strong><?php echo $product->name;?></strong>
<?php if($product->deleted):?>
<small class='label label-danger'><?php echo $lang->product->deleted;?></small>
Expand Down
84 changes: 47 additions & 37 deletions module/productplan/view/create.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,51 @@
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::import($jsRoot . 'misc/date.js');?>
<form method='post' target='hiddenwin' id='dataform'>
<table class='table-1'>
<caption><?php echo $lang->productplan->create;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->productplan->product;?></th>
<td><?php echo $product->name;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->title;?></th>
<td><?php echo html::input('title', '', "class='text-3'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->begin;?></th>
<td><?php echo html::input('begin', $begin, "class='text-3 date'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->end;?></th>
<td>
<?php echo html::input('end', '', "class='text-3 date'");?>
<span><?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?></span>
</td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->desc;?></th>
<td><?php echo html::textarea('desc', '', "rows='10' class='area-1'");?></td>
</tr>
<tr>
<td colspan='2' class='a-center'>
<?php
echo html::submitButton();
echo html::backButton();
echo html::hidden('product', $product->id);
?>
</td>
</tr>
</table>
</form>
<div class='container mw-900px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['plan']);?></span>
<strong><small class='text-muted'><i class='icon icon-plus'></i></small> <?php echo $lang->productplan->create;?></strong>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->productplan->product;?></th>
<td class='w-p45'><?php echo $product->name;?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->productplan->title;?></th>
<td><?php echo html::input('title', '', "class='form-control'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->productplan->begin;?></th>
<td><?php echo html::input('begin', $begin, "class='form-control date'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->productplan->end;?></th>
<td colspan='2'>
<div class='input-group w-p100'>
<?php echo html::input('end', '', "class='form-control form-date'");?>
<span class='input-group-addon'><?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?></span>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->productplan->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();
echo html::backButton();
echo html::hidden('product', $product->id);
?>
</td>
</tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>
77 changes: 43 additions & 34 deletions module/productplan/view/edit.html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,47 @@
<?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'>
<table class='table-1'>
<caption><?php echo $lang->productplan->edit;?></caption>
<tr>
<th class='rowhead'><?php echo $lang->productplan->product;?></th>
<td><?php echo $product->name;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->title;?></th>
<td><?php echo html::input('title', $plan->title, 'class="text-3"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->begin;?></th>
<td><?php echo html::input('begin', $plan->begin, 'class="text-3 date"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->end;?></th>
<td><?php echo html::input('end', $plan->end, 'class="text-3 date"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->productplan->desc;?></th>
<td><?php echo html::textarea('desc', $plan->desc, "rows='10' class='area-1'");?></td>
</tr>
<tr>
<td colspan='2' class='a-center'>
<?php
echo html::submitButton();
echo html::backButton();
echo html::hidden('product', $product->id);
?>
</td>
</tr>
</table>
</form>
<div class='container mw-900px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['plan']);?></span>
<strong><?php echo html::a(inlink('view', "id=$plan->id"), $plan->title);?></strong>
<small><?php echo html::icon($lang->icons['edit']) . ' ' . $lang->productplan->edit;?></small>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->productplan->product;?></th>
<td class='w-p45'><?php echo $product->name;?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->productplan->title;?></th>
<td><?php echo html::input('title', $plan->title, 'class="form-control"');?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->productplan->begin;?></th>
<td><?php echo html::input('begin', $plan->begin, 'class="form-control date"');?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->productplan->end;?></th>
<td><?php echo html::input('end', $plan->end, 'class="form-control form-date"');?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->productplan->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', $plan->desc, "rows='10' class='form-control'");?></td>
</tr>
<tr>
<td></td>
<td colspan='2'>
<?php
echo html::submitButton();
echo html::backButton();
echo html::hidden('product', $product->id);
?>
</td>
</tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>
Loading

0 comments on commit d4fae43

Please sign in to comment.