From 6e7425a0469c63817f9a2ec482cdcd60df52ee45 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Wed, 18 Sep 2013 20:17:16 +0000 Subject: [PATCH] Latest changes to add ID attribute to all elements. Lists and tables now have IDs. --- awx/ui/static/js/lists/Groups.js | 1 - awx/ui/static/js/lists/Hosts.js | 3 +- awx/ui/static/js/lists/Projects.js | 3 +- awx/ui/static/lib/ansible/form-generator.js | 43 ++++++++------- .../static/lib/ansible/generator-helpers.js | 44 +++++++++++----- awx/ui/static/lib/ansible/list-generator.js | 12 +++-- awx/ui/static/lib/ansible/prompt-dialog.js | 2 +- awx/ui/templates/ui/index.html | 52 ++++++++++--------- 8 files changed, 88 insertions(+), 72 deletions(-) diff --git a/awx/ui/static/js/lists/Groups.js b/awx/ui/static/js/lists/Groups.js index 0edb606ded..c0e92d600e 100644 --- a/awx/ui/static/js/lists/Groups.js +++ b/awx/ui/static/js/lists/Groups.js @@ -38,7 +38,6 @@ angular.module('GroupListDefinition', []) 'class': 'btn-xs btn-info btn-help pull-right', awToolTip: 'Click for help', dataTitle: 'Adding Groups', - id: 'group-help-button', iconSize: 'large' } }, diff --git a/awx/ui/static/js/lists/Hosts.js b/awx/ui/static/js/lists/Hosts.js index 1972467d08..5a363969e0 100644 --- a/awx/ui/static/js/lists/Hosts.js +++ b/awx/ui/static/js/lists/Hosts.js @@ -38,8 +38,7 @@ angular.module('HostListDefinition', []) 'class': 'btn-xs btn-info btn-help', awToolTip: 'Click for help', dataTitle: 'Selecting Hosts', - iconSize: 'large', - id: 'host-help-button' + iconSize: 'large' } }, diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index 1abda9fc2b..53e5142b38 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -71,8 +71,7 @@ angular.module('ProjectsListDefinition', []) 'class': 'btn-xs btn-info btn-help pull-right', awToolTip: 'Click for help', dataTitle: 'Project Status', - iconSize: 'large', - id: 'project-help-button' + iconSize: 'large' } }, diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js index f06b020f50..93f178f7e2 100644 --- a/awx/ui/static/lib/ansible/form-generator.js +++ b/awx/ui/static/lib/ansible/form-generator.js @@ -887,7 +887,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) var act; for (action in this.form.statusActions) { act = this.form.statusActions[action]; - html += this.button(act); + html += this.button(act, action); } //html += "\n"; //html += "
\n"; @@ -1153,19 +1153,14 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) html += "
\n"; html += "
\n"; html += "
\n"; - //html += "\n"; - html += "\n"; - //html += "\n"; - html += "\n"; - html += "\n"; - html += "\n"; html += "
\n"; @@ -1192,9 +1187,6 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) html += "
\n"; html += "
\n"; html += "
\n
\n"; - //html += "
\n"; html += "
\n"; html += "
\n"; html += "
\n"; @@ -1204,6 +1196,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) html += "
\n"; html += SearchWidget({ iterator: form.iterator, template: form, mini: true, size: 'col-md-6 col-lg-6'}); + html += "
\n" html += "
\n"; // Add actions(s) @@ -1211,7 +1204,12 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) html += "