Commit 645f9604 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Few UI improvements

parent 1a917bc9
class Teams::ApplicationController < ApplicationController class Teams::ApplicationController < ApplicationController
layout 'user_team'
before_filter :authorize_manage_user_team! before_filter :authorize_manage_user_team!
protected protected
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
&rarr; &rarr;
%span.last_activity %span.last_activity
%strong Projects: %strong Projects:
%span= team.projects.count %span= "#{team.projects.count}, "
%span.last_activity
%strong Members: %strong Members:
%span= team.members.count %span= team.members.count
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%ul.nav %ul.nav
%li %li
= link_to teams_path, title: "Teams of users", class: 'has_bottom_tooltip', 'data-original-title' => 'Teams list' do = 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? - if current_user.is_admin?
%li %li
= link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= render "layouts/head", title: "#{@group.name}" = render "layouts/head", title: "#{@group.name}"
%body{class: "#{app_theme} application"} %body{class: "#{app_theme} application"}
= render "layouts/flash" = render "layouts/flash"
= render "layouts/head_panel", title: "#{@group.name}" = render "layouts/head_panel", title: "group: #{@group.name}"
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do = nav_link(path: 'groups#show', html_options: {class: 'home'}) do
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= render "layouts/head", title: "#{@team.name}" = render "layouts/head", title: "#{@team.name}"
%body{class: "#{app_theme} application"} %body{class: "#{app_theme} application"}
= render "layouts/flash" = render "layouts/flash"
= render "layouts/head_panel", title: "#{@team.name}" = render "layouts/head_panel", title: "team: #{@team.name}"
.container .container
%ul.main_menu %ul.main_menu
= nav_link(path: 'teams#show', html_options: {class: 'home'}) do = nav_link(path: 'teams#show', html_options: {class: 'home'}) do
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
New Project New Project
%ul.well-list %ul.well-list
- if projects.blank? - 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| - projects.each do |project|
%li %li
= link_to project_path(project), class: dom_class(project) do = link_to project_path(project), class: dom_class(project) do
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%th Projects %th Projects
%th Members %th Members
%th Owner %th Owner
%th %th.cred Danger Zone!
- @teams.each do |team| - @teams.each do |team|
%tr %tr
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
%td= link_to team.projects.count, team_projects_path(team) %td= link_to team.projects.count, team_projects_path(team)
%td= link_to team.members.count, team_members_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= link_to team.owner.name, team_member_path(team, team.owner)
%td %td.bgred
- if current_user.can?(:manage_user_team, team) - 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) - 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; &nbsp;
= link_to "Edit", edit_team_path(team), class: "btn small right"
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