diff --git a/app/assets/javascripts/jamkazam.js b/app/assets/javascripts/jamkazam.js index f4a59bc20..5418680d5 100644 --- a/app/assets/javascripts/jamkazam.js +++ b/app/assets/javascripts/jamkazam.js @@ -170,7 +170,9 @@ routing(); var hash = context.location.hash; - var url = '#/ftue1'; + // TODO - defaulting to home for video + // var url = '#/ftue1'; + var url = '#/home'; if (hash) { url = hash; } diff --git a/app/assets/javascripts/layout.js b/app/assets/javascripts/layout.js index 45e4a546a..4e6f61a58 100644 --- a/app/assets/javascripts/layout.js +++ b/app/assets/javascripts/layout.js @@ -376,17 +376,22 @@ screenEvent(previousScreen, 'beforeHide', data); screenEvent(currentScreen, 'beforeShow', data); + // For now -- it seems we want it open always. + // TODO - support user preference here? Remember how they left it? + sidebarVisible = true; + /* var openSidebarScreens = [ 'home', 'session', 'createSession', 'findSession', 'searchResults' ]; - sidebarVisible = false; $.each(openSidebarScreens, function() { + logger.debug("comparing " + this + " to " + currentScreen); if (this === currentScreen) { sidebarVisible = true; return false; } }); + */ layout(); screenEvent(previousScreen, 'afterHide', data); diff --git a/app/assets/stylesheets/client/jamkazam.css.scss b/app/assets/stylesheets/client/jamkazam.css.scss index 9603f6c83..df50083f1 100644 --- a/app/assets/stylesheets/client/jamkazam.css.scss +++ b/app/assets/stylesheets/client/jamkazam.css.scss @@ -319,3 +319,9 @@ input[type="text"] { .right { float:right; } + + +/* TODO - we need a separate stylesheet(s) for signin/signup screens */ +/* Following is a style adjustment for the sign-in table spacing */ +#sign-in td { padding: 4px; } + diff --git a/app/assets/stylesheets/client/session.css.scss b/app/assets/stylesheets/client/session.css.scss index 028848ec4..c78bfe7b7 100644 --- a/app/assets/stylesheets/client/session.css.scss +++ b/app/assets/stylesheets/client/session.css.scss @@ -170,7 +170,7 @@ table.vu td { .session-add { - margin-top:6px; + margin-top:9px; margin-bottom:8px; font-size:16px; } @@ -181,7 +181,7 @@ table.vu td { } .session-add a img { - margin-top: 2px; + vertical-align:bottom; } .session-recording-name-wrapper { @@ -199,6 +199,7 @@ table.vu td { } .session-tracks-scroller { + position:relative; overflow-x:auto; overflow-y:hidden; width:100%; @@ -524,12 +525,13 @@ table.vu td { } .recording { + bottom: 0px; margin-top:15px; padding:3px; height:19px; width:95%; background-color:#242323; - position:relative; + position:absolute; text-align:center; font-size:13px; } @@ -539,6 +541,10 @@ table.vu td { text-decoration:none; } +.recording a img { + vertical-align:middle; +} + .recording-controls { margin-top:15px; padding:3px 5px 3px 10px; diff --git a/app/views/clients/_session.html.erb b/app/views/clients/_session.html.erb index 1d2b4473c..673225240 100644 --- a/app/views/clients/_session.html.erb +++ b/app/views/clients/_session.html.erb @@ -103,18 +103,22 @@

recordings

+
+ (No recording loaded) +
+
+ --> +
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 60aade7fc..7d4dff6f0 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -14,12 +14,13 @@

- Already a member? Enter your email address and password: + Already a member?
+ Enter your email address and password:

<%= form_for(:session, url: sessions_path) do |f| %> - +
<%= f.label :email %> <%= f.label :password %>