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

Merge pull request #5952 from gconsidine/uxi/configure-tower

Browse Source 
Add class to prevent form input overlap
This commit is contained in:
Greg Considine
2017-04-05 12:08:52 -04:00
committed by GitHub
parent 4276fd8102 6204d263a4
commit dfc36c7698
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/legacy-styles/forms.less
View File

@@ -484,6 +484,10 @@ input[type='radio']:checked:before {
display: inline-block !important; display: inline-block !important;
} }
.Form-mixedInputGroup {
width: 100%;
}
.FormToggle {} .FormToggle {}
.FormToggle-container { .FormToggle-container {
float: right; float: right;

6
awx/ui/client/src/shared/form-generator.js
View File

@@ -775,7 +775,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : ""; html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : "";
html += ">\n"; html += ">\n";
html += (field.clear || field.genMD5) ? "<div class=\"input-group\">\n" : ""; html += (field.clear || field.genMD5) ? "<div class=\"input-group Form-mixedInputGroup\">\n" : "";
if (field.control === null || field.control === undefined || field.control) { if (field.control === null || field.control === undefined || field.control) {
html += "<input "; html += "<input ";
@@ -872,7 +872,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "\t" + label(); html += "\t" + label();
if (field.hasShowInputButton) { if (field.hasShowInputButton) {
var tooltip = i18n._("Toggle the display of plaintext."); var tooltip = i18n._("Toggle the display of plaintext.");
html += "\<div class='input-group"; html += "\<div class='input-group Form-mixedInputGroup";
html += (horizontal) ? " " + getFieldWidth() : ""; html += (horizontal) ? " " + getFieldWidth() : "";
html += "'>\n"; html += "'>\n";
// TODO: make it so that the button won't show up if the mode is edit, hasShowInputButton !== true, and there are no contents in the field. // TODO: make it so that the button won't show up if the mode is edit, hasShowInputButton !== true, and there are no contents in the field.
@@ -1368,7 +1368,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : ""; html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : "";
html += ">\n"; html += ">\n";
html += `<div class="input-group">`; html += `<div class="input-group Form-mixedInputGroup">`;
html += "<span class=\"input-group-btn\">\n"; html += "<span class=\"input-group-btn\">\n";
html += `<button type="button" class="Form-lookupButton btn btn-default" ng-click="${field.ngClick || defaultLookupNgClick}" html += `<button type="button" class="Form-lookupButton btn btn-default" ng-click="${field.ngClick || defaultLookupNgClick}"
${field.readonly || field.showonly} ${field.readonly || field.showonly}