Commit ef04186f authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'move-help-state-vue-component' into 'master'

Move TimeTrackingHelpState vue component

See merge request gitlab-org/gitlab-ce!18319
parents 8e0e9d6d 93c55f58
<script>
import { sprintf, s__ } from '../../../locale'; import { sprintf, s__ } from '../../../locale';
export default { export default {
name: 'time-tracking-help-state', name: 'TimeTrackingHelpState',
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>
<script> <script>
import timeTrackingHelpState from './help_state'; import TimeTrackingHelpState from './help_state.vue';
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': timeTrackingHelpState, TimeTrackingHelpState,
}, },
props: { props: {
time_estimate: { time_estimate: {
......
---
title: Move TimeTrackingHelpState vue component
merge_request: 18319
author: George Tsiolis
type: performance
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment