openstack
/
horizon
Code Issues Proposed changes

Merge "Searchbar directive should be prefix with hz"

This commit is contained in:
Jenkins 2015-07-02 00:58:28 +00:00 committed by Gerrit Code Review
parent eff59ac2dd 6d6a44e190
commit f8eba7d1cb
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
horizon/static/framework/widgets/table/basic-table.js
View File

@ -6,14 +6,14 @@
.constant('horizon.framework.widgets.table.filterPlaceholderText', gettext('Filter')) .constant('horizon.framework.widgets.table.filterPlaceholderText', gettext('Filter'))
/** /**
* @ngdoc directive * @ngdoc directive
* @name horizon.framework.widgets.table.directive:searchBar * @name horizon.framework.widgets.table.directive:hzSearchBar
* @element * @element
* @param {string} {array} groupClasses Input group classes (optional) * @param {string} {array} groupClasses Input group classes (optional)
* @param {string} {array} iconClasses Icon classes (optional) * @param {string} {array} iconClasses Icon classes (optional)
* @param {string} {array} inputClasses Search field classes (optional) * @param {string} {array} inputClasses Search field classes (optional)
* @param {string} placeholder input field placeholder text (optional) * @param {string} placeholder input field placeholder text (optional)
* @description * @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. * trigger filtering of the associated Smart-Table.
* *
* groupClasses - classes that should be applied to input group element * groupClasses - classes that should be applied to input group element
@ -25,12 +25,12 @@
* *
* @example * @example
* ``` * ```
* <search-bar group-classes="input-group-sm" * <hz-search-bar group-classes="input-group-sm"
* icon-classes="fa-search" input-classes="..." placeholder="Filter"> * icon-classes="fa-search" input-classes="..." placeholder="Filter">
* </search-bar> * </hz-search-bar>
* ``` * ```
*/ */
.directive('searchBar', ['horizon.framework.widgets.table.filterPlaceholderText', .directive('hzSearchBar', ['horizon.framework.widgets.table.filterPlaceholderText',
'horizon.framework.widgets.basePath', 'horizon.framework.widgets.basePath',
function(FILTER_PLACEHOLDER_TEXT, path) { function(FILTER_PLACEHOLDER_TEXT, path) {
return { return {

4
horizon/static/framework/widgets/table/basic-table.spec.js
View File

@ -22,9 +22,9 @@
'<thead>' + '<thead>' +
' <tr>' + ' <tr>' +
' <th>' + ' <th>' +
' <search-bar group-classes="input-group-sm" ' + ' <hz-search-bar group-classes="input-group-sm" ' +
' icon-classes="fa-search">' + ' icon-classes="fa-search">' +
' </search-bar>' + ' </hz-search-bar>' +
' </th>' + ' </th>' +
' </tr>' + ' </tr>' +
'</thead>' + '</thead>' +

6
horizon/static/framework/widgets/transfer-table/available.html.example
View File

@ -3,8 +3,8 @@
<thead> <thead>
<tr> <tr>
<th class="search-header" colspan="10"> <th class="search-header" colspan="10">
<search-bar group-classes="input-group-sm" icon-classes="fa-search"> <hz-search-bar group-classes="input-group-sm" icon-classes="fa-search">
</search-bar> </hz-search-bar>
</th> </th>
</tr> </tr>
<tr> <tr>
@ -85,4 +85,4 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

4
openstack_dashboard/static/dashboard/launch-instance/flavor/select-flavor-table.html
View File

@ -18,8 +18,8 @@ limitations under the License.
<thead> <thead>
<tr ng-show="showSearchBar"> <tr ng-show="showSearchBar">
<th class="search-header" colspan="9"> <th class="search-header" colspan="9">
<search-bar group-classes="input-group-sm" icon-classes="fa-search"> <hz-search-bar group-classes="input-group-sm" icon-classes="fa-search">
</search-bar> </hz-search-bar>
</th> </th>
</tr> </tr>
<tr> <tr>

6
openstack_dashboard/static/dashboard/launch-instance/keypair/keypair.html
View File

@ -79,8 +79,8 @@
<thead> <thead>
<tr> <tr>
<th class="search-header" colspan="7"> <th class="search-header" colspan="7">
<search-bar group-classes="input-group-sm" icon-classes="fa-search"> <hz-search-bar group-classes="input-group-sm" icon-classes="fa-search">
</search-bar> </hz-search-bar>
</th> </th>
</tr> </tr>
<tr> <tr>
@ -127,4 +127,4 @@
</transfer-table> <!-- End Key Pairs Table --> </transfer-table> <!-- End Key Pairs Table -->
</div> <!-- End Content --> </div> <!-- End Content -->
</div> <!-- End Controller --> </div> <!-- End Controller -->

4
openstack_dashboard/static/dashboard/launch-instance/network/network.html
View File

@ -99,8 +99,8 @@
<thead> <thead>
<tr> <tr>
<th class="search-header" colspan="8"> <th class="search-header" colspan="8">
<search-bar group-classes="input-group-sm" icon-classes="fa-search"> <hz-search-bar group-classes="input-group-sm" icon-classes="fa-search">
</search-bar> </hz-search-bar>
</th> </th>
</tr> </tr>
<tr> <tr>

4
openstack_dashboard/static/dashboard/launch-instance/security-groups/security-groups.html
View File

@ -62,9 +62,9 @@
<thead> <thead>
<tr> <tr>
<th class="search-header" colspan="7"> <th class="search-header" colspan="7">
<search-bar group-classes="input-group-sm" <hz-search-bar group-classes="input-group-sm"
icon-classes="fa-search"> icon-classes="fa-search">
</search-bar> </hz-search-bar>
</th> </th>
</tr> </tr>
<tr> <tr>

4
openstack_dashboard/static/dashboard/launch-instance/source/source.html
View File

@ -287,9 +287,9 @@
<tr> <tr>
<th class="search-header" <th class="search-header"
colspan="{$ ctrl.tableHeadCells.length + 2 $}"> colspan="{$ ctrl.tableHeadCells.length + 2 $}">
<search-bar group-classes="input-group-sm" <hz-search-bar group-classes="input-group-sm"
icon-classes="fa-search"> icon-classes="fa-search">
</search-bar> </hz-search-bar>
</th> </th>
</tr> </tr>
<tr> <tr>