openstack
/
horizon
Code Issues Proposed changes

add 'x' dismiss button to simpleModal 

This modal should be consistent with all the other modals.
Add some additional attributes for the dismiss button.

Change-Id: I3c44acdaff0a24e13c164c406a84893d94e406ce
This commit is contained in:
Cindy Lu 2016-03-23 11:56:57 -07:00 committed by Rob Cresswell
parent caa5e91059
commit df5b5fb4b9
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
horizon/static/framework/widgets/modal/simple-modal.html
View File

@ -1,4 +1,7 @@
<div class="modal-header">
<button type="button" class="close" ng-click="modalCtrl.cancel()" aria-hidden="true" aria-label="Close">
<span aria-hidden="true" class="fa fa-times"></span>
</button>
<h3 class="modal-title">
<span ng-bind="::modalCtrl.context.title"></span>
</h3>

6
openstack_dashboard/dashboards/project/static/dashboard/project/containers/create-container-modal.html
View File

@ -1,8 +1,8 @@
<div ng-form="containerForm">
<div class="modal-header ui-draggable-handle">
<a href="#" class="close" ng-click="$dismiss()">
<span class="fa fa-times"></span>
</a>
<button type="button" class="close" ng-click="$dismiss()" aria-hidden="true" aria-label="Close">
<span aria-hidden="true" class="fa fa-times"></span>
</button>
<div class="h3 modal-title" translate>Create Container</div>
</div>

6
openstack_dashboard/dashboards/project/static/dashboard/project/containers/create-folder-modal.html
View File

@ -1,7 +1,7 @@
<div class="modal-header">
<a href="" class="close" ng-click="$dismiss()">
<span class="fa fa-times"></span>
</a>
<button type="button" class="close" ng-click="$dismiss()" aria-hidden="true" aria-label="Close">
<span aria-hidden="true" class="fa fa-times"></span>
</button>
<div class="h3 modal-title" translate>
Create Folder In: {$ ctrl.model.container.name $}
<span ng-if="ctrl.model.folder">: {$ ctrl.model.folder $}</span>

6
openstack_dashboard/dashboards/project/static/dashboard/project/containers/object-details-modal.html
View File

@ -1,8 +1,8 @@
<div class="modal-content ui-draggable">
<div class="modal-header ui-draggable-handle">
<a href="" class="close" ng-click="$dismiss()">
<span class="fa fa-times"></span>
</a>
<button type="button" class="close" ng-click="$dismiss()" aria-hidden="true" aria-label="Close">
<span aria-hidden="true" class="fa fa-times"></span>
</button>
<div class="h3 modal-title" translate>Object Details</div>
</div>
<div class="modal-body">

6
openstack_dashboard/dashboards/project/static/dashboard/project/containers/upload-object-modal.html
View File

@ -1,7 +1,7 @@
<div class="modal-header">
<a href="" class="close" ng-click="$dismiss()">
<span class="fa fa-times"></span>
</a>
<button type="button" class="close" ng-click="$dismiss()" aria-hidden="true" aria-label="Close">
<span aria-hidden="true" class="fa fa-times"></span>
</button>
<div class="h3 modal-title" translate>
Upload File To: {$ ctrl.model.container.name $}
<span ng-if="ctrl.model.folder">: {$ ctrl.model.folder $}</span>

6
openstack_dashboard/static/app/core/metadata/modal/modal.html
View File

@ -1,7 +1,7 @@
<div class="modal-header">
<a href="#" class="close" ng-click="modal.cancel()">
<span class="fa fa-times"></span>
</a>
<button type="button" class="close" ng-click="modal.cancel()" aria-hidden="true" aria-label="Close">
<span aria-hidden="true" class="fa fa-times"></span>
</button>
<h3 class="modal-title">
<span translate ng-if="modal.resourceType==='aggregate'">Update Aggregate Metadata</span>
<span translate ng-if="modal.resourceType==='flavor'">Update Flavor Metadata</span>