From b256182cc6e09804de202351159ac014de5197f5 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 2 Feb 2014 13:34:53 -0600
Subject: [PATCH 1/7] * VRFS-1055 and VRFS-1056 - fixing tests that hardcode /
 instead of /client, and updating pg gem to 17.1 from 15.1

---
 db/Gemfile                              |  2 +-
 db/Gemfile.lock                         | 10 +++++-----
 ruby/Gemfile                            |  2 +-
 web/Gemfile                             |  2 +-
 web/app/controllers/users_controller.rb |  7 ++-----
 web/config/routes.rb                    |  6 +++---
 web/spec/features/admin_spec.rb         |  2 +-
 web/spec/features/home_spec.rb          |  4 ++--
 web/spec/features/profile_menu_spec.rb  |  2 +-
 web/spec/features/sidebar_spec.rb       |  2 +-
 web/spec/features/whats_next_spec.rb    |  4 ++--
 websocket-gateway/Gemfile               |  2 +-
 12 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/db/Gemfile b/db/Gemfile
index e6d5a3717..45bf466d6 100644
--- a/db/Gemfile
+++ b/db/Gemfile
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Assumes you have already cloned pg_migrate_ruby in your workspace
 # $ cd [workspace]
 # $ git clone https://github.com/sethcall/pg_migrate_ruby
-gem 'pg_migrate', '0.1.11'
+gem 'pg_migrate', '0.1.12'
diff --git a/db/Gemfile.lock b/db/Gemfile.lock
index e9646a77c..0b59faefa 100644
--- a/db/Gemfile.lock
+++ b/db/Gemfile.lock
@@ -4,11 +4,11 @@ GEM
     little-plugger (1.1.3)
     logging (1.7.2)
       little-plugger (>= 1.1.3)
-    pg (0.15.1)
-    pg (0.15.1-x86-mingw32)
-    pg_migrate (0.1.11)
+    pg (0.17.1)
+    pg (0.17.1-x86-mingw32)
+    pg_migrate (0.1.12)
       logging (= 1.7.2)
-      pg (= 0.15.1)
+      pg (= 0.17.1)
       thor (= 0.15.4)
     thor (0.15.4)
 
@@ -17,4 +17,4 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  pg_migrate (= 0.1.11)
+  pg_migrate (= 0.1.12)
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 1925a2033..989804c45 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -15,7 +15,7 @@ else
   ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 end
 
-gem 'pg', '0.15.1', :platform => [:mri, :mswin, :mingw]
+gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
 gem 'jdbc_postgres', :platform => [:jruby]
 
 gem 'activerecord', '3.2.13'
diff --git a/web/Gemfile b/web/Gemfile
index 884ae244b..ac5e4551f 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -31,7 +31,7 @@ gem 'bootstrap-will_paginate', '0.0.6'
 gem 'em-websocket', '>=0.4.0' #, :path => '/Users/seth/workspace/em-websocket'
 gem 'uuidtools', '2.1.2'
 gem 'ruby-protocol-buffers', '1.2.2'
-gem 'pg', '0.15.1'
+gem 'pg', '0.17.1'
 gem 'compass-rails'
 gem 'rabl' # for JSON API development
 gem 'gon', '~>4.1.0' # for passthrough of Ruby variables to Javascript variables
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 691c5d22a..73776d76b 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -23,7 +23,7 @@ class UsersController < ApplicationController
 
   def new
     if current_user
-      redirect_to :root
+      redirect_to client_url
       return
     end
 
@@ -51,7 +51,7 @@ class UsersController < ApplicationController
 
   def create
     if current_user
-      redirect_to :root
+      redirect_to client_url
       return
     end
 
@@ -121,9 +121,6 @@ class UsersController < ApplicationController
   end
 
   def welcome
-    if current_user
-
-    end
     @hide_user_dropdown = true
     render :layout => "web"
   end
diff --git a/web/config/routes.rb b/web/config/routes.rb
index cad25d4b5..4c5556626 100644
--- a/web/config/routes.rb
+++ b/web/config/routes.rb
@@ -9,10 +9,10 @@ SampleApp::Application.routes.draw do
   resources :sessions, only: [:new, :create, :destroy]
 
   #root to: 'static_pages#home'
-  root to: 'clients#index'
-  #root to: 'users#welcome'
+  #root to: 'clients#index'
+  root to: 'users#welcome'
 
