kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Move TimeTrackingHelpState vue component

See merge request gitlab-org/gitlab-ce!18319
This commit is contained in:
Filipa Lacerda 2018-04-12 10:24:07 +00:00
parent 8e0e9d6dd5 93c55f5858
commit ef04186fe3
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/assets/javascripts/sidebar/components/time_tracking/help_state.js → app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
View File

@ -1,7 +1,8 @@
<script>
import { sprintf, s__ } from '../../../locale';
export default {
name: 'time-tracking-help-state',
name: 'TimeTrackingHelpState',
props: {
rootPath: {
type: String,
@ -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>

4
app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
View File

@ -1,5 +1,5 @@
<script>
import timeTrackingHelpState from './help_state';
import TimeTrackingHelpState from './help_state.vue';
import TimeTrackingCollapsedState from './collapsed_state.vue';
import timeTrackingSpentOnlyPane from './spent_only_pane';
import timeTrackingNoTrackingPane from './no_tracking_pane';
@ -16,7 +16,7 @@ export default {
'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane,
'time-tracking-no-tracking-pane': timeTrackingNoTrackingPane,
TimeTrackingComparisonPane,
'time-tracking-help-state': timeTrackingHelpState,
TimeTrackingHelpState,
},
props: {
time_estimate: {

5
changelogs/unreleased/move-help-state-vue-component.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Move TimeTrackingHelpState vue component
merge_request: 18319
author: George Tsiolis
type: performance