Permalink
Browse files

Make users log in immediately to submit ideas. (It's easier.) Closes #5.

  • Loading branch information...
1 parent dc4c509 commit c371eb8c1fbd42ec0434c85c7d17be989548867b @maxhawkins maxhawkins committed Feb 13, 2012
@@ -26,4 +26,8 @@ h1, h2, h3, h4, h5 {
.pagination {
text-align: center;
margin-top: 70px;
+}
+
+.btn-auth {
+ margin: 30px 0;
}
View
@@ -5,7 +5,6 @@ def initialize(user)
can :read, :all
can :create, Membership
cannot :index, Membership
- can :new, Project
if user
can :index, Membership
can :create, Project
@@ -1,5 +1,6 @@
-<h2>Forgot your password?</h2>
+<h1 id="next-meeting-title">Forgot your password?</h1>
+<section id="meeting-info">
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>
@@ -8,5 +9,8 @@
<div><%= f.submit "Send me reset password instructions" %></div>
<% end %>
+</section>
-<%= render :partial => "devise/shared/links" %>
+<section id="supplemental-info">
+<%= render :partial => "devise/shared/links" %>
+</section>
@@ -1,5 +1,6 @@
-<h2>Sign up</h2>
+<h1 id="next-meeting-title">Sign up</h1>
+<section id="meeting-info">
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
@@ -14,5 +15,8 @@
<div><%= f.submit "Sign up" %></div>
<% end %>
+</section>
+<section id="supplemental-info">
<%= render :partial => "devise/shared/links" %>
+</section>
@@ -1,5 +1,6 @@
-<h2>Sign in</h2>
+<h1 id="next-meeting-title">Sign In</h1>
+<section id="meeting-info">
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div><%= f.label :email %><br />
<%= f.email_field :email %></div>
@@ -13,5 +14,8 @@
<div><%= f.submit "Sign in" %></div>
<% end %>
+</section>
-<%= render :partial => "devise/shared/links" %>
+<section id="supplemental-info">
+<%= render :partial => "devise/shared/links" %>
+</section>
@@ -1,3 +1,9 @@
+<%- if devise_mapping.omniauthable? %>
+ <%- resource_class.omniauth_providers.each do |provider| %>
+ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn-auth btn-#{provider} large" %><br />
+ <% end -%>
+<% end -%>
+
<%- if controller_name != 'sessions' %>
<%= link_to "Sign in", new_session_path(resource_name) %><br />
<% end -%>
@@ -16,10 +22,4 @@
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.omniauthable? %>
- <%- resource_class.omniauth_providers.each do |provider| %>
- <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "btn-auth btn-#{provider} large" %><br />
- <% end -%>
<% end -%>

0 comments on commit c371eb8

Please sign in to comment.