External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 19:30:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

more fixes to About Tower dialog modal

Browse Source
This commit is contained in:
Jared Tabor 2014-08-08 14:03:25 -04:00
parent 6747d0690a
commit f9b6014519
4 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/static/js/helpers/AboutAnsible.js
View File

@ -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();
}
});
});

12
awx/ui/static/less/ansible-ui.less
View File

@ -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{

7
awx/ui/static/lib/ansible/Utilities.js
View File

@ -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');

16
awx/ui/static/partials/cowsay-about.html
View File

@ -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>