diff --git a/screenshots/chrome.png b/screenshots/chrome.png new file mode 100644 index 0000000..43bdf5c Binary files /dev/null and b/screenshots/chrome.png differ diff --git a/screenshots/chrome_sm.png b/screenshots/chrome_sm.png new file mode 100644 index 0000000..1bc1e87 Binary files /dev/null and b/screenshots/chrome_sm.png differ diff --git a/screenshots/firefox.png b/screenshots/firefox.png new file mode 100644 index 0000000..ec95fdd Binary files /dev/null and b/screenshots/firefox.png differ diff --git a/screenshots/firefox_sm.png b/screenshots/firefox_sm.png new file mode 100644 index 0000000..6dd63d9 Binary files /dev/null and b/screenshots/firefox_sm.png differ diff --git a/screenshots/screenbig.png b/screenshots/screenbig.png deleted file mode 100644 index b11fe46..0000000 Binary files a/screenshots/screenbig.png and /dev/null differ diff --git a/screenshots/screenbig_sm.png b/screenshots/screenbig_sm.png deleted file mode 100644 index 2169659..0000000 Binary files a/screenshots/screenbig_sm.png and /dev/null differ diff --git a/screenshots/screensmall.png b/screenshots/screensmall.png deleted file mode 100644 index 0dd99ac..0000000 Binary files a/screenshots/screensmall.png and /dev/null differ diff --git a/screenshots/screensmall_sm.png b/screenshots/screensmall_sm.png deleted file mode 100644 index 1f39e38..0000000 Binary files a/screenshots/screensmall_sm.png and /dev/null differ diff --git a/webclient/css/ws.css b/webclient/css/ws.css index ed16f62..7f45cab 100755 --- a/webclient/css/ws.css +++ b/webclient/css/ws.css @@ -1,8 +1,11 @@ -/* - * +/***** + * Mopidy Webclient CSS + * (c) */ -/* Responsive stuff */ +/**************************** + * Responsive stuff + ****************************/ @media all and (min-width: 35.1em) { .pl-breakpoint.ui-grid-a .ui-block-a { @@ -48,17 +51,20 @@ @media all and (max-width: 35em) { .pl-breakpoint .ui-block-a, .pl-breakpoint .ui-block-b { width: 100%; - float: none; + float:inherit; } - .header-breakpoint .ui-block-a, .header-breakpoint .ui-block-b, .header-breakpoint .ui-block-c { + .header-breakpoint .ui-block-a { + float:inherit; width: 100%; - float: none; } .header-breakpoint .ui-block-c, .header-breakpoint .ui-block-b { display: none; + width: 0; } } -/* Volume Slider */ +/************************ + * Volume Slider + ***********************/ #mutebt { float: left; margin-left: 8px; @@ -69,7 +75,9 @@ display: inline; } -/* Track Slider */ +/*********************** + * Track Slider + ***********************/ #trackslider { display: inline; @@ -94,7 +102,9 @@ margin-top: 12px; } -/* Controls */ +/*********************************** + * Controls + * *********************************/ #controldiv { height: 30px; width: 210px; @@ -103,7 +113,7 @@ } #controldiv img { - margin-left: 15px; + margin-left: 20px; float: left; } @@ -187,7 +197,7 @@ body { } .currenttrack { - background-image: url('../img/icons/play_alt_16x16.png'); + background-image: url('../images/icons/play_alt_16x16.png'); background-repeat: no-repeat; background-color: #fff; background-position: 4px center; diff --git a/webclient/images/Aquila_Hi-fi_Stereo.svg b/webclient/images/Aquila_Hi-fi_Stereo.svg deleted file mode 100644 index 2de110f..0000000 --- a/webclient/images/Aquila_Hi-fi_Stereo.svg +++ /dev/null @@ -1,1256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - style="overflow:visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - Track 7 - Sing Song - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webclient/images/Chrisdesign_LP_Guitar_black.svg b/webclient/images/Chrisdesign_LP_Guitar_black.svg deleted file mode 100644 index b1a82da..0000000 --- a/webclient/images/Chrisdesign_LP_Guitar_black.svg +++ /dev/null @@ -1,3181 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webclient/images/Chrisdesign_LP_Guitar_black.web.png b/webclient/images/Chrisdesign_LP_Guitar_black.web.png deleted file mode 100644 index 8cdef31..0000000 Binary files a/webclient/images/Chrisdesign_LP_Guitar_black.web.png and /dev/null differ diff --git a/webclient/images/Chrisdesign_LP_Guitar_black.web.svg b/webclient/images/Chrisdesign_LP_Guitar_black.web.svg deleted file mode 100644 index 709a93f..0000000 --- a/webclient/images/Chrisdesign_LP_Guitar_black.web.svg +++ /dev/null @@ -1,3182 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webclient/images/Music_Equalizer_by_Merlin2525.svg b/webclient/images/Music_Equalizer_by_Merlin2525.svg deleted file mode 100644 index b419828..0000000 --- a/webclient/images/Music_Equalizer_by_Merlin2525.svg +++ /dev/null @@ -1,4702 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webclient/images/headphone.svg b/webclient/images/headphone.svg deleted file mode 100644 index a0cd1a5..0000000 --- a/webclient/images/headphone.svg +++ /dev/null @@ -1,1270 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webclient/js/controls.js b/webclient/js/controls.js index 54c9d82..d57a0fb 100644 --- a/webclient/js/controls.js +++ b/webclient/js/controls.js @@ -132,22 +132,20 @@ function doRepeat() { function doSeekPos(value) { var val = $("#trackslider").val(); newposition = Math.round(val); - pauseTimer(); clearTimeout(seekTimer); if (!initgui) { + pauseTimer(); //set timer to not trigger it too much - seekTimer = setTimeout(triggerPos, 100); + mopidy.playback.pause(); + seekTimer = setTimeout(triggerPos, 250); } } function triggerPos() { console.log(newposition); if (mopidy) { - mopidy.playback.pause(); mopidy.playback.seek(newposition); - } - if (play) { - resumeTimer(); + mopidy.playback.resume(); } } diff --git a/webclient/js/functionsvars.js b/webclient/js/functionsvars.js index 6822d41..17b7013 100755 --- a/webclient/js/functionsvars.js +++ b/webclient/js/functionsvars.js @@ -106,7 +106,7 @@ function playlisttotable(pl, table, uri) { */ popupData[pl[i].uri] = pl[i]; - child = '
  • '; + child = '
  • '; child += '

    ' + pl[i].name + "

    "; child += '

    '; child += '' + timeFromSeconds(pl[i].length / 1000) + ''; @@ -142,7 +142,7 @@ function albumtrackstotable(pl, table, uri) { var child = ''; for (var i = 0; i < pl.length; i++) { popupData[pl[i].uri] = pl[i]; - child = '

  • '; + child = '
  • '; child += '

    ' + timeFromSeconds(pl[i].length / 1000) + '

    ' + pl[i].name + '

    • '; tmp += child; diff --git a/webclient/js/gui.js b/webclient/js/gui.js index 9de0bf7..ceb4e20 100755 --- a/webclient/js/gui.js +++ b/webclient/js/gui.js @@ -94,7 +94,8 @@ function setSongInfo(data) { * @param {Object} listuri * @param {Object} trackuri */ -function popupTracks (listuri, trackuri) { +function popupTracks (e, listuri, trackuri) { + if (!e) var e = window.event; //console.log('list: ' + listuri + ', track: ' + trackuri); $('#popupTrackName').html(popupData[trackuri].name); $('#popupAlbumName').html(popupData[trackuri].album.name); @@ -131,7 +132,7 @@ function popupTracks (listuri, trackuri) { $('#popupTracksLv').listview('refresh'); - $('#popupTracks').data("list", listuri).data("track", trackuri).popup( "open", { x: event.pageX, y: event.pageY } ); + $('#popupTracks').data("list", listuri).data("track", trackuri).popup("open", { x: e.pageX, y: e.pageY } ); return false; } diff --git a/webclient/js/library.js b/webclient/js/library.js index 80bdbea..9ecb039 100644 --- a/webclient/js/library.js +++ b/webclient/js/library.js @@ -39,13 +39,18 @@ function processSearchResults(resultArr) { $(SEARCH_TRACK_TABLE).empty(); $(SEARCH_ARTIST_TABLE).empty(); $(SEARCH_ALBUM_TABLE).empty(); - $("#searchresults").show(); //get the right result var results = resultArr[1]; var tracks = (results.tracks) ? results.tracks : ''; customTracklists['trackresultscache'] = tracks; var artists = (results.artists) ? results.artists : ''; var albums = (results.albums) ? results.albums : ''; + if ((tracks == '') && (artists == '') && (albums == '') ) { + alert('No results'); + showLoading(false); + return false; + } + $("#searchresults").show(); var child = ''; for (var i = 0; i < artists.length; i++) { child += '