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

Onepage working

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-01-23 14:54:05 +01:00
parent e25f8e157c
commit 9015d705a5
9 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
index.php
View File

@@ -154,6 +154,9 @@
</div> </div>
</header> </header>
<main class="container center-align main"> <main class="container center-align main">
<div id="channel-load" class="progress" style="top:52px;">
<div class="indeterminate" id="channel-load-move"></div>
</div>
<div id="main-row" class="row"> <div id="main-row" class="row">
<div class="col s12 m9 video-container hide-on-small-only"> <div class="col s12 m9 video-container hide-on-small-only">

3
php/channel.php
View File

@@ -146,6 +146,9 @@
</div> </div>
</header> </header>
<main class="container center-align main"> <main class="container center-align main">
<div id="channel-load" class="progress" style="top:52px;">
<div class="indeterminate" id="channel-load-move"></div>
</div>
<div id="main-row" class="row"> <div id="main-row" class="row">
<div class="col s12 m9 video-container hide-on-small-only"> <div class="col s12 m9 video-container hide-on-small-only">

4
php/nochan.php
View File

@@ -82,6 +82,9 @@ if(isset($_GET['chan'])){
</header> </header>
<div class="section mega"> <div class="section mega">
<div id="channel-load" class="progress">
<div class="indeterminate" id="channel-load-move"></div>
</div>
<div id="mega-background"></div> <div id="mega-background"></div>
<h5>Create a radio channel, collaborate and listen</h5> <h5>Create a radio channel, collaborate and listen</h5>
<form class="channel-finder"> <form class="channel-finder">
@@ -102,7 +105,6 @@ if(isset($_GET['chan'])){
maxlength="18" maxlength="18"
/> />
<datalist id="searches"></datalist> <datalist id="searches"></datalist>
<a class="refresh-button"><i class="small cached"></i></a>
<button class="listen-button" action="submit">Listen</button> <button class="listen-button" action="submit">Listen</button>
</form> </form>
<div class="pitch outline"> <div class="pitch outline">

4
php/nochan_content.php
View File

@@ -69,6 +69,9 @@
</header> </header>
<div class="section mega"> <div class="section mega">
<div id="channel-load" class="progress">
<div class="indeterminate" id="channel-load-move"></div>
</div>
<div id="mega-background"></div> <div id="mega-background"></div>
<h5>Create a radio channel, collaborate and listen</h5> <h5>Create a radio channel, collaborate and listen</h5>
<form class="channel-finder"> <form class="channel-finder">
@@ -89,7 +92,6 @@
maxlength="18" maxlength="18"
/> />
<datalist id="searches"></datalist> <datalist id="searches"></datalist>
<a class="refresh-button"><i class="small cached"></i></a>
<button class="listen-button" action="submit">Listen</button> <button class="listen-button" action="submit">Listen</button>
</form> </form>
<div class="pitch outline"> <div class="pitch outline">

11
static/css/style.css
View File

@@ -49,6 +49,17 @@
user-select: none; user-select: none;
} }
#channel-load{
display:none;
position: absolute;
top: -8px;
background-color:rgba(0,0,0,0);
}
#channel-load-move{
background-color: #FFFFFF !important;
}
.rounded{ .rounded{
border-radius: 4px; border-radius: 4px;
} }

2
static/dist/frontpage.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
static/js/listeners.js
View File

@@ -364,8 +364,8 @@ window.onpopstate = function(e){
} }
function onepage_load(){ function onepage_load(){
$("#channel-load").css("display", "block");
var url_split = window.location.href.split("/"); var url_split = window.location.href.split("/");
if(url_split[3] == "" || url_split[3].substring(0,1) == "#"){ if(url_split[3] == "" || url_split[3].substring(0,1) == "#"){
$.ajax({ $.ajax({
url: "php/nochan_content.php", url: "php/nochan_content.php",

5
static/js/nochan.js
View File

@@ -201,6 +201,8 @@ var Nochan = {
to_channel: function(chan, popstate){ to_channel: function(chan, popstate){
$("#channel-load").css("display", "block");
$.ajax({ $.ajax({
url: chan + "/php/channel.php", url: chan + "/php/channel.php",
success: function(e){ success: function(e){
@@ -330,6 +332,7 @@ $(".listen-button").click(function(e){
//console.log($(".room-namer").attr("placeholder")); //console.log($(".room-namer").attr("placeholder"));
if($(".room-namer").val() == ""){ if($(".room-namer").val() == ""){
e.preventDefault(); e.preventDefault();
window.location = "?chan="+$(".room-namer").attr("placeholder"); //window.location = "?chan="+
Nochan.to_channel($(".room-namer").attr("placeholder"));
} }
}); });