diff --git a/AUTHORS b/AUTHORS index ba92d46..29e256c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,7 +1,7 @@ Webclient - Wouter van Wijk - Flat Interface: Ulrich Lichtenegger -- Kingosticks +- Kingosticks (Nick Steel) - Szymon Nowak Mopidy: @@ -11,4 +11,5 @@ Icons: https://github.com/hybridgroup/betterfrontend/blob/master/iconic/AUTHORS Background: -Openclipart / Chrisdesign \ No newline at end of file +Openclipart / Chrisdesign + diff --git a/README.rst b/README.rst index 3f0bc7f..a27e7f3 100644 --- a/README.rst +++ b/README.rst @@ -39,8 +39,7 @@ Alternatively, clone the repository and run ``sudo python setup.py install`` fro Usage ===== -Point your (modern) browser at Mopidy-MusicBox-Webclient running on your Mopidy server e.g. http://localhost:6680/musicbox. - +Point your (modern) browser at Mopidy-MusicBox-Webclient running on your Mopidy server e.g. http://localhost:6680/musicbox_webclient. Project resources @@ -59,10 +58,19 @@ v1.0.2 Dev - A friendlier welcome with a home page with buttons to the most used functions - Converted Radio Stations to Streams, so user can add streams for youtube, spotify, soundcloud, podcasts +<<<<<<< HEAD - Enhanced radio/streams interface - Search: select service to search - Youtube icons added - Fixed single quote bug #39, other bugs +======= +- Improved radio/streams interface +- Better handling of coverart +- Search: select service to search +- Youtube icons added +- Fixed single quote bug #39 +- Bugfixes (search, popups, etc) +>>>>>>> develop v1.0.1 (20-9-2014) ------------------- diff --git a/mopidy_musicbox_webclient/__init__.py b/mopidy_musicbox_webclient/__init__.py index d517b27..11f5569 100644 --- a/mopidy_musicbox_webclient/__init__.py +++ b/mopidy_musicbox_webclient/__init__.py @@ -5,7 +5,7 @@ import os from mopidy import config, ext -__version__ = '1.0.2' +__version__ = '1.0.4' class MusicBoxExtension(ext.Extension): diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css index 553dda0..0bcd8fa 100644 --- a/mopidy_musicbox_webclient/static/css/webclient.css +++ b/mopidy_musicbox_webclient/static/css/webclient.css @@ -131,6 +131,11 @@ margin-top: 6px; } +#contentHeadline a { + color:white; + margin-left: 20%; +} + #headermenubtn{ width: 50px; } @@ -204,10 +209,23 @@ #artistviewimage, #albumviewcover { float: right; heigth: 90px; + max-width: 90%; } /*** home ***/ +#homerows div { + text-align:center; + background-color: #2C3E50; + padding: 2px; + padding-top: 20px; + border: 2px solid white; + color: white; +} + +<<<<<<< HEAD +/*** home ***/ + #homerows div { text-align:center; background-color: #2C3E50; @@ -216,6 +234,8 @@ border: 3px solid white; } +======= +>>>>>>> develop #homerows div i { font-size: 28px; } @@ -332,18 +352,18 @@ /******************* * Now Playing area *******************/ -.nowPlayingControls{ - font-size: 1.2em; - line-height: 50px; +.nowPlayingControls { + font-size: 20px; + line-height: 45px; + padding-left: 10px; } .nowPlayingControls .fa{ vertical-align: -webkit-baseline-middle; - vertical-align: middle; } .nowPlayingControls #btplayNowPlaying{ font-size: 190%; - margin-left: 20px; - margin-right: 20px; + margin-left: 15px; + margin-right: 15px; } @@ -360,7 +380,7 @@ } #controlspopup, #artistpopup, #coverpopup { - max-width: 550px; + max-width: 90%; background: white; padding: 5px; } @@ -374,7 +394,19 @@ display: block; margin-left: auto; margin-right: auto; - margin-bottom: 5px; + margin-bottom: 10px; + max-width:90%; + max-height:90%; +} + +#buttons { + font-size: 24px; + padding-right: 15px; + margin-bottom: 15px; +} + +#btplayNowPlaying { + padding-top: 15px; } #popupTracksLv li, #popupQueueLv li { @@ -543,7 +575,8 @@ a { padding: 15px 25px 0px 25px; } #nowPlayingpane #controlspopupimage{ - max-width: 100%; + max-width:90%; + max-height:90%; } .nowPlaying-artistInfo { font-size: 12px; @@ -560,6 +593,8 @@ a { } #controlspopupimage{ + max-width:90%; + max-height:90%; margin-bottom: 3px; } #nowPlayingpane #slidercontainer { diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html index c30a72d..6562777 100644 --- a/mopidy_musicbox_webclient/static/index.html +++ b/mopidy_musicbox_webclient/static/index.html @@ -3,13 +3,16 @@
- + - + @@ -75,6 +79,13 @@"; +/* '' + timeFromSeconds(newalbum[0].length / 1000) + ''; */ + if (newalbum[0].artists) { + for ( j = 0; j < newalbum[0].artists.length; j++) { + html += newalbum[0].artists[j].name; + html += (j == newalbum[0].artists.length - 1) ? '' : ' / '; + //stop after 3 + if (j > 2) { + html += '...'; + break; + } + } + } + if ( newalbum[0].album.name != '') { html += ' / ';} + html += '' + newalbum[0].album.name + '
'; + html += ''; + } + if (results[i].album.artists) { + for (j = 0; j < results[i].album.artists.length; j++) { + html += results[i].album.artists[j].name; + html += (j == results[i].album.artists.length - 1) ? '' : ' / '; + //stop after 3 + if (j > 2) { + child += '...'; + break; + } + } + } + html += '
' + timeFromSeconds(newalbum[j].length / 1000) + '
'; + child += '' + timeFromSeconds(pl[i].length / 1000) + ''; + // + for (var j = 0; j < pl[i].artists.length; j++) { + if (pl[i].artists[j]) { + child += pl[i].artists[j].name; + child += (j == pl[i].artists.length - 1) ? '' : ' / '; + //stop after 3 + if (j > 2) { + child += '...'; + break; + } + } + } + child += ' / ' + pl[i].album.name + '
'; + child += '' + timeFromSeconds(pl[i].length / 1000) + '
"; -/* '' + timeFromSeconds(newalbum[0].length / 1000) + ''; */ - if (newalbum[0].artists) { - for ( j = 0; j < newalbum[0].artists.length; j++) { - html += newalbum[0].artists[j].name; - html += (j == newalbum[0].artists.length - 1) ? '' : ' / '; - //stop after 3 - if (j > 2) { - html += '...'; - break; - } - } - } - if ( newalbum[0].album.name != '') { html += ' / ';} - html += '' + newalbum[0].album.name + '
'; - html += ''; - } - if (results[i].album.artists) { - for (j = 0; j < results[i].album.artists.length; j++) { - html += results[i].album.artists[j].name; - html += (j == results[i].album.artists.length - 1) ? '' : ' / '; - //stop after 3 - if (j > 2) { - child += '...'; - break; + html += '
"; + /* '' + timeFromSeconds(newalbum[0].length / 1000) + ''; */ + if (newalbum[0].artists) { + for (j = 0; j < newalbum[0].artists.length; j++) { + html += newalbum[0].artists[j].name; + html += (j == newalbum[0].artists.length - 1) ? '' : ' / '; + //stop after 3 + if (j > 2) { + html += '...'; + break; + } } - } - } - html += '
'; + } + if (results[i].album.artists) { + for (j = 0; j < results[i].album.artists.length; j++) { + html += results[i].album.artists[j].name; + html += (j == results[i].album.artists.length - 1) ? '' : ' / '; + //stop after 3 + if (j > 2) { + child += '...'; + break; + } + } + } + html += '
' + timeFromSeconds(newalbum[j].length / 1000) + '
' + timeFromSeconds(newalbum[j].length / 1000) + '
'; - child += '' + timeFromSeconds(pl[i].length / 1000) + ''; - // + child += '' + timeFromSeconds(pl[i].length / 1000) + ''; + // for (var j = 0; j < pl[i].artists.length; j++) { - if (pl[i].artists[j]) { + if (pl[i].artists[j]) { child += pl[i].artists[j].name; - child += (j == pl[i].artists.length - 1) ? '' : ' / '; - //stop after 3 - if (j > 2) { - child += '...'; - break; - } - } + child += (j == pl[i].artists.length - 1) ? '' : ' / '; + //stop after 3 + if (j > 2) { + child += '...'; + break; + } + } } - child += ' / ' + pl[i].album.name + '
'; + child += ' / ' + pl[i].album.name + ''; child += '| t |
| t |