From 843467b8c4be9ff1658d18d606f7fd5b149cbec9 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 16 Aug 2018 12:41:21 +0100 Subject: [PATCH] Added file templates to the Web IDE Closes #47947 --- .../ide/components/file_templates/bar.vue | 90 +++++++++++++ .../components/file_templates/dropdown.vue | 120 ++++++++++++++++++ .../ide/components/repo_editor.vue | 8 +- app/assets/javascripts/ide/stores/index.js | 2 + changelogs/unreleased/ide-file-templates.yml | 5 + locale/gitlab.pot | 15 +++ 6 files changed, 239 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/ide/components/file_templates/bar.vue create mode 100644 app/assets/javascripts/ide/components/file_templates/dropdown.vue create mode 100644 changelogs/unreleased/ide-file-templates.yml diff --git a/app/assets/javascripts/ide/components/file_templates/bar.vue b/app/assets/javascripts/ide/components/file_templates/bar.vue new file mode 100644 index 00000000000..8344b5440e9 --- /dev/null +++ b/app/assets/javascripts/ide/components/file_templates/bar.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/app/assets/javascripts/ide/components/file_templates/dropdown.vue b/app/assets/javascripts/ide/components/file_templates/dropdown.vue new file mode 100644 index 00000000000..914022d8764 --- /dev/null +++ b/app/assets/javascripts/ide/components/file_templates/dropdown.vue @@ -0,0 +1,120 @@ + + + diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index f55aa843444..d3a73e84cc7 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -6,12 +6,14 @@ import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue'; import { activityBarViews, viewerTypes } from '../constants'; import Editor from '../lib/editor'; import ExternalLink from './external_link.vue'; +import FileTemplatesBar from './file_templates/bar.vue'; export default { components: { ContentViewer, DiffViewer, ExternalLink, + FileTemplatesBar, }, props: { file: { @@ -34,6 +36,7 @@ export default { 'isCommitModeActive', 'isReviewModeActive', ]), + ...mapGetters('fileTemplates', ['showFileTemplatesBar']), shouldHideEditor() { return this.file && this.file.binary && !this.file.content; }, @@ -216,7 +219,7 @@ export default { id="ide" class="blob-viewer-container blob-editor-container" > -
+
+
pipelines, mergeRequests, branches, + fileTemplates, }, }); diff --git a/changelogs/unreleased/ide-file-templates.yml b/changelogs/unreleased/ide-file-templates.yml new file mode 100644 index 00000000000..68983670b25 --- /dev/null +++ b/changelogs/unreleased/ide-file-templates.yml @@ -0,0 +1,5 @@ +--- +title: Added file templates to the Web IDE +merge_request: +author: +type: added diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0e89c19066e..f197ee94e7e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1167,6 +1167,9 @@ msgstr "" msgid "Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request." msgstr "" +msgid "Choose a type..." +msgstr "" + msgid "Choose any color." msgstr "" @@ -2691,6 +2694,9 @@ msgstr "" msgid "Fields on this page are now uneditable, you can configure" msgstr "" +msgid "File templates" +msgstr "" + msgid "Files" msgstr "" @@ -2703,6 +2709,9 @@ msgstr "" msgid "Filter by commit message" msgstr "" +msgid "Filter..." +msgstr "" + msgid "Find by path" msgstr "" @@ -5595,6 +5604,9 @@ msgstr "" msgid "Template" msgstr "" +msgid "Template applied" +msgstr "" + msgid "Terms of Service Agreement and Privacy Policy" msgstr "" @@ -6175,6 +6187,9 @@ msgstr "" msgid "Unable to load the diff. %{button_try_again}" msgstr "" +msgid "Undo" +msgstr "" + msgid "Unlock" msgstr ""