From 1281ea15b1c73974b3ccd9b37810f9617e09c186 Mon Sep 17 00:00:00 2001
From: Dan Clarizio <dclarizi@redhat.com>
Date: Wed, 9 Nov 2016 14:06:53 -0800
Subject: [PATCH] Merge pull request #12528 from
 Jiri-Kremser/datasource-btns-alt

Adding alt and title attributes for buttons.
(cherry picked from commit 19a57ea0412d23393ad7905a9b2c79187fb403fe)
---
 .../_add_datasource_step1.html.haml                  | 12 +++++++++---
 .../_add_datasource_step2.html.haml                  | 12 +++++++++---
 .../_add_datasource_step3.html.haml                  | 12 +++++++++---
 .../middleware_server/_add_jdbc_driver.html.haml     | 11 ++++++-----
 .../middleware_server/_choose_datasource.html.haml   |  8 ++++++--
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/app/views/middleware_server/_add_datasource_step1.html.haml b/app/views/middleware_server/_add_datasource_step1.html.haml
index 1fc8cf29380..8088e43d817 100644
--- a/app/views/middleware_server/_add_datasource_step1.html.haml
+++ b/app/views/middleware_server/_add_datasource_step1.html.haml
@@ -39,12 +39,18 @@
 
     .modal-footer
       %button.btn.btn-default.dialog-cancel-button{:type      => "button",
+                                                   "alt"      => (t = _("Cancel")),
+                                                   "title"    => t,
                                                    "ng-click" => "reset()"}
-        = _("Cancel")
+        = t
       %button.btn.btn-default{:type      => "button",
+                              "alt"      => (t = _("Back")),
+                              "title"    => t,
                               "ng-click" => "addDatasourceStep1Back()"}
-        = _("Back")
+        = t
       %button.btn.btn-primary{:type         => "button",
+                              "alt"      => (t = _("Next")),
+                              "title"    => t,
                               "ng-click"    => "addDatasourceStep1Next()",
                               "ng-disabled" => "step1Form.$invalid"}
-        = _("Next")
+        = t
diff --git a/app/views/middleware_server/_add_datasource_step2.html.haml b/app/views/middleware_server/_add_datasource_step2.html.haml
index 22ba6b006b3..8203470b09e 100644
--- a/app/views/middleware_server/_add_datasource_step2.html.haml
+++ b/app/views/middleware_server/_add_datasource_step2.html.haml
@@ -58,12 +58,18 @@
 
     .modal-footer
       %button.btn.btn-default.dialog-cancel-button{:type      => "button",
+                                                   "alt"      => (t = _("Cancel")),
+                                                   "title"    => t,
                                                    "ng-click" => "reset()"}
-        = _("Cancel")
+        = t
       %button.btn.btn-default{:type      => "button",
+                              "alt"      => (t = _("Back")),
+                              "title"    => t,
                               "ng-click" => "addDatasourceStep2Back()"}
-        = _("Back")
+        = t
       %button.btn.btn-primary{:type         => "button",
+                              "alt"      => (t = _("Next")),
+                              "title"    => t,
                               "ng-click"    => "addDatasourceStep2Next()",
                               "ng-disabled" => "step2Form.$invalid"}
-        = _("Next")
+        = t
diff --git a/app/views/middleware_server/_add_datasource_step3.html.haml b/app/views/middleware_server/_add_datasource_step3.html.haml
index 28b385a47d8..2217c96fce1 100644
--- a/app/views/middleware_server/_add_datasource_step3.html.haml
+++ b/app/views/middleware_server/_add_datasource_step3.html.haml
@@ -53,12 +53,18 @@
 
     .modal-footer
       %button.btn.btn-default.dialog-cancel-button{:type          => "button",
+                                                   "alt"      => (t = _("Cancel")),
+                                                   "title"    => t,
                                                    "ng-click"     => "reset()"}
-        = _("Cancel")
+        = t
       %button.btn.btn-default{:type      => "button",
+                              "alt"      => (t = _("Back")),
+                              "title"    => t,
                               "ng-click" => "finishAddDatasourceBack()"}
-        = _("Back")
+        = t
       %button.btn.btn-primary{:type         => "button",
+                              "alt"      => (t = _("Finish")),
+                              "title"    => t,
                               "ng-click"    => "finishAddDatasource()",
                               "ng-disabled" => "step3Form.$invalid"}
-        = _("Finish")
+        = t
diff --git a/app/views/middleware_server/_add_jdbc_driver.html.haml b/app/views/middleware_server/_add_jdbc_driver.html.haml
index 10f06ee63b8..874b8f60429 100644
--- a/app/views/middleware_server/_add_jdbc_driver.html.haml
+++ b/app/views/middleware_server/_add_jdbc_driver.html.haml
@@ -98,12 +98,13 @@
 
         .modal-footer
           %button.btn.btn-default.dialog-cancel-button{:type => "button",
+                                                       "alt"      => (t = _("Cancel")),
+                                                       "title"    => t,
                                                        "data-dismiss" => "modal"}
-            = _("Cancel")
+            = t
           %button.btn.btn-primary{"ng-disabled" => "!jdbcDriverModel.filePath || jdbcAddForm.$invalid",
+                                  "alt"      => (t = _("Deploy")),
+                                  "title"    => t,
                                   "ng-click"    => "addJdbcDriver()",
                                   :type         => "button"}
-            = _("Deploy")
-
-:javascript
-  miq_bootstrap('#form_jdbc_add');
+            = t
diff --git a/app/views/middleware_server/_choose_datasource.html.haml b/app/views/middleware_server/_choose_datasource.html.haml
index 75b265b0e90..cc957884232 100644
--- a/app/views/middleware_server/_choose_datasource.html.haml
+++ b/app/views/middleware_server/_choose_datasource.html.haml
@@ -18,9 +18,13 @@
 
   .modal-footer
     %button.btn.btn-default.dialog-cancel-button{:type        => "button",
+                                                 "alt"      => (t = _("Cancel")),
+                                                 "title"    => t,
                                                  "ng-click"   => "reset()"}
-      = _("Cancel")
+      = t
     %button.btn.btn-primary{:type         => "button",
+                            "alt"      => (t = _("Next")),
+                            "title"    => t,
                             "ng-click"    => "addDatasourceChooseNext()",
                             "ng-disabled" => "dsChooseForm.$invalid"}
-      = _("Next")
+      = t