Refactored profile to resource. Added missing flash notice on successfull update…

…d. Update username via ajax

Refactored profile to resource. Added missing flash notice on successfull update…
…d. Update username via ajax
Dmitriy Zaporozhets
1 parent 2be5e6d4
Showing 20 changed files with 345 additions and 306 deletions Show diff stats
app/assets/javascripts/profile.js.coffee
app/controllers/profile_controller.rb
app/controllers/profiles_controller.rb
app/views/layouts/profile.html.haml
app/views/profile/account.html.haml
app/views/profile/design.html.haml
app/views/profile/history.html.haml
app/views/profile/index.html.haml
app/views/profile/show.html.haml
app/views/profile/update.js.erb
app/views/profiles/account.html.haml
app/views/profiles/design.html.haml
app/views/profiles/history.html.haml
app/views/profiles/show.html.haml
app/views/profiles/update.js.erb
app/views/profiles/update_username.js.haml
config/routes.rb
features/steps/shared/paths.rb
spec/requests/security/profile_access_spec.rb
spec/routing/routing_spec.rb
@@ -8,3 +8,13 @@ $ -&gt;
  
     # Go up the hierarchy and show the corresponding submission feedback element
     $(@).closest('fieldset').find('.update-feedback').show('highlight', {color: '#DFF0D8'}, 500)
+
+  $('.update-username form').on 'ajax:before', ->
+    $('.loading-gif').show()
+    $(this).find('.update-success').hide()
+    $(this).find('.update-failed').hide()
+
+  $('.update-username form').on 'ajax:complete', ->
+    $(this).find('.save-btn').removeAttr('disabled')
+    $(this).find('.save-btn').removeClass('disabled')
+    $(this).find('.loading-gif').hide()
@@ -1,47 +0,0 @@
-class ProfileController < ApplicationController
-  before_filter :user
-
-  def show
-  end
-
-  def design
-  end
-
-  def update
-    @user.update_attributes(params[:user])
-
-    respond_to do |format|
-      format.html { redirect_to :back }
-      format.js
-    end
-  end
-
-  def token
-  end
-
-  def password_update
-    params[:user].reject!{ |k, v| k != "password" && k != "password_confirmation"}
-
-    if @user.update_attributes(params[:user])
-      flash[:notice] = "Password was successfully updated. Please login with it"
-      redirect_to new_user_session_path
-    else
-      render 'account'
-    end
-  end
-
-  def reset_private_token
-    current_user.reset_authentication_token!
-    redirect_to profile_account_path
-  end
-
-  def history
-    @events = current_user.recent_events.page(params[:page]).per(20)
-  end
-
-  private
-
-  def user
-    @user = current_user
-  end
-end
@@ -0,0 +1,66 @@
+class ProfilesController < ApplicationController
+  before_filter :user
+  layout 'profile'
+
+  def show
+  end
+
+  def design
+  end
+
+  def account
+  end
+
+  def update
+    if @user.update_attributes(params[:user])
+      flash[:notice] = "Profile was successfully updated"
+    else
+      flash[:alert] = "Failed to update profile"
+    end
+
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js
+    end
+  end
+
+  def token
+  end
+
+  def update_password
+    params[:user].reject!{ |k, v| k != "password" && k != "password_confirmation"}
+
+    if @user.update_attributes(params[:user])
+      flash[:notice] = "Password was successfully updated. Please login with it"
+      redirect_to new_user_session_path
+    else
+      render 'account'
+    end
+  end
+
+  def reset_private_token
+    if current_user.reset_authentication_token!
+      flash[:notice] = "Token was successfully updated"
+    end
+
+    redirect_to account_profile_path
+  end
+
+  def history
+    @events = current_user.recent_events.page(params[:page]).per(20)
+  end
+
+  def update_username
+    @user.update_attributes(username: params[:user][:username])
+
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  private
+
+  def user
+    @user = current_user
+  end
+end
@@ -6,17 +6,17 @@
     = render "layouts/head_panel", title: "Profile"
     .container
       %ul.main_menu
-        = nav_link(path: 'profile#show', html_options: {class: 'home'}) do
+        = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
           = link_to "Profile", profile_path
-        = nav_link(path: 'profile#account') do
-          = link_to "Account", profile_account_path
+        = nav_link(path: 'profiles#account') do
+          = link_to "Account", account_profile_path
         = nav_link(controller: :keys) do
           = link_to keys_path do
             SSH Keys
             %span.count= current_user.keys.count
