Commit eccecdf2
Changed files (4)
app
views
creations
devise
passwords
sessions
registrations
app/views/creations/show.html.erb
@@ -11,11 +11,18 @@
</div>
<div class="row">
- <div class="span16">
+ <div class="span12">
<div class="media-grid">
<a href="<%= url_for creation_path(@creation) %>"><img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>"></a>
</div>
</div>
+ <div class="span4">
+ <ul class="media-grid">
+ <li> <a href=""><img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>" style="width:210px"></a> </li>
+ <li> <a href=""><img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>" style="width:210px"></a> </li>
+ <li> <a href=""><img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>" style="width:210px"></a> </li>
+ </ul>
+ </div>
</div>
<div class="row">
app/views/devise/passwords/new.html.erb
@@ -1,15 +1,23 @@
-<h1>C'mon In... </h1>
-<p>"You don't make friends with salad" - Homer Simpson<p>
+<div class="row">
+ <div class="span16">
+ <h1>Forgot your password? <small>don't worry, it happens</small></h1>
+ <p> Type your email address below to reset your password. </p>
-<div>Forgot your password?</div>
+ <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+ <%= devise_error_messages! %>
+ <fieldset>
+ <div class="clearfix">
+ <%= f.label :email %>
+ <div class="input">
+ <%= f.email_field :email, :class => "xlarge", :size => 30 %></p>
+ </div>
+ </div><!-- /clearfix -->
+ <div class="actions">
+ <input type="submit" class="btn primary" value="Send me reset password instructions"> <button type="reset" class="btn">Cancel</button>
+ </div>
+ </fieldset>
+ <% end %>
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
- <%= devise_error_messages! %>
-
- <p><%= f.label :email %><br />
- <%= f.email_field :email %></p>
-
- <p><%= f.submit "Send me reset password instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
+ <%= render :partial => "devise/shared/links" %>
+ </div>
+</div>
app/views/devise/sessions/new.html.erb
@@ -13,7 +13,7 @@
<%= f.password_field :password, :style => "height:20px;", :placeholder => 'Password',:size => 20 %>
</div>
<div class="span1">
- <%= f.submit "Sign in", :style => "width:100%;height:28px;"%>
+ <%= f.submit "Sign in", :style => "width:100%;height:28px;", :class => "btn"%>
</div>
<div class="span1"> </div>
<% end %>
@@ -23,8 +23,6 @@
<div class="row">
<div class="span10">
- <p class="notice"><%= notice %></p>
- <p class="alert"><%= alert %></p>
<%= devise_error_messages! %>
</div>
<div class="span5">
@@ -63,7 +61,7 @@
</div>
-
+<!--
<h1>Sign in</h1>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<fieldset>
@@ -73,22 +71,22 @@
<div class="input">
<%= f.email_field :email, :class => "xlarge" %>
</div>
- </div><!-- /clearfix -->
+ </div>
<div class="clearfix">
<%= f.label :password %>
<div class="input">
<%= f.password_field :password, :class => "xlarge" %></p>
</div>
- </div><!-- /clearfix -->
+ </div>
<% if devise_mapping.rememberable? -%>
- <!-- <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p> -->
- <div class="clearfix">
- <label>
- <%= f.check_box :remember_me %>
- <span>Remember me</span>
- </label>
- </div><!-- /clearfix -->
+ <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
+ <div class="clearfix">
+ <label>
+ <%= f.check_box :remember_me %>
+ <span>Remember me</span>
+ </label>
+ </div>
<% end -%>
<div class="actions">
<input type="submit" class="btn primary" value="Sign in"> <button type="reset" class="btn">Cancel</button>
@@ -96,4 +94,4 @@
</fieldset>
<% end %>
<%= render :partial => "devise/shared/links" %>
-
+-->
app/views/registrations/new.html.erb
@@ -2,26 +2,45 @@
C'mon In...
<% end %>
-<div class="grid_9 alpha omega">
- <div class="grid_5 alpha">
+<div class="row">
+ <div class="span16">
<h1>Sign up</h1>
-
<%= 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, :class => "forms" %></p>
-
- <p><%= f.label :email %><br />
- <%= f.email_field :email, :class => "forms" %></p>
-
- <p><%= f.label :password %><br />
- <%= f.password_field :password, :class => "forms" %></p>
-
- <p><%= f.label :password_confirmation %><br />
- <%= f.password_field :password_confirmation, :class => "forms" %></p>
-
- <p><%= f.submit "Sign up" %></p>
+ <fieldset>
+ <legend>C'mon in and join the club</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" %>