From 6d6a44e190b2b38090e8357e5cb755dc8ef67b00 Mon Sep 17 00:00:00 2001 From: Kuo-tung Kao Date: Tue, 30 Jun 2015 14:22:31 +0800 Subject: [PATCH] Searchbar directive should be prefix with hz Rename search-bar directive to hz-search-bar for consistency. Change-Id: I98e91b8fa6b9d6f0aa55825efce1de3a56e72f01 Closes-Bug: #1467610 --- horizon/static/framework/widgets/table/basic-table.js | 10 +++++----- .../static/framework/widgets/table/basic-table.spec.js | 4 ++-- .../widgets/transfer-table/available.html.example | 6 +++--- .../launch-instance/flavor/select-flavor-table.html | 4 ++-- .../dashboard/launch-instance/keypair/keypair.html | 6 +++--- .../dashboard/launch-instance/network/network.html | 4 ++-- .../security-groups/security-groups.html | 4 ++-- .../dashboard/launch-instance/source/source.html | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/horizon/static/framework/widgets/table/basic-table.js b/horizon/static/framework/widgets/table/basic-table.js index 35c0f4ea1b..8d995bd82e 100644 --- a/horizon/static/framework/widgets/table/basic-table.js +++ b/horizon/static/framework/widgets/table/basic-table.js @@ -6,14 +6,14 @@ .constant('horizon.framework.widgets.table.filterPlaceholderText', gettext('Filter')) /** * @ngdoc directive - * @name horizon.framework.widgets.table.directive:searchBar + * @name horizon.framework.widgets.table.directive:hzSearchBar * @element * @param {string} {array} groupClasses Input group classes (optional) * @param {string} {array} iconClasses Icon classes (optional) * @param {string} {array} inputClasses Search field classes (optional) * @param {string} placeholder input field placeholder text (optional) * @description - * The `searchBar` directive generates a search field that will + * The `hzSearchBar` directive generates a search field that will * trigger filtering of the associated Smart-Table. * * groupClasses - classes that should be applied to input group element @@ -25,12 +25,12 @@ * * @example * ``` - * - * + * * ``` */ - .directive('searchBar', ['horizon.framework.widgets.table.filterPlaceholderText', + .directive('hzSearchBar', ['horizon.framework.widgets.table.filterPlaceholderText', 'horizon.framework.widgets.basePath', function(FILTER_PLACEHOLDER_TEXT, path) { return { diff --git a/horizon/static/framework/widgets/table/basic-table.spec.js b/horizon/static/framework/widgets/table/basic-table.spec.js index 378ef2b6be..ede176a293 100644 --- a/horizon/static/framework/widgets/table/basic-table.spec.js +++ b/horizon/static/framework/widgets/table/basic-table.spec.js @@ -22,9 +22,9 @@ '' + ' ' + ' ' + - ' ' + - ' ' + + ' ' + ' ' + ' ' + '' + diff --git a/horizon/static/framework/widgets/transfer-table/available.html.example b/horizon/static/framework/widgets/transfer-table/available.html.example index 5ca51b9cf3..265326c126 100644 --- a/horizon/static/framework/widgets/transfer-table/available.html.example +++ b/horizon/static/framework/widgets/transfer-table/available.html.example @@ -3,8 +3,8 @@ - - + + @@ -85,4 +85,4 @@ - \ No newline at end of file + diff --git a/openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html b/openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html index cda4213c52..31dc8c2094 100644 --- a/openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html +++ b/openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html @@ -18,8 +18,8 @@ limitations under the License. - - + + diff --git a/openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html b/openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html index 432cefb47e..7ca2f77b40 100644 --- a/openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html +++ b/openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html @@ -79,8 +79,8 @@ - - + + @@ -127,4 +127,4 @@ - \ No newline at end of file + diff --git a/openstack_dashboard/static/dashboard/launch-instance/network/network.html b/openstack_dashboard/static/dashboard/launch-instance/network/network.html index c6156e3ce2..433aa8e62b 100644 --- a/openstack_dashboard/static/dashboard/launch-instance/network/network.html +++ b/openstack_dashboard/static/dashboard/launch-instance/network/network.html @@ -99,8 +99,8 @@ - - + + diff --git a/openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html b/openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html index 6aaf9ec447..25df7f97e5 100644 --- a/openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html +++ b/openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html @@ -62,9 +62,9 @@ - - + diff --git a/openstack_dashboard/static/dashboard/launch-instance/source/source.html b/openstack_dashboard/static/dashboard/launch-instance/source/source.html index b096006d5d..0877c66ba3 100644 --- a/openstack_dashboard/static/dashboard/launch-instance/source/source.html +++ b/openstack_dashboard/static/dashboard/launch-instance/source/source.html @@ -287,9 +287,9 @@ - - +