shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge branch 'style-stream-filters' into devel

Browse Source
This commit is contained in:
Michael Abashian 2016-02-11 12:51:12 -05:00
commit 62ad03ce5a
5 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/legacy-styles/ansible-ui.less
View File

@ -774,10 +774,6 @@ select.page-size {
vertical-align: middle;
}
#search_value_input {
padding-right: 25px;
}
#search-widget-spacer {
height: 20px;
}

28
awx/ui/client/legacy-styles/lists.less
View File

@ -207,6 +207,28 @@ table, tbody {
.List-searchDropdown {
border-top-left-radius: 5px!important;
border-bottom-left-radius: 5px!important;
height: 34px!important;
border-color: @default-second-border;
color: @default-icon;
background-color: @default-bg;
border-right: none;
}
.List-searchDropdown:focus,
.List-searchDropdown:active,
.List-searchDropdown.active
{
color: @default-icon;
background-color: @default-tertiary-bg;
}
.List-searchDropdown:hover {
background-color: @default-tertiary-bg;
color: @default-icon;
}
.List-searchDropdownCarat {
border-top-color: @default-icon!important;
}
.List-searchInput {
@ -214,8 +236,10 @@ table, tbody {
font-size: 14px!important;
color: @list-srch-inpt-txt!important;
border-color: @list-srch-inpt-bord!important;
border-radius: 5px!important;
border-radius: 0px 5px 5px 0px!important;
padding-left: 15px!important;
height: 34px!important;
padding-right: 45px!important;
}
.List-searchInput:placeholder-shown {
@ -235,7 +259,7 @@ table, tbody {
float: right;
position: relative;
top: -33px;
left: -1px;
left: -2px;
z-index: 10;
font-size: 16px;
background-color: @list-srch-btn-bg;

7
awx/ui/client/src/helpers/related-search.js
View File

@ -162,13 +162,6 @@ export default
scope[iterator + 'Loading'] = false;
scope[iterator + 'HoldInput'] = true;
if(scope[iterator + 'SearchValue'] && scope[iterator + 'SearchValue'] !== '') {
scope[iterator + '_active_search'] = true;
}
else {
scope[iterator + '_active_search'] = false;
}
if (scope[iterator + 'SearchValue']) {
// User typed a value in input field
scope[iterator + 'ShowStartBtn'] = false;

5
awx/ui/client/src/helpers/search.js
View File

@ -333,6 +333,8 @@ export default
var i, modifier,
widgets = (list.searchWidgets) ? list.searchWidgets : 1;
scope[iterator + '_active_search'] = false;
for (i = 1; i <= widgets; i++) {
modifier = (i === 1) ? '' : i;
if ($('#search-widget-container' + modifier)) {
@ -342,6 +344,7 @@ export default
if (list.fields[scope[iterator + 'SearchField' + modifier]].searchObject !== 'all') {
// An object type is selected
scope[iterator + 'HideAllStartBtn' + modifier] = false;
scope[iterator + '_active_search'] = true;
if (scope[iterator + 'SearchValue' + modifier]) {
// A search value was entered
scope[iterator + 'ShowStartBtn' + modifier] = false;
@ -369,6 +372,7 @@ export default
}
}
}
e.stopPropagation();
scope.$emit('prepareSearch2', iterator, page, load, calcOnly, deferWaitStop);
@ -401,6 +405,7 @@ export default
(scope[iterator + 'SelectShow' + modifier] && scope[iterator + 'SearchSelectValue' + modifier]) ||
(list.fields[scope[iterator + 'SearchField' + modifier]] &&
list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'gtzero')) {
scope[iterator + '_active_search'] = true;
if (list.fields[scope[iterator + 'SearchField' + modifier]].searchField) {
scope[iterator + 'SearchParams'] += '&' + list.fields[scope[iterator + 'SearchField' + modifier]].searchField + '__';
} else if (list.fields[scope[iterator + 'SearchField' + modifier]].sourceModel) {

28
awx/ui/client/src/shared/generator-helpers.js
View File

@ -678,6 +678,26 @@ angular.module('GeneratorHelpers', [systemStatus.name])
html += "<div ng-show=\"" + ngShow + "\">";
}
html += "<div class=\"input-group input-group-sm";
html += "\">\n";
html += "<div class=\"input-group-btn dropdown\">\n";
html += "<button type=\"button\" ";
html += "id=\"search_field_ddown\" ";
html += "class=\"btn dropdown-toggle List-searchDropdown\" data-toggle=\"dropdown\"";
html += ">\n";
html += "<span ng-bind=\"" + iterator + "SearchFieldLabel" + modifier + "\"></span>\n";
html += "<span class=\"caret List-searchDropdownCarat\"></span>\n";
html += "</button>\n";
html += "<ul class=\"dropdown-menu\" id=\"" + iterator + "SearchDropdown" + modifier + "\">\n";
html += addSearchFields(i);
html += "</ul>\n";
html += "</div><!-- input-group-btn -->\n";
html += "<select id=\"search_value_select\" ng-show=\"" + iterator + "SelectShow" + modifier + "\" " +
"ng-model=\"" + iterator + "SearchSelectValue" + modifier + "\" ng-change=\"search('" + iterator + "')\" ";
html += "ng-options=\"c.name for c in " + iterator + "SearchSelectOpts track by c.value" + modifier + "\" class=\"form-control search-select";
html += "\"></select>\n";
html += "<input id=\"search_value_input\" type=\"text\" ng-hide=\"" + iterator + "SelectShow" + modifier + " || " +
iterator + "InputHide" + modifier + "\" " +
"class=\"form-control List-searchInput\" ng-model=\"" + iterator + "SearchValue" + modifier + "\" " +
@ -685,6 +705,14 @@ angular.module('GeneratorHelpers', [systemStatus.name])
"InputDisable" + modifier + " || " + iterator + "HoldInput" + modifier + "\" ng-keypress=\"startSearch($event,'" +
iterator + "')\">\n";
// Reset button for drop-down
html += "<div class=\"input-group-btn\" ng-show=\"" + iterator + "SelectShow" + modifier + "\" >\n";
html += "<button type=\"button\" class=\"btn btn-default btn-small\" id=\"search-reset-button\" ng-click=\"resetSearch('" + iterator + "')\" " +
"aw-tool-tip=\"Clear the search\" data-placement=\"top\"><i class=\"fa fa-times\"></i></button>\n";
html += "</div><!-- input-group-btn -->\n";
html += "</div><!-- input-group -->\n";
html += "<a class=\"search-reset-start List-searchInputIcon\" id=\"search-reset-button\" ng-click=\"resetSearch('" + iterator + "')\"" +
"ng-hide=\"" + iterator + "SelectShow" + modifier + " || " + iterator + "InputHide" + modifier + " || " +
iterator + "ShowStartBtn" + modifier + " || " +