Commit 522c8044
Changed files (3)
app
views
app/views/devise/registrations/new.html.erb
@@ -1,25 +1,62 @@
-<h1>C'mon In... </h1>
-<p>"You don't make friends with salad" - Homer Simpson<p>
-<p>Already have an account. Then <%= link_to "sign in", new_user_session_path %>.</p>
-
-<div>Sign up</div>
-
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
- <%= devise_error_messages! %>
-
- <p><%= f.label :name %><br />
- <%= f.text_field :name %></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" %>
+<% content_for :head do %>
+ <script type="text/javascript">
+ $(document).ready(function(){
+ $('#accepted').click(function(){
+ if( $('#accepted').is(':checked')){
+ $('#submit-registration').removeAttr('disabled');
+ }
+ else{
+ $('#submit-registration').attr('disabled', 'disabled');
+ }
+ });
+ });
+ </script>
+ <% end %>
+
+ <div class="row">
+ <div class="span12">
+ <%= devise_error_messages! %>
+
+ <div class="row">
+ <div class="span6">
+ <img src="/assets/cakeside-logo.png" alt="" />
+ <h3>Why CakeSide?</h3>
+ <p>
+ CakeSide is a community dedicated to giving cake artists, bakers, creators, hobbyists, and of course cake lovers a place to share ideas and creations. Explore your creativity and find your inspiration. Resources shared here are all user driven.
+ </p>
+ </div>
+ <div class="span6">
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :class=> 'form-horizontal') do |f| %>
+ <fieldset>
+ <legend>Register <small>or <%= link_to "Sign in", new_user_session_path %></small></legend>
+ </fieldset>
+ <div class="control-group">
+ <div class="controls">
+ <%= f.text_field :name, :placeholder => 'Full Name' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="controls">
+ <%= f.email_field :email, :placeholder => 'Email' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="controls">
+ <%= f.password_field :password, :placeholder => 'Password' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="controls">
+ <%= f.password_field :password_confirmation, :placeholder => 'Password Confirmation' %>
+ </div>
+ </div>
+ <div class="form-actions">
+ <p> <input id="accepted" name="accepted" type="checkbox" value="" checked="checked" /> I have read the <a href="/terms.html">terms and conditions</a> and the <a href="/privacy.html">privacy policy</a> </p>
+ <%= f.submit "Sign up", :id => 'submit-registration', :class=> "btn btn-primary" %>
+ </div>
+ <% end %>
+ <%= render :partial => "devise/shared/links" %>
+ </div>
+ </div>
+ </div>
+ </div>
app/views/layouts/application.html.erb
@@ -25,24 +25,19 @@
<body>
<%= render "shared/header" %>
<div class="container">
- <div class="row">
- <div class="span12">
- <% if notice %>
- <div class="alert alert-success">
- <a class="close">×</a>
- <h4 class="alert-heading">Well done!</h4>
- <p><%= notice %></p>
+ <% if(flash.any?) -%>
+ <div class="row">
+ <div class="span12">
+ <% flash.each do |key, value| -%>
+ <div class="alert alert-<%= key %>">
+ <a class="close" data-dismiss="alert" href="#">×</a>
+ <h4 class="alert-heading"><%= key.to_s.titleize -%>!</h4>
+ <%= value %>
+ </div>
+ <% end -%>
</div>
- <% end %>
- <% if alert %>
- <div class="alert alert-error">
- <a class="close">×</a>
- <h4 class="alert-heading">Ooops!</h4>
- <%= alert %>
- </div>
- <% end %>
</div>
- </div>
+ <% end -%>
<%= yield %>
</div> <!-- /container -->
<%= render "shared/footer" %>
app/views/registrations/new.html.erb
@@ -1,50 +0,0 @@
-<% content_for :title do %>
- C'mon In...
-<% end %>
-
-<div class="row">
- <div class="span12">
- <h1>Sign up</h1>
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
- <% if resource.errors.messages.any? %>
- <div class="alert-message warning"><%= devise_error_messages! %></div>
- <% end %>
- <fieldset>
- <legend>C'mon in and join the community</legend>
- <div class="clearfix">
- <%= f.label :name %>
- <div class="input">
- <%= f.text_field :name %></p>
- </div>
- </div><!-- /clearfix -->
-
- <div class="clearfix">
- <%= f.label :email %>
- <div class="input">
- <%= f.email_field :email %>
- </div>
- </div><!-- /clearfix -->
-
- <div class="clearfix">
- <%= f.label :password %>
- <div class="input">
- <%= f.password_field :password %>
- </div>
- </div><!-- /clearfix -->
-
- <div class="clearfix">
- <%= f.label :password_confirmation %>
- <div class="input">
- <%= f.password_field :password_confirmation %>
- </div>
- </div><!-- /clearfix -->
-
- <div class="actions">
- <input type="submit" class="btn primary" value="Sign up"> <button type="reset" class="btn">Cancel</button>
- </div>
- </fieldset>
- <% end %>
-
- <%= render :partial => "devise/shared/links" %>
- </div>
-</div>