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

update all teams code. refactoring and some corrections

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-23 02:20:27 +04:00 • committed by Dmitriy Zaporozhets
parent 7658f8c151
commit 18bd1c9d30
35 changed files with 332 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,9 @@
%span.separator
%h1.project_name= title
%ul.nav
%li
= link_to teams_path, title: "Teams of users", class: 'has_bottom_tooltip', 'data-original-title' => 'Teams list' do
%i.icon-globe
- if current_user.is_admin?
%li
= link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do

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

@ -1,22 +1,22 @@
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: "#{@user_team.name}"
= render "layouts/head", title: "#{@team.name}"
%body{class: "#{app_theme} application"}
= render "layouts/flash"
= render "layouts/head_panel", title: "#{@user_team.name}"
= render "layouts/head_panel", title: "#{@team.name}"
.container
%ul.main_menu
= nav_link(path: 'teams#show', html_options: {class: 'home'}) do
= link_to "Home", team_path(@user_team), title: "Home"
= link_to "Home", team_path(@team), title: "Home"
= nav_link(path: 'teams#issues') do
= link_to issues_team_path(@user_team) do
= link_to issues_team_path(@team) do
Issues
%span.count= Issue.opened.of_user_team(@user_team).count
%span.count= Issue.opened.of_user_team(@team).count
= nav_link(path: 'teams#merge_requests') do
= link_to merge_requests_team_path(@user_team) do
= link_to merge_requests_team_path(@team) do
Merge Requests
%span.count= MergeRequest.opened.of_user_team(@user_team).count
%span.count= MergeRequest.opened.of_user_team(@team).count
= nav_link(path: 'teams#search') do
= link_to "Search", search_team_path(@user_team)
= link_to "Search", search_team_path(@team)
.content= yield