diff --git a/web/app/assets/images/content/icon_arrow.png b/web/app/assets/images/content/icon_arrow.png new file mode 100644 index 000000000..e8685069d Binary files /dev/null and b/web/app/assets/images/content/icon_arrow.png differ diff --git a/web/app/assets/images/content/icon_comment.png b/web/app/assets/images/content/icon_comment.png new file mode 100644 index 000000000..57ceb1035 Binary files /dev/null and b/web/app/assets/images/content/icon_comment.png differ diff --git a/web/app/assets/javascripts/web/recordings.js b/web/app/assets/javascripts/web/recordings.js deleted file mode 100644 index 7f4a5b478..000000000 --- a/web/app/assets/javascripts/web/recordings.js +++ /dev/null @@ -1,8 +0,0 @@ -(function(context,$) { - - "use strict"; - - context.JK = context.JK || {}; - - -})(window, jQuery) \ No newline at end of file diff --git a/web/app/assets/javascripts/web/sessions.js b/web/app/assets/javascripts/web/sessions.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js index c45b117d4..f1e3438e6 100644 --- a/web/app/assets/javascripts/web/web.js +++ b/web/app/assets/javascripts/web/web.js @@ -16,5 +16,3 @@ //= require landing/signup //= require web/downloads //= require web/congratulations -//= require web/recordings -//= require web/sessions \ No newline at end of file diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss index 5ce2dbb42..49df23e0f 100644 --- a/web/app/assets/stylesheets/web/main.css.scss +++ b/web/app/assets/stylesheets/web/main.css.scss @@ -36,11 +36,9 @@ body.web { background-color:black; width:100%; padding-bottom:15px; - /*position:relative; - width:100%; min-height: 366px; - background-color:black; - padding-top:20px;*/ + position:relative; + padding-bottom:30px; } div.wrapper { @@ -139,6 +137,26 @@ body.web { margin-top:25px; } + .avatar-small { + float:left; + padding:1px; + width:36px; + height:36px; + background-color:#ed3618; + margin:10px; + -webkit-border-radius:18px; + -moz-border-radius:18px; + border-radius:18px; + } + + .avatar-small img { + width: 36px; + height: 36px; + -webkit-border-radius:18px; + -moz-border-radius:18px; + border-radius:18px; + } + .cta { margin-top:40px; text-align:center; @@ -158,6 +176,7 @@ body.web { } h2 { + font-size: 1.5em; font-weight:300; } diff --git a/web/app/assets/stylesheets/web/recordings.css.scss b/web/app/assets/stylesheets/web/recordings.css.scss index c5dbef4b7..45e591aa1 100644 --- a/web/app/assets/stylesheets/web/recordings.css.scss +++ b/web/app/assets/stylesheets/web/recordings.css.scss @@ -3,6 +3,9 @@ margin-bottom:5px; padding:8px 5px 8px 10px; width:98%; + position:relative; + text-align:center; + background-color:#242323; } .recording-position { @@ -32,7 +35,7 @@ .recording-playback { display:inline-block; - background-image:url(../images/content/bkg_playcontrols.png); + background-image:url(../content/bkg_playcontrols.png); background-repeat:repeat-x; position:relative; width:70%; diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.erb index d76e02611..316f96083 100644 --- a/web/app/views/layouts/web.erb +++ b/web/app/views/layouts/web.erb @@ -1,84 +1,83 @@ - - <%= full_title(yield(:title)) %> + + <%= full_title(yield(:title)) %> - - - <%= stylesheet_link_tag "web/web", media: "all" %> - <% if bugsnag? %> - - - <% end %> - <%= include_gon(:init => true) %> - <%= csrf_meta_tags %> - - -<%= javascript_include_tag "web/web" %> - + + + <%= stylesheet_link_tag "web/web", media: "all" %> + <% if bugsnag? %> + + + <% end %> + <%= include_gon(:init => true) %> + <%= csrf_meta_tags %> + + + <%= javascript_include_tag "web/web" %> + -
- -
- <%= link_to root_path do %> - <%= image_tag("web/logo_home.png", :alt => "JamKazam logo", :size => "298x54") %> - <% end %> -
- -
-

Play music together over the Internet as if in the same room

-
- - <%= render "users/user_dropdown" %> - -


-
- -
-

