Commit e2fd4ea0
Changed files (2)
app
views
registrations
search
app/views/registrations/new.html.erb
@@ -2,47 +2,35 @@
C'mon In...
<% end %>
-<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>
-
-<hr />
-<h2>Sign up</h2>
-
-<%= 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>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
-<p>or</p>
-<h2>Sign up through one of these services</h2>
-<a href="/auth/twitter" class="auth_provider">
- <%= image_tag "twitter_64.png", :size => "64x64", :alt => "Twitter" %>
- Twitter
-</a>
-<a href="/auth/facebook" class="auth_provider">
- <%= image_tag "facebook_64.png", :size => "64x64", :alt => "Facebook" %>
- Facebook
-</a>
-<a href="/auth/google_apps" class="auth_provider">
- <%= image_tag "google_64.png", :size => "64x64", :alt => "Google" %>
- Google
-</a>
-<a href="/auth/open_id" class="auth_provider">
- <%= image_tag "openid_64.png", :size => "64x64", :alt => "OpenID" %>
- OpenID
-</a>
+<div class="grid_9 alpha omega">
+ <div class="grid_5 alpha">
+ <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>
+ <% end %>
+
+ <%= render :partial => "devise/shared/links" %>
+ </div>
+ <div class="grid_4 omega">
+ <h2>Sign up through one of these services</h2>
+ <a href="/auth/twitter" class="auth_provider"><%= image_tag "twitter_64.png", :size => "64x64", :alt => "Twitter" %>Twitter</a>
+ <a href="/auth/facebook" class="auth_provider"><%= image_tag "facebook_64.png", :size => "64x64", :alt => "Facebook" %>Facebook</a>
+ <a href="/auth/google_apps" class="auth_provider"><%= image_tag "google_64.png", :size => "64x64", :alt => "Google" %>Google</a>
+ <a href="/auth/open_id" class="auth_provider"><%= image_tag "openid_64.png", :size => "64x64", :alt => "OpenID" %>OpenID</a>
+ </div>
+</div>
app/views/search/index.html.erb
@@ -2,24 +2,22 @@
Search Results for <%= @search %>
<% end %>
-<h1>Search Results for <em><%= @search %></em></h1>
-<p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>
+<div class="grid_9 alpha omega">
+ <h1>Search Results for <em><%= @search %></em></h1>
+ <p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>
-<%= form_tag(search_index_path, :method => "get", :name => "search") do %>
- <input name="q" type="text" value="<%= @search %>" />
- <%= submit_tag("search") %>
-<% end %>
-<br />
+ <%= form_tag(search_index_path, :method => "get", :name => "search") do %>
+ <input name="q" type="text" value="<%= @search %>" />
+ <%= submit_tag("search") %>
+ <% end %>
+ <br />
-<% @creations.reverse.each do |creation| %>
-<div class="product_box">
- <h2><%= creation.name %></h2>
- <a href="<%= url_for creation %>">
- <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :alt => creation.name %>
- </a>
- <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
-</div>
-<% end %>
+ <% @creations.reverse.each do |creation| %>
+ <h2><%= creation.name %></h2>
+ <a href="<%= url_for creation %>"><%= image_tag creation.image_url.to_s, :alt => creation.name %></a>
+ <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
+ <% end %>
-<hr class="clear" />
-<p> <%= paginate @creations %> </p>
+ <p> <%= paginate @creations %> </p>
+</div>
+<div class="clear" />