shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

AC-167 Added new AWX logo to site footer and login dialog.

Browse Source
This commit is contained in:
chouseknecht 2013-07-18 18:16:29 -04:00
parent 74849c6dfa
commit eef7814d66
8 changed files with 80 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
awx/ui/static/css/ansible-ui.css
View File

@ -141,10 +141,12 @@
background-color: #36454F;
color: #A9A9A9;
padding-top: 20px;
padding-bottom: 40px;
text-align: center;
}
.copyright {
margin-top: 40px;
display: inline-block;
font-size: 11px;
font-weight: normal;
text-align: center;
@ -166,19 +168,19 @@
.site-footer .logo {
display: inline-block;
text-align: left;
font-size: 12px;
margin-right: 20px;
margin-right: 35px;
}
.site-footer .logo img {
max-width: 165px;
max-width: 125px;
}
.site-footer .logo .tag-line {
line-height: normal;
margin-top: 5px;
margin-left: 15px;
.login-header {
text-align: center;
}
.login-header img {
max-width: 100px;
}
.error {
@ -615,6 +617,15 @@
margin-top: 0;
}
.modal-backdrop,
.modal-backdrop.fade.in {
opacity: 0.6;
filter: alpha(opacity=60);
}
/* overrides to TB modal */
.modal-header {
padding: 15px 10px;

BIN
awx/ui/static/img/AWX_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
awx/ui/static/img/ansible-logo-bw-invert.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.4 KiB

3
awx/ui/static/js/app.js
View File

@ -98,6 +98,9 @@ angular.module('ansible', [
when('/projects/:id',
{ templateUrl: urlPrefix + 'partials/projects.html', controller: ProjectsEdit }).
when('/projects/:project_id/organizations',
{ templateUrl: urlPrefix + 'partials/projects.html', controller: OrganizationsList }).
when('/inventories',
{ templateUrl: urlPrefix + 'partials/inventories.html', controller: InventoriesList }).

5
awx/ui/static/js/controllers/Authentication.js
View File

@ -23,7 +23,8 @@ function Authenticate($scope, $rootScope, $location, Authorization, ToggleClass,
//gets set back to true by Authorization.setToken().
$scope.sessionExpired = Authorization.didSessionExpire(); //Display session timeout message
$scope.sessionTimeout = ($AnsibleConfig.session_timeout / 60).toFixed(2)
$scope.sessionTimeout = ($AnsibleConfig.session_timeout / 60).toFixed(2);
$scope.AWXLoginLogo = $staticURL + 'img/AWX_logo.png';
$('#login-password').bind('keypress', function(e) {
var code = (e.keyCode ? e.keyCode : e.which);
@ -33,7 +34,7 @@ function Authenticate($scope, $rootScope, $location, Authorization, ToggleClass,
});
// Display the login dialog
$('#login-modal').modal({ show: true, keyboard: false, backdrop: false });
$('#login-modal').modal({ show: true, keyboard: false, backdrop: 'static' });
$scope.reset = function() {
$('#login-form input').each( function(index) { $(this).val(''); });

40
awx/ui/static/js/forms/Projects.js
View File

@ -73,7 +73,47 @@ angular.module('ProjectFormDefinition', [])
},
related: { //related colletions (and maybe items?)
organizations: {
type: 'collection',
title: 'Organizations',
iterator: 'organization',
open: false,
actions: {
add: {
ngClick: "add('organizations')",
icon: 'icon-plus',
label: 'Add',
awToolTip: 'Add an organization'
}
},
fields: {
name: {
key: true,
label: 'Name'
},
description: {
label: 'Description'
}
},
fieldActions: {
edit: {
label: 'Edit',
ngClick: "edit('organizations', \{\{ organization.id \}\}, '\{\{ organization.name \}\}')",
icon: 'icon-edit',
awToolTip: 'Edit the credential'
},
"delete": {
label: 'Delete',
ngClick: "delete('organizations', \{\{ organization.id \}\}, '\{\{ organization.name \}\}', 'organizations')",
icon: 'icon-remove',
"class": 'btn-danger',
awToolTip: 'Delete the credential'
}
}
},
}
}); // Form

7
awx/ui/static/partials/login-dialog.html
View File

@ -2,11 +2,12 @@
<div class="span12">
<div id="login-modal" class="modal hide">
<div class="modal-header">
<h3>Ansible Login</h3>
<div class="modal-header login-header">
<img ng-src="{{ AWXLoginLogo }}" />
</div>
<div class="modal-body">
<div class="login-alert" ng-show="(sessionExpired == true)">Your session timed out due to inactivity. Please sign in again.</div>
<div class="login-alert" ng-show="(sessionExpired == false)">Welcome to AWX! &nbsp;Please sign in.</div>
<div class="login-alert" ng-show="(sessionExpired == true)">Your session timed out due to inactivity. Please sign in.</div>
<form id="login-form" name="loginForm" class="form-horizontal" autocomplete="off" novalidate >
<div class="control-group">
<label class="control-label">Username:</label>

13
awx/ui/templates/ui/index.html
View File

@ -10,6 +10,9 @@
<link rel="stylesheet" href="{{ STATIC_URL }}css/font-awesome.min.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}css/ansible-ui.css" />
<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
<script>
var $staticURL = "{{ STATIC_URL }}";
</script>
<script src="{{ STATIC_URL }}js/config.js"></script>
<script src="{{ STATIC_URL }}lib/angular/angular.js"></script>
<script src="{{ STATIC_URL }}lib/angular/angular-resource.js"></script>
@ -223,19 +226,21 @@
<div class="site-footer">
<div>
<div class="social">
<div class="social pull-left">
<a href="https://github.com/ansible" target="_blank"><i class="icon-github"></i></a>
<a href="https://www.facebook.com/pages/Ansibleworks/258737970923512?ref=hl" target="_blanck"><i class="icon-facebook"></i></a>
<a href="http://www.twitter.com/ansibleworks" target="_blanck"><i class="icon-twitter"></i></a>
<a href="http://www.linkedin.com/company/ansibleworks" target="_blanck"><i class="icon-linkedin"></i></a>
<a href="mailto://info@ansibleworks.com"><i class="icon-envelope"></i></a>
</div>
<div class="copyright">
Copyright &copy; 2013 AnsibleWorks, Inc. All rights reservied.<br />
1482 East Valley Road, Suite 888 &middot; Montecito, California 9308 &middot; +1-800-825-0212
</div>
<div class="logo pull-right">
<a href="http://www.ansibleworks.com" target="_blank"><img src="{{ STATIC_URL }}img/ansible-logo-bw-invert.png" /></a>
<div class="tag-line">Radically simple IT orchestration.</div>
<a href="http://www.ansibleworks.com" target="_blank"><img src="{{ STATIC_URL }}img/AWX_logo.png" /></a>
</div>
</div>
<div class="copyright">Copyright &copy; 2013 AnsibleWorks, Inc. All rights reservied.<br />1482 East Valley Road, Suite 888 &middot; Montecito, California 9308 &middot; +1-800-825-0212</div>
</div><!-- site footer -->
<script src="{{ STATIC_URL }}lib/jquery/jquery-1.9.1.min.js"></script>