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

Fixed drop-down menu hover issue that caused search drop-down to not display on small screens. Fixed js error in Socket.js

Browse Source
This commit is contained in:
Chris Houseknecht
2014-04-25 09:18:35 -04:00
parent 65859fa446
commit d34d0378fa
5 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/lists/Projects.js
View File

@@ -30,18 +30,18 @@ angular.module('ProjectsListDefinition', [])
dataTipWatch: 'project.statusTip',
dataPlacement: 'top',
icon: "icon-job-{{ project.statusIcon }}",
columnClass: "col-md-1 col-sm-2 col-xs-3",
columnClass: "col-lg-1 col-md-1 col-sm-2 col-xs-2",
nosort: true
},
name: {
key: true,
label: 'Name',
columnClass: "col-md-4 col-sm-3 col-xs-3"
columnClass: "col-lg-6 col-md-4 col-sm-6 col-xs-6"
},
last_updated: {
label: 'Last Updated',
filter: "date:'MM/dd/yy HH:mm:ss'",
columnClass: "col-md-2 hidden-sm hidden-xs",
columnClass: "col-lg-2 col-md-2 hidden-sm hidden-xs",
excludeModal: true,
searchable: false,
nosort: true

6
awx/ui/static/less/ansible-ui.less
View File

@@ -773,9 +773,7 @@ select.page-size {
.crumb-icon {
font-size: 12px;
}
}
}
.actions .dropdown {
@@ -786,7 +784,8 @@ select.page-size {
and menu, allowing smooth mouse movement between toggle and menu
http://stackoverflow.com/questions/8878033/how-to-make-twitter-bootstrap-menu-dropdown-on-hover-rather-than-click
*/
*/
.dropdown-toggle:hover .dropdown-menu, .dropdown:hover .dropdown-menu {
display: block;
}
@@ -797,6 +796,7 @@ select.page-size {
.dropdown-menu {
margin-top: 0;
z-index: 200;
}
/* end */

7
awx/ui/static/lib/ansible/generator-helpers.js
View File

@@ -728,7 +728,7 @@ angular.module('GeneratorHelpers', [])
if (includeSize) {
html += "<div class=\"";
html += (size) ? size : "col-lg-4 col-md-6 col-sm-12 col-xs-12";
html += (size) ? size : "col-lg-4 col-md-6";
html += "\" id=\"search-widget-container" + modifier + "\">\n";
}
@@ -737,8 +737,7 @@ angular.module('GeneratorHelpers', [])
html += "<div class=\"input-group-btn dropdown\">\n";
html += "<button type=\"button\" ";
html += "id=\"search_field_ddown\" ";
html += "class=\"btn btn-default ";
html += "dropdown-toggle\" data-toggle=\"dropdown\"";
html += "class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\"";
html += ">\n";
html += "<span ng-bind=\"" + iterator + "SearchFieldLabel" + modifier + "\"></span>\n";
html += "<span class=\"caret\"></span>\n";
@@ -772,14 +771,12 @@ angular.module('GeneratorHelpers', [])
html += "<a class=\"search-reset-start\" ng-click=\"resetSearch('" + iterator + "')\"" +
"ng-hide=\"" + iterator + "SelectShow" + modifier + " || " + iterator + "InputHide" + modifier + " || " +
iterator + "ShowStartBtn" + modifier + " || " +
iterator + "HoldInput" + modifier + " || " +
iterator + "HideAllStartBtn" + modifier + "\"" +
"><i class=\"fa fa-times\"></i></a>\n";
html += "<a class=\"search-reset-start\" ng-click=\"search('" + iterator + "')\"" +
"ng-hide=\"" + iterator + "SelectShow" + modifier + " || " + iterator + "InputHide" + modifier + " || " +
"!" + iterator + "ShowStartBtn" + modifier + " || " +
iterator + "HoldInput" + modifier + " || " +
iterator + "HideAllStartBtn" + modifier + "\"" +
"><i class=\"fa fa-search\"></i></a>\n";

2
awx/ui/static/lib/ansible/list-generator.js
View File

@@ -293,7 +293,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
html += "<thead>\n";
html += "<tr>\n";
if (list.index) {
html += "<th class=\"col-md-1 col-sm-2 hidden-xs\">#</th>\n";
html += "<th class=\"col-lg-1 col-md-1 col-sm-2 hidden-xs\">#</th>\n";
}
for (fld in list.fields) {
if ((list.fields[fld].searchOnly === undefined || list.fields[fld].searchOnly === false) &&