From e76244c36085dc7841e05a158d146529c4ffb439 Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Tue, 31 Dec 2013 23:24:10 -0500 Subject: [PATCH 1/7] VRFS-940 Change Avatar link borked. Add in avatar. --- web/app/assets/javascripts/accounts_profile.js | 1 + .../assets/stylesheets/client/account.css.scss | 17 ++++++++++++----- web/app/views/clients/_account_profile.html.erb | 16 +++++++++------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/web/app/assets/javascripts/accounts_profile.js b/web/app/assets/javascripts/accounts_profile.js index 85491c39c..615bdf708 100644 --- a/web/app/assets/javascripts/accounts_profile.js +++ b/web/app/assets/javascripts/accounts_profile.js @@ -36,6 +36,7 @@ city: userDetail.city, first_name: userDetail.first_name, last_name: userDetail.last_name, + photoUrl: context.JK.resolveAvatarUrl(userDetail.photo_url), user_instruments: userDetail.instruments, birth_date : userDetail.birth_date, gender: userDetail.gender, diff --git a/web/app/assets/stylesheets/client/account.css.scss b/web/app/assets/stylesheets/client/account.css.scss index 93967f182..c6410266f 100644 --- a/web/app/assets/stylesheets/client/account.css.scss +++ b/web/app/assets/stylesheets/client/account.css.scss @@ -59,7 +59,15 @@ } .account-profile { - padding-top:25px; + padding-top:20px; + + .avatar_large { + position:absolute; + float:none; + top: -36px; + right:0; + margin-right:20%; + } h2 { margin-bottom:15px; @@ -67,17 +75,16 @@ .location { position:relative; + padding-top:25px; } #account-change-avatar { - position:absolute; - top:-27px; - right:72px; height:13px; + float:right; + margin-right:17%; } .birth_date { - margin-left:40px; } } diff --git a/web/app/views/clients/_account_profile.html.erb b/web/app/views/clients/_account_profile.html.erb index e301ae4e5..982493710 100644 --- a/web/app/views/clients/_account_profile.html.erb +++ b/web/app/views/clients/_account_profile.html.erb @@ -30,7 +30,9 @@

profile:

+ Change Avatar +
@@ -54,19 +56,19 @@
-
+
-
+
- +

-
+
-
+
<%= date_select("user", "birth_date", :use_short_month => true, :start_year => 1900, :end_year => Time.now.year - 18, :order => [:month, :day, :year], :default => -25.years.from_now) %>
@@ -100,9 +102,9 @@ CANCEL  UPDATE PROFILE
- -
+
+
From c00267f31caee505a7181f8f54f6290a7b4bf5a1 Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Wed, 1 Jan 2014 15:41:40 -0500 Subject: [PATCH 2/7] VRFS-948 / VRFS-930 / VRFS-931 Formatting updates Will possibly need to revisit in the context of 294 --- .../assets/stylesheets/client/band.css.scss | 3 - .../stylesheets/client/content.css.scss | 11 ++++ .../stylesheets/client/musician.css.scss | 11 +--- .../stylesheets/client/profile.css.scss | 1 + .../stylesheets/client/screen_common.css.scss | 3 +- web/app/views/clients/_bands.html.erb | 10 +-- web/app/views/clients/_musicians.html.erb | 12 ++-- web/app/views/clients/_web_filter.html.erb | 63 +++++++++++-------- 8 files changed, 63 insertions(+), 51 deletions(-) diff --git a/web/app/assets/stylesheets/client/band.css.scss b/web/app/assets/stylesheets/client/band.css.scss index 63152401a..814fed92f 100644 --- a/web/app/assets/stylesheets/client/band.css.scss +++ b/web/app/assets/stylesheets/client/band.css.scss @@ -273,9 +273,6 @@ #band-filter-results { margin: 0 10px 5px 10px; - overflow: auto; - height: 100%; - width: 100%; } .band-list-result { diff --git a/web/app/assets/stylesheets/client/content.css.scss b/web/app/assets/stylesheets/client/content.css.scss index 168845843..ae75f3fc7 100644 --- a/web/app/assets/stylesheets/client/content.css.scss +++ b/web/app/assets/stylesheets/client/content.css.scss @@ -88,6 +88,17 @@ } } } + + .filter-head { + position: absolute; + padding:11px 0; + } + .filter-body { + height:100%; + width:100%; + box-sizing: border-box; + padding-top: 54px; + } } .result-list-button-wrapper { diff --git a/web/app/assets/stylesheets/client/musician.css.scss b/web/app/assets/stylesheets/client/musician.css.scss index fc78eefa3..b9e47e290 100644 --- a/web/app/assets/stylesheets/client/musician.css.scss +++ b/web/app/assets/stylesheets/client/musician.css.scss @@ -22,14 +22,11 @@ #musician-filter-results { margin: 0 10px 0px 10px; - overflow: auto; - height: 100%; -// width: 100%; } .musician-wrapper { -// overflow: auto; -// height: 480px; + overflow: initial; + height: initial; width: 100%; } @@ -37,12 +34,8 @@ padding-top: 5px; padding-right: 5px; padding-left: 5px; - box-sizing:border-box; } -#session-controls.musician-filter { - padding-top: 6px; -} .musician-following { overflow: auto; } diff --git a/web/app/assets/stylesheets/client/profile.css.scss b/web/app/assets/stylesheets/client/profile.css.scss index ef0a772dd..f2ec34e60 100644 --- a/web/app/assets/stylesheets/client/profile.css.scss +++ b/web/app/assets/stylesheets/client/profile.css.scss @@ -196,6 +196,7 @@ position:relative; margin:10px 0px 10px 0px; padding-bottom:5px; + box-sizing:border-box; } .profile-social-left { diff --git a/web/app/assets/stylesheets/client/screen_common.css.scss b/web/app/assets/stylesheets/client/screen_common.css.scss index 0edcc5c43..98fd15a4b 100644 --- a/web/app/assets/stylesheets/client/screen_common.css.scss +++ b/web/app/assets/stylesheets/client/screen_common.css.scss @@ -42,7 +42,8 @@ } } -.content { +.content, +.inner-content { clear: both; float: left; height: 100%; diff --git a/web/app/views/clients/_bands.html.erb b/web/app/views/clients/_bands.html.erb index 6e82eb331..2dc713b39 100644 --- a/web/app/views/clients/_bands.html.erb +++ b/web/app/views/clients/_bands.html.erb @@ -7,11 +7,11 @@ <%= render "screen_navigation" %> <% end -%> <%= content_tag(:div, :class => 'content-body') do -%> - <%= content_tag(:div, :class => 'content-body-scroller') do -%> - <%= form_tag('', :id => 'find-band-form') do -%> - <%= content_tag(:div, render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_BAND}), :class => 'band-filter', :id => 'session-controls') %> - <%= content_tag(:div, :class => 'content-scroller') do -%> - <%= content_tag(:div, content_tag(:div, '', :id => 'band-filter-results', :class => 'filter-results'), :class => 'content-wrapper band-wrapper') %> + <%= form_tag('', {:id => 'find-band-form', :class => 'inner-content'}) do -%> + <%= render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_BAND}) %> + <%= content_tag(:div, :class => 'filter-body') do %> + <%= content_tag(:div, :class => 'content-body-scroller') do -%> + <%= content_tag(:div, content_tag(:div, '', :id => 'band-filter-results', :class => 'filter-results'), :class => 'content-wrapper') %> <% end -%> <% end -%> <% end -%> diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb index 115aba151..0df6f6e06 100644 --- a/web/app/views/clients/_musicians.html.erb +++ b/web/app/views/clients/_musicians.html.erb @@ -7,11 +7,11 @@ <%= render "screen_navigation" %> <% end -%> <%= content_tag(:div, :class => 'content-body') do -%> - <%= content_tag(:div, :class => 'content-body-scroller') do -%> - <%= form_tag('', :id => 'find-musician-form') do -%> - <%= content_tag(:div, render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_MUSICIAN}), :class => 'musician-filter', :id => 'session-controls') %> - <%= content_tag(:div, :class => 'content-scroller') do -%> - <%= content_tag(:div, content_tag(:div, '', :id => 'musician-filter-results'), :class => 'content-wrapper musician-wrapper') %> + <%= form_tag('', {:id => 'find-musician-form', :class => 'inner-content'}) do -%> + <%= render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_MUSICIAN}) %> + <%= content_tag(:div, :class => 'filter-body') do %> + <%= content_tag(:div, :class => 'content-body-scroller') do -%> + <%= content_tag(:div, content_tag(:div, '', :id => 'musician-filter-results', :class => 'filter-results'), :class => 'content-wrapper musician-wrapper') %> <% end -%> <% end -%> <% end -%> @@ -22,7 +22,7 @@