diff --git a/webclient/css/fonts/Flat-UI-Icons-24.ttf b/webclient/css/fonts/Flat-UI-Icons-24.ttf
new file mode 100644
index 0000000..4e7a912
Binary files /dev/null and b/webclient/css/fonts/Flat-UI-Icons-24.ttf differ
diff --git a/webclient/css/fonts/Flat-UI-Icons-24.woff b/webclient/css/fonts/Flat-UI-Icons-24.woff
new file mode 100644
index 0000000..6169337
Binary files /dev/null and b/webclient/css/fonts/Flat-UI-Icons-24.woff differ
diff --git a/webclient/css/fonts/lato-black.ttf b/webclient/css/fonts/lato-black.ttf
new file mode 100644
index 0000000..543bc8b
Binary files /dev/null and b/webclient/css/fonts/lato-black.ttf differ
diff --git a/webclient/css/fonts/lato-black.woff b/webclient/css/fonts/lato-black.woff
new file mode 100644
index 0000000..43bee39
Binary files /dev/null and b/webclient/css/fonts/lato-black.woff differ
diff --git a/webclient/css/fonts/lato-bold.ttf b/webclient/css/fonts/lato-bold.ttf
new file mode 100644
index 0000000..93166dc
Binary files /dev/null and b/webclient/css/fonts/lato-bold.ttf differ
diff --git a/webclient/css/fonts/lato-bold.woff b/webclient/css/fonts/lato-bold.woff
new file mode 100644
index 0000000..35934a9
Binary files /dev/null and b/webclient/css/fonts/lato-bold.woff differ
diff --git a/webclient/css/fonts/lato-italic.ttf b/webclient/css/fonts/lato-italic.ttf
new file mode 100644
index 0000000..e2027ff
Binary files /dev/null and b/webclient/css/fonts/lato-italic.ttf differ
diff --git a/webclient/css/fonts/lato-italic.woff b/webclient/css/fonts/lato-italic.woff
new file mode 100644
index 0000000..e5d7554
Binary files /dev/null and b/webclient/css/fonts/lato-italic.woff differ
diff --git a/webclient/css/fonts/lato-regular.ttf b/webclient/css/fonts/lato-regular.ttf
new file mode 100644
index 0000000..d6101f3
Binary files /dev/null and b/webclient/css/fonts/lato-regular.ttf differ
diff --git a/webclient/css/fonts/lato-regular.woff b/webclient/css/fonts/lato-regular.woff
new file mode 100644
index 0000000..ad1a467
Binary files /dev/null and b/webclient/css/fonts/lato-regular.woff differ
diff --git a/webclient/fonts/FontAwesome.otf b/webclient/fonts/FontAwesome.otf
deleted file mode 100644
index 4dfe30a..0000000
Binary files a/webclient/fonts/FontAwesome.otf and /dev/null differ
diff --git a/webclient/fonts/fontawesome-webfont.eot b/webclient/fonts/fontawesome-webfont.eot
deleted file mode 100644
index e054c93..0000000
Binary files a/webclient/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/webclient/fonts/fontawesome-webfont.svg b/webclient/fonts/fontawesome-webfont.svg
deleted file mode 100644
index 36d43b8..0000000
--- a/webclient/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,414 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/webclient/fonts/fontawesome-webfont.ttf b/webclient/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 7ec2e1d..0000000
Binary files a/webclient/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/webclient/fonts/fontawesome-webfont.woff b/webclient/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 27d80b1..0000000
Binary files a/webclient/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/webclient/images/icons/musicbox114.png b/webclient/images/icons/musicbox114.png
new file mode 100644
index 0000000..14518ea
Binary files /dev/null and b/webclient/images/icons/musicbox114.png differ
diff --git a/webclient/images/icons/musicbox32.gif b/webclient/images/icons/musicbox32.gif
new file mode 100644
index 0000000..d0aefe9
Binary files /dev/null and b/webclient/images/icons/musicbox32.gif differ
diff --git a/webclient/images/icons/musicbox32.png b/webclient/images/icons/musicbox32.png
new file mode 100644
index 0000000..44f38e1
Binary files /dev/null and b/webclient/images/icons/musicbox32.png differ
diff --git a/webclient/images/icons/musicbox57.png b/webclient/images/icons/musicbox57.png
new file mode 100644
index 0000000..492ef6b
Binary files /dev/null and b/webclient/images/icons/musicbox57.png differ
diff --git a/webclient/images/icons/musicbox72.png b/webclient/images/icons/musicbox72.png
new file mode 100644
index 0000000..085eb5f
Binary files /dev/null and b/webclient/images/icons/musicbox72.png differ
diff --git a/webclient/index.html b/webclient/index.html
index f42e62e..28cafe5 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -25,34 +25,39 @@
new FastClick(document.body);
}, false);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -96,7 +101,7 @@
Exit Fullscreen
-
+
Settings
@@ -227,6 +232,7 @@
diff --git a/webclient/js/functionsvars.js b/webclient/js/functionsvars.js
index 2086a46..a0874e7 100644
--- a/webclient/js/functionsvars.js
+++ b/webclient/js/functionsvars.js
@@ -80,6 +80,9 @@ STATUS_TIMER = 10000;
var uriClassList = [ ['spotify', 'fa-spotify'], ['local', 'fa-file-sound-o'], ['podcast', 'fa-rss-square'], ['dirble', 'fa-microphone'],
['tunein', 'fa-headphones'], ['soundcloud', 'fa-soundcloud'], ['gmusic', 'fa-google'], ['internetarchive', 'fa-university'], ['somafm', 'fa-flask'], ['subsonic', 'fa-folder-open'] ];
+var uriHumanList = [ ['spotify', 'Spotify'], ['local', 'Local Files'], ['podcast', 'Podcasts'], ['dirble', 'Dirble'],
+ ['tunein', 'TuneIn'], ['soundcloud', 'SoundCloud'], ['gmusic', 'Google Music'], ['internetarchive', 'Internet Archive'], ['somafm', 'Soma FM'], ['subsonic', 'Subsonic'] ];
+
function scrollToTop() {
var divtop = 0;
$('body,html').animate({
@@ -455,3 +458,14 @@ function getMediaClass(uri) {
}
return '';
}
+
+function getMediaHuman(uri) {
+ var uriSplit = uri.split(":")[0].toLowerCase();
+ for (var i = 0; i < uriHumanList.length; i++) {
+ if (uriSplit == uriHumanList[i][0]) {
+ return uriHumanList[i][1];
+ }
+ }
+ return '';
+}
+
diff --git a/webclient/js/gui.js b/webclient/js/gui.js
index 32d0a57..2a5c9b6 100644
--- a/webclient/js/gui.js
+++ b/webclient/js/gui.js
@@ -514,7 +514,7 @@ $(document).ready(function(event) {
});
initRadio();
- if ($(window).width() <= 1024) {
+ if ($(window).width() < 980) {
$("#panel").panel("close");
}else{
$("#panel").panel("open");
diff --git a/webclient/js/library.js b/webclient/js/library.js
index 8db9353..1abf0e1 100644
--- a/webclient/js/library.js
+++ b/webclient/js/library.js
@@ -30,7 +30,7 @@ function initSearch() {
mopidy.library.search({
any: [value]
}).then(processSearchResults, console.error);
- console.log('search sent', value);
+// console.log('search sent', value);
}
}
@@ -38,7 +38,7 @@ function initSearch() {
* process results of a search
*********************************************************/
function processSearchResults(resultArr) {
- console.log('srch', resultArr);
+// console.log('srch', resultArr);
$(SEARCH_TRACK_TABLE).empty();
$(SEARCH_ARTIST_TABLE).empty();
$(SEARCH_ALBUM_TABLE).empty();
@@ -133,7 +133,7 @@ function processSearchResults(resultArr) {
child += theme(pattern, tokens);
}
// Inject list items, refresh listview and hide superfluous items.
- console.log(child, results.albums.length);
+// console.log(child, results.albums.length);
$(SEARCH_ALBUM_TABLE).html(child).listview('refresh').find('.overflow').hide();
$('#expandsearch').show();
diff --git a/webclient/js/process_ws.js b/webclient/js/process_ws.js
index 16e29b2..c708ff6 100644
--- a/webclient/js/process_ws.js
+++ b/webclient/js/process_ws.js
@@ -117,7 +117,19 @@ function processBrowseDir(resultArr) {
};
$('#browselist').html(child);
-
+ if (browseStack.length > 0 ) {
+/* child = '';
+ for (var i = 0; i < browseStack.length; i++) {
+ child += browseStack[i] + ' / ';
+ }
+*/
+ child = getMediaHuman(browseStack[0]);
+ iconClass = getMediaClass(browseStack[0]);
+ $('#browsepath').html(' ' + child);
+ } else {
+ $('#browsepath').html('');
+ }
+
updatePlayIcons(songdata.uri);
showLoading(false);
diff --git a/webclient/js/radiostations.js b/webclient/js/radiostations.js
deleted file mode 120000
index b4b2196..0000000
--- a/webclient/js/radiostations.js
+++ /dev/null
@@ -1 +0,0 @@
-/boot/config/radiostations.js
\ No newline at end of file
diff --git a/webclient/js/radiostations.js b/webclient/js/radiostations.js
new file mode 100755
index 0000000..354c353
--- /dev/null
+++ b/webclient/js/radiostations.js
@@ -0,0 +1,16 @@
+/**
+ * Default Radiostations which appear in the webinterface. Edit if you like.
+ * Take care when editting. Only edit the stuff between ''
+ * And don't use the default Windows Notepad for this (use Notepad++ on Windows)
+ */
+
+var radioStations = [];
+//fill with defaults
+ radioStations.push(['NPR 24', 'http://nprdmp.ic.llnwd.net/stream/nprdmp_live01_mp3']);
+ radioStations.push(['3FM Dutch', 'http://icecast.omroep.nl/3fm-bb-mp3']);
+ radioStations.push(['BBC WorldService', 'http://vprbbc.streamguys.net:8000/vprbbc24.mp3']);
+ radioStations.push(['Arrow Jazz', 'http://81.173.3.132:8082']);
+ radioStations.push(['PBS Australia', 'http://eno.emit.com:8000/pbsfm_live_64.mp3']);
+ radioStations.push(['Groove Salad - Soma FM', 'http://somafm.com/groovesalad.pls']);
+ radioStations.push(['Kiss FM Berlin', 'http://stream.kissfm.de/kissfm/mp3-128/internetradio/']);
+ radioStations.push(['Pinguin Radio', 'http://pr320.pinguinradio.com/listen.pls']);
\ No newline at end of file
diff --git a/webclient/mopidy b/webclient/mopidy
deleted file mode 120000
index f756a05..0000000
--- a/webclient/mopidy
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib/python2.7/dist-packages/mopidy/http/data
\ No newline at end of file
diff --git a/webclient/settings/index.html b/webclient/settings/index.html
index 3f4985f..88d9c9f 100644
--- a/webclient/settings/index.html
+++ b/webclient/settings/index.html
@@ -221,7 +221,7 @@ If the mount needs a username/password, also set it (leave empty for guest-acces
your installation to access your SoundCloud account. To do that, go to http://www.mopidy.com/authenticate
- NOTE: Enabling this plugin can mess up the search functionality of MusicBox!
+