Fukd ur madder

This commit is contained in:
Nicolas A. Tonne
2015-04-18 02:58:01 +02:00
parent d47bcc12c2
commit 2dcd3baad1
19 changed files with 65 additions and 38 deletions

View File

@@ -20,18 +20,21 @@
<a href="/" class="brand-logo hide-on-small-only"> <a href="/" class="brand-logo hide-on-small-only">
<img id="zicon" src="static/images/squareicon_small.png" alt="zöff" title="Zöff"> <img id="zicon" src="static/images/squareicon_small.png" alt="zöff" title="Zöff">
</a> </a>
<div class="brand-logo zbrand"> <div class="brand-logo truncate zbrand">
<a href="//zoff.no" class="hide-on-med-and-up">Zöff</a> <a href="//zoff.no" class="hide-on-med-and-up">Zöff</a>
<span class="hide-on-med-and-up">/</span> <span class="hide-on-med-and-up">/</span>
<span id="chan" class="chan clickable" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></span> <span id="chan" class="chan clickable" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></span>
</div> </div>
<ul> <div class="container">
<li id="song-title"> <ul class="row">
</li> <li class="col s6" id="song-title">
<li> </li>
<input id="search" class="search_input" type="search" required title="Search for songs..." spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off"> <!--<li>
</li> <input id="search" class="search_input" type="search" required title="Search for songs..." spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off">
<div id="results"></div> </li>-->
</ul>
</div>
<ul class="right"> <ul class="right">
<li> <li>
<a class="nav-btn" href="#" id="search-btn" onclick=""> <a class="nav-btn" href="#" id="search-btn" onclick="">
@@ -61,6 +64,7 @@
<ul class="side-nav" id="settings-bar"> <ul class="side-nav" id="settings-bar">
<?php include("php/panel.php");?> <?php include("php/panel.php");?>
</ul> </ul>
<div id="results"></div>
</div> </div>
</nav> </nav>
</div> </div>
@@ -91,15 +95,17 @@
<div id="playlist" class="col s12 m3"> <div id="playlist" class="col s12 m3">
<div id="wrapper"> <div id="wrapper">
<div id="list-song-html"> <div id="list-song-html">
<div id="list-song" class="card left-align clickable list-song" title="Vote!"> <div id="list-song" class="card left-align list-song">
<a class="clickable center-align votebg"> <span class="clickable vote-container" title="Vote!">
<span class="card-image cardbg list-image"></span> <a class="clickable center-align votebg">
</a> <span class="card-image cardbg list-image"></span>
<span class="card-content"> </a>
<span class="flow-text truncate list-title"></span> <span class="card-content">
<span class="vote-span"> <span class="flow-text truncate list-title"></span>
<span class="list-votes"></span> <span class="vote-span">
<span class="highlighted vote-text">&nbsp;votes</span> <span class="list-votes"></span>
<span class="highlighted vote-text">&nbsp;votes</span>
</span>
</span> </span>
</span> </span>
<div class="list-remove card-action center-align hide"> <div class="list-remove card-action center-align hide">

View File

@@ -21,15 +21,19 @@
<a href="https://github.com/nixolas1/Zoff"> <a href="https://github.com/nixolas1/Zoff">
<img title="Contribute on GitHub" src="static/images/GitHub_Logo.png"> <img title="Contribute on GitHub" src="static/images/GitHub_Logo.png">
</a> </a>
<a href="https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>" target="popup" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>','Share Playlist','width=600,height=300')"> <p>
Share on Facebook <a class="waves-effect waves-light btn light-blue share shareface" href="https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>" target="popup" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>','Share Playlist','width=600,height=300')">
</a> <img class="left" src="static/images/facebook.png">Share on Facebook
<br> </a>
<a href="http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic" target="popup" onclick="window.open('http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic','Share Playlist','width=600,height=300')"> </p>
Share on Twitter <p>
</a> <a class="waves-effect waves-light btn light-blue share" href="http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic" target="popup" onclick="window.open('http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic','Share Playlist','width=600,height=300')">
<br> <img class="left" src="static/images/twitter.png">Share on Twitter
<img src="https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=http://zoff.no/<?php echo $list; ?>&choe=UTF-8&chld=L|1" alt="QRCode for link" title="QRCode"> </a>
</p>
<p>
<img src="https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=http://zoff.no/<?php echo $list; ?>&choe=UTF-8&chld=L|1" alt="QRCode for link" title="QRCode">
</p>
</li> </li>
</ul> </ul>
</div> </div>

