deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Few UI improvements

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-24 10:16:03 +02:00
parent 1a917bc954
commit 645f960475
7 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/teams/application_controller.rb
View file

@ -1,5 +1,7 @@
class Teams::ApplicationController < ApplicationController
layout 'user_team'
before_filter :authorize_manage_user_team!
protected

3
app/views/dashboard/_teams.html.haml
View file

@ -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

2
app/views/layouts/_head_panel.html.haml
View file

@ -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

2
app/views/layouts/group.html.haml
View file

@ -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

2
app/views/layouts/user_team.html.haml
View file

@ -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

2
app/views/teams/_projects.html.haml
View file

@ -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

8
app/views/teams/index.html.haml
View file

@ -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"