Merge branch 'ui-improvements' into 'master'

Ui improvements

Merge branch 'ui-improvements' into 'master'
Ui improvements
Dmitriy Zaporozhets
2 parents 67b0857d 95d61a09
Showing 25 changed files with 245 additions and 171 deletions Show diff stats
app/assets/images/Storage-UI.PNG
app/assets/images/file_bin.png
app/assets/images/file_dir.png
app/assets/images/file_empty.png
app/assets/images/file_img.png
app/assets/images/file_txt.png
app/assets/images/rss_ui.png
app/assets/images/submodule.png
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/main/mixins.scss
app/assets/stylesheets/sections/admin.scss
app/assets/stylesheets/sections/tree.scss
app/controllers/admin/projects_controller.rb
app/controllers/admin/users_controller.rb
app/helpers/tree_helper.rb
app/views/admin/projects/index.html.haml
app/views/admin/users/_form.html.haml
app/views/admin/users/edit.html.haml
app/views/admin/users/new.html.haml
@@ -98,3 +98,7 @@ label {
     z-index: 2;
   }
 }
+
+.fieldset-form fieldset {
+  margin-bottom: 20px;
+}
@@ -14,6 +14,7 @@ h2.page-title {
 h3.page-title {
   @include page-title;
+  font-size: 22px;
 }
 h6 {
@@ -117,11 +117,11 @@
 }
 @mixin page-title {
-  color: #333;
-  font-size: 20px;
+  color: #555;
   line-height: 1.5;
+  font-weight: normal;
   margin-top: 0px;
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 @mixin str-truncated($max_width: "82%") {
@@ -21,12 +21,22 @@
 }
 .admin-filter form {
-  label { width: 110px; }
-  .controls { margin-left: 130px; }
-  .form-actions { padding-left: 130px; background: #fff }
-  .visibility-levels {
-    .controls {
-        margin-bottom: 9px;
+  .select2-container {
+    width: 100%
+  }
+
+  .controls {
+    margin-left: 130px;
+  }
+
+  .form-actions {
+    padding-left: 130px;
+    background: #fff
+   }
+
+   .visibility-levels {
+     .controls {
+       margin-bottom: 9px;
     }
     i {
@@ -57,6 +57,10 @@
         }
       }
+      i {
+        color: $bg_primary;
+      }
+
       img {
         position: relative;
         top:-1px;
@@ -4,10 +4,8 @@ class Admin::ProjectsController &lt; Admin::ApplicationController
   before_filter :repository, only: [:show, :transfer]
   def index
-    owner_id = params[:owner_id]
-    user = User.find_by(id: owner_id)
-
-    @projects = user ? user.owned_projects : Project.all
+    @projects = Project.all
+    @projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present?
     @projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present?
     @projects = @projects.with_push if params[:with_push].present?
     @projects = @projects.abandoned if params[:abandoned].present?
@@ -8,7 +8,8 @@ class Admin::UsersController &lt; Admin::ApplicationController
   end
   def show
-    @projects = user.authorized_projects
+    @personal_projects = user.personal_projects
+    @joined_projects = user.projects.joined(@user)
   end
   def new
@@ -25,8 +25,13 @@ module TreeHelper
   #
   # type - String type of the tree item; either 'folder' or 'file'
   def tree_icon(type)
-    image = type == 'folder' ? 'file_dir.png' : 'file_txt.png'
-    image_tag(image, size: '16x16')
+    icon_class = if type == 'folder'
+                   'icon-folder-close'
+                 else
+                   'icon-file-alt'
+                 end
+
+    content_tag :i, nil, class: icon_class
   end
   def tree_hex_class(content)
 .row
-  .col-md-4
+  .col-md-3
     .admin-filter
       = form_tag admin_projects_path, method: :get, class: '' do
         .form-group
@@ -7,19 +7,21 @@
           = text_field_tag :name, params[:name], class: "form-control"
         .form-group
-          = label_tag :owner_id, 'Owner:'
-          %div
-            = users_select_tag :owner_id, selected: params[:owner_id], class: 'input-large input-clamp'
-        .checkbox
-          = label_tag :with_push, 'Not empty'
-          = check_box_tag :with_push, 1, params[:with_push]
-          &nbsp;
-          %span.light Projects with push events
-        .checkbox
-          = label_tag :abandoned, 'Abandoned'
-          = check_box_tag :abandoned, 1, params[:abandoned]
-          &nbsp;
-          %span.light No activity over 6 month
+          = label_tag :namespace_id, "Namespace"
+          = namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
+
+        .form-group
+          %strong Activity
+          .checkbox
+            = label_tag :with_push, 'Not empty'
+            = check_box_tag :with_push, 1, params[:with_push]
+            &nbsp;
+            %span.light Projects with push events
+          .checkbox
+            = label_tag :abandoned, 'Abandoned'
+            = check_box_tag :abandoned, 1, params[:abandoned]
+            &nbsp;
+            %span.light No activity over 6 month
         %fieldset
           %strong Visibility level:
@@ -31,12 +33,12 @@
                   %span.descr
                     = visibility_level_icon(level)
                     = label
-        .form-actions
-          = hidden_field_tag :sort, params[:sort]
-          = submit_tag "Search", class: "btn submit btn-primary"
-          = link_to "Reset", admin_projects_path, class: "btn"
+        %hr
+        = hidden_field_tag :sort, params[:sort]
+        = submit_tag "Search", class: "btn submit btn-primary"
+        = link_to "Reset", admin_projects_path, class: "btn btn-cancel"
-  .col-md-8
+  .col-md-9
     .panel.panel-default
       .panel-heading
         Projects (#{@projects.total_count})
 .user_new
-  = form_for [:admin, @user], html: { class: 'form-horizontal' } do |f|
+  = form_for [:admin, @user], html: { class: 'form-horizontal fieldset-form' } do |f|
     -if @user.errors.any?
       #error_explanation
         .alert.alert-danger
@@ -61,17 +61,14 @@
           .col-sm-10 You cannot remove your own admin rights
         - else
           .col-sm-10= f.check_box :admin
-      - unless @user.new_record? || current_user == @user
-        .alert.alert-danger
-          - if @user.blocked?
-            %p This user is blocked and is not able to login to GitLab
-            = link_to 'Unblock User', unblock_admin_user_path(@user), method: :put, class: "btn btn-small"
-          - else
-            %p Blocked users will be removed from all projects &amp; will not be able to login to GitLab.
-            = link_to 'Block User', block_admin_user_path(@user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-small btn-remove"
     %fieldset
       %legend Profile
       .form-group
+        = f.label :avatar, class: 'control-label'
+        .col-sm-10
+          = f.file_field :avatar
+
+      .form-group
         = f.label :skype, class: 'control-label'
         .col-sm-10= f.text_field :skype, class: 'form-control'
       .form-group
 %h3.page-title
-  #{@user.name} &rarr;
-  %i.icon-edit
-  Edit user
+  Edit user: #{@user.name}
+.back-link
+  = link_to admin_user_path(@user) do
+    &larr; Back to user page
 %hr
 = render 'form'
 %h3.page-title
-  %i.icon-plus
   New user
 %hr
 = render 'form'
 %h3.page-title
-  %span.cgray User:
+  User:
   = @user.name
   - if @user.blocked?
     %span.cred (Blocked)
@@ -11,112 +11,144 @@
       %i.icon-edit
       Edit
 %hr
+%ul.nav.nav-tabs
+  %li.active
+    %a{"data-toggle" => "tab", href: "#account"} Account
+  %li
+    %a{"data-toggle" => "tab", href: "#profile"} Profile
+  %li
+    %a{"data-toggle" => "tab", href: "#groups"} Groups
+  %li
+    %a{"data-toggle" => "tab", href: "#projects"} Projects
-.row
-  .col-md-6
-    .panel.panel-default
-      .panel-heading
-        Account:
-        .pull-right
-          = image_tag avatar_icon(@user.email, 32), class: "avatar s32"
-      %ul.well-list
-        %li
-          %span.light Name:
-          %strong= @user.name
-        %li
-          %span.light Username:
-          %strong
-            = @user.username
-        %li
-          %span.light Email:
-          %strong
-            = mail_to @user.email
-        %li
-          %span.light Can create groups:
-          %strong
-            = @user.can_create_group ? "Yes" : "No"
-        %li
-          %span.light Personal projects limit:
-          %strong
-            = @user.projects_limit
-        %li
-          %span.light Member since:
-          %strong
-            = @user.created_at.stamp("Nov 12, 2031")
-        - if @user.confirmed_at
-          %li
-            %span.light Confirmed at:
-            %strong
-              = @user.confirmed_at.stamp("Nov 12, 2031")
-        - else
-          %li
-            %span.light Confirmed:
-            %strong.cred
-              No
+.tab-content
+  #account.tab-pane.active
+    .row
+      .col-md-6
+        .panel.panel-default
+          .panel-heading
+            Account:
+          %ul.well-list
+            %li
+              %span.light Name:
+              %strong= @user.name
+            %li
+              %span.light Username:
+              %strong
+                = @user.username
+            %li
+              %span.light Email:
+              %strong
+                = mail_to @user.email
+            - @user.emails.each do |email|
+              %li
+                %span.light Secondary email:
+                %strong= email.email
-        %li
-          %span.light Last sign-in at:
-          %strong
-            - if @user.last_sign_in_at
-              = @user.last_sign_in_at.stamp("Nov 12, 2031")
+            %li
+              %span.light Can create groups:
+              %strong
+                = @user.can_create_group ? "Yes" : "No"
+            %li
+              %span.light Personal projects limit:
+              %strong
+                = @user.projects_limit
+            %li
+              %span.light Member since:
+              %strong
+                = @user.created_at.stamp("Nov 12, 2031")
+            - if @user.confirmed_at
+              %li
+                %span.light Confirmed at:
+                %strong
+                  = @user.confirmed_at.stamp("Nov 12, 2031")
             - else
-              never
+              %li
+                %span.light Confirmed:
+                %strong.cred
+                  No
+
+            %li
+              %span.light Last sign-in at:
+              %strong
+                - if @user.last_sign_in_at
+                  = @user.last_sign_in_at.stamp("Nov 12, 2031")
+                - else
+                  never
-        - if @user.ldap_user?
-          %li
-            %span.light LDAP uid:
-            %strong
-              = @user.extern_uid
+            - if @user.ldap_user?
+              %li
+                %span.light LDAP uid:
+                %strong
+                  = @user.extern_uid
-        - if @user.created_by
-          %li
-            %span.light Created by:
-            %strong
-              = link_to @user.created_by.name, [:admin, @user.created_by]
+            - if @user.created_by
+              %li
+                %span.light Created by:
+                %strong
+                  = link_to @user.created_by.name, [:admin, @user.created_by]
-    - unless @user == current_user
-      - if @user.blocked?
-        .alert.alert-info
-          %h4 This user is blocked
-          %p Blocking user has the following effects:
-          %ul
-            %li User will not be able to login
-            %li User will not be able to access git repositories
-            %li User will be removed from joined projects and groups
-            %li Personal projects will be left
-            %li Owned groups will be left
-          %br
-          = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-new", data: { confirm: 'Are you sure?' }
-      - else
-        .alert.alert-warning
-          %h4 Block this user
-          %p Blocking user has the following effects:
-          %ul
-            %li User will not be able to login
-            %li User will not be able to access git repositories
-            %li User will be removed from joined projects and groups
-            %li Personal projects will be left
-            %li Owned groups will be left
-          %br
-          = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove"
+      .col-md-6
+        - unless @user == current_user
+          - if @user.blocked?
+            .alert.alert-info
+              %h4 This user is blocked
+              %p Blocking user has the following effects:
+              %ul
+                %li User will not be able to login
+                %li User will not be able to access git repositories
+                %li User will be removed from joined projects and groups
+                %li Personal projects will be left
+                %li Owned groups will be left
+              %br
+              = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-new", data: { confirm: 'Are you sure?' }
+          - else
+            .alert.alert-warning
+              %h4 Block this user
+              %p Blocking user has the following effects:
+              %ul
+                %li User will not be able to login
+                %li User will not be able to access git repositories
+                %li User will be removed from joined projects and groups
+                %li Personal projects will be left
+                %li Owned groups will be left
+              %br
+              = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove"
-      .alert.alert-danger
-        %h4
-          Remove user
-        %p Deleting a user has the following effects:
-        %ul
-          %li All user content like authored issues, snippets, comments will be removed
-          - rp = @user.personal_projects.count
-          - unless rp.zero?
-            %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
-          - if @user.solo_owned_groups.present?
+          .alert.alert-danger
+            %h4
+              Remove user
+            %p Deleting a user has the following effects:
+            %ul
+              %li All user content like authored issues, snippets, comments will be removed
+              - rp = @user.personal_projects.count
+              - unless rp.zero?
+                %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
+              - if @user.solo_owned_groups.present?
+                %li
+                  Next groups with all content will be removed:
+                  %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
+            %br
+            = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
+
+  #profile.tab-pane
+    .row
+      .col-md-6
+        .panel.panel-default
+          .panel-heading
+            = @user.name
+          %ul.well-list
+            %li
+              = image_tag avatar_icon(@user.email, 60), class: "avatar s60"
             %li
-              Next groups with all content will be removed:
-              %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
-        %br
-        = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
+              %span.light Profile page:
+              %strong
+                = link_to user_path(@user) do
+                  = @user.username
+      .col-md-6
+        = render 'users/profile', user: @user
-  .col-md-6
+  #groups.tab-pane
     - if @user.users_groups.present?
       .panel.panel-default
         .panel-heading Groups:
@@ -131,23 +163,42 @@
                 - unless user_group.owner?
                   = link_to group_users_group_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
                     %i.icon-remove.icon-white
+    - else
+      .nothing-here-block This user has no groups.
-    .panel.panel-default
-      .panel-heading Projects (#{@projects.count})
-      %ul.well-list
-        - @projects.sort_by(&:name_with_namespace).each do |project|
-          - tm = project.team.find_tm(@user.id)
-          %li.users_project
-            = link_to admin_project_path(project), class: dom_class(project) do
-              = project.name_with_namespace
+  #projects.tab-pane
+    - if @user.groups.any?
+      .panel.panel-default
+        .panel-heading Group projects
+        %ul.well-list
+          - @user.groups.each do |group|
+            %li
+              %strong= group.name
+              &ndash; access to
+              #{pluralize(group.projects.count, 'project')}
-            - if tm
-              .pull-right
-                - if tm.owner?
-                  %span.light Owner
-                - else
-                  %span.light= tm.human_access
+    .row
+      .col-md-6
+        = render 'users/projects', projects: @personal_projects
+
+      .col-md-6
+        .panel.panel-default
+          .panel-heading Joined projects (#{@joined_projects.count})
+          %ul.well-list
+            - @joined_projects.sort_by(&:name_with_namespace).each do |project|
+              - tm = project.team.find_tm(@user.id)
+              %li.users_project
+                .list-item-name
+                  = link_to admin_project_path(project), class: dom_class(project) do
+                    = project.name_with_namespace
+
+                - if tm
+                  .pull-right
+                    - if tm.owner?
+                      %span.light Owner
+                    - else
+                      %span.light= tm.human_access
-                  - if tm.respond_to? :project
-                    = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do
-                      %i.icon-remove
+                      - if tm.respond_to? :project
+                        = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do
+                          %i.icon-remove
 - tree, commit = submodule_links(submodule_item)
 %tr{ class: "tree-item" }
   %td.tree-item-file-name
-    = image_tag "submodule.png"
+    %i.icon-archive
     %span
       = link_to truncate(submodule_item.name, length: 40), tree
     @
@@ -36,8 +36,7 @@
     - if @path.present?
       %tr.tree-item
         %td.tree-item-file-name
-          = image_tag "file_empty.png", size: '16x16'
-          = link_to "..", project_tree_path(@project, up_dir_path(tree))
+          = link_to "..", project_tree_path(@project, up_dir_path(tree)), class: 'prepend-left-10'
         %td
         %td
         %td
 .panel.panel-default
   .panel-heading Personal projects
   %ul.well-list
-    - @projects.each do |project|
+    - projects.each do |project|
       %li
         = link_to_project project
@@ -13,12 +13,14 @@
       %br
       %small member since #{@user.created_at.stamp("Nov 12, 2031")}
     .clearfix
-    %h4 Groups:
-    = render 'groups', groups: @groups
-    %hr
+
+    - if @groups.any?
+      %h4 Groups:
+      = render 'groups', groups: @groups
+      %hr
     %h4 User Activity:
     = render @events
   .col-md-4
     = render 'profile', user: @user
     - if @projects.present?
-      = render 'projects'
+      = render 'projects', projects: @projects
	@@ -98,3 +98,7 @@ label {		@@ -98,3 +98,7 @@ label {
98	z-index: 2;	98	z-index: 2;
99	}	99	}
100	}	100	}
		101	+
		102	+.fieldset-form fieldset {
		103	+ margin-bottom: 20px;
		104	+}
	@@ -14,6 +14,7 @@ h2.page-title {		@@ -14,6 +14,7 @@ h2.page-title {
14		14
15	h3.page-title {	15	h3.page-title {
16	@include page-title;	16	@include page-title;
		17	+ font-size: 22px;
17	}	18	}
18		19
19	h6 {	20	h6 {
	@@ -21,12 +21,22 @@		@@ -21,12 +21,22 @@
21	}	21	}
22		22
23	.admin-filter form {	23	.admin-filter form {
24	- label { width: 110px; }
25	- .controls { margin-left: 130px; }
26	- .form-actions { padding-left: 130px; background: #fff }
27	- .visibility-levels {
28	- .controls {
29	- margin-bottom: 9px;	24	+ .select2-container {
		25	+ width: 100%
		26	+ }
		27	+
		28	+ .controls {
		29	+ margin-left: 130px;
		30	+ }
		31	+
		32	+ .form-actions {
		33	+ padding-left: 130px;
		34	+ background: #fff
		35	+ }
		36	+
		37	+ .visibility-levels {
		38	+ .controls {
		39	+ margin-bottom: 9px;
30	}	40	}
31		41
32	i {	42	i {
	@@ -8,7 +8,8 @@ class Admin::UsersController < Admin::ApplicationController		@@ -8,7 +8,8 @@ class Admin::UsersController < Admin::ApplicationController
8	end	8	end
9		9
10	def show	10	def show
11	- @projects = user.authorized_projects	11	+ @personal_projects = user.personal_projects
		12	+ @joined_projects = user.projects.joined(@user)
12	end	13	end
13		14
14	def new	15	def new
1	%h3.page-title	1	%h3.page-title
2	- %i.icon-plus
3	New user	2	New user
4	%hr	3	%hr
5	= render 'form'	4	= render 'form'
1	%h3.page-title	1	%h3.page-title
2	- %span.cgray User:	2	+ User:
3	= @user.name	3	= @user.name
4	- if @user.blocked?	4	- if @user.blocked?
5	%span.cred (Blocked)	5	%span.cred (Blocked)
	@@ -11,112 +11,144 @@		@@ -11,112 +11,144 @@
11	%i.icon-edit	11	%i.icon-edit
12	Edit	12	Edit
13	%hr	13	%hr
		14	+%ul.nav.nav-tabs
		15	+ %li.active
		16	+ %a{"data-toggle" => "tab", href: "#account"} Account
		17	+ %li
		18	+ %a{"data-toggle" => "tab", href: "#profile"} Profile
		19	+ %li
		20	+ %a{"data-toggle" => "tab", href: "#groups"} Groups
		21	+ %li
		22	+ %a{"data-toggle" => "tab", href: "#projects"} Projects
14		23
15	-.row
16	- .col-md-6
17	- .panel.panel-default
18	- .panel-heading
19	- Account:
20	- .pull-right
21	- = image_tag avatar_icon(@user.email, 32), class: "avatar s32"
22	- %ul.well-list
23	- %li
24	- %span.light Name:
25	- %strong= @user.name
26	- %li
27	- %span.light Username:
28	- %strong
29	- = @user.username
30	- %li
31	- %span.light Email:
32	- %strong
33	- = mail_to @user.email
34	- %li
35	- %span.light Can create groups:
36	- %strong
37	- = @user.can_create_group ? "Yes" : "No"
38	- %li
39	- %span.light Personal projects limit:
40	- %strong
41	- = @user.projects_limit
42	- %li
43	- %span.light Member since:
44	- %strong
45	- = @user.created_at.stamp("Nov 12, 2031")
46	- - if @user.confirmed_at
47	- %li
48	- %span.light Confirmed at:
49	- %strong
50	- = @user.confirmed_at.stamp("Nov 12, 2031")
51	- - else
52	- %li
53	- %span.light Confirmed:
54	- %strong.cred
55	- No	24	+.tab-content
		25	+ #account.tab-pane.active
		26	+ .row
		27	+ .col-md-6
		28	+ .panel.panel-default
		29	+ .panel-heading
		30	+ Account:
		31	+ %ul.well-list
		32	+ %li
		33	+ %span.light Name:
		34	+ %strong= @user.name
		35	+ %li
		36	+ %span.light Username:
		37	+ %strong
		38	+ = @user.username
		39	+ %li
		40	+ %span.light Email:
		41	+ %strong
		42	+ = mail_to @user.email
		43	+ - @user.emails.each do \|email\|
		44	+ %li
		45	+ %span.light Secondary email:
		46	+ %strong= email.email
56		47
57	- %li
58	- %span.light Last sign-in at:
59	- %strong
60	- - if @user.last_sign_in_at
61	- = @user.last_sign_in_at.stamp("Nov 12, 2031")	48	+ %li
		49	+ %span.light Can create groups:
		50	+ %strong
		51	+ = @user.can_create_group ? "Yes" : "No"
		52	+ %li
		53	+ %span.light Personal projects limit:
		54	+ %strong
		55	+ = @user.projects_limit
		56	+ %li
		57	+ %span.light Member since:
		58	+ %strong
		59	+ = @user.created_at.stamp("Nov 12, 2031")
		60	+ - if @user.confirmed_at
		61	+ %li
		62	+ %span.light Confirmed at:
		63	+ %strong
		64	+ = @user.confirmed_at.stamp("Nov 12, 2031")
62	- else	65	- else
63	- never	66	+ %li
		67	+ %span.light Confirmed:
		68	+ %strong.cred
		69	+ No
		70	+
		71	+ %li
		72	+ %span.light Last sign-in at:
		73	+ %strong
		74	+ - if @user.last_sign_in_at
		75	+ = @user.last_sign_in_at.stamp("Nov 12, 2031")
		76	+ - else
		77	+ never
64		78
65	- - if @user.ldap_user?
66	- %li
67	- %span.light LDAP uid:
68	- %strong
69	- = @user.extern_uid	79	+ - if @user.ldap_user?
		80	+ %li
		81	+ %span.light LDAP uid:
		82	+ %strong
		83	+ = @user.extern_uid
70		84
71	- - if @user.created_by
72	- %li
73	- %span.light Created by:
74	- %strong
75	- = link_to @user.created_by.name, [:admin, @user.created_by]	85	+ - if @user.created_by
		86	+ %li
		87	+ %span.light Created by:
		88	+ %strong
		89	+ = link_to @user.created_by.name, [:admin, @user.created_by]
76		90
77	- - unless @user == current_user
78	- - if @user.blocked?
79	- .alert.alert-info
80	- %h4 This user is blocked
81	- %p Blocking user has the following effects:
82	- %ul
83	- %li User will not be able to login
84	- %li User will not be able to access git repositories
85	- %li User will be removed from joined projects and groups
86	- %li Personal projects will be left
87	- %li Owned groups will be left
88	- %br
89	- = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-new", data: { confirm: 'Are you sure?' }
90	- - else
91	- .alert.alert-warning
92	- %h4 Block this user
93	- %p Blocking user has the following effects:
94	- %ul
95	- %li User will not be able to login
96	- %li User will not be able to access git repositories
97	- %li User will be removed from joined projects and groups
98	- %li Personal projects will be left
99	- %li Owned groups will be left
100	- %br
101	- = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove"	91	+ .col-md-6
		92	+ - unless @user == current_user
		93	+ - if @user.blocked?
		94	+ .alert.alert-info
		95	+ %h4 This user is blocked
		96	+ %p Blocking user has the following effects:
		97	+ %ul
		98	+ %li User will not be able to login
		99	+ %li User will not be able to access git repositories
		100	+ %li User will be removed from joined projects and groups
		101	+ %li Personal projects will be left
		102	+ %li Owned groups will be left
		103	+ %br
		104	+ = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-new", data: { confirm: 'Are you sure?' }
		105	+ - else
		106	+ .alert.alert-warning
		107	+ %h4 Block this user
		108	+ %p Blocking user has the following effects:
		109	+ %ul
		110	+ %li User will not be able to login
		111	+ %li User will not be able to access git repositories
		112	+ %li User will be removed from joined projects and groups
		113	+ %li Personal projects will be left
		114	+ %li Owned groups will be left
		115	+ %br
		116	+ = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove"
102		117
103	- .alert.alert-danger
104	- %h4
105	- Remove user
106	- %p Deleting a user has the following effects:
107	- %ul
108	- %li All user content like authored issues, snippets, comments will be removed
109	- - rp = @user.personal_projects.count
110	- - unless rp.zero?
111	- %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
112	- - if @user.solo_owned_groups.present?	118	+ .alert.alert-danger
		119	+ %h4
		120	+ Remove user
		121	+ %p Deleting a user has the following effects:
		122	+ %ul
		123	+ %li All user content like authored issues, snippets, comments will be removed
		124	+ - rp = @user.personal_projects.count
		125	+ - unless rp.zero?
		126	+ %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
		127	+ - if @user.solo_owned_groups.present?
		128	+ %li
		129	+ Next groups with all content will be removed:
		130	+ %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
		131	+ %br
		132	+ = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
		133	+
		134	+ #profile.tab-pane
		135	+ .row
		136	+ .col-md-6
		137	+ .panel.panel-default
		138	+ .panel-heading
		139	+ = @user.name
		140	+ %ul.well-list
		141	+ %li
		142	+ = image_tag avatar_icon(@user.email, 60), class: "avatar s60"
113	%li	143	%li
114	- Next groups with all content will be removed:
115	- %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
116	- %br
117	- = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"	144	+ %span.light Profile page:
		145	+ %strong
		146	+ = link_to user_path(@user) do
		147	+ = @user.username
		148	+ .col-md-6
		149	+ = render 'users/profile', user: @user
118		150
119	- .col-md-6	151	+ #groups.tab-pane
120	- if @user.users_groups.present?	152	- if @user.users_groups.present?
121	.panel.panel-default	153	.panel.panel-default
122	.panel-heading Groups:	154	.panel-heading Groups:
	@@ -131,23 +163,42 @@		@@ -131,23 +163,42 @@
131	- unless user_group.owner?	163	- unless user_group.owner?
132	= link_to group_users_group_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do	164	= link_to group_users_group_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
133	%i.icon-remove.icon-white	165	%i.icon-remove.icon-white
		166	+ - else
		167	+ .nothing-here-block This user has no groups.
134		168
135	- .panel.panel-default
136	- .panel-heading Projects (#{@projects.count})
137	- %ul.well-list
138	- - @projects.sort_by(&:name_with_namespace).each do \|project\|
139	- - tm = project.team.find_tm(@user.id)
140	- %li.users_project
141	- = link_to admin_project_path(project), class: dom_class(project) do
142	- = project.name_with_namespace	169	+ #projects.tab-pane
		170	+ - if @user.groups.any?
		171	+ .panel.panel-default
		172	+ .panel-heading Group projects
		173	+ %ul.well-list
		174	+ - @user.groups.each do \|group\|
		175	+ %li
		176	+ %strong= group.name
		177	+ – access to
		178	+ #{pluralize(group.projects.count, 'project')}
143		179
144	- - if tm
145	- .pull-right
146	- - if tm.owner?
147	- %span.light Owner
148	- - else
149	- %span.light= tm.human_access	180	+ .row
		181	+ .col-md-6
		182	+ = render 'users/projects', projects: @personal_projects
		183	+
		184	+ .col-md-6
		185	+ .panel.panel-default
		186	+ .panel-heading Joined projects (#{@joined_projects.count})
		187	+ %ul.well-list
		188	+ - @joined_projects.sort_by(&:name_with_namespace).each do \|project\|
		189	+ - tm = project.team.find_tm(@user.id)
		190	+ %li.users_project
		191	+ .list-item-name
		192	+ = link_to admin_project_path(project), class: dom_class(project) do
		193	+ = project.name_with_namespace
		194	+
		195	+ - if tm
		196	+ .pull-right
		197	+ - if tm.owner?
		198	+ %span.light Owner
		199	+ - else
		200	+ %span.light= tm.human_access
150		201
151	- - if tm.respond_to? :project
152	- = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do
153	- %i.icon-remove	202	+ - if tm.respond_to? :project
		203	+ = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do
		204	+ %i.icon-remove
1	- tree, commit = submodule_links(submodule_item)	1	- tree, commit = submodule_links(submodule_item)
2	%tr{ class: "tree-item" }	2	%tr{ class: "tree-item" }
3	%td.tree-item-file-name	3	%td.tree-item-file-name
4	- = image_tag "submodule.png"	4	+ %i.icon-archive
5	%span	5	%span
6	= link_to truncate(submodule_item.name, length: 40), tree	6	= link_to truncate(submodule_item.name, length: 40), tree
7	@	7	@
1	.panel.panel-default	1	.panel.panel-default
2	.panel-heading Personal projects	2	.panel-heading Personal projects
3	%ul.well-list	3	%ul.well-list
4	- - @projects.each do \|project\|	4	+ - projects.each do \|project\|
5	%li	5	%li
6	= link_to_project project	6	= link_to_project project