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

Fixed some bugs with settings panel, heights of buttons in remote, README.md updated

Browse Source
This commit is contained in:
kasperrt
2015-06-20 15:29:48 +02:00
parent ebda68d7f4
commit cd2785b16b
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
README.md
View File

@@ -11,23 +11,27 @@ The team consists of Kasper Rynning-Tønnesen and Nicolas Almagro Tonne, and the
The team can be reached on <a href="mailto:contact@zoff.no?Subject=Contact%20Zoff">contact@zoff.no</a> The team can be reached on <a href="mailto:contact@zoff.no?Subject=Contact%20Zoff">contact@zoff.no</a>
###Screenshot of desktop version: ###Screenshots of desktop version:
![alt tag](http://puu.sh/hwExf/1d176aae19.jpg) ![alt tag](http://puu.sh/ivYFF/e74a007058.jpg)
![alt tag](http://puu.sh/hwEG0/2bc8bc6971.jpg) ![alt tag](http://puu.sh/ivYHQ/89c3486968.jpg)
![alt tag](http://puu.sh/hwEIn/ea5b9da786.jpg) ![alt tag](http://puu.sh/ivYKz/b1b65b339c.jpg)
![alt tag](http://puu.sh/hwEM0/326e4c71ed.jpg) ![alt tag](http://puu.sh/ivYNn/e873b31142.jpg)
![alt tag](http://puu.sh/hwERH/b7ae8333ac.jpg) ![alt tag](http://puu.sh/ivYUo/eec3ac6d36.jpg)
![alt tag](http://puu.sh/hwEWE/e1042576c0.jpg) ![alt tag](http://puu.sh/ivYVo/9036795b95.jpg)
![alt tag](http://puu.sh/hwFoU/1ba6caf5a9.jpg) ![alt tag](http://puu.sh/ivYZ4/af184117e7.jpg)
###Screenshot of the mobile version: ![alt tag](http://puu.sh/ivZlY/0b7a0c17dc.png)
![alt tag](http://puu.sh/ivZmZ/8a5cdfa0d6.png)
###Screenshots of the mobile version:
![alt tag](http://lh5.googleusercontent.com/-_rATUkLCLH8/VUKTzZ19TqI/AAAAAAAABLc/ab9ZiJtLy4g/w330-h586-no/Screenshot_2015-04-30-22-30-43.png) ![alt tag](http://lh5.googleusercontent.com/-YaH8pUMzjRM/VUKTpr7ZpdI/AAAAAAAABLQ/ABOOB-1RWcw/w330-h586-no/Screenshot_2015-04-30-22-39-44.png) ![alt tag](http://lh5.googleusercontent.com/-wVKAxHBwIAI/VUKToHhHxgI/AAAAAAAABLI/RyCteTkdvDY/w330-h586-no/Screenshot_2015-04-30-22-36-00.png) ![alt tag](http://lh5.googleusercontent.com/-_rATUkLCLH8/VUKTzZ19TqI/AAAAAAAABLc/ab9ZiJtLy4g/w330-h586-no/Screenshot_2015-04-30-22-30-43.png) ![alt tag](http://lh5.googleusercontent.com/-YaH8pUMzjRM/VUKTpr7ZpdI/AAAAAAAABLQ/ABOOB-1RWcw/w330-h586-no/Screenshot_2015-04-30-22-39-44.png) ![alt tag](http://lh5.googleusercontent.com/-wVKAxHBwIAI/VUKToHhHxgI/AAAAAAAABLI/RyCteTkdvDY/w330-h586-no/Screenshot_2015-04-30-22-36-00.png)

6
php/controller.php
View File

@@ -80,13 +80,13 @@
</form> </form>
<div class="rc" id="remote-controls"> <div class="rc" id="remote-controls">
<a class="chan-link waves-effect btn green" onclick="play();"> <a class="remote-button chan-link waves-effect btn green" onclick="play();">
<i id="remote_play" class="mdi-av-play-arrow"></i> <i id="remote_play" class="mdi-av-play-arrow"></i>
</a> </a>
<a class="chan-link waves-effect btn gray" onclick="pause();"> <a class="remote-button chan-link waves-effect btn gray" onclick="pause();">
<i id="remote_pause" class="mdi-av-pause"></i> <i id="remote_pause" class="mdi-av-pause"></i>
</a> </a>
<a class="chan-link waves-effect btn blue" onclick="skip();"> <a class="remote-button chan-link waves-effect btn blue" onclick="skip();">
<i id="remote_skip" class="mdi-av-skip-next"></i> <i id="remote_skip" class="mdi-av-skip-next"></i>
</a> </a>
</div> </div>

19
static/css/style.css
View File

@@ -63,6 +63,15 @@ input[type=text]:focus:not([readonly]) + label, input[type=password]:focus:not([
color: #2D2D2D; color: #2D2D2D;
} }
.input-field{
margin-left: 25px;
color: rgb(68,68,68);
}
#password{
margin-left:10px;
}
span.badge.new, span.badge.new,
.progress .determinate, .progress .determinate,
.progress .indeterminate, .progress .indeterminate,
@@ -567,9 +576,9 @@ ul #chat-log{
} }
.switch{ .switch{
display: inline; display: inline;
/*float: right;*/ float: right;
position: absolute; /*position: absolute;*/
right:10px; margin-right:10px;
} }
.switch label .lever { .switch label .lever {
background-color: #00B2FF; background-color: #00B2FF;
@@ -826,6 +835,10 @@ ul #chat-log{
} }
} }
.remote-button{
line-height:21px;
}
#remote-controls { #remote-controls {
font-size:50px !important; font-size:50px !important;
} }

2
static/js/youtube.js
View File

@@ -45,12 +45,12 @@ function setup_youtube_listener(channel)
seekTo = time - conf["startTime"]; seekTo = time - conf["startTime"];
song_title = obj[0][0]["title"]; song_title = obj[0][0]["title"];
getTitle(song_title, viewers); getTitle(song_title, viewers);
setBGimage(video_id);
if(player_ready && !window.mobilecheck()) if(player_ready && !window.mobilecheck())
{ {
if(ytplayer.getVideoUrl().split('v=')[1] != video_id) if(ytplayer.getVideoUrl().split('v=')[1] != video_id)
{ {
ytplayer.loadVideoById(video_id); ytplayer.loadVideoById(video_id);
setBGimage(video_id);
notifyUser(video_id, song_title); notifyUser(video_id, song_title);
ytplayer.seekTo(seekTo); ytplayer.seekTo(seekTo);
if(paused) if(paused)