Commit 819e29cb
Changed files (3)
app
views
app/views/creations/new.html.erb
@@ -3,6 +3,12 @@
<% end %>
<div class="row">
<div class="span3">
+ <div class="thumbnail">
+ <img src="<%= avatar_url current_user %>&s=260" alt="<%= current_user.name %>" />
+ <div class="caption">
+ <h5><%= current_user.name %></h5>
+ </div>
+ </div>
<div style="padding: 8px 0;" class="well">
<ul class="nav nav-list">
<li class="nav-header">Creations</li>
@@ -21,17 +27,4 @@
<div class="span6">
<%= render 'form' %>
</div>
- <div class="span3">
-
- <div class="thumbnail">
- <img src="<%= avatar_url current_user %>&s=260" alt="<%= current_user.name %>" />
- <div class="caption">
- <h5><%= current_user.name %></h5>
- <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>
-
-
- </div>
</div>
app/views/profiles/favorites.html.erb
@@ -1,6 +1,12 @@
<% content_for :title do %>My Favorites<% end %>
<div class="row">
<div class="span3">
+ <div class="thumbnail">
+ <img src="<%= avatar_url current_user %>&s=260" alt="<%= current_user.name %>" />
+ <div class="caption">
+ <h5><%= current_user.name %></h5>
+ </div>
+ </div>
<div style="padding: 8px 0;" class="well">
<ul class="nav nav-list">
<li class="nav-header">Creations</li>
@@ -15,7 +21,7 @@
</ul>
</div>
</div>
- <div class="span6">
+ <div class="span9">
<h2>My Favorites</h2>
<ul class="thumbnails">
<% @creations.each do |creation| %>
@@ -23,15 +29,4 @@
<% end %>
</ul>
</div>
- <div class="span3">
- <div class="thumbnail">
- <img src="<%= avatar_url current_user %>&s=260" alt="<%= current_user.name %>" />
- <div class="caption">
- <h5><%= current_user.name %></h5>
- <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>
- <p><a class="btn btn-primary" href="http://gravatar.com/emails" target="_blank">Change My Picture</a></p>
- </div>
- </div>
- </div>
</div>
app/views/registrations/edit.html.erb
@@ -6,6 +6,15 @@
<% end %>
<div class="row">
<div class="span3">
+ <div class="thumbnail">
+ <img src="<%= avatar_url current_user %>&s=260" alt="<%= current_user.name %>" />
+ <div class="caption">
+ <h5><%= current_user.name %></h5>
+ <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>
+ <p><a class="btn btn-primary" href="http://gravatar.com/emails" target="_blank">Change My Picture</a></p>
+ </div>
+ </div>
<div style="padding: 8px 0;" class="well">
<ul class="nav nav-list">
<li class="nav-header">Creations</li>
@@ -22,7 +31,7 @@
<h4>Cancel My Account</h4>
<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => "btn btn-danger" %></p>
</div>
- <div class="span6">
+ <div class="span9">
<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, :class=> "form-horizontal" }) do |f| %>
@@ -87,15 +96,4 @@
</fieldset>
<% end %>
</div>
- <div class="span3">
- <div class="thumbnail">
- <img src="<%= avatar_url current_user %>&s=260" alt="<%= current_user.name %>" />
- <div class="caption">
- <h5><%= current_user.name %></h5>
- <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>
- <p><a class="btn btn-primary" href="http://gravatar.com/emails" target="_blank">Change My Picture</a></p>
- </div>
- </div>
- </div>
</div>