diff --git a/css/main.css b/css/main.css index 7795abc..6707a31 100644 --- a/css/main.css +++ b/css/main.css @@ -25,7 +25,7 @@ @keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } } #volumeslider{ - width: 150px; + width: 200px; display: inline-block; margin-top: 15px; margin-left: 5px; @@ -93,6 +93,10 @@ } /* fit app list view heights */ +#content { + padding-top: 25px; +} + .app-files #app-content>.viewcontainer { min-height: 0%; } @@ -842,3 +846,19 @@ html.ie8 #controls .button.new { #filestable tbody tr.canDrop { background-color: rgba(255, 255, 140, 1); } + +#app-content { + z-index: 500; + background-color: var(--color-main-background); + position: relative; + flex-basis: 100vw; + min-height: 100%; +} + +#content { + z-index: 500; + background-color: var(--color-main-background); + position: relative; + flex-basis: 100vw; + min-height: 100%; +} diff --git a/js/main.js b/js/main.js index ccf89d4..dab94e0 100644 --- a/js/main.js +++ b/js/main.js @@ -116,15 +116,19 @@ $(function(){ scheduled = true; var stationid = $('#player').attr('data-id'); req = $.get('https://onny.project-insanity.org/getmetadata/'+stationid, function(data) { - var metadata = data['metadata'].toString(); - if (metadata != $("#station_metadata").text()) { - $("#station_metadata").html(metadata); - var element = document.getElementById('station_metadata'); - if (isElementOverflowing(element)) { - wrapContentsInMarquee(element); + if (data.hasOwnProperty('metadata')) { + var metadata = data['metadata'].toString(); + if (metadata != $("#station_metadata").text()) { + $("#station_metadata").html(metadata); + var element = document.getElementById('station_metadata'); + if (isElementOverflowing(element)) { + wrapContentsInMarquee(element); + }; }; + setTimeout(function(){schedule_get_metadata(stationid);}, 10000); + } else { + scheduled = false; }; - setTimeout(function(){schedule_get_metadata(stationid);}, 10000); }).fail(function(){ scheduled = false; }); @@ -333,10 +337,13 @@ $(function(){ }; }; - OC.Plugins.register('OCA.Search', { + /*OC.Plugins.register('OCA.Search.Core', { attach: function(search) { search.setFilter('radio', mySearch); } + });*/ + OC.Plugins.attach('OCA.Search.Core', function(search) { + search.setFilter('radio', mySearch); }); $('#volumeslider').slider({ diff --git a/templates/main.php b/templates/main.php index 49a5316..c2aa9a5 100755 --- a/templates/main.php +++ b/templates/main.php @@ -1,6 +1,8 @@