mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-16 03:30:49 +01:00
Timesheet: Display changes for totals
- Totals in row now bold - Duration in header set to h:m format - adjust vertical position of duration to be more in line with the rest
This commit is contained in:
parent
6d5d4be614
commit
4e02b2ec98
@ -837,7 +837,7 @@ class timesheet_ui extends timesheet_bo
|
||||
}
|
||||
$row['ts_start'] = $row['ts_unitprice'] = '';
|
||||
if (!$this->quantity_sum) $row['ts_quantity'] = '';
|
||||
$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete';
|
||||
$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete rowSum';
|
||||
$row['titleClass'] = 'timesheet_titleSum';
|
||||
continue;
|
||||
}
|
||||
|
@ -5,16 +5,22 @@
|
||||
*/
|
||||
|
||||
/* Allow project list selection in nm header to be large */
|
||||
#timesheet-index #timesheet-index_pm_id .ui-autocomplete.ui-menu
|
||||
{
|
||||
#timesheet-index #timesheet-index_pm_id .ui-autocomplete.ui-menu {
|
||||
max-height: 80%;
|
||||
}
|
||||
.timesheet_titleSum,.timesheet_titleDetails { font-weight: bold; }
|
||||
|
||||
.rowSum [id*='ts_quantity'], .rowSum [id*='ts_duration'], .timesheet_titleSum, .timesheet_titleDetails {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
table.egwGridView_grid tbody td[align=right] {
|
||||
padding-top: 0px;
|
||||
}
|
||||
|
||||
/* Let category & total columns line up vertically with the 2-element headers (Duration, Total, etc) */
|
||||
#timesheet-index .innerContainer > span {
|
||||
margin-bottom: 5px;
|
||||
display: inline-block;
|
||||
margin-bottom: 5px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
#timesheet-edit.et2_container {
|
||||
|
@ -54,7 +54,7 @@
|
||||
<nextmatch-sortheader label="Category" id="cat_id"/>
|
||||
<et2-vbox>
|
||||
<nextmatch-sortheader label="Duration" id="ts_duration"/>
|
||||
<et2-date-duration id="duration" readonly="true" ></et2-date-duration>
|
||||
<et2-date-duration id="duration" readonly="true" displayFormat="hm"></et2-date-duration>
|
||||
</et2-vbox>
|
||||
<et2-vbox>
|
||||
<nextmatch-sortheader label="Quantity" id="ts_quantity"/>
|
||||
|
Loading…
Reference in New Issue
Block a user