* adding welcome.js

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) {

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;

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);

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;

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;
 }

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>
 

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">

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 %>
+<% end %>
+
+<%= javascript_include_tag "web/welcome" %>