From 9c6ccee6f0aa4abb9fd5cc21dd43e112afe5923d Mon Sep 17 00:00:00 2001 From: Daniel Weigh Date: Fri, 20 Dec 2013 07:04:58 -0500 Subject: [PATCH] VRFS-294 Adjustments to HTML/ CSS. --- web/app/assets/javascripts/findMusician.js | 4 +- .../assets/stylesheets/client/common.css.scss | 3 + .../stylesheets/client/content-orig.css.scss | 382 ++++++++++++++++++ .../stylesheets/client/content.css.scss | 159 +++++--- .../stylesheets/client/createSession.css.scss | 18 +- .../stylesheets/client/musician.css.scss | 31 +- .../stylesheets/client/profile.css.scss | 6 +- .../assets/stylesheets/client/search.css.scss | 4 +- web/app/views/clients/_account.html.erb | 220 +++++----- .../clients/_account_audio_profile.html.erb | 4 +- .../views/clients/_account_identity.html.erb | 4 +- .../views/clients/_account_profile.html.erb | 4 +- web/app/views/clients/_band_setup.html.erb | 235 +++++------ web/app/views/clients/_bands.html.erb | 12 +- web/app/views/clients/_createSession.html.erb | 294 +++++++------- web/app/views/clients/_feed.html.erb | 18 +- web/app/views/clients/_findSession.html.erb | 68 ++-- .../views/clients/_musician_filter.html.erb | 46 ++- web/app/views/clients/_musicians.html.erb | 26 +- web/app/views/clients/_profile.html.erb | 161 ++++---- web/app/views/clients/_web_filter.html.erb | 58 ++- 21 files changed, 1107 insertions(+), 650 deletions(-) create mode 100644 web/app/assets/stylesheets/client/content-orig.css.scss diff --git a/web/app/assets/javascripts/findMusician.js b/web/app/assets/javascripts/findMusician.js index 7c1e2e93a..7363ed50f 100644 --- a/web/app/assets/javascripts/findMusician.js +++ b/web/app/assets/javascripts/findMusician.js @@ -111,7 +111,7 @@ } var actionVals = { profile_url: "/#/profile/" + mm.id, - button_friend: mm['is_friend'] ? '' : 'button-orance', + button_friend: mm['is_friend'] ? '' : 'button-orange', button_follow: mm['is_following'] ? '' : 'button-orange', button_message: 'button-orange' }; @@ -233,4 +233,4 @@ return this; }; -})(window,jQuery); \ No newline at end of file +})(window,jQuery); diff --git a/web/app/assets/stylesheets/client/common.css.scss b/web/app/assets/stylesheets/client/common.css.scss index c75f35e17..67a0950f3 100644 --- a/web/app/assets/stylesheets/client/common.css.scss +++ b/web/app/assets/stylesheets/client/common.css.scss @@ -34,5 +34,8 @@ $text: #f3f1ee; $gradient-diff: 30%; $link: $color8; $border: hsl(210, 50%, 45%); +$narrow-screen: 1000px; // 990 ? 1000 ? +$short-screen: 600px; // toolbars / chrome for x768 + diff --git a/web/app/assets/stylesheets/client/content-orig.css.scss b/web/app/assets/stylesheets/client/content-orig.css.scss new file mode 100644 index 000000000..039a9e928 --- /dev/null +++ b/web/app/assets/stylesheets/client/content-orig.css.scss @@ -0,0 +1,382 @@ +/* This is simply Jeff's content.css file */ +@charset "UTF-8"; +#content { + background-color: #353535; + border: 1px solid #ed3618; + clear: both; + float: left; + margin-top: 39px; + height: auto; + width: auto; + position:relative; + padding-bottom:3px; +} + +.content-head { + height:21px; + padding:4px; + background-color:#ED3618; +} + +.content-icon { + margin-right:10px; + float:left; +} + +.content-head h1 { + margin: -6px 0px 0px 0px; + padding:0; + float:left; + font-weight:100; + font-size:24px; +} + +.content-nav { + float:right; + margin-right:10px; +} + +.home-icon { + float:left; + margin-right:20px; +} + +.content-nav a.arrow-right { + float:left; + display:block; + margin-top:2px; + margin-right:10px; + width: 0; + height: 0; + border-top: 7px solid transparent; + border-bottom: 7px solid transparent; + border-left: 7px solid #FFF; +} + +.content-nav a.arrow-left { + float:left; + display:block; + margin-top:2px; + margin-right:20px; + width: 0; + height: 0; + border-top: 7px solid transparent; + border-bottom: 7px solid transparent; + border-right:7px solid #FFF; +} + +#content-scroller, .content-scroller { + height:inherit; + position:relative; + display:block; + overflow:auto; +} + +.content-wrapper { + padding:10px 30px 10px 36px; + font-size:15px; + color:#ccc; + border-bottom: dotted 1px #444; + overflow-x:hidden; + white-space:nowrap; +} + +.create-session-left { + width:50%; + float:left; +} + +.create-session-right { + width:45%; + float:right; + font-size:13px; +} + +.content-wrapper h2 { + color:#fff; + font-weight:600; + font-size:24px; +} + +.content-wrapper select, .content-wrapper textarea, .content-wrapper input[type=text], .content-wrapper input[type=password], div.friendbox, .ftue-inner input[type=text], .ftue-inner input[type=password], .dialog-inner textarea, .dialog-inner input[type=text] { + font-family:"Raleway", arial, sans-serif; + background-color:#c5c5c5; + border:none; + -webkit-box-shadow: inset 2px 2px 3px 0px #888; + box-shadow: inset 2px 2px 3px 0px #888; + color:#666; +} + +.create-session-description { + padding:5px; + width:100%; + height:80px; +} + +.friendbox { + padding:5px; + width:100%; + height:60px; +} + +.invite-friend { + margin:0px 4px 4px 4px; + float:left; + display:block; + background-color:#666; + color:#fff; + font-size:12px; + -webkit-border-radius: 7px; + border-radius: 7px; + padding:2px 2px 2px 4px; +} + +.content-wrapper div.friendbox input[type=text] { + -webkit-box-shadow: inset 0px 0px 0px 0px #888; + box-shadow: inset 0px 0px 0px 0px #888; + color:#666; + font-style:italic; +} + +#genrelist, #musicianlist { + position:relative; + z-index:99; + width: 175px; + -webkit-border-radius: 6px; + border-radius: 6px; + background-color:#C5C5C5; + border: none; + color:#333; + font-weight:400; + padding:0px 0px 0px 8px; + height:20px; + line-height:20px; + overflow:hidden; + -webkit-box-shadow: inset 2px 2px 3px 0px #888; + box-shadow: inset 2px 2px 3px 0px #888; +} + +#musicianlist, .session-controls #genrelist { + width: 150px; +} + +#genrelist a, #musicianlist a { + color:#333; + text-decoration:none; +} + +.genre-wrapper, .musician-wrapper { + float:left; + width:175px; + height:127px; + overflow:auto; +} + +.musician-wrapper, .session-controls .genre-wrapper { + width:150px; +} + +.genrecategory { + font-size:11px; + float:left; + width:135px; +} + +.filtercategory, .session-controls .genrecategory { + font-size:11px; + float:left; + width:110px; +} + +a.arrow-up { + float:right; + margin-right:5px; + display:block; + margin-top:6px; + width: 0; + height: 0; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #333; +} + +a.arrow-down { + float:right; + margin-right:5px; + display:block; + margin-top:6px; + width: 0; + height: 0; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-top: 7px solid #333; +} + +.settings-session-description { + padding:10px; + width:300px; +} + +#session-controls { + width:100%; + padding:11px 0px 11px 0px; + background-color:#4c4c4c; + min-height:20px; + overflow-x:hidden; + } + +#session-controls .searchbox { + float:left; + width:140px; + margin-left: 10px; + -webkit-border-radius: 6px; + border-radius: 6px; + background-color:#C5C5C5; + border: none; + color:#333; + font-weight:400; + padding:0px 0px 0px 8px; + height:20px; + line-height:20px; + overflow:hidden; + -webkit-box-shadow: inset 2px 2px 3px 0px #888; + box-shadow: inset 2px 2px 3px 0px #888; +} + +#session-controls input[type=text] { + background-color:#c5c5c5; + border:none; + color:#666; +} + +.avatar-tiny { + float:left; + padding:1px; + width:24px; + height:24px; + background-color:#ed3618; + -webkit-border-radius:12px; + -moz-border-radius:12px; + border-radius:12px; +} + +.ftue-background { + background-image:url(../images/content/bkg_ftue.jpg); + background-repeat:no-repeat; + background-size:cover; + min-height:475px; + min-width:672px; +} + +table.generaltable { + background-color: #262626; + border: 1px solid #4D4D4D; + color: #FFFFFF; + font-size: 11px; + margin-top: 6px; + width: 100%; + + th { + background-color: #4D4D4D; + border-right: 1px solid #333333; + font-weight: 300; + padding: 6px; + } + + td { + border-right: 1px solid #333333; + border-top: 1px solid #333333; + padding: 9px 5px 5px; + vertical-align: top; + white-space: normal; + } + + .noborder { + border-right: medium none; + } +} + +ul.shortcuts { + border:1px solid #ED3618; + + li { + margin:0; + height:20px; + line-height:20px; + padding:2px; + } + + .account-home, .band-setup, .audio, .get-help, .download-app, .invite-friends { + border-bottom:1px; + border-style:solid; + border-color:#ED3618; + } + + span.arrow-right { + display:inline-block; + width: 0; + height: 0; + border-top: 4px solid transparent; + border-bottom: 4px solid transparent; + border-left: 4px solid #FFCC00; + padding-left:5px; + } + + ul.shortcuts-submenu { + display:none; + + li { + margin:0; + height:20px; + line-height:20px; + padding:2px; + color:#FFCC00; + } + + li.google-invite, li.email-invite { + padding-left:9px; + } + + } +} + +.tagline { + font-size:30px; + margin-top:35px; + color:#ed3718; + font-weight:300; + width:345px; + clear:left; + white-space:normal; +} + +.smallbutton { + font-size:10px !important; + padding:2px 8px !important; +} + +.whitespace { + white-space:normal; +} + +.w0 {width:0% !important} +.w5 {width:5% !important} +.w10 {width:10% !important} +.w15 {width:15% !important} +.w20 {width:20% !important} +.w25 {width:25% !important} +.w30 {width:30% !important} +.w35 {width:35% !important} +.w40 {width:40% !important} +.w45 {width:45% !important} +.w50 {width:50% !important} +.w55 {width:55% !important} +.w60 {width:60% !important} +.w65 {width:65% !important} +.w70 {width:70% !important} +.w75 {width:75% !important} +.w80 {width:80% !important} +.w85 {width:85% !important} +.w90 {width:90% !important} +.w95 {width:95% !important} +.w100 {width:100% !important} diff --git a/web/app/assets/stylesheets/client/content.css.scss b/web/app/assets/stylesheets/client/content.css.scss index 2c7d100e8..44fa0178e 100644 --- a/web/app/assets/stylesheets/client/content.css.scss +++ b/web/app/assets/stylesheets/client/content.css.scss @@ -1,5 +1,7 @@ -/* This is simply Jeff's content.css file */ -@charset "UTF-8"; +/* This is Daniel's content.css file */ +/* Common styles used in screens */ +@import "client/common.css.scss";@charset "UTF-8"; + #content { background-color: #353535; border: 1px solid #ed3618; @@ -12,58 +14,96 @@ padding-bottom:3px; } -.content-head { - height:21px; - padding:4px; - background-color:#ED3618; +/* Daniel's tweaks */ +.screen, .screen .content { + .content-head { + position: absolute; + height:21px; + padding:4px 0; + width:100%; + background-color:$ColorScreenPrimary; + + .content-icon { + margin: -1px 10px 0 4px; + float:left; + } + + .content-nav { + float:right; + margin-right:10px; + + a { + &.arrow-right, + &.arrow-left { + float:left; + display:block; + margin-top:2px; + width: 0; + height: 0; + border-top: 7px solid transparent; + border-bottom: 7px solid transparent; + } + &.arrow-right { + margin-right:10px; + border-left: 7px solid #FFF; + } + &.arrow-left { + margin-right:20px; + border-right:7px solid #FFF; + } + + } + } + + h1 { + margin: -3px 0px 0px 0px; + padding:0; + float:left; + font-weight:100; + font-size:24px; + } + } + .content-body { + height:100%; + width:100%; + box-sizing: border-box; + padding-top: 29px; + + .content-body-scroller { + height:inherit; + position:relative; + display:block; + overflow:auto; +// padding: 10px 35px; + + @media screen and (max-width: $narrow-screen) { +// padding: 10px 20px; + } + + &.outer { + overflow: hidden; + > * { + height:inherit; + } + } + } + } } -.content-icon { - margin-right:10px; - float:left; +.result-list-button-wrapper { + margin-top: 10px; + margin-bottom: 10px; + > a.smallbutton { + margin: 2px; + } } -.content-head h1 { - margin: -6px 0px 0px 0px; - padding:0; - float:left; - font-weight:100; - font-size:24px; -} - -.content-nav { - float:right; - margin-right:10px; -} .home-icon { float:left; margin-right:20px; } -.content-nav a.arrow-right { - float:left; - display:block; - margin-top:2px; - margin-right:10px; - width: 0; - height: 0; - border-top: 7px solid transparent; - border-bottom: 7px solid transparent; - border-left: 7px solid #FFF; -} - -.content-nav a.arrow-left { - float:left; - display:block; - margin-top:2px; - margin-right:20px; - width: 0; - height: 0; - border-top: 7px solid transparent; - border-bottom: 7px solid transparent; - border-right:7px solid #FFF; -} #content-scroller, .content-scroller { height:inherit; @@ -72,25 +112,14 @@ overflow:auto; } -.content-wrapper { - padding:10px 30px 10px 36px; - font-size:15px; - color:#ccc; - border-bottom: dotted 1px #444; - overflow-x:hidden; - white-space:nowrap; -} - -.create-session-left { - width:50%; - float:left; -} - -.create-session-right { - width:45%; - float:right; - font-size:13px; -} +//.content-wrapper { +// padding:10px 30px 10px 36px; +// font-size:15px; +// color:#ccc; +// border-bottom: dotted 1px #444; +// overflow-x:hidden; +// white-space:nowrap; +//} .content-wrapper h2 { color:#fff; @@ -222,7 +251,7 @@ a.arrow-down { padding:11px 0px 11px 0px; background-color:#4c4c4c; min-height:20px; - overflow-x:hidden; + overflow-x:scroll; } #session-controls .searchbox { @@ -379,4 +408,4 @@ ul.shortcuts { .w85 {width:85% !important} .w90 {width:90% !important} .w95 {width:95% !important} -.w100 {width:100% !important} \ No newline at end of file +.w100 {width:100% !important} diff --git a/web/app/assets/stylesheets/client/createSession.css.scss b/web/app/assets/stylesheets/client/createSession.css.scss index a14c37c67..f345b2ac4 100644 --- a/web/app/assets/stylesheets/client/createSession.css.scss +++ b/web/app/assets/stylesheets/client/createSession.css.scss @@ -1,25 +1,9 @@ -.create-session { - .content { - .content-head { - position:absolute; - z-index:1; - padding: 4px 0; - width:100%; - - .content-icon { - margin-left:4px; - } - } - } -} - .session-wrapper { - padding: 29px 35px 10px; + padding: 10px 35px; white-space: initial; > div.session { width: 50%; - padding-top: 10px; &.right { font-size: 13px; diff --git a/web/app/assets/stylesheets/client/musician.css.scss b/web/app/assets/stylesheets/client/musician.css.scss index 709fc7f0b..fc78eefa3 100644 --- a/web/app/assets/stylesheets/client/musician.css.scss +++ b/web/app/assets/stylesheets/client/musician.css.scss @@ -1,18 +1,35 @@ .filter-element { float:left; margin-left: 5px; + + &.wrapper { + margin-top: 5px; + &.right { + float: right; + > a { + margin-top: 3px; + } + } + } + + // @FIXME labeel is overriding from #session-controls. + &.desc { + margin-top: 3px; + padding-top: 3px; + } } + #musician-filter-results { - margin: 0 10px 5px 10px; + margin: 0 10px 0px 10px; overflow: auto; height: 100%; - width: 100%; +// width: 100%; } .musician-wrapper { - overflow: auto; - height: 480px; +// overflow: auto; +// height: 480px; width: 100%; } @@ -20,8 +37,12 @@ padding-top: 5px; padding-right: 5px; padding-left: 5px; + box-sizing:border-box; } +#session-controls.musician-filter { + padding-top: 6px; +} .musician-following { overflow: auto; -} \ No newline at end of file +} diff --git a/web/app/assets/stylesheets/client/profile.css.scss b/web/app/assets/stylesheets/client/profile.css.scss index c7f543555..ef0a772dd 100644 --- a/web/app/assets/stylesheets/client/profile.css.scss +++ b/web/app/assets/stylesheets/client/profile.css.scss @@ -1,8 +1,8 @@ @import "client/common.css.scss"; .profile-header { - padding:20px; - height:120px; + padding:10px 20px; +// height:120px; } .profile-header h2 { @@ -252,4 +252,4 @@ border-top:none; padding:3px; vertical-align:middle; -} \ No newline at end of file +} diff --git a/web/app/assets/stylesheets/client/search.css.scss b/web/app/assets/stylesheets/client/search.css.scss index 352a3b644..c1a43fe51 100644 --- a/web/app/assets/stylesheets/client/search.css.scss +++ b/web/app/assets/stylesheets/client/search.css.scss @@ -57,8 +57,8 @@ .query-distance-params { float: left; - width: 80px; - margin-left: 10px; +// width: 80px; + margin-left: 2px; border: none; } diff --git a/web/app/views/clients/_account.html.erb b/web/app/views/clients/_account.html.erb index 526d56727..86c8f43d8 100644 --- a/web/app/views/clients/_account.html.erb +++ b/web/app/views/clients/_account.html.erb @@ -1,115 +1,117 @@ +
-
- -
-
- <%= image_tag "content/icon_account.png", {:height => 18, :width => 18} %> +
+ +
+
+ <%= image_tag "content/icon_account.png", {:height => 18, :width => 18} %> +
+

