Merge "Fix style of the submit button on confirmation modal"

horizon/static/framework/widgets/modal/simple-modal.html

@@ -14,7 +14,7 @@
     type="button" ng-click="modalCtrl.cancel()">
     <span ng-bind="::modalCtrl.context.cancel"></span>
   </button>
-  <button class="btn btn-primary"
+  <button class="btn" ng-class="modalCtrl.context.confirmCssClass"
     type="button" ng-click="modalCtrl.submit()">
     <span ng-bind="::modalCtrl.context.submit"></span>
   </button>

horizon/static/framework/widgets/modal/simple-modal.service.js

@@ -79,7 +79,8 @@
                 title: params.title,
                 body: params.body,
                 submit: params.submit || gettext('Submit'),
-                cancel: params.cancel || gettext('Cancel')
+                cancel: params.cancel || gettext('Cancel'),
+                confirmCssClass: params.confirmCssClass || "btn-primary"
               };
             }
           }

horizon/static/horizon/js/horizon.modals.js

@@ -43,13 +43,17 @@ horizon.modals.initModal = function (modal) {
 };
 
 /* Creates a modal dialog from the client-side template. */
-horizon.modals.create = function (title, body, confirm, cancel) {
+horizon.modals.create = function (title, body, confirm, cancel, confirmCssClass) {
   if (!cancel) {
     cancel = gettext("Cancel");
   }
   var template = horizon.templates.compiled_templates["#modal_template"],
     params = {
-      title: title, body: body, confirm: confirm, cancel: cancel,
+      title: title,
+      body: body,
+      confirm: confirm,
+      cancel: cancel,
+      confirmCssClass: confirmCssClass || "btn-primary",
       modal_backdrop: horizon.modals.MODAL_BACKDROP
     };
   return $(template.render(params)).appendTo("#modal_wrapper");

horizon/static/horizon/js/horizon.tables.js

@@ -318,8 +318,9 @@ horizon.datatables.confirm = function(action) {
   } catch (e) {
     body = name_string + gettext("Please confirm your selection. ") + help_text;
   }
-
+  var actionNode = action.nodeType ? action: action[0];
-  var modal = horizon.modals.create(title, body, action_string);
+  var confirmCssClass = actionNode.className.indexOf("btn-danger") >= 0 ? "btn-danger" : "btn-primary";
+  var modal = horizon.modals.create(title, body, action_string, "", confirmCssClass);
   modal.modal();
 
   if ($uibModal_parent.length) {
@@ -329,7 +330,7 @@ horizon.datatables.confirm = function(action) {
     modal.css('z-index', child_backdrop.css('z-index')+10);
   }
 
-  modal.find('.btn-primary').click(function () {
+  modal.find('.' + confirmCssClass).click(function () {
     var $form = $action.closest('form');
     var el = document.createElement("input");
     el.type = 'hidden';

horizon/templates/horizon/client_side/_modal.html

@@ -18,7 +18,7 @@
       </div>
       <div class='modal-footer'>
         <a href='#' class='btn btn-default cancel' data-dismiss='modal'>[[cancel]]</a>
-        <a href='#' class='btn btn-primary'>[[confirm]]</a>
+        <a href='#' class='btn [[confirmCssClass]]'>[[confirm]]</a>
       </div>
     </div>
   </div>

openstack_dashboard/dashboards/project/static/dashboard/project/containers/containers.controller.js

@@ -137,8 +137,9 @@
         body: interpolate(
           gettext('Are you sure you want to delete container %(name)s?'), container, true
         ),
-        submit: gettext('Yes'),
+        submit: gettext('Delete'),
-        cancel: gettext('No')
+        cancel: gettext('Cancel'),
+        confirmCssClass: "btn-danger"
       };
 
       simpleModalService.modal(options).result.then(function confirmed() {

openstack_dashboard/dashboards/project/static/dashboard/project/containers/delete-objects-modal.html

@@ -32,7 +32,7 @@
     <span class="fa fa-close"></span>
     <translate>Cancel</translate>
   </button>
-  <button class="btn btn-primary" ng-disabled="ctrl.model.running" ng-click="ctrl.action()">
+  <button class="btn btn-danger" ng-disabled="ctrl.model.running" ng-click="ctrl.action()">
     <translate ng-if="ctrl.model.mode === 'discovery'">Delete</translate>
     <translate ng-if="ctrl.model.mode === 'deletion'">OK</translate>
   </button>

openstack_dashboard/test/integration_tests/regions/forms.py

@@ -283,6 +283,7 @@ class BaseFormRegion(baseregion.BaseRegion):
     """Base class for forms."""
 
     _submit_locator = (by.By.CSS_SELECTOR, '*.btn.btn-primary')
+    _submit_danger_locator = (by.By.CSS_SELECTOR, '*.btn.btn-danger')
     _cancel_locator = (by.By.CSS_SELECTOR, '*.btn.cancel')
     _default_form_locator = (by.By.CSS_SELECTOR, 'div.modal-dialog')
 
@@ -298,7 +299,11 @@ class BaseFormRegion(baseregion.BaseRegion):
 
     @property
     def _submit_element(self):
-        return self._get_element(*self._submit_locator)
+        try:
+            submit_element = self._get_element(*self._submit_locator)
+        except exceptions.NoSuchElementException:
+            submit_element = self._get_element(*self._submit_danger_locator)
+        return submit_element
 
     def submit(self):
         self._submit_element.click()