Skip to content

Commit 645f960

Browse files
committed
Few UI improvements
1 parent 1a917bc commit 645f960

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

app/controllers/teams/application_controller.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
class Teams::ApplicationController < ApplicationController
22

3+
layout 'user_team'
4+
35
before_filter :authorize_manage_user_team!
46

57
protected

app/views/dashboard/_teams.html.haml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
&rarr;
2121
%span.last_activity
2222
%strong Projects:
23-
%span= team.projects.count
24-
%span.last_activity
23+
%span= "#{team.projects.count}, "
2524
%strong Members:
2625
%span= team.members.count

app/views/layouts/_head_panel.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
%ul.nav
1111
%li
1212
= link_to teams_path, title: "Teams of users", class: 'has_bottom_tooltip', 'data-original-title' => 'Teams list' do
13-
%i.icon-globe
13+
%i.icon-group
1414
- if current_user.is_admin?
1515
%li
1616
= link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do

app/views/layouts/group.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
= render "layouts/head", title: "#{@group.name}"
44
%body{class: "#{app_theme} application"}
55
= render "layouts/flash"
6-
= render "layouts/head_panel", title: "#{@group.name}"
6+
= render "layouts/head_panel", title: "group: #{@group.name}"
77
.container
88
%ul.main_menu
99
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do

app/views/layouts/user_team.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
= render "layouts/head", title: "#{@team.name}"
44
%body{class: "#{app_theme} application"}
55
= render "layouts/flash"
6-
= render "layouts/head_panel", title: "#{@team.name}"
6+
= render "layouts/head_panel", title: "team: #{@team.name}"
77
.container
88
%ul.main_menu
99
= nav_link(path: 'teams#show', html_options: {class: 'home'}) do

app/views/teams/_projects.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
New Project
1111
%ul.well-list
1212
- if projects.blank?
13-
%p.nothing_here_message This groups has no projects yet
13+
%p.nothing_here_message This team has no projects yet
1414
- projects.each do |project|
1515
%li
1616
= link_to project_path(project), class: dom_class(project) do

app/views/teams/index.html.haml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
%th Projects
2121
%th Members
2222
%th Owner
23-
%th
23+
%th.cred Danger Zone!
2424

2525
- @teams.each do |team|
2626
%tr
@@ -30,9 +30,9 @@
3030
%td= link_to team.projects.count, team_projects_path(team)
3131
%td= link_to team.members.count, team_members_path(team)
3232
%td= link_to team.owner.name, team_member_path(team, team.owner)
33-
%td
33+
%td.bgred
3434
- if current_user.can?(:manage_user_team, team)
35+
= link_to "Edit", edit_team_path(team), class: "btn small"
3536
- if current_user.can?(:admin_user_team, team)
36-
= link_to "Destroy", team_path(team), method: :delete, confirm: "You are shure?", class: "danger btn small right"
37+
= link_to "Destroy", team_path(team), method: :delete, confirm: "You are shure?", class: "danger btn small"
3738
&nbsp;
38-
= link_to "Edit", edit_team_path(team), class: "btn small right"

0 commit comments

Comments
 (0)