ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-21 17:57:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Search] Menu checkboxes and labels

Browse Source 
Added checkboxes with styling to the menu. Set
up a types list for the menu.
This commit is contained in:
slhale 2015-08-13 10:59:12 -07:00
parent a9c85d5241
commit c51856522c
5 changed files with 100 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
platform/commonUI/general/res/css/tree.css
View File

@ -342,13 +342,23 @@ ul.tree {
float: right; float: right;
margin-top: 17px; margin-top: 17px;
left: -25px; } left: -25px; }
/* line 140, ../sass/search/_search.scss */ /* line 138, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu ul li { .search-holder .search .search-bar .search-menu-holder .search-menu {
padding: 0; border-top: 0; }
padding-left: 6px; /* line 141, ../sass/search/_search.scss */
padding-right: 6px; .search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item {
font-size: 0.9em; } padding: 0px 4px;
/* line 151, ../sass/search/_search.scss */ font-size: 0.8em; }
/* line 146, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item .search-menu-checkbox {
margin-top: 4px;
padding-left: 0;
margin-right: 0; }
/* line 156, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder .search-menu .search-menu-item .search-menu-icon {
color: white;
padding-left: 2px; }
/* line 165, ../sass/search/_search.scss */
.search-holder .search .search-bar .search-menu-holder:after { .search-holder .search .search-bar .search-menu-holder:after {
position: absolute; position: absolute;
top: -6px; top: -6px;
@ -358,18 +368,18 @@ ul.tree {
border-bottom: 6px solid #5e5e5e; border-bottom: 6px solid #5e5e5e;
border-left: 6px solid transparent; border-left: 6px solid transparent;
content: ''; } content: ''; }
/* line 164, ../sass/search/_search.scss */ /* line 178, ../sass/search/_search.scss */
.search-holder .search .search-bar .menu-icon:hover + div.search-menu-holder { .search-holder .search .search-bar .menu-icon:hover + div.search-menu-holder {
visibility: visible; } visibility: visible; }
/* line 167, ../sass/search/_search.scss */ /* line 181, ../sass/search/_search.scss */
.search-holder .search .search-bar div.search-menu-holder:hover { .search-holder .search .search-bar div.search-menu-holder:hover {
visibility: visible; } visibility: visible; }
/* line 172, ../sass/search/_search.scss */ /* line 186, ../sass/search/_search.scss */
.search-holder .search .search-scroll { .search-holder .search .search-scroll {
top: 25px; top: 25px;
overflow-y: auto; overflow-y: auto;
padding-right: 5px; } padding-right: 5px; }
/* line 180, ../sass/search/_search.scss */ /* line 194, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item { .search-holder .search .search-scroll .results .search-result-item {
-moz-transition: background-color 0.25s; -moz-transition: background-color 0.25s;
-o-transition: background-color 0.25s; -o-transition: background-color 0.25s;
@ -379,10 +389,10 @@ ul.tree {
border-radius: 2px; border-radius: 2px;
padding-top: 4px; padding-top: 4px;
padding-bottom: 2px; } padding-bottom: 2px; }
/* line 194, ../sass/search/_search.scss */ /* line 208, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item .label { .search-holder .search .search-scroll .results .search-result-item .label {
margin-left: 6px; } margin-left: 6px; }
/* line 198, ../sass/search/_search.scss */ /* line 212, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item .label .title-label { .search-holder .search .search-scroll .results .search-result-item .label .title-label {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
@ -394,47 +404,47 @@ ul.tree {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; } white-space: nowrap; }
/* line 220, ../sass/search/_search.scss */ /* line 234, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected { .search-holder .search .search-scroll .results .search-result-item.selected {
background: #005177; background: #005177;
color: #fff; } color: #fff; }
/* line 224, ../sass/search/_search.scss */ /* line 238, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected .view-control { .search-holder .search .search-scroll .results .search-result-item.selected .view-control {
color: #0099cc; } color: #0099cc; }
/* line 227, ../sass/search/_search.scss */ /* line 241, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon { .search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
color: #fff; } color: #fff; }
/* line 234, ../sass/search/_search.scss */ /* line 248, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover { .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
background: #404040; background: #404040;
color: #cccccc; } color: #cccccc; }
/* line 237, ../sass/search/_search.scss */ /* line 251, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger { .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
display: block; } display: block; }
/* line 240, ../sass/search/_search.scss */ /* line 254, ../sass/search/_search.scss */
.search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon { .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
color: #33ccff; } color: #33ccff; }
/* line 248, ../sass/search/_search.scss */ /* line 262, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon { .search-holder .search .search-scroll .load-icon {
position: relative; } position: relative; }
/* line 250, ../sass/search/_search.scss */ /* line 264, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading { .search-holder .search .search-scroll .load-icon.loading {
pointer-events: none; pointer-events: none;
margin-left: 6px; } margin-left: 6px; }
/* line 254, ../sass/search/_search.scss */ /* line 268, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading .title-label { .search-holder .search .search-scroll .load-icon.loading .title-label {
font-style: italic; font-style: italic;
font-size: .9em; font-size: .9em;
opacity: 0.5; opacity: 0.5;
margin-left: 26px; margin-left: 26px;
line-height: 24px; } line-height: 24px; }
/* line 264, ../sass/search/_search.scss */ /* line 278, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon.loading .wait-spinner { .search-holder .search .search-scroll .load-icon.loading .wait-spinner {
margin-left: 6px; } margin-left: 6px; }
/* line 269, ../sass/search/_search.scss */ /* line 283, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-icon:not(.loading) { .search-holder .search .search-scroll .load-icon:not(.loading) {
cursor: pointer; } cursor: pointer; }
/* line 274, ../sass/search/_search.scss */ /* line 288, ../sass/search/_search.scss */
.search-holder .search .search-scroll .load-more-button { .search-holder .search .search-scroll .load-more-button {
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;

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

@ -136,13 +136,27 @@
left: -25px; left: -25px;
.search-menu { .search-menu {
border-top: 0;
ul li { .search-menu-item {
padding: 0; // Padding only on sides
padding-left: 6px; padding: 0px 4px;
padding-right: 6px; font-size: 0.8em;
font-size: 0.9em; .search-menu-checkbox {
// Vertically center
margin-top: 4px;
// Get rid of weird checkbox positioning
// from label.checkbox.custom
padding-left: 0;
margin-right: 0;
}
.search-menu-icon {
color: white;
padding-left: 2px;
}
} }
} }
} }

2
platform/search/bundle.json
View File

@ -13,7 +13,7 @@
{ {
"key": "SearchController", "key": "SearchController",
"implementation": "controllers/SearchController.js", "implementation": "controllers/SearchController.js",
"depends": [ "$scope", "searchService" ] "depends": [ "$scope", "searchService", "types[]" ]
}, },
{ {
"key": "SearchItemController", "key": "SearchItemController",

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

@ -56,9 +56,23 @@
<div class="menu-element search-menu-holder"> <div class="menu-element search-menu-holder">
<div class="menu dropdown search-menu"> <div class="menu dropdown search-menu">
<ul> <ul>
<li>Contents 1</li> <li class="search-menu-item"
<li>Contents 2</li> ng-repeat="type in types">
<li>Contents 3</li>
<label class="checkbox custom search-menu-checkbox">
<input type="checkbox"
class="checkbox"
checked="true"/>
<em></em>
</label>
<span class="ui-symbol search-menu-icon">
{{ type.glyph }}
</span>
{{ type.name }}
</li>
</ul> </ul>
</div> </div>
</div> </div>

29
platform/search/src/controllers/SearchController.js
View File

@ -30,12 +30,14 @@ define(function () {
var INITIAL_LOAD_NUMBER = 20, var INITIAL_LOAD_NUMBER = 20,
LOAD_INCREMENT = 20; LOAD_INCREMENT = 20;
function SearchController($scope, searchService) { function SearchController($scope, searchService, types) {
// Starting amount of results to load. Will get increased. // Starting amount of results to load. Will get increased.
var numResults = INITIAL_LOAD_NUMBER, var numResults = INITIAL_LOAD_NUMBER,
loading = false, loading = false,
fullResults = {hits: []}; fullResults = {hits: []};
console.log('types', types);
function search(maxResults) { function search(maxResults) {
var inputText = $scope.ngModel.input; var inputText = $scope.ngModel.input;
@ -71,6 +73,31 @@ define(function () {
}); });
} }
function filter(types) {
var newResults = [],
i = 0;
while (newResults.length < numResults && newResults.length < fullResults.hits.length) {
// If this is of an acceptable type, add it to the list
if (types.indexOf(fullResults.hits[i].getModel().type) !== -1) {
newResults.push(fullResults.hits[i]);
}
i += 1;
}
$scope.results = newResults;
}
$scope.types = [];
// On initialization, fill the scope's types with type keys
types.forEach(function (type) {
// We only want some types: the ones that have keys and
// descriptions are probably human user usable types
if (type.key && type.description) {
$scope.types.push(type);
}
});
return { return {
/** /**
* Search the filetree. * Search the filetree.