17 files changed, 229 insertions, 159 deletions

diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index a21dcff41c0..6bafcb56551 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  Account settings
+  Account Settings
 %p.light
   You can change your username and private token here.
   - if current_user.ldap_user?
@@ -10,7 +10,7 @@
 .account-page
   %fieldset.update-token
     %legend
-      Private token
+      Reset Private token
     %div
       = form_for @user, url: reset_private_token_profile_path, method: :put do |f|
         .data
@@ -25,7 +25,7 @@
             - if current_user.private_token
               = text_field_tag "token", current_user.private_token, class: "form-control"
               %div
-                = f.submit 'Reset', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token"
+                = f.submit 'Reset private token', data: { confirm: "Are you sure?" }, class: "btn 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"
@@ -43,7 +43,7 @@
   - if show_profile_username_tab?
     %fieldset.update-username
       %legend
-        Username
+        Change Username
       = form_for @user, url: update_username_profile_path,  method: :put, remote: true do |f|
         %p
           Changing your username will change path to all personal projects!
@@ -57,7 +57,7 @@
         %p.light
           = user_url(@user)
         %div
-          = f.submit 'Save username', class: "btn btn-save"
+          = f.submit 'Save username', class: "btn btn-warning"
 
   - if show_profile_remove_tab?
     %fieldset.remove-account
@@ -75,3 +75,4 @@
               The following groups will be abandoned. You should transfer or remove them:
               %strong #{current_user.solo_owned_groups.map(&:name).join(', ')}
         = link_to 'Delete account', user_registration_path, data: { confirm: "REMOVE #{current_user.name}? Are you sure?" }, method: :delete, class: "btn btn-remove"
+
diff --git a/app/views/profiles/applications.html.haml b/app/views/profiles/applications.html.haml
new file mode 100644
index 00000000000..97e98948f36
--- /dev/null
+++ b/app/views/profiles/applications.html.haml
@@ -0,0 +1,49 @@
+%h3.page-title
+  Application Settings
+%p.light
+  OAuth2 protocol settings below.
+
+%fieldset.oauth-applications
+  %legend Your applications
+  %p= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success'
+  - if @applications.any?
+    %table.table.table-striped
+      %thead
+        %tr
+          %th Name
+          %th Callback URL
+          %th Clients
+          %th
+          %th
+      %tbody
+        - @applications.each do |application|
+          %tr{:id => "application_#{application.id}"}
+            %td= link_to application.name, oauth_application_path(application)
+            %td
+              - application.redirect_uri.split.each do |uri|
+                %div= uri
+            %td= application.access_tokens.count
+            %td= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link btn-sm'
+            %td= render 'doorkeeper/applications/delete_form', application: application
+
+%fieldset.oauth-authorized-applications.prepend-top-20
+  %legend Authorized applications
+
+  - if @authorized_tokens.any?
+    %table.table.table-striped
+      %thead
+        %tr
+          %th Name
+          %th Authorized At
+          %th Scope
+          %th
+      %tbody
+        - @authorized_apps.each do |app|
+          - token = app.authorized_tokens.order('created_at desc').first
+          %tr{:id => "application_#{app.id}"}
+            %td= app.name
+            %td= token.created_at
+            %td= token.scopes
+            %td= render 'doorkeeper/authorized_applications/delete_form', application: app
+  - else
+    %p.light You dont have any authorized applications
diff --git a/app/views/profiles/design.html.haml b/app/views/profiles/design.html.haml
index 0d8075b7d43..cc00d08d03b 100644
--- a/app/views/profiles/design.html.haml
+++ b/app/views/profiles/design.html.haml
@@ -1,7 +1,7 @@
 %h3.page-title
-  My appearance settings
+  Design Settings
 %p.light
-  Appearance settings saved to your profile and available across all devices
+  Appearance settings will be saved to your profile and made available across all devices.
 %hr
 
 = form_for @user, url: profile_path, remote: true, method: :put do |f|
@@ -33,6 +33,11 @@
         .prev.violet
         = f.radio_button :theme_id, 5
         Violet
+
+      = label_tag do
+        .prev.blue
+        = f.radio_button :theme_id, 6
+        Blue
     %br
     .clearfix
 
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index ca980db2f3c..9d8f33cbbaa 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -1,9 +1,13 @@
 %h3.page-title
