From 9e46cceff48a5c1928cb737a7954ac261726d667 Mon Sep 17 00:00:00 2001 From: dleffler Date: Thu, 24 Apr 2014 11:13:15 -0400 Subject: [PATCH] updates bootstrap3 views with new dataTables & responsive --- .../core/assets/less/forms-bootstrap3.less | 6 +++++- .../view_registrants.bootstrap3.tpl | 18 +++++++++--------- .../forms/views/forms/showall.bootstrap3.tpl | 18 +++++++++--------- .../views/users/_permissions.bootstrap3.tpl | 18 +++++++++--------- .../users/views/users/manage.bootstrap3.tpl | 18 +++++++++--------- .../manage_group_memberships.bootstrap3.tpl | 18 +++++++++--------- .../views/users/manage_groups.bootstrap3.tpl | 18 +++++++++--------- 7 files changed, 59 insertions(+), 55 deletions(-) diff --git a/framework/core/assets/less/forms-bootstrap3.less b/framework/core/assets/less/forms-bootstrap3.less index 0f538c57e3..66ac4eb4a4 100644 --- a/framework/core/assets/less/forms-bootstrap3.less +++ b/framework/core/assets/less/forms-bootstrap3.less @@ -174,4 +174,8 @@ a.fa-sort, .container-chrome ul li a.fa-sort { .label { color: #000000; -} \ No newline at end of file +} + +input.tagit-hidden-field { + display: none!important; +} diff --git a/framework/modules/ecommerce/views/eventregistration/view_registrants.bootstrap3.tpl b/framework/modules/ecommerce/views/eventregistration/view_registrants.bootstrap3.tpl index 4467f529bc..37a5742e0f 100644 --- a/framework/modules/ecommerce/views/eventregistration/view_registrants.bootstrap3.tpl +++ b/framework/modules/ecommerce/views/eventregistration/view_registrants.bootstrap3.tpl @@ -13,7 +13,7 @@ * *} -{css unique="viewregistrants" corecss="tables"} +{css unique="viewregistrants" corecss="tables,datatables-tools"} {/css} @@ -172,30 +172,30 @@ {script unique="view-registrants" jquery='jquery.dataTables,dataTables.tableTools,dataTables.bootstrap3,datatables.responsive'} {literal} $(document).ready(function() { - var responsiveHelper = undefined; + var responsiveHelper; var breakpointDefinition = { tablet: 1024, phone : 480 }; - var tableElement = $('#view-registrants'); + var tableContainer = $('#view-registrants'); - var table = tableElement.dataTable({ + var table = tableContainer.dataTable({ // sDom: 'T<"row-fluid"<"span6"l><"span6"f>r>t<"row-fluid"<"span6"i><"span6"p>>', aoColumnDefs: [ { bSearchable: false, aTargets: [ -2 ] }, { bSortable: false, aTargets: [ -2 ] }, ], - bAutoWidth: false, - fnPreDrawCallback: function () { + autoWidth: false, + preDrawCallback: function () { // Initialize the responsive datatables helper once. if (!responsiveHelper) { - responsiveHelper = new ResponsiveDatatablesHelper(tableElement, breakpointDefinition); + responsiveHelper = new ResponsiveDatatablesHelper(tableContainer, breakpointDefinition); } }, - fnRowCallback: function (nRow) { + rowCallback: function (nRow) { responsiveHelper.createExpandIcon(nRow); }, - fnDrawCallback: function (oSettings) { + drawCallback: function (oSettings) { responsiveHelper.respond(); } }); diff --git a/framework/modules/forms/views/forms/showall.bootstrap3.tpl b/framework/modules/forms/views/forms/showall.bootstrap3.tpl index ada6813bfe..96eeeb7fd4 100644 --- a/framework/modules/forms/views/forms/showall.bootstrap3.tpl +++ b/framework/modules/forms/views/forms/showall.bootstrap3.tpl @@ -17,7 +17,7 @@ {*{css unique="data-view" corecss="button"}*} {*{/css}*} - {css unique="showall-forms" link="`$asset_path`css/datatables-tools.css"} + {css unique="manage-groups" corecss="datatables-tools"} {/css} @@ -98,30 +98,30 @@ {script unique="form-showall" jquery='jquery.dataTables,dataTables.tableTools,dataTables.bootstrap3,datatables.responsive'} {literal} $(document).ready(function() { - var responsiveHelper = undefined; + var responsiveHelper; var breakpointDefinition = { tablet: 1024, phone : 480 }; - var tableElement = $('#forms-showall'); + var tableContainer = $('#forms-showall'); - var table = tableElement.dataTable({ + var table = tableContainer.dataTable({ // sDom: 'T<"row-fluid"<"span6"l><"span6"f>r>t<"row-fluid"<"span6"i><"span6"p>>', aoColumnDefs: [ { bSearchable: false, "aTargets": [ -1 ] }, { bSortable: false, "aTargets": [ -1 ] }, ], - bAutoWidth: false, - fnPreDrawCallback: function () { + autoWidth: false, + preDrawCallback: function () { // Initialize the responsive datatables helper once. if (!responsiveHelper) { - responsiveHelper = new ResponsiveDatatablesHelper(tableElement, breakpointDefinition); + responsiveHelper = new ResponsiveDatatablesHelper(tableContainer, breakpointDefinition); } }, - fnRowCallback: function (nRow) { + rowCallback: function (nRow) { responsiveHelper.createExpandIcon(nRow); }, - fnDrawCallback: function (oSettings) { + drawCallback: function (oSettings) { responsiveHelper.respond(); } }); diff --git a/framework/modules/users/views/users/_permissions.bootstrap3.tpl b/framework/modules/users/views/users/_permissions.bootstrap3.tpl index 480063c6d1..b7d2e3d128 100644 --- a/framework/modules/users/views/users/_permissions.bootstrap3.tpl +++ b/framework/modules/users/views/users/_permissions.bootstrap3.tpl @@ -21,7 +21,7 @@ {*}*} {*{/literal}*} {*{/css}*} -{css unique="manage-perms" link="`$asset_path`css/datatables-tools.css"} +{css unique="manage-groups" corecss="datatables-tools"} {/css} @@ -122,14 +122,14 @@ YUI(EXPONENT.YUI3_CONFIG).use('node', "event", "node-event-delegate", function(Y {script unique="permissions" jquery='jquery.dataTables,dataTables.tableTools,dataTables.bootstrap3,datatables.responsive'} {literal} $(document).ready(function() { - var responsiveHelper = undefined; + var responsiveHelper; var breakpointDefinition = { tablet: 1024, phone : 480 }; - var tableElement = $('#permissions'); + var tableContainer = $('#permissions'); - var table = tableElement.dataTable({ + var table = tableContainer.dataTable({ // sDom: 'T<"row-fluid"<"span6"l><"span6"f>r>t<"row-fluid"<"span6"i><"span6"p>>', aoColumnDefs: [ // { "bSearchable": true, "aTargets": [ {/literal}{if !$is_group}0, 1, 2{else}0{/if}{literal} ] }, @@ -139,17 +139,17 @@ YUI(EXPONENT.YUI3_CONFIG).use('node', "event", "node-event-delegate", function(Y {aTargets: [ "sortme"], bSortable: true }, {aTargets: [ 'nosort' ], bSortable: false } ], - bAutoWidth: false, - fnPreDrawCallback: function () { + autoWidth: false, + preDrawCallback: function () { // Initialize the responsive datatables helper once. if (!responsiveHelper) { - responsiveHelper = new ResponsiveDatatablesHelper(tableElement, breakpointDefinition); + responsiveHelper = new ResponsiveDatatablesHelper(tableContainer, breakpointDefinition); } }, - fnRowCallback: function (nRow) { + rowCallback: function (nRow) { responsiveHelper.createExpandIcon(nRow); }, - fnDrawCallback: function (oSettings) { + drawCallback: function (oSettings) { responsiveHelper.respond(); } }); diff --git a/framework/modules/users/views/users/manage.bootstrap3.tpl b/framework/modules/users/views/users/manage.bootstrap3.tpl index 006c78c387..976a16d1b4 100644 --- a/framework/modules/users/views/users/manage.bootstrap3.tpl +++ b/framework/modules/users/views/users/manage.bootstrap3.tpl @@ -20,7 +20,7 @@ {*height:20px;*} {*}*} {*{/css}*} -{css unique="manage-users" link="`$asset_path`css/datatables-tools.css"} +{css unique="manage-groups" corecss="datatables-tools"} {/css} @@ -83,14 +83,14 @@ {script unique="manage-users" jquery='jquery.dataTables,dataTables.tableTools,dataTables.bootstrap3,datatables.responsive'} {literal} $(document).ready(function() { - var responsiveHelper = undefined; + var responsiveHelper; var breakpointDefinition = { tablet: 1024, phone : 480 }; - var tableElement = $('#users-manage'); + var tableContainer = $('#users-manage'); - var table = tableElement.dataTable({ + var table = tableContainer.dataTable({ // sDom: "T<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>", aoColumns: [ null, @@ -99,17 +99,17 @@ { bSearchable: false, bSortable: false }, { bSearchable: false, bSortable: false }, ], - bAutoWidth: false, - fnPreDrawCallback: function () { + autoWidth: false, + preDrawCallback: function () { // Initialize the responsive datatables helper once. if (!responsiveHelper) { - responsiveHelper = new ResponsiveDatatablesHelper(tableElement, breakpointDefinition); + responsiveHelper = new ResponsiveDatatablesHelper(tableContainer, breakpointDefinition); } }, - fnRowCallback: function (nRow) { + rowCallback: function (nRow) { responsiveHelper.createExpandIcon(nRow); }, - fnDrawCallback: function (oSettings) { + drawCallback: function (oSettings) { responsiveHelper.respond(); } }); diff --git a/framework/modules/users/views/users/manage_group_memberships.bootstrap3.tpl b/framework/modules/users/views/users/manage_group_memberships.bootstrap3.tpl index 52ffb7af47..e88133f8e2 100644 --- a/framework/modules/users/views/users/manage_group_memberships.bootstrap3.tpl +++ b/framework/modules/users/views/users/manage_group_memberships.bootstrap3.tpl @@ -16,7 +16,7 @@ {*{css unique="group" corecss="tables"}*} {*{/css}*} -{css unique="manage-groups" link="`$asset_path`css/datatables-tools.css"} +{css unique="manage-groups" corecss="datatables-tools"} {/css} @@ -68,14 +68,14 @@ {script unique="manage-groups" jquery='jquery.dataTables,dataTables.tableTools,dataTables.bootstrap3,datatables.responsive'} {literal} $(document).ready(function() { - var responsiveHelper = undefined; + var responsiveHelper; var breakpointDefinition = { tablet: 1024, phone : 480 }; - var tableElement = $('#groups-manage'); + var tableContainer = $('#groups-manage'); - var table = tableElement.dataTable({ + var table = tableContainer.dataTable({ // sDom: "T<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>", aoColumns: [ null, @@ -84,17 +84,17 @@ { bSearchable: false, bSortable: false }, { bSearchable: false, bSortable: false }, ], - bAutoWidth: false, - fnPreDrawCallback: function () { + autoWidth: false, + preDrawCallback: function () { // Initialize the responsive datatables helper once. if (!responsiveHelper) { - responsiveHelper = new ResponsiveDatatablesHelper(tableElement, breakpointDefinition); + responsiveHelper = new ResponsiveDatatablesHelper(tableContainer, breakpointDefinition); } }, - fnRowCallback: function (nRow) { + rowCallback: function (nRow) { responsiveHelper.createExpandIcon(nRow); }, - fnDrawCallback: function (oSettings) { + drawCallback: function (oSettings) { responsiveHelper.respond(); } }); diff --git a/framework/modules/users/views/users/manage_groups.bootstrap3.tpl b/framework/modules/users/views/users/manage_groups.bootstrap3.tpl index 497e9d79fa..93a7d1f000 100644 --- a/framework/modules/users/views/users/manage_groups.bootstrap3.tpl +++ b/framework/modules/users/views/users/manage_groups.bootstrap3.tpl @@ -16,7 +16,7 @@ {*{css unique="manage_groups" corecss="tables"}*} {*{/css}*} -{css unique="manage-groups" link="`$asset_path`css/datatables-tools.css"} +{css unique="manage-groups" corecss="datatables-tools"} {/css} @@ -76,14 +76,14 @@ {script unique="manage-groups" jquery='jquery.dataTables,dataTables.tableTools,dataTables.bootstrap3,datatables.responsive'} {literal} $(document).ready(function() { - var responsiveHelper = undefined; + var responsiveHelper; var breakpointDefinition = { tablet: 1024, phone : 480 }; - var tableElement = $('#groups-manage'); + var tableContainer = $('#groups-manage'); - var table = tableElement.dataTable({ + var table = tableContainer.dataTable({ // sDom: "T<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>", aoColumns: [ null, @@ -92,17 +92,17 @@ { bSearchable: false }, { bSearchable: false, bSortable: false }, ], - bAutoWidth: false, - fnPreDrawCallback: function () { + autoWidth: false, + preDrawCallback: function () { // Initialize the responsive datatables helper once. if (!responsiveHelper) { - responsiveHelper = new ResponsiveDatatablesHelper(tableElement, breakpointDefinition); + responsiveHelper = new ResponsiveDatatablesHelper(tableContainer, breakpointDefinition); } }, - fnRowCallback: function (nRow) { + rowCallback: function (nRow) { responsiveHelper.createExpandIcon(nRow); }, - fnDrawCallback: function (oSettings) { + drawCallback: function (oSettings) { responsiveHelper.respond(); } });