KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed way viewers are showed

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-01-28 13:12:12 +01:00
parent 2f8e2f285b
commit 75a713dfbb
7 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/css/style.css
View File

@@ -208,6 +208,12 @@
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 125px; left: 125px;
height: 100%;
display: flex;
}
.frontpage-viewers{
margin-right: 5px;
} }
#toast-container{ #toast-container{
@@ -1679,6 +1685,22 @@ nav ul li:hover, nav ul li.active {
right: 0; right: 0;
} }
#frontpage-viewer-counter{
right: 0px;
width: 62px;
left: inherit;
text-align: right;
}
.brand-logo{
left: 0 !important;
-webkit-transform: translateX(0%) !important;
-moz-transform: translateX(0%) !important;
-ms-transform: translateX(0%) !important;
-o-transform: translateX(0%) !important;
transform: translateX(0%) !important;
}
#wrapper{ #wrapper{
min-height: 75px; min-height: 75px;
} }

4
public/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/js/frontpage.js
View File

@@ -249,8 +249,8 @@ var Frontpage = {
set_viewers: function(viewers){ set_viewers: function(viewers){
if(viewers > 0){ if(viewers > 0){
var to_add = viewers > 1 ? "listeners" : "listener"; //var to_add = viewers > 1 ? "listeners" : "listener";
$("#frontpage-viewer-counter").html(viewers + " " + to_add); $("#frontpage-viewer-counter").html("<i class='mdi-action-visibility frontpage-viewers'></i>" + viewers);
} }
}, },

4
public/js/player.js
View File

@@ -281,14 +281,14 @@ var Player = {
getTitle: function(titt, v) getTitle: function(titt, v)
{ {
var outPutWord = v > 1 ? "viewers" : "viewer"; var outPutWord = "<i class='mdi-action-visibility'></i>"//v > 1 ? "viewers" : "viewer";
var title = decodeURIComponent(titt); var title = decodeURIComponent(titt);
if(window.location.pathname != "/"){ if(window.location.pathname != "/"){
var elem = document.getElementById('song-title'); var elem = document.getElementById('song-title');
var getTitleViews = document.getElementById('viewers'); var getTitleViews = document.getElementById('viewers');
elem.innerHTML = title; elem.innerHTML = title;
getTitleViews.innerHTML = v + " " + outPutWord; getTitleViews.innerHTML = outPutWord + " " + v;
elem.title = title; elem.title = title;
if(chromecastAvailable){ if(chromecastAvailable){
$("#player_overlay").css("background", "url(https://img.youtube.com/vi/" + video_id + "/hqdefault.jpg)"); $("#player_overlay").css("background", "url(https://img.youtube.com/vi/" + video_id + "/hqdefault.jpg)");

6
public/php/channel.php
View File

@@ -204,9 +204,9 @@
<div id="fullscreen"> <div id="fullscreen">
<i class="mdi-navigation-fullscreen"></i> <i class="mdi-navigation-fullscreen"></i>
</div> </div>
<button class="castButton mdi-hardware-cast tooltipped" style="" data-position="top" data-delay="10" data-tooltip="Cast Zöff to TV" is="google-cast-button"> <button class="castButton mdi-hardware-cast tooltipped" style="" data-position="top" data-delay="5" data-tooltip="Cast Zöff to TV" is="google-cast-button">
</button> </button>
<button class="castButton-active hide mdi-hardware-cast-connected tooltipped" data-position="top" data-delay="10" data-tooltip="Stop casting" > <button class="castButton-active hide mdi-hardware-cast-connected tooltipped" data-position="top" data-delay="5" data-tooltip="Stop casting" >
</button> </button>
<div id="volume-button"> <div id="volume-button">
<i id="v-mute" class="mdi-av-volume-off"></i> <i id="v-mute" class="mdi-av-volume-off"></i>
@@ -215,7 +215,7 @@
<i id="v-full" class="mdi-av-volume-up"></i> <i id="v-full" class="mdi-av-volume-up"></i>
</div> </div>
<div id="volume"></div> <div id="volume"></div>
<div id="viewers"></div> <div id="viewers" data-position="top" data-delay="5" class="tooltipped" data-tooltip="Viewers"></div>
<div id="bar"></div> <div id="bar"></div>
</div> </div>
</div> </div>

2
public/php/frontpage.php
View File

@@ -19,7 +19,7 @@ if(isset($_GET['chan'])){
<a href="#" class="brand-logo noselect"> <a href="#" class="brand-logo noselect">
<img id="zicon" src="public/images/squareicon_small.png" alt="zöff" title="Zöff" /> <img id="zicon" src="public/images/squareicon_small.png" alt="zöff" title="Zöff" />
</a> </a>
<span id="frontpage-viewer-counter" class="hide-on-small-only noselect" title="Divided among all channels. Hidden or not"></span> <div id="frontpage-viewer-counter" data-position="bottom" data-delay="5" data-tooltip="Total viewers" class="noselect tooltipped" title="Divided among all channels. Hidden or not"></div>
<!--<a href="//zoff.no" class="brand-logo brand-mobile hide-on-med-and-up">Zöff</a>--> <!--<a href="//zoff.no" class="brand-logo brand-mobile hide-on-med-and-up">Zöff</a>-->
<ul class="right hide-on-med-and-down"> <ul class="right hide-on-med-and-down">
<li><a class="header-buttons waves-effect waves-cyan" id="offline-mode" title="Offline mode" href="#">Private</a></li> <li><a class="header-buttons waves-effect waves-cyan" id="offline-mode" title="Offline mode" href="#">Private</a></li>