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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
93c55f58
Commit
93c55f58
authored
Apr 11, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move TimeTrackingHelpState vue component
parent
174950b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
25 deletions
+33
-25
app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
...vascripts/sidebar/components/time_tracking/help_state.vue
+26
-23
app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
...scripts/sidebar/components/time_tracking/time_tracker.vue
+2
-2
changelogs/unreleased/move-help-state-vue-component.yml
changelogs/unreleased/move-help-state-vue-component.yml
+5
-0
No files found.
app/assets/javascripts/sidebar/components/time_tracking/help_state.
js
→
app/assets/javascripts/sidebar/components/time_tracking/help_state.
vue
View file @
93c55f58
<
script
>
import
{
sprintf
,
s__
}
from
'
../../../locale
'
;
import
{
sprintf
,
s__
}
from
'
../../../locale
'
;
export
default
{
export
default
{
name
:
'
time-tracking-help-s
tate
'
,
name
:
'
TimeTrackingHelpS
tate
'
,
props
:
{
props
:
{
rootPath
:
{
rootPath
:
{
type
:
String
,
type
:
String
,
...
@@ -27,26 +28,28 @@ export default {
...
@@ -27,26 +28,28 @@ export default {
);
);
},
},
},
},
template
:
`
<div class="time-tracking-help-state">
<div class="time-tracking-info">
<h4>
{{ __('Track time with quick actions') }}
</h4>
<p>
{{ __('Quick actions can be used in the issues description and comment boxes.') }}
</p>
<p v-html="estimateText">
</p>
<p v-html="spendText">
</p>
<a
class="btn btn-default learn-more-button"
:href="href"
>
{{ __('Learn more') }}
</a>
</div>
</div>
`
,
};
};
</
script
>
<
template
>
<div
class=
"time-tracking-help-state"
>
<div
class=
"time-tracking-info"
>
<h4>
{{
__
(
'
Track time with quick actions
'
)
}}
</h4>
<p>
{{
__
(
'
Quick actions can be used in the issues description and comment boxes.
'
)
}}
</p>
<p
v-html=
"estimateText"
>
</p>
<p
v-html=
"spendText"
>
</p>
<a
class=
"btn btn-default learn-more-button"
:href=
"href"
>
{{
__
(
'
Learn more
'
)
}}
</a>
</div>
</div>
</
template
>
app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
View file @
93c55f58
<
script
>
<
script
>
import
timeTrackingHelpState
from
'
./help_stat
e
'
;
import
TimeTrackingHelpState
from
'
./help_state.vu
e
'
;
import
TimeTrackingCollapsedState
from
'
./collapsed_state.vue
'
;
import
TimeTrackingCollapsedState
from
'
./collapsed_state.vue
'
;
import
timeTrackingSpentOnlyPane
from
'
./spent_only_pane
'
;
import
timeTrackingSpentOnlyPane
from
'
./spent_only_pane
'
;
import
timeTrackingNoTrackingPane
from
'
./no_tracking_pane
'
;
import
timeTrackingNoTrackingPane
from
'
./no_tracking_pane
'
;
...
@@ -16,7 +16,7 @@ export default {
...
@@ -16,7 +16,7 @@ export default {
'
time-tracking-spent-only-pane
'
:
timeTrackingSpentOnlyPane
,
'
time-tracking-spent-only-pane
'
:
timeTrackingSpentOnlyPane
,
'
time-tracking-no-tracking-pane
'
:
timeTrackingNoTrackingPane
,
'
time-tracking-no-tracking-pane
'
:
timeTrackingNoTrackingPane
,
TimeTrackingComparisonPane
,
TimeTrackingComparisonPane
,
'
time-tracking-help-state
'
:
t
imeTrackingHelpState
,
T
imeTrackingHelpState
,
},
},
props
:
{
props
:
{
time_estimate
:
{
time_estimate
:
{
...
...
changelogs/unreleased/move-help-state-vue-component.yml
0 → 100644
View file @
93c55f58
---
title
:
Move TimeTrackingHelpState vue component
merge_request
:
18319
author
:
George Tsiolis
type
:
performance
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