my account

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

my account

- <%= render "screen_navigation" %>
- - - - - diff --git a/web/app/views/clients/_account_audio_profile.html.erb b/web/app/views/clients/_account_audio_profile.html.erb index 236bd2c8b..d1e5fc947 100644 --- a/web/app/views/clients/_account_audio_profile.html.erb +++ b/web/app/views/clients/_account_audio_profile.html.erb @@ -13,8 +13,10 @@ - diff --git a/web/app/views/clients/_account_identity.html.erb b/web/app/views/clients/_account_identity.html.erb index f99233cce..345825c42 100644 --- a/web/app/views/clients/_account_identity.html.erb +++ b/web/app/views/clients/_account_identity.html.erb @@ -13,8 +13,10 @@ - diff --git a/web/app/views/clients/_account_profile.html.erb b/web/app/views/clients/_account_profile.html.erb index 69e6903cc..e301ae4e5 100644 --- a/web/app/views/clients/_account_profile.html.erb +++ b/web/app/views/clients/_account_profile.html.erb @@ -13,8 +13,10 @@ - diff --git a/web/app/views/clients/_band_setup.html.erb b/web/app/views/clients/_band_setup.html.erb index ab8e9e77a..6cc1b644e 100644 --- a/web/app/views/clients/_band_setup.html.erb +++ b/web/app/views/clients/_band_setup.html.erb @@ -9,126 +9,127 @@ <%= render "screen_navigation" %>
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - -
-