-  My email addresses
+  Email Settings
 %p.light
   Your
   %b Primary Email
-  will be used for account notifications, avatar detection and web based operations, such as edits and merges.
+  will be used for avatar detection and web based operations, such as edits and merges.
+  %br
+  Your
+  %b Notification Email
+  will be used for account notifications.
   %br
   All email addresses will be used to identify your commits.
 
@@ -21,7 +25,7 @@
         %strong= email.email
         %span.cgray
           added #{time_ago_with_tooltip(email.created_at)}
-        = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-small btn-remove pull-right'
+        = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-remove pull-right'
 
 %h4 Add email address
 = form_for 'email', url: profile_emails_path, html: { class: 'form-horizontal' } do |f|
@@ -30,4 +34,4 @@
     .col-sm-10
       = f.text_field :email, class: 'form-control'
   .form-actions
-    = f.submit 'Add', class: 'btn btn-create'
+    = f.submit 'Add email address', class: 'btn btn-create'
diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml
deleted file mode 100644
index e9ffca8faf4..00000000000
--- a/app/views/profiles/groups/index.html.haml
+++ /dev/null
@@ -1,39 +0,0 @@
-%h3.page-title
-  Group membership
-  - if current_user.can_create_group?
-    %span.pull-right
-      = link_to new_group_path, class: "btn btn-new" do
-        %i.fa.fa-plus
-        New Group
-%p.light
-  Group members have access to all a group's projects
-%hr
-.panel.panel-default
-  .panel-heading
-    %strong Groups
-    (#{@user_groups.count})
-  %ul.well-list
-    - @user_groups.each do |user_group|
-      - group = user_group.group
-      %li
-        .pull-right
-          - if can?(current_user, :manage_group, group)
-            = link_to edit_group_path(group), class: "btn-small btn btn-grouped" do
-              %i.fa.fa-cogs
-              Settings
-
-          - if can?(current_user, :destroy, user_group)
-            = link_to leave_profile_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-small btn btn-grouped", title: 'Remove user from group' do
-              %i.fa.fa-sign-out
-              Leave
-
-        = link_to group, class: 'group-name' do
-          %strong= group.name
-
-        as
-        %strong #{user_group.human_access}
-
-        %div.light
-          #{pluralize(group.projects.count, "project")}, #{pluralize(group.users.count, "user")}
-
-= paginate @user_groups
diff --git a/app/views/profiles/history.html.haml b/app/views/profiles/history.html.haml
index 3951c47b5f2..9cafe03b8b3 100644
--- a/app/views/profiles/history.html.haml
+++ b/app/views/profiles/history.html.haml
@@ -1,7 +1,7 @@
 %h3.page-title
-  Account history
+  My Account History
 %p.light
-  All events created by your account are listed here
+  All events created by your account are listed below.
 %hr
 .profile_history
   = render @events
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml
index 81411a7565e..fe5770f45c3 100644
--- a/app/views/profiles/keys/_key.html.haml
+++ b/app/views/profiles/keys/_key.html.haml
@@ -1,9 +1,12 @@
-%li
-  = link_to profile_key_path(key) do
-    %strong= key.title
-  %span
-    (#{key.fingerprint})
-  %span.cgray
-    added #{time_ago_with_tooltip(key.created_at)}
-
-  = link_to 'Remove', profile_key_path(key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-small btn-remove delete-key pull-right"
+%tr
+  %td
+    = link_to path_to_key(key, is_admin) do
+      %strong= key.title
+  %td
+    %span
+      (#{key.fingerprint})
+  %td
+    %span.cgray
+      added #{time_ago_with_tooltip(key.created_at)}
+  %td
+    = link_to 'Remove', path_to_key(key, is_admin), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml
new file mode 100644
index 00000000000..8bac22a2e1a
--- /dev/null
+++ b/app/views/profiles/keys/_key_details.html.haml
@@ -0,0 +1,22 @@
+- is_admin = defined?(admin) ? true : false
+.row
+  .col-md-4
+    .panel.panel-default
+      .panel-heading
+        SSH Key
+      %ul.well-list
+        %li
+          %span.light Title:
+          %strong= @key.title
+        %li
+          %span.light Created on:
+          %strong= @key.created_at.stamp("Aug 21, 2011")
+
+  .col-md-8
+    %p
+      %span.light Fingerprint:
+      %strong= @key.fingerprint
+    %pre.well-pre
+      = @key.key
+  .pull-right
+    = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"
diff --git a/app/views/profiles/keys/_key_table.html.haml b/app/views/profiles/keys/_key_table.html.haml
new file mode 100644
index 00000000000..ef0075aad3b
--- /dev/null
+++ b/app/views/profiles/keys/_key_table.html.haml
@@ -0,0 +1,19 @@
+- is_admin = defined?(admin) ? true : false
+.panel.panel-default
+  - if @keys.any?
+    %table.table
+      %thead.panel-heading
+        %tr
+          %th Title
+          %th Fingerprint
+          %th Added at
+          %th
+      %tbody
+        - @keys.each do |key|
+          = render 'profiles/keys/key', key: key, is_admin: is_admin
+  - else
+    .nothing-here-block
+      - if is_admin
+        User has no ssh keys
+      - else
+        There are no SSH keys with access to your account.
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index a322f82f236..965d5e032f9 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,22 +1,12 @@
 %h3.page-title
-  My SSH keys
+  SSH Keys Settings
   .pull-right
     = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
 %p.light
-  SSH keys allow you to establish a secure connection between your computer and GitLab
+  My SSH keys: #{@keys.count}
   %br
   Before you can add an SSH key you need to
-  = link_to "generate it", help_page_path("ssh", "ssh")
+  = link_to "generate it.", help_page_path("ssh", "README")
 %hr
 
-
-.panel.panel-default
-  .panel-heading
-    SSH Keys (#{@keys.count})
-  %ul.well-list#keys-table
-    = render @keys
-    - if @keys.blank?
-      %li
-        .nothing-here-block There are no SSH keys with access to your account.
-
-
+= render 'key_table'
diff --git a/app/views/profiles/keys/new.html.haml b/app/views/profiles/keys/new.html.haml
index c02b47b0ad5..ccec716d0c6 100644
--- a/app/views/profiles/keys/new.html.haml
+++ b/app/views/profiles/keys/new.html.haml
@@ -8,9 +8,9 @@
   $('#key_key').on('focusout', function(){
     var title = $('#key_title'),
         val      = $('#key_key').val(),
-        key_mail = val.match(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+|\.[a-zA-Z0-9._-]+)/gi);
+        comment = val.match(/^\S+ \S+ (.+)$/);
 
-    if( key_mail && key_mail.length > 0 && title.val() == '' ){
-      $('#key_title').val( key_mail );
+    if( comment && comment.length > 1 && title.val() == '' ){
+      $('#key_title').val( comment[1] );
     }
   });
diff --git a/app/views/profiles/keys/show.html.haml b/app/views/profiles/keys/show.html.haml
index c4fc1bb269c..cfd53298962 100644
--- a/app/views/profiles/keys/show.html.haml
+++ b/app/views/profiles/keys/show.html.haml
@@ -1,22 +1 @@
-.row
-  .col-md-4
-    .panel.panel-default
-      .panel-heading
-        SSH Key
-      %ul.well-list
-        %li
-          %span.light Title:
-          %strong= @key.title
-        %li
-          %span.light Created on:
-          %strong= @key.created_at.stamp("Aug 21, 2011")
-
-  .col-md-8
-    %p
-      %span.light Fingerprint:
-      %strong= @key.fingerprint
-    %pre.well-pre
-      = @key.key
-
-.pull-right
-  = link_to 'Remove', profile_key_path(@key), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"
+= render "key_details"
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index f84de4430cc..273e72f8a4d 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -1,49 +1,76 @@
 %h3.page-title
-  Notifications settings
+  Notifications Settings
 %p.light
-  GitLab uses the email specified in your profile for notifications
+  These are your global notification settings.
 %hr
-= form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications form-horizontal global-notifications-form' do
+
+= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications form-horizontal global-notifications-form' } do |f|
+  -if @user.errors.any?
+    %div.alert.alert-danger
+      %ul
+        - @user.errors.full_messages.each do |msg|
+          %li= msg
+
   = hidden_field_tag :notification_type, 'global'
 
-  = label_tag :notification_level, 'Notification level', class: 'control-label'
-  .col-sm-10
-    .radio
-      = label_tag nil, class: '' do
-        = radio_button_tag :notification_level, Notification::N_DISABLED, @notification.disabled?, class: 'trigger-submit'
-        .level-title
-          Disabled
-        %p You will not get any notifications via email
-
-    .radio
-      = label_tag nil, class: '' do
-        = radio_button_tag :notification_level, Notification::N_PARTICIPATING, @notification.participating?, class: 'trigger-submit'
-        .level-title
-          Participating
-        %p You will only receive notifications from related resources (e.g. from your commits or assigned issues)
-
-    .radio
-      = label_tag nil, class: '' do
-        = radio_button_tag :notification_level, Notification::N_WATCH, @notification.watch?, class: 'trigger-submit'
-        .level-title
-          Watch
-        %p You will receive all notifications from projects in which you participate
+  .form-group
+    = f.label :notification_email, class: "control-label"
+    .col-sm-10
+      = f.select :notification_email, @user.all_emails, { include_blank: false }, class: "form-control"
+
+  .form-group
+    = f.label :notification_level, class: 'control-label'
+    .col-sm-10
+      .radio
+        = f.label :notification_level, value: Notification::N_DISABLED do
+          = f.radio_button :notification_level, Notification::N_DISABLED
+          .level-title
+            Disabled
+          %p You will not get any notifications via email
+
+      .radio
+        = f.label :notification_level, value: Notification::N_MENTION do
+          = f.radio_button :notification_level, Notification::N_MENTION
+          .level-title
+            Mention
+          %p You will receive notifications only for comments in which you were @mentioned
+
+      .radio
+        = f.label :notification_level, value: Notification::N_PARTICIPATING do
+          = f.radio_button :notification_level, Notification::N_PARTICIPATING
+          .level-title
+            Participating
+          %p You will only receive notifications from related resources (e.g. from your commits or assigned issues)
+
+      .radio
+        = f.label :notification_level, value: Notification::N_WATCH do
+          = f.radio_button :notification_level, Notification::N_WATCH
+          .level-title
+            Watch
+          %p You will receive all notifications from projects in which you participate
+
+  .form-actions
+    = f.submit 'Save changes', class: "btn btn-create"
 
 .clearfix
   %hr
-  %p
-    You can also specify notification level per group or per project
-    %br
-    By default all projects and groups uses notification level set above
 .row.all-notifications
   .col-md-6
+    %p
+      You can also specify notification level per group or per project.
+      %br
+      By default, all projects and groups will use the notification level set above.
     %h4 Groups:
     %ul.bordered-list
-      - @group_members.each do |users_group|
-        - notification = Notification.new(users_group)
-        = render 'settings', type: 'group', membership: users_group, notification: notification
+      - @group_members.each do |group_member|
+        - notification = Notification.new(group_member)
+        = render 'settings', type: 'group', membership: group_member, notification: notification
 
   .col-md-6
+    %p
+      To specify the notification level per project of a group you belong to,
+      %br
+      you need to be a member of the project itself, not only its group.
     %h4 Projects:
     %ul.bordered-list
       - @project_members.each do |project_member|
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 2a7d317aa3e..4b04b113e89 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -1,25 +1,30 @@
-%h3.page-title Password
+%h3.page-title Password Settings
 %p.light
-  Change your password or recover your current one.
+  - if @user.password_automatically_set?
+    Set your password.
+  - else
+    Change your password or recover your current one.
 %hr
 .update-password
   = form_for @user, url: profile_password_path, method: :put, html: { class: 'form-horizontal' }  do |f|
     %div
       %p.slead
-        You must provide current password in order to change it.
-        %br
-        After a successful password update you will be redirected to login page where you should login with your new password
+        - unless @user.password_automatically_set?
+          You must provide current password in order to change it.
+          %br
+        After a successful password update, you will be redirected to the login page where you can log in with your new password.
       -if @user.errors.any?
         .alert.alert-danger
           %ul
             - @user.errors.full_messages.each do |msg|
               %li= msg
-      .form-group
-        = f.label :current_password, class: 'control-label'
-        .col-sm-10
-          = f.password_field :current_password, required: true, class: 'form-control'
-          %div
-            = link_to "Forgot your password?", reset_profile_password_path, method: :put
+      - unless @user.password_automatically_set?
+        .form-group
+          = f.label :current_password, class: 'control-label'
+          .col-sm-10
+            = f.password_field :current_password, required: true, class: 'form-control'
+            %div
+              = link_to "Forgot your password?", reset_profile_password_path, method: :put
 
       .form-group
         = f.label :password, 'New password', class: 'control-label'
@@ -30,4 +35,4 @@
         .col-sm-10
           = f.password_field :password_confirmation, required: true, class: 'form-control'
       .form-actions
-        = f.submit 'Save password', class: "btn btn-save"
+        = f.submit 'Save password', class: "btn btn-create"
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
index aef7348fd20..8bed6e0dbee 100644
--- a/app/views/profiles/passwords/new.html.haml
+++ b/app/views/profiles/passwords/new.html.haml
@@ -10,10 +10,11 @@
       %ul
         - @user.errors.full_messages.each do |msg|
           %li= msg
-
-  .form-group
-    = f.label :current_password, class: 'control-label'
-    .col-sm-10= f.password_field :current_password, required: true, class: 'form-control'
+  
+  - unless @user.password_automatically_set?
+    .form-group
+      = f.label :current_password, class: 'control-label'
+      .col-sm-10= f.password_field :current_password, required: true, class: 'form-control'
   .form-group
     = f.label :password, class: 'control-label'
     .col-sm-10= f.password_field :password, required: true, class: 'form-control'
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index d6b52f86154..409b6b5a193 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,7 +1,7 @@
 %h3.page-title
-  Profile settings
+  Profile Settings
 %p.light
-  This information appears on your profile.
+  This information will appear on your profile.
   - if current_user.ldap_user?
     Some options are unavailable for LDAP accounts
 %hr
@@ -56,7 +56,7 @@
       .form-group
         = f.label :bio, class: "control-label"
         .col-sm-10
-          = f.text_area :bio, rows: 6, class: "form-control", maxlength: 250
+          = f.text_area :bio, rows: 4, class: "form-control", maxlength: 250
           %span.help-block Tell us about yourself in fewer than 250 characters.
 
     .col-md-5
@@ -77,22 +77,26 @@
                   %br
                   or change it at #{link_to "gravatar.com", "http://gravatar.com"}
             %hr
-            %a.choose-btn.btn.btn-small.js-choose-user-avatar-button
+            %a.choose-btn.btn.btn-sm.js-choose-user-avatar-button
               %i.fa.fa-paperclip
               %span Choose File ...
              
             %span.file_name.js-avatar-filename File name...
             = f.file_field :avatar, class: "js-user-avatar-input hidden"
-            .light The maximum file size allowed is 100KB.
+            .light The maximum file size allowed is 200KB.
             - if @user.avatar?
               %hr
-              = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-avatar"
+              = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
 
       - if @user.public_profile?
-        .bs-callout.bs-callout-info
+        .alert.alert-info
           %h4 Public profile
           %p Your profile is publicly visible because you joined public project(s)
 
 
-  .form-actions
-    = f.submit 'Save changes', class: "btn btn-save"
+  .row
+    .col-md-7
+      .form-group
+        .col-sm-2  
+        .col-sm-10
+          = f.submit 'Save changes', class: "btn btn-success"
diff --git a/app/views/profiles/update.js.erb b/app/views/profiles/update.js.erb
index 04b5cf4827d..e664ac2a52a 100644
--- a/app/views/profiles/update.js.erb
+++ b/app/views/profiles/update.js.erb
@@ -1,6 +1,6 @@
 // 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 %>')
+$('body').removeClass('ui_basic ui_mars ui_modern ui_gray ui_color light_theme dark_theme')
+$('body').addClass('<%= app_theme %> <%= theme_type %>')
 
 // Re-render the header to reflect the new theme
 $('header').html('<%= escape_javascript(render("layouts/head_panel", title: "Profile")) %>')