-        = nav_link(path: 'profile#design') do
-          = link_to "Design", profile_design_path
-        = nav_link(path: 'profile#history') do
-          = link_to "History", profile_history_path
+        = nav_link(path: 'profiles#design') do
+          = link_to "Design", design_profile_path
+        = nav_link(path: 'profiles#history') do
+          = link_to "History", history_profile_path
  
       .content= yield
@@ -1,69 +0,0 @@
-- if Gitlab.config.omniauth_enabled?
-  %fieldset
-    %legend Social Accounts
-    .oauth_select_holder
-      %p.hint Tip: Click on icon to activate sigin with one of the following services
-      - User.omniauth_providers.each do |provider|
-        %span{class: oauth_active_class(provider) }
-          = link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
-
-
-
-%fieldset
-  %legend
-    Private token
-    %span.cred.right
-      keep it secret!
-  .padded
-    = form_for @user, url: profile_reset_private_token_path, method: :put do |f|
-      .data
-        %p.slead
-          Private token used to access application resources without authentication.
-          %br
-          It can be used for atom feed or API
-        %p.cgray
-          - if current_user.private_token
-            = text_field_tag "token", current_user.private_token, class: "xxlarge large_text"
-            = f.submit 'Reset', confirm: "Are you sure?", class: "btn primary btn-build-token"
-          - else
-            %span You don`t have one yet. Click generate to fix it.
-            = f.submit 'Generate', class: "btn success btn-build-token"
-
-%fieldset
-  %legend Password
-  = form_for @user, url: profile_password_path, method: :put do |f|
-    .padded
-      %p.slead After successful password update you will be redirected to login page where you should login with new password
-      -if @user.errors.any?
-        .alert-message.block-message.error
-          %ul
-            - @user.errors.full_messages.each do |msg|
-              %li= msg
-
-      .clearfix
-        = f.label :password
-        .input= f.password_field :password, required: true
-      .clearfix
-        = f.label :password_confirmation
-        .input
-          = f.password_field :password_confirmation, required: true
-      .clearfix
-        .input
-          = f.submit 'Save password', class: "btn save-btn"
-
-
-
-%fieldset
-  %legend
-    Username
-    %small.right
-      Changing your username can have unintended side effects!
-  = form_for @user, url: profile_update_path,  method: :put do |f|
-    .padded
-      = f.label :username
-      .input
-        = f.text_field :username, required: true
-      .input
-        = f.submit 'Save username', class: "btn save-btn"
-
-
@@ -1,52 +0,0 @@
-= form_for @user, url: profile_update_path, remote: true, method: :put do |f|
-  %fieldset.application-theme
-    %legend
-      Application theme
-      .update-feedback.hide
-        %i.icon-ok
-        Saved
-    .themes_opts
-      = label_tag do
-        .prev.default
-        = f.radio_button :theme_id, 1
-        Default
-
-      = label_tag do
-        .prev.classic
-        = f.radio_button :theme_id, 2
-        Classic
-
-      = label_tag do
-        .prev.modern
-        = f.radio_button :theme_id, 3
-        Modern
-
-      = label_tag do
-        .prev.gray
-        = f.radio_button :theme_id, 4
-        SlateGray
-
-      = label_tag do
-        .prev.violet
-        = f.radio_button :theme_id, 5
-        Violet
-    %br
-    .clearfix
-
-  %fieldset.code-preview-theme
-    %legend
-      Code preview theme
-      .update-feedback.hide
-        %i.icon-ok
-        Saved
-    .code_highlight_opts
-      = label_tag do
-        .prev
-          = image_tag "white.png"
-        = f.radio_button :dark_scheme, false
-        White code preview
-      = label_tag do
-        .prev
-          = image_tag "dark.png"
-        = f.radio_button :dark_scheme, true
-        Dark code preview
@@ -1,5 +0,0 @@
-.profile_history
-  = render @events
-%hr
-= paginate @events, theme: "gitlab"
-
@@ -1 +0,0 @@
-%h1 Profile
@@ -1,82 +0,0 @@
-.profile_avatar_holder
-  = image_tag gravatar_icon(@user.email, 90)
-%h3.page_title
-  = @user.name
-  %br
-  %small
-    = @user.email
-
-%hr
-
-= form_for @user, url: profile_update_path, method: :put, html: { class: "edit_user form-horizontal" }  do |f|
-  -if @user.errors.any?
-    %div.alert-message.block-message.error
-      %ul
-        - @user.errors.full_messages.each do |msg|
-          %li= msg
-  .row
-    .span7
-      .control-group
-        = f.label :name, class: "control-label"
-        .controls
-          = f.text_field :name, class: "input-xlarge", required: true
-          %span.help-block Enter your name, so people you know can recognize you.
-      .control-group
-        = f.label :email, class: "control-label"
-        .controls
-          = f.text_field :email, class: "input-xlarge", required: true
-          %span.help-block We also use email for avatar detection.
-
-    .span5.right
-      %fieldset.tips
-        %legend Tips:
-        %ul
-          %li
-            %p You can change your password on Account page
-          -unless Gitlab.config.disable_gravatar?
-            %li
-              %p You can change your avatar at #{link_to "gravatar.com", "http://gravatar.com"}
-
-          - if Gitlab.config.omniauth_enabled? && @user.provider?
-            %li
-              %p.hint
-                You can login through #{@user.provider.titleize}!
-                = link_to "click here to change", profile_account_path
-
-  .row
-    .span7
-      .control-group
-        = f.label :skype, class: "control-label"
-        .controls= f.text_field :skype, class: "input-xlarge"
-      .control-group
-        = f.label :linkedin, class: "control-label"
-        .controls= f.text_field :linkedin, class: "input-xlarge"
-      .control-group
-        = f.label :twitter, class: "control-label"
-        .controls= f.text_field :twitter, class: "input-xlarge"
-      .control-group
-        = f.label :bio, class: "control-label"
-        .controls
-          = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
-          %span.help-block Tell us about yourself in fewer than 250 characters.
-    .span5.right
-      %fieldset
-        %legend
-          Personal projects:
-          %small.right
-            %span= current_user.my_own_projects.count
-            of
-            %span= current_user.projects_limit
-        .padded
-          .progress
-            .bar{style: "width: #{current_user.projects_limit_percent}%;"}
-
-      %fieldset
-        %legend
-          SSH public keys:
-          %strong.right= link_to current_user.keys.count, keys_path
-        .padded
-          = link_to "Add Public Key", new_key_path, class: "btn small"
-
-  .form-actions
-    = f.submit 'Save', class: "btn save-btn"
@@ -1,9 +0,0 @@
-// Remove body class for any previous theme, re-add current one
-$('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color')
-$('body').addClass('<%= app_theme %>')
-
-// Re-render the header to reflect the new theme
-$('header').html('<%= escape_javascript(render("layouts/head_panel", title: "Profile")) %>')
-
-// Re-initialize header tooltips
-$('.has_bottom_tooltip').tooltip({placement: 'bottom'})
@@ -0,0 +1,77 @@
+- if Gitlab.config.omniauth_enabled?
+  %fieldset
+    %legend Social Accounts
+    .oauth_select_holder
+      %p.hint Tip: Click on icon to activate sigin with one of the following services
+      - User.omniauth_providers.each do |provider|
+        %span{class: oauth_active_class(provider) }
+          = link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
+
+
+
+%fieldset
+  %legend
+    Private token
+    %span.cred.right
+      keep it secret!
+  .padded
+    = form_for @user, url: reset_private_token_profile_path, method: :put do |f|
+      .data
+        %p.slead
+          Private token used to access application resources without authentication.
+          %br
+          It can be used for atom feed or API
+        %p.cgray
+          - if current_user.private_token
+            = text_field_tag "token", current_user.private_token, class: "xxlarge large_text"
+            = f.submit 'Reset', confirm: "Are you sure?", class: "btn primary btn-build-token"
+          - else
+            %span You don`t have one yet. Click generate to fix it.
+            = f.submit 'Generate', class: "btn success btn-build-token"
+
+%fieldset
+  %legend Password
+  = form_for @user, url: update_password_profile_path, method: :put do |f|
+    .padded
+      %p.slead After successful password update you will be redirected to login page where you should login with new password
+      -if @user.errors.any?
+        .alert-message.block-message.error
+          %ul
+            - @user.errors.full_messages.each do |msg|
+              %li= msg
+
+      .clearfix
+        = f.label :password
+        .input= f.password_field :password, required: true
+      .clearfix
+        = f.label :password_confirmation
+        .input
+          = f.password_field :password_confirmation, required: true
+      .clearfix
+        .input
+          = f.submit 'Save password', class: "btn save-btn"
+
+
+
+%fieldset.update-username
+  %legend
+    Username
+    %small.cred.right
+      Changing your username can have unintended side effects!
+  = form_for @user, url: update_username_profile_path,  method: :put, remote: true do |f|
+    .padded
+      = f.label :username
+      .input
+        = f.text_field :username, required: true
+        &nbsp;
+        %span.loading-gif.hide= image_tag "ajax_loader.gif"
+        %span.update-success.cgreen.hide
+          %i.icon-ok
+          Saved
+        %span.update-failed.cred.hide
+          %i.icon-ok
+          Failed
+      .input
+        = f.submit 'Save username', class: "btn save-btn"
+
+
@@ -0,0 +1,52 @@
+= form_for @user, url: profile_path, remote: true, method: :put do |f|
+  %fieldset.application-theme
+    %legend
+      Application theme
+      .update-feedback.hide
+        %i.icon-ok
+        Saved
+    .themes_opts
+      = label_tag do
+        .prev.default
+        = f.radio_button :theme_id, 1
+        Default
+
+      = label_tag do
+        .prev.classic
+        = f.radio_button :theme_id, 2
+        Classic
+
+      = label_tag do
+        .prev.modern
+        = f.radio_button :theme_id, 3
+        Modern
+
+      = label_tag do
+        .prev.gray
+        = f.radio_button :theme_id, 4
+        SlateGray
+
+      = label_tag do
+        .prev.violet
+        = f.radio_button :theme_id, 5
+        Violet
+    %br
+    .clearfix
+
+  %fieldset.code-preview-theme
+    %legend
+      Code preview theme
+      .update-feedback.hide
+        %i.icon-ok
+        Saved
+    .code_highlight_opts
+      = label_tag do
+        .prev
+          = image_tag "white.png"
+        = f.radio_button :dark_scheme, false
+        White code preview
+      = label_tag do
+        .prev
+          = image_tag "dark.png"
+        = f.radio_button :dark_scheme, true
+        Dark code preview
@@ -0,0 +1,5 @@
+.profile_history
+  = render @events
+%hr
+= paginate @events, theme: "gitlab"
+
@@ -0,0 +1,82 @@
+.profile_avatar_holder
+  = image_tag gravatar_icon(@user.email, 90)
+%h3.page_title
+  = @user.name
+  %br
+  %small
+    = @user.email
+
+%hr
+
+= form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" }  do |f|
+  -if @user.errors.any?
+    %div.alert-message.block-message.error
+      %ul
+        - @user.errors.full_messages.each do |msg|
+          %li= msg
+  .row
+    .span7
+      .control-group
+        = f.label :name, class: "control-label"
+        .controls
+          = f.text_field :name, class: "input-xlarge", required: true
+          %span.help-block Enter your name, so people you know can recognize you.
+      .control-group
+        = f.label :email, class: "control-label"
+        .controls
+          = f.text_field :email, class: "input-xlarge", required: true
+          %span.help-block We also use email for avatar detection.
+
+    .span5.right
+      %fieldset.tips
+        %legend Tips:
+        %ul
+          %li
+            %p You can change your password on Account page
+          -unless Gitlab.config.disable_gravatar?
+            %li
+              %p You can change your avatar at #{link_to "gravatar.com", "http://gravatar.com"}
+
+          - if Gitlab.config.omniauth_enabled? && @user.provider?
+            %li
+              %p
+                You can login through #{@user.provider.titleize}!
+                = link_to "click here to change", account_profile_path
+
+  .row
+    .span7
+      .control-group
+        = f.label :skype, class: "control-label"
+        .controls= f.text_field :skype, class: "input-xlarge"
+      .control-group
+        = f.label :linkedin, class: "control-label"
+        .controls= f.text_field :linkedin, class: "input-xlarge"
+      .control-group
+        = f.label :twitter, class: "control-label"
+        .controls= f.text_field :twitter, class: "input-xlarge"
+      .control-group
+        = f.label :bio, class: "control-label"
+        .controls
+          = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
+          %span.help-block Tell us about yourself in fewer than 250 characters.
+    .span5.right
+      %fieldset
+        %legend
+          Personal projects:
+          %small.right
+            %span= current_user.my_own_projects.count
+            of
+            %span= current_user.projects_limit
+        .padded
+          .progress
+            .bar{style: "width: #{current_user.projects_limit_percent}%;"}
+
+      %fieldset
+        %legend
+          SSH public keys:
+          %strong.right= link_to current_user.keys.count, keys_path
+        .padded
+          = link_to "Add Public Key", new_key_path, class: "btn small"
+
+  .form-actions
+    = f.submit 'Save', class: "btn save-btn"
@@ -0,0 +1,9 @@
+// Remove body class for any previous theme, re-add current one
+$('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color')
+$('body').addClass('<%= app_theme %>')
+
+// Re-render the header to reflect the new theme
+$('header').html('<%= escape_javascript(render("layouts/head_panel", title: "Profile")) %>')
+
+// Re-initialize header tooltips
+$('.has_bottom_tooltip').tooltip({placement: 'bottom'})
@@ -0,0 +1,6 @@
+- if @user.valid?
+  :plain
+    $('.update-username .update-success').show();
+- else
+  :plain
+    $('.update-username .update-failed').show();
@@ -69,14 +69,18 @@ Gitlab::Application.routes.draw do
   #
   # Profile Area
   #