Step 1: General Information

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

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 +
+
+
Band Name:
-
- 		Web Site:
- -
Country:
-

- 		State/Region:
-

- 		City:
-

-
Genres:
-
-
-
- 		Description / Bio:
- -
-
-
- CANCEL   - NEXT +
+
E-mail
+
+ + +
+
+ + <%= image_tag("content/icon_google.png", :size => "24x24", :align => "absmiddle") %> + +
+
Google+
+
+
+
+ BACK   + CREATE BAND +
+
- -
+
- - +
\ No newline at end of file + diff --git a/web/app/views/clients/_bands.html.erb b/web/app/views/clients/_bands.html.erb index 473ecf9bf..6e82eb331 100644 --- a/web/app/views/clients/_bands.html.erb +++ b/web/app/views/clients/_bands.html.erb @@ -6,10 +6,14 @@ <%= content_tag(:h1, 'bands') %> <%= render "screen_navigation" %> <% end -%> - <%= 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') %> + <%= 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') %> + <% end -%> + <% end -%> <% end -%> <% end -%> <% end -%> diff --git a/web/app/views/clients/_createSession.html.erb b/web/app/views/clients/_createSession.html.erb index 406e50a9d..114bcaf86 100644 --- a/web/app/views/clients/_createSession.html.erb +++ b/web/app/views/clients/_createSession.html.erb @@ -9,160 +9,164 @@