-  match '/welcome', to: 'users#welcome'
+  #match '/welcome', to: 'users#welcome'
   # This page is still here, and is under test. Keep a route to it.
   match '/oldhome', to: 'static_pages#home'
 
diff --git a/web/spec/features/admin_spec.rb b/web/spec/features/admin_spec.rb
index 19145d17e..eef4caf2e 100644
--- a/web/spec/features/admin_spec.rb
+++ b/web/spec/features/admin_spec.rb
@@ -17,7 +17,7 @@ describe "Admin", :js => true, :type => :feature, :capybara_feature => true do
   before(:each) do
     UserMailer.deliveries.clear
     sign_in_poltergeist user
-    visit "/"
+    visit "/client"
     find('h2', text: 'musicians')
   end
 
diff --git a/web/spec/features/home_spec.rb b/web/spec/features/home_spec.rb
index a47e47cac..1585f9c73 100644
--- a/web/spec/features/home_spec.rb
+++ b/web/spec/features/home_spec.rb
@@ -115,7 +115,7 @@ describe "Home Screen", :js => true, :type => :feature, :capybara_feature => tru
       UserMailer.deliveries.clear
       page.driver.headers = { 'User-Agent' => ' JamKazam ' }
       sign_in_poltergeist user
-      visit "/"
+      visit "/client"
     end
 
     it_behaves_like :has_footer
@@ -133,7 +133,7 @@ describe "Home Screen", :js => true, :type => :feature, :capybara_feature => tru
       UserMailer.deliveries.clear
       page.driver.headers = { 'User-Agent' => 'Firefox' }
       sign_in_poltergeist user
-      visit "/"
+      visit "/client"
     end
 
     it_behaves_like :has_footer
diff --git a/web/spec/features/profile_menu_spec.rb b/web/spec/features/profile_menu_spec.rb
index d04e5f876..d60a670cf 100644
--- a/web/spec/features/profile_menu_spec.rb
+++ b/web/spec/features/profile_menu_spec.rb
@@ -90,7 +90,7 @@ describe "Profile Menu", :js => true, :type => :feature, :capybara_feature => tr
     before(:each) do
       UserMailer.deliveries.clear
       sign_in_poltergeist user
-      visit "/"
+      visit "/client"
       find('h2', text: 'musicians')
       # open menu
       find('.userinfo').hover()
diff --git a/web/spec/features/sidebar_spec.rb b/web/spec/features/sidebar_spec.rb
index e00c4b6af..35ecb1583 100644
--- a/web/spec/features/sidebar_spec.rb
+++ b/web/spec/features/sidebar_spec.rb
@@ -15,7 +15,7 @@ describe "Profile Menu", :js => true, :type => :feature, :capybara_feature => tr
   before(:each) do
     UserMailer.deliveries.clear
     sign_in_poltergeist user
-    visit "/"
+    visit "/client"
     find('h2', text: 'musicians')
   end
 
diff --git a/web/spec/features/whats_next_spec.rb b/web/spec/features/whats_next_spec.rb
index f4a96eca8..1946e622e 100644
--- a/web/spec/features/whats_next_spec.rb
+++ b/web/spec/features/whats_next_spec.rb
@@ -13,7 +13,7 @@ describe "Home Screen", :js => true, :type => :feature, :capybara_feature => tru
   before(:each) do
     sign_in_poltergeist user
     page.driver.headers = { 'User-Agent' => ' JamKazam ' }
-    visit "/"
+    visit "/client"
 
   end
 
@@ -63,7 +63,7 @@ describe "Home Screen", :js => true, :type => :feature, :capybara_feature => tru
           # needed because we poke the server with an updateUser call, but their is no indication in the UI that it's done
           wait_for_ajax
           page.driver.headers = { 'User-Agent' => ' JamKazam ' }
-          visit "/"
+          visit "/client"
           wait_until_curtain_gone
           should_not have_selector('h1',    text: 'what\'s next?')
         }
diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile
index 52e8dd565..6634c7858 100644
--- a/websocket-gateway/Gemfile
+++ b/websocket-gateway/Gemfile
@@ -56,7 +56,7 @@ group :test do
     gem 'database_cleaner', '0.7.0'
     gem 'guard', '>= 0.10.0'
     gem 'guard-rspec', '>= 0.7.3'
