diff --git a/app/assets/javascripts/music_player.js b/app/assets/javascripts/music_player.js
index 11e84bda2c56ac8cb704215140f5f1a2a8e4ea4f..8d1ade0b60b5fcbba277f6c0499ce8325e916ab3 100644
--- a/app/assets/javascripts/music_player.js
+++ b/app/assets/javascripts/music_player.js
@@ -42,6 +42,9 @@ function next_music() {
else if (music_info.data().player == "soundcloud" ) {
soundcloud_player();
}
+ else {
+ next_music();
+ }
}
function onPlayerStateChange(event) {
diff --git a/app/assets/stylesheets/music_index.css b/app/assets/stylesheets/music_index.css
index 5bba9c05d218b5ea39f0904a5a3c748ec341f323..7176ecafaf107db19a833ee87a5296fc1e4f1ccd 100644
--- a/app/assets/stylesheets/music_index.css
+++ b/app/assets/stylesheets/music_index.css
@@ -15,9 +15,13 @@ a
padding: 2px 6px;
}
-.tags{
+.cloud{
color: rgba(0, 110, 140, 0.95);
}
+.cloud:hover{
+ color: rgba(255,220,180,1);
+ background-color: rgba(0, 110, 140, 0.95);
+}
a:hover{
background-color: rgba(255,220,180,1);
@@ -69,6 +73,25 @@ ul
background-color: rgba(0, 110, 140, 0.8);
}
+.menu {
+ background-color: rgba(0, 110, 140, 1);
+ margin: auto;
+ cursor: pointer;
+ border-radius: 12px;
+ width: 60%;
+}
+
+.menu a{
+ width: 24.55%;
+ padding: 15px 0;
+ border-radius: 12px;
+ display: inline-block;
+ font: 20px Helvetica Neue, Helvetica, Arial, sans-serif;
+ overflow: hidden;
+ vertical-align: middle;
+ text-align: center;
+}
+
.music_id
{
width: 5%;
diff --git a/app/controllers/channels_controller.rb b/app/controllers/channels_controller.rb
index 60f1af5818313caac67456ca36c358ddbc748e78..f9d254c37b28a23ad66b38f186cd3c4d885ca0fb 100644
--- a/app/controllers/channels_controller.rb
+++ b/app/controllers/channels_controller.rb
@@ -1,12 +1,50 @@
class ChannelsController < ApplicationController
- def index_user
- @users = Channel.all
+ def index_users
+ users = Channel.all
+
+ list_users = Array.new
+ users.each do |user|
+ list_users.push(user.sender_irc)
+ end
+
+ @usercloud = Hash.new
+ list_users.each do |user|
+ if @usercloud.key?(user)
+ @usercloud[user] += 1.0
+ else
+ @usercloud[user] = 1.0
+ end
+ end
+
+ max_weight = @usercloud.values.max
+ @usercloud.each do |user, occ|
+ @usercloud[user] = occ / max_weight
+ end
respond_to do |format|
format.html
end
end
+ def index
+ channels = Channel.all
+ list_channels = Array.new
+ channels.each do |channel|
+ list_channels.push(channel.chan)
+ end
+
+ @channels = Array.new
+ list_channels.each do |channel|
+ if @channels.include?(channel) == false
+ @channels.push(channel)
+ end
+ end
+
+ respond_to do |format|
+ format.html
+ end
+ end
+
def show_user
@musics = Music.joins(:channel).where(playbot_chan: {sender_irc: params[:user]}).page params[:page]
respond_to do |format|
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 662172deb6dac26681894494da7b38a1c18cd07a..d33f92e22f958f0e1564ec4f8a4324b7fbf56662 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -19,7 +19,11 @@ class TagsController < ApplicationController
max_weight = @tagcloud.values.max
@tagcloud.each do |tag, occ|
- @tagcloud[tag] = occ / max_weight
+ if occ == 1
+ @tagcloud.delete(tag)
+ else
+ @tagcloud[tag] = occ / max_weight
+ end
end
respond_to do |format|
diff --git a/app/views/channels/index.html.erb b/app/views/channels/index.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..c140c31e87add1239a8b638067a714dad4b98b5d
--- /dev/null
+++ b/app/views/channels/index.html.erb
@@ -0,0 +1,5 @@
+<ul>
+<% @channels.each do |channel| %>
+ <li><%= link_to channel, '/musics/channels/'+channel.sub('#',''), class: "cloud" %></li>
+<% end %>
+</ul>
diff --git a/app/views/channels/index_users.html.erb b/app/views/channels/index_users.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..96582fbe1074439636c198b4446b08c6cb2646db
--- /dev/null
+++ b/app/views/channels/index_users.html.erb
@@ -0,0 +1,3 @@
+<% @usercloud.each do |user,weight| %>
+ <%= link_to user, '/musics/users/'+user, style: "font-size:"+(15+weight*200).to_s+"px", class: "cloud" %>
+<% end %>
diff --git a/app/controllers/.tags_controller.rb.swp b/app/views/layouts/.application.html.erb.swp
similarity index 77%
rename from app/controllers/.tags_controller.rb.swp
rename to app/views/layouts/.application.html.erb.swp
index b244a6ae9666bf727f934b4ad71ca9a05674b0e9..1caf2a10765c22112bcad1804794860ce23a4401 100644
Binary files a/app/controllers/.tags_controller.rb.swp and b/app/views/layouts/.application.html.erb.swp differ
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 280a7392794d25710dab6189579e9f3752689cb1..fd88f04778b516c13526227c8343b567fcd482d1 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -6,6 +6,14 @@
<%= csrf_meta_tags %>
</head>
<body>
+ <ul>
+ <li class="menu">
+ <span><a href="/musics">Home</a></span>
+ <span><a href="/channels">Channels</a></span>
+ <span><a href="/users">Users</a></span>
+ <span><a href="/tags">Tags</a></span>
+ </li>
+ </ul>
<div id="player_position">
<div id="player_block"></div>
</div>
diff --git a/app/views/tags/.index.html.erb.swp b/app/views/shared/._music.html.erb.swp
similarity index 90%
rename from app/views/tags/.index.html.erb.swp
rename to app/views/shared/._music.html.erb.swp
index d5ad42a4d32c6f2e43c83e2ad14a3329ba26cb4a..7de8c0b5ec70c19b8cf878edc212195df87c3eff 100644
Binary files a/app/views/tags/.index.html.erb.swp and b/app/views/shared/._music.html.erb.swp differ
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 6bef3eacced82e56243d486d6487449b94e02c2b..f2321bff5f5e5baf86e5d36cccf42c8ebbfb1694 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,4 +1,4 @@
<% @tagcloud.each do |tag,weight| %>
- <%= link_to raw("<span class=\"tags\" style=\"font-size:"+(15+weight*200).to_s+"px\">"+tag+"</span>"), '/musics/tags/'+tag %>
+ <%= link_to tag, '/musics/tags/'+tag, style: "font-size:"+(15+weight*200).to_s+"px", class: "cloud" %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index c05a8d51ac1f9a900bf215852269eef555fc571f..2d90b5c7645746a53ec139a76d0c56613fb0eb1f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,4 +62,5 @@ Rails.application.routes.draw do
get '/musics/tags/:tag', to: "tags#show"
get '/musics/users/:user', to: "channels#show_user"
get '/musics/channels/:channel', to: "channels#show_channel"
+ get '/users', to: "channels#index_users"
end