From 895eab08346ac0b88a1635094c676b29a5d68b6e Mon Sep 17 00:00:00 2001 From: jcass Date: Wed, 3 Feb 2016 05:55:41 +0200 Subject: [PATCH 1/5] docs:Add comment to identify override of slider handle size. --- mopidy_musicbox_webclient/static/css/webclient.css | 1 + 1 file changed, 1 insertion(+) diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css index fe66026..77c9580 100644 --- a/mopidy_musicbox_webclient/static/css/webclient.css +++ b/mopidy_musicbox_webclient/static/css/webclient.css @@ -168,6 +168,7 @@ margin-right: 35px; } +/* Increase slider handle by 30%. */ .ui-slider-track.ui-mini .ui-slider-handle { height: 22px; width: 22px; From 7991e94042961d57c9475c885a057fe9ed36865a Mon Sep 17 00:00:00 2001 From: jcass Date: Wed, 3 Feb 2016 09:25:21 +0200 Subject: [PATCH 2/5] docs:Update changelog to show issues under correct headings. --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index fe08417..9935e69 100644 --- a/README.rst +++ b/README.rst @@ -73,13 +73,10 @@ v2.1.0 (UNRELEASED) - Now updates the track name when the stream title changes. - Adding a browsed radio station to the tracklist now also starts playback of the station. (Addresses: `#98 `_). -- Remove support for defunct Grooveshark service. - (Addresses: `#120 `_). - Increase volume slider handle by 30% to make it easier to grab on mobile devices. - Add application cache manifest file for quicker loads and to allow client devices to detect when local caches should be invalidated. - Use standard Mopidy mixer methods to mute / un-mute playback. -- Added event handling for 'muteChanged' event. (Fixes: `#141 `_). **Fixes** @@ -106,6 +103,9 @@ v2.1.0 (UNRELEASED) - Re-align the menu and search buttons in the title bar. (Fixes: `#148 `_). - Use explicit Mopidy.js calling convention. (Fixes: `#79 `_). +- Added event handling for 'muteChanged' event. (Fixes: `#141 `_). +- Remove support for defunct Grooveshark service. + (Fixes: `#120 `_). v2.0.0 (2015-03-26) From c0fbffcdb656bac9b6cd04f1fdaaeea79efaa85a Mon Sep 17 00:00:00 2001 From: jcass Date: Thu, 4 Feb 2016 07:10:40 +0200 Subject: [PATCH 3/5] fix:Bump Mopidy version dependency for M3U-related features. Fixes #147. --- README.rst | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 9935e69..df92b9d 100644 --- a/README.rst +++ b/README.rst @@ -77,6 +77,7 @@ v2.1.0 (UNRELEASED) - Add application cache manifest file for quicker loads and to allow client devices to detect when local caches should be invalidated. - Use standard Mopidy mixer methods to mute / un-mute playback. +- Mopidy-Musicbox-Webclient now requires at least Mopidy v1.1.0 or greater to be installed. **Fixes** diff --git a/setup.py b/setup.py index c594f79..17b680e 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup( include_package_data=True, install_requires=[ 'setuptools', - 'Mopidy >= 0.19', + 'Mopidy >= 1.1.0', ], entry_points={ 'mopidy.ext': [ From 6772e42e2b297260138ac735b486b132801bff86 Mon Sep 17 00:00:00 2001 From: jcass Date: Thu, 4 Feb 2016 14:00:24 +0200 Subject: [PATCH 4/5] fix:Align layout and features of 'Search' pane with rest of the web client. --- .../static/css/webclient.css | 10 +- mopidy_musicbox_webclient/static/index.html | 130 +++++++++--------- .../static/js/library.js | 16 ++- mopidy_musicbox_webclient/static/mb.manifest | 2 +- 4 files changed, 89 insertions(+), 69 deletions(-) diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css index 77c9580..4e6771d 100644 --- a/mopidy_musicbox_webclient/static/css/webclient.css +++ b/mopidy_musicbox_webclient/static/css/webclient.css @@ -205,7 +205,15 @@ background-color: #fff; } -#searchresults { +#searchartists { + display: none; +} + +#searchalbums { + display: none; +} + +#searchtracks { display: none; } diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html index 29a7877..2798776 100644 --- a/mopidy_musicbox_webclient/static/index.html +++ b/mopidy_musicbox_webclient/static/index.html @@ -357,98 +357,98 @@
-
-
- - - -
+

Search

+ +
+
+
+

Search for artists, albums, or specific tracks. + + + +

+
- -
-
-
-
-
-

Artists

-
-
-
    -
    +
    +
    +
    +
    +

    Artists

    -
    -
    -
    -
    -

    Albums

    -
    -
    -
      -
      +
      +
        - -
        -

        Tracks

        -
          +
          +
          +
          +

          Albums

          +
          +
          +
            +
            +
            + +
            +

            Tracks

            +
              +

              Streams

              -
              -
              +
              -
              -

              Play a specific stream/track and optionally save it to your favourites. - - - + +

              Play a specific stream/track and optionally save it to your favourites. + + + - - -
              -

              + + +
              +
                -
                -
                -
                -
                -
                -
                -
                -
                -
                -
                - +
                +
                +
                +
                +
                +
                +
                + +
                +
                diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js index 4ff0caf..3a62e05 100644 --- a/mopidy_musicbox_webclient/static/js/library.js +++ b/mopidy_musicbox_webclient/static/js/library.js @@ -27,7 +27,9 @@ function initSearch() { delete customTracklists[URI_SCHEME+':artistresultscache']; delete customTracklists[URI_SCHEME+':albumresultscache']; delete customTracklists[URI_SCHEME+':trackresultscache']; - $("#searchresults").hide(); + $("#searchartists").hide(); + $("#searchalbums").hide(); + $("#searchtracks").hide(); if (searchService != 'all') { mopidy.library.search({'query': {any:[value]}, 'uris': [searchService + ':']}).then(processSearchResults, console.error); @@ -108,7 +110,17 @@ function processSearchResults(resultArr) { return false; } - $("#searchresults").show(); + if (results.artists.length > 0) { + $("#searchartists").show(); + } + + if (results.albums.length > 0) { + $("#searchalbums").show(); + } + + if (results.tracks.length > 0) { + $("#searchtracks").show(); + } // Returns a string where {x} in template is replaced by tokens[x]. function theme(template, tokens) { diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest index 612636c..779e318 100644 --- a/mopidy_musicbox_webclient/static/mb.manifest +++ b/mopidy_musicbox_webclient/static/mb.manifest @@ -1,6 +1,6 @@ CACHE MANIFEST -# 2016-01-31:v3 +# 2016-02-4:v1 NETWORK: * From 920b60384cece9bb5c3818d1005fdfdebbad909e Mon Sep 17 00:00:00 2001 From: jcass Date: Thu, 4 Feb 2016 17:38:11 +0200 Subject: [PATCH 5/5] fix:Prevent song information text from overlapping the 'Play' button. Fixes #155. --- .../static/css/webclient.css | 16 ++++++++++------ mopidy_musicbox_webclient/static/index.html | 6 +++--- mopidy_musicbox_webclient/static/js/gui.js | 2 ++ mopidy_musicbox_webclient/static/mb.manifest | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css index 4e6771d..777be12 100644 --- a/mopidy_musicbox_webclient/static/css/webclient.css +++ b/mopidy_musicbox_webclient/static/css/webclient.css @@ -481,7 +481,12 @@ a { #infocover { height: 50px; width: 50px; - position: absolute; +} + +.playicon { + width: 10%; + float: right; + text-align: right; } #btplay { @@ -490,17 +495,16 @@ a { .songinfo { height: 100%; + width: 90%; + float: left; } .songinfo-text { text-align: left; line-height: 22px; - display:inline-block; - padding: 6px; color: white; - position: absolute; - padding-left: 55px; - padding-right: 55px; + overflow: hidden; + padding: 3px; } #nowPlayingpane{ diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html index 2798776..9dc3d67 100644 --- a/mopidy_musicbox_webclient/static/index.html +++ b/mopidy_musicbox_webclient/static/index.html @@ -438,14 +438,14 @@
                -
                -
                +
                +
                -
                +
                diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index e5c99fa..7f2cd66 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -24,7 +24,9 @@ function resetSong() { function resizeMb() { $("#infoname").html(songdata.track.name); + $("#infoname").truncate(); $("#infoartist").html(artiststext); + $("#infoartist").truncate(); if ($(window).width() <= 960) { // $('#playlisttracksdiv').hide(); diff --git a/mopidy_musicbox_webclient/static/mb.manifest b/mopidy_musicbox_webclient/static/mb.manifest index 779e318..7f4e333 100644 --- a/mopidy_musicbox_webclient/static/mb.manifest +++ b/mopidy_musicbox_webclient/static/mb.manifest @@ -1,6 +1,6 @@ CACHE MANIFEST -# 2016-02-4:v1 +# 2016-02-4:v2 NETWORK: *