From c9dc64b6dd95880434321ebc030212978c36e6f6 Mon Sep 17 00:00:00 2001
From: skw4y <its.skway@gmail.com>
Date: Sun, 17 Mar 2019 19:18:43 +0100
Subject: [PATCH 1/7] Fix #294: Better mobile experience

---
 app/Config/bootstrap.php           |  2 +-
 app/View/Elements/artists_view.ctp |  4 +--
 app/View/Layouts/default.ctp       | 40 ++++++++++++----------
 app/webroot/css/style.css          | 54 +++++++++++++++++++-----------
 app/webroot/js/navigation.js       |  9 ++++-
 app/webroot/js/player-nav.js       |  2 +-
 6 files changed, 70 insertions(+), 41 deletions(-)
 mode change 100755 => 100644 app/Config/bootstrap.php

diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php
old mode 100755
new mode 100644
index 8db6b52..2cec930
--- a/app/Config/bootstrap.php
+++ b/app/Config/bootstrap.php
@@ -116,7 +116,7 @@
 /**
  * Sonerezh constants declarations
  */
-define('SONEREZH_VERSION', 'v1.2.5');
+define('SONEREZH_VERSION', 'v1.2.6');
 define('THUMBNAILS_DIR', 'thumbnails');
 define('RESIZED_DIR', IMAGES.'resized'.DS);
 define('AVATARS_DIR', 'avatars');
diff --git a/app/View/Elements/artists_view.ctp b/app/View/Elements/artists_view.ctp
index 7e5367a..6675677 100644
--- a/app/View/Elements/artists_view.ctp
+++ b/app/View/Elements/artists_view.ctp
@@ -15,7 +15,7 @@
         </p>
         </div>
         <div class="col-xs-2">
-            <h3 class="text-right">
+            <h3 class="text-right hidden-xs">
                 <small>
                     <span class="glyphicon glyphicon-play song-controls action-play-artist" title="<?php echo __('Play all albums'); ?>"></span>
                     <span class="glyphicon glyphicon-random song-controls action-shuffle-artist" title="<?php echo __('Shuffle this artist'); ?>"></span>
@@ -56,7 +56,7 @@
                             <small class="album-year">
                                 <?php echo h($album['year']); ?>
                             </small>
-                            <small>
+                            <small class="hidden-xs">
                                 <span class="glyphicon glyphicon-play song-controls action-play-album" title="<?php echo __('Play all tracks'); ?>"></span>
                                 <span class="glyphicon glyphicon-random song-controls action-shuffle-album" title="<?php echo __('Shuffle this album'); ?>"></span>
                                 <span class="dropdown">
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index d168a0d..57d1a5b 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -57,16 +57,17 @@
     </div>
 </nav>
 <!-- Player -->
-<div class="navbar navbar-default navbar-fixed-top navbar-player">
+<div class="navbar navbar-default navbar-fixed-bottom navbar-player">
     <div class="container">
-        <!-- Play/Pause buttons -->
-        <div class="col-md-2 col-xs-3">
+        <!-- Playlist management -->
+        <div class="col-md-2 col-xs-1">
             <ul class="player-controls">
-                <li><span class="glyphicon glyphicon-backward" id="backward"></span></li>
-                <li class="play"><span class="glyphicon glyphicon-play" id="play"></span></li>
-                <li><span class="glyphicon glyphicon-forward" id="forward"></span></li>
+                <li class="hidden-xs"><span class="glyphicon glyphicon-th-list" id="queue-button"></span></li>
+                <li class="hidden-xs"><span class="glyphicon glyphicon-repeat" id="queue-repeat"></span></li>
+                <li><span class="glyphicon glyphicon-random" id="queue-shuffle"></span></li>
             </ul>
         </div>
+
         <!-- Volume control -->
         <div class="col-md-2 hidden-xs hidden-sm">
             <ul class="player-controls volume">
@@ -77,25 +78,30 @@
         <!-- Current playing -->
         <div class="col-md-6 col-xs-6">
             <?php echo $this->Html->image("no-cover.png", array('class' => "song-cover hidden-xs")); ?>
