Merge pull request #715 from frecuencialibre/user-settings

masterpanel ui tweaks

airtime_mvc/application/views/scripts/partialviews/header.phtml

@@ -52,10 +52,12 @@
     <a href="#" class="listen-control-button"><span><?php echo _("Listen") ?></span></a>
   </div>
   <div class="time-info-block pull-right">
-    <ul>
+    <div class="time" id="time"></div>
-      <li class="time" id="time"></li>
+    <div class="personal-block">
-      <li class="time-zone"><span id="time-zone"></span></li>
+      <a id="current-user" href=<?php echo $this->baseUrl . "/user/edit-user"?>><span class="name"><?php echo $this->escape($this->loggedInAs()); ?></span></a>
-    </ul>
+      <span>|</span> 
+      <a href=<?php echo $this->baseUrl . "/login/logout"?>><?php echo _("Logout")?></a>
+    </div>
   </div>
 </div>
 <div id="jquery_jplayer_1" class="jp-jplayer" style="width:0px; height:0px;"></div>

airtime_mvc/public/css/masterpanel.css

@@ -302,32 +302,46 @@
 
 
 
-.personal-block.solo {
-	width: 215px;
-	line-height: 32px;
-	margin: 0;
-}
-.personal-block.solo span {
-	display: inline-block;
-	width: 100px;
-	text-overflow: ellipsis;
-	text-decoration: underline;
-	overflow: hidden;
-	float: left;
-}
-.personal-block.solo ol {
-    margin-top: 6px;
-}
 .time-info-block.pull-right {
 	margin-right:0;
 	text-align:right !important;
 	background-position:0 0;
 	padding: 0 10px 0 10px;
-	}
+	display: flex;
-	.time-info-block li, .time-info-block li.time {
+    flex-direction: column;
-		text-align: right;
+	justify-content: center;
-		}
+	max-width: 150px;
+}
+.time-info-block .time {
+	padding: 0;
+	margin: 0;
+	width: auto;
+	list-style-type:none;
+	font-size:40px;
+	color:#fff;
+}
 
+.personal-block {
+	display: flex;
+	justify-content: space-between;
+	color:#fff;
+	font-size:12px;
+}
+.personal-block .name {
+	display: inline-block;
+	max-width: 100px;
+	text-overflow: ellipsis;
+	text-decoration: underline;
+	overflow: hidden;
+	margin-right: 3px;
+}
+.personal-block a {
+	color:#fff;
+	text-decoration:underline;
+}
+.personal-block a:hover {
+    color:#ff5d1a;
+}
 /*.line-to-switch {
 	float: right;
 	width: 10px;

airtime_mvc/public/css/styles.css

@@ -106,15 +106,16 @@ img.logo
 /* Version Notification Starts*/
 #version-icon {
     position:absolute;
-    top:68px;
+    top:3px;
-    right: 10px;
+    right: 3px;
-    height:35px;
+    height:20px;
-    width:35px;
+    width:20px;
     z-index:1000;
     display:block;
     cursor:pointer;
     background-repeat:no-repeat;
     background-position:center;
+    background-size: contain;
 }
 #version-icon.outdated {
     background-image:url(images/icon_outdated.png);
@@ -267,7 +268,7 @@ img.logo
     overflow:hidden;
 }
 
-.now-playing-block, .show-block, .on-air-block, .time-info-block, .personal-block, .listen-control-block, .trial-info-block {
+.now-playing-block, .show-block, .on-air-block, .time-info-block, .listen-control-block, .trial-info-block {
     height:100px;
     float:left;
     margin-right:10px;
@@ -279,34 +280,6 @@ img.logo
     min-width:170px;
 }
 
-.personal-block  {
-    float:right;
-    margin-right:20px;
-    text-align:right;
-    min-width:110px;
-}
-
-.personal-block  ul {
-    margin:0;
-    padding:8px 0 0;
-}
-.personal-block li {
-    font-size:11px;
-    color:#bdbdbd;
-    list-style-type:none;
-    margin:0 0 2px 0;
-}
-.personal-block li.name {
-    color:#fff;
-    font-weight:normal;
-}
-.personal-block li a {
-    color:#fff;
-    text-decoration:underline;
-}
-.personal-block li a:hover {
-    color:#ff5d1a;
-}
 .now-playing-block {
     -webkit-flex: 1 0;
     -moz-flex: 1 0;
@@ -430,26 +403,7 @@ ol.navigation {
         min-width: 630px;
     }
 }
-.time-info-block ul {
+
-    margin:0;
-    padding:6px 0 0;
-}
-.time-info-block li {
-    list-style-type:none;
-    font-size:14px;
-    color:#bdbdbd;
-    margin:0 0 6px;
-}
-.time-info-block li.time {
-    font-size:26px;
-    color:#fff;
-    width:auto;
-    text-align:left;
-}
-.time-info-block li.time-zone {
-    font-size:17px;
-    margin-bottom:0;
-}
 .listen-control-block a, .listen-control-button {
     font-size:11px;
     text-transform:uppercase;

airtime_mvc/public/js/airtime/dashboard/dashboard.js

@@ -242,9 +242,6 @@ function calculateTimeToNextShow() {
 }
 
 function parseItems(obj){
-    $('#time-zone').text(obj.timezone);
-
-
     previousSong = obj.previous;
     currentSong = obj.current;
     nextSong = obj.next;