-    gem 'pg_migrate','0.1.11' #:path => "#{workspace}/pg_migrate_ruby"
+    gem 'pg_migrate','0.1.12' #:path => "#{workspace}/pg_migrate_ruby"
     gem 'evented-spec'
 end
 

From 821e8cc2b5f14f8e3eb830b335856471909dd5d8 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 2 Feb 2014 13:57:41 -0600
Subject: [PATCH 2/7] * fail on error

---
 build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build b/build
index 6fc0ce391..9b97f9176 100755
--- a/build
+++ b/build
@@ -3,6 +3,8 @@
 # RUN_SLOW_TESTS, RUN_AWS_TESTS, SKIP_KARMA=1 SHOW_JS_ERRORS=1    PACKAGE=1
 # WORKSPACE=/var/lib/jenkins/jobs/jam-web/workspace
 
+set -e 
+
 export BUNDLE_JOBS=1 # 6, which i want to use, makes the whole server crawl
 
 echo ""
@@ -130,4 +132,4 @@ GEM_SERVER=http://localhost:9000/gems
       echo "Skipping publish since branch is neither master or develop..."
   fi
 
-fi
\ No newline at end of file
+fi

From 513fb2b8d4209d51fc5b6861bba805af229155a0 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 2 Feb 2014 14:03:31 -0600
Subject: [PATCH 3/7] * intsall to vendor/bundle

---
 admin/build             | 4 ++--
 db/build                | 2 +-
 ruby/build              | 3 +--
 web/build               | 2 +-
 websocket-gateway/build | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/admin/build b/admin/build
index dea84d1da..64c48f159 100755
--- a/admin/build
+++ b/admin/build
@@ -25,7 +25,7 @@ cp ../ruby/jam_ruby-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy j
 #rm -rf vendor/bundle -- let jenkins config 'wipe workspace' decide this
 rm Gemfile.lock # if we don't want versions to float, pin it in the Gemfile, not count on Gemfile.lock
 bundle install --path vendor/bundle
-bundle update
+#bundle update
 
 if [ "$?" = "0" ]; then
     echo "success: updated dependencies"
@@ -74,7 +74,7 @@ EOF
 
     set -e
     # cache all gems local, and tell bundle to use local gems only
-    bundle install --path vendor/bundle --local
+    #bundle install --path vendor/bundle --local
     # prepare production acssets
     rm -rf $DIR/public/assets
     bundle exec rake assets:precompile RAILS_ENV=production
diff --git a/db/build b/db/build
index 259aea93b..a0084254e 100755
--- a/db/build
+++ b/db/build
@@ -19,7 +19,7 @@ rm -rf $TARGET
 mkdir -p $PG_BUILD_OUT
 mkdir -p $PG_RUBY_PACKAGE_OUT
 
-bundle update
+bundle install --path vendor/bundle
 
 echo "building migrations"
 bundle exec pg_migrate build --source . --out $PG_BUILD_OUT --test --verbose
diff --git a/ruby/build b/ruby/build
index df9ac25e3..f405937d2 100755
--- a/ruby/build
+++ b/ruby/build
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 echo "updating dependencies"
-bundle install --path vendor/bundle --local
-bundle update
+bundle install --path vendor/bundle
 
 echo "running rspec tests"
 bundle exec rspec
