Download as
Browse Code »

Commit 645f9604752ae258ab3f125c8fa98adf3b81c127

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

Few UI improvements

Showing 7 changed files with 11 additions and 10 deletions   Show diff stats
app/controllers/teams/application_controller.rb
  Diff comments   View file @645f960
1 class Teams::ApplicationController < ApplicationController 1 class Teams::ApplicationController < ApplicationController
2 2
  3 + layout 'user_team'
  4 +
3 before_filter :authorize_manage_user_team! 5 before_filter :authorize_manage_user_team!
4 6
5 protected 7 protected
app/views/dashboard/_teams.html.haml
  Diff comments   View file @645f960
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
20 &rarr; 20 &rarr;
21 %span.last_activity 21 %span.last_activity
22 %strong Projects: 22 %strong Projects:
23 - %span= team.projects.count  
24 - %span.last_activity 23 + %span= "#{team.projects.count}, "
25 %strong Members: 24 %strong Members:
26 %span= team.members.count 25 %span= team.members.count
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @645f960
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %ul.nav 10 %ul.nav
11 %li 11 %li
12 = link_to teams_path, title: "Teams of users", class: 'has_bottom_tooltip', 'data-original-title' => 'Teams list' do 12 = 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
14 - if current_user.is_admin? 14 - if current_user.is_admin?
15 %li 15 %li
16 = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do 16 = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
app/views/layouts/group.html.haml
  Diff comments   View file @645f960
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 = render "layouts/head", title: "#{@group.name}" 3 = render "layouts/head", title: "#{@group.name}"
4 %body{class: "#{app_theme} application"} 4 %body{class: "#{app_theme} application"}
5 = render "layouts/flash" 5 = render "layouts/flash"
6 - = render "layouts/head_panel", title: "#{@group.name}" 6 + = render "layouts/head_panel", title: "group: #{@group.name}"
7 .container 7 .container
8 %ul.main_menu 8 %ul.main_menu
9 = nav_link(path: 'groups#show', html_options: {class: 'home'}) do 9 = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
app/views/layouts/user_team.html.haml
  Diff comments   View file @645f960
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 = render "layouts/head", title: "#{@team.name}" 3 = render "layouts/head", title: "#{@team.name}"
4 %body{class: "#{app_theme} application"} 4 %body{class: "#{app_theme} application"}
5 = render "layouts/flash" 5 = render "layouts/flash"
6 - = render "layouts/head_panel", title: "#{@team.name}" 6 + = render "layouts/head_panel", title: "team: #{@team.name}"
7 .container 7 .container
8 %ul.main_menu 8 %ul.main_menu
9 = nav_link(path: 'teams#show', html_options: {class: 'home'}) do 9 = nav_link(path: 'teams#show', html_options: {class: 'home'}) do
app/views/teams/_projects.html.haml
  Diff comments   View file @645f960
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 New Project 10 New Project
11 %ul.well-list 11 %ul.well-list
12 - if projects.blank? 12 - 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
14 - projects.each do |project| 14 - projects.each do |project|
15 %li 15 %li
16 = link_to project_path(project), class: dom_class(project) do 16 = link_to project_path(project), class: dom_class(project) do
app/views/teams/index.html.haml
  Diff comments   View file @645f960
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 %th Projects 20 %th Projects
21 %th Members 21 %th Members
22 %th Owner 22 %th Owner
23 - %th 23 + %th.cred Danger Zone!
24 24
25 - @teams.each do |team| 25 - @teams.each do |team|
26 %tr 26 %tr
@@ -30,9 +30,9 @@ @@ -30,9 +30,9 @@
30 %td= link_to team.projects.count, team_projects_path(team) 30 %td= link_to team.projects.count, team_projects_path(team)
31 %td= link_to team.members.count, team_members_path(team) 31 %td= link_to team.members.count, team_members_path(team)
32 %td= link_to team.owner.name, team_member_path(team, team.owner) 32 %td= link_to team.owner.name, team_member_path(team, team.owner)
33 - %td 33 + %td.bgred
34 - if current_user.can?(:manage_user_team, team) 34 - if current_user.can?(:manage_user_team, team)
  35 + = link_to "Edit", edit_team_path(team), class: "btn small"
35 - if current_user.can?(:admin_user_team, team) 36 - 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"
37 &nbsp; 38 &nbsp;
38 - = link_to "Edit", edit_team_path(team), class: "btn small right"