From 141ee5f2e73a53de0142b1e8d227415b2d4351ac Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Sat, 6 Jun 2015 10:17:32 -0500 Subject: [PATCH] VRFS-3247 : Band Summary - About * Layout and styling for musical experience, performance samples, online presence, and current interests. * Refactor online presence icons into slim partial and use from both musician and band profile * Refactor performance sample icons into slim partial and use from both musician and band profile. * Hook up buttons: edit, delete, invite, edit bio. --- web/app/assets/javascripts/bandProfile.js | 14 ++- .../assets/stylesheets/client/band.css.scss | 50 +++++++--- .../stylesheets/client/profile.css.scss | 34 ++++--- web/app/views/clients/_bandProfile.html.erb | 92 ++++++++++++++++--- web/app/views/clients/_profile.html.erb | 50 +--------- ..._profile_summary_online_presence.html.slim | 26 ++++++ ...file_summary_performance_samples.html.slim | 11 +++ 7 files changed, 193 insertions(+), 84 deletions(-) create mode 100644 web/app/views/clients/_profile_summary_online_presence.html.slim create mode 100644 web/app/views/clients/_profile_summary_performance_samples.html.slim diff --git a/web/app/assets/javascripts/bandProfile.js b/web/app/assets/javascripts/bandProfile.js index 22e735f40..a2dd98891 100644 --- a/web/app/assets/javascripts/bandProfile.js +++ b/web/app/assets/javascripts/bandProfile.js @@ -21,6 +21,7 @@ // hide until we know if 'isMember' $("#btn-follow-band").hide(); $("#btn-edit-band-profile").hide(); + $("#btn-edit-band-bio").hide(); $("#btn-edit-band-info").hide(); $("#btn-edit-band-members").hide(); $("#btn-edit-band-delete").hide(); @@ -143,6 +144,7 @@ if (isMember) { $("#btn-follow-band").hide(); $("#btn-edit-band-profile").show(); + $("#btn-edit-band-bio").show(); $("#btn-edit-band-info").show(); $("#btn-edit-band-members").show(); if (isAdmin) { @@ -150,6 +152,7 @@ } } else { $("#btn-follow-band").show(); + $("#btn-edit-band-bio").hide(); $("#btn-edit-band-profile").hide(); $("#btn-edit-band-info").hide(); $("#btn-edit-band-members").hide(); @@ -212,9 +215,9 @@ $('#band-profile-website').text(band.website); } - profileUtils.renderMusicalExperience(band, $("#bandProfile")) - profileUtils.renderPerformanceSamples(band, $("#bandProfile"), isAdmin) - profileUtils.renderOnlinePresence(band, $("#bandProfile"), isAdmin) + // profileUtils.renderMusicalExperience(band, $("#bandProfile")) + // profileUtils.renderPerformanceSamples(band, $("#bandProfile"), isAdmin) + // profileUtils.renderOnlinePresence(band, $("#bandProfile"), isAdmin) //renderInterests() // wire up Follow click @@ -430,6 +433,7 @@ $divMember.remove(); if (userId == context.JK.currentUserId) { $('#btn-edit-band-profile').hide(); + $('#btn-edit-band-bio').hide(); $('#btn-edit-band-info').hide(); $('#btn-edit-band-members').hide(); $('.btn-remove-member').each(function(idx) { $(this).hide(); }); @@ -486,6 +490,10 @@ context.location = "/client#/band/setup/" + bandId + '/step1'; return false; }); + $("#btn-edit-band-bio").unbind('click').click(function() { + context.location = "/client#/band/setup/" + bandId + '/step0'; + return false; + }); $("#btn-edit-band-members").unbind('click').click(function() { context.location = "/client#/band/setup/" + bandId + '/step2'; return false; diff --git a/web/app/assets/stylesheets/client/band.css.scss b/web/app/assets/stylesheets/client/band.css.scss index 8cc2c147a..82fd2799b 100644 --- a/web/app/assets/stylesheets/client/band.css.scss +++ b/web/app/assets/stylesheets/client/band.css.scss @@ -15,6 +15,16 @@ } } + + + table.summary-table { + tr { + td { + padding-right: 1em; + } + } + } + // Mimic style of easydropdown selects: input[type="number"] { border-radius: 6px; @@ -43,18 +53,7 @@ } } - tr:nth-child(even) td { - padding-bottom: 1em; - } - - td.band-biography, td.tdBandGenres { - height:100%; - vertical-align: top; - #band-biography { - - } - } - + .band-setup-genres { width:100%; @@ -190,6 +189,20 @@ border-radius:44px; } + + .band-entry { + .item-caption { + font-size: 1.4em; + font-weight: bold; + margin: 0.25em 0em 0.25em 0em; + } + .item-content { + font-size: 1.1em; + margin: 0.25em 0em 0.25em 0em; + } + margin: 0em 0em 1.0em 0em; + } + // .band-name, .band-photo { // display: inline; // } @@ -392,6 +405,19 @@ table.band-form-table { width: 100%; margin: 1em; + + tr:nth-child(even) td { + padding-bottom: 1em; + } + + td.band-biography, td.tdBandGenres { + height:100%; + vertical-align: top; + #band-biography { + + } + } + } .easydropdown { diff --git a/web/app/assets/stylesheets/client/profile.css.scss b/web/app/assets/stylesheets/client/profile.css.scss index 5328a80c2..6641eac24 100644 --- a/web/app/assets/stylesheets/client/profile.css.scss +++ b/web/app/assets/stylesheets/client/profile.css.scss @@ -12,7 +12,10 @@ div.logo, div.item { text-align: bottom; - margin-left: 1em; + } + + .online-presence-option, .performance-sample-option { + margin-right: 1em; } img.logo { @@ -35,11 +38,11 @@ } .profile-body { - + } .profile-header { padding:10px 20px; - position: relative; + position: relative; } .profile-header h2 { @@ -49,11 +52,20 @@ margin: 0px 0px 0px 0px; } -.profile-about-right .section-header { - font-weight:600; - font-size:18px; - float:left; - margin: 0px 0px 10px 0px; +.profile-about-right { + .section-header { + font-weight:600; + font-size:18px; + float:left; + margin: 0px 0px 10px 0px; + } + + .section-content { + font-weight:normal; + font-size:1.2em; + float:left; + margin: 0px 0px 10px 0px; + } } .profile-details { @@ -241,7 +253,7 @@ -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing:border-box; - + .result-name { font-size: 12px; font-weight: bold; @@ -267,11 +279,11 @@ height:24px; width:24px; margin-right:2px; - + &:last-child { margin-right:0px; } - + } } .button-row { diff --git a/web/app/views/clients/_bandProfile.html.erb b/web/app/views/clients/_bandProfile.html.erb index 1a51223bd..4bf6b3102 100644 --- a/web/app/views/clients/_bandProfile.html.erb +++ b/web/app/views/clients/_bandProfile.html.erb @@ -14,12 +14,17 @@

