zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-08 17:11:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into uxi/templates

Browse Source
This commit is contained in:
Greg Considine
2017-04-05 15:37:49 -04:00
committed by GitHub
parent 3f761d52f6 11ea5d7bab
commit 81dea61ba9
93 changed files with 1382 additions and 827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -794,7 +794,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : "";
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) {
html += "<input ";
@@ -878,7 +878,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "\t" + label();
if (field.hasShowInputButton) {
var tooltip = i18n._("Toggle the display of plaintext.");
html += "\<div class='input-group";
html += "\<div class='input-group Form-mixedInputGroup";
html += (horizontal) ? " " + getFieldWidth() : "";
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.
@@ -1357,7 +1357,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += (horizontal) ? "class=\"" + getFieldWidth() + "\"" : "";
html += ">\n";
html += `<div class="input-group">`;
html += `<div class="input-group Form-mixedInputGroup">`;
html += "<span class=\"input-group-btn\">\n";
html += `<button type="button" class="Form-lookupButton btn btn-default" ng-click="${field.ngClick || defaultLookupNgClick}"
${field.readonly || field.showonly}