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

AC-525 Fixed inventory and job navigation issues. Fixed nagging horizontal scroll in dialogs with accordions.

Browse Source
This commit is contained in:
chouseknecht
2013-09-26 22:02:40 -04:00
parent 567605cc59
commit 7bfa0c4b0c
9 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,6 +846,20 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
html += "<li ng-repeat=\"crumb in breadcrumbs\"><a href=\"{{ '#' + crumb.path }}\">{{ crumb.title | capitalize }}</a></li>\n";
if (navigation) {
var paths = $location.path().replace(/^\//,'').split('/');
if (paths.length == 2) {
html += "<li class=\"active\">";
if (options.mode == 'edit') {
html += this.form.editTitle;
}
else {
html += this.form.addTitle;
}
html += "</li>\n";
}
html += "<li class=\"active\"> </li>\n";
html += "</ul>\n";
html += "<div class=\"dropdown\">\n";
@@ -857,14 +871,17 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
break;
}
}
html += "<ul class=\"dropdown-menu\" role=\"menu\">\n";
for (var itm in navigation) {
html += "<li role=\"presentation\"><a role=\"menuitem\" tabindex=\"-1\" href=\"" +
navigation[itm].href + "\" ";
html += (navigation[itm].active) ? "class=\"active\" " : "";
// html += (navigation[itm].active) ? "class=\"active\" " : "";
html += ">";
html += "<i class=\"icon-ok\" style=\"visibility: ";
html += (navigation[itm].active) ? "visible" : "hidden";
html += "\"></i> ";
html += (navigation[itm].listLabel) ? navigation[itm].listLabel : navigation[itm].label;
html += (navigation[itm].active) ? " <i class=\"icon-angle-left\"></i>" : "";
html += "</a></li>\n";
}
html += "</ul>\n";
@@ -1123,7 +1140,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
var navigation = {
inventory: {
href: "/#/inventories/{{ inventory_id }}",
label: "Inventory Properties",
label: "Properties",
icon: "icon-edit"
},
hosts: {