create session

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

session info

-
+

session info

+
-
-
Description:
-
- -
-
- -
-
Genre:
-
- <%= render "genreSelector" %> -
-
- -
-
Band:
-
- -
-
- -

- -
Musician Access:
-
-
- -
- -
- - -
-
- -

- -
Fan Access:
-
-
- -
- -
- - -
-
-
- -
-

invite musicians

- -
-
-
- CHOOSE FRIENDS -
-
- Start typing friends' names or: -
-
-
-
- - -
-
- -
- -
- Invite friends and contacts to join you on JamKazam from: -
-
-
-
- - <%= image_tag("content/icon_gmail.png", :size => "24x24", :align => "absmiddle") %> - -
-
E-mail
-
- - -
-
- - <%= image_tag("content/icon_google.png", :size => "24x24", :align => "absmiddle") %> - -
-
Google+
-
-
-
-
- -
-
- -
-
- I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the Creative Commons CC BY-NC-SA license in accordance with the JamKazam Terms of Service. -
-
-
-
-
+
+
Description:
- CANCEL - JAM! + +
+
+ +
+
Genre:
+
+ <%= render "genreSelector" %> +
+
+ +
+
Band:
+
+ +
+
+ +

+ +
Musician Access:
+
+
+ +
+ +
+ + +
+
+ +

