Started inital migration to rails 3.2

This commit is contained in:
2013-01-19 01:14:55 -05:00
parent 64aff15deb
commit a9a4cd892f
98 changed files with 968 additions and 363 deletions

0
app/views/devise/confirmations/new.html.erb Normal file → Executable file
View File

View File

View File

0
app/views/devise/mailer/unlock_instructions.html.erb Normal file → Executable file
View File

0
app/views/devise/passwords/edit.html.erb Normal file → Executable file
View File

0
app/views/devise/passwords/new.html.erb Normal file → Executable file
View File

5
app/views/devise/registrations/edit.html.erb Normal file → Executable file
View File

@@ -6,6 +6,11 @@
<p><%= f.label :email %><br />
<%= f.email_field :email %></p>
<% if current_user.admin? %>
<p><%= f.label :is_admin %><br />
<%= f.check_box :is_admin, {checked: resource.admin?} %></p>
<% end %>
<p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
<%= f.password_field :password %></p>

7
app/views/devise/registrations/new.html.erb Normal file → Executable file
View File

@@ -1,8 +1,7 @@
<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>
<h1>Welcome to Horses</h1>
<%= devise_error_messages! %>
</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| %>
@@ -26,4 +25,4 @@
<% end %>
</div>
<div class="clear"></div>
</div>
</div>

10
app/views/devise/sessions/new.html.erb Normal file → Executable file
View File

@@ -19,13 +19,7 @@
<div class="module" style="padding:15px 25px 0px 25px;">
<div style="float:left; width:50%; height:210px; 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>You can login with the following information:</p>
<p><strong>Admin Demo:</strong> admin/forum_admin</p>
<p><strong>User Demo:</strong> user/forum_user</p>
</p>
<h1>Welcome to Horses</h1>
</div>
<div style="float:right; width:45%; height:195px; padding-left:30px; border-left:1px solid #e2e2e2;">
<%= form_for("user", :url => user_session_path) do |f| %>
@@ -35,4 +29,4 @@
<% end %>
</div>
<div class="clear"></div>
</div>
</div>

0
app/views/devise/shared/_links.erb Normal file → Executable file
View File

0
app/views/devise/unlocks/new.html.erb Normal file → Executable file
View File