upgrade avatar upload and change password page.

2 files changed, 20 insertions, 38 deletions

diff --git a/app/views/my/avatars/new.html.erb b/app/views/my/avatars/new.html.erb
index 00578ada..f117caed 100644
--- a/app/views/my/avatars/new.html.erb
+++ b/app/views/my/avatars/new.html.erb
@@ -1,20 +1,14 @@
-<div class="row-fluid">
-  <div class="span2">
+<div class="row">
+  <div class="col-3">
     <%= render partial: "my/shared/my_nav" %>
   </div>
-  <div class="span10">
+  <div class="col-9">
     <%= avatar_for(current_user) %>
     <%= form_for(@avatar, url: my_avatars_path, method: :post, :multipart => true, remote: true, authenticity_token: true) do |f| %>
-      <div class="control-group">
-        <div class="controls">
-          <%= f.file_field :image %>
-        </div>
-      </div>
-      <div class="control-group">
-        <div class="controls">
-          <%= f.submit "Upload picture", :class => "btn btn-primary", data: { disable_with: "Uploading..." } %>
-        </div>
+      <div class="form-group">
+        <%= f.file_field :image, class: 'form-control' %>
       </div>
+      <%= f.submit "Upload picture", :class => "btn btn-primary", data: { disable_with: "Uploading..." } %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/my/passwords/index.html.erb b/app/views/my/passwords/index.html.erb
index e6dd33f1..a6d8c472 100644
--- a/app/views/my/passwords/index.html.erb
+++ b/app/views/my/passwords/index.html.erb
@@ -1,35 +1,23 @@
-<div class="row-fluid">
-  <div class="span2">
+<div class="row">
+  <div class="col-3">
     <%= render partial: "my/shared/my_nav" %>
   </div>
-  <div class="span10">
-    <div class="page-header">
-      <h1>Change Password</h1>
-    </div>
+  <div class="col-9">
+    <h1>Change Password</h1>
     <%= form_for @user, url: my_password_path(@user), html: { method: :patch, class: "form-horizontal" } do |f| %>
-      <div class="control-group">
-        <%= f.label :old_password, "Old password", class: "control-label" %>
-        <div class="controls">
-          <%= f.password_field :old_password %>
-        </div>
+      <div class="form-group">
+        <%= f.label :old_password, "Old password" %>
+        <%= f.password_field :old_password, class: 'form-control' %>
       </div>
-      <div class="control-group">
-        <%= f.label :password, "New password", class: "control-label" %>
-        <div class="controls">
-          <%= f.password_field :password %>
-        </div>
+      <div class="form-group">
+        <%= f.label :password, "New password" %>
+        <%= f.password_field :password, class: 'form-control' %>
       </div>
-      <div class="control-group">
-        <%= f.label :password_confirmation, "Confirm new password", class: "control-label" %>
-        <div class="controls">
-          <%= f.password_field :password_confirmation %>
-        </div>
-      </div>
-      <div class="control-group">
-        <div class="controls">
-          <%= f.submit "Update password", class: "btn btn-primary" %>
-        </div>
+      <div class="form-group">
+        <%= f.label :password_confirmation, "Confirm new password" %>
+        <%= f.password_field :password_confirmation, class: 'form-control' %>
       </div>
+      <%= f.submit "Update password", class: "btn btn-primary" %>
     <% end %>
   </div>
 </div>