Merge pull request doccano#176 from CatalystCode/enhancement/remove-django-template-inheritance-from-admin

Enhancement/Remove Django template inheritance in admin pages

Author: Hironsan

app/server/models.py

@@ -36,10 +36,10 @@ def image(self):
     def get_bundle_name(self):
         raise NotImplementedError()
 
-    def get_upload_template(self):
+    def get_bundle_name_upload(self):
         raise NotImplementedError()
 
-    def get_download_template(self):
+    def get_bundle_name_download(self):
         raise NotImplementedError()
 
     def get_annotation_serializer(self):
@@ -64,11 +64,11 @@ def image(self):
     def get_bundle_name(self):
         return 'document_classification'
 
-    def get_upload_template(self):
-        return 'admin/upload/text_classification.html'
+    def get_bundle_name_upload(self):
+        return 'upload_text_classification'
 
-    def get_download_template(self):
-        return 'admin/download/text_classification.html'
+    def get_bundle_name_download(self):
+        return 'download_text_classification'
 
     def get_annotation_serializer(self):
         from .serializers import DocumentAnnotationSerializer
@@ -91,11 +91,11 @@ def image(self):
     def get_bundle_name(self):
         return 'sequence_labeling'
 
-    def get_upload_template(self):
-        return 'admin/upload/sequence_labeling.html'
+    def get_bundle_name_upload(self):
+        return 'upload_sequence_labeling'
 
-    def get_download_template(self):
-        return 'admin/download/sequence_labeling.html'
+    def get_bundle_name_download(self):
+        return 'download_sequence_labeling'
 
     def get_annotation_serializer(self):
         from .serializers import SequenceAnnotationSerializer
@@ -118,11 +118,11 @@ def image(self):
     def get_bundle_name(self):
         return 'seq2seq'
 
-    def get_upload_template(self):
-        return 'admin/upload/seq2seq.html'
+    def get_bundle_name_upload(self):
+        return 'upload_seq2seq'
 
-    def get_download_template(self):
-        return 'admin/download/seq2seq.html'
+    def get_bundle_name_download(self):
+        return 'download_seq2seq'
 
     def get_annotation_serializer(self):
         from .serializers import Seq2seqAnnotationSerializer

app/server/package-lock.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "axios": "^0.18.0",
     "chart.js": "^2.7.2",
+    "highlight.js": "^9.12.0",
     "marked": "^0.3.19",
     "swiper": "^4.3.3",
     "vue": "^2.5.16",

app/server/package.json

@@ -48,7 +48,7 @@ hr {
 </style>
 
 <script>
-import annotationMixin from './mixin';
+import { annotationMixin } from './mixin';
 import HTTP from './http';
 import { simpleShortcut } from './filter';
 

app/server/static/js/dataset.js

@@ -0,0 +1,22 @@
+div.columns(v-cloak="")
+  div.column.is-12
+    messages(v-bind:messages="messages")
+
+    div.card
+
+      header.card-header
+        p.card-header-title File Downloader
+
+      div.card-content
+        h2.subtitle Download labeled data
+
+        div.control(style="margin-bottom: 1em;")
+          block select-format-area
+
+        block example-format-area
+
+        button.button.is-primary(
+          style="margin-top: 1em;"
+          type="submit"
+          v-on:click="download()"
+        ) Download

app/server/static/js/document_classification.vue

@@ -0,0 +1,10 @@
+import Vue from 'vue';
+import DownloadSeq2Seq from './download_seq2seq.vue';
+
+new Vue({
+  el: '#mail-app',
+
+  components: { DownloadSeq2Seq },
+
+  template: '<DownloadSeq2Seq />',
+});

app/server/static/js/download.pug

@@ -0,0 +1,41 @@
+<template lang="pug">
+extends ./download.pug
+
+block select-format-area
+  label.radio
+    input(
+      type="radio"
+      name="format"
+      value="csv"
+      v-bind:checked="format == 'csv'"
+      v-model="format"
+    )
+    | CSV
+
+  label.radio
+    input(
+      type="radio"
+      name="format"
+      value="json"
+      v-bind:checked="format == 'json'"
+      v-model="format"
+    )
+    | JSONL
+
+block example-format-area
+  pre.code-block(v-show="format == 'csv'")
+    code.csv
+      include ./examples/download_seq2seq.csv
+      | ...
+
+  pre.code-block(v-show="format == 'json'")
+    code.json
+      include ./examples/download_seq2seq.jsonl
+      | ...
+</template>
+
+<script>
+import { uploadMixin } from './mixin';
+
+export default uploadMixin;
+</script>

app/server/static/js/download_seq2seq.js

@@ -0,0 +1,10 @@
+import Vue from 'vue';
+import DownloadSequenceLabeling from './download_sequence_labeling.vue';
+
+new Vue({
+  el: '#mail-app',
+
+  components: { DownloadSequenceLabeling },
+
+  template: '<DownloadSequenceLabeling />',
+});

app/server/static/js/download_seq2seq.vue

@@ -0,0 +1,26 @@
+<template lang="pug">
+extends ./download.pug
+
+block select-format-area
+  label.radio
+    input(
+      type="radio"
+      name="format"
+      value="json"
+      v-bind:checked="format == 'json'"
+      v-model="format"
+    )
+    | JSONL
+
+block example-format-area
+  pre.code-block(v-show="format == 'json'")
+    code.json
+      include ./examples/download_sequence_labeling.jsonl
+      | ...
+</template>
+
+<script>
+import { uploadMixin } from './mixin';
+
+export default uploadMixin;
+</script>