+ +
Fan Access:
+
+
+ +
+ +
+ +
+ +
+

invite musicians

+ +
+
+
+ CHOOSE FRIENDS +
+
+ Start typing friends' names or: +
+
+
+
+ + +
+
+ +
+ +
+ Invite friends and contacts to join you on JamKazam from: +
+
+
+
+ + <%= image_tag("content/icon_gmail.png", :size => "24x24", :align => "absmiddle") %> + +
+
E-mail
+
+ + +
+
+ + <%= image_tag("content/icon_google.png", :size => "24x24", :align => "absmiddle") %> + +
+
Google+
+
+
+
+
+ +
+
+ +
+
+ I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the Creative Commons CC BY-NC-SA license in accordance with the JamKazam Terms of Service. +
+
+
+
+
+
+ CANCEL + JAM! +
+
+
+
+
-
-
- + +
+
diff --git a/web/app/views/clients/_feed.html.erb b/web/app/views/clients/_feed.html.erb index 5f09c1720..80b2a24b1 100644 --- a/web/app/views/clients/_feed.html.erb +++ b/web/app/views/clients/_feed.html.erb @@ -1,12 +1,18 @@
-
+
+
-
- <%= image_tag "content/icon_feed.png", {:height => 19, :width => 19} %> +
+ <%= image_tag "content/icon_feed.png", {:height => 19, :width => 19} %> +
+

