From 61a745398e5f699ab1aa9b0154875efc40f1ca04 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 18 Feb 2014 01:01:14 -0500 Subject: [PATCH] VRFS-1132 fix visual issues on create session screen --- web/app/assets/javascripts/createSession.js.erb | 13 ++++--------- .../assets/stylesheets/client/jamkazam.css.scss | 14 ++++++++++---- .../stylesheets/client/screen_common.css.scss | 5 +++++ web/app/views/clients/_createSession.html.erb | 4 ++-- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/web/app/assets/javascripts/createSession.js.erb b/web/app/assets/javascripts/createSession.js.erb index 0416ed85b..c591b88b4 100644 --- a/web/app/assets/javascripts/createSession.js.erb +++ b/web/app/assets/javascripts/createSession.js.erb @@ -64,7 +64,6 @@ .unbind('blur') .attr("placeholder", "Looking up friends...") .prop('disabled', true) - // Should easily be able to grab other items out of sessionSettings and put them into the appropriate ui elements. } function validateForm() { @@ -143,14 +142,10 @@ data.genres = context.JK.GenreSelectorHelper.getSelectedGenres('#create-session-genre'); data.musician_access = $('#musician-access option:selected').val() === "true" ? true : false; - console.log("data.musician_access=%o", data.musician_access); data.approval_required = $("input[name='musician-access-option']:checked").val() === "true" ? true : false; - console.log("data.approval_required=%o", data.approval_required); data.fan_access = $('#fan-access option:selected').val() === "true" ? true : false; - console.log("data.fan_access=%o", data.fan_access); data.fan_chat = $("input[name='fan-chat-option']:checked").val() === "true" ? true : false; - console.log("data.fan_chat=%o", data.fan_chat); if ($('#band-list option:selected').val() !== '') { data.band = $('#band-list option:selected').val(); @@ -224,11 +219,11 @@ var value = $("#musician-access option:selected").val(); if (value == "false") { $("input[name='musician-access-option']").attr('disabled', 'disabled'); - $("input[name='musician-access-option']").parent().addClass("op50"); + $("input[name='musician-access-option']").parent().addClass("op10"); } else { $("input[name='musician-access-option']").removeAttr('disabled'); - $("input[name='musician-access-option']").parent().removeClass("op50"); + $("input[name='musician-access-option']").parent().removeClass("op10"); } } @@ -236,11 +231,11 @@ var value = $("#fan-access option:selected").val(); if (value == "false") { $("input[name='fan-chat-option']").attr('disabled', 'disabled'); - $("input[name='fan-chat-option']").parent().addClass("op50"); + $("input[name='fan-chat-option']").parent().addClass("op10"); } else { $("input[name='fan-chat-option']").removeAttr('disabled'); - $("input[name='fan-chat-option']").parent().removeClass("op50"); + $("input[name='fan-chat-option']").parent().removeClass("op10"); } } diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss index 305eba56f..ed9415099 100644 --- a/web/app/assets/stylesheets/client/jamkazam.css.scss +++ b/web/app/assets/stylesheets/client/jamkazam.css.scss @@ -345,20 +345,26 @@ input[type="text"], input[type="password"]{ margin-left:35px; } -.op50 { - opacity: .5; - -ms-filter: "alpha(opacity=50)"; -} .op70 { opacity: .7; -ms-filter: "alpha(opacity=70)"; } +.op50 { + opacity: .5; + -ms-filter: "alpha(opacity=50)"; +} + .op30 { opacity: .3; -ms-filter: "alpha(opacity=30)"; } +.op10 { + opacity: .1; + -ms-filter: "alpha(opacity=10)"; +} + .nowrap { display:inline-block; white-space:nowrap; diff --git a/web/app/assets/stylesheets/client/screen_common.css.scss b/web/app/assets/stylesheets/client/screen_common.css.scss index b552e5cfe..24a8a0635 100644 --- a/web/app/assets/stylesheets/client/screen_common.css.scss +++ b/web/app/assets/stylesheets/client/screen_common.css.scss @@ -328,6 +328,11 @@ small, .small {font-size:11px;} -ms-filter: "alpha(opacity=30)"; } +.op10 { + opacity: .1; + -ms-filter: "alpha(opacity=10)"; +} + .nowrap { display:inline-block; white-space:nowrap; diff --git a/web/app/views/clients/_createSession.html.erb b/web/app/views/clients/_createSession.html.erb index 5ada0d801..0d228335b 100644 --- a/web/app/views/clients/_createSession.html.erb +++ b/web/app/views/clients/_createSession.html.erb @@ -49,7 +49,7 @@
Musician Access:
-
+