Commit fc43c4e7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Restyle admin/user page

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 87e0fe6f
No related merge requests found
...@@ -8,7 +8,8 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -8,7 +8,8 @@ class Admin::UsersController < Admin::ApplicationController
end end
def show def show
@projects = user.authorized_projects @personal_projects = user.personal_projects
@joined_projects = user.projects.joined(@user)
end end
def new def new
......
%h3.page-title %h3.page-title
%span.cgray User: User:
= @user.name = @user.name
- if @user.blocked? - if @user.blocked?
%span.cred (Blocked) %span.cred (Blocked)
...@@ -11,14 +11,23 @@ ...@@ -11,14 +11,23 @@
%i.icon-edit %i.icon-edit
Edit Edit
%hr %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 .tab-content
#account.tab-pane.active
.row
.col-md-6 .col-md-6
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
Account: Account:
.pull-right
= image_tag avatar_icon(@user.email, 32), class: "avatar s32"
%ul.well-list %ul.well-list
%li %li
%span.light Name: %span.light Name:
...@@ -31,6 +40,11 @@ ...@@ -31,6 +40,11 @@
%span.light Email: %span.light Email:
%strong %strong
= mail_to @user.email = mail_to @user.email
- @user.emails.each do |email|
%li
%span.light Secondary email:
%strong= email.email
%li %li
%span.light Can create groups: %span.light Can create groups:
%strong %strong
...@@ -74,6 +88,7 @@ ...@@ -74,6 +88,7 @@
%strong %strong
= link_to @user.created_by.name, [:admin, @user.created_by] = link_to @user.created_by.name, [:admin, @user.created_by]
.col-md-6
- unless @user == current_user - unless @user == current_user
- if @user.blocked? - if @user.blocked?
.alert.alert-info .alert.alert-info
...@@ -116,7 +131,24 @@ ...@@ -116,7 +131,24 @@
%br %br
= link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove" = 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 .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
%span.light Profile page:
%strong
= link_to user_path(@user) do
= @user.username
.col-md-6
= render 'users/profile', user: @user
#groups.tab-pane
- if @user.users_groups.present? - if @user.users_groups.present?
.panel.panel-default .panel.panel-default
.panel-heading Groups: .panel-heading Groups:
...@@ -131,13 +163,32 @@ ...@@ -131,13 +163,32 @@
- unless user_group.owner? - 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 = 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 %i.icon-remove.icon-white
- else
.nothing-here-block This user has no groups.
#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')}
.row
.col-md-6
= render 'users/projects', projects: @personal_projects
.col-md-6
.panel.panel-default .panel.panel-default
.panel-heading Projects (#{@projects.count}) .panel-heading Joined projects (#{@joined_projects.count})
%ul.well-list %ul.well-list
- @projects.sort_by(&:name_with_namespace).each do |project| - @joined_projects.sort_by(&:name_with_namespace).each do |project|
- tm = project.team.find_tm(@user.id) - tm = project.team.find_tm(@user.id)
%li.users_project %li.users_project
.list-item-name
= link_to admin_project_path(project), class: dom_class(project) do = link_to admin_project_path(project), class: dom_class(project) do
= project.name_with_namespace = project.name_with_namespace
......
.panel.panel-default .panel.panel-default
.panel-heading Personal projects .panel-heading Personal projects
%ul.well-list %ul.well-list
- @projects.each do |project| - projects.each do |project|
%li %li
= link_to_project project = link_to_project project
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
%br %br
%small member since #{@user.created_at.stamp("Nov 12, 2031")} %small member since #{@user.created_at.stamp("Nov 12, 2031")}
.clearfix .clearfix
- if @groups.any?
%h4 Groups: %h4 Groups:
= render 'groups', groups: @groups = render 'groups', groups: @groups
%hr %hr
...@@ -21,4 +23,4 @@ ...@@ -21,4 +23,4 @@
.col-md-4 .col-md-4
= render 'profile', user: @user = render 'profile', user: @user
- if @projects.present? - if @projects.present?
= render 'projects' = render 'projects', projects: @projects
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment