Merge branch 'issue-edit-inline' into issue-edit-inline-description-template

1 files changed, 36 insertions, 6 deletions

diff --git a/app/assets/javascripts/issue_show/components/form.vue b/app/assets/javascripts/issue_show/components/form.vue
index f7461c8d05b..5c1e0568819 100644
--- a/app/assets/javascripts/issue_show/components/form.vue
+++ b/app/assets/javascripts/issue_show/components/form.vue
@@ -1,6 +1,8 @@
 <script>
   import titleField from './fields/title.vue';
+  import descriptionField from './fields/description.vue';
   import editActions from './edit_actions.vue';
+  import descriptionTemplate from './fields/description_template.vue';
 
   export default {
     props: {
@@ -17,24 +19,52 @@
         required: false,
         default: () => [],
       },
+      markdownPreviewUrl: {
+        type: String,
+        required: true,
+      },
+      markdownDocs: {
+        type: String,
+        required: true,
+      },
     },
     components: {
       titleField,
+      descriptionField,
+      descriptionTemplate,
       editActions,
     },
-    issuableTemplates: {
-      type: Array,
-      required: true,
-      default: () => [],
+    computed: {
+      hasIssuableTemplates() {
+        return this.issuableTemplates.length !== 0;
+      },
     },
   };
 </script>
 
 <template>
   <form>
-    <title-field
+    <div class="row">
+      <div
+        class="col-sm-4 col-lg-3"
+        v-if="hasIssuableTemplates">
+        <description-template
+          :issuable-templates="issuableTemplates" />
+      </div>
+      <div
+        :class="{
+          'col-sm-8 col-lg-9': hasIssuableTemplates,
+          'col-xs-12': !hasIssuableTemplates,
+        }">
+        <title-field
+          :form-state="formState"
+          :issuable-templates="issuableTemplates" />
+      </div>
+    </div>
+    <description-field
       :form-state="formState"
-      :issuable-templates="issuableTemplates" />
+      :markdown-preview-url="markdownPreviewUrl"
+      :markdown-docs="markdownDocs" />
     <edit-actions
       :can-destroy="canDestroy" />
   </form>