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
iv
gitlab-ce
Commits
fe1433c3
Commit
fe1433c3
authored
Nov 09, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev'
Conflicts: app/helpers/dashboard_helper.rb
parents
c98301d7
3f70316c
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
211 additions
and
211 deletions
+211
-211
app/assets/javascripts/projects.js
app/assets/javascripts/projects.js
+16
-0
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+32
-61
app/assets/stylesheets/tags.css.css
app/assets/stylesheets/tags.css.css
+14
-0
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb
+3
-3
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+10
-0
app/helpers/tags_helper.rb
app/helpers/tags_helper.rb
+15
-0
app/views/admin/projects/_form.html.haml
app/views/admin/projects/_form.html.haml
+29
-20
app/views/commits/_text_file.html.haml
app/views/commits/_text_file.html.haml
+1
-3
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+1
-3
app/views/issues/_show.html.haml
app/views/issues/_show.html.haml
+1
-4
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+10
-4
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+3
-1
app/views/projects/_form.html.haml
app/views/projects/_form.html.haml
+10
-21
app/views/projects/_list.html.haml
app/views/projects/_list.html.haml
+2
-3
app/views/projects/_recent_commits.html.haml
app/views/projects/_recent_commits.html.haml
+31
-17
app/views/projects/_recent_messages.html.haml
app/views/projects/_recent_messages.html.haml
+22
-47
app/views/projects/_tile.html.haml
app/views/projects/_tile.html.haml
+1
-3
app/views/projects/new.html.erb
app/views/projects/new.html.erb
+0
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+8
-0
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-18
app/views/tags/index.html.haml
app/views/tags/index.html.haml
+1
-1
spec/requests/issues_spec.rb
spec/requests/issues_spec.rb
+0
-1
No files found.
app/assets/javascripts/projects.js
View file @
fe1433c3
...
@@ -40,3 +40,19 @@ $(document).ready(function(){
...
@@ -40,3 +40,19 @@ $(document).ready(function(){
function
focusSearch
()
{
function
focusSearch
()
{
$
(
"
#search
"
).
focus
();
$
(
"
#search
"
).
focus
();
}
}
function
taggifyForm
(){
var
tag_field
=
$
(
'
#tag_field
'
).
tagify
();
tag_field
.
tagify
(
'
inputField
'
).
autocomplete
({
source
:
'
/tags.json
'
});
$
(
'
form
'
).
submit
(
function
()
{
var
tag_field
=
$
(
'
#tag_field
'
)
tag_field
.
val
(
tag_field
.
tagify
(
'
serialize
'
)
);
return
true
;
});
}
app/assets/stylesheets/projects.css.scss
View file @
fe1433c3
...
@@ -443,67 +443,6 @@ input.ssh_project_url {
...
@@ -443,67 +443,6 @@ input.ssh_project_url {
padding
:
10px
;
padding
:
10px
;
}
}
.recent_message_parent
{
img
{
padding-right
:
10px
;
}
float
:
left
;
margin
:
0
20px
20px
0px
;
padding
:
5px
0px
;;
width
:
420px
;
&
.dash_wall
{
border-bottom
:
2px
solid
orange
;
span
{
background
:
orange
;
color
:black
;
}
}
&
.dash_issue
{
border-bottom
:
2px
solid
#ffbbbb
;
span
{
background
:
#ffbbbb
;
}
}
&
.dash_commit
{
border-bottom
:
2px
solid
#bbbbff
;
span
{
background
:
#bbbbff
;
}
}
&
.dash_snippet
{
border-bottom
:
2px
solid
#bbffbb
;
span
{
background
:
#bbffbb
;
}
}
span
{
border
:
1px
solid
#aaa
;
color
:black
;
padding
:
1px
4px
;
}
h4
{
margin-bottom
:
3px
;
}
}
.commit
,
.message
{
.author
{
background
:
#eaeaea
;
color
:
#333
;
border
:
1px
solid
#aaa
;
padding
:
1px
2px
;
margin-right
:
5px
;
}
}
/* Note textare */
/* Note textare */
#note_note
{
#note_note
{
...
@@ -665,6 +604,8 @@ table.highlighttable pre{
...
@@ -665,6 +604,8 @@ table.highlighttable pre{
margin-right
:
15px
;
margin-right
:
15px
;
}
}
}
}
.filter
.left
{
margin-right
:
15px
;
}
.cgray
{
color
:gray
;
}
.cgray
{
color
:gray
;
}
.cred
{
color
:
#D12F19
;
}
.cred
{
color
:
#D12F19
;
}
...
@@ -710,3 +651,33 @@ body.project-page #notes-list .note span.note-title{display: block;}
...
@@ -710,3 +651,33 @@ body.project-page #notes-list .note span.note-title{display: block;}
body
.project-page
#notes-list
.note
span
.note-title
{
margin-bottom
:
10px
}
body
.project-page
#notes-list
.note
span
.note-title
{
margin-bottom
:
10px
}
body
.project-page
#notes-list
.note
span
.note-author
{
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
body
.project-page
#notes-list
.note
span
.note-author
{
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
body
.project-page
#notes-list
.note
span
.note-author
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
body
.project-page
#notes-list
.note
span
.note-author
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
/** NEW PROJECT **/
.new-project-hodler
{
.icon
span
{
background-position
:
-31px
-70px
;
}
td
{
border-bottom
:
1px
solid
#DEE2E3
;
}
}
//.message .note-title p { margin-bottom:0px; }
.commit
,
.message
{
.title
{
color
:
#666
;
a
{
color
:
#666
!
important
;
}
p
{
margin-top
:
0px
;
}
}
.author
{
color
:
#999
}
}
app/assets/stylesheets/tags.css.css
View file @
fe1433c3
...
@@ -27,4 +27,18 @@
...
@@ -27,4 +27,18 @@
color
:
#FFF
;
color
:
#FFF
;
text-shadow
:
none
;
text-shadow
:
none
;
font-weight
:
bold
;
font-weight
:
bold
;
}
.medium-tags
a
{
font-size
:
12px
;
display
:
inline-block
;
padding
:
3px
4px
2px
4px
;
margin
:
0px
7px
8px
0px
;
border-radius
:
3px
;
background-color
:
#72bbdf
;
color
:
#FFF
;
text-shadow
:
none
;
font-weight
:
bold
;
}
}
\ No newline at end of file
app/helpers/dashboard_helper.rb
View file @
fe1433c3
...
@@ -12,7 +12,7 @@ module DashboardHelper
...
@@ -12,7 +12,7 @@ module DashboardHelper
when
"Commit"
then
project_commit_path
(
project
,
:id
=>
note
.
noteable_id
)
when
"Commit"
then
project_commit_path
(
project
,
:id
=>
note
.
noteable_id
)
else
wall_project_path
(
project
)
else
wall_project_path
(
project
)
end
end
else
"#"
else
wall_project_path
(
project
)
end
end
rescue
rescue
"#"
"#"
...
@@ -24,8 +24,8 @@ module DashboardHelper
...
@@ -24,8 +24,8 @@ module DashboardHelper
title
=
case
klass
title
=
case
klass
when
"Note"
then
markdown
(
object
.
note
)
when
"Note"
then
markdown
(
object
.
note
)
when
"Issue"
then
object
.
title
when
"Issue"
then
object
.
title
when
"Commit"
then
object
.
safe_message
when
"
Grit::
Commit"
then
object
.
safe_message
else
"
"
else
return
"Project Wall
"
end
end
"[
#{
klass
}
]
#{
truncate
(
sanitize
(
title
,
:tags
=>
[]),
:length
=>
60
)
}
"
"[
#{
klass
}
]
#{
truncate
(
sanitize
(
title
,
:tags
=>
[]),
:length
=>
60
)
}
"
...
...
app/helpers/issues_helper.rb
View file @
fe1433c3
module
IssuesHelper
module
IssuesHelper
def
sort_class
if
can?
(
current_user
,
:admin_issue
,
@project
)
&&
(
!
params
[
:f
]
||
params
[
:f
]
==
"0"
)
"handle"
end
end
def
project_issues_filter_path
project
,
params
=
{}
params
[
:f
]
||=
cookies
[
'issue_filter'
]
project_issues_path
project
,
params
end
end
end
app/helpers/tags_helper.rb
0 → 100644
View file @
fe1433c3
module
TagsHelper
def
tag_path
tag
"/tags/
#{
tag
}
"
end
def
tag_list
project
html
=
''
project
.
tag_list
.
each
do
|
tag
|
html
+=
link_to
tag
,
tag_path
(
tag
)
end
html
.
html_safe
end
end
app/views/admin/projects/_form.html.haml
View file @
fe1433c3
=
form_for
[
:admin
,
@admin_project
]
do
|
f
|
=
form_for
[
:admin
,
@admin_project
]
do
|
f
|
-
if
@admin_project
.
errors
.
any?
-
if
@admin_project
.
errors
.
any?
#error_explanation
#error_explanation
%h2
=
"
#{
pluralize
(
@admin_project
.
errors
.
count
,
"error"
)
}
prohibited this admin_project from being saved:"
%h2
=
"
#{
pluralize
(
@admin_project
.
errors
.
count
,
"error"
)
}
prohibited this admin_project from being saved:"
%ul
%ul
-
@admin_project
.
errors
.
full_messages
.
each
do
|
msg
|
-
@admin_project
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.span-24
.form-row
.span-12
=
f
.
label
:name
.field
%br
=
f
.
label
:name
=
f
.
text_field
:name
%br
.form-row
=
f
.
text_field
:name
=
f
.
label
:code
.field
%br
=
f
.
label
:code
=
f
.
text_field
:code
%br
.form-row
=
f
.
text_field
:code
=
f
.
label
:path
.field
%br
=
f
.
label
:path
=
f
.
text_field
:path
%br
=
f
.
text_field
:path
.span-10
.form-row
.field
=
f
.
label
:tag_list
=
f
.
label
:description
%br
%br
=
f
.
text_area
:tag_list
,
:placeholder
=>
"project tags"
,
:style
=>
"height:50px"
,
:id
=>
:tag_field
=
f
.
text_area
:description
.form-row
=
f
.
label
:description
%br
=
f
.
text_area
:description
.clear
.clear
.actions
.actions
=
f
.
submit
'Save'
,
:class
=>
"lbutton"
=
f
.
submit
'Save'
,
:class
=>
"lbutton"
:javascript
$
(
function
(){
taggifyForm
();
})
app/views/commits/_text_file.html.haml
View file @
fe1433c3
...
@@ -13,10 +13,8 @@
...
@@ -13,10 +13,8 @@
=
diff_line
(
line
,
line_new
,
line_old
)
=
diff_line
(
line
,
line_new
,
line_old
)
-
if
line
[
0
]
==
"+"
-
if
line
[
0
]
==
"+"
-
line_new
+=
1
-
line_new
+=
1
-
elsif
-
elsif
line
[
0
]
==
"-"
-
line
[
0
]
==
"-"
-
line_old
+=
1
-
line_old
+=
1
-
else
-
else
-
line_new
+=
1
-
line_new
+=
1
-
line_old
+=
1
-
line_old
+=
1
app/views/dashboard/index.html.haml
View file @
fe1433c3
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
%h3
=
project
.
name
%h3
=
project
.
name
.data
.data
-
project
.
updates
.
each
do
|
update
|
-
project
.
updates
(
4
)
.
each
do
|
update
|
%a
.project-update
{
:href
=>
dashboard_feed_path
(
project
,
update
)}
%a
.project-update
{
:href
=>
dashboard_feed_path
(
project
,
update
)}
=
image_tag
gravatar_icon
(
update
.
author_email
),
:class
=>
"left"
,
:width
=>
40
=
image_tag
gravatar_icon
(
update
.
author_email
),
:class
=>
"left"
,
:width
=>
40
%span
.update-title
%span
.update-title
...
@@ -34,7 +34,5 @@
...
@@ -34,7 +34,5 @@
=
time_ago_in_words
(
update
.
created_at
)
=
time_ago_in_words
(
update
.
created_at
)
ago
ago
%br
%br
/ .project-update
/ .project-updates
/ #news-feed
/ #news-feed
/ #dashboard-content
/ #dashboard-content
app/views/issues/_show.html.haml
View file @
fe1433c3
%tr
{
:id
=>
dom_id
(
issue
),
:class
=>
"issue #{issue.critical ? "
critical
" : ""}"
,
:url
=>
project_issue_path
(
@project
,
issue
)
}
%tr
{
:id
=>
dom_id
(
issue
),
:class
=>
"issue #{issue.critical ? "
critical
" : ""}"
,
:url
=>
project_issue_path
(
@project
,
issue
)
}
-#- if can?(current_user, :admin_issue, @project) && (!params[:f] || params[:f] == "0")
%td
= image_tag "move.png" , :class => [:handle, :left]
%td
%td
%strong
.issue-number
=
"#
#{
issue
.
id
}
"
%strong
.issue-number
{
:class
=>
sort_class
}
=
"#
#{
issue
.
id
}
"
%span
%span
=
truncate
(
html_escape
(
issue
.
title
),
:length
=>
fixed_mode?
?
100
:
200
)
=
truncate
(
html_escape
(
issue
.
title
),
:length
=>
fixed_mode?
?
100
:
200
)
%br
%br
...
...
app/views/issues/index.html.haml
View file @
fe1433c3
...
@@ -13,16 +13,16 @@
...
@@ -13,16 +13,16 @@
.right.issues_filter
.right.issues_filter
=
form_tag
project_issues_path
(
@project
),
:method
=>
:get
do
=
form_tag
project_issues_path
(
@project
),
:method
=>
:get
do
.left
.left
=
radio_button_tag
:f
,
0
,
(
params
[
:f
]
||
"0"
)
==
"0"
,
:onclick
=>
"
this.form.submit(
)"
,
:id
=>
"open_issues"
,
:class
=>
"status"
=
radio_button_tag
:f
,
0
,
(
params
[
:f
]
||
"0"
)
==
"0"
,
:onclick
=>
"
setIssueFilter(this.form, 0
)"
,
:id
=>
"open_issues"
,
:class
=>
"status"
=
label_tag
"open_issues"
,
"Open"
=
label_tag
"open_issues"
,
"Open"
.left
.left
=
radio_button_tag
:f
,
2
,
params
[
:f
]
==
"2"
,
:onclick
=>
"
this.form.submit(
)"
,
:id
=>
"closed_issues"
,
:class
=>
"status"
=
radio_button_tag
:f
,
2
,
params
[
:f
]
==
"2"
,
:onclick
=>
"
setIssueFilter(this.form, 2
)"
,
:id
=>
"closed_issues"
,
:class
=>
"status"
=
label_tag
"closed_issues"
,
"Closed"
=
label_tag
"closed_issues"
,
"Closed"
.left
.left
=
radio_button_tag
:f
,
3
,
params
[
:f
]
==
"3"
,
:onclick
=>
"
this.form.submit(
)"
,
:id
=>
"my_issues"
,
:class
=>
"status"
=
radio_button_tag
:f
,
3
,
params
[
:f
]
==
"3"
,
:onclick
=>
"
setIssueFilter(this.form, 3
)"
,
:id
=>
"my_issues"
,
:class
=>
"status"
=
label_tag
"my_issues"
,
"To Me"
=
label_tag
"my_issues"
,
"To Me"
.left
.left
=
radio_button_tag
:f
,
1
,
params
[
:f
]
==
"1"
,
:onclick
=>
"
this.form.submit(
)"
,
:id
=>
"all_issues"
,
:class
=>
"status"
=
radio_button_tag
:f
,
1
,
params
[
:f
]
==
"1"
,
:onclick
=>
"
setIssueFilter(this.form, 1
)"
,
:id
=>
"all_issues"
,
:class
=>
"status"
=
label_tag
"all_issues"
,
"All"
=
label_tag
"all_issues"
,
"All"
=
render
"issues"
=
render
"issues"
...
@@ -31,6 +31,12 @@
...
@@ -31,6 +31,12 @@
var
href
=
$
(
'
.issue_search
'
).
parent
().
attr
(
'
action
'
);
var
href
=
$
(
'
.issue_search
'
).
parent
().
attr
(
'
action
'
);
var
last_terms
=
''
;
var
last_terms
=
''
;
var
setIssueFilter
=
function
(
form
,
value
){
$
.
cookie
(
'
issue_filter
'
,
value
,
{
expires
:
140
});
form
.
submit
();
}
$
(
'
.issue_search
'
).
keyup
(
function
()
{
$
(
'
.issue_search
'
).
keyup
(
function
()
{
var
terms
=
$
(
this
).
val
();
var
terms
=
$
(
this
).
val
();
var
project_id
=
$
(
'
#project_id
'
).
val
();
var
project_id
=
$
(
'
#project_id
'
).
val
();
...
...
app/views/layouts/project.html.haml
View file @
fe1433c3
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
Team
Team
-
if
@project
.
users_projects
.
count
>
0
-
if
@project
.
users_projects
.
count
>
0
%span
{
:class
=>
"number"
}=
@project
.
users_projects
.
count
%span
{
:class
=>
"number"
}=
@project
.
users_projects
.
count
=
link_to
project_issues_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"issues"
)
?
"current"
:
nil
do
=
link_to
project_issues_
filter_
path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"issues"
)
?
"current"
:
nil
do
Issues
Issues
-
if
@project
.
issues
.
opened
.
count
>
0
-
if
@project
.
issues
.
opened
.
count
>
0
%span
{
:class
=>
"number"
}=
@project
.
issues
.
opened
.
count
%span
{
:class
=>
"number"
}=
@project
.
issues
.
opened
.
count
...
@@ -40,5 +40,7 @@
...
@@ -40,5 +40,7 @@
-
if
@commit
-
if
@commit
=
link_to
truncate
(
commit_name
(
@project
,
@commit
),
:length
=>
15
),
project_commit_path
(
@project
,
:id
=>
@commit
.
id
),
:class
=>
current_page?
(
:controller
=>
"commits"
,
:action
=>
"show"
,
:project_id
=>
@project
,
:id
=>
@commit
.
id
)
?
"current"
:
nil
=
link_to
truncate
(
commit_name
(
@project
,
@commit
),
:length
=>
15
),
project_commit_path
(
@project
,
:id
=>
@commit
.
id
),
:class
=>
current_page?
(
:controller
=>
"commits"
,
:action
=>
"show"
,
:project_id
=>
@project
,
:id
=>
@commit
.
id
)
?
"current"
:
nil
.medium-tags
{
:style
=>
'padding: 10px 0 0 10px; width: 210px;'
}=
tag_list
@project
.project-content
.project-content
=
yield
=
yield
app/views/projects/_form.html.haml
View file @
fe1433c3
=
form_for
(
@project
,
:remote
=>
true
)
do
|
f
|
=
form_for
(
@project
,
:remote
=>
true
)
do
|
f
|
%div
.form_content
%div
.form_content
-
unless
@project
.
new_record?
-
unless
@project
.
new_record?
%h1
Edit Project
%h2
.icon
%span
=
@project
.
name
-
if
@project
.
errors
.
any?
-
if
@project
.
errors
.
any?
#error_explanation
#error_explanation
%h2
%h2
...
@@ -10,7 +12,7 @@
...
@@ -10,7 +12,7 @@
%ul
%ul
-
@project
.
errors
.
full_messages
.
each
do
|
msg
|
-
@project
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
%table
.round-borders
%table
%tr
%tr
%td
=
f
.
label
:name
%td
=
f
.
label
:name
%td
=
f
.
text_field
:name
,
:placeholder
=>
"Example Project"
%td
=
f
.
text_field
:name
,
:placeholder
=>
"Example Project"
...
@@ -29,15 +31,13 @@
...
@@ -29,15 +31,13 @@
%tr
%tr
%td
=
f
.
label
:tag_list
%td
=
f
.
label
:tag_list
%td
=
f
.
text_area
:tag_list
,
:placeholder
=>
"project tags"
,
:style
=>
"height:50px"
,
:id
=>
:tag_field
%td
=
f
.
text_area
:tag_list
,
:placeholder
=>
"project tags"
,
:style
=>
"height:50px"
,
:id
=>
:tag_field
%tr
%td
=
f
.
label
:description
%td
=
f
.
text_area
:description
,
:placeholder
=>
"project description"
,
:style
=>
"height:50px"
.field
%br
=
f
.
label
:description
%br
/
=
f
.
text_area
:description
,
:style
=>
"height:140px;width:932px;"
.clear
%hr
.prepend-top
.actions
.actions
=
f
.
submit
:class
=>
"
lbutton vm
"
=
f
.
submit
:class
=>
"
button
"
%div
{
:class
=>
"ajax_loader"
,
:style
=>
"display:none;height:200px;"
}
%div
{
:class
=>
"ajax_loader"
,
:style
=>
"display:none;height:200px;"
}
%center
%center
...
@@ -55,16 +55,5 @@
...
@@ -55,16 +55,5 @@
:javascript
:javascript
$
(
function
(){
$
(
function
(){
var
tag_field
=
$
(
'
#tag_field
'
).
tagify
();
taggifyForm
();
tag_field
.
tagify
(
'
inputField
'
).
autocomplete
({
source
:
'
/tags.json
'
});
$
(
'
form
'
).
submit
(
function
()
{
var
tag_field
=
$
(
'
#tag_field
'
)
tag_field
.
val
(
tag_field
.
tagify
(
'
serialize
'
)
);
return
true
;
});
})
})
app/views/projects/_list.html.haml
View file @
fe1433c3
...
@@ -12,9 +12,8 @@
...
@@ -12,9 +12,8 @@
%tr
{
:class
=>
"project"
,
:url
=>
project_path
(
project
)
}
%tr
{
:class
=>
"project"
,
:url
=>
project_path
(
project
)
}
%td
%td
=
project
.
name
=
project
.
name
.small-tags
.small-tags
=
tag_list
project
-
project
.
tag_list
.
each
do
|
tag
|
=
link_to
tag
,
"/tags/
#{
tag
}
"
%td
=
truncate
project
.
url_to_repo
%td
=
truncate
project
.
url_to_repo
%td
=
project
.
code
%td
=
project
.
code
...
...
app/views/projects/_recent_commits.html.haml
View file @
fe1433c3
-
@commits
.
each
do
|
commit
|
%table
%div
.commit
%thead
-
if
commit
.
author
.
email
%th
=
image_tag
gravatar_icon
(
commit
.
author
.
email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
Commits
-
else
.filter.right
=
image_tag
"no_avatar.png"
,
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
=
form_tag
project_path
(
@project
),
:method
=>
:get
,
:class
=>
"right"
do
%p
{
:style
=>
"margin-bottom: 3px;"
}
.left
%strong
=
radio_button_tag
:view
,
"recent"
,
(
params
[
:view
]
||
"recent"
)
==
"recent"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"recent_view"
=
link_to
truncate
(
commit
.
safe_message
,
:length
=>
60
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
=
label_tag
"recent_view"
,
"Recent"
.left
%span
=
radio_button_tag
:view
,
"day"
,
params
[
:view
]
==
"day"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"day_view"
%span
.author
=
label_tag
"day_view"
,
"Today"
=
commit
.
author
.
name
.
force_encoding
(
"UTF-8"
)
.left
%cite
=
radio_button_tag
:view
,
"week"
,
params
[
:view
]
==
"week"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"week_view"
=
time_ago_in_words
(
commit
.
committed_date
)
=
label_tag
"week_view"
,
"Week"
ago
-
@commits
.
each
do
|
commit
|
%br
%tr
%td
%div
.commit
-
if
commit
.
author
.
email
=
image_tag
gravatar_icon
(
commit
.
author
.
email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
-
else
=
image_tag
"no_avatar.png"
,
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
.title
%p
=
link_to
truncate
(
commit
.
safe_message
,
:length
=>
fixed_mode?
?
40
:
100
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
%span
%span
.author
%strong
=
commit
.
author
.
name
.
force_encoding
(
"UTF-8"
)
%cite
.cgray
=
time_ago_in_words
(
commit
.
committed_date
)
ago
app/views/projects/_recent_messages.html.haml
View file @
fe1433c3
...
@@ -3,50 +3,25 @@
...
@@ -3,50 +3,25 @@
-
parent
=
load_note_parent
(
id
,
type
,
@project
)
-
parent
=
load_note_parent
(
id
,
type
,
@project
)
-
next
unless
parent
-
next
unless
parent
-
case
type
%table
-
when
"Issue"
%thead
-
css_class
=
"dash_issue"
%th
-
issue
=
parent
%div
{
:class
=>
"recent_message_parent"
}
-
item_code
=
issue
.
author
.
email
=
link_to
(
truncate
(
dashboard_feed_title
(
parent
),
:length
=>
fixed_mode?
?
40
:
100
),
dashboard_feed_path
(
@project
,
parent
))
-
link_item_name
=
truncate
(
issue
.
title
,
:length
=>
50
)
-
notes
.
sort
{
|
x
,
y
|
y
.
updated_at
<=>
x
.
updated_at
}.
each
do
|
note
|
-
link_to_item
=
project_issue_path
(
@project
,
issue
)
%tr
-
when
"Snippet"
%td
-
css_class
=
"dash_snippet"
%div
.message
-
item_code
=
parent
.
author
.
email
=
image_tag
gravatar_icon
(
note
.
author_email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
-
link_item_name
=
parent
.
title
%div
.title
-
link_to_item
=
project_snippet_path
(
@project
,
parent
)
=
link_to
markdown
(
truncate
(
note
.
note
,
:length
=>
fixed_mode?
?
40
:
100
)),
dashboard_feed_path
(
@project
,
parent
)
+
"#note_
#{
note
.
id
}
"
-
when
"Commit"
-
if
note
.
attachment
.
url
-
css_class
=
"dash_commit"
%br
-
commit
=
parent
Attachment:
-
item_code
=
commit
.
author
.
email
=
link_to
note
.
attachment_identifier
,
note
.
attachment
.
url
-
link_item_name
=
truncate
(
commit
.
safe_message
,
:length
=>
50
)
%div
.author
-
link_to_item
=
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
%strong
=
note
.
author_name
-
else
%cite
.cgray
-
css_class
=
"dash_wall"
=
time_ago_in_words
(
note
.
updated_at
)
-
item_code
=
@project
.
name
ago
-
link_item_name
=
"Project Wall"
%br
-
link_to_item
=
wall_project_path
(
@project
)
%div
{
:class
=>
"recent_message_parent #{css_class}"
}
=
image_tag
gravatar_icon
(
item_code
),
:class
=>
"left"
,
:width
=>
40
%h4
=
link_to
(
link_item_name
,
link_to_item
)
%span
=
type
.clear
-
notes
.
sort
{
|
x
,
y
|
x
.
updated_at
<=>
y
.
updated_at
}.
each
do
|
note
|
%div
.message
=
image_tag
gravatar_icon
(
note
.
author
.
email
),
:class
=>
"left"
,
:width
=>
24
,
:style
=>
"padding-right:5px;"
%p
{
:style
=>
"margin-bottom: 3px;"
}
%span
.author
=
note
.
author
.
name
=
link_to
markdown
(
truncate
(
note
.
note
,
:length
=>
200
)),
link_to_item
+
"#note_
#{
note
.
id
}
"
-
if
note
.
attachment
.
url
%br
Attachment:
=
link_to
note
.
attachment_identifier
,
note
.
attachment
.
url
%br
%br
.append-bottom
.clear
app/views/projects/_tile.html.haml
View file @
fe1433c3
...
@@ -13,9 +13,7 @@
...
@@ -13,9 +13,7 @@
-
last_note
=
project
.
notes
.
last
-
last_note
=
project
.
notes
.
last
=
last_note
?
last_note
.
created_at
.
stamp
(
"24 Aug, 2011"
)
:
"Never"
=
last_note
?
last_note
.
created_at
.
stamp
(
"24 Aug, 2011"
)
:
"Never"
%p
.small-tags
%p
.small-tags
=
tag_list
project
-
project
.
tag_list
.
each
do
|
tag
|
=
link_to
tag
,
"/tags/
#{
tag
}
"
.buttons
.buttons
%a
.browse-code.button.yellow
{
:href
=>
tree_project_path
(
project
)}
Browse code
%a
.browse-code.button.yellow
{
:href
=>
tree_project_path
(
project
)}
Browse code
...
...
app/views/projects/new.html.erb
deleted
100644 → 0
View file @
c98301d7
<%=
render
'form'
%>
app/views/projects/new.html.haml
0 → 100644
View file @
fe1433c3
.new-project-hodler
.container_4
%h2
.icon
%span
New Project
%div
.clear
=
render
'form'
app/views/projects/show.html.haml
View file @
fe1433c3
%div
%h2
.left
History
.right
=
form_tag
project_path
(
@project
),
:method
=>
:get
do
.span-2
=
radio_button_tag
:view
,
"recent"
,
(
params
[
:view
]
||
"recent"
)
==
"recent"
,
:onclick
=>
"this.form.submit()"
,
:id
=>
"recent_view"
=
label_tag
"recent_view"
,
"Recent"
.span-2
=
radio_button_tag
:view
,
"day"
,
params
[
:view
]
==
"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"
.clear
%hr
.left.width-49p
.left.width-49p
%h3
Commits
=
render
"projects/recent_commits"
=
render
"projects/recent_commits"
.right.width-49p
.right.width-49p
%h3
Talk
=
render
"projects/recent_messages"
=
render
"projects/recent_messages"
:javascript
:javascript
function
updateDashboard
(){
function
updateDashboard
(){
$
(
'
#content-container
'
).
load
(
"
#{
escape_javascript
(
project_path
(
@project
))
}
#content-container
>*
"
);
$
(
'
.project-content
'
).
load
(
"
#{
escape_javascript
(
project_path
(
@project
))
}
.project-content
>*
"
);
}
}
setInterval
(
"
updateDashboard()
"
,
300000
);
setInterval
(
"
updateDashboard()
"
,
300000
);
app/views/tags/index.html.haml
View file @
fe1433c3
...
@@ -7,5 +7,5 @@
...
@@ -7,5 +7,5 @@
.tags-list
.tags-list
-
@tags
.
all
.
each
do
|
tag
|
-
@tags
.
all
.
each
do
|
tag
|
=
link_to
"
#{
tag
.
name
}
(
#{
tag
.
count
}
)"
,
"/tags/
#{
tag
.
name
}
"
=
link_to
"
#{
tag
.
name
}
(
#{
tag
.
count
}
)"
,
tag_path
(
name
)
spec/requests/issues_spec.rb
View file @
fe1433c3
...
@@ -158,7 +158,6 @@ describe "Issues" do
...
@@ -158,7 +158,6 @@ describe "Issues" do
it
"should have valid show page for issue"
do
it
"should have valid show page for issue"
do
page
.
should
have_content
@issue
.
title
page
.
should
have_content
@issue
.
title
page
.
should
have_content
@user
.
name
page
.
should
have_content
@user
.
name
page
.
should
have_content
"today"
end
end
end
end
...
...
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