Commit e2019da2
Changed files (20)
app
helpers
views
devise
confirmations
passwords
registrations
sessions
unlocks
home
layouts
profiles
registrations
public
stylesheets
app/helpers/application_helper.rb
@@ -1,2 +1,7 @@
module ApplicationHelper
+ def avatar_url(user)
+ default_url = "#{root_url}images/rails.png"
+ gravatar_id = Digest::MD5.hexdigest(user.email.downcase)
+ "http://gravatar.com/avatar/#{gravatar_id}.png?s=200&d=#{CGI.escape(default_url)}"
+ end
end
app/views/creations/_form.html.erb
@@ -2,7 +2,6 @@
<% if @creation.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(@creation.errors.count, "error") %> prohibited this creation from being saved:</h2>
-
<ul>
<% @creation.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
@@ -11,23 +10,15 @@
</div>
<% end %>
- <div class="field">
- <%= f.label :name %><br />
- <%= f.text_field :name %>
- </div>
- <div class="field">
- <%= f.label :image %><br />
- <%= f.file_field :image %>
- </div>
- <div class="field">
- <%= f.label :remote_image_url, "or image url" %><br />
- <%= f.file_field :remote_image_url %>
- </div>
- <div class="field">
- <%= f.label :story %><br />
- <%= f.text_area :story %>
- </div>
- <div class="actions">
- <%= f.submit %>
- </div>
+ <fieldset class="cute_form">
+ <%= f.label :image %>
+ <%= f.file_field :image, :class => "forms" %>
+ <%= f.label :remote_image_url, "or image url" %>
+ <%= f.file_field :remote_image_url, :class => "forms" %>
+ <%= f.label :name %>
+ <%= f.text_field :name, :class => "forms" %>
+ <%= f.label :story %>
+ <%= f.text_area :story, :class => "forms" %>
+ <input type="image" id="submit" name="submit" src="/images/template/button_submit.gif" title="Submit Message" />
+ </fieldset>
<% end %>
app/views/creations/edit.html.erb
@@ -1,11 +1,8 @@
-
-<%= image_tag "cakes/Camouflage_Truck.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<h1>Browse All Creations</h1>
<p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>
<p>Check out our communities most recent cake work.</p>
-<a href="<%= url_for my_creations_path %>"> My Creations </a>
-<div>Editing creation <%= @creation.name %></div>
+<h2>Editing creation <%= @creation.name %></h2>
<div class="width100 floatLeft">
<div class="width50 floatLeft">
@@ -19,4 +16,3 @@
</div>
<%= link_to 'Show', @creation %> |
-<%= link_to 'Back', creations_path %>
app/views/creations/index.html.erb
@@ -1,28 +1,13 @@
-
-<% if @creations.any? %>
- <a href="<%= url_for @creations[0] %>">
- <%= image_tag @creations[0].image_url.to_s, :width => 417, :height => 205, :class => 'photo' %>
- </a>
-<% else %>
- <a href="<%= url_for @creations[0] %>">
- <%= image_tag "cakes/Camouflage_Truck.jpg", :width => 417, :height => 205, :class => 'photo' %>
- </a>
-<% end %>
-
<h1>Browse All Creations</h1>
<p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>
<p>Check out our communities most recent cake work.</p>
-<a href="<%= url_for my_creations_path %>"> My Creations </a>
-<div>The most recent creations</div>
-
-<div>
- <% @creations.reverse.each_with_index do |creation, index| %>
- <a href="<%= url_for creation %>">
- <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
- </a>
- <h2><%= creation.name %></h2>
- <p><%= creation.story %> <%= link_to 'more...', creation %></p>
- <% end %>
+<% @creations.reverse.each_with_index do |creation, index| %>
+<div class="product_box">
+ <a href="<%= url_for creation %>">
+ <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
+ </a>
+ <h2><%= creation.name %></h2>
+ <p><%= creation.story %> <%= link_to 'more...', creation %></p>
</div>
-
+<% end %>
app/views/creations/mine.html.erb
@@ -1,18 +1,18 @@
-<div>My Creations</div>
+<h1>My Creations</h1>
-<div class="floatRight">
<%= link_to "add creation", new_creation_path(@creation) %>
-</div>
+
+<hr />
<% if @creations.length == 0 %>
- <div class="width100">
<p> you have no creations. </p>
- </div>
<% else %>
<% @creations.reverse.each_with_index do |creation, index| %>
- <a href="<%= url_for creation %>">
- <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo" %>
- </a>
- <h2><%= creation.name %></h2>
- <p><%= creation.story %> <%= link_to 'more...', creation %></p>
+ <div class="product_box">
+ <h2><%= creation.name %></h2>
+ <a href="<%= url_for creation %>">
+ <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo" %>
+ </a>
+ <p><%= creation.story %> <%= link_to 'more...', creation %></p>
+ </div>
<% end %>
<% end %>
app/views/creations/new.html.erb
@@ -1,12 +1,6 @@
-
-<%= image_tag "cakes/Camouflage_Truck.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<h1>Share your creation with other Cake artists, enthusiasts, and eaters!</h1>
<p>We're delighted that you're going to share you latest creation with us.<p>
-<a href="<%= url_for my_creations_path %>"> my creations </a>
-<div>Add My Latest Creation</div>
+<h2>Add My Latest Creation</h2>
<div class="width100">
<%= render 'form' %>
</div>
-
-<%= link_to 'Back', creations_path %>
-
app/views/creations/show.html.erb
@@ -1,49 +1,42 @@
-<div><%= @creation.name %></div>
+<h1><%= @creation.name %> by <em> <%= link_to @creation.user.name, profile_path(@creation.user) %> </em> </h1>
<div class="width100 floatLeft">
- <div class="width50 floatLeft">
+ <div class="width25 floatLeft">
+ <p> <%= @creation.story %> </p>
<p>
- <%= image_tag @creation.image_url.to_s, :class => 'photo' %>
+ <% if signed_in? %>
+ <%= link_to "Add Creation", new_creation_path %>
+ <% end %>
+ <%= link_to 'Back', creations_path %>
</p>
- <p> submitted on: <%= @creation.created_at %> </p>
</div>
- <div class="width50 floatRight">
- <p>
- <strong>Story:</strong>
- <%= @creation.story %>
- </p>
+ <div class="width75 floatRight">
<p>
- <strong>Artist:</strong>
- <%= link_to @creation.user.name, profile_path(@creation.user) %>
+ <%= image_tag @creation.image_url.to_s, :class => 'photo' %>
</p>
- <p>
<% if @creation.user == current_user %>
- <%= link_to 'Edit', edit_creation_path(@creation) %> |
+ <%= link_to 'Edit', edit_creation_path(@creation) %>
<%= button_to 'Delete', @creation, :method => :delete %>
<% end %>
- <% if signed_in? %>
- <%= link_to "Add Creation", new_creation_path %>
- <% end %>
- <%= link_to 'Back', creations_path %>
- </p>
+ <p> submitted on: <%= @creation.created_at %> </p>
</div>
</div>
-<div>
- <%= @creation.user.name.to_s.pluralize %> other creations
- <%= link_to 'view more...', profile_path(@creation.user), :class=>"floatRight" %>
-</div>
-<% other_creations = @creation.user.creations.last(4) %>
+<hr />
+<hr class="clear" />
+<h3> other creations by <%= @creation.user.name.to_s %> <em><%= link_to 'view more...', profile_path(@creation.user) %> </em> </h3>
+<% other_creations = @creation.user.creations.last(4) %>
<% if other_creations.length > 0 %>
<% other_creations.each do |creation| %>
<% if creation != @creation %>
+ <div class="product_box">
<a href="<%= url_for creation %>">
<%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
</a>
- <h2><%= creation.name %></h2>
+ <h2><%= @creation.name %></h2>
<p><%= creation.story %> <%= link_to 'more...', creation %></p>
+ </div>
<% end %>
<% end %>
<% end %>
-<%= link_to 'view more...', profile_path(@creation.user), :class=>"floatRight" %>
app/views/devise/confirmations/new.html.erb
@@ -1,8 +1,7 @@
-<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<h1>C'mon In... </h1>
<p>"You don't make friends with salad" - Homer Simpson<p>
-<div>Resend confirmation instructions</div>
+<h2>Resend confirmation instructions</h2>
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>
app/views/devise/passwords/edit.html.erb
@@ -1,4 +1,3 @@
-<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<h1>C'mon In... </h1>
<p>"You don't make friends with salad" - Homer Simpson<p>
app/views/devise/passwords/new.html.erb
@@ -1,8 +1,5 @@
-<div>
- <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
- <h1>C'mon In... </h1>
- <p>"You don't make friends with salad" - Homer Simpson<p>
-</div>
+<h1>C'mon In... </h1>
+<p>"You don't make friends with salad" - Homer Simpson<p>
<div>Forgot your password?</div>
app/views/devise/registrations/edit.html.erb
@@ -1,7 +1,5 @@
-
- <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
- <h1>C'mon In... </h1>
- <p>"You don't make friends with salad" - Homer Simpson<p>
+<h1>C'mon In... </h1>
+<p>"You don't make friends with salad" - Homer Simpson<p>
<div>Edit <%= resource_name.to_s.humanize %></div>
app/views/devise/registrations/new.html.erb
@@ -1,4 +1,3 @@
-<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<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>
app/views/devise/sessions/new.html.erb
@@ -1,17 +1,15 @@
-
-<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<h1>C'mon In... </h1>
<p>"You don't make friends with salad" - Homer Simpson<p>
<p>Don't have an account. Then <%= link_to "sign up", new_user_registration_path %>.</p>
-<div>Sign in</div>
+<h2>Sign in</h2>
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<p><%= f.label :email %><br />
- <%= f.email_field :email %></p>
+ <%= f.email_field :email, :class => "forms" %></p>
<p><%= f.label :password %><br />
- <%= f.password_field :password %></p>
+ <%= f.password_field :password, :class => "forms" %></p>
<% if devise_mapping.rememberable? -%>
<p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
app/views/devise/unlocks/new.html.erb
@@ -1,4 +1,3 @@
-<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<h1>C'mon In... </h1>
<p>"You don't make friends with salad" - Homer Simpson<p>
app/views/home/index.html.erb
@@ -1,20 +1,26 @@
-<% if @creations.any? %>
- <a href="<%= url_for @creations[0] %>">
- <%= image_tag @creations[0].image_url.to_s, :width => 417, :height => 205, :class => 'photo' %>
- </a>
-<% else %>
- <a href="<%= url_for @creations[0] %>">
- <%= image_tag "cakes/Camouflage_Truck.jpg", :width => 417, :height => 205, :class => 'photo' %>
- </a>
-<% end %>
<h1>Welcome to the CakeSide</h1>
<p><em>An online community for cake artists, enthusiasists and eaters.</em></p>
-<a href="<%= url_for my_creations_path %>"> My Creations </a>
+<div class="inner_right">
+ <a href="shop.html"><img src="/images/template/button_coffee.jpg" border="0" alt="Coffee" /></a>
+ <br />
+ <br />
+ <a href="shop.html"><img src="/images/template/button_chocolate.jpg" border="0" alt="Coffee" /></a>
+</div>
+<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec malesuada facilisis erat, id sollicitudin leo sollicitudin in. Quisque quis elit eget neque convallis imperdiet in ut odio. Nunc vel lectus turpis, nec tincidunt ipsum. Pellentesque turpis tellus, pulvinar vehicula sodales a, sollicitudin egestas mauris. </p>
+<ul class="ticklist">
+ <li>Vestibulum aliquet</li>
+ <li>Enim sit amet bibendum venenatis</li>
+ <li>Dolor risus ornare orci, ac mollis </li>
+</ul>
+<p>Eros rhoncus convallis. Aliquam condimentum rhoncus ante a elementum. Praesent massa ligula, fermentum ac aliquet eu, ultricies a elit. Aliquam tincidunt lacus in nisi volutpat eleifend. urna in vulputate porttitor, mi est placerat tellus, at sagittis risus enim sit amet sapien. </p>
+<br /><br /><br /><br />
<% @creations.reverse.each_with_index do |creation, index| %>
- <a href="<%= url_for creation %>">
- <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
- </a>
- <h2><%= creation.name %></h2>
- <p><%= creation.story %> <%= link_to 'more...', creation %></p>
+ <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.story %> <%= link_to 'more...', creation %></p>
+ </div>
<% end %>
app/views/layouts/application.html.erb
@@ -7,41 +7,27 @@
<meta name="description" content="">
<meta name="author" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="shortcut icon" href="/favicon.ico">
-<script src="/javascripts/libs/modernizr-1.7.min.js"></script>
-<%= stylesheet_link_tag :all %>
-<%= csrf_meta_tag %>
-<%= yield :head %>
+ <link rel="shortcut icon" href="/favicon.ico">
+ <script src="/javascripts/libs/modernizr-1.7.min.js"></script>
+ <%= stylesheet_link_tag :all %>
+ <%= csrf_meta_tag %>
+ <%= yield :head %>
</head>
<body>
-
-
<!-- start ribbon background -->
<div id="page_bg">
<!-- start content -->
<div id="container">
<!-- start header -->
<div id="header">
- <div id="header_logo"> <a href="index.html#"><img src="/images/template/logo.png" alt="Logo" width="322" height="56" border="0" /></a> </div>
+ <div id="header_logo"> <a href="/"><img src="/images/template/logo.png" alt="Logo" width="322" height="56" border="0" /></a> </div>
<div id="header_slogan"><img src="/images/template/slogan.png" alt="Gourmet Online Shop" width="213" height="40" /></div>
</div>
<!-- end header -->
<div id="menu_container">
<ul id="navigation">
- <li class="current"><a href="index.html">Home</a></li>
- <li><a href="about.html">About</a></li>
- <li><a href="shop.html">Products</a>
- <ul class="second-level">
- <li> <a href="index.html#">Product 1</a> </li>
- <li> <a href="index.html#">Product 2</a> </li>
- <li> <a href="index.html#">Product 3</a> </li>
- <li> <a href="index.html#">Product 4</a> </li>
- <li> <a href="index.html#">Product 5</a> </li>
- </ul>
- </li>
- <li><a href="index.html#">Gifts</a></li>
- <li><a href="index.html#">Stores</a></li>
- <li><a href="index.html#">FAQ</a></li>
+ <li class="current"><%= link_to "home", home_index_path %></li>
+ <li><%= link_to "Browse", creations_path %></li>
<li class="last"><a href="contact.html">Contact</a></li>
</ul>
</div>
@@ -52,28 +38,18 @@
<div id="body_text">
<!-- begin main page content -->
-<% form_tag(search_index_path, :method => "get") do %>
- <%= text_field_tag(:q) %>
- <%= submit_tag("search") %>
-<% end %>
-
+<div class="floatRight">
<% if user_signed_in? %>
- <%= link_to "sign out", destroy_user_session_path %> </p>
-<% else %>
- <%= link_to "sign in", new_user_session_path %>
-<% end %>
-
-<%= link_to "home", home_index_path %>
-<%= link_to "browse", creations_path %>
-<a href="<%= url_for home_index_path %>.xml"><p>SUBCRIBE to RSS</p></a>
-
-<% if user_signed_in? %>
- signed in as <%= link_to current_user.name, edit_user_registration_path %>
+ signed in as <%= link_to current_user.name, edit_user_registration_path %> |
+ <a href="<%= url_for my_creations_path %>">my creations</a> |
+ <%= link_to "sign out", destroy_user_session_path %>
<% else %>
<%= link_to "sign up", new_user_registration_path %> or <%= link_to "sign in", new_user_session_path %>
<% end %>
+</div>
<%= yield %>
+
<!-- end main page content -->
</div>
</div>
@@ -83,59 +59,62 @@
<div style="position:relative; margin-top:-47px; width:147px; height:93px; background:url(/images/template/tag_top.gif);"></div>
<div class="tag">
<ul>
- <li><a href="index.html#">Father's Day</a></li>
- <li><a href="index.html#">Chocolates</a></li>
- <li><a href="index.html#">Fudge</a></li>
- <li><a href="index.html#">Lollies</a></li>
- <li><a href="index.html#">Hampers</a></li>
- <li><a href="index.html#">Special Diet</a></li>
- <li><a href="index.html#">On Sale</a></li>
+ <li><a href="/">Father's Day</a></li>
+ <li><a href="/">Chocolates</a></li>
+ <li><a href="/">Fudge</a></li>
+ <li><a href="/">Lollies</a></li>
+ <li><a href="/">Hampers</a></li>
+ <li><a href="/">Special Diet</a></li>
+ <li><a href="/">On Sale</a></li>
</ul>
<p> </p>
</div>
<!-- end left menu -->
<!-- start search tag -->
<div id="search_box">
- <form action="index.html#" method="get" name="search">
- <div>
+ <% form_tag(search_index_path, :method => "get", :name => "search") do %>
<div id="search_box_inner">
- <input name="search_query" id="search_query" type="text" style="" value=" SEARCH" onfocus="if(this.value==' SEARCH')this.value='';" />
+ <input name="q" id="search_query" type="text" style="" value=" SEARCH" onfocus="if(this.value==' SEARCH')this.value='';" />
+ <%# <%= text_field_tag(:q) %>
</div>
<!-- set padding-top:1px in IE 6 and 7 if statement -->
<div id="search_box_go">
<input type="image" src="/images/template/go.gif" alt="Go!" style="margin:0px; padding:0px;" />
+ <%# <%= submit_tag("search") %>
</div>
- </div>
- </form>
+ <% end %>
</div>
<!-- end search -->
- <div id="shopping_cart_summary">
- <div> <a href="index.html#">3 Items</a> | <a href="index.html#">$2.00</a> </div>
- <div> <a href="index.html#">Check out</a> </div>
- </div>
</div>
<hr class="clear" />
</div>
<!-- start footer -->
<div id="footer">
- <div style="float:left">© Candy Cakes</div>
- <div style="float:right; "><a href="http://themeforest.net/user/dtbaker/portfolio?ref=dtbaker">Template design by dtbaker</a> | <a href="index.html#">Privacy Policy</a> | <a href="sitemap.php">Site Map</a></div>
+ <div class="floatLeft">© Candy Cakes</div>
+ <div class="floatRight">
+ <a href="/">Privacy Policy</a> |
+ <a href="sitemap.php">Site Map</a>
+ </div>
</div>
<!-- end footer -->
</div>
</div>
-<!-- end content --><script type="text/javascript">
-
-
-
+<!-- end content -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
<%= javascript_include_tag :all %>
+<script type="text/javascript" src="/javascripts/template/jquery.cycle.all.js"></script>
+<script type="text/javascript" src="/javascripts/template/hide-select.js"></script>
+<script type="text/javascript">
+ $(function() {
+ $('#s1').cycle({fx:'fade',speed:1500,timeout:4000});
+ });
+</script>
<!--[if lt IE 7 ]>
- <script src="javascripts/libs/dd_belatedpng.js"></script>
+ <script src="/javascripts/libs/dd_belatedpng.js"></script>
<script> DD_belatedPNG.fix('img, .png_bg');</script>
<![endif]-->
- <script>
+ <script type="text/javascript">
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']]; // Change UA-XXXXX-X to be your site's ID
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
app/views/profiles/show.html.erb
@@ -1,14 +1,19 @@
-<img src="" width="417px" heigh="205px" alt="" class="photo" />
<h1><%= @profile.name %></h1>
+<%= image_tag avatar_url(@profile), :class => "photo" %>
+<% if @profile == current_user %>
+ <a href="http://en.gravatar.com/">change your photo</a>
+<% end %>
<p><em>A member since <%= @profile.created_at %>, with <%= @profile.creations.length %> creations.</em></p>
-<div><%= @profile.name %></div>
+<hr />
<% @profile.creations.reverse.each_with_index do |creation, index| %>
+ <div class="product_box">
<a href="<%= url_for creation %>">
<%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
</a>
<h2><%= creation.name %></h2>
<p><%= creation.story %> <%= link_to 'more...', creation %></p>
+</div>
<% end %>
app/views/registrations/edit.html.erb
@@ -1,35 +1,36 @@
-<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<h1>C'mon In... </h1>
<p>"You don't make friends with salad" - Homer Simpson<p>
-<div>Edit <%= resource_name.to_s.humanize %></div>
<div class="floatRight">
<%= link_to "my other authentications", authentications_path %>
</div>
+<h2>Update My Account</h2>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>
- <p><%= f.label :name %><br />
- <%= f.text_field :name %></p>
+ <fieldset class="cute_form">
+ <%= f.label :name %>
+ <%= f.text_field :name, :class => "forms" %>
- <p><%= f.label :email %><br />
- <%= f.email_field :email %></p>
+ <%= f.label :email %>
+ <%= f.email_field :email, :class => "forms" %>
- <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
- <%= f.password_field :password %></p>
+ <%= f.label :password %> <i>(leave blank if you don't want to change it)</i>
+ <%= f.password_field :password, :class => "forms" %>
- <p><%= f.label :password_confirmation %><br />
- <%= f.password_field :password_confirmation %></p>
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, :class => "forms" %>
- <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
- <%= f.password_field :current_password %></p>
+ <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i>
+ <%= f.password_field :current_password, :class => "forms" %>
- <p><%= f.submit "Update" %></p>
+ <input type="image" src="/images/template/button_submit.gif" class="submit_button" />
+ </fieldset>
<% end %>
-<div>Cancel my account</div>
+<h2>Cancel My Account</h2>
-<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %></p>
<%= link_to "Back", :back %>
app/views/registrations/new.html.erb
@@ -1,24 +1,24 @@
-<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
<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>
+<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 %></p>
+ <%= f.text_field :name, :class => "forms" %></p>
<p><%= f.label :email %><br />
- <%= f.email_field :email %></p>
+ <%= f.email_field :email, :class => "forms" %></p>
<p><%= f.label :password %><br />
- <%= f.password_field :password %></p>
+ <%= f.password_field :password, :class => "forms" %></p>
<p><%= f.label :password_confirmation %><br />
- <%= f.password_field :password_confirmation %></p>
+ <%= f.password_field :password_confirmation, :class => "forms" %></p>
<p><%= f.submit "Sign up" %></p>
<% end %>
public/stylesheets/styles.css
@@ -6,7 +6,7 @@ body {
margin: 0px;
padding: 0px;
color: #241a10;
- background:#c9e4ec url(../images/template/page_bg.gif);
+ background:#c9e4ec url(/images/template/page_bg.gif);
}
a, a:link, a:active, a:visited {
color: #605646;
@@ -15,7 +15,7 @@ a:hover {
text-decoration:none;
}
#page_bg {
- background:url(../images/template/ribbon.gif) no-repeat center 108px;
+ background:url(/images/template/ribbon.gif) no-repeat center 108px;
}
#container {
width:850px;
@@ -25,7 +25,7 @@ a:hover {
#header {
height: 108px;
padding: 0px;
- background-image:url(../images/template/header_bg.jpg);
+ background-image:url(/images/template/header_bg.jpg);
background-position:top;
background-repeat:no-repeat;
}
@@ -43,7 +43,7 @@ a:hover {
}
#mainContent {
padding:0px;
- background:#fffdee url(../images/template/body_top_shadow.jpg);
+ background:#fffdee url(/images/template/body_top_shadow.jpg);
background-repeat:repeat-x;
background-position:top;
min-height:400px;
@@ -166,7 +166,7 @@ ul#navigation ul.second-level li.hover a, ul#navigation ul.second-level li:hover
/*Tag Menu*/
.tag {
- background-image:url(../images/template/tag_bottom.gif);
+ background-image:url(/images/template/tag_bottom.gif);
background-repeat:no-repeat;
background-position:0px bottom;
width:148px;
@@ -184,10 +184,10 @@ ul#navigation ul.second-level li.hover a, ul#navigation ul.second-level li:hover
padding:0 0 0 15px;
margin:0px 0px 0px 8px; /* used to center the menu on its bg image */
line-height:22px;
- background:url(../images/template/tag_line.gif) no-repeat 0 bottom;
+ background:url(/images/template/tag_line.gif) no-repeat 0 bottom;
}
.tag a, .tag a:link, .tag a:visited {
- background-image:url(../images/template/tag_icon.gif);
+ background-image:url(/images/template/tag_icon.gif);
background-position:left;
background-repeat:no-repeat;
display:block;
@@ -226,7 +226,7 @@ ul#navigation ul.second-level li.hover a, ul#navigation ul.second-level li:hover
border:0px;
padding:3px 0px 0px 6px;
margin:0px 0px 0px 5px;
- background-image:url(../images/template/search.gif);
+ background-image:url(/images/template/search.gif);
background-repeat:no-repeat;
background-position:left;
width:105px;
@@ -238,7 +238,7 @@ ul#navigation ul.second-level li.hover a, ul#navigation ul.second-level li:hover
}
/*Shopping Cart On the Menu*/
#shopping_cart_summary {
- background:url(../images/template/we_accept.gif) no-repeat;
+ background:url(/images/template/we_accept.gif) no-repeat;
width:142px;
height:71px;
color:#8f6637;
@@ -339,7 +339,7 @@ ul.ticklist {
}
ul.ticklist li {
list-style:none;
- background-image:url(../images/template/icon_tick.gif);
+ background-image:url(/images/template/icon_tick.gif);
background-position:left 3px; /*the number here moves the tick down*/
background-repeat:no-repeat;
margin:0px 0px 5px 0px;
@@ -369,10 +369,11 @@ th { /*top row of the table*/
background-color:#FFFFFF;
}
/*SHOP*/
-
+ /* 285px 140px 287px 190px */
+ /* 130px 87px 132px 137px */
.product_box {
- width:132px; /*140px minus padding*/
- height:137px;
+ width:287px; /*140px minus padding*/
+ height:220px;
float:left;
background-color:#FFFFFF;
border:1px solid #e2dacf;
@@ -417,24 +418,23 @@ th { /*top row of the table*/
.pink {
color:#f07398;
}
-#contact {
+.cute_form {
border:0;
- width:480px;
}
-#contact label {
+.cute_form label {
float:left;
- width:80px;
- margin-right:15px;
+ width:180px;
+ margin-right:5px;
clear:left;
color:#f07398;
font-weight:bold;
text-align:right;
height:32px;
}
-#contact input, #contact textarea {
+.cute_form input, .cute_form textarea {
margin-right:40px;
}
-#contact #submit {
+.cute_form .submit_button {
clear:left;
margin-left:95px;
}