- <%= yield %> -
-
-
- <%= yield(:after_black_bar) %> -
+
+ <%= link_to root_path do %> + <%= image_tag("web/logo_home.png", :alt => "JamKazam logo", :size => "298x54") %> + <% end %> +
+ +
+

Play music together over the Internet as if in the same room

+
+ + <%= render "users/user_dropdown" %> + +


+ + +
+
+

+ <%= yield %> +
+
+ +
+ <%= yield(:after_black_bar) %> +
- - <%= render "clients/invitationDialog" %> + <%= render "clients/invitationDialog" %> - + var userDropdown = new JK.UserDropdown(JK.app); + userDropdown.initialize(invitationDialog); + } + }) + -<%= render "shared/ga" %> - - + <%= render "shared/ga" %> + + diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb index 4482b731e..875d9919b 100644 --- a/web/app/views/recordings/show.html.erb +++ b/web/app/views/recordings/show.html.erb @@ -1,211 +1,137 @@ <% provide(:title, "#{@claimed_recording.name}") %> -
-
- -
- Raven & The Blackbirds +
+ <% unless @claimed_recording.recording.band.nil? %> +
+ <% unless @claimed_recording.recording.band.photo_url.blank? %> + <%= image_tag "#{@claimed_recording.recording.band.photo_url}", {:alt => ""} %> + <% else %> + <%= image_tag "shared/avatar_generic_band.png", {:alt => ""} %> + <% end %> +
+ <%= @claimed_recording.recording.band.name %> + <% else %> +
+ <% unless @claimed_recording.recording.owner.photo_url.blank? %> + <%= image_tag "#{@claimed_recording.recording.owner.photo_url}", {:alt => ""} %> + <% else %> + <%= image_tag "shared/avatar_generic.png", {:alt => ""} %> + <% end %> +
+ <%= @claimed_recording.recording.owner.name %> + <% end %> +
+ +
+
RECORDING
+
<%= @claimed_recording.recording.created_at %>
+

+

<%= @claimed_recording.name %>

+
+ <%= image_tag "content/icon_like.png", {:width => 12, :height => 12} %> LIKE    + <%= image_tag "content/icon_share.png", {:width => 13, :height => 15} %> SHARE +
+
TODO: Which field is this in the database??

+
+
+ <%= image_tag "content/icon_playbutton.png", {:width => 20, :height => 20} %> +
+
0:00
+
+
<%= image_tag "content/slider_playcontrols.png", {:width => 5, :height => 16} %>
- -
-
RECORDING
-
Yesterday, 11:10 am
-

-

You Hurt Me Bad

-
LIKE    SHARE
-
- A sweet and sexy ballad about broken hearts and bad girls.
-
- - -
- -
- - - - - -
- - -
0:00
- - -
-
-
- - -
4:59
-
- - - -
- 1:23 -
- -
- - - -
Blues
-
80     12     35
-
-

- - - - - - - - - - - - - - - - - - - -
Jimmy Johnson
Perry Jon Blazinsky
Knox Pitzer
Coby Jones
-
-
+
4:59
+
+
1:23
+
+ +
<%= @claimed_recording.genre_id.capitalize %>
+
+ <%= @claimed_recording.recording.play_count %> + <%= image_tag "content/icon_arrow.png", {:width => 7, :height => 12, :align => "absmiddle"} %>     + <%= @claimed_recording.recording.comment_count %> + <%= image_tag "content/icon_comment.png", {:width => 13, :height => 12, :align => "absmiddle"} %>     + <%= @claimed_recording.recording.like_count %> + <%= image_tag "content/icon_like.png", {:width => 12, :height => 12, :align => "absmiddle"} %> +
+
+

+ + <% @claimed_recording.recording.recorded_tracks.each_with_index do |track, index| %> + <% if index % 2 == 0 %> + + <% end %> + + + + <% if index % 2 == 0 %> + + <% else %> + + <% end %> + <% end %> +
+
+ <% unless track.user.photo_url.blank? %> + <%= image_tag "#{track.user.photo_url}", {:alt => ""} %> + <% else %> + <%= image_tag "shared/avatar_generic.png", {:alt => ""} %> + <% end %> +
+
<%= track.user.name %>
 +
+ <%= image_tag "shared/icon_instrument_#{track.instrument_id}45.png", {:width => 32, :alt => ""} %> +
+
+
+
- - - -

-

More by Raven & The Blackbirds:


