mirror of
https://github.com/ansible/awx.git
synced 2026-01-16 12:20:45 -03:30
added an about dialog that give copyright information about Tower
This commit is contained in:
Jared Tabor
parent
1fa2d35977
commit
7466968941
@ -113,7 +113,8 @@ angular.module('Tower', [
|
||||
'SocketIO',
|
||||
'lrInfiniteScroll',
|
||||
'LoadConfigHelper',
|
||||
'SocketHelper'
|
||||
'SocketHelper',
|
||||
'AboutAnsibleHelpModal'
|
||||
])
|
||||
|
||||
.constant('AngularScheduler.partials', urlPrefix + 'lib/angular-scheduler/lib/')
|
||||
@ -421,9 +422,10 @@ angular.module('Tower', [
|
||||
}])
|
||||
|
||||
.run(['$compile', '$cookieStore', '$rootScope', '$log', 'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer', 'ClearScope', 'HideStream', 'Socket',
|
||||
'LoadConfig', 'Store', 'ShowSocketHelp', 'LicenseViewer',
|
||||
'LoadConfig', 'Store', 'ShowSocketHelp', 'LicenseViewer', 'AboutAnsibleHelp',
|
||||
function ($compile, $cookieStore, $rootScope, $log, CheckLicense, $location, Authorization, LoadBasePaths, Timer, ClearScope, HideStream, Socket,
|
||||
LoadConfig, Store, ShowSocketHelp, LicenseViewer) {
|
||||
LoadConfig, Store, ShowSocketHelp, LicenseViewer, AboutAnsibleHelp) {
|
||||
|
||||
|
||||
var e, html, sock, checkCount = 0;
|
||||
|
||||
@ -542,6 +544,10 @@ angular.module('Tower', [
|
||||
|
||||
activateTab();
|
||||
|
||||
$rootScope.viewAboutTower = function(){
|
||||
AboutAnsibleHelp();
|
||||
};
|
||||
|
||||
$rootScope.viewCurrentUser = function () {
|
||||
$location.path('/users/' + $rootScope.current_user.id);
|
||||
};
|
||||
|
||||
64
awx/ui/static/js/helpers/AboutAnsible.js
Normal file
64
awx/ui/static/js/helpers/AboutAnsible.js
Normal file
@ -0,0 +1,64 @@
|
||||
/*********************************************
|
||||
* Copyright (c) 2014 AnsibleWorks, Inc.
|
||||
*
|
||||
* Dashboard.js
|
||||
*
|
||||
* The new dashboard
|
||||
*
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
angular.module('AboutAnsibleHelpModal', ['RestServices', 'Utilities','ModalDialog'])
|
||||
.factory('AboutAnsibleHelp', ['$rootScope', '$compile', '$location' , 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait', 'CreateDialog',
|
||||
function ($rootScope, $compile , $location, Rest, GetBasePath, ProcessErrors, Wait, CreateDialog) {
|
||||
return function () {
|
||||
|
||||
var scope= $rootScope.$new(),
|
||||
url;
|
||||
|
||||
url = GetBasePath('config');
|
||||
Rest.setUrl(url);
|
||||
Rest.get()
|
||||
.success(function (data){
|
||||
scope.$emit('BuildAboutDialog', data);
|
||||
})
|
||||
.error(function (data, status) {
|
||||
ProcessErrors(scope, data, status, null, { hdr: 'Error!',
|
||||
msg: 'Failed to get: ' + url + ' GET returned: ' + status });
|
||||
});
|
||||
|
||||
|
||||
if (scope.removeDialogReady) {
|
||||
scope.removeDialogReady();
|
||||
}
|
||||
scope.removeDialogReady = scope.$on('DialogReady', function() {
|
||||
// element = angular.element(document.getElementById('about-modal-dialog'));
|
||||
// $compile(element)(scope);
|
||||
$('#about-modal-dialog').dialog('open');
|
||||
});
|
||||
|
||||
if (scope.removeBuildAboutDialog) {
|
||||
scope.removeBuildAboutDialog();
|
||||
}
|
||||
scope.removeBuildAboutDialog = scope.$on('BuildAboutDialog', function(e, data) {
|
||||
var str = data.version;
|
||||
if(str.search('-')){
|
||||
str = str.substr(0,str.search('-'));
|
||||
}
|
||||
$('#about-modal-version').html(str);
|
||||
CreateDialog({
|
||||
id: 'about-modal-dialog',
|
||||
scope: scope,
|
||||
buttons: [],
|
||||
width: 600,
|
||||
height: 300,
|
||||
minWidth: 300,
|
||||
// title: , //'<img src="static/img/tower_login_logo.png">' ,//'About Ansible',
|
||||
callback: 'DialogReady'
|
||||
});
|
||||
});
|
||||
|
||||
};
|
||||
}
|
||||
]);
|
||||
@ -128,6 +128,17 @@ a:focus {
|
||||
background-color: #FFF;
|
||||
}
|
||||
|
||||
#about-modal-logo{
|
||||
width: 150px;
|
||||
height: 150px;
|
||||
margin-left: 10px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
#about-modal-titlelogo{
|
||||
margin-bottom: 10px;
|
||||
|
||||
}
|
||||
|
||||
/* Make buttons appear to be disabled, but allow mouse events */
|
||||
.btn-disabled {
|
||||
opacity: 0.35;
|
||||
|
||||
14
awx/ui/static/partials/about.html
Normal file
14
awx/ui/static/partials/about.html
Normal file
@ -0,0 +1,14 @@
|
||||
<div class="row">
|
||||
<div class="left-side col-sm-4 col-xs-12">
|
||||
<img id="about-modal-logo" src="static/img/tower_console_bug.png">
|
||||
|
||||
</div>
|
||||
<div class="right-side col-sm-8 col-xs-12">
|
||||
<img id="about-modal-titlelogo" src="static/img/tower_login_logo.png"><br>
|
||||
<p>Tower Version <span id='about-modal-version'></span></p>
|
||||
<textarea class="form-control" rows="3">Copyright 2014. All rights reserved.
Ansible is a registered trademark of Ansible, Inc.
Ansible Tower is a trademark pending registration. </textarea>
|
||||
<br>
|
||||
<p>Visit <a href="http://www.ansible.com" target="_blank">Ansible.com</a> for more information!</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -157,6 +157,7 @@
|
||||
<script src="{{ STATIC_URL }}js/helpers/JobTemplates.js"></script>
|
||||
<script src="{{ STATIC_URL }}js/helpers/HostEventsViewer.js"></script>
|
||||
<script src="{{ STATIC_URL }}js/helpers/License.js"></script>
|
||||
<script src="{{ STATIC_URL }}js/helpers/AboutAnsible.js"></script>
|
||||
<script src="{{ STATIC_URL }}js/widgets/JobStatus.js"></script>
|
||||
<script src="{{ STATIC_URL }}js/widgets/DashboardCounts.js"></script>
|
||||
<script src="{{ STATIC_URL }}js/widgets/HostPieChart.js"></script>
|
||||
@ -184,6 +185,7 @@
|
||||
<a href="#inventories" id="main_inventories_link">Inventories</a></li>
|
||||
<a href="#job_templates" id="main_job_templates_link">Job Templates</a></li>
|
||||
<a href="#jobs" id="main_jobs_link">Jobs</a></li>
|
||||
<a href="" id="main_about" ng-click ="viewAboutTower()"> About Tower</a> </li>
|
||||
<a href="" id="main_view_user" ng-click="viewCurrentUser()">Account Settings</a></li>
|
||||
<a href="" id="main_view_license" ng-click="viewLicense()">View License</a></li>
|
||||
<a href="https://ansibleworks.zendesk.com/anonymous_requests/new" id="main_contact_support" target="_blank">Contact Support</a></li>
|
||||
@ -220,6 +222,7 @@
|
||||
<li ng-show="current_user.username" class="collapsed-option">
|
||||
<a href="" id="account-menu-link">Hello, <span ng-bind="current_user.username"></span> <span class="caret"></span></a>
|
||||
<ul class="nav navbar-nav" id="account-submenu">
|
||||
<li><a href="" id="main_about" ng-click ="viewAboutTower()"> About Tower</a> </li>
|
||||
<li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li>
|
||||
<li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
|
||||
<li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
|
||||
@ -235,6 +238,7 @@
|
||||
<li class="dropdown" ng-show="current_user.username">
|
||||
<a href="" id="account-menu-link" class="dropdown-toggle" data-toggle="dropdown">Hello, <span ng-bind="current_user.username"></span> <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu" id="account-submenu">
|
||||
<li><a href="" id="main_about" ng-click ="viewAboutTower()"> About Tower</a> </li>
|
||||
<li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li>
|
||||
<li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
|
||||
<li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
|
||||
@ -395,6 +399,8 @@
|
||||
|
||||
<div id="help-modal-dialog" style="display: none;"></div>
|
||||
<div id="license-modal-dialog" style="display: none;"></div>
|
||||
<div id="about-modal-dialog" style="display: none;" ng-include="'static/partials/about.html '"></div>
|
||||
|
||||
|
||||
</div><!-- container -->
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user