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

Latest UI changes. More tweaks to related set buttons and styling.

Browse Source
This commit is contained in:
chouseknecht
2013-05-24 12:28:34 -04:00
parent ef16ec55f1
commit 007db3435d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansibleworks/ui/static/css/ansible-ui.css
View File

@@ -260,6 +260,7 @@
.search-widget { .search-widget {
display: inline-block; display: inline-block;
vertical-align: bottom; vertical-align: bottom;
margin-bottom: 15px;
} }
.list-actions { .list-actions {

6
ansibleworks/ui/static/lib/ansible/form-generator.js
View File

@@ -632,12 +632,12 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
else { else {
html += "<div class=\"well\">\n"; html += "<div class=\"well\">\n";
html += SearchWidget({ iterator: form.related[itm].iterator, template: form.related[itm], mini: true }); html += SearchWidget({ iterator: form.related[itm].iterator, template: form.related[itm], mini: false });
// Add actions(s) // Add actions(s)
html += "<div class=\"list-actions\">\n"; html += "<div class=\"list-actions\">\n";
for (var action in form.related[itm].actions) { for (var action in form.related[itm].actions) {
html += "<button class=\"btn btn-mini btn-success\" "; html += "<button class=\"btn btn-small btn-success\" ";
html += this.attr(form.related[itm]['actions'][action],'ngClick'); html += this.attr(form.related[itm]['actions'][action],'ngClick');
html += "><i class=\"" + form.related[itm]['actions'][action].icon + "\"></i></button>\n"; html += "><i class=\"" + form.related[itm]['actions'][action].icon + "\"></i></button>\n";
} }
@@ -689,7 +689,7 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
// Row level actions // Row level actions
html += "<td class=\"actions\">"; html += "<td class=\"actions\">";
for (action in form.related[itm].fieldActions) { for (action in form.related[itm].fieldActions) {
html += "<button class=\"btn btn-mini"; html += "<button class=\"btn btn-small";
html += (form.related[itm]['fieldActions'][action].class) ? html += (form.related[itm]['fieldActions'][action].class) ?
" " + form.related[itm]['fieldActions'][action].class : ""; " " + form.related[itm]['fieldActions'][action].class : "";
html += "\" " + this.attr(form.related[itm]['fieldActions'][action],'ngClick') + html += "\" " + this.attr(form.related[itm]['fieldActions'][action],'ngClick') +

4
ansibleworks/ui/static/lib/ansible/generator-helpers.js
View File

@@ -24,7 +24,7 @@ angular.module('GeneratorHelpers', [])
html += "<div class=\"input-prepend input-append\">\n"; html += "<div class=\"input-prepend input-append\">\n";
html += "<div class=\"btn-group\">\n"; html += "<div class=\"btn-group\">\n";
html += "<button class=\"btn "; html += "<button class=\"btn ";
html += (useMini) ? "btn-mini " : ""; html += (useMini) ? "btn-mini " : "btn-small";
html += "dropdown-toggle\" data-toggle=\"dropdown\">\n"; html += "dropdown-toggle\" data-toggle=\"dropdown\">\n";
html += "<span ng-bind=\"" + iterator + "SearchFieldLabel\"></span>\n"; html += "<span ng-bind=\"" + iterator + "SearchFieldLabel\"></span>\n";
html += "<span class=\"caret\"></span>\n"; html += "<span class=\"caret\"></span>\n";
@@ -51,7 +51,7 @@ angular.module('GeneratorHelpers', [])
html += "<div class=\"btn-group\">\n"; html += "<div class=\"btn-group\">\n";
html += "<button ng-hide=\"" + iterator + "SelectShow || " + iterator + "HideSearchType\" class=\"btn "; html += "<button ng-hide=\"" + iterator + "SelectShow || " + iterator + "HideSearchType\" class=\"btn ";
html += (useMini) ? "btn-mini " : ""; html += (useMini) ? "btn-mini " : "btn-small";
html += "dropdown-toggle\" data-toggle=\"dropdown\">\n"; html += "dropdown-toggle\" data-toggle=\"dropdown\">\n";
html += "<span ng-bind=\"" + iterator + "SearchTypeLabel\"></span>\n"; html += "<span ng-bind=\"" + iterator + "SearchTypeLabel\"></span>\n";
html += "<span class=\"caret\"></span>\n"; html += "<span class=\"caret\"></span>\n";