update with changes from Production branch

app/views/users/edit_profile.html.erb

@@ -0,0 +1,43 @@
+<div class="col-sm-8 col-xs-7">
+
+  <ol class="breadcrumb">
+    <li><%= link_to t(:myaccount), account_path %></li>
+    <li class="active"><%= t(:profile_edit) %></li>
+  </ol>
+
+
+  <%= form_for @user, :url => update_profile_path, :html => {:class => 'form-horizontal'} do |f| %>
+    <input name='userlogin' class='userlogin' />
+
+    <div class="form-group">
+      <div class="col-sm-offset-4 col-sm-8 col-xs-offset-3 col-xs-6">
+        <div class="checkbox">
+          <label>
+            <%= f.check_box :public_flag %>
+            <%= t(:public) %>
+          </label>
+        </div>
+      </div>
+    </div>
+
+    <div class="form-group">
+      <label class="col-sm-4 col-xs-3 control-label"><%= t(:profile_website) %></label>
+      <div class="col-sm-8 col-xs-6"><%= f.text_field :website, :class => 'form-control' %></div>
+    </div>
+
+
+    <div class="form-group">
+      <label class="col-sm-4 col-xs-3 control-label"><%= t(:profile_bio) %></label>
+      <div class="col-sm-8 col-xs-6"><%= f.text_area :bio, :class => 'form-control', :rows => 4 %></div>
+    </div>
+
+
+    <div class="form-group">
+      <label class="col-sm-4 control-label"></label>
+      <div class="col-sm-8"><p class="form-control-static"><%= f.submit t(:profile_update), :class => 'btn btn-primary' %></p></div>
+    </div>
+
+  <% end %>
+
+</div>
+