Commit e0e22164
Changed files (8)
app
views
creations
home
layouts
profiles
registrations
app/views/creations/_form.html.erb
@@ -33,7 +33,7 @@
</div>
-->
<div class="clearfix">
- <%= f.label :story %><br />
+ <%= f.label :story, "Description" %><br />
<div class="input">
<%= f.text_area :story, :class =>"xxlarge", :rows => "3" %>
<span class="help-block">
app/views/creations/crop.html.erb
@@ -12,7 +12,7 @@ $(function() {
$('#cropbox').Jcrop({
onChange: update_crop,
onSelect: update_crop,
- setSelect: [100, 100, 210, 150],
+ setSelect: [50, 50, 210, 150],
aspectRatio: 1.4
});
}catch(e){
@@ -51,6 +51,7 @@ function update_crop(coords) {
</div>
<div class="row">
<div class="span12">
+ <h3>Do you want to crop the image as well?</h3>
<%= image_tag @creation.image_url, :id => "cropbox" %>
</div>
<div class="span4">
@@ -62,13 +63,12 @@ function update_crop(coords) {
</div>
<div class="row">
<div class="span16">
- <h2>Next</h2>
<%= form_for @creation, :url => creations_crop_update_path(@creation) do |f| %>
<% for attribute in [:crop_x, :crop_y, :crop_h, :crop_w] %>
<%= f.hidden_field attribute, :id => attribute %>
<% end %>
- <div class="well">
- <%= f.submit "Publish", :class => "btn large primary" %>
+ <div class="actions">
+ <%= f.submit "Crop and Publish", :class => "btn large primary" %>
<%# <a class="btn large primary" href="#">Publish</a>%>
<a class="btn large" href="<%= url_for creation_path(@creation) %>">Skip</a>
</div>
app/views/creations/new.html.erb
@@ -17,6 +17,9 @@
<div class="span4">
<div class="media-grid">
<a href="<%= url_for profile_path(current_user) %>"><img src="<%= avatar_url current_user %>&s=200" alt="<%= current_user.name %>" /></a>
- </div>
+ </div>
+ <h3><%= current_user.name %></h3>
+ <p>member since: <%= current_user.created_at.to_s :foomat %></p>
+ <p>last signed in: <%= current_user.last_sign_in_at.to_s :foomat %></p>
</div>
</div>
app/views/creations/show.html.erb
@@ -67,6 +67,6 @@
<%= render "shared/creation_image_gallery" %>
</div>
<div class="span4 media-grid">
- <a href="<%= url_for profile_path @creation.user %>"><img src="<%= avatar_url @creation.user %>&s=200" alt="<%= @creation.user.name %>" /></a>
</div>
+
</div>
app/views/home/index.html.erb
@@ -6,7 +6,7 @@
<div class="hero-unit">
<h1>Hello cake enthusiast!</h1>
<p> </p>
- <p>Do you <em>make</em> cakes, <em>sell</em> cakes, or just <em>love</em> eating them?</p>
+ <p>Do you <strong>make</strong> cakes, <strong>sell</strong> cakes, or just <strong>love</strong> eating them?</p>
<p>Then you've come to the right place!</p>
<br />
<p>CakeSide is a free site to <strong>share</strong> your cake <strong>creations</strong> and <strong>ideas</strong> with other cake fanatics like yourself!</p>
app/views/layouts/blank.html.erb
@@ -9,19 +9,73 @@
<%= javascript_include_tag "application" %>
</head>
<%# <body style="background: url(/assets/sunset.png) no-repeat center 20px #FBE47E;">%>
- <body style="background: url(/assets/bg-header.png) repeat-x center 0px #fff;">
+ <body style="background: #FFFFFF;">
<div style="background: url(/assets/sunset.png) no-repeat center 0px;">
<div class="container">
<div class="content">
<div style="height:625px;">
<%= yield %>
</div>
- <footer>
- <p>© Cakeside 2011</p>
- </footer>
</div>
</div> <!-- /container -->
</div>
+ <footer>
+ <div class="container">
+ <div class="row">
+ <div class="span4">
+ <h3>CakeSide</h3>
+ <ul class="unstyled">
+ <li>
+ <a href="/">Home</a>
+ </li>
+ <li>
+ <a href="/">Sign-Up</a>
+ </li>
+ <li>
+ <a href="/">About Us</a>
+ </li>
+ <li>
+ <a href="/">Why CakeSide?</a>
+ </li>
+ </ul>
+ </div>
+ <div class="span4">
+ <h3>Contact</h3>
+ <ul class="unstyled">
+ <li>
+ <a href="http://cakeside.wufoo.com/forms/z7x3k1/" target="_blank">Send Feedback</a>
+ </li>
+ <li>
+ <a href="/">Twitter</a>
+ </li>
+ <li>
+ <a href="/">Facebook</a>
+ </li>
+ <li>
+ <a href="/"></a>
+ </li>
+ </ul>
+ </div>
+ <div class="span8"></div>
+ </div>
+ </div>
+
+
+ <div id="footer-floor">
+ <div class="container">
+ <div class="row">
+ <div class="span10">
+ <p>Copyright © 2012 CakeSide Inc. | <a href="/terms.html"> Terms</a> & <a href="/privacy.html"> Privacy</a> | Contact Us <a href="http://twitter.com/cakeside">@cakeside</a> | <a href="https://www.facebook.com/pages/CakeSide/214607468615074">facebook</a></p>
+ </div>
+ <div class="span6">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </footer>
+
+
<%= render "shared/google_analytics" %>
</body>
</html>
app/views/profiles/mine.html.erb
@@ -15,7 +15,7 @@
<div class="media-grid">
<a href="<%= url_for profile_path(current_user) %>"><img src="<%= avatar_url current_user %>&s=200" alt="<%= current_user.name %>" /></a>
</div>
- <h2><%= current_user.name %></h2>
+ <h3><%= current_user.name %></h3>
<p>member since: <%= current_user.created_at.to_s :foomat %></p>
<p>last signed in: <%= current_user.last_sign_in_at.to_s :foomat %></p>
<a href="http://en.gravatar.com/" target="_blank">Change My Photo</a>
app/views/registrations/edit.html.erb
@@ -47,6 +47,9 @@
<a href="<%= url_for profile_path(current_user) %>"><img src="<%= avatar_url current_user %>&s=200" alt="<%= current_user.name %>" /></a>
</div>
<a href="http://en.gravatar.com/" target="_blank">Change My Photo</a>
+ <p>member since: <%= current_user.created_at.to_s :foomat %></p>
+ <p>last signed in: <%= current_user.last_sign_in_at.to_s :foomat %></p>
+
<h4>Cancel My Account</h4>
<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => "btn danger" %></p>
</div>