From 69bf50ff281e2904fb9149e2789cfb313fd2aefa Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Thu, 21 Nov 2013 01:24:40 -0500 Subject: [PATCH 1/5] VRFS-689 band setup work --- ruby/.gitignore | 2 +- ruby/lib/jam_ruby/models/band.rb | 32 +--- .../images/shared/avatar_generic_band.png | Bin 0 -> 4884 bytes web/app/assets/javascripts/band_setup.js | 156 ++++++++++++++++++ web/app/assets/javascripts/createSession.js | 27 +-- web/app/assets/javascripts/friendSelector.js | 9 +- web/app/assets/javascripts/jam_rest.js | 22 +++ web/app/assets/javascripts/utils.js | 4 + .../{bandProfile.css.scss => band.css.scss} | 17 ++ web/app/assets/stylesheets/client/client.css | 2 +- .../stylesheets/client/content.css.scss | 2 +- web/app/controllers/api_bands_controller.rb | 2 +- web/app/views/clients/_band_setup.html.erb | 122 ++++++++++++++ web/app/views/clients/_createSession.html.erb | 2 - web/app/views/clients/index.html.erb | 12 +- web/app/views/users/_user_dropdown.html.erb | 1 + 16 files changed, 365 insertions(+), 47 deletions(-) create mode 100644 web/app/assets/images/shared/avatar_generic_band.png create mode 100644 web/app/assets/javascripts/band_setup.js rename web/app/assets/stylesheets/client/{bandProfile.css.scss => band.css.scss} (92%) create mode 100644 web/app/views/clients/_band_setup.html.erb diff --git a/ruby/.gitignore b/ruby/.gitignore index a35fe92d7..be1654c09 100644 --- a/ruby/.gitignore +++ b/ruby/.gitignore @@ -15,7 +15,7 @@ spec/reports test/tmp test/version_tmp tmp - +vendor .idea *~ *.swp diff --git a/ruby/lib/jam_ruby/models/band.rb b/ruby/lib/jam_ruby/models/band.rb index d853050b7..50f18486c 100644 --- a/ruby/lib/jam_ruby/models/band.rb +++ b/ruby/lib/jam_ruby/models/band.rb @@ -131,34 +131,22 @@ module JamRuby end # name - unless name.nil? - band.name = name - end + band.name = name unless name.nil? # website - unless website.nil? - band.website = website - end + band.website = website unless website.nil? # biography - unless biography.nil? - band.biography = biography - end + band.biography = biography unless biography.nil? # city - unless city.nil? - band.city = city - end + band.city = city unless city.nil? # state - unless state.nil? - band.state = state - end + band.state = state unless state.nil? # country - unless country.nil? - band.country = country - end + band.country = country unless country.nil? # genres unless genres.nil? @@ -177,14 +165,10 @@ module JamRuby end # photo url - unless photo_url.nil? - band.photo_url = photo_url - end + band.photo_url = photo_url unless photo_url.nil? # logo url - unless logo_url.nil? - band.logo_url = logo_url - end + band.logo_url = logo_url unless logo_url.nil? band.updated_at = Time.now.getutc band.save diff --git a/web/app/assets/images/shared/avatar_generic_band.png b/web/app/assets/images/shared/avatar_generic_band.png new file mode 100644 index 0000000000000000000000000000000000000000..4a883b00431dbd85c2d56dcb814b40b16ae9d6ff GIT binary patch literal 4884 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 +
+
+
+ <%= image_tag "content/icon_bands.png", :size => "19x19" %> +
+ +

set up band

+ + <%= render "screen_navigation" %> +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
+

Step 1: General Information

+ 		+ + <%= image_tag "shared/avatar_generic_band.png", {:id => "band-avatar", :align=>"absmiddle", :height => 88, :width => 88 } %> + +

+ Upload Band Photo

+
Band Name:
+
+ 		Web Site:
+ +
Country:
+

+ 		State/Region:
+

+ 		City:
+

+
Genres:
+
+
+
+ 		Description / Bio:
+ +
+
+
+ CANCEL   + NEXT +
+
+ +
+
+ +
+
+ + + + \ No newline at end of file diff --git a/web/app/views/clients/_createSession.html.erb b/web/app/views/clients/_createSession.html.erb index 6b508df6c..f4bf56b7b 100644 --- a/web/app/views/clients/_createSession.html.erb +++ b/web/app/views/clients/_createSession.html.erb @@ -169,8 +169,6 @@ -<%= render "friendSelector" %> - + + + diff --git a/web/app/views/clients/_band_setup.html.erb b/web/app/views/clients/_band_setup.html.erb index c29920c29..581178ef5 100644 --- a/web/app/views/clients/_band_setup.html.erb +++ b/web/app/views/clients/_band_setup.html.erb @@ -29,31 +29,37 @@ Band Name:
-
+
Web Site:
- + Country:
-

+

State/Region:
-

+

City:
-

+

Genres:
-
+
Description / Bio:
- + @@ -112,7 +118,7 @@