From 80d4801d0f7d1d5359e31a90304756646f9f28b5 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 22 Jan 2019 17:42:35 -0600 Subject: [PATCH 1/3] restore account name and logout in header, remove timezone, simplify --- .../views/scripts/partialviews/header.phtml | 10 ++-- airtime_mvc/public/css/masterpanel.css | 54 ++++++++++------- airtime_mvc/public/css/styles.css | 60 +++---------------- .../public/js/airtime/dashboard/dashboard.js | 3 - 4 files changed, 47 insertions(+), 80 deletions(-) diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml index df94ff732..b3fd9f430 100644 --- a/airtime_mvc/application/views/scripts/partialviews/header.phtml +++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml @@ -52,10 +52,12 @@
- +
+
+ baseUrl . "/user/edit-user"?>>escape($this->loggedInAs()); ?> + | + baseUrl . "/login/logout"?>> +
diff --git a/airtime_mvc/public/css/masterpanel.css b/airtime_mvc/public/css/masterpanel.css index c338bf09f..6396aba31 100644 --- a/airtime_mvc/public/css/masterpanel.css +++ b/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; - } - .time-info-block li, .time-info-block li.time { - text-align: right; - } + display: flex; + flex-direction: column; + 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; diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 8327080a4..adc90fef2 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -106,15 +106,16 @@ img.logo /* Version Notification Starts*/ #version-icon { position:absolute; - top:68px; - right: 10px; - height:35px; - width:35px; + top:3px; + right: 3px; + height:20px; + 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; diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js index 09b1c1916..5ceadf6a2 100644 --- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js +++ b/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; From aa6ac77491d8a1928cce34f78adb7970b1bc1359 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 22 Jan 2019 17:45:31 -0600 Subject: [PATCH 2/3] remove red logout button from left sidebar --- airtime_mvc/application/layouts/scripts/layout.phtml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index a67970653..cc89c21e4 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -92,14 +92,6 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= - -
- - - -