retrieving layouts

lucianot · Sep 28, 2012 · ca100f6 · ca100f6
1 parent c610f09
commit ca100f6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,6 +14,7 @@
 //= require bootstrap
 //= require bootstrap-alert
 //= require bootstrap-dropdown
+//= require bootstrap-modal
 //= require jquery_ujs
 //= require jquery-ui
 //= require chosen-jquery

diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
@@ -3,7 +3,7 @@
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+  <%= link_to('Join Now', "#joinNow", :data => {:toggle => 'modal'}) %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>

diff --git a/app/views/home/_guest.html.erb b/app/views/home/_guest.html.erb
@@ -3,11 +3,13 @@
     <h3>100% crowdsourced</h3>
      <div class="signup_button">
       <p>
-        <%= link_to('Sign up now', new_user_registration_path, :id => 'signup_link', :class => 'btn btn-info btn-large') %>
+        <%= link_to('Join Now', "#joinNow", :data => {:toggle => 'modal'}, :id => 'signup_link', :class => 'btn btn-info btn-large') %>
       </p> 
     </div>
 </div>
+
 <div class="row">
+
   <div class="span4">
     <div class="well well-index">
       <h3>Browse the full database</h3>
@@ -33,10 +35,10 @@
       </table>
     </div>
   </div>
+
   <div class="span4">
     <div class="well well-index">
       <h3>Get all the recent updates</h3>
-
       <% if @deals.empty? %>
       <p>No updates.</p><br>
       <% else %>
@@ -53,14 +55,15 @@
         <% end %>
         <tr>
           <td>
-            <%= link_to "More...", new_user_registration_path %>
+            <%= link_to "More...", new_user_session_path %>
           </td>
         </tr>
         </tbody>
       </table>
       <% end %>
     </div>
   </div>
+
   <div class="span4">
     <div class="well well-index">
       <h3>More reasons to sign up</h3>
@@ -69,10 +72,14 @@
         <li>Become part of a <b>vibrant open-source community</b> that bringing more transparency and liquidity to the market</li>
         <li>It's completely <b>free</b></li>
       </ul>
-      <div class="reasons_signup"><%= link_to "Sign up now!", new_user_registration_path %>
+      <div class="reasons_signup">
+        <%= link_to('Join Now!', "#joinNow", :data => {:toggle => 'modal'}) %>
       </div>
     </div>
   </div>
 </div>  
+
 <div class="clear">
-</div>
+</div>
+
+
diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
@@ -30,7 +30,7 @@
           </li>
         <% else %>
           <li><%= link_to('Login', new_user_session_path, :id => 'login_link') %></li>
-          <li><%= link_to('Sign up', new_user_registration_path, :id => 'signup_link') %></li>
+          <li><%= link_to('Join Now', "#joinNow", :data => {:toggle => 'modal'}) %></li>
         <% end %>
       </ul>
 
@@ -52,4 +52,18 @@
   </ul>
 		</div>
 	</div>
-</nav>
+</nav>
+
+<div class="modal hide" id="joinNow" tabindex="-1" role="dialog" aria-labelledby="joinNowLabel" aria-hidden="true">
+  <div class="modal-header">
+    <h3 id="joinNowLabel">Dealbook</h3>
+    <p>Get the latest updates on Brazilian tech startups!</p>
+  </div>
+  <div class="modal-body">
+    <p><%= link_to "Sign Up with Email", new_user_registration_path, :id => 'signup_link' %></p>
+    <p><%= link_to "Sign Up with Linkedin", user_omniauth_authorize_path(:linkedin), :id => 'signup_link' %></p>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+  </div>
+</div>