- -
Now:
-
SESSION: Live Session in Progress
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis.
-

-
Yesterday:
-
RECORDING: You Hurt Me Bad
-
Nullam sit amet enim. Suspendisse id velit vitae ligula volutpat condimentum. Aliquam erat volutpat. Sed quis velit. Nulla facilisi.
-

-
Dec. 18th:
-
SESSION: Session Ended. Unavailable.
-
Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer. Sed aliquam, nunc eget euismod ullamcorper, lectus nunc ullamcorper orci, fermentum bibendum enim nibh eget ipsum.
-

-
Dec. 12th:
-
RECORDING: Bustin' My Chops
-
Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.
-

-
Dec. 10th:
-
SESSION: Session Ended. Unavailable.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.
-

-
Nov. 29th:
-
SESSION: Session Ended. Unavailable.
-
Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer.
-
+

+

More by Raven & The Blackbirds:


+
Now:
+
SESSION: Live Session in Progress
+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis.
+

+
Yesterday:
+
RECORDING: You Hurt Me Bad
+
Nullam sit amet enim. Suspendisse id velit vitae ligula volutpat condimentum. Aliquam erat volutpat. Sed quis velit. Nulla facilisi.
+

+
Dec. 18th:
+
SESSION: Session Ended. Unavailable.
+
Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer. Sed aliquam, nunc eget euismod ullamcorper, lectus nunc ullamcorper orci, fermentum bibendum enim nibh eget ipsum.
+

+
Dec. 12th:
+
RECORDING: Bustin' My Chops
+
Donec porttitor ligula eu dolor. Maecenas vitae nulla consequat libero cursus venenatis. Nam magna enim, accumsan eu, blandit sed, blandit a, eros.
+

+
Dec. 10th:
+
SESSION: Session Ended. Unavailable.
+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi commodo, ipsum sed pharetra gravida, orci magna rhoncus neque, id pulvinar odio lorem non turpis. Nullam sit amet enim.
+

+
Nov. 29th:
+
SESSION: Session Ended. Unavailable.
+
Nulla libero. Vivamus pharetra posuere sapien. Nam consectetuer.
+
- <% content_for :after_black_bar do %> -
-
-

Comments:

- - -
-
- -
-
- - - -
- - -
-
- - Jeremy Jones Nulla facilisi. In vel sem. Morbi id urna in diam dignissim feugiat. Proin molestie tortor eu velit. -
-
5 minutes ago
-
-
- - -
-
- - Johnny Cameroon Fusce consectetuer luctus ipsum. -
-
30 minutes ago
-
-
- - -
-
- - Perry Gaberdeen Nulla facilisi. In vel sem. Morbi id urna in diam dignissim feugiat. Proin molestie tortor eu velit. -
-
2 hours ago
-
-
- - -
-
- - Billy Saban Ut eu ligula. Etiam ligula enim, tempor ut, blandit nec, mollis eu, lectus. -
-
Yesterday, 2:45 pm
-
-
- - -
-
- - Jeremy Jones Nulla facilisi. In vel sem. Morbi id urna in diam dignissim feugiat. Proin molestie tortor eu velit. -
-
5 minutes ago
-
-
- - -
-
- - Johnny Cameroon Fusce consectetuer luctus ipsum. -
-
30 minutes ago
-
-
- - -
-
- - Perry Gaberdeen Nulla facilisi. In vel sem. Morbi id urna in diam dignissim feugiat. Proin molestie tortor eu velit. -
-
2 hours ago
-
-
- - -
-
- - Billy Saban Ut eu ligula. Etiam ligula enim, tempor ut, blandit nec, mollis eu, lectus. -
-
Yesterday, 2:45 pm
-
-
-
+
+
+

Comments:

+
+
+ +
+
+ +
+
+
+ Billy Saban Ut eu ligula. Etiam ligula enim, tempor ut, blandit nec, mollis eu, lectus. +
+
Yesterday, 2:45 pm
+
+
<% end %> diff --git a/web/app/views/users/_user_dropdown.html.erb b/web/app/views/users/_user_dropdown.html.erb index a42194440..842219322 100644 --- a/web/app/views/users/_user_dropdown.html.erb +++ b/web/app/views/users/_user_dropdown.html.erb @@ -12,7 +12,7 @@
-
    +
    • <%= link_to "Identity", '/client#/account/identity' %>