Merge query_results into corpora blueprint

web/app/templates/corpora/query_results/inspect.html.j2

@@ -70,7 +70,7 @@ import {
   Client,
   ClientEventListener,
   ListenerCallback,
-} from '../../static/js/modules/corpus_analysis/client/Client.js';
+} from '../../../static/js/modules/corpus_analysis/client/Client.js';
 /**
  * Import Client listener functions which will listen for defined socket or
  * javascript events.
@@ -78,16 +78,16 @@ import {
 import {
   recieveQueryStatus,
   recieveQueryData,
-} from '../../static/js/modules/corpus_analysis/client/listeners.js';
+} from '../../../static/js/modules/corpus_analysis/client/listeners.js';
 // Import client listener callbacks so they can be registered to the listeners.
 import {
   prepareQueryData,
   saveQueryData,
-} from '../../static/js/modules/corpus_analysis/client/callbacks.js';
+} from '../../../static/js/modules/corpus_analysis/client/callbacks.js';
 // Import Results class which will be used to save results data of a query etc.
 import {
   Results,
-} from '../../static/js/modules/corpus_analysis/model/Results.js';
+} from '../../../static/js/modules/corpus_analysis/model/Results.js';
 /**
  * Import the ResultsList which can be understood as a View class that handles
  * how the data from Results is represented to the user. The ViewEventListener
@@ -97,7 +97,7 @@ import {
 import {
   ResultsList,
   ViewEventListener,
-} from '../../static/js/modules/corpus_analysis/view/ResultsView.js';
+} from '../../../static/js/modules/corpus_analysis/view/ResultsView.js';
 // Import listener which will be registered to the ViewEventListener class.
 import {
   // listener listening for client dispatched 'notify-vie' custom event.
@@ -109,10 +109,10 @@ import {
   displayOptions,
   showMetaData,
   showCorpusFiles,
-} from '../../static/js/modules/corpus_analysis/view/listeners.js';
+} from '../../../static/js/modules/corpus_analysis/view/listeners.js';
 import {
   scrollToTop,
-} from '../../static/js/modules/corpus_analysis/view/scrollToTop.js'
+} from '../../../static/js/modules/corpus_analysis/view/scrollToTop.js'
 /**
  * Second Phase:
  * Asynchronus and event driven code.

web/app/templates/corpora/query_results/query_result.html.j2

@@ -1,8 +1,7 @@
 {% extends "nopaque.html.j2" %}
 
 {% block page_content %}
-
-
+{{ Macros.insert_color_scheme(corpus_analysis_color_darken) }}
 <div class="col s12">
   <p>Below the metadata for the results from the Corpus
     <i>{{ query_result.query_metadata.corpus_name }}</i> generated with the query
@@ -13,6 +12,10 @@
 
 <div class="col s12">
   <div class="card">
+    <div class="card-action right-align">
+      <a class="waves-effect waves-light btn left-align" href="{{ url_for('services.service', service='corpus_analysis') }}">Back To Overview<i class="material-icons right">arrow_back</i></a>
+      <a class="waves-effect waves-light btn" href="{{ url_for('corpora.inspect_query_result', query_result_id=query_result.id) }}">Inspect Results<i class="material-icons right">search</i></a>
+    </div>
     <div class="card-content" id="results">
       <table class="responsive-table highlight">
         <thead>
@@ -63,7 +66,7 @@
     </div>
     <div class="card-action right-align">
       <a class="waves-effect waves-light btn left-align" href="{{ url_for('services.service', service='corpus_analysis') }}">Back To Overview<i class="material-icons right">arrow_back</i></a>
-      <a class="waves-effect waves-light btn" href="{{ url_for('query_results.inspect_query_result', query_result_id=query_result.id) }}">Inspect Results<i class="material-icons right">search</i></a>
+      <a class="waves-effect waves-light btn" href="{{ url_for('corpora.inspect_query_result', query_result_id=query_result.id) }}">Inspect Results<i class="material-icons right">search</i></a>
     </div>
   </div>
 </div>

web/app/templates/main/dashboard.html.j2

@@ -76,7 +76,7 @@
           <ul class="pagination paginationBottom"></ul>
         </div>
         <div class="card-action right-align">
-          <a class="waves-effect waves-light btn" href="{{ url_for('query_results.add_query_result') }}">Add query result<i class="material-icons right">file_upload</i></a>
+          <a class="waves-effect waves-light btn" href="{{ url_for('corpora.add_query_result') }}">Add query result<i class="material-icons right">file_upload</i></a>
         </div>
       </div>
     </div>

web/app/templates/services/corpus_analysis.html.j2

@@ -86,7 +86,7 @@
       <ul class="pagination paginationBottom"></ul>
     </div>
     <div class="card-action right-align">
-      <a class="btn corpus-analysis-color darken waves-effect waves-light" href="{{ url_for('query_results.add_query_result') }}">Add query result<i class="material-icons right">file_upload</i></a>
+      <a class="btn corpus-analysis-color darken waves-effect waves-light" href="{{ url_for('corpora.add_query_result') }}">Add query result<i class="material-icons right">file_upload</i></a>
     </div>
   </div>
 </div>