Move query_results and interactions into corpora template folder

web/app/query_results/views.py

@@ -69,7 +69,7 @@ def add_query_result():
         redirect_url = url_for('query_results.query_result',
                                query_result_id=query_result.id)
         return make_response({'redirect_url': redirect_url}, 201)
-    return render_template('query_results/add_query_result.html.j2',
+    return render_template('corpora/query_results/add_query_result.html.j2',
                            add_query_result_form=add_query_result_form,
                            title='Add query result')
 
@@ -81,7 +81,7 @@ def query_result(query_result_id):
     if not (query_result.creator == current_user
             or current_user.is_administrator()):
         abort(403)
-    return render_template('query_results/query_result.html.j2',
+    return render_template('corpora/query_results/query_result.html.j2',
                            query_result=query_result,
                            title='Query result')
 
@@ -114,7 +114,7 @@ def inspect_query_result(query_result_id):
     )
     with open(query_result_file_path, 'r') as query_result_file:
         query_result_file_content = json.load(query_result_file)
-    return render_template('query_results/inspect.html.j2',
+    return render_template('corpora/query_results/inspect.html.j2',
                            display_options_form=display_options_form,
                            inspect_display_options_form=inspect_display_options_form,
                            query_result_file_content=query_result_file_content,

web/app/templates/corpora/analyse_corpus.html.j2

@@ -44,12 +44,12 @@
       <div id="interactions-menu" class="row hide"
            style="margin-bottom: 0px;">
         {# Importing menus for query settings, export etc. #}
-        {% include 'interactions/infos.html.j2' %}
+        {% include 'corpora/interactions/infos.html.j2' %}
-        {% include 'interactions/export.html.j2' %}
+        {% include 'corpora/interactions/export.html.j2' %}
-        {% include 'interactions/create.html.j2' %}
+        {% include 'corpora/interactions/create.html.j2' %}
-        {% include 'interactions/display.html.j2' %}
+        {% include 'corpora/interactions/display.html.j2' %}
-        {% include 'interactions/analysis.html.j2' %}
+        {% include 'corpora/interactions/analysis.html.j2' %}
-        {% include 'interactions/cite.html.j2' %}
+        {% include 'corpora/interactions/cite.html.j2' %}
       </div>
       {% include 'tables/query_results.html.j2' %}
     </div>
@@ -57,7 +57,7 @@
 </div>
 
 <!-- Scroll to top element -->
-{% include 'interactions/scroll_to_top.html.j2' %}
+{% include 'corpora/interactions/scroll_to_top.html.j2' %}
 
 <!-- Modals -->
 {% include 'modals/show_metadata.html.j2' %}

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

@@ -34,15 +34,15 @@
   <div class="card">
     <div class="card-content" id="result-list" style="overflow: hidden;">
       <div class="row" id="interactions-menu">
-        {% include 'interactions/infos.html.j2' %}
+        {% include 'corpora/interactions/infos.html.j2' %}
-        {% include 'interactions/display.html.j2' %}
+        {% include 'corpora/interactions/display.html.j2' %}
-        {% include 'interactions/analysis.html.j2' %}
+        {% include 'corpora/interactions/analysis.html.j2' %}
-        {% include 'interactions/cite.html.j2' %}
+        {% include 'corpora/interactions/cite.html.j2' %}
         <div class="hide">
           {# Hide those because they are not needed when inspecting results.
           But some of their elements are being asked for by the client. #}
-          {% include 'interactions/export.html.j2' %}
+          {% include 'corpora/interactions/export.html.j2' %}
-          {% include 'interactions/create.html.j2' %}
+          {% include 'corpora/interactions/create.html.j2' %}
         </div>
       </div>
       {% include 'tables/query_results.html.j2' %}
@@ -51,7 +51,7 @@
 </div>
 
 <!-- Scroll to top element -->
-{% include 'interactions/scroll_to_top.html.j2' %}
+{% include 'corpora/interactions/scroll_to_top.html.j2' %}
 
 <!-- Modals -->
 {% include 'modals/show_metadata.html.j2' %}