diff --git a/README.rst b/README.rst index 388894e..8a8f03c 100644 --- a/README.rst +++ b/README.rst @@ -73,15 +73,13 @@ 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 `_). - Streams are now saved to the '[Radio Streams].m3u' playlist and are accessible from all clients. Users with existing streamUris stored as browser cookies will be prompted to convert them to the new m3u backed scheme. +- Mopidy-Musicbox-Webclient now requires at least Mopidy v1.1.0 or greater to be installed. **Fixes** @@ -108,6 +106,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) diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css index fe66026..777be12 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; @@ -204,7 +205,15 @@ background-color: #fff; } -#searchresults { +#searchartists { + display: none; +} + +#searchalbums { + display: none; +} + +#searchtracks { display: none; } @@ -472,7 +481,12 @@ a { #infocover { height: 50px; width: 50px; - position: absolute; +} + +.playicon { + width: 10%; + float: right; + text-align: right; } #btplay { @@ -481,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 b50ffee..66339e4 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/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index d4ab846..18b8706 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/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 270655f..4958f56 100644 --- a/mopidy_musicbox_webclient/static/mb.manifest +++ b/mopidy_musicbox_webclient/static/mb.manifest @@ -1,6 +1,6 @@ CACHE MANIFEST -# 2016-02-04:v1 +# 2016-02-4:v2 NETWORK: * 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': [