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

update about modal to be monospace and have core version

Browse Source
This commit is contained in:
John Mitchell
2017-03-06 11:14:06 -05:00
committed by Matthew Jones
parent 6e586282f5
commit 8f5253014b
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/about/about.block.less
View File

@@ -1,6 +1,16 @@
/** @define About */ /** @define About */
@import "./client/src/shared/branding/colors.default.less"; @import "./client/src/shared/branding/colors.default.less";
.About-ansibleVersion,
.About-cowsay--code {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
}
.About-ansibleVersion {
color: @default-data-txt;
}
.About-cowsay--container{ .About-cowsay--container{
width: 340px; width: 340px;
margin: 0 auto; margin: 0 auto;
@@ -25,6 +35,7 @@
.About-brand--redhat{ .About-brand--redhat{
float: left; float: left;
width: 112px; width: 112px;
padding-top: 13px;
} }
.About-brand--ansible{ .About-brand--ansible{
max-width: 120px; max-width: 120px;

19
awx/ui/client/src/about/about.controller.js
View File

@@ -1,27 +1,12 @@
export default export default
['$scope', '$state', 'ConfigService', 'i18n', ['$scope', '$state', 'ConfigService', 'i18n',
function($scope, $state, ConfigService, i18n){ function($scope, $state, ConfigService, i18n){
var processVersion = function(version){
// prettify version & calculate padding
// e,g 3.0.0-0.git201602191743/ -> 3.0.0
var split = version.split('-')[0];
var spaces = Math.floor((16-split.length)/2),
paddedStr = "";
for(var i=0; i<=spaces; i++){
paddedStr = paddedStr +" ";
}
paddedStr = paddedStr + split;
for(var j = paddedStr.length; j<16; j++){
paddedStr = paddedStr + " ";
}
return paddedStr;
};
var init = function(){ var init = function(){
ConfigService.getConfig() ConfigService.getConfig()
.then(function(config){ .then(function(config){
$scope.version = config.version.split('-')[0];
$scope.ansible_version = config.ansible_version;
$scope.subscription = config.license_info.subscription_name; $scope.subscription = config.license_info.subscription_name;
$scope.version = processVersion(config.version);
$scope.version_str = i18n._("Version");
$('#about-modal').modal('show'); $('#about-modal').modal('show');
}); });
}; };

16
awx/ui/client/src/about/about.partial.html
View File

@@ -10,10 +10,9 @@
<div class="About-cowsay--container"> <div class="About-cowsay--container">
<!-- Don't indent this properly, you'll break the cow --> <!-- Don't indent this properly, you'll break the cow -->
<pre class="About-cowsay--code"> <pre class="About-cowsay--code">
________________ _______________
/ Tower {{version_str}} \ < Tower {{version}} >
\<span>{{version}}</span>/ ---------------
----------------
\ ^__^ \ ^__^
\ (oo)\_______ \ (oo)\_______
(__) A )\/\ (__) A )\/\
@@ -23,8 +22,13 @@
</div> </div>
<div class="About-modal--footer"> <div class="About-modal--footer">
<img class="About-brand--redhat img-responsive" src="/static/assets/tower-logo-login.svg" /> <img class="About-brand--redhat img-responsive" src="/static/assets/tower-logo-login.svg" />
<p class="text-right">Copyright &copy; 2017 Red Hat, Inc. <br> <p class="text-right">
Visit <a href="http://www.ansible.com/" target="_blank">Ansible.com</a> for more information.<br> <span class="About-ansibleVersion">
Ansible {{ ansible_version }}
</span> <br>
Copyright &copy; 2017 Red Hat, Inc. <br>
Visit <a href="http://www.ansible.com/" target="_blank">Ansible.com</a> for more information.<br>
</p>
</div> </div>
</div> </div>
</div> </div>