+
+ EDIT PROFILE + INVITE + DELETE +
FOLLOW - EDIT PROFILE +


@@ -43,7 +48,7 @@
-
+

Location:





Stats:


@@ -51,19 +56,82 @@

-
-
- EDIT - INVITE - DELETE + + +
+
+
Bio
+
+
+ Edit Bio +
-

-

-
-


+ +
+
+
Musical Experience
+
+ + + + + + + + + + + + + + + + + +
Genres:Genres
Concert Gigs:
Status:
Type:
+
+
-
+ +
+
+
Performance Samples
+
+ <%=render "profile_summary_performance_samples" %> +
+
+
+ +
+
+
Online Presence
+
+ <%=render "profile_summary_online_presence" %> +
+
+
+ + +
+
+
Current Interests
+
    +
  • + Our band is looking for new members who play our genre(s) of music and can play the following: + +
    • +
  • + Our band is available for hire to perform at concerts and events for + +
    • +
  • + Our band is available to perform at concerts and events at no charge as we are currently building our live performance experience. +
    • +
+
+
+
diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb index 2bbc22804..52e3b459a 100644 --- a/web/app/views/clients/_profile.html.erb +++ b/web/app/views/clients/_profile.html.erb @@ -99,20 +99,9 @@
Performance Samples

-
None specified
- - - - - - + <%=render "profile_summary_performance_samples" %> +
Add Recordings

@@ -120,39 +109,8 @@
Online Presence

-
None specified
- - - - - - - - - - - - - - - - + + <%=render "profile_summary_online_presence" %>
Add Sites
diff --git a/web/app/views/clients/_profile_summary_online_presence.html.slim b/web/app/views/clients/_profile_summary_online_presence.html.slim new file mode 100644 index 000000000..ec7b48f42 --- /dev/null +++ b/web/app/views/clients/_profile_summary_online_presence.html.slim @@ -0,0 +1,26 @@ +#no-online-presence.left.online-presence-option + | None specified +#user-website.left.logo.online-presence-option + a rel="external" + img.logo src="/assets/content/website-logo.png" +#soundcloud-presence.left.logo.online-presence-option + a rel="external" + img.logo src="/assets/content/soundcloud-logo.png" +#reverbnation-presence.left.logo.online-presence-option + a rel="external" + img.logo src="/assets/content/reverbnation-logo.png" +#bandcamp-presence.left.logo.online-presence-option + a rel="external" + img.logo src="/assets/content/bandcamp-logo.png" +#fandalism-presence.left.logo.online-presence-option + a rel="external" + img.logo src="/assets/content/fandalism-logo.png" +#youtube-presence.left.logo.online-presence-option + a rel="external" + img.logo src="/assets/content/youtube-logo.png" +#facebook-presence.left.logo.online-presence-option + a rel="external" + img.logo src="/assets/content/facebook-logo.png" +#twitter-presence.left.logo.online-presence-option + a rel="external" + img.logo src="/assets/content/twitter-logo.png" diff --git a/web/app/views/clients/_profile_summary_performance_samples.html.slim b/web/app/views/clients/_profile_summary_performance_samples.html.slim new file mode 100644 index 000000000..03fba205c --- /dev/null +++ b/web/app/views/clients/_profile_summary_performance_samples.html.slim @@ -0,0 +1,11 @@ +#no-samples.left.performance-sample-option None specified +#jamkazam-samples.left.logo.performance-sample-option + img.logo src="/assets/header/logo.png" + br/ +#soundcloud-samples.left.logo.performance-sample-option + img.logo src="/assets/content/soundcloud-logo.png" + br/ +#youtube-samples.left.logo.performance-sample-option + img.logo src="/assets/content/youtube-logo.png" + br/ +