Commit 7ebb5c9a
Changed files (5)
app
views
creations
profiles
registrations
shared
app/views/creations/_form.html.erb
@@ -11,30 +11,55 @@
<% end %>
<fieldset>
- <p>
- <%= f.label :name %><br />
- <%= f.text_field :name, :class => "forms" %>
- </p>
- <p>
- <%= f.label :image, "Upload Image" %><br />
- <%= f.file_field :image, :class => "forms" %>
- </p>
- <p>
- <%= f.label :remote_image_url, "Or Image URL" %><br />
- <%= f.text_field :remote_image_url, :class => "forms" %>
- </p>
- <p>
- <%= f.label :story %><br />
- <%= f.text_area :story, :class => "forms" %>
- </p>
- <% for category in Category.all %>
- <div>
- <label>
- <%= check_box_tag "creation[category_ids][]", category.id, @creation.categories.include?(category) %>
- <%= category.name %>
- </label>
+ <legend>Share a new creation</legend>
+ <div class="clearfix">
+ <%= f.label :name %>
+ <div class="input">
+ <%= f.text_field :name, :class => "xlarge" %>
</div>
- <% end %>
- <input type="submit" id="submit" name="submit" value="share" />
+ </div><!-- /clearfix -->
+ <div class="clearfix">
+ <%= f.label :image, "Upload Image" %>
+ <div class="input">
+ <%= f.file_field :image, :class => "input-file" %>
+ </div>
+ </div><!-- /clearfix -->
+ <div class="clearfix">
+ <%= f.label :remote_image_url, "Or Image URL" %><br />
+ <div class="input">
+ <%= f.text_field :remote_image_url, :class=>"xlarge" %>
+ </div>
+ </div><!-- /clearfix -->
+ <div class="clearfix">
+ <%= f.label :story %><br />
+ <div class="input">
+ <%= f.text_area :story, :class =>"xxlarge", :rows => "3" %>
+ <span class="help-block">
+ Block of help text to describe the field above if need be.
+ </span>
+ </div>
+ </div><!-- /clearfix -->
+ <div class="clearfix">
+ <label id="optionsCheckboxes">Categories</label>
+ <div class="input">
+ <ul class="inputs-list">
+ <% for category in Category.all %>
+ <li>
+ <label>
+ <%= check_box_tag "creation[category_ids][]", category.id, @creation.categories.include?(category) %>
+ <span><%= category.name %></span>
+ </label>
+ </li>
+ <% end %>
+ </ul>
+ <span class="help-block">
+ <strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.
+ </span>
+ </div>
+ </div><!-- /clearfix -->
+
+ <div class="actions">
+ <input type="submit" class="btn primary" value="Save changes"> <button type="reset" class="btn">Cancel</button>
+ </div>
</fieldset>
<% end %>
app/views/creations/new.html.erb
@@ -6,10 +6,19 @@
<%= render "shared/my_profile_sidebar" %>
<% end %>
-<div class="grid_9 alpha omega">
- <h1>Share your creation with other Cake artists, enthusiasts, and eaters!</h1>
- <p>We're delighted that you're going to share your latest creation with us.<p>
- <h2>Share My Latest Creation</h2>
- <%= render 'form' %>
-</div>
-<div class="clear" />
+<ul class="tabs">
+ <li> <%= link_to "Profile", profiles_mine_path %></li>
+ <li class="active"> <%= link_to "Share", new_creation_path %></li>
+ <li><a href="#">Messages</a></li>
+ <li> <%= link_to "Settings", edit_user_registration_path %> </li>
+ <li><a href="#">Contact</a></li>
+</ul>
+
+<%# <div class="hero-unit">%>
+<%# <h1>Share your creation with other Cake artists, enthusiasts, and eaters!</h1>%>
+<%# <p>We're delighted that you're going to share your latest creation with us.<p>%>
+<%# <p><a class="btn primary large">Learn more »</a></p>%>
+<%# </div>%>
+
+<h2>Share My Latest Creation</h2>
+<%= render 'form' %>
app/views/profiles/mine.html.erb
@@ -8,5 +8,11 @@
<%= render "shared/my_profile_sidebar" %>
<% end %>
-<h1>My Creations</h1>
+<ul class="tabs">
+ <li class="active"> <%= link_to "Profile", profiles_mine_path %></li>
+ <li><a href="#">Messages</a></li>
+ <li> <%= link_to "Settings", edit_user_registration_path %> </li>
+ <li><a href="#">Contact</a></li>
+</ul>
+
<%= render "shared/creation_thumbs" %>
app/views/registrations/edit.html.erb
@@ -8,54 +8,52 @@
<%= render "shared/my_profile_sidebar" %>
<% end %>
-<div class="grid_9 alpha omega">
- <div class="grid_6 alpha">
-
- <h1>Update My Account</h1>
- <p>
- If you prefer not to change your password, then just leave it blank.
- </p>
+<ul class="tabs">
+ <li> <%= link_to "Profile", profiles_mine_path %></li>
+ <li> <%= link_to "Share", new_creation_path %></li>
+ <li><a href="#">Messages</a></li>
+ <li class="active"> <%= link_to "Settings", edit_user_registration_path %> </li>
+ <li><a href="#">Contact</a></li>
+</ul>
+
+<div class="row">
+ <div class="span8">
+ <h1>Settings</h1>
+ <p> If you prefer not to change your password, then just leave it blank. </p>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>
-
<fieldset>
- <p>
- <%= f.label :name, :style => 'display:block;' %>
- <%= f.text_field :name %>
- </p>
-
- <p>
- <%= f.label :email, :style => 'display:block;' %>
- <%= f.email_field :email %>
- </p>
-
- <p>
- <%= f.label :password, :style => 'display:block;' %>
- <%= f.password_field :password %>
- </p>
-
- <p>
- <%= f.label :password_confirmation, :style => 'display:block;' %>
- <%= f.password_field :password_confirmation %>
- </p>
-
- <p>
- <%= f.label :current_password, :style => 'display:block;' %>
- <%= f.password_field :current_password %>
- </p>
-
- <input type="submit" value="update" />
+ <legend>Update your settings</legend>
+ <div class="clearfix">
+ <%= f.label :name %>
+ <div class="input"> <%= f.text_field :name, :class => "xlarge" %> </div>
+ </div><!-- /clearfix -->
+ <div class="clearfix">
+ <%= f.label :email %>
+ <div class="input"> <%= f.email_field :email, :class => "xlarge" %> </div>
+ </div><!-- /clearfix -->
+ <div class="clearfix">
+ <%= f.label :password %>
+ <div class="input"> <%= f.password_field :password, :class => "xlarge" %> </div>
+ </div><!-- /clearfix -->
+ <div class="clearfix">
+ <%= f.label :password_confirmation %>
+ <div class="input"> <%= f.password_field :password_confirmation, :class => "xlarge" %> </div>
+ </div><!-- /clearfix -->
+ <div class="clearfix">
+ <%= f.label :current_password %>
+ <div class="input"> <%= f.password_field :current_password, :class => "xlarge" %> </div>
+ </div><!-- /clearfix -->
+ <div class="actions">
+ <input type="submit" class="btn primary" value="Save changes"> <button type="reset" class="btn">Cancel</button>
+ </div>
</fieldset>
<% end %>
</div>
-
- <div class="grid_3 omega">
- <div class="helpbox">
- <h4>Cancel My Account</h4>
- <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %></p>
- </div>
+ <div class="span4"> </div>
+ <div class="span4">
+ <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>
+ <a href="http://en.gravatar.com/" target="_blank">Change My Photo</a>
</div>
</div>
-<div class="clear" />
-
-