summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-05-07 13:35:28 +0100
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-05-07 13:35:28 +0100
commit6948b56cddaf0848345945003ffcbc8715c61a04 (patch)
treeca23e2898b70ff2daedf8e820238dfc2ff237afc
parenta3b73e261f0a9e7d37b0003621355be9a6f50dc1 (diff)
downloadgitlab-ce-6948b56cddaf0848345945003ffcbc8715c61a04.tar.gz
Added modal message and removed traget branch and commit message fields for delete wiki page modal
-rw-r--r--app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue50
1 files changed, 10 insertions, 40 deletions
diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index af0b86ea816..85c14b6af77 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -5,7 +5,7 @@ import { s__, sprintf } from '~/locale';
export default {
components: {
- GlModal
+ GlModal,
},
props: {
deleteWikiUrl: {
@@ -26,29 +26,24 @@ export default {
},
computed: {
message() {
- return sprintf(s__('WikiPageConfirmDelete|Delete %{pageTitle}'),
- {
- pageTitle: _.escape(this.pageTitle),
- },
- false,
- );
+ return s__('WikiPageConfirmDelete|Are you sure you want to delete this page?');
},
-
title() {
- return sprintf(s__('WikiPageConfirmDelete|Delete Page %{pageTitle}?'),
+ return sprintf(
+ s__('WikiPageConfirmDelete|Delete Page %{pageTitle}?'),
{
pageTitle: `'${_.escape(this.pageTitle)}'`,
},
- false,
+ false
);
- }
+ },
},
methods: {
onSubmit() {
this.$refs.form.submit();
- }
- }
-}
+ },
+ },
+};
</script>
<template>
@@ -59,6 +54,7 @@ export default {
:footer-primary-button-text="s__('WikiPageConfirmDelete|Delete Page')"
@submit="onSubmit"
>
+ {{ message }}
<form
ref="form"
:action="deleteWikiUrl"
@@ -76,32 +72,6 @@ export default {
name="authenticity_token"
:value="csrfToken"
/>
-
- <div class="form-group">
- <div class="col-sm-12">
- <label for="commit_message" class="control-label-full-width">Commit Message</label>
- </div>
- <div class="col-sm-12">
- <div class="commit-message-container">
- <textarea
- id="commit_message"
- rows="3"
- name="commit_message"
- :value="message"
- class="form-control js-commit-message" required></textarea>
- </div>
-
- </div>
- </div>
- <div class="form-group">
- <div class="col-sm-12">
- <label for="branch_name" class="control-label-full-width">Target Branch</label>
- </div>
- <div class="col-sm-12">
- <input type="text" name="branch_name" class="form-control js-commit-message ref-name" required />
- </div>
- </div>
</form>
</gl-modal>
</template>
-