Netflix · kevgliss · Apr 1, 2016 · Apr 1, 2016
diff --git a/lemur/static/app/angular/authorities/authority/authority.js b/lemur/static/app/angular/authorities/authority/authority.js
@@ -41,6 +41,10 @@ angular.module('lemur')
     // set the defaults
     AuthorityService.getDefaults($scope.authority);
 
+    $scope.cancel = function () {
+      $modalInstance.dismiss('cancel');
+    };
+
     $scope.create = function (authority) {
       WizardHandler.wizard().context.loading = true;
       AuthorityService.create(authority).then(

diff --git a/lemur/static/app/angular/authorities/authority/authorityWizard.tpl.html b/lemur/static/app/angular/authorities/authority/authorityWizard.tpl.html
@@ -1,4 +1,5 @@
 <div class="modal-header">
+    <button type="button" class="close" ng-click="cancel()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <h3 class="modal-title"><span ng-show="!authority.id">Create</span><span ng-show="authority.id">Edit</span> Authority <span class="text-muted"><small>The nail that sticks out farthest gets hammered the hardest</small></span></h3>
 </div>
 <div class="modal-body">

diff --git a/lemur/static/app/angular/authorities/authority/edit.tpl.html b/lemur/static/app/angular/authorities/authority/edit.tpl.html
@@ -1,5 +1,6 @@
 <div class="modal-header">
     <div class="modal-title">
+        <button type="button" class="close" ng-click="cancel()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h3 class="modal-header">Edit <span class="text-muted"><small>{{ authority.name }}</small></span></h3>
     </div>
     <div class="modal-body">

diff --git a/lemur/static/app/angular/authorities/view/view.js b/lemur/static/app/angular/authorities/view/view.js
@@ -73,6 +73,7 @@ angular.module('lemur')
         templateUrl: '/angular/authorities/authority/edit.tpl.html',
         controller: 'AuthorityEditController',
         size: 'lg',
+        backdrop: 'static',
         resolve: {
           editId: function () {
             return authorityId;
@@ -92,6 +93,7 @@ angular.module('lemur')
         templateUrl: '/angular/roles/role/role.tpl.html',
         controller: 'RolesEditController',
         size: 'lg',
+        backdrop: 'static',
         resolve: {
           editId: function () {
             return roleId;
@@ -110,7 +112,8 @@ angular.module('lemur')
         animation: true,
         controller: 'AuthorityCreateController',
         templateUrl: '/angular/authorities/authority/authorityWizard.tpl.html',
-        size: 'lg'
+        size: 'lg',
+        backdrop: 'static',
       });
 
       modalInstance.result.then(function () {

diff --git a/lemur/static/app/angular/certificates/certificate/certificate.js b/lemur/static/app/angular/certificates/certificate/certificate.js
@@ -90,6 +90,10 @@ angular.module('lemur')
     // set the defaults
     CertificateService.getDefaults($scope.certificate);
 
+    $scope.cancel = function () {
+      $modalInstance.dismiss('cancel');
+    };
+
     $scope.create = function (certificate) {
       WizardHandler.wizard().context.loading = true;
       CertificateService.create(certificate).then(

diff --git a/lemur/static/app/angular/certificates/certificate/certificateWizard.tpl.html b/lemur/static/app/angular/certificates/certificate/certificateWizard.tpl.html
@@ -1,5 +1,6 @@
 <div class="modal-header">
-    <h3 class="modal-title"><span ng-show="!certificate.id">Create</span><span ng-show="certificate.id">Edit</span> Certificate <span class="text-muted"><small>encrypt all the things</small></h3>
+    <button type="button" class="close" ng-click="cancel()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h3 class="modal-title"><span ng-show="!certificate.id">Create</span><span ng-show="certificate.id">Edit</span> Certificate <span class="text-muted"><small>encrypt all the things</small></span></h3>
 </div>
 <div class="modal-body">
     <div>

diff --git a/lemur/static/app/angular/certificates/certificate/edit.tpl.html b/lemur/static/app/angular/certificates/certificate/edit.tpl.html
@@ -1,5 +1,6 @@
 <div class="modal-header">
     <div class="modal-title">
+        <button type="button" class="close" ng-click="cancel()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h3 class="modal-header">Edit <span class="text-muted"><small>{{ certificate.name }}</small></span></h3>
     </div>
     <div class="modal-body">

diff --git a/lemur/static/app/angular/certificates/certificate/export.tpl.html b/lemur/static/app/angular/certificates/certificate/export.tpl.html
@@ -1,5 +1,6 @@
 <div class="modal-header">
   <div class="modal-title">
+    <button type="button" class="close" ng-click="cancel()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <h3 class="modal-header">Export <span class="text-muted"><small>{{ certificate.name }}</small></span></h3>
   </div>
   <div class="modal-body">

diff --git a/lemur/static/app/angular/certificates/certificate/upload.tpl.html b/lemur/static/app/angular/certificates/certificate/upload.tpl.html
@@ -1,5 +1,6 @@
 <div class="modal-header">
     <div class="modal-title">
+        <button type="button" class="close" ng-click="cancel()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h3 class="modal-header">Upload a certificate <span class="text-muted"><small>encrypt all the things</small></span></h3>
     </div>
     <div class="modal-body">

diff --git a/lemur/static/app/angular/certificates/view/view.js b/lemur/static/app/angular/certificates/view/view.js
@@ -125,7 +125,8 @@ angular.module('lemur')
         animation: true,
         controller: 'CertificateCreateController',
         templateUrl: '/angular/certificates/certificate/certificateWizard.tpl.html',
-        size: 'lg'
+        size: 'lg',
+        backdrop: 'static'
       });
 
       modalInstance.result.then(function () {
@@ -139,6 +140,7 @@ angular.module('lemur')
         controller: 'CertificateEditController',
         templateUrl: '/angular/certificates/certificate/edit.tpl.html',
         size: 'lg',
+        backdrop: 'static',
         resolve: {
           editId: function () {
             return certificateId;
@@ -156,7 +158,8 @@ angular.module('lemur')
         animation: true,
         controller: 'CertificateUploadController',
         templateUrl: '/angular/certificates/certificate/upload.tpl.html',
-        size: 'lg'
+        size: 'lg',
+        backdrop: 'static'
       });
 
       modalInstance.result.then(function () {
@@ -170,6 +173,7 @@ angular.module('lemur')
         controller: 'CertificateExportController',
         templateUrl: '/angular/certificates/certificate/export.tpl.html',
         size: 'lg',
+        backdrop: 'static',
         resolve: {
           editId: function () {
             return certificateId;

diff --git a/lemur/static/app/angular/destinations/destination/destination.tpl.html b/lemur/static/app/angular/destinations/destination/destination.tpl.html
@@ -1,56 +1,55 @@
 <div class="modal-header">
-    <div class="modal-title">
-        <h3 class="modal-header"><span ng-show="!destination.fromServer">Create</span><span ng-show="destination.fromServer">Edit</span> Destination <span class="text-muted"><small>oh the places you will go!</small></span></h3>
-    </div>
-    <div class="modal-body">
-        <form name="createForm" class="form-horizontal" role="form" novalidate>
-            <div class="form-group"
-                 ng-class="{'has-error': createForm.label.$invalid, 'has-success': !createForm.label.$invalid&&createForm.label.$dirty}">
-                <label class="control-label col-sm-2">
-                    Label
-                </label>
-                <div class="col-sm-10">
-                    <input name="label" ng-model="destination.label" placeholder="Label" class="form-control" required/>
-                    <p ng-show="createForm.label.$invalid && !createForm.label.$pristine" class="help-block">You must enter an destination label</p>
-                </div>
+    <button type="button" class="close" ng-click="cancel()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h3><span ng-show="!destination.fromServer">Create</span><span ng-show="destination.fromServer">Edit</span> Destination <span class="text-muted"><small>oh the places you will go!</small></span></h3>
+</div>
+<div class="modal-body">
+    <form name="createForm" class="form-horizontal" role="form" novalidate>
+        <div class="form-group"
+             ng-class="{'has-error': createForm.label.$invalid, 'has-success': !createForm.label.$invalid&&createForm.label.$dirty}">
+            <label class="control-label col-sm-2">
+                Label
+            </label>
+            <div class="col-sm-10">
+                <input name="label" ng-model="destination.label" placeholder="Label" class="form-control" required/>
+                <p ng-show="createForm.label.$invalid && !createForm.label.$pristine" class="help-block">You must enter an destination label</p>
             </div>
-            <div class="form-group">
-                <label class="control-label col-sm-2">
-                    Description
-                </label>
-                <div class="col-sm-10">
-                    <textarea name="comments" ng-model="destination.description" placeholder="Something elegant" class="form-control" ></textarea>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-sm-2">
+                Description
+            </label>
+            <div class="col-sm-10">
+                <textarea name="comments" ng-model="destination.description" placeholder="Something elegant" class="form-control" ></textarea>
             </div>
-            <div class="form-group">
-                <label class="control-label col-sm-2">
-                    Plugin
-                </label>
-                <div class="col-sm-10">
-                    <select class="form-control" ng-model="destination.plugin" ng-options="plugin.title for plugin in plugins" required></select>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-sm-2">
+                Plugin
+            </label>
+            <div class="col-sm-10">
+                <select class="form-control" ng-model="destination.plugin" ng-options="plugin.title for plugin in plugins" required></select>
             </div>
-            <div class="form-group" ng-repeat="item in destination.plugin.pluginOptions">
-                <ng-form name="subForm" class="form-horizontal" role="form" novalidate>
-                    <div ng-class="{'has-error': subForm.sub.$invalid, 'has-success': !subForm.sub.$invalid&&subForm.sub.$dirty}">
-                        <label class="control-label col-sm-2">
-                            {{ item.name | titleCase }}
-                        </label>
-                        <div class="col-sm-10">
-                            <input name="sub" ng-if="item.type == 'int'" type="number" ng-pattern="/^[0-9]{12,12}$/" class="form-control" ng-model="item.value"/>
-                            <select name="sub" ng-if="item.type == 'select'" class="form-control" ng-options="i for i in item.available" ng-model="item.value"></select>
-                            <input name="sub" ng-if="item.type == 'bool'" class="form-control" type="checkbox" ng-model="item.value">
-                            <input name="sub" ng-if="item.type == 'str'" type="text" class="form-control" ng-model="item.value"/>
-                            <p ng-show="subForm.sub.$invalid && !subForm.sub.$pristine" class="help-block">{{ item.helpMessage }}</p>
-                        </div>
+        </div>
+        <div class="form-group" ng-repeat="item in destination.plugin.pluginOptions">
+            <ng-form name="subForm" class="form-horizontal" role="form" novalidate>
+                <div ng-class="{'has-error': subForm.sub.$invalid, 'has-success': !subForm.sub.$invalid&&subForm.sub.$dirty}">
+                    <label class="control-label col-sm-2">
+                        {{ item.name | titleCase }}
+                    </label>
+                    <div class="col-sm-10">
+                        <input name="sub" ng-if="item.type == 'int'" type="number" ng-pattern="/^[0-9]{12,12}$/" class="form-control" ng-model="item.value"/>
+                        <select name="sub" ng-if="item.type == 'select'" class="form-control" ng-options="i for i in item.available" ng-model="item.value"></select>
+                        <input name="sub" ng-if="item.type == 'bool'" class="form-control" type="checkbox" ng-model="item.value">
+                        <input name="sub" ng-if="item.type == 'str'" type="text" class="form-control" ng-model="item.value"/>
+                        <p ng-show="subForm.sub.$invalid && !subForm.sub.$pristine" class="help-block">{{ item.helpMessage }}</p>
                     </div>
-                </ng-form>
-            </div>
-        </form>
-    </div>
-    <div class="modal-footer">
-        <button ng-click="save(destination)" type="submit" ng-disabled="createForm.$invalid" class="btn btn-primary">Save</button>
-        <button ng-click="cancel()" class="btn btn-danger">Cancel</button>
-    </div>
+                </div>
+            </ng-form>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button ng-click="save(destination)" type="submit" ng-disabled="createForm.$invalid" class="btn btn-primary">Save</button>
+    <button ng-click="cancel()" class="btn btn-danger">Cancel</button>
 </div>
 
diff --git a/lemur/static/app/angular/destinations/view/view.js b/lemur/static/app/angular/destinations/view/view.js
@@ -55,6 +55,7 @@ angular.module('lemur')
         templateUrl: '/angular/destinations/destination/destination.tpl.html',
         controller: 'DestinationsEditController',
         size: 'lg',
+        backdrop: 'static',
         resolve: {
             editId: function () {
               return destinationId;
@@ -73,7 +74,8 @@ angular.module('lemur')
         animation: true,
         controller: 'DestinationsCreateController',
         templateUrl: '/angular/destinations/destination/destination.tpl.html',
-        size: 'lg'
+        size: 'lg',
+        backdrop: 'static'
       });
 
       modalInstance.result.then(function () {

diff --git a/lemur/static/app/angular/domains/view/view.js b/lemur/static/app/angular/domains/view/view.js
@@ -54,7 +54,8 @@ angular.module('lemur')
         animation: true,
         controller: 'DomainsCreateController',
         templateUrl: '/angular/domains/domain/domain.tpl.html',
-        size: 'lg'
+        size: 'lg',
+        backdrop: 'static'
       });
 
       modalInstance.result.then(function () {