Skip to content
Extraits de code Groupes Projets
Valider ace2934a rédigé par Sybil's avatar Sybil
Parcourir les fichiers

- Autonext changes page alone,

- Few CSS updates and bugfixes.
parent cdb65247
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Fichier ajouté
...@@ -17,6 +17,11 @@ $("a").on( 'click', function(event){ ...@@ -17,6 +17,11 @@ $("a").on( 'click', function(event){
event.stopPropagation(); event.stopPropagation();
}); });
$( document ).ready(function () {
if ($(location).attr("hash") == "#autoplay=on") {
$(".clickable_links").first().trigger('click');
}
});
function youtube_click() { function youtube_click() {
music_info = $(this); music_info = $(this);
...@@ -52,11 +57,10 @@ function youtube_player() { ...@@ -52,11 +57,10 @@ function youtube_player() {
function next_music() { function next_music() {
music_info = $("li[data-id=\'"+music_info.data().id+"\']").next(); music_info = $("li[data-id=\'"+music_info.data().id+"\']").next();
if (music_info.length == 0) { if (music_info.length == 0) {
next_page = $(".next a").attr('href')
window.location.href = $(".next a").attr('href'); if ( next_page.length != 0 ){
window.location.href = next_page+"#autoplay=on";
//setTimeout($(".clickable_links").first().trigger("click"),2000); }
//console.log($(".clickable_links").first());
} }
if (music_info.data().player == "youtube" ) { if (music_info.data().player == "youtube" ) {
youtube_player(); youtube_player();
...@@ -142,8 +146,7 @@ function soundcloud_player() { ...@@ -142,8 +146,7 @@ function soundcloud_player() {
} }
}); });
var white_top = $("#header").height(); $("#white").css({'height':68+player_height}).slideDown();
$("#white").css({'height':white_top}).slideDown();
player_min = 20; player_min = 20;
player_max = 120; player_max = 120;
} }
......
Aucun aperçu pour ce type de fichier
...@@ -38,9 +38,8 @@ ul ...@@ -38,9 +38,8 @@ ul
.clickable_links .clickable_links
{ {
/*0 110 140 0.8*/
background-color: rgba(0, 110, 140, 1); background-color: rgba(0, 110, 140, 1);
margin: 2px; margin: 2px 10px;
cursor: pointer; cursor: pointer;
padding: 10px 0; padding: 10px 0;
border-radius: 12px; border-radius: 12px;
...@@ -59,11 +58,13 @@ ul ...@@ -59,11 +58,13 @@ ul
color: rgba(0, 110, 140, 0.95); color: rgba(0, 110, 140, 0.95);
} }
.clickable_links:hover{ #on_play{
background-color: rgba(0, 110, 140, 0.8); background-color: rgba(0,70,100,1);
margin-left: 20px;
margin-right: 0;
} }
#on_play { .clickable_links:hover{
background-color: rgba(0, 110, 140, 0.8); background-color: rgba(0, 110, 140, 0.8);
} }
......
Aucun aperçu pour ce type de fichier
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<%= link_to music.channel.chan, '/musics/channels/'+music.channel.chan.sub('#','') %> <%= link_to music.channel.chan, '/musics/channels/'+music.channel.chan.sub('#','') %>
</span> </span>
<span class="music_title"> <span class="music_title">
<%= link_to music.title, music.url %> <%= music.title %>
</span> </span>
<span class="music_tags"> <span class="music_tags">
<%= raw(music.tags.map{|t| link_to t.tag, '/musics/tags/'+t.tag}.join(" ")) %> <%= raw(music.tags.map{|t| link_to t.tag, '/musics/tags/'+t.tag}.join(" ")) %>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter