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

Re-styled tree pieces on Inventory detail page. Blended boxes on left into one continuous box to match box on right.

Browse Source
This commit is contained in:
chouseknecht
2013-06-14 15:16:41 -04:00
parent 0cf6faaff4
commit d47ea40d60
3 changed files with 117 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,25 +345,36 @@
} }
.inventory-buttons { .inventory-buttons {
margin: 10px 10px 0 0; text-align: right;
background-color: #f5f5f5;
border-left: 1px solid #e3e3e3;
border-right: 1px solid #e3e3e3;
border-top: 1px solid #e3e3e3;
-webkit-border-top-left-radius: 4px;
-moz-border-top-left-radius: 4px;
border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px;
-moz-border-top-right-radius: 4px;
border-top-right-radius: 4px;
} }
.inventory-buttons button { .inventory-buttons button {
margin-left: 5px; margin: 5px 5px 3px 0;
} }
.inventory-filter { .inventory-filter {
padding: 0 3px 3px 3px; padding: 0 3px 3px 3px;
margin-top: 3px;
text-align: right; text-align: right;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #e3e3e3; border-left: 1px solid #e3e3e3;
-webkit-border-radius: 4px; border-right: 1px solid #e3e3e3;
-moz-border-radius: 4px; border-bottom: 1px solid #e3e3e3;
border-radius: 4px; -webkit-border-bottom-left-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-border-bottom-left-radius: 4px;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); border-bottom-left-radius: 4px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -webkit-border-bottom-right-radius: 4px;
-moz-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
} }
.inventory-filter label { .inventory-filter label {

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

@@ -637,7 +637,7 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
for (var itm in form.related) { for (var itm in form.related) {
if (form.related[itm].type == 'tree') { if (form.related[itm].type == 'tree') {
html += "<div class=\"span5\">"; html += "<div class=\"span5\">";
html += "<div class=\"inventory-buttons pull-right\">"; html += "<div class=\"inventory-buttons\">";
html += "<button ng-click=\"addGroup()\" ng-hide=\"groupAddHide\" id=\"inv-group-add\" " + html += "<button ng-click=\"addGroup()\" ng-hide=\"groupAddHide\" id=\"inv-group-add\" " +
"class=\"btn btn-mini btn-success\"><i class=\"icon-plus\"></i> Add Group</button>"; "class=\"btn btn-mini btn-success\"><i class=\"icon-plus\"></i> Add Group</button>";
html += "<button ng-click=\"editGroup()\" ng-hide=\"groupEditHide\" id=\"inv-group-edit\" class=\"btn btn-mini btn-success\">" + html += "<button ng-click=\"editGroup()\" ng-hide=\"groupEditHide\" id=\"inv-group-edit\" class=\"btn btn-mini btn-success\">" +
@@ -647,7 +647,7 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
html += "</div>\n"; html += "</div>\n";
html += "<div id=\"tree-view\"></div>\n"; html += "<div id=\"tree-view\"></div>\n";
html += "<div class=\" inventory-filter\" ng-show=\"has_active_failures == true\"><label class=\"checkbox inline\">" + html += "<div class=\" inventory-filter\" ng-show=\"has_active_failures == true\"><label class=\"checkbox inline\">" +
"<input ng-model=\"inventoryFailureFilter\" ng-change=\"filterInventory()\" type=\"checkbox\" >Only show groups with active failures</label></div>\n"; "<input ng-model=\"inventoryFailureFilter\" ng-change=\"filterInventory()\" type=\"checkbox\" >Show only groups with failures</label></div>\n";
html += "</div>\n"; html += "</div>\n";
} }
else { else {
@@ -787,26 +787,6 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
html += "</div>\n" html += "</div>\n"
} }
if (form.related[itm].type == 'tree') {
html += "<div>\n";
// Add actions(s)
if (form.related[itm].actions && form.related[itm].actions.length > 0) {
html += "<div class=\"text-right actions\">\n";
for (var act in form.related[itm].actions) {
var action = form.related[itm].actions[act];
html += "<button class=\"btn btn-small btn-success\" ";
html += this.attr(action,'ngClick');
html += (action.awToolTip) ? this.attr(action,'awToolTip') : "";
html += (action.awToolTip) ? "data-placement=\"top\" " : "";
html += ">" + this.icon(action.icon) + "</button>\n";
}
html += "</div>\n";
}
html += "<div id=\"tree-view\" class=\"span6\"></div>\n";
html += "<div id=\"group-view\" class=\"span6\"></div>\n";
html += "</div>\n";
}
else {
html += "<div class=\"well\">\n"; html += "<div class=\"well\">\n";
html += SearchWidget({ iterator: form.related[itm].iterator, template: form.related[itm], mini: false }); html += SearchWidget({ iterator: form.related[itm].iterator, template: form.related[itm], mini: false });
@@ -901,7 +881,6 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
html += "</div>\n"; // close list div html += "</div>\n"; // close list div
html += PaginateWidget({ set: itm, iterator: form.related[itm].iterator, mini: true }); html += PaginateWidget({ set: itm, iterator: form.related[itm].iterator, mini: true });
}
// End Accordion Group // End Accordion Group
html += "</div>\n"; // accordion inner html += "</div>\n"; // accordion inner

9
ansibleworks/ui/static/lib/jstree/themes/ansible/style.css
View File

@@ -11,13 +11,8 @@
.jstree-ansible { .jstree-ansible {
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #e3e3e3; border-left: 1px solid #e3e3e3;
-webkit-border-radius: 4px; border-right: 1px solid #e3e3e3;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
} }
.jstree-ansible li, .jstree-ansible li,