View File

@@ -132,15 +132,19 @@ if(isset($_GET['chan'])){
<a href="https://github.com/nixolas1/Zoff"> <a href="https://github.com/nixolas1/Zoff">
<img title="Contribute on GitHub" src="static/images/GitHub_Logo.png"> <img title="Contribute on GitHub" src="static/images/GitHub_Logo.png">
</a> </a>
<a href="https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/" target="popup" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/','Share Playlist','width=600,height=300')"> <p>
Share on Facebook <a class="waves-effect waves-light btn light-blue share shareface" href="https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>" target="popup" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=http://zoff.no/<?php echo $list; ?>','Share Playlist','width=600,height=300')">
</a> <img class="left" src="static/images/facebook.png">Share on Facebook
<br> </a>
<a href="http://twitter.com/intent/tweet?url=http://zoff.no/&text=Check out Zöff!&via=zoffmusic" target="popup" onclick="window.open('http://twitter.com/intent/tweet?url=http://zoff.no/&text=Check out Zöff!&via=zoffmusic','Share Playlist','width=600,height=300')"> </p>
Share on Twitter <p>
</a> <a class="waves-effect waves-light btn light-blue share" href="http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic" target="popup" onclick="window.open('http://twitter.com/intent/tweet?url=http://zoff.no/<?php echo $list; ?>&text=Check out this playlist <?php echo ucfirst($list); ?> on Zöff!&via=zoffmusic','Share Playlist','width=600,height=300')">
<br> <img class="left" src="static/images/twitter.png">Share on Twitter
<img src="https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=http://zoff.no/&choe=UTF-8&chld=L|1" alt="QRCode for link" title="QRCode"> </a>
</p>
<p>
<img src="https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=http://zoff.no/<?php echo $list; ?>&choe=UTF-8&chld=L|1" alt="QRCode for link" title="QRCode">
</p>
</li> </li>
</ul> </ul>
</div> </div>

View File

@@ -65,6 +65,8 @@ main {
nav .zbrand{ nav .zbrand{
left:90px; left:90px;
max-width: 22%;
overflow: hidden;
} }
.fullwidth{ .fullwidth{
@@ -120,6 +122,17 @@ nav .zbrand{
color:grey; color:grey;
} }
.share, .shareface{
padding-left: 10px !important;
}
.shareface {background-color: rgb(42, 134, 200) !important;}
.share img{
height: 50px;
margin-right:10px;
}
/* /*
play mdi-av-play-arrow play mdi-av-play-arrow
@@ -221,7 +234,7 @@ hide mdi-action-visibility mdi-action-visibility-off
opacity:0; opacity:0;
transition: all .1s ease; transition: all .1s ease;
} }
.list-song:hover .list-image:after { .vote-container:hover .list-image:after {
opacity:1; opacity:1;
} }
@@ -246,7 +259,7 @@ hide mdi-action-visibility mdi-action-visibility-off
.card{margin:5px 0 5px 0 !important;} .card{margin:5px 0 5px 0 !important;}
#result img{float:left;padding-right:20px !important;} #result img{float:left;padding-right:20px !important;}
#result{height:100px;margin-left:40px;} #result{height:100px;margin-left:40px;}
#results{margin-top:-12px;background-color: rgba(0,0,0,0.6);} #results{background-color: rgba(0,0,0,0.6);}
.result:hover { .result:hover {
background-color: rgba(0,0,0,0.4); background-color: rgba(0,0,0,0.4);
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 KiB

BIN
static/images/facebook.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 930 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
static/images/twitter.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 980 B

View File

@@ -67,7 +67,7 @@ function populate_list(msg, conf_only)
song.find(".list-title").text(video_title); song.find(".list-title").text(video_title);
song.find(".list-title").attr("title", video_title); song.find(".list-title").attr("title", video_title);
song.find(".list-votes").text(video_votes); song.find(".list-votes").text(video_votes);
song.attr("onclick", "vote('"+video_id+"','pos')"); song.find(".vote-container").attr("onclick", "vote('"+video_id+"','pos')");
song.find(".list-image").attr("style",video_thumb); song.find(".list-image").attr("style",video_thumb);
song.attr("id",video_id); song.attr("id",video_id);
song.find("#del").attr("onclick", "vote('"+video_id+"', 'del')"); song.find("#del").attr("onclick", "vote('"+video_id+"', 'del')");