-            <div class="song-infos truncated-name">
-                <span class="song-name"></span>
-                -
-                <span class="song-artist"></span>
+            <div class="song-infos truncated-name hidden-xs">
+		<span class="song-artist truncated"></span>
+		-
+                <span class="song-name truncated"></span>
+            </div>
+            <div class="song-infos truncated-name hidden-sm hidden-md hidden-lg">
+		<div class="song-artist truncated"></div>
+                <div class="song-name truncated"></div>
             </div>
-            <ul class="timebar">
-                <li><span class="badge badge-timer currentTime"></span></li>
+            <ul class="timebar hidden-xs">
+                <li class=""><span class="badge badge-timer currentTime"></span></li>
                 <li class="bar"><div id="timebar"></div></li>
                 <li><span class="badge badge-timer totalTime"></span></li>
             </ul>
         </div>
-        <!-- Playlist management -->
-        <div class="col-md-2 col-xs-2">
+	<!-- Play/Pause buttons -->
+        <div class="col-md-2 col-xs-5">
             <ul class="player-controls">
-                <li><span class="glyphicon glyphicon-th-list" id="queue-button"></span></li>
-                <li><span class="glyphicon glyphicon-repeat" id="queue-repeat"></span></li>
-                <li><span class="glyphicon glyphicon-random" id="queue-shuffle"></span></li>
+                <li><span class="glyphicon glyphicon-step-backward" id="backward"></span></li>
+                <li class="play"><span class="glyphicon glyphicon-play" id="play"></span></li>
+                <li><span class="glyphicon glyphicon-step-forward" id="forward"></span></li>
             </ul>
         </div>
+
     </div>
 </div>
 
diff --git a/app/webroot/css/style.css b/app/webroot/css/style.css
index 5c4f8df..bc7df0a 100644
--- a/app/webroot/css/style.css
+++ b/app/webroot/css/style.css
@@ -11,7 +11,8 @@
 
 body {
     font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    padding-top: 120px;
+    padding-top: 60px;
+    padding-bottom: 60px;
 }
 
 h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
@@ -62,10 +63,14 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 }
 
 .navbar-inverse .navbar-header>a,
-.navbar-inverse .navbar-nav>li>a,
+.navbar-inverse .navbar-nav>li>a{
+    background-color:transparent;
+    transition: background-color 0.2s;
+}
+
 .navbar-inverse .navbar-nav>.active>a,
 .navbar-inverse .navbar-nav>.active>a:focus {
-    background-color: transparent;
+    background-color:#58A7D2;
     transition: background-color 0.2s;
 }
 .navbar-inverse .navbar-header>a:hover,
@@ -73,17 +78,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 .navbar-inverse .navbar-nav>.active>a:hover {
     background-color: #337AB7;
 }
-.navbar-inverse .navbar-nav>.active>a:after{
-    content: " ";
-    display: block;
-    position: absolute;
-    border-width: 7px;
-    border-style: solid;
-    border-color: transparent transparent #f8f8f8;
-    bottom: 0;
-    left: 50%;
-    margin-left: -7px;
-}
+
 
 nav .search .search-input{
     height: 25px;
@@ -123,7 +118,7 @@ nav .search .search-input{
     margin-top: 50px;
     height: 65px;
     z-index: 1020;
-    border: none;
+    /*border: none;*/
     box-shadow: 0 2px 4px 0 rgba(0,0,0,.15);
 }
 
@@ -146,6 +141,24 @@ ul.player-controls li{
     cursor: default;
     color: #808080;
 }
+
+ul.player-controls li.disable span,
+ul.player-controls li.disable div{
+    cursor: default;
+}
+
+ul.player-controls li span,
+ul.player-controls li div,
+div#timebar.slider{
+    cursor: pointer;
+}
+
+ul.player-controls li span{
+	height: 100%;
+	width: 100%;
+	line-height: 65px;
+}
+
 ul.player-controls.volume li.volumeicon .glyphicon{
     margin-right: 5px;
 }
