Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2016-12-01 13:39:50 +08:00
6 changed files with 18 additions and 6 deletions
+2
View File
@@ -3,3 +3,5 @@
.table-bordered tr > th:last-child, .table-bordered tr > td:last-child {border-right: 1px solid #ddd!important}
.col-side {width: 250px}
.panel-heading > strong > span {float: right; color: red;}
+4 -2
View File
@@ -39,7 +39,10 @@
<div class='col-main'>
<div class='panel panel-sm'>
<div class='panel-heading'>
<strong><?php echo $lang->bug->report->common;?></strong>
<strong>
<?php echo $lang->bug->report->common;?>
<span><?php echo $lang->report->notice->help?></span>
</strong>
</div>
<table class='table active-disabled'>
<?php foreach($charts as $chartType => $chartOption):?>
@@ -76,7 +79,6 @@
<?php endforeach;?>
</table>
</div>
<div class='alert alert-info'><?php echo $lang->report->notice->help?></div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
+2
View File
@@ -1,3 +1,5 @@
.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}
.panel-heading > strong > span {float: right; color: red;}
+4 -2
View File
@@ -39,7 +39,10 @@
<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>
<strong>
<?php echo $lang->story->report->common;?>
<span><?php echo $lang->report->notice->help;?></span>
</strong>
</div>
<table class='table active-disabled'>
<?php foreach($charts as $chartType => $chartOption):?>
@@ -75,7 +78,6 @@
<?php endforeach;?>
</table>
</div>
<div class='alert alert-info'><?php echo $lang->report->notice->help?></div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
+2
View File
@@ -1,3 +1,5 @@
.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}
.panel-heading > strong > span {float: right; color: red;}
+4 -2
View File
@@ -39,7 +39,10 @@
<div class='col-md-9 col-lg-10'>
<div class='panel panel-sm'>
<div class='panel-heading'>
<strong><?php echo $lang->task->report->common;?></strong>
<strong>
<?php echo $lang->task->report->common;?>
<span><?php echo $lang->report->notice->help?></span>
</strong>
</div>
<table class='table active-disabled'>
<?php foreach($charts as $chartType => $chartOption):?>
@@ -77,7 +80,6 @@
<?php endforeach;?>
</table>
</div>
<div class='alert alert-info'><?php echo $lang->report->notice->help?></div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>