Skip to content

Use table toolbar styles for events filter #1826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/styles/_tables.less
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
}

.events .data-toolbar {
.form-group {
margin-bottom: 0;
}
.search-pf {
margin-bottom: 10px;
width: 100%;
Expand Down
56 changes: 29 additions & 27 deletions app/views/directives/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,39 @@
Loading...
</div>
<div ng-if="events" class="events">
<div class="data-toolbar">
<form role="form" class="search-pf has-button">
<div class="form-group filter-controls has-clear">
<div class="search-pf-input-group">
<label for="events-filter" class="sr-only">Filter</label>
<input type="search"
placeholder="Filter by keyword"
class="form-control"
id="events-filter"
ng-model="filter.text"
autocorrect="off"
autocapitalize="none"
spellcheck="false">
<button
type="button"
class="clear"
aria-hidden="true"
ng-if="filter.text"
ng-click="filter.text = ''">
<span class="pficon pficon-close"></span>
</button>
<div class="table-filter-extension">
<div class="data-toolbar">
<form role="form" class="search-pf has-button">
<div class="form-group filter-controls has-clear">
<div class="search-pf-input-group">
<label for="events-filter" class="sr-only">Filter</label>
<input type="search"
placeholder="Filter by keyword"
class="form-control"
id="events-filter"
ng-model="filter.text"
autocorrect="off"
autocapitalize="none"
spellcheck="false">
<button
type="button"
class="clear"
aria-hidden="true"
ng-if="filter.text"
ng-click="filter.text = ''">
<span class="pficon pficon-close"></span>
</button>
</div>
</div>
</form>
<div class="vertical-divider"></div>
<div class="sort-group">
<span class="sort-label">Sort by</span>
<pf-sort config="sortConfig" class="sort-controls"></pf-sort>
</div>
</form>
<div class="vertical-divider"></div>
<div class="sort-group">
<span class="sort-label">Sort by</span>
<pf-sort config="sortConfig" class="sort-controls"></pf-sort>
</div>
</div>
<table class="table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table" ng-class="{ 'table-empty': (filteredEvents | hashSize) === 0 }">
<table class="table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table">
<thead>
<tr>
<th id="time">Time</th>
Expand Down
4 changes: 3 additions & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -6858,6 +6858,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"Loading...\n" +
"</div>\n" +
"<div ng-if=\"events\" class=\"events\">\n" +
"<div class=\"table-filter-extension\">\n" +
"<div class=\"data-toolbar\">\n" +
"<form role=\"form\" class=\"search-pf has-button\">\n" +
"<div class=\"form-group filter-controls has-clear\">\n" +
Expand All @@ -6876,7 +6877,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<pf-sort config=\"sortConfig\" class=\"sort-controls\"></pf-sort>\n" +
"</div>\n" +
"</div>\n" +
"<table class=\"table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table\" ng-class=\"{ 'table-empty': (filteredEvents | hashSize) === 0 }\">\n" +
"</div>\n" +
"<table class=\"table table-bordered table-condensed table-mobile table-hover table-layout-fixed events-table\">\n" +
"<thead>\n" +
"<tr>\n" +
"<th id=\"time\">Time</th>\n" +
Expand Down
1 change: 1 addition & 0 deletions dist/styles/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.