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
3f709e0a
Commit
3f709e0a
authored
Dec 16, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5848 from bke-drewb/feature/time_ago_tooltips
Add time ago tooltips to show actual date/time
parents
3221dc53
fa817dff
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
48 additions
and
53 deletions
+48
-53
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+13
-3
app/helpers/notes_helper.rb
app/helpers/notes_helper.rb
+8
-2
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+3
-6
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+1
-1
app/views/events/_event_last_push.html.haml
app/views/events/_event_last_push.html.haml
+2
-3
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/_key.html.haml
+1
-3
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+1
-3
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+2
-4
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-4
app/views/projects/commits/_inline_commit.html.haml
app/views/projects/commits/_inline_commit.html.haml
+1
-4
app/views/projects/deploy_keys/_deploy_key.html.haml
app/views/projects/deploy_keys/_deploy_key.html.haml
+1
-2
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+2
-2
app/views/projects/notes/_discussion.html.haml
app/views/projects/notes/_discussion.html.haml
+1
-2
app/views/projects/protected_branches/index.html.haml
app/views/projects/protected_branches/index.html.haml
+1
-3
app/views/projects/refs/logs_tree.js.haml
app/views/projects/refs/logs_tree.js.haml
+1
-1
app/views/projects/snippets/_snippet.html.haml
app/views/projects/snippets/_snippet.html.haml
+2
-1
app/views/projects/tags/index.html.haml
app/views/projects/tags/index.html.haml
+1
-2
app/views/projects/wikis/history.html.haml
app/views/projects/wikis/history.html.haml
+1
-2
app/views/projects/wikis/pages.html.haml
app/views/projects/wikis/pages.html.haml
+1
-1
app/views/projects/wikis/show.html.haml
app/views/projects/wikis/show.html.haml
+1
-1
app/views/snippets/_snippet.html.haml
app/views/snippets/_snippet.html.haml
+1
-1
No files found.
app/helpers/application_helper.rb
View file @
3f709e0a
...
...
@@ -72,7 +72,7 @@ module ApplicationHelper
def
last_commit
(
project
)
if
project
.
repo_exists?
time_ago_
in_words
(
project
.
repository
.
commit
.
committed_date
)
+
" ago"
time_ago_
with_tooltip
(
project
.
repository
.
commit
.
committed_date
)
+
" ago"
else
"Never"
end
...
...
@@ -136,9 +136,9 @@ module ApplicationHelper
Digest
::
SHA1
.
hexdigest
string
end
def
project_last_activity
project
def
project_last_activity
(
project
)
if
project
.
last_activity_at
time_ago_
in_words
(
project
.
last_activity_at
)
+
" ago"
time_ago_
with_tooltip
(
project
.
last_activity_at
,
'bottom'
,
'last_activity_time_ago'
)
+
" ago"
else
"Never"
end
...
...
@@ -215,4 +215,14 @@ module ApplicationHelper
Pygments
::
Lexer
[
:js
].
highlight
(
string
).
html_safe
end
end
def
time_ago_with_tooltip
(
date
,
placement
=
'top'
,
html_class
=
'time_ago'
)
capture_haml
do
haml_tag
:time
,
time_ago_in_words
(
date
),
class:
html_class
,
datetime:
date
,
title:
date
.
stamp
(
"Aug 21, 2011 9:23pm"
),
data:
{
toggle:
'tooltip'
,
placement:
placement
}
haml_tag
:script
,
"$('."
+
html_class
+
"').tooltip()"
end
.
html_safe
end
end
app/helpers/notes_helper.rb
View file @
3f709e0a
...
...
@@ -31,8 +31,14 @@ module NotesHelper
def
note_timestamp
(
note
)
# Shows the created at time and the updated at time if different
ts
=
"
#{
time_ago_in_words
(
note
.
created_at
)
}
ago"
ts
<<
content_tag
(
:small
,
" (Edited
#{
time_ago_in_words
(
note
.
updated_at
)
}
ago)"
)
if
note
.
updated_at
!=
note
.
created_at
ts
=
"
#{
time_ago_with_tooltip
(
note
.
created_at
,
'bottom'
,
'note_created_ago'
)
}
ago"
if
note
.
updated_at
!=
note
.
created_at
ts
<<
capture_haml
do
haml_tag
:small
do
haml_concat
" (Edited
#{
time_ago_with_tooltip
(
note
.
updated_at
,
'bottom'
,
'note_edited_ago'
)
}
ago)"
end
end
end
ts
.
html_safe
end
end
app/views/admin/dashboard/index.html.haml
View file @
3f709e0a
...
...
@@ -37,8 +37,7 @@
%p
=
link_to
project
.
name_with_namespace
,
[
:admin
,
project
]
%span
.light.pull-right
=
time_ago_in_words
project
.
created_at
ago
#{
time_ago_with_tooltip
(
project
.
created_at
)
}
ago
.span4
%h4
Latest users
...
...
@@ -48,8 +47,7 @@
=
link_to
[
:admin
,
user
]
do
=
user
.
name
%span
.light.pull-right
=
time_ago_in_words
user
.
created_at
ago
#{
time_ago_with_tooltip
(
user
.
created_at
)
}
ago
.span4
%h4
Latest groups
...
...
@@ -59,8 +57,7 @@
=
link_to
[
:admin
,
group
]
do
=
group
.
name
%span
.light.pull-right
=
time_ago_in_words
group
.
created_at
ago
#{
time_ago_with_tooltip
(
group
.
created_at
)
}
ago
%br
.row
...
...
app/views/events/_event.html.haml
View file @
3f709e0a
-
if
event
.
proper?
.event-item
{
class:
"#{event.body? ? "
event
-
block
" : "
event
-
inline
" }"
}
%span
.cgray.pull-right
#{
time_ago_
in_words
(
event
.
created_at
)
}
ago.
#{
time_ago_
with_tooltip
(
event
.
created_at
)
}
ago
=
cache
event
do
=
image_tag
avatar_icon
(
event
.
author_email
,
24
),
class:
"avatar s24"
,
alt
:''
...
...
app/views/events/_event_last_push.html.haml
View file @
3f709e0a
...
...
@@ -5,9 +5,8 @@
%strong
=
truncate
(
event
.
ref_name
,
length:
28
)
at
%strong
=
link_to_project
event
.
project
%span
=
time_ago_in_words
(
event
.
created_at
)
ago.
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
ago
.pull-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-create btn-small"
do
Create Merge Request
...
...
app/views/profiles/keys/_key.html.haml
View file @
3f709e0a
...
...
@@ -4,8 +4,6 @@
%span
(
#{
key
.
fingerprint
}
)
%span
.cgray
added
=
time_ago_in_words
(
key
.
created_at
)
ago
added
#{
time_ago_with_tooltip
(
key
.
created_at
)
}
ago
=
link_to
'Remove'
,
profile_key_path
(
key
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-small btn-remove delete-key pull-right"
app/views/projects/branches/_branch.html.haml
View file @
3f709e0a
...
...
@@ -27,6 +27,4 @@
=
image_tag
avatar_icon
(
commit
.
author_email
),
class:
"avatar s16"
,
alt:
''
%span
.light
=
gfm
escape_once
(
truncate
(
commit
.
title
,
length:
40
))
%span
=
time_ago_in_words
(
commit
.
committed_date
)
ago
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
ago
app/views/projects/commit/_commit_box.html.haml
View file @
3f709e0a
...
...
@@ -23,16 +23,14 @@
%span
.light
Authored by
%strong
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
24
)
%time
{
title:
@commit
.
authored_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
authored_date
)
}
ago
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
ago
-
if
@commit
.
different_committer?
.commit-info-row
%span
.light
Committed by
%strong
=
commit_committer_link
(
@commit
,
avatar:
true
,
size:
24
)
%time
{
title:
@commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)}
#{
time_ago_in_words
(
@commit
.
committed_date
)
}
ago
#{
time_ago_with_tooltip
(
@commit
.
committed_date
)
}
ago
.commit-info-row
%span
.cgray
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
...
...
app/views/projects/commits/_commit.html.haml
View file @
3f709e0a
...
...
@@ -13,7 +13,4 @@
.commit-row-info
=
commit_author_link
(
commit
,
avatar:
true
,
size:
16
)
%time
.committed_ago
{
datetime:
commit
.
committed_date
,
title:
commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)
}
=
time_ago_in_words
(
commit
.
committed_date
)
ago
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
ago
app/views/projects/commits/_inline_commit.html.haml
View file @
3f709e0a
...
...
@@ -3,7 +3,4 @@
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
project
,
commit
),
class:
"commit_short_id"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
40
),
project_commit_path
(
project
,
commit
.
id
),
class:
"commit-row-message"
%time
.committed_ago
{
datetime:
commit
.
committed_date
,
title:
commit
.
committed_date
.
stamp
(
"Aug 21, 2011 9:23pm"
)
}
=
time_ago_in_words
(
commit
.
committed_date
)
ago
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
ago
app/views/projects/deploy_keys/_deploy_key.html.haml
View file @
3f709e0a
...
...
@@ -21,5 +21,4 @@
-
deploy_key
.
projects
.
map
(
&
:name_with_namespace
).
each
do
|
project_name
|
%span
.label
=
project_name
%small
.pull-right
Created
#{
time_ago_in_words
(
deploy_key
.
created_at
)
}
ago
Created
#{
time_ago_with_tooltip
(
deploy_key
.
created_at
)
}
ago
app/views/projects/issues/_issue.html.haml
View file @
3f709e0a
...
...
@@ -26,7 +26,7 @@
%i
.icon-time
=
issue
.
milestone
.
title
.pull-right
%small
updated
#{
time_ago_
in_words
(
issue
.
updated_at
)
}
ago
%small
updated
#{
time_ago_
with_tooltip
(
issue
.
updated_at
,
'bottom'
,
'issue_update_ago'
)
}
ago
.issue-labels
-
issue
.
labels
.
each
do
|
label
|
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
3f709e0a
...
...
@@ -34,4 +34,4 @@
.pull-right
%small
updated
#{
time_ago_
in_words
(
merge_request
.
updated_at
)
}
ago
%small
updated
#{
time_ago_
with_tooltip
(
merge_request
.
updated_at
,
'bottom'
,
'merge_request_updated_ago'
)
}
ago
app/views/projects/merge_requests/show/_mr_box.html.haml
View file @
3f709e0a
...
...
@@ -34,13 +34,13 @@
%span
%i
.icon-remove
Closed by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
)
}
%span
#{
time_ago_in_words
(
@merge_request
.
closed_event
.
created_at
)
}
ago.
#{
time_ago_with_tooltip
(
@merge_request
.
closed_event
.
created_at
)
}
ago.
-
if
@merge_request
.
merged?
.ui-box-bottom.alert-success
%span
%i
.icon-ok
Merged by
#{
link_to_member
(
@project
,
@merge_request
.
merge_event
.
author
)
}
#{
time_ago_
in_words
(
@merge_request
.
merge_event
.
created_at
)
}
ago.
#{
time_ago_
with_tooltip
(
@merge_request
.
merge_event
.
created_at
)
}
ago.
-
if
!
@closes_issues
.
empty?
&&
@merge_request
.
opened?
.ui-box-bottom.alert-info
%span
...
...
app/views/projects/notes/_discussion.html.haml
View file @
3f709e0a
...
...
@@ -32,8 +32,7 @@
last updated by
=
link_to_member
(
@project
,
last_note
.
author
,
avatar:
false
)
%span
.discussion-last-update
=
time_ago_in_words
(
last_note
.
updated_at
)
ago
#{
time_ago_with_tooltip
(
last_note
.
updated_at
,
'bottom'
,
'discussion_updated_ago'
)
}
ago
.discussion-body
-
if
note
.
for_diff_line?
-
if
note
.
active?
...
...
app/views/projects/protected_branches/index.html.haml
View file @
3f709e0a
...
...
@@ -46,8 +46,6 @@
=
commit
.
short_id
%span
.light
=
gfm
escape_once
(
truncate
(
commit
.
title
,
length:
40
))
%span
=
time_ago_in_words
(
commit
.
committed_date
)
ago
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
ago
-
else
(branch was removed from repository)
app/views/projects/refs/logs_tree.js.haml
View file @
3f709e0a
...
...
@@ -5,5 +5,5 @@
:plain
var row = $("table.table_
#{
@hex_path
}
tr.file_
#{
hexdigest
(
file_name
)
}
");
row.find("td.tree_time_ago").html('
#{
escape_javascript
time_ago_
in_words
(
commit
.
committed_date
)
}
ago');
row.find("td.tree_time_ago").html('
#{
escape_javascript
time_ago_
with_tooltip
(
commit
.
committed_date
)
}
ago');
row.find("td.tree_commit").html('
#{
escape_javascript
render
(
"projects/tree/tree_commit_column"
,
commit:
commit
)
}
');
app/views/projects/snippets/_snippet.html.haml
View file @
3f709e0a
...
...
@@ -18,4 +18,5 @@
by
=
image_tag
avatar_icon
(
snippet
.
author_email
),
class:
"avatar avatar-inline s16"
=
snippet
.
author_name
%span
.light
#{
time_ago_in_words
(
snippet
.
created_at
)
}
ago
%span
.light
#{
time_ago_with_tooltip
(
snippet
.
created_at
)
}
ago
app/views/projects/tags/index.html.haml
View file @
3f709e0a
...
...
@@ -24,8 +24,7 @@
.pull-right
%small
.cdark
%i
.icon-calendar
=
time_ago_in_words
(
commit
.
committed_date
)
ago
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
ago
%p
.prepend-left-20
=
link_to
commit
.
short_id
(
8
),
project_commit_path
(
@project
,
commit
),
class:
"monospace"
–
...
...
app/views/projects/wikis/history.html.haml
View file @
3f709e0a
...
...
@@ -23,8 +23,7 @@
%td
=
commit
.
title
%td
=
time_ago_in_words
(
version
.
date
)
ago
#{
time_ago_with_tooltip
(
version
.
date
)
}
ago
%td
%strong
=
@wiki
.
page
.
wiki
.
page
(
@wiki
.
page
.
name
,
commit
.
id
).
try
(
:format
)
app/views/projects/wikis/pages.html.haml
View file @
3f709e0a
...
...
@@ -8,4 +8,4 @@
=
link_to
wiki_page
.
title
.
titleize
,
project_wiki_path
(
@project
,
wiki_page
)
%small
(
#{
wiki_page
.
format
}
)
.pull-right
%small
Last edited
#{
time_ago_
in_words
(
wiki_page
.
commit
.
created_at
)
}
ago
%small
Last edited
#{
time_ago_
with_tooltip
(
wiki_page
.
commit
.
created_at
)
}
ago
app/views/projects/wikis/show.html.haml
View file @
3f709e0a
...
...
@@ -12,4 +12,4 @@
=
preserve
do
=
render_wiki_content
(
@wiki
)
%p
.
time
Last edited by
#{
commit_author_link
(
@wiki
.
commit
,
avatar:
true
,
size:
16
)
}
#{
time_ago_in_words
@wiki
.
commit
.
created_at
}
ago
%p
.
span
Last edited by
#{
commit_author_link
(
@wiki
.
commit
,
avatar:
true
,
size:
16
)
}
#{
time_ago_with_tooltip
(
@wiki
.
commit
.
created_at
)
}
ago
app/views/snippets/_snippet.html.haml
View file @
3f709e0a
...
...
@@ -20,4 +20,4 @@
=
link_to
user_snippets_path
(
snippet
.
author
)
do
=
image_tag
avatar_icon
(
snippet
.
author_email
),
class:
"avatar avatar-inline s16"
,
alt:
''
=
snippet
.
author_name
%span
.light
#{
time_ago_
in_words
(
snippet
.
created_at
)
}
ago
%span
.light
#{
time_ago_
with_tooltip
(
snippet
.
created_at
)
}
ago
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