Add full_width and limited_width templates.

2024-12-24 10:34:17 +00:00 · 2019-10-24 13:13:34 +02:00 · 2019-10-24 13:13:34 +02:00 · dce834c9a1
commit dce834c9a1
parent 6f8a8dbc77
22 changed files with 101 additions and 28 deletions
--- a/app/templates/403.html.j2
+++ b/app/templates/403.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="page-header">
--- a/app/templates/404.html.j2
+++ b/app/templates/404.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="page-header">
--- a/app/templates/500.html.j2
+++ b/app/templates/500.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="page-header">
--- a/app/templates/admin/admin.html.j2
+++ b/app/templates/admin/admin.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "full_width.html.j2" %}

 {% block page_content %}
 <div class="col s12">
--- a/app/templates/admin/admin_user_page.html.j2
+++ b/app/templates/admin/admin_user_page.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m6">
--- a/app/templates/admin/edit_profile_admin.html.j2
+++ b/app/templates/admin/edit_profile_admin.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m8">
--- a/app/templates/auth/login.html.j2
+++ b/app/templates/auth/login.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">
--- a/app/templates/auth/register.html.j2
+++ b/app/templates/auth/register.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">
--- a/app/templates/auth/reset_password.html.j2
+++ b/app/templates/auth/reset_password.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">
--- a/app/templates/auth/reset_password_request.html.j2
+++ b/app/templates/auth/reset_password_request.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">
--- a/app/templates/auth/unconfirmed.html.j2
+++ b/app/templates/auth/unconfirmed.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block title %}Opaque - Confirm your account{% endblock %}

--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@ -24,8 +24,8 @@
      {% if current_user.is_dark == True %}
      DarkReader.enable({
        brightness: 100,
-        contrast: 90,
-        sepia: 10
+        contrast: 100,
+        sepia: 0
      });
      {% else %}
      DarkReader.disable();
@ -182,15 +182,9 @@
    </header>

    <main class="grey lighten-5">
-      <div class="container">
-        <div class="row">
-          <div class="col s12">
-            <h2>{% if title %}{{ title }}{% else %}Unnamed page{% endif %}</h2>
-          </div>
-          {% block page_content %}
+          {% block main_block %}
          {% endblock %}
-        </div>
-      </div>
+
    </main>

    <footer class="page-footer">
--- a/app/templates/full_width.html.j2
+++ b/app/templates/full_width.html.j2
@ -0,0 +1,11 @@
+{% extends "base.html.j2" %}
+
+{% block main_block %}
+<div class="row">
+  <div class="col s12">
+    <h2>{% if title %}{{ title }}{% else %}Unnamed page{% endif %}</h2>
+  </div>
+  {% block page_content %}
+  {% endblock %}
+</div>
+{% endblock %}
--- a/app/templates/limited_width.html.j2
+++ b/app/templates/limited_width.html.j2
@ -0,0 +1,13 @@
+{% extends "base.html.j2" %}
+
+{% block main_block %}
+<div class="container">
+  <div class="row">
+    <div class="col s12">
+      <h2>{% if title %}{{ title }}{% else %}Unnamed page{% endif %}</h2>
+    </div>
+    {% block page_content %}
+    {% endblock %}
+  </div>
+</div>
+{% endblock %}
--- a/app/templates/main/corpora/corpus.html.j2
+++ b/app/templates/main/corpora/corpus.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <script>
@ -84,6 +84,7 @@
  <!-- Confirm deletion of job with modal dialogue
  Modal Trigger-->
  <a href="#modal-confirm-delete" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete Corpus</a>
+  <a href="{{ url_for('main.corpus_analysis', corpus_id=corpus.id) }}" class="waves-effect waves-light btn "><i class="material-icons left">help</i>Analyse</a>
  <!-- Modal Strucutre -->
  <div id="modal-confirm-delete" class="modal">
    <div class="modal-content">
--- a/app/templates/main/corpora/corpus_analysis.html.j2
+++ b/app/templates/main/corpora/corpus_analysis.html.j2
@ -0,0 +1,54 @@
+{% extends "full_width.html.j2" %}
+
+{% block page_content %}
+<div class="col s12 m9 l9">
+  <div class="card">
+    <div class="card-content">
+      <span class="card-title">Query Results</span>
+      <table class="responsive highlight">
+       <tr>
+         <th>Firstname</th>
+         <th>Lastname</th>
+         <th>Age</th>
+       </tr>
+       <tr>
+         <td>Jill</td>
+         <td>Smith</td>
+         <td>50</td>
+       </tr>
+       {% for i in range(0,51) %}
+       <tr>
+         <td>Eve</td>
+         <td>Jackson</td>
+         <td>94</td>
+       </tr>
+       {% endfor %}
+      </table>
+    </div>
+  </div>
+</div>
+<div class="col s12 m3 l3 sticky">
+      <div class="card">
+        <div class="card-content">
+          <span class="card-title">Card Title</span>
+          <table class="responsive highlight">
+           <tr>
+             <th>Firstname</th>
+             <th>Lastname</th>
+             <th>Age</th>
+           </tr>
+           <tr>
+             <td>Jill</td>
+             <td>Smith</td>
+             <td>50</td>
+           </tr>
+           <tr>
+             <td>Eve</td>
+             <td>Jackson</td>
+             <td>94</td>
+           </tr>
+          </table>
+        </div>
+      </div>
+    </div>
+{% endblock %}
--- a/app/templates/main/dashboard.html.j2
+++ b/app/templates/main/dashboard.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">
--- a/app/templates/main/index.html.j2
+++ b/app/templates/main/index.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">
--- a/app/templates/main/jobs/job.html.j2
+++ b/app/templates/main/jobs/job.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <script>
--- a/app/templates/profile/index.html.j2
+++ b/app/templates/profile/index.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">
--- a/app/templates/services/nlp.html.j2
+++ b/app/templates/services/nlp.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">
--- a/app/templates/services/ocr.html.j2
+++ b/app/templates/services/ocr.html.j2
@ -1,4 +1,4 @@
-{% extends "base.html.j2" %}
+{% extends "limited_width.html.j2" %}

 {% block page_content %}
 <div class="col s12 m4">