From e088e385119001fb1abfbe8671e72e0c894e29fd Mon Sep 17 00:00:00 2001 From: "Clint T." Date: Sat, 20 Sep 2014 11:44:13 -0500 Subject: [PATCH 01/13] Update style.css To handle tables with many columns (previously some columns would get commented out and not display at all). --- builder/code/phreeze.backbone/styles/style.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/builder/code/phreeze.backbone/styles/style.css b/builder/code/phreeze.backbone/styles/style.css index 28fa2a95..078e15ae 100644 --- a/builder/code/phreeze.backbone/styles/style.css +++ b/builder/code/phreeze.backbone/styles/style.css @@ -20,6 +20,19 @@ p.buttonContainer { } +.tableContainer { + overflow: auto; + width: 940px; /* add responsive parts in bootstrap.css */ + border: 2px solid #333; + border-radius: 4px; + padding:0px; +} + +table { +width:auto !important; +margin-bottom:0px !important; +} + table.collection tr:hover { cursor: pointer; } From b7e7108731bfac1ef41c480e60a49dc0e4e99d7a Mon Sep 17 00:00:00 2001 From: "Clint T." Date: Sat, 20 Sep 2014 11:48:07 -0500 Subject: [PATCH 02/13] Update ListView.tpl.tpl Added in new div with the new css class tableContainer to support tables with many columns (once the extra columns are uncommented). --- builder/code/phreeze.backbone/templates/ListView.tpl.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builder/code/phreeze.backbone/templates/ListView.tpl.tpl b/builder/code/phreeze.backbone/templates/ListView.tpl.tpl index 3c1a05a3..673af575 100644 --- a/builder/code/phreeze.backbone/templates/ListView.tpl.tpl +++ b/builder/code/phreeze.backbone/templates/ListView.tpl.tpl @@ -36,6 +36,7 @@ From b1a4a673873957334de01d555aa8cdb8d8806762 Mon Sep 17 00:00:00 2001 From: "Clint T." Date: Sat, 20 Sep 2014 13:21:14 -0500 Subject: [PATCH 09/13] Update ListView.tpl.tpl Previously added in the wrong place. --- builder/code/phreeze.backbone/templates/ListView.tpl.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/code/phreeze.backbone/templates/ListView.tpl.tpl b/builder/code/phreeze.backbone/templates/ListView.tpl.tpl index 5bf13510..c967e095 100644 --- a/builder/code/phreeze.backbone/templates/ListView.tpl.tpl +++ b/builder/code/phreeze.backbone/templates/ListView.tpl.tpl @@ -46,7 +46,6 @@ - <% items.each(function(item) {ldelim} %> {foreach from=$table->Columns item=column name=columnsForEach} @@ -64,6 +63,7 @@ <% {rdelim}); %> + <%= view.getPaginationHtml(page) %> From ebbf56c17b587d3d2e39844864e9462019d62280 Mon Sep 17 00:00:00 2001 From: "Clint T." Date: Sat, 20 Sep 2014 13:51:52 -0500 Subject: [PATCH 10/13] Update style.css Adapted new css class .tableContainer ( for cleanly displaying all columns) for responsive layout. --- .../code/phreeze.backbone/styles/style.css | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/builder/code/phreeze.backbone/styles/style.css b/builder/code/phreeze.backbone/styles/style.css index 078e15ae..cb68d0bc 100644 --- a/builder/code/phreeze.backbone/styles/style.css +++ b/builder/code/phreeze.backbone/styles/style.css @@ -20,17 +20,9 @@ p.buttonContainer { } -.tableContainer { - overflow: auto; - width: 940px; /* add responsive parts in bootstrap.css */ - border: 2px solid #333; - border-radius: 4px; - padding:0px; -} - table { -width:auto !important; -margin-bottom:0px !important; + width:auto !important; + margin-bottom:0px !important; } table.collection tr:hover { @@ -42,6 +34,14 @@ table.collection th:hover { opacity: 0.5; } +.tableContainer { + overflow: auto; + width: 940px; /* add responsive parts in bootstrap.css */ + border: 2px solid #333; + border-radius: 4px; + padding:0px; +} + .date-picker input { width: 80px; @@ -109,3 +109,15 @@ span.help-inline { span.help-inline:empty { display: none; } + +@media(min-width:1200px) { + .tableContainer{width:1170px} +} + +@media(min-width:768px) and (max-width:979px) { + .tableContainer{width:724px} +} + +@media(max-width:767px) { + .tableContainer{width:100%} +} From 4d7c90f8f528ea2b717003e78e435bb30d72ee17 Mon Sep 17 00:00:00 2001 From: "Clint T." Date: Sat, 20 Sep 2014 14:19:30 -0500 Subject: [PATCH 11/13] Update style.css Fixed typos. --- builder/code/phreeze.backbone/styles/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/code/phreeze.backbone/styles/style.css b/builder/code/phreeze.backbone/styles/style.css index cb68d0bc..b3e05454 100644 --- a/builder/code/phreeze.backbone/styles/style.css +++ b/builder/code/phreeze.backbone/styles/style.css @@ -111,13 +111,13 @@ span.help-inline:empty { } @media(min-width:1200px) { - .tableContainer{width:1170px} + .tableContainer{width:1170px;} } @media(min-width:768px) and (max-width:979px) { - .tableContainer{width:724px} + .tableContainer{width:724px;} } @media(max-width:767px) { - .tableContainer{width:100%} + .tableContainer{width:100%;} } From d1b6a6efd273e51ae930a29888fa28d4f16e3112 Mon Sep 17 00:00:00 2001 From: "Clint T." Date: Sat, 20 Sep 2014 14:27:52 -0500 Subject: [PATCH 12/13] Update style.css Apparently Phreeze is a bit picky regarding indentations... --- builder/code/phreeze.backbone/styles/style.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/builder/code/phreeze.backbone/styles/style.css b/builder/code/phreeze.backbone/styles/style.css index b3e05454..4085bbc4 100644 --- a/builder/code/phreeze.backbone/styles/style.css +++ b/builder/code/phreeze.backbone/styles/style.css @@ -111,13 +111,19 @@ span.help-inline:empty { } @media(min-width:1200px) { - .tableContainer{width:1170px;} + .tableContainer{ + width: 1170px; + } } @media(min-width:768px) and (max-width:979px) { - .tableContainer{width:724px;} + .tableContainer{ + width: 724px; + } } @media(max-width:767px) { - .tableContainer{width:100%;} + .tableContainer{ + width: 100%; + } } From 018eba1044f12a5ff9a711f1d26d0ba47037faca Mon Sep 17 00:00:00 2001 From: "Clint T." Date: Sat, 20 Sep 2014 14:33:28 -0500 Subject: [PATCH 13/13] Update listview.blade.php.tpl Left out adding
previously. --- builder/code/phreeze.blade/views/listview.blade.php.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builder/code/phreeze.blade/views/listview.blade.php.tpl b/builder/code/phreeze.blade/views/listview.blade.php.tpl index 67eb1458..95f132df 100644 --- a/builder/code/phreeze.blade/views/listview.blade.php.tpl +++ b/builder/code/phreeze.blade/views/listview.blade.php.tpl @@ -34,6 +34,7 @@