@@ -216,7 +229,7 @@ ul.player-controls li.play{
 
 .queue {
     border-bottom: 1px solid transparent;
-    top: -196px;
+    top: -250px;
     left: 0;
     position: fixed;
     width: 100%;
@@ -226,7 +239,7 @@ ul.player-controls li.play{
 }
 
 .queue.queue-open {
-    top: 114px;
+    top: 50px;
 }
 
 .queue > .queue-wrapper {
@@ -267,7 +280,7 @@ body, body.modal-open {
     position: fixed;
     width: 250px;
     z-index: 100;
-    bottom: 15px;
+    top: 35px;
     right: -300px;
 }
 
@@ -302,11 +315,14 @@ body, body.modal-open {
 }
 
 .truncated-name {
-    white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
+.truncated {
+    white-space: nowrap;
+}
+
 .separator-right {
     border-right: 1px solid #DDD;
 }
diff --git a/app/webroot/js/navigation.js b/app/webroot/js/navigation.js
index f236b95..d949710 100644
--- a/app/webroot/js/navigation.js
+++ b/app/webroot/js/navigation.js
@@ -139,4 +139,11 @@ $(function(){
         $(this).find('.hidden-fields').empty();
     });
 
-});
\ No newline at end of file
+    
+    $('.nav a').on('click', function(){
+        if($('.navbar-toggle').css('display') !='none'){
+            $('.navbar-toggle').click();
+        }
+    });
+
+});
diff --git a/app/webroot/js/player-nav.js b/app/webroot/js/player-nav.js
index f16ed41..916009a 100644
--- a/app/webroot/js/player-nav.js
+++ b/app/webroot/js/player-nav.js
@@ -445,7 +445,7 @@ function init() {
     });
 
     player.volume(0);
-    player.volume(volume ? volume : 50);
+    player.volume(volume ? volume : 100);
     if (mute == "true") {
         player.mute();
     }

From 44f2e53ff44f8d6bd816ef0c87ce55210ab5f77b Mon Sep 17 00:00:00 2001
From: skw4y <its.skway@gmail.com>
Date: Sun, 17 Mar 2019 21:22:23 +0000
Subject: [PATCH 2/7] Version rollback

---
 app/Config/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php
index 2cec930..8db6b52 100644
--- a/app/Config/bootstrap.php
+++ b/app/Config/bootstrap.php
@@ -116,7 +116,7 @@
 /**
  * Sonerezh constants declarations
  */
-define('SONEREZH_VERSION', 'v1.2.6');
+define('SONEREZH_VERSION', 'v1.2.5');
 define('THUMBNAILS_DIR', 'thumbnails');
 define('RESIZED_DIR', IMAGES.'resized'.DS);
 define('AVATARS_DIR', 'avatars');

From 2ba82f44d96d92104ffef6eae81975f7d227386c Mon Sep 17 00:00:00 2001
From: skw4y <its.skway@gmail.com>
Date: Sun, 17 Mar 2019 21:24:24 +0000
Subject: [PATCH 3/7] Useless comment removal

---
 app/webroot/css/style.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/webroot/css/style.css b/app/webroot/css/style.css
index bc7df0a..cce8ad6 100644
--- a/app/webroot/css/style.css
+++ b/app/webroot/css/style.css
@@ -118,7 +118,6 @@ nav .search .search-input{
     margin-top: 50px;
     height: 65px;
     z-index: 1020;
-    /*border: none;*/
     box-shadow: 0 2px 4px 0 rgba(0,0,0,.15);
 }
 

From d20efa80f636d1ec18f2cc0132c2efe7ec8ff7f2 Mon Sep 17 00:00:00 2001
From: skw4y <its.skway@gmail.com>
Date: Sun, 17 Mar 2019 21:24:58 +0000
Subject: [PATCH 4/7] Space added

---
 app/webroot/js/navigation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/webroot/js/navigation.js b/app/webroot/js/navigation.js
