senaduka/old-lab_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Chuck
2019-06-27 15:46:10 -04:00
parent a5dbf77739
commit 39e0a6c356
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/app/components/coordinator/js/update_guis.js
View File

@@ -12,6 +12,8 @@ function getBagList(callback)
var request = new ROSLIB.ServiceRequest({}); var request = new ROSLIB.ServiceRequest({});
service.callService(request, function(result) { service.callService(request, function(result) {
console.log("getBagListResults");
console.log(result);
callback(JSON.parse(result.message)); callback(JSON.parse(result.message));
}); });
} }
@@ -186,20 +188,22 @@ function displayLoadingOptions() {
placeholder : "Select bag to play", placeholder : "Select bag to play",
render : { render : {
item: function(item, escape) { item: function(item, escape) {
filename = item.filename;
category = item.category || 'None';
return '<div class="bag-select-element">' + return '<div class="bag-select-element">' +
'<div class="bag-select-element">' + '<div class="bag-select-element">' +
'<span class="filename">' + escape(item.filename) + '</span>' + '<span class="filename">' + escape(filename) + '</span>' +
'<span class="category">' + ' (' + escape(item.category) + ') ' + '</span>' + '<span class="category">' + ' (' + escape(category) + ') ' + '</span>' +
'</div>' + '</div>' +
'</div>'; '</div>';
}, },
option: function(item, escape) { option: function(item, escape) {
var label = item.filename || item.category; filename = item.filename;
var caption = item.filename ? item.category : null; category = item.category || 'None';
return '<div class="bag-select-element bag-option">' + return '<div class="bag-select-element bag-option">' +
'<div class="primary">' + '<div class="primary">' +
'<div class="filename">' + escape(item.filename) + '</div>' + '<div class="filename">' + escape(filename) + '</div>' +
'<div class="category">' + escape(item.category) + '</div>' + '<div class="category">' + escape(category) + '</div>' +
'</div>' + '</div>' +
'<div class="secondary">' + '<div class="secondary">' +
'<div class="tags">' + '<div class="tags">' +

2
client/app/main.css
View File

@@ -435,8 +435,6 @@ html, body {
.bag-option .category { .bag-option .category {
width: 40%; width: 40%;
font-weight: 600;
} }
.bag-option .tags { .bag-option .tags {