-  get "profile/account"             => "profile#account"
-  get "profile/history"             => "profile#history"
-  put "profile/password"            => "profile#password_update"
-  get "profile/token"               => "profile#token"
-  put "profile/reset_private_token" => "profile#reset_private_token"
-  get "profile"                     => "profile#show"
-  get "profile/design"              => "profile#design"
-  put "profile/update"              => "profile#update"
+  resource :profile, only: [:show, :update] do
+    member do
+      get :account
+      get :history
+      get :token
+      get :design
+
+      put :update_password
+      put :reset_private_token
+      put :update_username
+    end
+  end
  
   resources :keys
  
@@ -54,7 +54,7 @@ module SharedPaths
   end
  
   Given 'I visit profile account page' do
-    visit profile_account_path
+    visit account_profile_path
   end
  
   Given 'I visit profile SSH keys page' do
@@ -62,15 +62,11 @@ module SharedPaths
   end
  
   Given 'I visit profile design page' do
-    visit profile_design_path
+    visit design_profile_path
   end
  
   Given 'I visit profile history page' do
-    visit profile_history_path
-  end
-
-  Given 'I visit profile token page' do
-    visit profile_token_path
+    visit history_profile_path
   end
  
   # ----------------------------------------
@@ -29,7 +29,16 @@ describe &quot;Users Security&quot; do
     end
  
     describe "GET /profile/account" do