diff --git a/web/build b/web/build
index 40d979147..71544af08 100755
--- a/web/build
+++ b/web/build
@@ -31,7 +31,7 @@ cp ../websocket-gateway/jam_websockets-${GEM_VERSION}.gem vendor/cache/ || { ech
 
 echo "updating dependencies"
 bundle install --path vendor/bundle
-bundle update
+#bundle update
 
 # clean assets, because they may be lingering from last build
 bundle exec rake assets:clean
diff --git a/websocket-gateway/build b/websocket-gateway/build
index 568a403c7..1d0af4990 100755
--- a/websocket-gateway/build
+++ b/websocket-gateway/build
@@ -25,7 +25,7 @@ cp ../ruby/jam_ruby-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy j
 echo "updating dependencies"
 
 bundle install --path vendor/bundle
-bundle update
+#bundle update
 
 
 if [ -z $SKIP_TESTS ]; then
@@ -59,7 +59,7 @@ if [ -n "$PACKAGE" ]; then
 
     set -e
     # cache all gems local, and tell bundle to use local gems only
-    bundle install --path vendor/bundle --local
+    #bundle install --path vendor/bundle --local
     
     # create debian using fpm 
     bundle exec fpm -s dir -t deb -p target/deb/websocket-gateway_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "websocket-gateway" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/websocket-gateway --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile lib bin vendor .bundle config script BUILD_NUMBER

From 05e5a8cc1199032c8f09384ec6e037dcd4518f4a Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 2 Feb 2014 15:06:41 -0600
Subject: [PATCH 4/7] * working on signup on welcome page

---
 .../assets/javascripts/web/signupDialog.js    | 37 +++++++++++++++++++
 web/app/views/layouts/web.erb                 |  3 ++
 web/app/views/users/_signupDialog.html.erb    | 33 +++++++++++++++++
 web/app/views/users/welcome.html.erb          |  2 +-
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 web/app/assets/javascripts/web/signupDialog.js
 create mode 100644 web/app/views/users/_signupDialog.html.erb

diff --git a/web/app/assets/javascripts/web/signupDialog.js b/web/app/assets/javascripts/web/signupDialog.js
new file mode 100644
index 000000000..f6a916f5c
--- /dev/null
+++ b/web/app/assets/javascripts/web/signupDialog.js
@@ -0,0 +1,37 @@
+(function(context,$) {
+
+    "use strict";
+
+    context.JK = context.JK || {};
+
+    context.JK.SignupDialog = function(app) {
+        var logger = context.JK.logger;
+        var rest = context.JK.Rest();
+        var dialogId = '#signup-dialog';
+
+        function events() {
+
+        }
+
+        function beforeShow() {
+        }
+
+        function afterHide() {
+        }
+
+        function initialize(){
+
+            var dialogBindings = {
+                'beforeShow' : beforeShow,
+                'afterHide': afterHide
+            };
+
+            app.bindDialog('inviteUsers', dialogBindings);
+
+
+        }
+
+        this.initialize = initialize;
+
+    }
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.erb
index 50e6e8cf9..6312ffc76 100644
--- a/web/app/views/layouts/web.erb
+++ b/web/app/views/layouts/web.erb
@@ -70,6 +70,9 @@
 
                 var userDropdown = new JK.UserDropdown(JK.app);
                 userDropdown.initialize(invitationDialog);
+
+                var signupDialog = new JK.SignupDialog(JK.app);
+                signupDialog.initialize();
             }
         })
     </script>
diff --git a/web/app/views/users/_signupDialog.html.erb b/web/app/views/users/_signupDialog.html.erb
new file mode 100644
index 000000000..8610d2f63
--- /dev/null
+++ b/web/app/views/users/_signupDialog.html.erb
@@ -0,0 +1,33 @@
+<div class="dialog overlay-small" layout-id="signup" id="signup-dialog">
+
+  <!-- ftue header -->
+  <div class="content-head">
+    <h1>sign up for jamkazam</h1>
+  </div>
+
+  <!-- inner wrapper -->
+  <div class="overlay-inner">
+
+    <%= image_tag "content/button_facebook_signup.png", {:width => 249, :height => 46 } %>
+    <br>
+    <br><br>
+
+    <div class="center"><strong class="white">Or</strong></div>
+    <br>
+    <br>
+
+    <div class="center"><%= link_to "SIGN UP WITH YOUR EMAIL", signup_path, class: "button-orange block" %>
+
+      <br>
+
+      <div class="center">
+        <small>Already have an account? <a href="#" class='signin'>Sign In</a><br>
+          <br>
+          <a href="#" layout-action="close">Cancel</a></small>
+      </div>
+    </div>
+    <!-- end inner -->
+    <br clear="all">
+  </div>
+  <!-- end overlay content -->
+</div>
\ No newline at end of file
diff --git a/web/app/views/users/welcome.html.erb b/web/app/views/users/welcome.html.erb
index 9bf3df638..062844780 100644
--- a/web/app/views/users/welcome.html.erb
+++ b/web/app/views/users/welcome.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 <div class="clearall"></div>
 <div class="login-wrapper">
-  <%= link_to image_tag("/assets/web/cta_button.png", :alt => "Sign up now for your free account!"), signup_path, class: "signup", id: "signup" %>
+  <%= link_to image_tag("/assets/web/cta_button.png", :alt => "Sign up now for your free account!"), signup_path, class: "signup", id: "signup", :'layout-link' => 'signup-dialog' %>
   <div class="clearall"></div>
   <%= link_to "Already have an account?", signin_path, class: "signin", id: "signin" %>
 </div>

