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

* ajusted style of chosen with input group in table foot.

Browse Source
This commit is contained in:
Catouse
2014-10-28 10:41:30 +08:00
parent 519b40b4e5
commit 9c3497e1d9
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/project/view/task.html.php
View File

@@ -39,7 +39,7 @@
</div>
<div class='main'>
<form method='post' id='projectTaskForm'>
<table class='table datatable' id='taskList'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed datatable' id='taskList'>
<?php $vars = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
<thead>
<tr>
@@ -72,7 +72,7 @@
<?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : ''; ?>
<tr class='text-center'>
<td>
<input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>'/>
<!-- <input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>'/> -->
<?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
</td>
<td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
@@ -164,8 +164,8 @@
$actionLink = $this->createLink('task', 'batchAssignTo', "projectID=$projectID");
echo "<div class='input-group w-150px'>";
echo html::select('assignedTo', $memberPairs, '', 'class="form-control chosen"');
echo "<span class='input-group-addon'>";
echo html::a("javascript:setFormAction(\"$actionLink\")", $lang->task->assign);
echo "<span class='input-group-btn'>";
echo html::a("javascript:setFormAction(\"$actionLink\")", $lang->task->assign, '', "class='btn'");
echo '</span></div>';
}
}

10
www/theme/default/style.css
View File

@@ -82,9 +82,6 @@ hr.small {margin: 10px 0}
/* Table */
.table td .input[type="radio"], .table td input[type="checkbox"] {margin-top: 1px; position: relative; top: 2px}
.table-fixed {table-layout: fixed;}
.table-fixed th, .table-fixed td {overflow:hidden; white-space:nowrap;}
.table-fixed tfoot > tr > th, .table-fixed tfoot > tr > td, .table-fixed .nofixed{overflow: visible;}
.table-borderless {border: none!important}
/* Tables sorters */
@@ -104,6 +101,11 @@ hr.small {margin: 10px 0}
.table caption {padding: 8px 20px; border: 1px solid #DDD; border-bottom: 0; background: #fafafa;}
.table.table-condensed caption {padding: 6px 15px;}
/* Datatable */
.table-datatable tbody > tr td,
.table-datatable thead > tr th {max-height: 34px; line-height: 21px;}
.table-datatable tbody > tr td .btn-icon > i {line-height: 19px;}
/* Datepicker */
.datepicker-wrapper {position: relative; cursor: pointer;}
.datepicker-wrapper:before {font-family: ZenIcon; content: '\e617'; display: block; position: absolute; right: 8px; color: #808080; font-size: 14px; top: 5px;}
@@ -502,6 +504,8 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
.outer .table tfoot .datepicker-wrapper:before {top: 5px}
.outer .table tfoot .form-control.form-date {width: 110px}
.outer .table tfoot .input-wrapper {display: inline-block;}
.outer .table tfoot .chosen-single {padding: 4px 6px; height: 30px; }
.outer .table tfoot .chosen-container-single .chosen-single abbr {top: 4px;}
.table-actions {float: left;}
.table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group, .table-actions > .text {float: left; margin-right: 10px;}
.table-actions > .text {line-height: 30px; color: #808080}