Skip to content

Commit

Permalink
Merge pull request #2439 from spadgett/clear-filter-nowrap
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Don't wrap "Clear Filter" text

Before:

![iphone x - ios 11 0 2017-11-02 13-04-13](https://user-images.githubusercontent.com/1167259/32339689-ebf8108e-bfce-11e7-880a-8ebe778b05df.png)

After:

![iphone x - ios 11 0 2017-11-02 13-08-36](https://user-images.githubusercontent.com/1167259/32339708-fb4a74be-bfce-11e7-8201-5fd8bb4449d4.png)

@jwforres @rhamilto
  • Loading branch information
openshift-merge-robot authored Nov 3, 2017
2 parents 1d3a73b + faf361a commit bea6783
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion app/views/browse/config-maps.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h2>No config maps.</h2>
</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all config maps. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all config maps. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/browse/routes.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h2>No routes.</h2>
</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all routes. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all routes. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/browse/stateful-sets.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h2>No stateful sets.</h2>
<p>No stateful sets have been added to project {{projectName}}.</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all stateful sets. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all stateful sets. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/builds.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h2>No builds.</h2>
<p>No builds have been added to project {{projectName}}.</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all builds. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all builds. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/catalog/catalog.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ <h2 class="text-center">No images or templates.</h2>

<div ng-if="allContentHidden" class="empty-state-message text-center h2">
All content is hidden by the current filter.
<a href="" ng-click="filter.keyword = ''">Clear Filter</a>
<a href="" ng-click="filter.keyword = ''" role="button" class="nowrap">Clear Filter</a>
</div>

<div ng-if="!filterActive">
Expand Down
2 changes: 1 addition & 1 deletion app/views/catalog/category-content.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h2 class="text-center">No images or templates.</h2>

<div ng-if="!filteredBuilderImages.length && !filteredTemplates.length && loaded" class="empty-state-message text-center h2">
All content is hidden by the current filter.
<a href="" ng-click="filter.keyword = ''">Clear Filter</a>
<a href="" ng-click="filter.keyword = ''" role="button" class="nowrap">Clear Filter</a>
</div>

<div class="row row-cards-pf row-cards-pf-flex mar-top-xl">
Expand Down
2 changes: 1 addition & 1 deletion app/views/deployments.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h2>No deployments.</h2>
<p>No deployments have been added to project {{projectName}}.</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all deployments. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all deployments. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/directives/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@
<span ng-if="(events | hashSize) === 0"><em>No events to show.</em></span>
<span ng-if="(events | hashSize) > 0">
All events hidden by filter.
<a href="" ng-click="filter.text = ''" role="button">Clear Filter</a>
<a href="" ng-click="filter.text = ''" role="button" class="nowrap">Clear Filter</a>
</span>
</td>
<td class="hidden-xs hidden-sm hidden-md" colspan="{{showKindAndName ? 6 : 4}}">
<span ng-if="(events | hashSize) === 0"><em>No events to show.</em></span>
<span ng-if="(events | hashSize) > 0">
All events hidden by filter.
<a href="" ng-click="filter.text = ''" role="button">Clear Filter</a>
<a href="" ng-click="filter.text = ''" role="button" class="nowrap">Clear Filter</a>
</span>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion app/views/images.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h2>No image streams.</h2>
<p>No image streams have been added to project {{projectName}}.</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all image streams. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all image streams. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/other-resources.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h2>No {{resourceName}}.</h2>
</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all {{resourceName}}. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all {{resourceName}}. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ <h2>Welcome to project {{projectName}}.</h2>
<div ng-if="overview.everythingFiltered && overview.viewBy !== 'pipeline'">
<div class="empty-state-message text-center h2">
The filter is hiding all resources.
<a href="" ng-click="overview.clearFilter()">Clear Filter</a>
<a href="" ng-click="overview.clearFilter()" role="button" class="nowrap">Clear Filter</a>
</div>
</div>
<div ng-if="!overview.everythingFiltered || overview.viewBy === 'pipeline'">
Expand Down Expand Up @@ -269,7 +269,7 @@ <h2>No pipelines.</h2>
<div ng-if="(overview.pipelineBuildConfigs | hashSize) && !(overview.filteredPipelineBuildConfigs | hashSize)">
<div class="empty-state-message text-center h2">
All pipelines are filtered.
<a href="" ng-click="overview.clearFilter()">Clear Filter</a>
<a href="" ng-click="overview.clearFilter()" role="button" class="nowrap">Clear Filter</a>
</div>
</div>
<div ng-repeat="pipeline in overview.filteredPipelineBuildConfigs track by (pipeline | uid)">
Expand Down
2 changes: 1 addition & 1 deletion app/views/pods.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h2>No pods.</h2>
<p>No pods have been added to project {{projectName}}.</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all pods. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all pods. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h1>My Projects</h1>
</div>
<div ng-if="!projects.length && !isProjectListIncomplete" class="h3">
The current filter is hiding all projects.
<a href="" ng-click="search.text = ''" role="button">Clear Filter</a>
<a href="" ng-click="search.text = ''" role="button" class="nowrap">Clear Filter</a>
</div>
<div class="list-group list-view-pf projects-list">
<div ng-repeat="project in projects | limitTo: limitListTo track by (project | uid)" class="list-group-item project-info tile-click">
Expand Down
2 changes: 1 addition & 1 deletion app/views/service-instances.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h2>No provisioned services.</h2>
<p>No provisioned services have been added to project {{projectName}}.</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all provisioned services. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all provisioned services. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/services.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h2>No services.</h2>
<p>No services have been added to project {{projectName}}.</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all services. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all services. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/storage.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h2>No persistent volume claims.</h2>
</p>
</div>
<div ng-if="filterWithZeroResults">
<h2>The filter is hiding all persistent volume claims. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
<h2>The filter is hiding all persistent volume claims. <a href="" ng-click="clearFilter()" role="button" class="nowrap">Clear Filter</a></h2>
</div>
</div>
</div>
Expand Down
36 changes: 18 additions & 18 deletions dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -2228,7 +2228,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all config maps. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all config maps. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -3485,7 +3485,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all routes. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all routes. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -4030,7 +4030,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<p>No stateful sets have been added to project {{projectName}}.</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all stateful sets. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all stateful sets. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -4103,7 +4103,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<p>No builds have been added to project {{projectName}}.</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all builds. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all builds. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -4367,7 +4367,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</form>\n" +
"<div ng-if=\"allContentHidden\" class=\"empty-state-message text-center h2\">\n" +
"All content is hidden by the current filter.\n" +
"<a href=\"\" ng-click=\"filter.keyword = ''\">Clear Filter</a>\n" +
"<a href=\"\" ng-click=\"filter.keyword = ''\" role=\"button\" class=\"nowrap\">Clear Filter</a>\n" +
"</div>\n" +
"<div ng-if=\"!filterActive\">\n" +
"<div ng-repeat=\"category in categories\" ng-if=\"hasContent[category.id]\">\n" +
Expand Down Expand Up @@ -4471,7 +4471,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</form>\n" +
"<div ng-if=\"!filteredBuilderImages.length && !filteredTemplates.length && loaded\" class=\"empty-state-message text-center h2\">\n" +
"All content is hidden by the current filter.\n" +
"<a href=\"\" ng-click=\"filter.keyword = ''\">Clear Filter</a>\n" +
"<a href=\"\" ng-click=\"filter.keyword = ''\" role=\"button\" class=\"nowrap\">Clear Filter</a>\n" +
"</div>\n" +
"<div class=\"row row-cards-pf row-cards-pf-flex mar-top-xl\">\n" +
"<catalog-image image-stream=\"builder\" project=\"{{projectName}}\" is-builder=\"true\" keywords=\"keywords\" ng-repeat=\"builder in filteredBuilderImages track by (builder | uid)\">\n" +
Expand Down Expand Up @@ -5118,7 +5118,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<p>No deployments have been added to project {{projectName}}.</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all deployments. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all deployments. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -7102,14 +7102,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<span ng-if=\"(events | hashSize) === 0\"><em>No events to show.</em></span>\n" +
"<span ng-if=\"(events | hashSize) > 0\">\n" +
"All events hidden by filter.\n" +
"<a href=\"\" ng-click=\"filter.text = ''\" role=\"button\">Clear Filter</a>\n" +
"<a href=\"\" ng-click=\"filter.text = ''\" role=\"button\" class=\"nowrap\">Clear Filter</a>\n" +
"</span>\n" +
"</td>\n" +
"<td class=\"hidden-xs hidden-sm hidden-md\" colspan=\"{{showKindAndName ? 6 : 4}}\">\n" +
"<span ng-if=\"(events | hashSize) === 0\"><em>No events to show.</em></span>\n" +
"<span ng-if=\"(events | hashSize) > 0\">\n" +
"All events hidden by filter.\n" +
"<a href=\"\" ng-click=\"filter.text = ''\" role=\"button\">Clear Filter</a>\n" +
"<a href=\"\" ng-click=\"filter.text = ''\" role=\"button\" class=\"nowrap\">Clear Filter</a>\n" +
"</span>\n" +
"</td>\n" +
"</tr>\n" +
Expand Down Expand Up @@ -10497,7 +10497,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<p>No image streams have been added to project {{projectName}}.</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all image streams. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all image streams. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -11555,7 +11555,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all {{resourceName}}. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all {{resourceName}}. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -11698,7 +11698,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div ng-if=\"overview.everythingFiltered && overview.viewBy !== 'pipeline'\">\n" +
"<div class=\"empty-state-message text-center h2\">\n" +
"The filter is hiding all resources.\n" +
"<a href=\"\" ng-click=\"overview.clearFilter()\">Clear Filter</a>\n" +
"<a href=\"\" ng-click=\"overview.clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a>\n" +
"</div>\n" +
"</div>\n" +
"<div ng-if=\"!overview.everythingFiltered || overview.viewBy === 'pipeline'\">\n" +
Expand Down Expand Up @@ -11815,7 +11815,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div ng-if=\"(overview.pipelineBuildConfigs | hashSize) && !(overview.filteredPipelineBuildConfigs | hashSize)\">\n" +
"<div class=\"empty-state-message text-center h2\">\n" +
"All pipelines are filtered.\n" +
"<a href=\"\" ng-click=\"overview.clearFilter()\">Clear Filter</a>\n" +
"<a href=\"\" ng-click=\"overview.clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a>\n" +
"</div>\n" +
"</div>\n" +
"<div ng-repeat=\"pipeline in overview.filteredPipelineBuildConfigs track by (pipeline | uid)\">\n" +
Expand Down Expand Up @@ -12869,7 +12869,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<p>No pods have been added to project {{projectName}}.</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all pods. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all pods. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -12953,7 +12953,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"<div ng-if=\"!projects.length && !isProjectListIncomplete\" class=\"h3\">\n" +
"The current filter is hiding all projects.\n" +
"<a href=\"\" ng-click=\"search.text = ''\" role=\"button\">Clear Filter</a>\n" +
"<a href=\"\" ng-click=\"search.text = ''\" role=\"button\" class=\"nowrap\">Clear Filter</a>\n" +
"</div>\n" +
"<div class=\"list-group list-view-pf projects-list\">\n" +
"<div ng-repeat=\"project in projects | limitTo: limitListTo track by (project | uid)\" class=\"list-group-item project-info tile-click\">\n" +
Expand Down Expand Up @@ -13383,7 +13383,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<p>No provisioned services have been added to project {{projectName}}.</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all provisioned services. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all provisioned services. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -13480,7 +13480,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<p>No services have been added to project {{projectName}}.</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all services. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all services. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -13624,7 +13624,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</p>\n" +
"</div>\n" +
"<div ng-if=\"filterWithZeroResults\">\n" +
"<h2>The filter is hiding all persistent volume claims. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
"<h2>The filter is hiding all persistent volume claims. <a href=\"\" ng-click=\"clearFilter()\" role=\"button\" class=\"nowrap\">Clear Filter</a></h2>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down

0 comments on commit bea6783

Please sign in to comment.