shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

AC-217 The well surrounding the Inventory tree was missing the bottom border when the 'Show only groups with failures' checkbox is not displayed.

Browse Source
This commit is contained in:
chouseknecht 2013-07-11 23:36:14 -04:00
parent a72a4e9032
commit 01e1edfe1b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/awx-min.js vendored
View File

@ -4,7 +4,7 @@
*
* awx-min.js
*
* master-03f7564, Thu Jul 11 23:22:54 2013 -0400
* master-f2e5182, Thu Jul 11 23:28:39 2013 -0400
*
*/
var urlPrefix="/static/";
@ -335,7 +335,7 @@ template:this.form.items[itm],mini:!1,label:"Filter Events"});a+='<div class="it
this.form.items[itm].set+"','"+this.form.items[itm].iterator+"')\">&rarr; Next</a></li>\n";a+="</ul>\n";a+='<form class="form-horizontal" name="'+this.form.name+'_items_form" id="'+this.form.name+'_items_form" novalidate>\n';for(b in this.form.items[itm].fields)d=this.form.items[itm].fields[b],a+=this.buildField(b,d,c);a+="</form>\n";a+='<ul class="pager">\n';a+='<li ng-class="'+this.form.items[itm].iterator+'PrevUrlDisable"><a href="" ng-click="prevSet(\''+this.form.items[itm].set+"','"+this.form.items[itm].iterator+
"')\">&larr; Prev</a></li>\n";a+='<li ng-class="'+this.form.items[itm].iterator+'NextUrlDisable"><a href="" ng-click="nextSet(\''+this.form.items[itm].set+"','"+this.form.items[itm].iterator+"')\">&rarr; Next</a></li>\n";a+="</ul>\n";a+="</div>\x3c!-- well --\x3e\n"}"inventory"==this.form.name&&"edit"==c.mode?a+=this.buildTree(c):!this.modal&&(c.related&&this.form.related)&&(a+=this.buildCollections(c));return a},buildTree:function(f){var a=1,d=this.form;html='<div id="'+this.form.name+'-collapse-2" data-open="true" class="jqui-accordion">\n';
html+="<h3>Inventory Content<h3>\n";html+="<div>\n";for(var b in d.related){if("tree"==d.related[b].type)html+='<div class="span5">',html+='<div class="inventory-buttons">',html+='<button ng-click="addGroup()" ng-hide="groupAddHide" id="inv-group-add" class="btn btn-mini btn-success" aw-tool-tip="Add existing groups or create a new group" data-placement="bottom"><i class="icon-plus"></i> Add Groups</button>',html+='<button ng-click="editGroup()" ng-hide="groupEditHide" id="inv-group-edit" class="btn btn-mini btn-success" aw-tool-tip="Edit the selected group" data-placement="bottom" <i class="icon-edit"></i> Edit Group</button>',
html+='<button ng-click="deleteGroup()" ng-hide="groupDeleteHide" id="inv-group-delete" aw-tool-tip="Delete the selected group" data-placement="bottom" class="btn btn-mini btn-danger"><i class="icon-remove"></i> Delete Group</button>',html+="</div>\n",html+='<div id="tree-view"></div>\n',html+='<div class=" inventory-filter" ng-show="has_active_failures == true"><label class="checkbox inline"><input ng-model="inventoryFailureFilter" ng-change="filterInventory()" type="checkbox" >Show only groups with failures</label></div>\n',
html+='<button ng-click="deleteGroup()" ng-hide="groupDeleteHide" id="inv-group-delete" aw-tool-tip="Delete the selected group" data-placement="bottom" class="btn btn-mini btn-danger"><i class="icon-remove"></i> Delete Group</button>',html+="</div>\n",html+='<div id="tree-view"></div>\n',html+='<div class=" inventory-filter">',html+='<span ng-show="has_active_failures == true"><label class="checkbox inline">',html+='<input ng-model="inventoryFailureFilter" ng-change="filterInventory()" type="checkbox">Show only groups with failures</label></span></div>\n',
html+="</div>\n";else{html+='<div id="group-view" class="span7">\n';html+='<div id="hosts-well" class="well">\n';html+='<h4 id="hosts-title">'+d.related[b].title+"</h4>\n";html+=h({iterator:d.related[b].iterator,template:d.related[b],mini:!0});html+='<div class="list-actions">\n';for(var g in d.related[b].actions)html+='<button class="btn btn-mini ',html+=d.related[b].actions[g]["class"]?d.related[b].actions[g]["class"]:"btn-success",html+='" ',html+=d.related[b].actions[g].id?this.attr(d.related[b].actions[g],
"id"):"",html+=this.attr(d.related[b].actions[g],"ngClick"),html+=d.related[b].actions[g].awToolTip?this.attr(d.related[b].actions[g],"awToolTip"):"",html+=d.related[b].actions[g].awToolTip?'data-placement="top" ':"",html+=d.related[b].actions[g].ngHide?this.attr(d.related[b].actions[g],"ngHide"):"",html+='><i class="'+d.related[b].actions[g].icon+'"></i>',html+=d.related[b].actions[g].label?" "+d.related[b].actions[g].label:"",html+="</button>\n";html+="</div>\n";html+='<div class="list">\n';html+=
'<table class="'+d.related[b].iterator+' table table-condensed table-hover">\n';html+="<thead>\n";html+="<tr>\n";html+="<th>#</th>\n";for(var k in d.related[b].fields)html+='<th class="list-header" id="'+d.related[b].iterator+"-"+k+'-header" ng-click="sort(\''+d.related[b].iterator+"', '"+k+"')\">"+d.related[b].fields[k].label,html+=' <i class="',html=d.related[b].fields[k].key?d.related[b].fields[k].desc?html+"icon-sort-down":html+"icon-sort-up":html+"icon-sort",html+='"></i></a></th>\n';html+="<th></th>\n";

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

@ -803,8 +803,10 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
"<i class=\"icon-remove\"></i> Delete Group</button>";
html += "</div>\n";
html += "<div id=\"tree-view\"></div>\n";
html += "<div class=\" inventory-filter\" ng-show=\"has_active_failures == true\"><label class=\"checkbox inline\">" +
"<input ng-model=\"inventoryFailureFilter\" ng-change=\"filterInventory()\" type=\"checkbox\" >Show only groups with failures</label></div>\n";
html += "<div class=\" inventory-filter\">";
html += "<span ng-show=\"has_active_failures == true\"><label class=\"checkbox inline\">";
html += "<input ng-model=\"inventoryFailureFilter\" ng-change=\"filterInventory()\" type=\"checkbox\"" +
">Show only groups with failures</label></span></div>\n";
html += "</div>\n";
}
else {