From 751bdb530ee4b165e7bd25ee90b4c39abf2f7229 Mon Sep 17 00:00:00 2001 From: Wouter van Wijk Date: Sun, 17 Feb 2013 12:16:12 +0100 Subject: [PATCH] better ui --- webclient/css/ws.css | 48 +++++++++++++------------- webclient/images/start.jpg | Bin 0 -> 10588 bytes webclient/index.html | 13 +++---- webclient/js/controls.js | 38 ++++++++++++++++++-- webclient/js/functionsvars.js | 11 ++++-- webclient/js/gui.js | 63 +++++++++------------------------- webclient/js/library.js | 2 +- 7 files changed, 94 insertions(+), 81 deletions(-) create mode 100644 webclient/images/start.jpg diff --git a/webclient/css/ws.css b/webclient/css/ws.css index 7f45cab..6a7baa6 100755 --- a/webclient/css/ws.css +++ b/webclient/css/ws.css @@ -7,7 +7,7 @@ * Responsive stuff ****************************/ -@media all and (min-width: 35.1em) { +@media all and (min-width: 50.1em){ .pl-breakpoint.ui-grid-a .ui-block-a { width: 32.95%; } @@ -18,34 +18,46 @@ clear: left; } .header-breakpoint.ui-grid-b .ui-block-a { - width: 19.95%; + width: 21.95%; } .header-breakpoint.ui-grid-b .ui-block-b { - width: 39.92%; + width: 37.92%; display: block; } .header-breakpoint.ui-grid-b .ui-block-c { - width: 39.92%; + width: 37.1%; display: block; } .pl-breakpoint.ui-grid-a .ui-block-a { clear: left; } + .srch-breakpoint.ui-grid-a .ui-block-b { + margin-left: 5px; + } + .srch-breakpoint.ui-grid-a .ui-block-a, .srch-breakpoint.ui-grid-a .ui-block-b { + width: 49.5%; + } #playlisttablediv { margin-left: 10px; } + #header { + height: 50px !important; + } } @media all and (max-width: 50em) { .header-breakpoint.ui-grid-b .ui-block-a { width: 39.95%; } - .header-breakpoint.ui-grid-b .ui-block-b { - width: 59.92%; - } .header-breakpoint.ui-grid-b .ui-block-c { + width: 59%; + } + .header-breakpoint.ui-grid-b .ui-block-b { display: none; } + #header { + height: 50px !important; + } } @media all and (max-width: 35em) { @@ -53,14 +65,16 @@ width: 100%; float:inherit; } - .header-breakpoint .ui-block-a { - float:inherit; + .header-breakpoint .ui-block-c, .header-breakpoint .ui-block-a { width: 100%; } - .header-breakpoint .ui-block-c, .header-breakpoint .ui-block-b { + .header-breakpoint .ui-block-b { display: none; width: 0; } + #header { + height: 75px !important; + } } /************************ * Volume Slider @@ -107,7 +121,7 @@ * *********************************/ #controldiv { height: 30px; - width: 210px; + width: 230px; margin-left: -5px; display: inline; } @@ -159,14 +173,6 @@ } /* div */ -body { - /* padding-top: 80px; - /* background-image:url('../iages/Chrisdesign_LP_Guitar_black.web.png'); - background-attachment: fixed; - background-repeat:no-repeat; - background-position:right; - */ -} .nobreak, .btsquare { display: inline !important; @@ -218,7 +224,3 @@ body { font-style: oblique; } -#header { - height: 50px !important; -} - diff --git a/webclient/images/start.jpg b/webclient/images/start.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7b6f4e5bc3fffd6c15d90337cd704085d867c47b GIT binary patch literal 10588 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 literal 0 HcmV?d00001 diff --git a/webclient/index.html b/webclient/index.html index 8f40563..c14e08b 100755 --- a/webclient/index.html +++ b/webclient/index.html @@ -5,6 +5,8 @@ + + -
-
+
Close

-
+

  @@ -157,7 +158,7 @@

-
+

Artists

    @@ -200,7 +201,7 @@
    - + diff --git a/webclient/js/controls.js b/webclient/js/controls.js index d57a0fb..828cd1a 100644 --- a/webclient/js/controls.js +++ b/webclient/js/controls.js @@ -37,6 +37,8 @@ function playTrack() { return false; } + + /********************** * Buttons */ @@ -151,6 +153,10 @@ function triggerPos() { function setPosition(pos) { var oldval = initgui; + if (pos > songlength) { + pos = songlength; + pauseTimer(); + } currentposition = pos; initgui = true; $("#trackslider").val(currentposition).slider('refresh'); @@ -172,7 +178,7 @@ function setVolume(value) { function doVolume(value) { if (!initgui) { console.log('volume: ' + value); - mopidy.playback.setVolume(value); + mopidy.playback.setVolume(parseInt(value)); } } @@ -188,4 +194,32 @@ function doMute() { muteVolume = -1; } -} \ No newline at end of file +} +/******* + * Track timer + */ + +//timer function to update interface +function updateTimer() { + currentposition += TRACK_TIMER; + setPosition(currentposition); + // $("#songelapsed").html(timeFromSeconds(currentposition / 1000)); +} + +function resumeTimer() { + pauseTimer(); + posTimer = setInterval(updateTimer, TRACK_TIMER); +} + +function initTimer() { + pauseTimer(); + // setPosition(0); + resumeTimer(); +} + +function pauseTimer() { + clearInterval(posTimer); +} + + + diff --git a/webclient/js/functionsvars.js b/webclient/js/functionsvars.js index 17b7013..bf9e1a7 100755 --- a/webclient/js/functionsvars.js +++ b/webclient/js/functionsvars.js @@ -23,6 +23,7 @@ var seekTimer; var initgui = true; var currentpos = 0; var popupData = {}; +var songlength = 0; var artistshtml = ''; var artiststext = ''; @@ -36,7 +37,8 @@ var customPlaylists = []; var customTracklists = []; //constants -PROGRAM_NAME = 'Mopidy'; +PROGRAM_NAME = 'MusicBox'; +//PROGRAM_NAME = 'Mopidy'; ARTIST_TABLE = '#artiststable'; ALBUM_TABLE = '#albumstable'; PLAYLIST_TABLE = '#playlisttable'; @@ -45,9 +47,14 @@ SEARCH_ALL_TABLE = '#allresulttable'; SEARCH_ALBUM_TABLE = '#albumresulttable'; SEARCH_ARTIST_TABLE = '#artistresulttable'; SEARCH_TRACK_TABLE = '#trackresulttable'; -//update track timer, milliseconds + +//update track slider timer, milliseconds TRACK_TIMER = 1000; +//check status timer, every 5 or 10 sec +STATUS_TIMER = 10000; + + /******* * */ diff --git a/webclient/js/gui.js b/webclient/js/gui.js index ceb4e20..c521454 100755 --- a/webclient/js/gui.js +++ b/webclient/js/gui.js @@ -74,6 +74,7 @@ function setSongInfo(data) { $("#modalartist").html(arttmp + ': ' + artistshtml); $("#trackslider").attr("min", 0); + songlength = data.length; $("#trackslider").attr("max", data.length); $("#songlength").html(timeFromSeconds(data.length / 1000)); @@ -232,39 +233,11 @@ function initSocketevents() { }); } -/******* - * Track timer - */ - -//timer function to update interface -function updateTimer() { - currentposition += TRACK_TIMER; - setPosition(currentposition); - // $("#songelapsed").html(timeFromSeconds(currentposition / 1000)); -} - -function resumeTimer() { - pauseTimer(); - posTimer = setInterval(updateTimer, TRACK_TIMER); -} - -function initTimer() { - pauseTimer(); - // setPosition(0); - resumeTimer(); -} - -function pauseTimer() { - clearInterval(posTimer); -} - - - /********************** * initialize software **********************/ -//$(document).ready(function() { -$(document).bind("pageinit", function() { +$(document).ready(function() { +//$(document).bind("pageinit", function() { $(window).hashchange(); @@ -273,14 +246,6 @@ $(document).bind("pageinit", function() { //initialize events initSocketevents(); - $('.pane').hide(); - $('.sidebar-nav a').bind('click', function(e) { - var divid = $(e.target).attr('href').substr(1); - var uri = $(divid + "table").attr('data'); - - switchContent(divid, uri); - }); - resetSong(); if (location.hash.length < 2) { @@ -291,7 +256,7 @@ $(document).bind("pageinit", function() { if (window.navigator.standalone) { $("#btback").show(); } else { - $("#btback").hide(); +// $("#btback").hide(); } // $("#songinfo").resize(resizeSonginfo()); @@ -299,10 +264,10 @@ $(document).bind("pageinit", function() { window.onhashchange = locationHashChanged; // Log all events mopidy.on(function() { - // console.log(arguments); + // console.log(arguments); }); - //update gui every x seconds from mopdidy - setInterval(updateStatusOfAll, 5000); + //update gui status every x seconds from mopdidy + setInterval(updateTimer, STATUS_TIMER); }); /************************ @@ -317,6 +282,13 @@ function switchContent(divid, uri) { location.hash = "#" + hash; } +//update timer +function updateStatusOfAll() { + mopidy.playback.getCurrentTrack().then(processCurrenttrack, console.error); + mopidy.playback.getTimePosition().then(processCurrentposition, console.error); +//TODO check offline? +} + //update everything as if reloaded function updateStatusOfAll() { mopidy.playback.getCurrentTrack().then(processCurrenttrack, console.error); @@ -327,8 +299,6 @@ function updateStatusOfAll() { mopidy.playback.getRandom().then(processRandom, console.error); mopidy.playback.getVolume().then(processVolume, console.error); - - //TODO check offline? } function locationHashChanged() { @@ -365,10 +335,9 @@ function locationHashChanged() { } break; } - showLoading(false); // Set the page title based on the hash. - //document.title = PROGRAM_NAME; + document.title = PROGRAM_NAME; $('.pane').hide(); $('#' + divid + 'pane').show(); return false; - } \ No newline at end of file + } diff --git a/webclient/js/library.js b/webclient/js/library.js index 3d2126b..69071fa 100644 --- a/webclient/js/library.js +++ b/webclient/js/library.js @@ -40,7 +40,7 @@ function processSearchResults(resultArr) { $(SEARCH_ARTIST_TABLE).empty(); $(SEARCH_ALBUM_TABLE).empty(); //get the right result - // 0 = raspberry 1 = dev. + // 0 = older raspberry 1 = dev. // var results = resultArr[0]; var results = resultArr[1]; var tracks = (results.tracks) ? results.tracks : '';