Merge pull request #15 from jcorporation/devel

Merge devel into master

- Replace sammy.js with own implementation with state save for cards, tabs and views
- Use queue version for song change in http streams

CMakeLists.txt

@@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 2.6)
 project (mympd C)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 set(CPACK_PACKAGE_VERSION_MAJOR "2")
-set(CPACK_PACKAGE_VERSION_MINOR "2")
-set(CPACK_PACKAGE_VERSION_PATCH "1")
+set(CPACK_PACKAGE_VERSION_MINOR "3")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
+
 if(CMAKE_BUILD_TYPE MATCHES RELEASE)
     set(ASSETS_PATH "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/htdocs")
 else()

README.md

@@ -15,7 +15,6 @@ UI Components
  - Bootstrap Notify: http://bootstrap-notify.remabledesigns.com/
  - Bootstrap Slider: https://github.com/seiyria/bootstrap-slider
  - Material Design Icons: https://material.io/tools/icons/?style=baseline
- - Sammy.js: http://sammyjs.org/
  - jQuery: https://jquery.com/
  - js-cookie: https://github.com/js-cookie/js-cookie
 

htdocs/css/mpd.css

@@ -25,12 +25,12 @@ button {
   overflow: hidden;
 }
 
-#browseBreadcrumb {
+#BrowseBreadrumb {
   overflow: auto;
   white-space: nowrap;
 }
 
-#browseBreadcrumb > li > a {
+#BrowseBreadcrumb > li > a {
   cursor: pointer;
 }
 
@@ -82,7 +82,7 @@ tbody {
  float: right !important;
 }
 
-#queue-buttons, #browsePlaylistsButtons, #searchButtons, #browseFilesystemButtons, #browseDatabaseButtons {
+#queue-buttons, #BrowsePlaylistsButtons, #SearchButtons, #BrowseFilesystemButtons, #BrowseDatabaseButtons {
  margin-bottom:20px;
 }
 
@@ -180,16 +180,16 @@ main {
  margin-right:5px;
 }
 
-#browseFilesystemFilterLetters > button, 
-#browseDatabaseFilterLetters > button,
-#browsePlaylistsFilterLetters > button
+#BrowseFilesystemFilterLetters > button, 
+#BrowseDatabaseFilterLetters > button,
+#BrowsePlaylistsFilterLetters > button
 {
  min-width:28px;
 }
 
 .col-md {
- min-width:250px;
- max-width:350px;
+ min-width:260px;
+ max-width:260px;
 }
 
 .card-img-top {