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

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

Browse Source
This commit is contained in:
daitingting
2017-05-10 14:48:18 +08:00
parent b1fea69e50 1f16b7eff9
commit 0cdba9950f
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/datatable.html.php
+2 -1
View File
@@ -2,7 +2,7 @@
<?php if(!empty($lang->datatable)):?>
<style>
.table-datatable tbody > tr td,
.table-datatable thead > tr th {max-height: 34px; line-height: 21px;}
.table-datatable thead > tr th {height: 34px; line-height: 20px;}
.table-datatable tbody > tr td .btn-icon > i {line-height: 19px;}
.hide-side .table-datatable thead > tr > th.check-btn i {visibility: hidden;}
.hide-side .side-handle {line-height: 33px}
@@ -50,6 +50,7 @@ $(document).ready(function()
scrollPos : 'out',
tableClass : 'tablesorter',
storage : false,
fixCellHeight : false,
selectable :
{
clickBehavior: 'multi',
module/project/view/taskdata.html.php
+1 -1
View File
@@ -96,7 +96,7 @@
<td><?php echo $task->estimate;?></td>
<td><?php echo $task->consumed;?></td>
<td><?php echo $task->left;?></td>
<td><div class='progress-pie' title="<?php echo $task->progess?>%" data-value='<?php echo $task->progess;?>'></div></td>
<td><?php echo $task->progess?>%</td>
<?php
if($project->type == 'sprint')
{
module/task/model.php
+1 -1
View File
@@ -1646,7 +1646,7 @@ class taskModel extends model
echo round($task->left, 1);
break;
case 'progess':
echo "<div class='progress-pie' title='{$task->progess}%' data-value='{$task->progess}'></div>";
echo "{$task->progess}%";
break;
case 'deadline':
if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);
www/js/my.full.js
+1
View File
@@ -269,6 +269,7 @@ function setRequiredFields()
var $requiredDiv = $('<div class="input-group-required"><div class="required"></div></div>');
$ctlEle.after($requiredDiv);
$requiredDiv.find('.required').append($ctlEle);
if($ctlEle.is('select')) $requiredDiv.addClass('fix-pd-right');
}
else
{
www/js/zui/min.js
+3 -3
View File
File diff suppressed because one or more lines are too long
www/theme/default/style.css
+2 -1
View File
@@ -329,9 +329,10 @@ form .star {display: none;}/* hide star */
[class*="col-"].required {position: relative;}
[class*="col-"].required:after {position: absolute; top: 6px; right: 2px}
.control-label.required:after{right: -10px}
.input-group-required {display: table-cell; width: 100%; float: left; z-index: 2; position: relative;}
.input-group-required {display: table-cell; width: 100%; float: left; position: relative;}
.input-group-required > .required:after {z-index: 3; right: 6px; top: 2px;}
.input-group-required .form-control {float: none; display: block;}
.fix-pd-right.input-group-required > .required:after {right: 20px;}
.required-wrapper{position: relative;width: 100%; height: 0;overflow: visible;}
.required-wrapper.required:after{right: -13px;top: 4px}