feed

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

This feature not yet implemented

+
-

feed

- <%= render "screen_navigation" %>
-

This feature not yet implemented

diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb index af1d851c6..dc8a54bfb 100644 --- a/web/app/views/clients/_findSession.html.erb +++ b/web/app/views/clients/_findSession.html.erb @@ -10,43 +10,47 @@ <%= render "screen_navigation" %>
-
-
-
-
Filter Session List:
+
+
+ +
+
+
Filter Session List:
- -
- <%= render "genreSelector" %> -
+ +
+ <%= render "genreSelector" %> +
- -
- + +
+ +
+
+ REFRESH +
+
-
- REFRESH +
+
+
+ <%= render :partial => "sessionList", :locals => {:title => "sessions you're invited to", :category => "sessions-invitations"} %> +
+
+ <%= render :partial => "sessionList", :locals => {:title => "sessions with friends or bandmates", :category => "sessions-friends"} %> +
+
+ <%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %> +
+
+ + + +
+ There are currently no public sessions.
-
-
-
- <%= render :partial => "sessionList", :locals => {:title => "sessions you're invited to", :category => "sessions-invitations"} %> -
-
- <%= render :partial => "sessionList", :locals => {:title => "sessions with friends or bandmates", :category => "sessions-friends"} %> -
-
- <%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %> -
-
-
- - - -
- There are currently no public sessions.
@@ -105,4 +109,4 @@ \ No newline at end of file + diff --git a/web/app/views/clients/_musician_filter.html.erb b/web/app/views/clients/_musician_filter.html.erb index 917136950..f5650b65d 100644 --- a/web/app/views/clients/_musician_filter.html.erb +++ b/web/app/views/clients/_musician_filter.html.erb @@ -1,25 +1,29 @@ -<%= content_tag(:div, :style => "min-width:770px;") do -%> - <%= content_tag(:div, :class => 'filter-element') do -%> - <%= content_tag(:div, 'Filter By:', :class => 'filter-element', :style => "padding-top:3px;") %> - - <%= select_tag(:musician_order_by, options_for_select(Search::M_ORDERINGS), {:class => 'musician-order-by'} ) %> - <% end -%> - <%= content_tag(:div, :class => 'filter-element') do -%> +<%= content_tag(:div, :class => 'filter-element wrapper foobar') do -%> + <%= content_tag(:div, 'Filter By:', :class => 'filter-element desc') %> + + <%= select_tag(:musician_order_by, options_for_select(Search::M_ORDERINGS), {:class => 'musician-order-by'} ) %> +<% end -%> +<%= content_tag(:div, :class => "filter-element wrapper") do -%> + <%= content_tag(:div, :class => 'filter-element wrapper') do -%> - <%= content_tag(:div, 'Instrument:', :class => 'filter-element') %> - <%= content_tag(:div, :class => 'filter-element') do -%> - <%= select_tag(:musician_instrument, + <%= content_tag(:div, 'Instrumente:', :class => 'filter-element') %> + <%= select_tag(:musician_instrument, options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] }))) %> - <% end -%> - <% end -%> - - <%= content_tag(:div, :class => 'filter-element') do -%> - <%= content_tag(:div, 'Within', :class => 'filter-element') %> - <%= content_tag(:div, :class => 'query-distance-params') do -%> - <%= select_tag('musician_query_distance', options_for_select(Search::M_DISTANCE_OPTS, Search::M_MILES_DEFAULT)) %> - <% end -%> - <%= content_tag(:div, :class => 'filter-element') do -%> - miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => 'musician-filter-city') %> - <% end -%> <% end -%> <% end -%> + +<%= content_tag(:div, :class => 'filter-element wrapper') do -%> + <%= content_tag(:div, 'Within', :class => 'filter-element desc') %> + <%= content_tag(:div, :class => 'query-distance-params') do -%> + <%= select_tag('musician_query_distance', options_for_select(Search::M_DISTANCE_OPTS, Search::M_MILES_DEFAULT)) %> + <% end -%> + <%= content_tag(:div, :class => 'filter-element') do -%> + miles of <%= content_tag(:span, current_user.current_city(request.remote_ip), :id => 'musician-filter-city') %> + <% end -%> +<% end -%> +<%= content_tag(:div, +link_to('REFRESH', '#', + :id => 'btn-refresh-musicians', + :style => 'text-decoration:none', + :class => 'button-grey'), +:class => 'filter-element wrapper right mr10') %> diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb index 973b93880..115aba151 100644 --- a/web/app/views/clients/_musicians.html.erb +++ b/web/app/views/clients/_musicians.html.erb @@ -6,10 +6,14 @@ <%= content_tag(:h1, 'musicians') %> <%= render "screen_navigation" %> <% end -%> - <%= 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') %> + <%= 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') %> + <% end -%> + <% end -%> <% end -%> <% end -%> <% end -%> @@ -32,10 +36,10 @@

- {biography}
+ {biography}

-
- {musician_action_template} +
+ {musician_action_template}
@@ -48,7 +52,13 @@