Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
645f9604
Commit
645f9604
authored
Jan 24, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Few UI improvements
parent
1a917bc9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
10 deletions
+11
-10
app/controllers/teams/application_controller.rb
app/controllers/teams/application_controller.rb
+2
-0
app/views/dashboard/_teams.html.haml
app/views/dashboard/_teams.html.haml
+1
-2
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+1
-1
app/views/layouts/group.html.haml
app/views/layouts/group.html.haml
+1
-1
app/views/layouts/user_team.html.haml
app/views/layouts/user_team.html.haml
+1
-1
app/views/teams/_projects.html.haml
app/views/teams/_projects.html.haml
+1
-1
app/views/teams/index.html.haml
app/views/teams/index.html.haml
+4
-4
No files found.
app/controllers/teams/application_controller.rb
View file @
645f9604
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
...
...
app/views/dashboard/_teams.html.haml
View file @
645f9604
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
→
→
%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
app/views/layouts/_head_panel.html.haml
View file @
645f9604
...
@@ -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-g
lobe
%i
.icon-g
roup
-
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
...
...
app/views/layouts/group.html.haml
View file @
645f9604
...
@@ -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
...
...
app/views/layouts/user_team.html.haml
View file @
645f9604
...
@@ -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
...
...
app/views/teams/_projects.html.haml
View file @
645f9604
...
@@ -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
...
...
app/views/teams/index.html.haml
View file @
645f9604
...
@@ -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"
=
link_to
"Edit"
,
edit_team_path
(
team
),
class:
"btn small right"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment