Download as
Browse Code »

Commit b5dd9e6775e2da52a9efb07bbeedd7cd56230c1d

Authored by Dmitriy Zaporozhets
1 parent ca752e64
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Make a team and group boxes smaller on dashboard

Showing 3 changed files with 15 additions and 14 deletions   Show diff stats
app/models/user_team_user_relationship.rb
  Diff comments   View file @b5dd9e6
... ... @@ -12,4 +12,8 @@ class UserTeamUserRelationship < ActiveRecord::Base
12 12 def user_name
13 13 user.name
14 14 end
  15 +
  16 + def access_human
  17 + UsersProject.access_roles.invert[permission]
  18 + end
15 19 end
... ...
app/views/dashboard/_groups.html.haml
  Diff comments   View file @b5dd9e6
1   -.groups_box
  1 +.ui-box
2 2 %h5.title
3 3 Groups
4 4 %small
... ... @@ -13,8 +13,6 @@
13 13 %li
14 14 = link_to group_path(id: group.path), class: dom_class(group) do
15 15 %strong.well-title= truncate(group.name, length: 35)
16   - %span.arrow
17   - →
18   - %span.last_activity
19   - %strong Projects:
20   - %span= current_user.authorized_projects.where(namespace_id: group.id).count
  16 + %span.right.light
  17 + - if group.owner == current_user
  18 + %i.icon-wrench
... ...
app/views/dashboard/_teams.html.haml
  Diff comments   View file @b5dd9e6
1   -.teams_box
  1 +.ui-box
2 2 %h5.title
3 3 Teams
4 4 %small
... ... @@ -12,10 +12,9 @@
12 12 %li
13 13 = link_to team_path(id: team.path), class: dom_class(team) do
14 14 %strong.well-title= truncate(team.name, length: 35)
15   - %span.arrow
16   - →
17   - %span.last_activity
18   - %strong Projects:
19   - %span= "#{team.projects.count}, "
20   - %strong Members:
21   - %span= team.members.count
  15 + %span.right.light
  16 + - if team.owner == current_user
  17 + %i.icon-wrench
  18 + - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
  19 + - if tm
  20 + = tm.access_human
... ...