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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2e7ca8c8
Commit
2e7ca8c8
authored
Aug 21, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show only tm events related to this project
parent
366c0065
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+11
-10
app/controllers/team_members_controller.rb
app/controllers/team_members_controller.rb
+1
-0
app/views/team_members/show.html.haml
app/views/team_members/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/projects.scss
View file @
2e7ca8c8
.projects
{
.projects
{
@extend
.row
;
@extend
.row
;
.activities
{
.activities
{
}
}
.side
{
.side
{
@extend
.span4
;
@extend
.span4
;
@extend
.right
;
@extend
.right
;
.projects_box
{
.projects_box
{
h5
{
h5
{
color
:
$style_color
;
color
:
$style_color
;
font-size
:
16px
;
font-size
:
16px
;
text-shadow
:
0
1px
1px
#fff
;
text-shadow
:
0
1px
1px
#fff
;
padding
:
2px
10px
;
}
}
@extend
.leftbar
;
@extend
.leftbar
;
@extend
.ui-box
;
@extend
.ui-box
;
...
@@ -19,19 +20,19 @@
...
@@ -19,19 +20,19 @@
}
}
}
}
.new_project
,
.new_project
,
.edit_project
{
.edit_project
{
.project_name_holder
{
.project_name_holder
{
input
,
input
,
label
{
label
{
font-size
:
16px
;
font-size
:
16px
;
line-height
:
20px
;
line-height
:
20px
;
padding
:
8px
;
padding
:
8px
;
}
}
label
{
label
{
color
:
#888
;
color
:
#888
;
}
}
.btn
{
.btn
{
padding
:
6px
;
padding
:
6px
;
margin-left
:
10px
;
margin-left
:
10px
;
}
}
...
...
app/controllers/team_members_controller.rb
View file @
2e7ca8c8
...
@@ -9,6 +9,7 @@ class TeamMembersController < ApplicationController
...
@@ -9,6 +9,7 @@ class TeamMembersController < ApplicationController
def
show
def
show
@team_member
=
project
.
users_projects
.
find
(
params
[
:id
])
@team_member
=
project
.
users_projects
.
find
(
params
[
:id
])
@events
=
@team_member
.
user
.
recent_events
.
where
(
:project_id
=>
@project
.
id
).
limit
(
7
)
end
end
def
new
def
new
...
...
app/views/team_members/show.html.haml
View file @
2e7ca8c8
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
=
form_for
(
@team_member
,
as: :team_member
,
url:
project_team_member_path
(
@project
,
@team_member
))
do
|
f
|
=
form_for
(
@team_member
,
as: :team_member
,
url:
project_team_member_path
(
@project
,
@team_member
))
do
|
f
|
=
f
.
select
:project_access
,
options_for_select
(
Project
.
access_options
,
@team_member
.
project_access
),
{},
class:
"project-access-select"
,
disabled:
!
allow_admin
=
f
.
select
:project_access
,
options_for_select
(
Project
.
access_options
,
@team_member
.
project_access
),
{},
class:
"project-access-select"
,
disabled:
!
allow_admin
%hr
%hr
=
render
user
.
recent_events
.
limit
(
5
)
=
render
@events
:javascript
:javascript
$
(
function
(){
$
(
function
(){
$
(
'
.repo-access-select, .project-access-select
'
).
live
(
"
change
"
,
function
()
{
$
(
'
.repo-access-select, .project-access-select
'
).
live
(
"
change
"
,
function
()
{
...
...
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