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
Boxiang Sun
gitlab-ce
Commits
3f91cf45
Commit
3f91cf45
authored
13 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wall redesign
parent
fce1428d
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
89 additions
and
36 deletions
+89
-36
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+4
-0
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+28
-4
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+9
-2
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+2
-2
app/views/commits/show.js.haml
app/views/commits/show.js.haml
+3
-1
app/views/notes/_form.html.haml
app/views/notes/_form.html.haml
+2
-2
app/views/notes/_notes.html.haml
app/views/notes/_notes.html.haml
+8
-9
app/views/notes/_show.html.haml
app/views/notes/_show.html.haml
+5
-7
app/views/notes/create.js.haml
app/views/notes/create.js.haml
+1
-1
app/views/projects/_recent_commits.html.haml
app/views/projects/_recent_commits.html.haml
+2
-2
app/views/projects/_recent_messages.html.haml
app/views/projects/_recent_messages.html.haml
+0
-6
app/views/projects/wall.html.haml
app/views/projects/wall.html.haml
+25
-0
No files found.
app/assets/javascripts/application.js
View file @
3f91cf45
...
...
@@ -16,3 +16,7 @@ $(function(){
$
(
'
select#branch
'
).
selectmenu
({
style
:
'
popup
'
,
width
:
200
});
$
(
'
select#tag
'
).
selectmenu
({
style
:
'
popup
'
,
width
:
200
});
});
function
updatePage
(){
$
.
ajax
({
type
:
"
GET
"
,
url
:
location
.
href
,
dataType
:
"
script
"
});
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/projects.css.scss
View file @
3f91cf45
...
...
@@ -491,8 +491,14 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
background
:
white
;
}
p
{
margin-bottom
:
3px
;
font-size
:
12px
;
margin-bottom
:
4px
;
font-size
:
13px
;
color
:
#111
;
}
}
cite
{
&
.ago
{
color
:
#666
;
}
}
}
...
...
@@ -515,7 +521,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
}
.note_content
{
float
:left
;
width
:
7
50px
;
width
:
6
50px
;
}
.issue_notes
{
...
...
@@ -605,7 +611,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
}
}
.message
{
.commit
,
.message
,
#notes-list
{
.author
{
background
:
#eaeaea
;
color
:
#333
;
...
...
@@ -614,3 +622,19 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
margin-right
:
5px
;
}
}
/* Note textare */
#note_note
{
height
:
100px
;
width
:
97%
;
font-size
:
14px
;
}
.wall_page
{
#note_note
{
height
:
25px
;
}
.attach_holder
{
display
:none
;
}
}
This diff is collapsed.
Click to expand it.
app/controllers/projects_controller.rb
View file @
3f91cf45
...
...
@@ -75,7 +75,7 @@ class ProjectsController < ApplicationController
y
.
committed_date
<=>
x
.
committed_date
end
@messages
=
project
.
notes
.
since
(
@date
).
limit
(
40
).
order
(
"created_at DESC"
)
@messages
=
project
.
notes
.
since
(
@date
).
order
(
"created_at DESC"
)
else
return
render
"projects/empty"
end
...
...
@@ -86,7 +86,14 @@ class ProjectsController < ApplicationController
#
def
wall
@notes
=
@project
.
common_notes
@date
=
case
params
[
:view
]
when
"week"
then
Date
.
today
-
7
.
days
when
"all"
then
nil
else
Date
.
today
end
@notes
=
@project
.
common_notes
.
order
(
"created_at DESC"
)
@notes
=
@notes
.
since
(
@date
.
at_beginning_of_day
)
if
@date
@note
=
Note
.
new
end
...
...
This diff is collapsed.
Click to expand it.
app/views/commits/_commits.html.haml
View file @
3f91cf45
...
...
@@ -15,8 +15,8 @@
=
link_to
"Browse Code"
,
tree_project_path
(
@project
,
:commit_id
=>
commit
.
id
),
:class
=>
"lite_button"
,
:style
=>
"float:right"
=
link_to
truncate
(
commit
.
id
.
to_s
,
:length
=>
16
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
),
:class
=>
"lite_button"
,
:style
=>
"width:120px;float:right"
%span
%span
[
#{
commit
.
author
}
]
%span
.author
=
commit
.
author
=
time_ago_in_words
(
commit
.
committed_date
)
ago
=
more_commits_link
if
@commits
.
size
>
99
This diff is collapsed.
Click to expand it.
app/views/commits/show.js.haml
View file @
3f91cf45
:plain
-#
:plain
$("#side-commit-preview").remove();
var side = $("<div id='side-commit-preview'></div>");
side.html("#{escape_javascript(render "commits/show")}");
$("##{dom_id(@project)}").parent().append(side);
$("##{dom_id(@project)}").addClass("span-14");
:plain
$("#notes-list").html("
#{
escape_javascript
(
render
(
:partial
=>
'notes/notes_list'
))
}
");
This diff is collapsed.
Click to expand it.
app/views/notes/_form.html.haml
View file @
3f91cf45
...
...
@@ -12,9 +12,9 @@
=
f
.
label
:note
%cite
(255 symbols only)
%br
=
f
.
text_area
:note
,
:style
=>
"width:97%;height:100px"
,
:size
=>
255
=
f
.
text_area
:note
,
:size
=>
255
%div
%div
.attach_holder
=
f
.
label
:attachment
%cite
(less than 10 MB)
%br
...
...
This diff is collapsed.
Click to expand it.
app/views/notes/_notes.html.haml
View file @
3f91cf45
%ul
#notes-list
=
render
"notes/notes_list"
-
if
controller
.
action_name
==
"wall"
%ul
#notes-list
=
render
"notes/notes_list"
%br
%br
-
if
can?
current_user
,
:write_note
,
@project
-
else
%ul
#notes-list
=
render
"notes/notes_list"
%br
%br
-
if
can?
current_user
,
:write_note
,
@project
=
render
"notes/form"
:javascript
...
...
@@ -23,7 +26,3 @@
$
(
function
(){
var
int
=
self
.
setInterval
(
"
updatePage()
"
,
20000
);
});
function
updatePage
(){
$
.
ajax
({
type
:
"
GET
"
,
url
:
location
.
href
,
dataType
:
"
script
"
});
}
This diff is collapsed.
Click to expand it.
app/views/notes/_show.html.haml
View file @
3f91cf45
%li
{
:id
=>
dom_id
(
note
)}
%div
.note_author
=
image_tag
gravatar_icon
(
note
.
author
.
email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
%div
.note_content
%div
.note_content
.left
=
simple_format
(
html_escape
(
note
.
note
))
-
if
note
.
attachment
.
url
Attachment:
=
link_to
note
.
attachment_identifier
,
note
.
attachment
.
url
=
link_to
note
.
attachment_identifier
,
note
.
attachment
.
url
,
:target
=>
"_blank"
%br
%span
%span
[
#{
note
.
author
.
name
}
]
%span
.author
=
note
.
author
.
name
%cite
.ago
=
time_ago_in_words
(
note
.
updated_at
)
ago
%br
...
...
This diff is collapsed.
Click to expand it.
app/views/notes/create.js.haml
View file @
3f91cf45
-
if
@note
.
valid?
:plain
$("#new_note .errors").remove();
$("#notes-list").append("
#{
escape_javascript
(
render
(
:partial
=>
'show'
,
:locals
=>
{
:note
=>
@note
}
))
}
"
);
updatePage(
);
$('#note_note').val("");
-
else
:plain
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/_recent_commits.html.haml
View file @
3f91cf45
...
...
@@ -9,8 +9,8 @@
=
link_to
truncate_commit_message
(
commit
,
60
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
%span
%span
[
#{
commit
.
author
}
]
%span
.author
=
commit
.
author
.
name
.
force_encoding
(
"UTF-8"
)
%cite
=
time_ago_in_words
(
commit
.
committed_date
)
ago
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/_recent_messages.html.haml
View file @
3f91cf45
...
...
@@ -46,12 +46,6 @@
Attachment:
=
link_to
note
.
attachment_identifier
,
note
.
attachment
.
url
%br
-#%span
%span
[ #{note.author.name} ]
%cite
= time_ago_in_words(note.created_at)
ago
%br
.append-bottom
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/wall.html.haml
View file @
3f91cf45
%div
.wall_page
-
if
can?
current_user
,
:write_note
,
@project
=
render
"notes/form"
.right
=
form_tag
wall_project_path
(
@project
),
:method
=>
:get
do
.span-2
=
radio_button_tag
:view
,
"day"
,
(
params
[
:view
]
||
"day"
)
==
"day"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"day_view"
=
label_tag
"day_view"
,
"Today"
.span-2
=
radio_button_tag
:view
,
"week"
,
params
[
:view
]
==
"week"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"week_view"
=
label_tag
"week_view"
,
"Week"
.span-2
=
radio_button_tag
:view
,
"all"
,
params
[
:view
]
==
"all"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"all_view"
=
label_tag
"all_view"
,
"All"
.clear
%br
%hr
=
render
"notes/notes"
:javascript
$
(
function
(){
$
(
"
#note_note
"
).
live
(
"
click
"
,
function
(){
$
(
this
).
css
(
"
height
"
,
"
100px
"
);
$
(
'
.attach_holder
'
).
show
();
});
});
This diff is collapsed.
Click to expand it.
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