Commit aae58125

@@ -7,7 +7,7 @@ class AvatarsController < ApplicationController
 
   def update
     @avatar.attach(params[:avatar][:avatar])
-    redirect_to avatar_path(current_user), :notice => 'Your avatar has been updated.'
+    redirect_to edit_avatar_path(current_user), :notice => 'Your avatar has been updated.'
   end
 
   protected 

@@ -1,1 +1,19 @@
 <%= render :partial => "shared/account_nav" %>
+
+<div class="row">
+  <div class="span12">
+    <%= avatar_for(current_user) %>
+    <%= form_for(avatar_path(@avatar), :method => :put, :multipart => true) do |f| %>
+      <div class="control-group">
+        <div class="controls">
+          <%= f.file_field :avatar %>
+        </div>
+      </div>
+      <div class="control-group">
+        <div class="controls">
+          <%= f.submit "Upload picture", :class => "btn btn-primary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

@@ -62,25 +62,3 @@ $(function(){
     <% end %>
   </div>
 </div>
-<div id="change-avatar-dialog" class="modal hide fade">
-  <%= form_tag(edit_avatar_path(current_user), :method => :put, :multipart => true) do |f| %>
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal">x</button>
-      <h3>Change My Picture</h3>
-    </div>
-    <div class="modal-body">
-      <p style="margin-left:auto; margin-right:auto;text-align:center;"> 
-        <%= avatar_for(current_user) %>
-      </p>
-      <p style="margin-left:auto; margin-right:auto;text-align:center;">
-      <%= fields_for Avatar.new do |f| %>
-        <%= f.file_field :avatar, :rel => edit_avatar_path(current_user) %>
-      <% end %>
-      </p>
-    </div>
-    <div class="modal-footer">
-      <input type="submit" class="btn btn-primary" value="Save changes" />
-      <a href="#" class="btn" data-dismiss="modal">Close</a>
-    </div>
-  <% end %>
-</div>