Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

app/templates/corpora/add_corpus_file.html.j2

@@ -8,7 +8,7 @@
 </div>
 
 <div class="col s12 m8">
-  <form method="POST" enctype="multipart/form-data">
+  <form class="nopaque-job-form" data-progress-modal="progress-modal">
     {{ add_corpus_file_form.hidden_tag() }}
     <div class="card">
       <div class="card-content">
@@ -103,4 +103,16 @@
     </ul>
   </form>
 </div>
+
+<div id="progress-modal" class="modal">
+  <div class="modal-content">
+    <h4><i class="material-icons prefix">file_upload</i> Uploading files for <span class="title"></span></h4>
+    <div class="progress">
+      <div class="determinate" style="width: 0%"></div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <a href="#!" class="modal-close waves-effect waves-light btn red abort-request">Cancel</a>
+  </div>
+</div>
 {% endblock %}

app/templates/corpora/corpus.html.j2

@@ -35,9 +35,7 @@
     </div>
     <div class="card-action right-align">
       <a href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}" class="btn disabled hide waves-effect waves-light" id="analyze"><i class="material-icons left">search</i>Analyze</a>
-      {% if corpus.files[0] is defined %}
-      <a href="{{ url_for('corpora.prepare_corpus', corpus_id=corpus.id) }}" class="btn disabled hide waves-effect waves-light" id="build"><i class="material-icons left">build</i>Build</a>
-      {% endif %}
+      <a href="{{ url_for('corpora.prepare_corpus', corpus_id=corpus.id) }}" class="btn disabled hide waves-effect waves-light" id="compile"><i class="material-icons left">merge_type</i>Compile</a>
       <a data-target="delete-corpus-modal" class="btn modal-trigger red waves-effect waves-light"><i class="material-icons left">delete</i>Delete</a>
     </div>
   </div>
@@ -49,6 +47,7 @@
   <div class="card">
     <div class="card-content" style="overflow: hidden;">
       <span class="card-title">Files</span>
+
       <table class="highlight responsive-table">
         <thead>
           <tr>
@@ -60,6 +59,12 @@
           </tr>
         </thead>
         <tbody>
+          <tr class="show-if-only-child">
+            <td colspan="5">
+              <span class="card-title"><i class="material-icons left">book</i>Nothing here...</span>
+              <p>Corpus is empty. Add texts using the option below.</p>
+            </td>
+          </tr>
           {% for file in corpus.files %}
           <tr>
             <td>{{ file.filename }}</td>
@@ -114,6 +119,7 @@
     constructor(corpusId, foreignCorpusFlag) {
       this.corpusId = corpusId;
       this.foreignCorpusFlag = foreignCorpusFlag;
+
       if (this.foreignCorpusFlag) {
         nopaque.foreignCorporaSubscribers.push(this);
       } else {
@@ -124,14 +130,11 @@
     _init() {
       let corpus;
 
-      if (this.foreignCorpusFlag) {
-        corpus = nopaque.foreignCorpora[this.corpusId];
-      } else {
-        corpus = nopaque.corpora[this.corpusId];
-      }
+      corpus = (this.foreignCorpusFlag ? nopaque.foreignCorpora[this.corpusId]
+                                       : nopaque.corpora[this.corpusId]);
 
       // Status
-      this.setStatus(corpus.status);
+      this.setStatus(corpus.status, corpus.files.length);
     }
 
     _update(patch) {
@@ -160,7 +163,9 @@
     }
 
     setStatus(status) {
-      let analyzeElement, buildElement, progressIndicatorElement, statusElement;
+      let analyzeElement, compileElement, numFiles, progressIndicatorElement, statusElement;
+
+      numFiles = (this.foreignCorpusFlag ? nopaque.foreignCorpora[this.corpusId] : nopaque.corpora[this.corpusId]).files.length;
 
       progressIndicatorElement = document.getElementById("progress-indicator");
       if (["queued", "running", "start analysis", "stop analysis"].includes(status)) {
@@ -180,11 +185,11 @@
         analyzeElement.classList.add("disabled", "hide");
       }
 
-      buildElement = document.getElementById("build");
-      if (status === 'unprepared') {
-        buildElement.classList.remove("disabled", "hide");
+      compileElement = document.getElementById("compile");
+      if (status === "unprepared" && numFiles > 0) {
+        compileElement.classList.remove("disabled", "hide");
       } else {
-        buildElement.classList.add("disabled", "hide");
+        compileElement.classList.add("disabled", "hide");
       }
     }
   }

app/templates/jobs/job.html.j2

@@ -146,6 +146,7 @@
     constructor(jobId, foreignJobFlag) {
       this.jobId = jobId;
       this.foreignJobFlag = foreignJobFlag;
+
       if (this.foreignJobFlag) {
         nopaque.foreignJobsSubscribers.push(this);
       } else {
@@ -156,11 +157,8 @@
     _init() {
       let job;
 
-      if (this.foreignJobFlag) {
-        job = nopaque.foreignJobs[this.jobId];
-      } else {
-        job = nopaque.jobs[this.jobId];
-      }
+      job = (this.foreignJobFlag ? nopaque.foreignJobs[this.jobId]
+                                 : nopaque.jobs[this.jobId]);
 
       // End date
       this.setEndDate(job.end_date);