From ddf4e78a77c0347c342ad1af577d8c2d1b09da36 Mon Sep 17 00:00:00 2001 From: sg00dwin Date: Wed, 12 Jul 2017 11:52:30 -0400 Subject: [PATCH] Update table label filter to reuse data-toolbar data-toolbar-filter and extend on top of table Fixes https://github.com/openshift/origin-web-console/issues/1824 --- app/styles/_tables.less | 8 ++------ app/views/browse/build-config.html | 8 ++++++-- app/views/browse/deployment-config.html | 8 ++++++-- dist/scripts/templates.js | 12 ++++++++++-- dist/scripts/vendor.js | 8 ++++---- dist/styles/main.css | 5 ++--- 6 files changed, 30 insertions(+), 19 deletions(-) diff --git a/app/styles/_tables.less b/app/styles/_tables.less index b34c4488c9..95d9443c1d 100644 --- a/app/styles/_tables.less +++ b/app/styles/_tables.less @@ -147,16 +147,12 @@ border-top: none; } -.table-filter-wrapper { +.table-filter-extension { background-color: #f9f9f9; border-left: 1px solid @table-border-color; border-right: 1px solid @table-border-color; border-top: 1px solid @table-border-color; - display: flex; - padding: 10px 10px 5px 10px; - .form-group { - margin-bottom: 5px; - } + padding: 5px 10px; } @media (max-width: @screen-xs-max) { diff --git a/app/views/browse/build-config.html b/app/views/browse/build-config.html index d5be11b2ed..5ca46e4de5 100644 --- a/app/views/browse/build-config.html +++ b/app/views/browse/build-config.html @@ -175,8 +175,12 @@

No builds.

-
- +
+
+
+ +
+
diff --git a/app/views/browse/deployment-config.html b/app/views/browse/deployment-config.html index da85f17b19..424702dab4 100644 --- a/app/views/browse/deployment-config.html +++ b/app/views/browse/deployment-config.html @@ -127,8 +127,12 @@

created -
- +
+
+
+ +
+

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js index c8deb98747..5b76a0450e 100644 --- a/dist/scripts/templates.js +++ b/dist/scripts/templates.js @@ -1770,9 +1770,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "\n" + "\n" + "
0\" class=\"mar-bottom-xl\">\n" + - "
\n" + + "
\n" + + "
\n" + + "
\n" + "\n" + "
\n" + + "
\n" + + "
\n" + "
\n" + "\n" + "\n" + @@ -2425,9 +2429,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "created \n" + "\n" + "\n" + - "
\n" + + "
\n" + + "
\n" + + "
\n" + "\n" + "
\n" + + "
\n" + + "
\n" + "
\n" + "\n" + "\n" + diff --git a/dist/scripts/vendor.js b/dist/scripts/vendor.js index 9ea659cac9..cd80b7c93e 100644 --- a/dist/scripts/vendor.js +++ b/dist/scripts/vendor.js @@ -36789,13 +36789,13 @@ if (b) { b.$el ? b.$el.empty() :b.$el = this._newNodeEl(b, c).addClass("node-" + this._elementId), b.$el.addClass(b["class"]), b.id && b.$el.attr("id", b.id), b.dataAttr && a.each(b.dataAttr, function(a, c) { b.$el.attr("data-" + a, c); }), b.$el.attr("data-nodeId", b.nodeId), b.tooltip && b.$el.attr("title", b.tooltip); -for (var d = 0; d < b.level - 1; d++) b.$el.append(this._template.indent.clone()); +for (var e = 0; e < b.level - 1; e++) b.$el.append(this._template.indent.clone()); if (b.$el.append(b.nodes || b.lazyLoad ? this._template.icon.expand.clone() :this._template.icon.empty.clone()), this._options.checkboxFirst ? (this._addCheckbox(b), this._addIcon(b), this._addImage(b)) :(this._addIcon(b), this._addImage(b), this._addCheckbox(b)), this._options.wrapNodeText) { -var e = this._template.text.clone(); -b.$el.append(e), e.append(b.text); +var g = this._template.text.clone(); +b.$el.append(g), g.append(b.text); } else b.$el.append(b.text); this._options.showTags && b.tags && a.each(b.tags, a.proxy(function(a, c) { -b.$el.append(this._template.badge.clone().addClass("string" == typeof b.tagsClass[a] ? b.tagsClass[a] :this._options.tagsClass).append(c)); +b.$el.append(this._template.badge.clone().addClass(("object" == typeof c ? c["class"] :d) || b.tagsClass || this._options.tagsClass).append(("object" == typeof c ? c.text :d) || c)); }, this)), this._setSelected(b, b.state.selected), this._setChecked(b, b.state.checked), this._setSearchResult(b, b.searchResult), this._setExpanded(b, b.state.expanded), this._setDisabled(b, b.state.disabled), this._setVisible(b, b.state.visible), this._triggerEvent("nodeRendered", b, f.options); } }, g.prototype._addCheckbox = function(a) { diff --git a/dist/styles/main.css b/dist/styles/main.css index d695264995..1693a4a1cb 100644 --- a/dist/styles/main.css +++ b/dist/styles/main.css @@ -5433,15 +5433,14 @@ body,html{margin:0;padding:0} .key-value-table>tbody>tr>td.value .truncated-content{white-space:pre} .table{background-color:#fff} .table.table-bordered>tbody>tr td,.table.table-bordered>tbody>tr th,.table.table-bordered>thead>tr td,.table.table-bordered>thead>tr th{border-left:0;border-right:0;padding-bottom:8px;padding-top:8px;vertical-align:middle} -.table-filter-wrapper,.table.table-bordered-columns tbody>tr td,.table.table-bordered-columns tbody>tr th,.table.table-bordered-columns thead>tr td,.table.table-bordered-columns thead>tr th{border-left:1px solid #d1d1d1;border-right:1px solid #d1d1d1} +.table-filter-extension,.table.table-bordered-columns tbody>tr td,.table.table-bordered-columns tbody>tr th,.table.table-bordered-columns thead>tr td,.table.table-bordered-columns thead>tr th{border-left:1px solid #d1d1d1;border-right:1px solid #d1d1d1} .table.table-layout-fixed{table-layout:fixed} .table.table-layout-fixed td{word-wrap:break-word;word-break:break-word;overflow-wrap:break-word;min-width:0} .table>tbody+tbody{border-top-width:1px} .table th .pficon-help{color:#999;cursor:help} .table th .pficon-help:not(:first-child){margin-left:5px} .table-borderless>tbody>tr>td,.table-borderless>tbody>tr>th,.table-borderless>tfoot>tr>td,.table-borderless>tfoot>tr>th,.table-borderless>thead>tr>td{border-top:none} -.table-filter-wrapper{background-color:#f9f9f9;border-top:1px solid #d1d1d1;display:flex;padding:10px 10px 5px} -.table-filter-wrapper .form-group{margin-bottom:5px} +.table-filter-extension{background-color:#f9f9f9;border-top:1px solid #d1d1d1;padding:5px 10px} @media (max-width:767px){.table-mobile{border-top-width:0;table-layout:fixed} .table-mobile col,.table-mobile colgroup{display:none} .table-mobile tbody,.table-mobile td,.table-mobile th,.table-mobile thead,.table-mobile tr{display:block}