Revision: 1953
http://mrbs.svn.sourceforge.net/mrbs/?rev=1953&view=rev
Author: cimorrison
Date: 2011-09-16 16:38:37 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
Formatting tweaks to pending table (still some problems with IE7)
Modified Paths:
--------------
mrbs/branches/datatables/web/Themes/default/header.inc
mrbs/branches/datatables/web/jquery/datatables/css/mrbs-table.css
mrbs/branches/datatables/web/mrbs-ielte7.css.php
mrbs/branches/datatables/web/mrbs.css.php
Modified: mrbs/branches/datatables/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-15
17:06:59 UTC (rev 1952)
+++ mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-16
16:38:37 UTC (rev 1953)
@@ -1227,13 +1227,17 @@
var subtables = maintable.find('tr.sub_table').detach();
<?php
// Set up the column definitions, fixing the widths of the first and
last columns
+ // Get the width of the last column by finding the width of the largest
content
+ // (assuming all the content is wrapped in the first child)
?>
- var actionWidth = $('div.div_buttons').eq(0).outerWidth() + 30; <?php
// 30 to allow for padding in the <td> ?>
+ var maxActionWidth = 0;
+ $('th:last-child, td:last-child').each(function() {
+ var actionWidth = $(this).children().eq(0).outerWidth(true);
+ maxActionWidth = Math.max(maxActionWidth, actionWidth);
+ });
+ maxActionWidth += 16; <?php // to allow for padding in the <td> ?>
var colDefsMain = [{"sWidth": "1.2em", "aTargets": [0] },
- {"sWidth": actionWidth + "px", "aTargets": [6] }];
- var colDefsSub = colDefsMain.slice(0);
- colDefsSub.push({"bSortable": false, "aTargets": [ 0 ]});
-
+ {"sWidth": maxActionWidth + "px", "aTargets": [6] }];
<?php
// Set up a click event that "opens" the table row and inserts the
subtable
?>
@@ -1243,11 +1247,8 @@
var nTr = $(this).parent();
var serial = nTr.attr('id').replace('row_', '');
var subtableId = 'subtable_' + serial;
- var subtable = subtables.find('#' +
subtableId).parent().clone();
-
- var colDefsSub = [{"bAutoWidth": false}];
- var columns = [];
-
+ var subtable = subtables.find('#' +
subtableId).parent().clone();
+ var columns = [];
<?php
// We want the columns in the main and sub tables to
align. So
// find the widths of the main table columns and use those
values
@@ -1284,7 +1285,7 @@
// bStateSave and sScrollX and comment out the FixedColumns.
?>
tableOptions.bStateSave = false;
- tableOptions.sScrollX = '';
+ tableOptions.sScrollX = '100%';
<?php
// Fix the left hand column. This has to be done when
// initialisation is complete as the language files are loaded
Modified: mrbs/branches/datatables/web/jquery/datatables/css/mrbs-table.css
===================================================================
--- mrbs/branches/datatables/web/jquery/datatables/css/mrbs-table.css
2011-09-15 17:06:59 UTC (rev 1952)
+++ mrbs/branches/datatables/web/jquery/datatables/css/mrbs-table.css
2011-09-16 16:38:37 UTC (rev 1953)
@@ -149,7 +149,7 @@
table.display th {
- padding: 3px 24px 3px 3px;
+ padding: 3px 24px 3px 8px;
}
Modified: mrbs/branches/datatables/web/mrbs-ielte7.css.php
===================================================================
--- mrbs/branches/datatables/web/mrbs-ielte7.css.php 2011-09-15 17:06:59 UTC
(rev 1952)
+++ mrbs/branches/datatables/web/mrbs-ielte7.css.php 2011-09-16 16:38:37 UTC
(rev 1953)
@@ -66,7 +66,7 @@
// the sub-table expand to the right
?>
#pending_list table.sub {
- table-layout: auto;
+ table-layout: fixed;
}
/* ------------ TRAILER.INC ---------------------*/
Modified: mrbs/branches/datatables/web/mrbs.css.php
===================================================================
--- mrbs/branches/datatables/web/mrbs.css.php 2011-09-15 17:06:59 UTC (rev
1952)
+++ mrbs/branches/datatables/web/mrbs.css.php 2011-09-16 16:38:37 UTC (rev
1953)
@@ -66,7 +66,7 @@
table.admin_table {border-spacing: 0px; border-collapse: collapse;
border-color: <?php echo $admin_table_border_color ?>; border-style: solid;
border-top-width: 0; border-right-width: 1px; border-bottom-width: 1px;
border-left-width: 0}
.admin_table th, .admin_table td {vertical-align: middle; text-align: left;
- padding: 0.1em 0.5em 0.1em 0.5em;
+ padding: 0.1em 8px 0.1em 8px;
border-top-width: 0; border-right-width: 0; border-bottom-width: 0;
border-left-width: 1px; border-style: solid;}
.admin_table th {color: <?php echo $admin_table_header_font_color ?>;
background-color: <?php echo $admin_table_header_back_color ?>}
@@ -723,7 +723,7 @@
/* ------------ PENDING.PHP ------------------*/
div#pending_list {width: 98%; padding: 2em 0 2em 1em}
-#pending_list form {float: left}
+#pending_list form {display: inline-block}
#pending_list td.table_container, #pending_list td.sub_table {padding: 0;
border: 0; margin: 0}
#pending_list .control {padding-left: 0; padding-right: 0; text-align: center;
color: <?php echo $standard_font_color ?>}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
