From f9b6014519c228e83cb7b1d4cb9cd5707e047d96 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Fri, 8 Aug 2014 14:03:25 -0400
Subject: [PATCH] more fixes to About Tower dialog modal

---
 awx/ui/static/js/helpers/AboutAnsible.js | 14 ++++++++++----
 awx/ui/static/less/ansible-ui.less       | 12 ++++++++----
 awx/ui/static/lib/ansible/Utilities.js   |  7 ++++++-
 awx/ui/static/partials/cowsay-about.html | 16 ++++++++--------
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/awx/ui/static/js/helpers/AboutAnsible.js b/awx/ui/static/js/helpers/AboutAnsible.js
index 6f95f0848a..1bc921b3ff 100644
--- a/awx/ui/static/js/helpers/AboutAnsible.js
+++ b/awx/ui/static/js/helpers/AboutAnsible.js
@@ -58,15 +58,21 @@ angular.module('AboutAnsibleHelpModal', ['RestServices', 'Utilities','ModalDialo
                         paddedStr = paddedStr + " ";
                     }
                     $('#about-modal-version').html(paddedStr);
+                    scope.modalOK = function(){
+                        $('#about-modal-dialog').dialog('close');
+                    };
                     CreateDialog({
                         id: 'about-modal-dialog',
                         scope: scope,
-                        buttons: [],
-                        width: 730,
-                        height: 320,
+                        // buttons: [],
+                        width: 700,
+                        height: 380,
                         minWidth: 300,
                         // title:  , //'<img src="static/img/tower_login_logo.png">' ,//'About Ansible',
-                        callback: 'DialogReady'
+                        callback: 'DialogReady',
+                        onOpen: function(){
+                            $('#dialog-ok-button').focus();
+                        }
                     });
                 });
 
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index 51e45542ab..0ce4f3f548 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -128,15 +128,19 @@ a:focus {
   background-color: #FFF;
 }
 
+#cowsay {
+  padding-left: 30px;
+  max-width: 340px;
+  background-color: white;
+  border-style: none;
 
-#cowsay{
-  margin-right: 10px;
 }
 
+
 #about-modal-titlelogo{
   margin-bottom: 10px;
-  width: 228px;
-  height: 70px;
+  width: 175px;
+  height: 50px;
 }
 
 #copyright-text{
diff --git a/awx/ui/static/lib/ansible/Utilities.js b/awx/ui/static/lib/ansible/Utilities.js
index c3ad2c6b32..cc6310a099 100644
--- a/awx/ui/static/lib/ansible/Utilities.js
+++ b/awx/ui/static/lib/ansible/Utilities.js
@@ -99,6 +99,9 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
                     action();
                 }
             });
+            $('#alert-modal2').on('shown.bs.modal', function () {
+                $('#alert2_ok_btn').focus();
+            });
             $(document).bind('keydown', function (e) {
                 if (e.keyCode === 27) {
                     $('#alert-modal2').modal('hide');
@@ -122,7 +125,9 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
                     action();
                 }
             });
-
+            $('#alert-modal').on('shown.bs.modal', function () {
+                $('#alert_ok_btn').focus();
+            });
             $(document).bind('keydown', function (e) {
                 if (e.keyCode === 27) {
                     $('#alert-modal').modal('hide');
diff --git a/awx/ui/static/partials/cowsay-about.html b/awx/ui/static/partials/cowsay-about.html
index a89163d231..5c68189ff1 100644
--- a/awx/ui/static/partials/cowsay-about.html
+++ b/awx/ui/static/partials/cowsay-about.html
@@ -1,8 +1,8 @@
 
 <div id="about-dialog-body">
     <div class="row">
-        <div class="col-sm-5 col-xs-12">
-            <pre id='cowsay'>
+        <div class="col-sm-5 col-xs-12 text-center">
+            <pre id='cowsay' style="text-align:left;">
  ________________
 /  Tower Version \
 \<span id='about-modal-version'></span>/
@@ -14,12 +14,12 @@
                 ||     ||
             </pre>
         </div>
-        <div  class="col-sm-7 col-xs-12">
+        <div  class="col-sm-7 col-xs-12 text-center">
             <img id="about-modal-titlelogo" src="static/img/ansible_tower_logo_minimalc.png"><br>
-            <!-- <p>Tower Version <span id='about-modal-version'></span></p> -->
-            <textarea id="copyright-text" class="form-control" rows="3" readonly>Copyright 2014.  All rights reserved.&#10Ansible is a registered trademark of Ansible, Inc.&#10Ansible Tower is a trademark pending registration. </textarea>
+            <p>Copyright 2014.  All rights reserved.</p>
+            <p>Ansible is a registered trademark of Ansible, Inc.</p>
+            <p>Ansible Tower is a trademark pending registration.</p>
             <br>
-            <p>Visit <a href="http://www.ansible.com" target="_blank">Ansible.com</a> for more information!</p>
+            <p>Visit <a href="http://www.ansible.com" target="_blank">Ansible.com</a> for more information.</p>
     </div>
-</div>
-
+</div>
\ No newline at end of file