index d949710..8502da8 100644
--- a/app/webroot/js/navigation.js
+++ b/app/webroot/js/navigation.js
@@ -141,7 +141,7 @@ $(function(){
 
     
     $('.nav a').on('click', function(){
-        if($('.navbar-toggle').css('display') !='none'){
+        if($('.navbar-toggle').css('display') != 'none'){
             $('.navbar-toggle').click();
         }
     });

From e2870d7102f4943c6f4c14d73a3fb0c167bce288 Mon Sep 17 00:00:00 2001
From: skw4y <its.skway@gmail.com>
Date: Sun, 17 Mar 2019 21:34:00 +0000
Subject: [PATCH 5/7] Song infos display fix

---
 app/View/Layouts/default.ctp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 57d1a5b..2829717 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -79,9 +79,7 @@
         <div class="col-md-6 col-xs-6">
             <?php echo $this->Html->image("no-cover.png", array('class' => "song-cover hidden-xs")); ?>
             <div class="song-infos truncated-name hidden-xs">
-		<span class="song-artist truncated"></span>
-		-
-                <span class="song-name truncated"></span>
+		<span class="song-artist truncated"></span> - <span class="song-name truncated"></span>
             </div>
             <div class="song-infos truncated-name hidden-sm hidden-md hidden-lg">
 		<div class="song-artist truncated"></div>

From 582fe65e17c186c625bbcb1f3f884c1946a61c5b Mon Sep 17 00:00:00 2001
From: skw4y <its.skway@gmail.com>
Date: Mon, 18 Mar 2019 07:45:02 +0000
Subject: [PATCH 6/7] Tabs replaced by spaces

---
 app/View/Layouts/default.ctp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 2829717..2c51155 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -79,10 +79,10 @@
         <div class="col-md-6 col-xs-6">
             <?php echo $this->Html->image("no-cover.png", array('class' => "song-cover hidden-xs")); ?>
             <div class="song-infos truncated-name hidden-xs">
-		<span class="song-artist truncated"></span> - <span class="song-name truncated"></span>
+                <span class="song-artist truncated"></span> - <span class="song-name truncated"></span>
             </div>
             <div class="song-infos truncated-name hidden-sm hidden-md hidden-lg">
-		<div class="song-artist truncated"></div>
+                <div class="song-artist truncated"></div>
                 <div class="song-name truncated"></div>
             </div>
             <ul class="timebar hidden-xs">
@@ -91,7 +91,7 @@
                 <li><span class="badge badge-timer totalTime"></span></li>
             </ul>
         </div>
-	<!-- Play/Pause buttons -->
+        <!-- Play/Pause buttons -->
         <div class="col-md-2 col-xs-5">
             <ul class="player-controls">
                 <li><span class="glyphicon glyphicon-step-backward" id="backward"></span></li>

From 8e43aee4cf27ab7be8a084a52bff9db6ed015f31 Mon Sep 17 00:00:00 2001
From: skw4y <its.skway@gmail.com>
Date: Mon, 18 Mar 2019 07:49:48 +0000
Subject: [PATCH 7/7] Tabs replaced by spaces

---
 app/webroot/css/style.css | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/webroot/css/style.css b/app/webroot/css/style.css
index cce8ad6..f101ede 100644
--- a/app/webroot/css/style.css
+++ b/app/webroot/css/style.css
@@ -153,9 +153,9 @@ div#timebar.slider{
 }
 
 ul.player-controls li span{
-	height: 100%;
-	width: 100%;
-	line-height: 65px;
+    height: 100%;
+    width: 100%;
+    line-height: 65px;
 }
 
 ul.player-controls.volume li.volumeicon .glyphicon{
@@ -301,7 +301,7 @@ body, body.modal-open {
 }
 
  tr[data-id]{
- 	cursor: pointer;
+     cursor: pointer;
  }
 
 .table>tbody>tr>td.track-number{
@@ -401,17 +401,17 @@ body, body.modal-open {
 }
 
 .band-name{
-	margin-bottom: 25px;
+    margin-bottom: 25px;
 }
 
 .band-stats{
-	margin: -8px auto;
-	font-style: italic;
-	color: #999;
+    margin: -8px auto;
+    font-style: italic;
+    color: #999;
 }
 
 .disc-number{
-	margin: 10px 0;
+    margin: 10px 0;
     text-transform: uppercase;
 }
 
@@ -425,9 +425,9 @@ body, body.modal-open {
 }
 
 .song-controls {
-	color: #999;
-	margin: 0 2px;
-	padding: 0 2px;
+    color: #999;
+    margin: 0 2px;
+    padding: 0 2px;
     cursor: pointer;
 }