openstack/horizon
Code Issues Proposed changes

Merge "Action-list: Update for ui bootstrap changes"

Browse Source
This commit is contained in:
Jenkins 2016-12-22 13:09:13 +00:00 committed by Gerrit Code Review
commit abe2bb5283
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/static/framework/widgets/action-list/actions.service.js
View File

@ -155,7 +155,7 @@
* `menu-item` buttons
*/
function renderList(actionList, splitButton, scope) {
var actionListElem = angular.element('<action-list>');
var actionListElem = angular.element('<action-list uib-dropdown>');
actionListElem.attr('dropdown', 'true');
actionListElem.append(splitButton);
actionListElem.append(getMenu(actionList, scope));

2
horizon/static/framework/widgets/action-list/split-button.html
View File

@ -6,7 +6,7 @@
<ng-transclude></ng-transclude>
</button><!--
Dropdown caret button
--><button class="split-caret dropdown-toggle" dropdown-toggle
--><button class="split-caret dropdown-toggle" uib-dropdown-toggle
ng-class="actionClasses"
aria-expanded="false" ng-click="$event.stopPropagation()">
<span class="fa fa-caret-down"></span>

6
horizon/static/framework/widgets/magic-search/magic-search.html
View File

@ -18,9 +18,9 @@
<span class="search-selected" ng-cloak="" ng-show="ctrl.facetSelected">
{$ ctrl.facetSelected.label[0] $}:
</span>
<!-- For bootstrap, the dropdown attribute is moved from input up to div. -->
<span class="search-entry" dropdown is-open="ctrl.isMenuOpen">
<input class="search-input" type="text" dropdown-toggle
<!-- For bootstrap, the uib-dropdown attribute is moved from input up to div. -->
<span class="search-entry" uib-dropdown is-open="ctrl.isMenuOpen">
<input class="search-input" type="text" uib-dropdown-toggle
placeholder="{$ strings.prompt $}" autocomplete="off" />
<ul class="facet-drop f-dropdown dropdown-menu" data-dropdown-content=""
ng-if="ctrl.filteredObj.length > 0">