diff --git a/client/app/components/coordinator/coordinator.html b/client/app/components/coordinator/coordinator.html index ba11306..53df455 100644 --- a/client/app/components/coordinator/coordinator.html +++ b/client/app/components/coordinator/coordinator.html @@ -396,11 +396,11 @@ -
+
- +
diff --git a/client/app/components/coordinator/js/update_guis.js b/client/app/components/coordinator/js/update_guis.js index abaa0ce..e9b8afa 100644 --- a/client/app/components/coordinator/js/update_guis.js +++ b/client/app/components/coordinator/js/update_guis.js @@ -67,7 +67,7 @@ function displayTaggingOptions(mode) { document.querySelector(modeTag).classList.add('open'); //Putting this in a timeout to wait for the animation to finish completing setTimeout(function(){ - document.querySelector(modeTag).setAttribute('overflow', 'visible'); + document.querySelector(modeTag).style.overflow = "visible"; }, 600) var $fileNameSelect = $(fileNameSelector).selectize({ @@ -144,7 +144,7 @@ function hideTaggingOptions(mode, updateValues=false) { updateBagMetadata(mode, bag_name, filename, category, tags) } //TO DO: Wait for the response from the backend before setting the display to none - document.querySelector(modeTag).setAttribute('overflow', 'hidden'); + document.querySelector(modeTag).style.overflow = "hidden"; document.querySelector(modeTag).classList.remove('open'); } @@ -169,11 +169,15 @@ function updateBagMetadata(mode, bag_name, modified_bag_name, category, tags) { function displayLoadingOptions() { - selector = "#bagList" + selector = "#loadBags"; document.querySelector(selector).classList.add('open'); + //Putting this in a timeout to wait for the animation to finish completing + setTimeout(function(){ + document.querySelector(selector).style.overflow = "visible"; + }, 420) - var $select = $('#bagList').selectize({ + var $select = $('#loadBagList').selectize({ valueField: 'filename', labelField: 'filename', searchField: ['filename', 'category', 'tags'], @@ -182,17 +186,29 @@ function displayLoadingOptions() { placeholder : "Select bag to play", render : { item: function(item, escape) { - return '
' + - (item.filename ? '' + escape(item.filename) + '' : '') + - (item.category ? '' : '') + + return '
' + + '
' + + '' + escape(item.filename) + '' + + '' + ' (' + escape(item.category) + ') ' + '' + + '
' + '
'; }, option: function(item, escape) { var label = item.filename || item.category; var caption = item.filename ? item.category : null; - return '
' + - '' + escape(label) + '' + - (caption ? '' + escape(caption) + '' : '') + + return '
' + + '
' + + '
' + escape(item.filename) + '
' + + '
' + escape(item.category) + '
' + + '
' + + '
' + + '
' + + item.tags.map(function(tag) { + return '' + escape(tag) + '' + }).join(' ') + + '
' + + '
' + escape('27 Jun 10:10am') + '
' + + '
' + '
'; } } @@ -200,7 +216,8 @@ function displayLoadingOptions() { getBagList(function(results){ var selectize = $select[0].selectize; - selectize.clearOptions() + selectize.clearOptions(); + //results = [{filename : 'testfile', category: 'testcategory', tags : ['testtag1', 'testtag2', 'testtag3']}, {filename : 'testfile2', category: 'testcategory2', tags : ['testtag21', 'testtag22', 'testtag23']}] selectize.addOption(results); if(results[0]) { selectize.setValue(results[0].filename); @@ -209,9 +226,9 @@ function displayLoadingOptions() { } function hideLoadingOptions() { - var selector = '#bagList'; + var selector = '#loadBags'; - document.querySelector(selector).setAttribute('overflow', 'hidden'); + document.querySelector(selector).style.overflow = "hidden"; document.querySelector(selector).classList.remove('open'); } diff --git a/client/app/main.css b/client/app/main.css index e338feb..521af88 100644 --- a/client/app/main.css +++ b/client/app/main.css @@ -409,11 +409,64 @@ html, body { transition: height 600ms ease 0ms; } .loading-options { - transition: height 600ms ease 0ms; + transition: height 420ms ease 0ms; } .tagging-options.open { height: 122px; } .loading-options.open { height: 85px; - } \ No newline at end of file + } + + + .bag-option > div { + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: space-between; + } + + + .bag-option .filename { + width: 60%; + font-size: 12pt; + font-weight: 600; + } + + .bag-option .category { + width: 40%; + font-weight: 600; + + } + + .bag-option .tags { + width: 60%; + + } + + .bag-option .timestamp { + width: 40%; + + } + + + + .loading-options .selectize-input { + font-size: 13pt; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-weight: 600; + } + + /* + .selectize-dropdown, .selectize-dropdown.form-control{ + height: 90vh !important; + } + + .selectize-dropdown-content{ + max-height: 100% !important; + height: 100% !important; + } + */ + \ No newline at end of file