ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-22 10:11:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Frontend] Minor search enhancements

Browse Source 
Fixes #1093
Finessed and cleaned up filters display
element; added '# results found' element;
This commit is contained in:
Charles Hacskaylo 2016-08-02 15:57:43 -07:00
parent 2d50a63ca4
commit 06f2c74444
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/commonUI/general/res/sass/search/_search.scss
View File

@ -126,16 +126,15 @@
$p: $interiorMargin; $p: $interiorMargin;
box-sizing: border-box; box-sizing: border-box;
line-height: 130%; line-height: 130%;
//padding-left: $s * 2.25; padding-left: $s * 2;
font-size: $s; font-size: $s;
.clear-filters { .clear-filters {
color: $colorInputIcon;
opacity: 1; opacity: 1;
font-size: 0.9em; font-size: 0.9em;
margin-right: $interiorMarginSm; margin-right: $interiorMarginSm;
//position: absolute; position: absolute;
//left: 1px; left: 1px;
cursor: pointer; cursor: pointer;
} }
} }

13
platform/search/res/templates/search.html
View File

@ -43,7 +43,7 @@
</mct-include> </mct-include>
</div> </div>
<a class="holder s-btn flex-elem btn-cancel" <a class="holder s-button flex-elem btn-cancel"
ng-show="!(ngModel.input === '' || ngModel.input === undefined)" ng-show="!(ngModel.input === '' || ngModel.input === undefined)"
ng-click="ngModel.input = ''; ngModel.checkAll = true; menuController.checkAll(); controller.search()"> ng-click="ngModel.input = ''; ngModel.checkAll = true; menuController.checkAll(); controller.search()">
Cancel</a> Cancel</a>
@ -51,13 +51,16 @@
<div class="active-filter-display flex-elem holder" <div class="active-filter-display flex-elem holder"
ng-class="{off: ngModel.filtersString === '' || ngModel.filtersString === undefined || !ngModel.search}"> ng-class="{off: ngModel.filtersString === '' || ngModel.filtersString === undefined || !ngModel.search}">
<a class="clear-filters icon-x-in-circle" <a class="clear-filters icon-x-in-circle s-icon-button"
ng-click="ngModel.checkAll = true; menuController.checkAll()"></a>Filtered by: {{ ngModel.filtersString }} ng-click="ngModel.checkAll = true; menuController.checkAll()"></a>Filtered by: {{ ngModel.filtersString }}
</div> </div>
<div class="holder results-msg" ng-model="ngModel" <div class="flex-elem holder results-msg" ng-model="ngModel" ng-show="!loading && ngModel.search">
ng-show="!loading && !results.length > 0 && ngModel.search"> {{
No results found</div> !results.length > 0? 'No results found':
results.length + ' result' + (results.length > 1? 's':'') + ' found'
}}
</div>
<div class="search-results flex-elem holder grows vscroll" <div class="search-results flex-elem holder grows vscroll"
ng-class="{ off: !(loading || results.length > 0), loading: loading }"> ng-class="{ off: !(loading || results.length > 0), loading: loading }">