Few UI improvements

7 files changed, 11 insertions, 10 deletions

diff --git a/app/controllers/teams/application_controller.rb b/app/controllers/teams/application_controller.rb
index 2c1583d943e..fc23202610c 100644
--- a/app/controllers/teams/application_controller.rb
+++ b/app/controllers/teams/application_controller.rb
@@ -1,5 +1,7 @@
 class Teams::ApplicationController < ApplicationController
 
+  layout 'user_team'
+
   before_filter :authorize_manage_user_team!
 
   protected
diff --git a/app/views/dashboard/_teams.html.haml b/app/views/dashboard/_teams.html.haml
index 414bb12a945..4250faac685 100644
--- a/app/views/dashboard/_teams.html.haml
+++ b/app/views/dashboard/_teams.html.haml
@@ -20,7 +20,6 @@
             &rarr;
           %span.last_activity
             %strong Projects:
-            %span= team.projects.count
-          %span.last_activity
+            %span= "#{team.projects.count}, "
             %strong Members:
             %span= team.members.count
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 945500d4b6c..de4117ae296 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -10,7 +10,7 @@
       %ul.nav
         %li
           = link_to teams_path, title: "Teams of users", class: 'has_bottom_tooltip', 'data-original-title' => 'Teams list'  do
-            %i.icon-globe
+            %i.icon-group
         - if current_user.is_admin?
           %li
             = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index f47e8b3e9ff..46bc9ef1457 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -3,7 +3,7 @@
   = render "layouts/head", title: "#{@group.name}"
   %body{class: "#{app_theme} application"}
     = render "layouts/flash"
-    = render "layouts/head_panel", title: "#{@group.name}"
+    = render "layouts/head_panel", title: "group: #{@group.name}"
     .container
       %ul.main_menu
         = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
diff --git a/app/views/layouts/user_team.html.haml b/app/views/layouts/user_team.html.haml
index aa613d71f90..769fc3b78c3 100644
--- a/app/views/layouts/user_team.html.haml
+++ b/app/views/layouts/user_team.html.haml
@@ -3,7 +3,7 @@
   = render "layouts/head", title: "#{@team.name}"
   %body{class: "#{app_theme} application"}
     = render "layouts/flash"
-    = render "layouts/head_panel", title: "#{@team.name}"
+    = render "layouts/head_panel", title: "team: #{@team.name}"
     .container
       %ul.main_menu
         = nav_link(path: 'teams#show', html_options: {class: 'home'}) do
diff --git a/app/views/teams/_projects.html.haml b/app/views/teams/_projects.html.haml
index 040d1ae94aa..95202bc6ee5 100644
--- a/app/views/teams/_projects.html.haml
+++ b/app/views/teams/_projects.html.haml
@@ -10,7 +10,7 @@
           New Project
   %ul.well-list
     - if projects.blank?
-      %p.nothing_here_message This groups has no projects yet
+      %p.nothing_here_message This team has no projects yet
     - projects.each do |project|
       %li
         = link_to project_path(project), class: dom_class(project) do
diff --git a/app/views/teams/index.html.haml b/app/views/teams/index.html.haml
index 8f8874328fc..6610cdbd76e 100644
--- a/app/views/teams/index.html.haml
+++ b/app/views/teams/index.html.haml
@@ -20,7 +20,7 @@
       %th Projects
       %th Members
       %th Owner
-      %th
+      %th.cred Danger Zone!
 
   - @teams.each do |team|
     %tr
@@ -30,9 +30,9 @@
       %td= link_to team.projects.count, team_projects_path(team)
       %td= link_to team.members.count, team_members_path(team)
       %td= link_to team.owner.name, team_member_path(team, team.owner)
-      %td
+      %td.bgred
         - if current_user.can?(:manage_user_team, team)
+          = link_to "Edit", edit_team_path(team), class: "btn small"
           - if current_user.can?(:admin_user_team, team)
-            = link_to "Destroy", team_path(team), method: :delete, confirm: "You are shure?", class: "danger btn small right"
+            = link_to "Destroy", team_path(team), method: :delete, confirm: "You are shure?", class: "danger btn small"
             &nbsp;
-          = link_to "Edit", edit_team_path(team), class: "btn small right"