diff --git a/src/assets/backgrounds/browse-albums.jpg b/src/assets/backgrounds/browse-albums.jpg
index 179e53a4..82dd2f8d 100755
Binary files a/src/assets/backgrounds/browse-albums.jpg and b/src/assets/backgrounds/browse-albums.jpg differ
diff --git a/src/assets/backgrounds/browse-default.jpg b/src/assets/backgrounds/browse-default.jpg
new file mode 100755
index 00000000..b8d76679
Binary files /dev/null and b/src/assets/backgrounds/browse-default.jpg differ
diff --git a/src/assets/backgrounds/browse-tunein.jpg b/src/assets/backgrounds/browse-tunein.jpg
new file mode 100755
index 00000000..5f125748
Binary files /dev/null and b/src/assets/backgrounds/browse-tunein.jpg differ
diff --git a/src/assets/icons/cd.svg b/src/assets/icons/cd.svg
index e88b87ab..8e105d12 100755
--- a/src/assets/icons/cd.svg
+++ b/src/assets/icons/cd.svg
@@ -3,117 +3,12 @@
diff --git a/src/js/components/Sidebar.js b/src/js/components/Sidebar.js
index 82093189..35a8150a 100755
--- a/src/js/components/Sidebar.js
+++ b/src/js/components/Sidebar.js
@@ -80,7 +80,7 @@ class Sidebar extends React.Component{
Tracks
-
+
Browse
diff --git a/src/js/index.js b/src/js/index.js
index 85d40d23..1ca63716 100755
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -75,9 +75,9 @@ ReactDOM.render(
+
+
-
-
diff --git a/src/js/services/mopidy/actions.js b/src/js/services/mopidy/actions.js
index c65e25b7..4f87dff0 100755
--- a/src/js/services/mopidy/actions.js
+++ b/src/js/services/mopidy/actions.js
@@ -185,7 +185,7 @@ export function getPlaylist( uri ){
export function getDirectory( uri ){
return {
type: 'MOPIDY_GET_DIRECTORY',
- data: { uri: uri }
+ data: { uri: (uri ? decodeURIComponent(uri) : null) }
}
}
diff --git a/src/js/views/library/LibraryBrowse.js b/src/js/views/library/LibraryBrowse.js
index f62db15f..ede8a8c7 100755
--- a/src/js/views/library/LibraryBrowse.js
+++ b/src/js/views/library/LibraryBrowse.js
@@ -60,7 +60,7 @@ class LibraryBrowse extends React.Component{
{},
directory[i],
{
- uri: directory[i].uri.replace('?','|')
+ uri: encodeURIComponent(directory[i].uri)
}
))
}
@@ -123,12 +123,12 @@ class LibraryBrowse extends React.Component{
var grid_items = [
{
name: 'Local artists',
- link: global.baseURL+'library/local/artists',
+ link: global.baseURL+'library/browse/local-artists',
icons: ['assets/backgrounds/browse-artists.jpg']
},
{
name: 'Local albums',
- link: global.baseURL+'library/local/albums',
+ link: global.baseURL+'library/browse/local-albums',
icons: ['assets/backgrounds/browse-albums.jpg']
}
]
@@ -156,13 +156,17 @@ class LibraryBrowse extends React.Component{
directory.icons = ['assets/backgrounds/browse-tunigo.jpg']
break
+ case 'Tunein':
+ directory.icons = ['assets/backgrounds/browse-tunein.jpg']
+ break
+
default:
- directory.icons = ['assets/backgrounds/browse-albums.jpg']
+ directory.icons = ['assets/backgrounds/browse-default.jpg']
}
grid_items.push({
name: directory.name,
- link: global.baseURL+'library/browse/'+directory.uri.replace('?','|').replace('/','%2F'),
+ link: global.baseURL+'library/browse/'+encodeURIComponent(directory.uri),
icons: directory.icons
})
}