-      subject { profile_account_path }
+      subject { account_profile_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /profile/design" do
+      subject { design_profile_path }
  
       it { should be_allowed_for @u1 }
       it { should be_allowed_for :admin }
@@ -82,37 +82,25 @@ end
 #                     profile GET    /profile(.:format)                     profile#show
 #              profile_design GET    /profile/design(.:format)              profile#design
 #              profile_update PUT    /profile/update(.:format)              profile#update
-describe ProfileController, "routing" do
+describe ProfilesController, "routing" do
   it "to #account" do
-    get("/profile/account").should route_to('profile#account')
+    get("/profile/account").should route_to('profiles#account')
   end
  
   it "to #history" do
-    get("/profile/history").should route_to('profile#history')
-  end
-
-  it "to #password_update" do
-    put("/profile/password").should route_to('profile#password_update')
-  end
-
-  it "to #token" do
-    get("/profile/token").should route_to('profile#token')
+    get("/profile/history").should route_to('profiles#history')
   end
  
   it "to #reset_private_token" do
-    put("/profile/reset_private_token").should route_to('profile#reset_private_token')
+    put("/profile/reset_private_token").should route_to('profiles#reset_private_token')
   end
  
   it "to #show" do
-    get("/profile").should route_to('profile#show')
+    get("/profile").should route_to('profiles#show')
   end
  
   it "to #design" do
-    get("/profile/design").should route_to('profile#design')
-  end
-
-  it "to #update" do
-    put("/profile/update").should route_to('profile#update')
+    get("/profile/design").should route_to('profiles#design')
   end
 end
...	...	@@ -8,3 +8,13 @@ $ ->
8	8
9	9	# Go up the hierarchy and show the corresponding submission feedback element
10	10	$(@).closest('fieldset').find('.update-feedback').show('highlight', {color: '#DFF0D8'}, 500)
	11	+
	12	+ $('.update-username form').on 'ajax:before', ->
	13	+ $('.loading-gif').show()
	14	+ $(this).find('.update-success').hide()
	15	+ $(this).find('.update-failed').hide()
	16	+
	17	+ $('.update-username form').on 'ajax:complete', ->
	18	+ $(this).find('.save-btn').removeAttr('disabled')
	19	+ $(this).find('.save-btn').removeClass('disabled')
	20	+ $(this).find('.loading-gif').hide()
...	...
...	...	@@ -1,47 +0,0 @@
1		-class ProfileController < ApplicationController
2		- before_filter :user
3		-
4		- def show
5		- end
6		-
7		- def design
8		- end
9		-
10		- def update
11		- @user.update_attributes(params[:user])
12		-
13		- respond_to do \|format\|
14		- format.html { redirect_to :back }
15		- format.js
16		- end
17		- end
18		-
19		- def token
20		- end
21		-
22		- def password_update
23		- params[:user].reject!{ \|k, v\| k != "password" && k != "password_confirmation"}
24		-
25		- if @user.update_attributes(params[:user])
26		- flash[:notice] = "Password was successfully updated. Please login with it"
27		- redirect_to new_user_session_path
28		- else
29		- render 'account'
30		- end
31		- end
32		-
33		- def reset_private_token
34		- current_user.reset_authentication_token!
35		- redirect_to profile_account_path
36		- end
37		-
38		- def history
39		- @events = current_user.recent_events.page(params[:page]).per(20)
40		- end
41		-
42		- private
43		-
44		- def user
45		- @user = current_user
46		- end
47		-end
...	...	@@ -0,0 +1,66 @@
	1	+class ProfilesController < ApplicationController
	2	+ before_filter :user
	3	+ layout 'profile'
	4	+
	5	+ def show
	6	+ end
	7	+
	8	+ def design
	9	+ end
	10	+
	11	+ def account
	12	+ end
	13	+
	14	+ def update
	15	+ if @user.update_attributes(params[:user])
	16	+ flash[:notice] = "Profile was successfully updated"
	17	+ else
	18	+ flash[:alert] = "Failed to update profile"
	19	+ end
	20	+
	21	+ respond_to do \|format\|
	22	+ format.html { redirect_to :back }
	23	+ format.js
	24	+ end
	25	+ end
	26	+
	27	+ def token
	28	+ end
	29	+
	30	+ def update_password
	31	+ params[:user].reject!{ \|k, v\| k != "password" && k != "password_confirmation"}
	32	+
	33	+ if @user.update_attributes(params[:user])
	34	+ flash[:notice] = "Password was successfully updated. Please login with it"
	35	+ redirect_to new_user_session_path
	36	+ else
	37	+ render 'account'
	38	+ end
	39	+ end
	40	+
	41	+ def reset_private_token
	42	+ if current_user.reset_authentication_token!
	43	+ flash[:notice] = "Token was successfully updated"
	44	+ end
	45	+
	46	+ redirect_to account_profile_path
	47	+ end
	48	+
	49	+ def history
	50	+ @events = current_user.recent_events.page(params[:page]).per(20)
	51	+ end
	52	+
	53	+ def update_username
	54	+ @user.update_attributes(username: params[:user][:username])
	55	+
	56	+ respond_to do \|format\|
	57	+ format.js
	58	+ end
	59	+ end
	60	+
	61	+ private
	62	+
	63	+ def user
	64	+ @user = current_user
	65	+ end
	66	+end
...	...
...	...	@@ -6,17 +6,17 @@
6	6	= render "layouts/head_panel", title: "Profile"
7	7	.container
8	8	%ul.main_menu
9		- = nav_link(path: 'profile#show', html_options: {class: 'home'}) do
	9	+ = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
10	10	= link_to "Profile", profile_path
11		- = nav_link(path: 'profile#account') do
12		- = link_to "Account", profile_account_path
	11	+ = nav_link(path: 'profiles#account') do
	12	+ = link_to "Account", account_profile_path
13	13	= nav_link(controller: :keys) do
14	14	= link_to keys_path do
15	15	SSH Keys
16	16	%span.count= current_user.keys.count
17		- = nav_link(path: 'profile#design') do
18		- = link_to "Design", profile_design_path
19		- = nav_link(path: 'profile#history') do
20		- = link_to "History", profile_history_path
	17	+ = nav_link(path: 'profiles#design') do
	18	+ = link_to "Design", design_profile_path
	19	+ = nav_link(path: 'profiles#history') do
	20	+ = link_to "History", history_profile_path
21	21
22	22	.content= yield
...	...
...	...	@@ -1,69 +0,0 @@
1		-- if Gitlab.config.omniauth_enabled?
2		- %fieldset
3		- %legend Social Accounts
4		- .oauth_select_holder
5		- %p.hint Tip: Click on icon to activate sigin with one of the following services
6		- - User.omniauth_providers.each do \|provider\|
7		- %span{class: oauth_active_class(provider) }
8		- = link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
9		-
10		-
11		-
12		-%fieldset
13		- %legend
14		- Private token
15		- %span.cred.right
16		- keep it secret!
17		- .padded
18		- = form_for @user, url: profile_reset_private_token_path, method: :put do \|f\|
19		- .data
20		- %p.slead
21		- Private token used to access application resources without authentication.
22		- %br
23		- It can be used for atom feed or API
24		- %p.cgray
25		- - if current_user.private_token
26		- = text_field_tag "token", current_user.private_token, class: "xxlarge large_text"
27		- = f.submit 'Reset', confirm: "Are you sure?", class: "btn primary btn-build-token"
28		- - else
29		- %span You don`t have one yet. Click generate to fix it.
30		- = f.submit 'Generate', class: "btn success btn-build-token"
31		-
32		-%fieldset
33		- %legend Password
34		- = form_for @user, url: profile_password_path, method: :put do \|f\|
35		- .padded
36		- %p.slead After successful password update you will be redirected to login page where you should login with new password
37		- -if @user.errors.any?
38		- .alert-message.block-message.error
39		- %ul
40		- - @user.errors.full_messages.each do \|msg\|
41		- %li= msg
42		-
43		- .clearfix
44		- = f.label :password
45		- .input= f.password_field :password, required: true
46		- .clearfix
47		- = f.label :password_confirmation
48		- .input
49		- = f.password_field :password_confirmation, required: true
50		- .clearfix
51		- .input
52		- = f.submit 'Save password', class: "btn save-btn"
53		-
54		-
55		-
56		-%fieldset
57		- %legend
58		- Username
59		- %small.right
60		- Changing your username can have unintended side effects!
61		- = form_for @user, url: profile_update_path, method: :put do \|f\|
62		- .padded
63		- = f.label :username
64		- .input
65		- = f.text_field :username, required: true
66		- .input
67		- = f.submit 'Save username', class: "btn save-btn"
68		-
69		-
...	...	@@ -1,52 +0,0 @@
1		-= form_for @user, url: profile_update_path, remote: true, method: :put do \|f\|
2		- %fieldset.application-theme
3		- %legend
4		- Application theme
5		- .update-feedback.hide
6		- %i.icon-ok
7		- Saved
8		- .themes_opts
9		- = label_tag do
10		- .prev.default
11		- = f.radio_button :theme_id, 1
12		- Default
13		-
14		- = label_tag do
15		- .prev.classic
16		- = f.radio_button :theme_id, 2
17		- Classic
18		-
19		- = label_tag do
20		- .prev.modern
21		- = f.radio_button :theme_id, 3
22		- Modern
23		-
24		- = label_tag do
25		- .prev.gray
26		- = f.radio_button :theme_id, 4
27		- SlateGray
28		-
29		- = label_tag do
30		- .prev.violet
31		- = f.radio_button :theme_id, 5
32		- Violet
33		- %br
34		- .clearfix
35		-
36		- %fieldset.code-preview-theme
37		- %legend
38		- Code preview theme
39		- .update-feedback.hide
40		- %i.icon-ok
41		- Saved
42		- .code_highlight_opts
43		- = label_tag do
44		- .prev
45		- = image_tag "white.png"
46		- = f.radio_button :dark_scheme, false
47		- White code preview
48		- = label_tag do
49		- .prev
50		- = image_tag "dark.png"
51		- = f.radio_button :dark_scheme, true
52		- Dark code preview
...	...	@@ -1,5 +0,0 @@
1		-.profile_history
2		- = render @events
3		-%hr
4		-= paginate @events, theme: "gitlab"
5		-
...	...	@@ -1,82 +0,0 @@
1		-.profile_avatar_holder
2		- = image_tag gravatar_icon(@user.email, 90)
3		-%h3.page_title
4		- = @user.name
5		- %br
6		- %small
7		- = @user.email
8		-
9		-%hr
10		-
11		-= form_for @user, url: profile_update_path, method: :put, html: { class: "edit_user form-horizontal" } do \|f\|
12		- -if @user.errors.any?
13		- %div.alert-message.block-message.error
14		- %ul
15		- - @user.errors.full_messages.each do \|msg\|
16		- %li= msg
17		- .row
18		- .span7
19		- .control-group
20		- = f.label :name, class: "control-label"
21		- .controls
22		- = f.text_field :name, class: "input-xlarge", required: true
23		- %span.help-block Enter your name, so people you know can recognize you.
24		- .control-group
25		- = f.label :email, class: "control-label"
26		- .controls
27		- = f.text_field :email, class: "input-xlarge", required: true
28		- %span.help-block We also use email for avatar detection.
29		-
30		- .span5.right
31		- %fieldset.tips
32		- %legend Tips:
33		- %ul
34		- %li
35		- %p You can change your password on Account page
36		- -unless Gitlab.config.disable_gravatar?
37		- %li
38		- %p You can change your avatar at #{link_to "gravatar.com", "http://gravatar.com"}
39		-
40		- - if Gitlab.config.omniauth_enabled? && @user.provider?
41		- %li
42		- %p.hint
43		- You can login through #{@user.provider.titleize}!
44		- = link_to "click here to change", profile_account_path
45		-
46		- .row
47		- .span7
48		- .control-group
49		- = f.label :skype, class: "control-label"
50		- .controls= f.text_field :skype, class: "input-xlarge"
51		- .control-group
52		- = f.label :linkedin, class: "control-label"
53		- .controls= f.text_field :linkedin, class: "input-xlarge"
54		- .control-group
55		- = f.label :twitter, class: "control-label"
56		- .controls= f.text_field :twitter, class: "input-xlarge"
57		- .control-group
58		- = f.label :bio, class: "control-label"
59		- .controls
60		- = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
61		- %span.help-block Tell us about yourself in fewer than 250 characters.
62		- .span5.right
63		- %fieldset
64		- %legend
65		- Personal projects:
66		- %small.right
67		- %span= current_user.my_own_projects.count
68		- of
69		- %span= current_user.projects_limit
70		- .padded
71		- .progress
72		- .bar{style: "width: #{current_user.projects_limit_percent}%;"}
73		-
74		- %fieldset
75		- %legend
76		- SSH public keys:
77		- %strong.right= link_to current_user.keys.count, keys_path
78		- .padded
79		- = link_to "Add Public Key", new_key_path, class: "btn small"
80		-
81		- .form-actions
82		- = f.submit 'Save', class: "btn save-btn"
...	...	@@ -1,9 +0,0 @@
1		-// Remove body class for any previous theme, re-add current one
2		-$('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color')
3		-$('body').addClass('<%= app_theme %>')
4		-
5		-// Re-render the header to reflect the new theme
6		-$('header').html('<%= escape_javascript(render("layouts/head_panel", title: "Profile")) %>')
7		-
8		-// Re-initialize header tooltips
9		-$('.has_bottom_tooltip').tooltip({placement: 'bottom'})
...	...	@@ -0,0 +1,77 @@
	1	+- if Gitlab.config.omniauth_enabled?
	2	+ %fieldset
	3	+ %legend Social Accounts
	4	+ .oauth_select_holder
	5	+ %p.hint Tip: Click on icon to activate sigin with one of the following services
	6	+ - User.omniauth_providers.each do \|provider\|
	7	+ %span{class: oauth_active_class(provider) }
	8	+ = link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
	9	+
	10	+
	11	+
	12	+%fieldset
	13	+ %legend
	14	+ Private token
	15	+ %span.cred.right
	16	+ keep it secret!
	17	+ .padded
	18	+ = form_for @user, url: reset_private_token_profile_path, method: :put do \|f\|
	19	+ .data
	20	+ %p.slead
	21	+ Private token used to access application resources without authentication.
	22	+ %br
	23	+ It can be used for atom feed or API
	24	+ %p.cgray
	25	+ - if current_user.private_token
	26	+ = text_field_tag "token", current_user.private_token, class: "xxlarge large_text"
	27	+ = f.submit 'Reset', confirm: "Are you sure?", class: "btn primary btn-build-token"
	28	+ - else
	29	+ %span You don`t have one yet. Click generate to fix it.
	30	+ = f.submit 'Generate', class: "btn success btn-build-token"
	31	+
	32	+%fieldset
	33	+ %legend Password
	34	+ = form_for @user, url: update_password_profile_path, method: :put do \|f\|
	35	+ .padded
	36	+ %p.slead After successful password update you will be redirected to login page where you should login with new password
	37	+ -if @user.errors.any?
	38	+ .alert-message.block-message.error
	39	+ %ul
	40	+ - @user.errors.full_messages.each do \|msg\|
	41	+ %li= msg
	42	+
	43	+ .clearfix
	44	+ = f.label :password
	45	+ .input= f.password_field :password, required: true
	46	+ .clearfix
	47	+ = f.label :password_confirmation
	48	+ .input
	49	+ = f.password_field :password_confirmation, required: true
	50	+ .clearfix
	51	+ .input
	52	+ = f.submit 'Save password', class: "btn save-btn"
	53	+
	54	+
	55	+
	56	+%fieldset.update-username
	57	+ %legend
	58	+ Username
	59	+ %small.cred.right
	60	+ Changing your username can have unintended side effects!
	61	+ = form_for @user, url: update_username_profile_path, method: :put, remote: true do \|f\|
	62	+ .padded
	63	+ = f.label :username
	64	+ .input
	65	+ = f.text_field :username, required: true
	66	+
	67	+ %span.loading-gif.hide= image_tag "ajax_loader.gif"
	68	+ %span.update-success.cgreen.hide
	69	+ %i.icon-ok
	70	+ Saved
	71	+ %span.update-failed.cred.hide
	72	+ %i.icon-ok
	73	+ Failed
	74	+ .input
	75	+ = f.submit 'Save username', class: "btn save-btn"
	76	+
	77	+
...	...