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

* ajusted grid layout.

Browse Source 
* ajusted style of treeview.
This commit is contained in:
Catouse
2014-05-02 10:37:15 +08:00
parent bb4db397d1
commit a84ef67f6d
18 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/edit.html.php
+3 -3
View File
@@ -39,8 +39,8 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<?php echo html::submitButton($lang->save)?>
</div>
</div>
<div class='row'>
<div class='col-md-8'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<div class='form-group'>
<?php echo html::input('title', str_replace("'","&#039;",$bug->title), 'class="form-control" placeholder="' . $lang->bug->title . '"');?>
@@ -67,7 +67,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div class='col-md-4'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->bug->legendBasicInfo;?></legend>
module/bug/view/view.html.php
+3 -3
View File
@@ -63,8 +63,8 @@
</div>
</div>
<div class='row'>
<div class='col-md-8 col-lg-9'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->bug->legendSteps;?></legend>
@@ -84,7 +84,7 @@
</fieldset>
</div>
</div>
<div class='col-md-4 col-lg-3'>
<div class='col-side'>
<div class='main main-side'>
<div class='tabs'>
<ul class='nav nav-tabs'>
module/build/view/view.html.php
+3 -3
View File
@@ -20,8 +20,8 @@
<?php endif; ?>
</div>
</div>
<div class='row'>
<div class='col-md-8'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->build->desc;?></legend>
@@ -123,7 +123,7 @@
</div>
</div>
</div>
<div class='col-md-4'>
<div class='col-side'>
<div class='main-side main'>
<fieldset>
<legend><?php echo $lang->build->basicInfo?></legend>
module/doc/view/view.html.php
+3 -3
View File
@@ -45,8 +45,8 @@
?>
</div>
</div>
<div class='row'>
<div class='col-md-8 col-lg-9'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->doc->digest;?></legend>
@@ -75,7 +75,7 @@
<div class='actions'><?php if(!$doc->deleted) echo $actionLinks;?></div>
</div>
</div>
<div class='col-md-4 col-lg-3'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->doc->basicInfo;?></legend>
module/my/view/index.html.php
+7 -7
View File
@@ -22,28 +22,28 @@
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-4 col-sm-6">
<?php include './blocktodoes.html.php';?>
</div>
<?php if($app->user->role and strpos('qa|qd', $app->user->role) !== false):?>
<div class="col-md-4">
<div class="col-md-4 col-sm-6">
<?php include './blockbugs.html.php';?>
</div>
<div class="col-md-4">
<div class="col-md-4 col-sm-6">
<?php include './blocktasks.html.php';?>
</div>
<?php elseif($app->user->role and strpos('po|pd', $app->user->role) !== false):?>
<div class="col-md-4">
<div class="col-md-4 col-sm-6">
<?php include './blockstories.html.php';?>
</div>
<div class="col-md-4">
<div class="col-md-4 col-sm-6">
<?php include './blockbugs.html.php';?>
</div>
<?php else:?>
<div class="col-md-4">
<div class="col-md-4 col-sm-6">
<?php include './blocktasks.html.php';?>
</div>
<div class="col-md-4">
<div class="col-md-4 col-sm-6">
<?php include './blockbugs.html.php';?>
</div>
<?php endif;?>
module/product/view/view.html.php
+3 -3
View File
@@ -45,8 +45,8 @@
?>
</div>
</div>
<div class='row'>
<div class='col-md-8 col-lg-9'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->product->desc;?></legend>
@@ -56,7 +56,7 @@
<div class='actions'><?php if(!$product->deleted) echo $actionLinks;?></div>
</div>
</div>
<div class='col-md-4 col-lg-3'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->product->basicInfo?></legend>
module/project/view/view.html.php
+3 -3
View File
@@ -51,8 +51,8 @@
?>
</div>
</div>
<div class='row'>
<div class='col-md-8 col-lg-9'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->project->desc;?></legend>
@@ -62,7 +62,7 @@
<div class='actions'> <?php if(!$project->deleted) echo $actionLinks;?></div>
</div>
</div>
<div class='col-md-4 col-lg-3'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->project->basicInfo?></legend>
module/release/view/view.html.php
+3 -3
View File
@@ -46,8 +46,8 @@
?>
</div>
</div>
<div class='row'>
<div class='col-md-8'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->release->desc;?></legend>
@@ -162,7 +162,7 @@
</div>
</div>
</div>
<div class='col-md-4'>
<div class='col-side'>
<div class='main-side main'>
<fieldset>
<legend><?php echo $lang->release->basicInfo?></legend>
module/story/lang/zh-cn.php
+1
View File
@@ -24,6 +24,7 @@ $lang->story->batchClose = '批量关闭';
$lang->story->activate = '激活';
$lang->story->delete = "删除";
$lang->story->view = "需求详情";
$lang->story->legend = "相关";
$lang->story->tasks = "相关任务";
$lang->story->taskCount = '任务数';
$lang->story->bugs = "Bug";
module/story/view/edit.html.php
+3 -3
View File
@@ -22,8 +22,8 @@
<?php echo html::submitButton($lang->save)?>
</div>
</div>
<div class='row'>
<div class='col-md-8'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->story->legendSpec;?></legend>
@@ -48,7 +48,7 @@
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div class='col-md-4'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->story->legendBasicInfo;?></legend>
module/task/view/edit.html.php
+3 -3
View File
@@ -28,8 +28,8 @@
<?php echo html::submitButton($lang->save)?>
</div>
</div>
<div class='row'>
<div class='col-md-8'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<div class='form-group'>
<?php echo html::input('name', $task->name, 'class="form-control" placeholder="' . $lang->task->name . '"');?>
@@ -54,7 +54,7 @@
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div class='col-md-4'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->task->legendBasic;?></legend>
module/task/view/view.html.php
+3 -3
View File
@@ -62,8 +62,8 @@
?>
</div>
</div>
<div class='row'>
<div class='col-md-8 col-lg-9'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->task->legendDesc;?></legend>
@@ -81,7 +81,7 @@
</fieldset>
</div>
</div>
<div class='col-md-4 col-lg-3'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->task->legendBasic;?></legend>
module/testcase/view/edit.html.php
+3 -3
View File
@@ -27,8 +27,8 @@
<?php echo html::submitButton($lang->save)?>
</div>
</div>
<div class='row'>
<div class='col-md-8'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<div class='form-group'>
<?php echo html::input('title', $case->title, 'class="form-control" placeholder="' . $lang->case->title . '"');?>
@@ -83,7 +83,7 @@
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div class='col-md-4'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->testcase->legendBasicInfo;?></legend>
module/testcase/view/view.html.php
+3 -3
View File
@@ -72,8 +72,8 @@
</div>
</div>
<div class='row'>
<div class='col-md-8 col-lg-9'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->testcase->precondition;?></legend>
@@ -115,7 +115,7 @@
</fieldset>
</div>
</div>
<div class='col-md-4 col-lg-3'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->testcase->legendBasicInfo;?></legend>
module/testtask/view/view.html.php
+3 -3
View File
@@ -50,8 +50,8 @@
?>
</div>
</div>
<div class='row'>
<div class='col-md-8 col-lg-9'>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->testtask->legendDesc;?></legend>
@@ -65,7 +65,7 @@
<div class='actions'><?php echo $actionLinks;?></div>
</div>
</div>
<div class='col-md-4 col-lg-3'>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->testtask->legendBasicInfo;?></legend>
module/tree/view/browse.html.php
+2 -2
View File
@@ -16,7 +16,7 @@
<div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?> </div>
</div>
<div class='row'>
<div class='col-md-4 col-lg-3'>
<div class='col-sm-6 col-md-4 col-lg-3'>
<form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'updateOrder', "root={$root->id}&viewType=$viewType");?>'>
<div class='panel'>
<div class='panel-heading'>
@@ -31,7 +31,7 @@
</div>
</form>
</div>
<div class='col-md-8 col-lg-9'>
<div class='col-sm-6 col-md-8 col-lg-9'>
<form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=$viewType");?>'>
<div class='panel'>
<div class='panel-heading'>
module/tree/view/browsetask.html.php
+2 -2
View File
@@ -16,7 +16,7 @@
<div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?> </div>
</div>
<div class='row'>
<div class='col-md-4 col-lg-3'>
<div class='col-sm-6 col-md-4 col-lg-3'>
<form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'updateOrder', "root={$root->id}&viewType=task");?>'>
<div class='panel'>
<div class='panel-heading'>
@@ -31,7 +31,7 @@
</div>
</form>
</div>
<div class='col-md-8 col-lg-9'>
<div class='col-sm-6 col-md-8 col-lg-9'>
<form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=task");?>'>
<div class='panel'>
<div class='panel-heading'>
www/theme/default/treeview.css
+3 -3
View File
@@ -1,8 +1,8 @@
/*treeview*/
.treeview .hitarea {position: absolute; left: 15px; top: 10px; background-color: #fff; cursor: pointer;}
.treeview > li > .hitarea {left: -1px; top: -1px;}
.treeview .hitarea {position: absolute; left: 15px; top: 5px; background-color: #fff; cursor: pointer;}
.treeview > li > .hitarea {left: -1px; top: 0px;}
.treeview .hitarea:before {color: #999; content: '\e6f1'; font-family: ZenIcon; transition:all 0.3s; font-size: 14px}
.treeview li:hover .hitarea:before {color: #2973EA;}
.treeview .hitarea.collapsable-hitarea:before {content: '\e6f2';}
.treeview .form-control {padding: 1px 2px; height: 22px; display: inline-block;}
.treeview .form-control, .treeview input[type='text'] {padding: 1px 2px; height: 20px; display: inline-block;}