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

random UI fixes

Browse Source 
fixed jshint error
fixed asterisk padding on login modal
fixed color on border of error form field.
This commit is contained in:
John Mitchell
2015-04-26 18:06:12 -04:00
parent 0d4c1a4245
commit 04340dcc27
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ export function Authenticate($log, $cookieStore, $compile, $window, $rootScope,
"<div class=\"login-alert\" ng-show=\"sessionExpired\">Your session timed out due to inactivity. Please sign in.</div>\n" + "<div class=\"login-alert\" ng-show=\"sessionExpired\">Your session timed out due to inactivity. Please sign in.</div>\n" +
"<form id=\"login-form\" name=\"loginForm\" class=\"form-horizontal\" autocomplete=\"off\" novalidate >\n" + "<form id=\"login-form\" name=\"loginForm\" class=\"form-horizontal\" autocomplete=\"off\" novalidate >\n" +
"<div class=\"form-group\">\n" + "<div class=\"form-group\">\n" +
"<label class=\"control-label col-md-offset-1 col-md-2 col-sm-offset-1 col-sm-2 col-xs-3 prepend-asterisk\">Username</label>\n" + "<label class=\"control-label col-md-offset-1 col-md-2 col-sm-offset-1 col-sm-2 col-xs-3 prepend-asterisk prepend-asterisk--login\">Username</label>\n" +
"<div class=\"col-md-8 col-sm-8 col-xs-9\">\n" + "<div class=\"col-md-8 col-sm-8 col-xs-9\">\n" +
"<input type=\"text\" name=\"login_username\" class=\"form-control\" ng-model=\"login_username\"" + "<input type=\"text\" name=\"login_username\" class=\"form-control\" ng-model=\"login_username\"" +
"id=\"login-username\" autocomplete=\"off\" required>\n" + "id=\"login-username\" autocomplete=\"off\" required>\n" +
@@ -125,7 +125,7 @@ export function Authenticate($log, $cookieStore, $compile, $window, $rootScope,
"</div>\n" + "</div>\n" +
"</div>\n" + "</div>\n" +
"<div class=\"form-group\">\n" + "<div class=\"form-group\">\n" +
"<label class=\"control-label col-md-offset-1 col-md-2 col-sm-offset-1 col-sm-2 col-xs-3 prepend-asterisk\">Password</label>\n" + "<label class=\"control-label col-md-offset-1 col-md-2 col-sm-offset-1 col-sm-2 col-xs-3 prepend-asterisk prepend-asterisk--login\">Password</label>\n" +
"<div class=\"col-md-8 col-sm-8 col-xs-9\">\n" + "<div class=\"col-md-8 col-sm-8 col-xs-9\">\n" +
"<input type=\"password\" name=\"login_password\" id=\"login-password\" class=\"form-control\"" + "<input type=\"password\" name=\"login_password\" id=\"login-password\" class=\"form-control\"" +
"ng-model=\"login_password\" required autocomplete=\"off\">\n" + "ng-model=\"login_password\" required autocomplete=\"off\">\n" +

4
awx/ui/static/js/helpers/Lookup.js
View File

@@ -27,8 +27,8 @@ import listGenerator from 'tower/shared/list-generator/main';
export default export default
angular.module('LookUpHelper', ['RestServices', 'Utilities', 'SearchHelper', 'PaginationHelpers', listGenerator.name, 'ApiLoader', 'ModalDialog']) angular.module('LookUpHelper', ['RestServices', 'Utilities', 'SearchHelper', 'PaginationHelpers', listGenerator.name, 'ApiLoader', 'ModalDialog'])
.factory('LookUpInit', ['Alert', 'Rest', 'generateList', 'SearchInit', 'PaginateInit', 'GetBasePath', 'FormatDate', 'Empty', 'CreateDialog', .factory('LookUpInit', ['Alert', 'Rest', 'ProcessErrors', 'generateList', 'SearchInit', 'PaginateInit', 'GetBasePath', 'FormatDate', 'Empty', 'CreateDialog',
function (Alert, Rest, GenerateList, SearchInit, PaginateInit, GetBasePath, FormatDate, Empty, CreateDialog) { function (Alert, Rest, ProcessErrors, GenerateList, SearchInit, PaginateInit, GetBasePath, FormatDate, Empty, CreateDialog) {
return function (params) { return function (params) {
var parent_scope = params.scope, var parent_scope = params.scope,

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

@@ -381,6 +381,10 @@ textarea.allowresize {
margin-right: -5px; margin-right: -5px;
} }
.prepend-asterisk--login:before {
margin-right: -2px;
}
.subtitle { .subtitle {
font-size: 16px; font-size: 16px;
} }
@@ -670,10 +674,10 @@ dd {
/* Outline required fields in Red when there is an error */ /* Outline required fields in Red when there is an error */
.form-control.ng-dirty.ng-invalid, .form-control.ng-dirty.ng-invalid:focus { .form-control.ng-dirty.ng-invalid, .form-control.ng-dirty.ng-invalid:focus {
border-color: rgba(204, 0, 0, 0.8); border-color: rgba(255, 88, 80, 0.8);
outline: 0; outline: 0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px rgba(204, 0, 0, 0.6); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px rgba(255, 88, 80, 0.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px rgba(204, 0, 0, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px rgba(255, 88, 80, 0.6);
} }
/* For some reason TB 3 RC1 does not provide an input-mini */ /* For some reason TB 3 RC1 does not provide an input-mini */
@@ -1966,4 +1970,3 @@ tr td button i {
} }
} }