fixed some bugs, added seed data, changed login to use username + styled login/register page

This commit is contained in:
Mike Kelley
2011-08-27 02:34:18 -06:00
parent 17fee3c6d5
commit 14d7aa9772
8 changed files with 111 additions and 44 deletions

View File

@@ -1,21 +1,29 @@
<h2>Sign up</h2>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
<p><%= f.label :username %><br />
<%= f.text_field :username %></p>
<p><%= f.label :email %><br />
<%= f.email_field :email %></p>
<p><%= f.label :password %><br />
<%= f.password_field :password %></p>
<p><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation %></p>
<p><%= f.submit "Sign up" %></p>
<% end %>
<%= render :partial => "devise/shared/links" %>
<div class="module" style="padding:15px 25px 0px 25px;">
<div style="float:left; width:50%; height:330px; padding-right:10px;">
<h1>Welcome to Forum Monster</h1>
<p>Forum Monster is a simple forum generator written in rails 3. The goal of Forum Monster, is to provide a simple, and easy to setup forum application without having to dictate how your site it setup.</p>
<p style="font-size:1.2em;"><strong>The email field is required, but none of the data is saved for more than a day. Feel free to put in a fake address.</strong></p>
</div>
<div style="float:right; width:45%; padding-left:30px; border-left:1px solid #e2e2e2;">
<%= form_for("user", :as => resource_name, :url => registration_path("user")) do |f| %>
<p>
Username: <br />
<%= f.text_field :username, :style => "font-size:2.2em", :autocomplete => "off" %><br />
</p>
<p>
Email Address: <br />
<%= f.text_field :email, :style => "font-size:2.2em", :autocomplete => "off" %><br />
</p>
<p>
Password:<br />
<%= f.password_field :password, :style => "font-size:2.2em", :autocomplete => "off" %><br />
</p>
<p>
Confirm Password:<br />
<%= f.password_field :password_confirmation, :style => "font-size:2.2em", :autocomplete => "off" %><br />
</p>
<p><%= f.submit "Sign up" %></p>
<% end %>
</div>
<div class="clear"></div>
</div>