From af553c173470dea9a5c71a7128834c86a797e058 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 2 Feb 2014 15:07:04 -0600
Subject: [PATCH 5/7] * adding fb image

---
 .../images/content/button_facebook_signup.png    | Bin 0 -> 7074 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 web/app/assets/images/content/button_facebook_signup.png

diff --git a/web/app/assets/images/content/button_facebook_signup.png b/web/app/assets/images/content/button_facebook_signup.png
new file mode 100644
index 0000000000000000000000000000000000000000..d51b554026b37510ad3815400e62b4d65c03c09a
GIT binary patch
literal 7074
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
ZU{U3Y9o5>y`}ePzvVyvNxvY86{{ad+T6zEg

literal 0
HcmV?d00001


From ef6e3f5fa83e8e0b33f31a7e50003535c0102b6c Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 2 Feb 2014 21:19:45 +0000
Subject: [PATCH 6/7] * signup dialog js included now

---
 web/app/assets/javascripts/web/web.js | 1 +
 web/app/views/layouts/web.erb         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js
index 0cde1c7d7..c6489a530 100644
--- a/web/app/assets/javascripts/web/web.js
+++ b/web/app/assets/javascripts/web/web.js
@@ -5,6 +5,7 @@
 //= require AAA_Log
 //= require AAC_underscore
 //= require globals
+//= require web/signupDialog
 //= require invitationDialog
 //= require shareDialog
 //= require layout
diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.erb
index 6312ffc76..849687718 100644
--- a/web/app/views/layouts/web.erb
+++ b/web/app/views/layouts/web.erb
@@ -49,6 +49,7 @@
     </div>
 
     <%= render "clients/invitationDialog" %>
+    <%= render "users/signupDialog" %>
 
     <script type="text/javascript">
         $(function () {

From aa68a4e2f46ec24ada2022c1d2170f1c01890166 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 2 Feb 2014 22:25:59 +0000
Subject: [PATCH 7/7] * adding welcome.js

---
 web/app/assets/javascripts/user_dropdown.js    |  4 ++++
 web/app/assets/javascripts/web/signupDialog.js |  8 ++++++--
 web/app/assets/javascripts/web/welcome.js      | 17 +++++++++++++++++
 .../assets/stylesheets/client/dialog.css.scss  |  4 ++++
 .../stylesheets/client/jamkazam.css.scss       |  8 ++++++++
 web/app/views/layouts/web.erb                  | 18 ++++++++----------
 web/app/views/users/_signupDialog.html.erb     |  2 +-
 web/app/views/users/welcome.html.erb           |  6 ++++--
 8 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 web/app/assets/javascripts/web/welcome.js

diff --git a/web/app/assets/javascripts/user_dropdown.js b/web/app/assets/javascripts/user_dropdown.js
index 2973dda7d..807f154e2 100644
--- a/web/app/assets/javascripts/user_dropdown.js
+++ b/web/app/assets/javascripts/user_dropdown.js
@@ -49,6 +49,10 @@
         }
 
         function loadMe() {
+            if(!context.JK.currentUserId) {
+                return;
+            }
+
             $.ajax({
                 url: '/api/users/' + context.JK.currentUserId
             }).done(function(r) {
diff --git a/web/app/assets/javascripts/web/signupDialog.js b/web/app/assets/javascripts/web/signupDialog.js
index f6a916f5c..459833503 100644
--- a/web/app/assets/javascripts/web/signupDialog.js
+++ b/web/app/assets/javascripts/web/signupDialog.js
@@ -11,12 +11,15 @@
 
         function events() {
 
+
         }
 
         function beforeShow() {
+
         }
 
         function afterHide() {
+
         }
 
         function initialize(){
@@ -26,9 +29,10 @@
                 'afterHide': afterHide
             };
 
-            app.bindDialog('inviteUsers', dialogBindings);
-
+            app.bindDialog('signup-dialog', dialogBindings);
 
+            console.log("honuth")
+            events();
         }
 
         this.initialize = initialize;
diff --git a/web/app/assets/javascripts/web/welcome.js b/web/app/assets/javascripts/web/welcome.js
new file mode 100644
index 000000000..7d4728e03
--- /dev/null
+++ b/web/app/assets/javascripts/web/welcome.js
@@ -0,0 +1,17 @@
+(function(context,$) {
+
+    "use strict";
+
+    context.JK = context.JK || {};
+
+    function initialize() {
+        $('#signup').click(function(e) {
+            context.JK.app.layout.showDialog('signup-dialog');
+            e.preventDefault();
+            return false;
+        });
+    }
+
+    initialize()
+
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/stylesheets/client/dialog.css.scss b/web/app/assets/stylesheets/client/dialog.css.scss
index d1c188cfa..438725f43 100644
--- a/web/app/assets/stylesheets/client/dialog.css.scss
+++ b/web/app/assets/stylesheets/client/dialog.css.scss
@@ -10,6 +10,10 @@
     z-index: 100;
 }
 
+.thin-dialog {
+    min-width: 100px;
+}
+
 .dialog-inner {
     padding:25px;
     color:#aaa;
diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss
index 819e8e9ef..0d6321bb4 100644
--- a/web/app/assets/stylesheets/client/jamkazam.css.scss
+++ b/web/app/assets/stylesheets/client/jamkazam.css.scss
@@ -131,6 +131,14 @@ input[type="button"] {
   font-size:11px;
 }
 
+.center {
+  text-align:center;
+}
+
+.block {
+  display:block;
+}
+
 .orange {
   color: $ColorScreenPrimary !important;
 }
diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.erb
index 849687718..58c07dd86 100644
--- a/web/app/views/layouts/web.erb
+++ b/web/app/views/layouts/web.erb
@@ -62,19 +62,17 @@
             JK.currentUserId = null;
             <% end %>
 
-            if (JK.currentUserId) {
-                JK.app = JK.JamKazam();
-                JK.app.initialize({inClient: false, layoutOpts: {layoutFooter: false}});
+            JK.app = JK.JamKazam();
+            JK.app.initialize({inClient: false, layoutOpts: {layoutFooter: false}});
 
-                var invitationDialog = new JK.InvitationDialog(JK.app);
-                invitationDialog.initialize();
+            var invitationDialog = new JK.InvitationDialog(JK.app);
+            invitationDialog.initialize();
 
-                var userDropdown = new JK.UserDropdown(JK.app);
-                userDropdown.initialize(invitationDialog);
+            var userDropdown = new JK.UserDropdown(JK.app);
+            userDropdown.initialize(invitationDialog);
 
-                var signupDialog = new JK.SignupDialog(JK.app);
-                signupDialog.initialize();
-            }
+            var signupDialog = new JK.SignupDialog(JK.app);
+            signupDialog.initialize();
         })
     </script>
 
diff --git a/web/app/views/users/_signupDialog.html.erb b/web/app/views/users/_signupDialog.html.erb
index 8610d2f63..9484902a5 100644
--- a/web/app/views/users/_signupDialog.html.erb
+++ b/web/app/views/users/_signupDialog.html.erb
@@ -1,4 +1,4 @@
-<div class="dialog overlay-small" layout-id="signup" id="signup-dialog">
+<div class="dialog thin-dialog overlay-small" layout-id="signup-dialog" id="signup-dialog">
 
   <!-- ftue header -->
   <div class="content-head">
diff --git a/web/app/views/users/welcome.html.erb b/web/app/views/users/welcome.html.erb
index 062844780..86d9ed153 100644
--- a/web/app/views/users/welcome.html.erb
+++ b/web/app/views/users/welcome.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 <div class="clearall"></div>
 <div class="login-wrapper">
-  <%= link_to image_tag("/assets/web/cta_button.png", :alt => "Sign up now for your free account!"), signup_path, class: "signup", id: "signup", :'layout-link' => 'signup-dialog' %>
+  <%= link_to image_tag("/assets/web/cta_button.png", :alt => "Sign up now for your free account!"), '#', class: "signup", id: "signup" %>
   <div class="clearall"></div>
   <%= link_to "Already have an account?", signin_path, class: "signin", id: "signin" %>
 </div>
@@ -13,4 +13,6 @@
         Have questions about how JamKazam works?
         <a href="#" id="faq-open">Here are some answers</a>.
     <% end %>
-<% end %>
\ No newline at end of file
+<% end %>
+
+<%= javascript_include_tag "web/welcome" %>
\ No newline at end of file