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
d95cfc61
Commit
d95cfc61
authored
Jan 14, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
started cleaning UI
parent
1ee69714
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
38 additions
and
29 deletions
+38
-29
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+24
-10
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/controllers/team_members_controller.rb
app/controllers/team_members_controller.rb
+5
-1
app/models/project.rb
app/models/project.rb
+2
-2
app/views/projects/_feed.html.haml
app/views/projects/_feed.html.haml
+0
-2
app/views/projects/_project_head.html.haml
app/views/projects/_project_head.html.haml
+2
-2
app/views/repositories/_head.html.haml
app/views/repositories/_head.html.haml
+1
-1
app/views/team_members/_form.html.haml
app/views/team_members/_form.html.haml
+2
-2
app/views/team_members/new.html.haml
app/views/team_members/new.html.haml
+1
-0
app/views/team_members/new.js.haml
app/views/team_members/new.js.haml
+0
-8
No files found.
app/assets/stylesheets/projects.css.scss
View file @
d95cfc61
...
...
@@ -745,16 +745,7 @@ a.project-update.titled {
.add_new
{
float
:right
;
padding
:
5px
12px
;
border
:
1px
solid
#CCC
;
&
:hover
{
background
:
#eee
;
}
&
:active
{
background
:
#ddd
;
}
padding
:
6px
12px
;
}
.tree_progress
{
...
...
@@ -845,3 +836,26 @@ tr.line_notes_row {
color
:
#2FA0BB
;
}
}
.top-tabs
{
margin
:
0
;
padding
:
5px
;
font-size
:
14px
;
padding-bottom
:
10px
;
margin-bottom
:
20px
;
height
:
26px
;
border-bottom
:
1px
solid
#ccc
;
.tab
{
font-weight
:
bold
;
background
:none
;
padding
:
10px
;
float
:left
;
padding-left
:
0px
;
padding-right
:
40px
;
&
.active
{
color
:
#2FA0BB
;
}
}
}
app/controllers/projects_controller.rb
View file @
d95cfc61
...
...
@@ -69,7 +69,7 @@ class ProjectsController < ApplicationController
def
show
return
render
"projects/empty"
unless
@project
.
repo_exists?
&&
@project
.
has_commits?
limit
=
(
params
[
:limit
]
||
20
).
to_i
@activities
=
@project
.
updates_wo_repo
(
limit
)
@activities
=
@project
.
activities
(
limit
)
#
updates_wo_repo(limit)
end
def
files
...
...
app/controllers/team_members_controller.rb
View file @
d95cfc61
...
...
@@ -18,7 +18,11 @@ class TeamMembersController < ApplicationController
def
create
@team_member
=
UsersProject
.
new
(
params
[
:team_member
])
@team_member
.
project
=
project
@team_member
.
save
if
@team_member
.
save
redirect_to
team_project_path
(
@project
)
else
render
"new"
end
end
def
update
...
...
app/models/project.rb
View file @
d95cfc61
...
...
@@ -300,11 +300,11 @@ class Project < ActiveRecord::Base
end
[
0
...
n
]
end
def
updates_wo_repo
(
n
=
3
)
def
activities
(
n
=
3
)
[
fresh_issues
(
n
),
fresh_merge_requests
(
n
),
fresh_notes
(
n
)
notes
.
inc_author_project
.
where
(
"noteable_type is not null"
).
order
(
"created_at desc"
).
first
(
n
)
].
compact
.
flatten
.
sort
do
|
x
,
y
|
y
.
created_at
<=>
x
.
created_at
end
[
0
...
n
]
...
...
app/views/projects/_feed.html.haml
View file @
d95cfc61
...
...
@@ -40,8 +40,6 @@
%span
.update-title
%span
.commit.tag
Project Wall
%span
.update-author
\...
-
elsif
update
.
kind_of?
(
MergeRequest
)
...
...
app/views/projects/_project_head.html.haml
View file @
d95cfc61
.
merge
-tabs
.
top
-tabs
=
link_to
project_path
(
@project
),
:class
=>
"activities-tab tab
#{
'active'
if
current_page?
(
project_path
(
@project
))
}
"
do
%span
Activities
...
...
@@ -23,5 +23,5 @@
-
if
current_page?
(
team_project_path
(
@project
))
-
if
can?
current_user
,
:admin_team_member
,
@project
=
link_to
new_project_team_member_path
(
@project
),
:class
=>
"add_new"
,
:title
=>
"New Team Member"
,
:remote
=>
true
do
=
link_to
new_project_team_member_path
(
@project
),
:class
=>
"add_new"
,
:title
=>
"New Team Member"
do
=
image_tag
"add_new.png"
,
:width
=>
14
app/views/repositories/_head.html.haml
View file @
d95cfc61
.
merge
-tabs.repository
.
top
-tabs.repository
=
link_to
project_repository_path
(
@project
),
:class
=>
"activities-tab tab
#{
'active'
if
current_page?
(
project_repository_path
(
@project
))
}
"
do
%span
Activities
...
...
app/views/team_members/_form.html.haml
View file @
d95cfc61
=
form_for
@team_member
,
:as
=>
:team_member
,
:url
=>
project_team_members_path
(
@project
,
@team_member
)
,
:remote
=>
"true"
do
|
f
|
=
form_for
@team_member
,
:as
=>
:team_member
,
:url
=>
project_team_members_path
(
@project
,
@team_member
)
do
|
f
|
%div
%span
.entity-info
-
if
request
.
xhr?
=
link_to
"#back"
,
:onclick
=>
"backToMembers();"
do
=
link_to
project_team_members_path
(
@project
)
do
.entity-button
Team List
%i
...
...
app/views/team_members/new.html.haml
0 → 100644
View file @
d95cfc61
=
render
"team_members/form"
app/views/team_members/new.js.haml
deleted
100644 → 0
View file @
1ee69714
:plain
$("#team-table").hide("slide", { direction: "left" }, 150, function(){
$(this).parent().append("
#{
escape_javascript
(
render
(
'form'
))
}
");
$('#team_member_new select#team_member_user_id').chosen();
$("#team_member_new").show("slide", { direction: "right" }, 150);
$(".add_new").hide();
});
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