Revision: 1883
http://mrbs.svn.sourceforge.net/mrbs/?rev=1883&view=rev
Author: cimorrison
Date: 2011-08-24 10:21:44 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Fixed the start and end time columns so that they sort properly
Modified Paths:
--------------
mrbs/branches/datatables/web/jquery/datatables/css/mrbs-table.css
mrbs/branches/datatables/web/report.php
Modified: mrbs/branches/datatables/web/jquery/datatables/css/mrbs-table.css
===================================================================
--- mrbs/branches/datatables/web/jquery/datatables/css/mrbs-table.css
2011-08-24 09:52:34 UTC (rev 1882)
+++ mrbs/branches/datatables/web/jquery/datatables/css/mrbs-table.css
2011-08-24 10:21:44 UTC (rev 1883)
@@ -1,4 +1,4 @@
-/* $Id */
+/* $Id$ */
/*
* File: demo_table.css
@@ -33,78 +33,78 @@
*/
.dataTables_wrapper {
- position: relative;
- min-height: 302px;
- clear: both;
- _height: 302px;
- zoom: 1; /* Feeling sorry for IE */
+ position: relative;
+ min-height: 302px;
+ clear: both;
+ _height: 302px;
+ zoom: 1; /* Feeling sorry for IE */
}
.dataTables_processing {
- position: absolute;
- top: 50%;
- left: 50%;
- width: 250px;
- height: 30px;
- margin-left: -125px;
- margin-top: -15px;
- padding: 14px 0 2px 0;
- border: 1px solid #ddd;
- text-align: center;
- color: #999;
- font-size: 14px;
- background-color: white;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 250px;
+ height: 30px;
+ margin-left: -125px;
+ margin-top: -15px;
+ padding: 14px 0 2px 0;
+ border: 1px solid #ddd;
+ text-align: center;
+ color: #999;
+ font-size: 14px;
+ background-color: white;
}
.dataTables_length {
- width: 40%;
- float: left;
- margin-bottom: 10px;
+ width: 40%;
+ float: left;
+ margin-bottom: 10px;
}
.dataTables_filter {
- width: 50%;
- float: right;
- text-align: right;
- margin-bottom: 10px;
+ width: 50%;
+ float: right;
+ text-align: right;
+ margin-bottom: 10px;
}
.dataTables_info {
- width: 60%;
- float: left;
+ width: 60%;
+ float: left;
margin-top: 10px;
}
.dataTables_paginate {
- width: 44px;
- * width: 50px;
- float: right;
- text-align: right;
- margin-top: 10px;
+ width: 44px;
+ * width: 50px;
+ float: right;
+ text-align: right;
+ margin-top: 10px;
}
/* Pagination nested */
.paginate_disabled_previous, .paginate_enabled_previous,
.paginate_disabled_next, .paginate_enabled_next {
- height: 19px;
- width: 19px;
- margin-left: 3px;
- float: left;
+ height: 19px;
+ width: 19px;
+ margin-left: 3px;
+ float: left;
}
.paginate_disabled_previous {
- background-image: url('../images/back_disabled.jpg');
+ background-image: url('../images/back_disabled.jpg');
}
.paginate_enabled_previous {
- background-image: url('../images/back_enabled.jpg');
+ background-image: url('../images/back_enabled.jpg');
}
.paginate_disabled_next {
- background-image: url('../images/forward_disabled.jpg');
+ background-image: url('../images/forward_disabled.jpg');
}
.paginate_enabled_next {
- background-image: url('../images/forward_enabled.jpg');
+ background-image: url('../images/forward_enabled.jpg');
}
@@ -113,22 +113,22 @@
* DataTables display
*/
table.display {
- margin: 0 auto;
- clear: both;
- width: 100%;
-
- /* Note Firefox 3.5 and before have a bug with border-collapse
- * ( https://bugzilla.mozilla.org/show%5Fbug.cgi?id=155955 )
- * border-spacing: 0; is one possible option. Conditional-css.com is
- * useful for this kind of thing
- *
- * Further note IE 6/7 has problems when calculating widths with border
width.
- * It subtracts one px relative to the other browsers from the first
column, and
- * adds one to the end...
- *
- * If you want that effect I'd suggest setting a border-top/left on
th/td's and
- * then filling in the gaps with other borders.
- */
+ margin: 0 auto;
+ clear: both;
+ width: 100%;
+
+ /* Note Firefox 3.5 and before have a bug with border-collapse
+ * ( https://bugzilla.mozilla.org/show%5Fbug.cgi?id=155955 )
+ * border-spacing: 0; is one possible option. Conditional-css.com is
+ * useful for this kind of thing
+ *
+ * Further note IE 6/7 has problems when calculating widths with border
width.
+ * It subtracts one px relative to the other browsers from the first column,
and
+ * adds one to the end...
+ *
+ * If you want that effect I'd suggest setting a border-top/left on th/td's
and
+ * then filling in the gaps with other borders.
+ */
}
table.display th, table.display td {
@@ -146,23 +146,23 @@
*/
.sorting_asc {
- background: url('../images/sort_asc.png') no-repeat center right;
+ background: url('../images/sort_asc.png') no-repeat center right;
}
.sorting_desc {
- background: url('../images/sort_desc.png') no-repeat center right;
+ background: url('../images/sort_desc.png') no-repeat center right;
}
.sorting {
- background: url('../images/sort_both.png') no-repeat center right;
+ background: url('../images/sort_both.png') no-repeat center right;
}
.sorting_asc_disabled {
- background: url('../images/sort_asc_disabled.png') no-repeat center
right;
+ background: url('../images/sort_asc_disabled.png') no-repeat center right;
}
.sorting_desc_disabled {
- background: url('../images/sort_desc_disabled.png') no-repeat center
right;
+ background: url('../images/sort_desc_disabled.png') no-repeat center right;
}
@@ -173,44 +173,44 @@
* DataTables row classes
*/
table.display tr.odd.gradeA {
- background-color: #ddffdd;
+ background-color: #ddffdd;
}
table.display tr.even.gradeA {
- background-color: #eeffee;
+ background-color: #eeffee;
}
table.display tr.odd.gradeC {
- background-color: #ddddff;
+ background-color: #ddddff;
}
table.display tr.even.gradeC {
- background-color: #eeeeff;
+ background-color: #eeeeff;
}
table.display tr.odd.gradeX {
- background-color: #ffdddd;
+ background-color: #ffdddd;
}
table.display tr.even.gradeX {
- background-color: #ffeeee;
+ background-color: #ffeeee;
}
table.display tr.odd.gradeU {
- background-color: #ddd;
+ background-color: #ddd;
}
table.display tr.even.gradeU {
- background-color: #eee;
+ background-color: #eee;
}
tr.odd {
- background-color: #E2E4FF;
+ background-color: #E2E4FF;
}
tr.even {
- background-color: white;
+ background-color: white;
}
@@ -221,92 +221,92 @@
* Misc
*/
.dataTables_scroll {
- clear: both;
+ clear: both;
}
.dataTables_scrollBody {
- *margin-top: -1px;
+ *margin-top: -1px;
}
.top, .bottom {
- padding: 15px;
- background-color: #F5F5F5;
- border: 1px solid #CCCCCC;
+ padding: 15px;
+ background-color: #F5F5F5;
+ border: 1px solid #CCCCCC;
}
.top .dataTables_info {
- float: none;
+ float: none;
}
.clear {
- clear: both;
+ clear: both;
}
.dataTables_empty {
- text-align: center;
+ text-align: center;
}
tfoot input {
- margin: 0.5em 0;
- width: 100%;
- color: #444;
+ margin: 0.5em 0;
+ width: 100%;
+ color: #444;
}
tfoot input.search_init {
- color: #999;
+ color: #999;
}
td.group {
- background-color: #d1cfd0;
- border-bottom: 2px solid #A19B9E;
- border-top: 2px solid #A19B9E;
+ background-color: #d1cfd0;
+ border-bottom: 2px solid #A19B9E;
+ border-top: 2px solid #A19B9E;
}
td.details {
- background-color: #d1cfd0;
- border: 2px solid #A19B9E;
+ background-color: #d1cfd0;
+ border: 2px solid #A19B9E;
}
.example_alt_pagination div.dataTables_info {
- width: 40%;
+ width: 40%;
}
.paging_full_numbers {
- width: 400px;
- height: 22px;
- line-height: 22px;
+ width: 400px;
+ height: 22px;
+ line-height: 22px;
}
.paging_full_numbers span.paginate_button,
- .paging_full_numbers span.paginate_active {
- border: 1px solid #aaa;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- padding: 2px 5px;
- margin: 0 3px;
- cursor: pointer;
- *cursor: hand;
+ .paging_full_numbers span.paginate_active {
+ border: 1px solid #aaa;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ padding: 2px 5px;
+ margin: 0 3px;
+ cursor: pointer;
+ *cursor: hand;
}
.paging_full_numbers span.paginate_button {
- background-color: #ddd;
+ background-color: #ddd;
}
.paging_full_numbers span.paginate_button:hover {
- background-color: #ccc;
+ background-color: #ccc;
}
.paging_full_numbers span.paginate_active {
- background-color: #99B3FF;
+ background-color: #99B3FF;
}
table.display tr.even.row_selected td {
- background-color: #B0BED9;
+ background-color: #B0BED9;
}
table.display tr.odd.row_selected td {
- background-color: #9FAFD1;
+ background-color: #9FAFD1;
}
@@ -315,134 +315,134 @@
*/
/* For the standard odd/even */
tr.odd td.sorting_1 {
- background-color: #D3D6FF;
+ background-color: #D3D6FF;
}
tr.odd td.sorting_2 {
- background-color: #DADCFF;
+ background-color: #DADCFF;
}
tr.odd td.sorting_3 {
- background-color: #E0E2FF;
+ background-color: #E0E2FF;
}
tr.even td.sorting_1 {
- background-color: #EAEBFF;
+ background-color: #EAEBFF;
}
tr.even td.sorting_2 {
- background-color: #F2F3FF;
+ background-color: #F2F3FF;
}
tr.even td.sorting_3 {
- background-color: #F9F9FF;
+ background-color: #F9F9FF;
}
/* For the Conditional-CSS grading rows */
/*
- Colour calculations (based off the main row colours)
+ Colour calculations (based off the main row colours)
Level 1:
- dd > c4
- ee > d5
- Level 2:
- dd > d1
- ee > e2
+ dd > c4
+ ee > d5
+ Level 2:
+ dd > d1
+ ee > e2
*/
tr.odd.gradeA td.sorting_1 {
- background-color: #c4ffc4;
+ background-color: #c4ffc4;
}
tr.odd.gradeA td.sorting_2 {
- background-color: #d1ffd1;
+ background-color: #d1ffd1;
}
tr.odd.gradeA td.sorting_3 {
- background-color: #d1ffd1;
+ background-color: #d1ffd1;
}
tr.even.gradeA td.sorting_1 {
- background-color: #d5ffd5;
+ background-color: #d5ffd5;
}
tr.even.gradeA td.sorting_2 {
- background-color: #e2ffe2;
+ background-color: #e2ffe2;
}
tr.even.gradeA td.sorting_3 {
- background-color: #e2ffe2;
+ background-color: #e2ffe2;
}
tr.odd.gradeC td.sorting_1 {
- background-color: #c4c4ff;
+ background-color: #c4c4ff;
}
tr.odd.gradeC td.sorting_2 {
- background-color: #d1d1ff;
+ background-color: #d1d1ff;
}
tr.odd.gradeC td.sorting_3 {
- background-color: #d1d1ff;
+ background-color: #d1d1ff;
}
tr.even.gradeC td.sorting_1 {
- background-color: #d5d5ff;
+ background-color: #d5d5ff;
}
tr.even.gradeC td.sorting_2 {
- background-color: #e2e2ff;
+ background-color: #e2e2ff;
}
tr.even.gradeC td.sorting_3 {
- background-color: #e2e2ff;
+ background-color: #e2e2ff;
}
tr.odd.gradeX td.sorting_1 {
- background-color: #ffc4c4;
+ background-color: #ffc4c4;
}
tr.odd.gradeX td.sorting_2 {
- background-color: #ffd1d1;
+ background-color: #ffd1d1;
}
tr.odd.gradeX td.sorting_3 {
- background-color: #ffd1d1;
+ background-color: #ffd1d1;
}
tr.even.gradeX td.sorting_1 {
- background-color: #ffd5d5;
+ background-color: #ffd5d5;
}
tr.even.gradeX td.sorting_2 {
- background-color: #ffe2e2;
+ background-color: #ffe2e2;
}
tr.even.gradeX td.sorting_3 {
- background-color: #ffe2e2;
+ background-color: #ffe2e2;
}
tr.odd.gradeU td.sorting_1 {
- background-color: #c4c4c4;
+ background-color: #c4c4c4;
}
tr.odd.gradeU td.sorting_2 {
- background-color: #d1d1d1;
+ background-color: #d1d1d1;
}
tr.odd.gradeU td.sorting_3 {
- background-color: #d1d1d1;
+ background-color: #d1d1d1;
}
tr.even.gradeU td.sorting_1 {
- background-color: #d5d5d5;
+ background-color: #d5d5d5;
}
tr.even.gradeU td.sorting_2 {
- background-color: #e2e2e2;
+ background-color: #e2e2e2;
}
tr.even.gradeU td.sorting_3 {
- background-color: #e2e2e2;
+ background-color: #e2e2e2;
}
@@ -450,43 +450,43 @@
* Row highlighting example
*/
.ex_highlight #example tbody tr.even:hover, #example tbody tr.even
td.highlighted {
- background-color: #ECFFB3;
+ background-color: #ECFFB3;
}
.ex_highlight #example tbody tr.odd:hover, #example tbody tr.odd
td.highlighted {
- background-color: #E6FF99;
+ background-color: #E6FF99;
}
.ex_highlight_row #example tr.even:hover {
- background-color: #ECFFB3;
+ background-color: #ECFFB3;
}
.ex_highlight_row #example tr.even:hover td.sorting_1 {
- background-color: #DDFF75;
+ background-color: #DDFF75;
}
.ex_highlight_row #example tr.even:hover td.sorting_2 {
- background-color: #E7FF9E;
+ background-color: #E7FF9E;
}
.ex_highlight_row #example tr.even:hover td.sorting_3 {
- background-color: #E2FF89;
+ background-color: #E2FF89;
}
.ex_highlight_row #example tr.odd:hover {
- background-color: #E6FF99;
+ background-color: #E6FF99;
}
.ex_highlight_row #example tr.odd:hover td.sorting_1 {
- background-color: #D6FF5C;
+ background-color: #D6FF5C;
}
.ex_highlight_row #example tr.odd:hover td.sorting_2 {
- background-color: #E0FF84;
+ background-color: #E0FF84;
}
.ex_highlight_row #example tr.odd:hover td.sorting_3 {
- background-color: #DBFF70;
+ background-color: #DBFF70;
}
@@ -494,34 +494,38 @@
* KeyTable
*/
table.KeyTable td {
- border: 3px solid transparent;
+ border: 3px solid transparent;
}
table.KeyTable td.focus {
- border: 3px solid #3366FF;
+ border: 3px solid #3366FF;
}
table.display tr.gradeA {
- background-color: #eeffee;
+ background-color: #eeffee;
}
table.display tr.gradeC {
- background-color: #ddddff;
+ background-color: #ddddff;
}
table.display tr.gradeX {
- background-color: #ffdddd;
+ background-color: #ffdddd;
}
table.display tr.gradeU {
- background-color: #ddd;
+ background-color: #ddd;
}
div.box {
- height: 100px;
- padding: 10px;
- overflow: auto;
- border: 1px solid #8080FF;
- background-color: #E5E5FF;
+ height: 100px;
+ padding: 10px;
+ overflow: auto;
+ border: 1px solid #8080FF;
+ background-color: #E5E5FF;
}
+table.display span {
+ display: none;
+}
+
Modified: mrbs/branches/datatables/web/report.php
===================================================================
--- mrbs/branches/datatables/web/report.php 2011-08-24 09:52:34 UTC (rev
1882)
+++ mrbs/branches/datatables/web/report.php 2011-08-24 10:21:44 UTC (rev
1883)
@@ -197,7 +197,16 @@
{
$start_date = time_date_string($row['start_time']);
}
- $values[] = escape($start_date);
+ if ($output_as_csv)
+ {
+ $values[] = escape($start_date);
+ }
+ else
+ {
+ // Include the numeric start time in a non-displayed span so that
+ // the column can be sorted properly
+ $values[] = "<span>" . $row['start_time'] . "</span>" .
escape($start_date);
+ }
// End date
if ($enable_periods)
@@ -208,7 +217,16 @@
{
$end_date = time_date_string($row['end_time']);
}
- $values[] = escape($end_date);
+ if ($output_as_csv)
+ {
+ $values[] = escape($end_date);
+ }
+ else
+ {
+ // Include the numeric start time in a non-displayed span so that
+ // the column can be sorted properly
+ $values[] = "<span>" . $row['end_time'] . "</span>" . escape($end_date);
+ }
// Duration
$d = get_duration($row['start_time'], $row['end_time']);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
