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
68de3ac1
Commit
68de3ac1
authored
Jul 27, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
display system timezone underneath activity calendar
parent
037b3729
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
app/assets/javascripts/users/user_tabs.js
app/assets/javascripts/users/user_tabs.js
+5
-0
app/assets/stylesheets/framework/calendar.scss
app/assets/stylesheets/framework/calendar.scss
+1
-0
No files found.
app/assets/javascripts/users/user_tabs.js
View file @
68de3ac1
...
@@ -151,12 +151,17 @@ export default class UserTabs {
...
@@ -151,12 +151,17 @@ export default class UserTabs {
const
calendarPath
=
$calendarWrap
.
data
(
'
calendarPath
'
);
const
calendarPath
=
$calendarWrap
.
data
(
'
calendarPath
'
);
const
calendarActivitiesPath
=
$calendarWrap
.
data
(
'
calendarActivitiesPath
'
);
const
calendarActivitiesPath
=
$calendarWrap
.
data
(
'
calendarActivitiesPath
'
);
const
utcOffset
=
$calendarWrap
.
data
(
'
utcOffset
'
);
const
utcOffset
=
$calendarWrap
.
data
(
'
utcOffset
'
);
let
utcFormatted
=
'
UTC
'
;
if
(
utcOffset
!==
0
)
{
utcFormatted
=
`UTC
${
utcOffset
>
0
?
'
+
'
:
''
}${(
utcOffset
/
3600
)}
`
;
}
$
.
ajax
({
$
.
ajax
({
dataType
:
'
json
'
,
dataType
:
'
json
'
,
url
:
calendarPath
,
url
:
calendarPath
,
success
:
(
activityData
)
=>
{
success
:
(
activityData
)
=>
{
$calendarWrap
.
html
(
CALENDAR_TEMPLATE
);
$calendarWrap
.
html
(
CALENDAR_TEMPLATE
);
$calendarWrap
.
find
(
'
.calendar-hint
'
).
append
(
`(Timezone:
${
utcFormatted
}
)`
);
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
ActivityCalendar
(
'
.js-contrib-calendar
'
,
activityData
,
calendarActivitiesPath
,
utcOffset
);
new
ActivityCalendar
(
'
.js-contrib-calendar
'
,
activityData
,
calendarActivitiesPath
,
utcOffset
);
...
...
app/assets/stylesheets/framework/calendar.scss
View file @
68de3ac1
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
margin-top
:
-23px
;
margin-top
:
-23px
;
float
:
right
;
float
:
right
;
font-size
:
12px
;
font-size
:
12px
;
direction
:
ltr
;
}
}
.pika-single.gitlab-theme
{
.pika-single.gitlab-theme
{
...
...
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