Going back to vanilla css

app/templates/_base/scripts.html.j2

@@ -6,40 +6,22 @@
 <script src="{{ url_for('static', filename='external/socket.io/js/socket.io.min.js') }}"></script>
 {% assets
   filters='rjsmin',
-  output='gen/app.%(version)s.js',
+  output='gen/nopaque.%(version)s.js',
   'js/index.js',
   'js/app.js',
-  'js/utils.js'
--%}
-<script src="{{ ASSET_URL }}"></script>
-{% endassets -%}
+  'js/utils.js',
 
-{% assets
-  filters='rjsmin',
-  output='gen/Forms.%(version)s.js',
   'js/forms/index.js',
   'js/forms/base-form.js',
   'js/forms/create-contribution-form.js',
   'js/forms/create-corpus-file-form.js',
-  'js/forms/create-job-form.js'
--%}
-<script src="{{ ASSET_URL }}"></script>
-{% endassets -%}
+  'js/forms/create-job-form.js',
 
-{% assets
-  filters='rjsmin',
-  output='gen/resource-displays.%(version)s.js',
   'js/resource-displays/index.js',
   'js/resource-displays/resource-display.js',
   'js/resource-displays/corpus-display.js',
-  'js/resource-displays/job-display.js'
--%}
-<script src="{{ ASSET_URL }}"></script>
-{% endassets -%}
+  'js/resource-displays/job-display.js',
 
-{% assets
-  filters='rjsmin',
-  output='gen/resource-lists.%(version)s.js',
   'js/resource-lists/index.js',
   'js/resource-lists/resource-list.js',
   'js/resource-lists/admin-user-list.js',
@@ -55,27 +37,15 @@
   'js/resource-lists/public-corpus-list.js',
   'js/resource-lists/public-user-list.js',
   'js/resource-lists/spacy-nlp-pipeline-model-list.js',
-  'js/resource-lists/tesseract-ocr-pipeline-model-list.js'
--%}
-<script src="{{ ASSET_URL }}"></script>
-{% endassets -%}
+  'js/resource-lists/tesseract-ocr-pipeline-model-list.js',
 
-{% assets
-  filters='rjsmin',
-  output='gen/requests.%(version)s.js',
   'js/requests/index.js',
   'js/requests/admin.js',
   'js/requests/contributions.js',
   'js/requests/corpora.js',
   'js/requests/jobs.js',
-  'js/requests/users.js'
--%}
-<script src="{{ ASSET_URL }}"></script>
-{% endassets -%}
+  'js/requests/users.js',
 
-{% assets
-  filters='rjsmin',
-  output='gen/corpus-analysis.%(version)s.js',
   'js/corpus-analysis/index.js',
   'js/corpus-analysis/cqi/index.js',
   'js/corpus-analysis/cqi/constants.js',

app/templates/_base/sidenav.html.j2

@@ -26,11 +26,11 @@
   {# dashboard items #}
   <li><div class="divider"></div></li>
   <li><a class="subheader">Dashboard</a></li>
-  <li>
-    <a class="waves-effect" href="{{ url_for('main.dashboard', _anchor='corpora') }}"><i class="nopaque-icons">I</i>My Corpora</a>
+  <li {% if request.path == url_for('corpora.corpora') %}class="active"{% endif %}>
+    <a class="waves-effect" href="{{ url_for('corpora.corpora') }}"><i class="nopaque-icons">I</i>My Corpora</a>
   </li>
-  <li>
-    <a class="waves-effect" href="{{ url_for('main.dashboard', _anchor='jobs') }}"><i class="nopaque-icons">J</i>My Jobs</a>
+  <li {% if request.path == url_for('jobs.jobs') %}class="active"{% endif %}>
+    <a class="waves-effect" href="{{ url_for('jobs.jobs') }}"><i class="nopaque-icons">J</i>My Jobs</a>
   </li>
   <li>
     <a class="waves-effect" href="{{ url_for('main.dashboard', _anchor='contributions') }}"><i class="material-icons">new_label</i>My Contributions</a>

app/templates/_base/stylesheets.html.j2

@@ -1,26 +1,21 @@
 <link href="{{ url_for('static', filename='external/material-design-icons/css/material-icons.css') }}" rel="stylesheet">
-{# <link href="{{ url_for('static', filename='external/materialize/css/materialize.min.css') }}" rel="stylesheet"> #}
 {% assets
-  filters='pyscss',
-  output='gen/nopaque-materialize.%(version)s.css',
-  'nopaque-materialize.scss'
--%}
-<link href="{{ ASSET_URL }}" rel="stylesheet">
-{% endassets -%}
-{% if current_user.is_authenticated -%}
-{% assets
-  filters='pyscss',
-  output='gen/sidenav-fixed.%(version)s.css',
-  'sass/sidenav-fixed.scss'
--%}
-<link href="{{ ASSET_URL }}" rel="stylesheet">
-{% endassets -%}
-{% endif -%}
-<link href="{{ url_for('static', filename='nopaque-icons/css/nopaque-icons.css') }}" rel="stylesheet">
-{% assets
-  filters='pyscss',
   output='gen/nopaque.%(version)s.css',
-  'sass/main.scss'
+  'css/materialize.css',
+  'css/materialize.override.css',
+  'css/nopaque-icons.css',
+  'css/theme-colors.css',
+  'css/corpus-status-colors.css',
+  'css/corpus-status-text.css',
+  'css/job-status-colors.css',
+  'css/job-status-text.css',
+  'css/service-colors.css',
+  'css/pagination.css',
+  'css/service-icons.css',
+  'css/s-attr-colors.css',
+  'css/spacing.css',
+  'css/status-spinner.css',
+  'css/utils.css'
 -%}
 <link href="{{ ASSET_URL }}" rel="stylesheet">
 {% endassets -%}

app/templates/base.html.j2

@@ -2,6 +2,14 @@
 {% set title = 'nopaque' %}
 {% endif %}
 
+{% if sidenav_fixed is not defined %}
+{% set sidenav_fixed = current_user.is_authenticated %}
+{% endif %}
+
+{% if sticky_footer is not defined %}
+{% set sticky_footer = true %}
+{% endif %}
+
 {% if navbar_fixed is not defined %}
 {% set navbar_fixed = true %}
 {% endif %}
@@ -31,7 +39,7 @@
     {% endblock stylesheets %}
     {% endblock head %}
   </head>
-  <body {% block body_attribs %}{% endblock body_attribs %}>
+  <body {% block body_attribs %}data-sidenav-fixed="{{ sidenav_fixed }}" data-sticky-footer="{{ sticky_footer }}"{% endblock body_attribs %}>
     {% block body %}
     <header {% block header_attribs %}{% endblock header_attribs %}>
       {% block header %}
@@ -88,11 +96,9 @@
       {% endblock footer %}
     </footer>
 
-    <div id="scripts">
-      {% block scripts %}
-      {% include "_base/scripts.html.j2" %}
-      {% endblock scripts %}
-    </div>
+    {% block scripts %}
+    {% include "_base/scripts.html.j2" %}
+    {% endblock scripts %}
     {% endblock body %}
   </body>
   {% endblock html %}

app/templates/corpora/analysis.html.j2

@@ -10,13 +10,7 @@
 
 {% block stylesheets %}
 {{ super() }}
-{% assets
-  filters='pyscss',
-  output='gen/pages/corpora/analysis.%(version)s.css',
-  'sass/pages/corpora/analysis.scss'
--%}
-<link href="{{ ASSET_URL }}" rel="stylesheet">
-{% endassets -%}
+<link href="{{ url_for('static', filename='css/pages/corpora/analysis.css') }}" rel="stylesheet">
 {% endblock stylesheets %}
 
 

app/templates/corpora/corpora.html.j2

@@ -0,0 +1,38 @@
+{% extends "base.html.j2" %}
+
+
+{% block page_content %}
+<div class="container">
+  <h1>{{ title }}</h1>
+
+  <div class="card">
+    <div class="card-content">
+      <div class="corpus-list" data-user-id="{{ current_user.hashid }}"></div>
+    </div>
+    <div class="card-action right-align">
+      <a class="btn waves-effect waves-light" href="{{ url_for('corpora.create_corpus') }}">Create corpus<i class="material-icons right">add</i></a>
+    </div>
+  </div>
+</div>
+
+{#
+<div class="parallax-container">
+  <div class="parallax">
+    <img src="{{ url_for('static', filename='images/parallax_lq/01_books_antique_book_old.jpg') }}">
+  </div>
+</div>
+
+<div class="container">
+  <div style="position: relative; top: -225px;">
+    <div class="card white">
+      <div class="card-content">
+        <div class="corpus-list" data-user-id="{{ current_user.hashid }}"></div>
+      </div>
+      <div class="card-action right-align">
+        <a class="btn waves-effect waves-light" href="{{ url_for('corpora.create_corpus') }}">Create corpus<i class="material-icons right">add</i></a>
+      </div>
+    </div>
+  </div>
+</div>
+#}
+{% endblock page_content %}

app/templates/corpora/corpus.html.j2

@@ -4,13 +4,7 @@
 
 {% block stylesheets %}
 {{ super() }}
-{% assets
-  filters='pyscss',
-  output='gen/pages/corpora/corpus.%(version)s.css',
-  'sass/pages/corpora/corpus.scss'
--%}
-<link href="{{ ASSET_URL }}" rel="stylesheet">
-{% endassets -%}
+<link href="{{ url_for('static', filename='css/pages/corpora/corpus.css') }}" rel="stylesheet">
 {% endblock stylesheets %}
 
 
@@ -21,12 +15,12 @@
   <div class="row corpus-display" data-corpus-id="{{ corpus.hashid }}" data-user-id="{{ corpus.user.hashid }}">
     <div class="col s12">
       <h1>{{ corpus.title }}</h1>
+      <span class="chip corpus-status corpus-status-color corpus-status-text white-text"></span>
     </div>
 
     <div class="col s12 l7">
       <div class="card service-color-border border-darken" data-service="corpus-analysis" style="border-top: 10px solid">
         <div class="card-content">
-          <span class="chip corpus-status corpus-status-color corpus-status-text white-text"></span>
           <div class="row">
             <div class="col s12">
               <div class="input-field">

app/templates/jobs/jobs.html.j2

@@ -0,0 +1,98 @@
+{% extends "base.html.j2" %}
+
+
+{% block page_content %}
+<div class="container">
+  <h1>{{ title }}</h1>
+
+  <div class="card">
+    <div class="card-content">
+      <div class="job-list" data-user-id="{{ current_user.hashid }}"></div>
+    </div>
+    <div class="card-action right-align">
+      <a class="btn modal-trigger waves-effect waves-light" data-target="create-job-modal">Create job<i class="material-icons right">add</i></a>
+    </div>
+  </div>
+
+  <div class="fixed-action-btn">
+    <a class="btn-floating btn-large">
+      <i class="large material-icons">add</i>
+    </a>
+    <ul>
+      <li>
+        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="File Setup Pipeline" data-service="file-setup-pipeline">
+          <i class="nopaque-icons service-icons" data-service="file-setup-pipeline"></i>
+        </a>
+      </li>
+      <li>
+        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="Tesseract OCR Pipeline" data-service="tesseract-ocr-pipeline">
+          <i class="nopaque-icons service-icons" data-service="tesseract-ocr-pipeline"></i>
+        </a>
+      </li>
+      {% if config.NOPAQUE_TRANSKRIBUS_ENABLED %}
+      <li>
+        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="Transkribus HTR Pipeline" data-service="transkribus-htr-pipeline">
+          <i class="nopaque-icons service-icons" data-service="transkribus-htr-pipeline"></i>
+        </a>
+      </li>
+      {% endif %}
+      <li>
+        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="SpaCy NLP Pipeline" data-service="spacy-nlp-pipeline">
+          <i class="nopaque-icons service-icons" data-service="spacy-nlp-pipeline"></i>
+        </a>
+      </li>
+    </ul>
+  </div>
+</div>
+
+{# 
+<div class="parallax-container">
+  <div class="parallax">
+    <img src="{{ url_for('static', filename='images/parallax_lq/01_books_antique_book_old.jpg') }}">
+  </div>
+</div>
+
+<div class="container">
+  <div class="fixed-action-btn">
+    <a class="btn-floating btn-large">
+      <i class="large material-icons">add</i>
+    </a>
+    <ul>
+      <li>
+        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="File Setup Pipeline" data-service="file-setup-pipeline">
+          <i class="nopaque-icons service-icons" data-service="file-setup-pipeline"></i>
+        </a>
+      </li>
+      <li>
+        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="Tesseract OCR Pipeline" data-service="tesseract-ocr-pipeline">
+          <i class="nopaque-icons service-icons" data-service="tesseract-ocr-pipeline"></i>
+        </a>
+      </li>
+      {% if config.NOPAQUE_TRANSKRIBUS_ENABLED %}
+      <li>
+        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="Transkribus HTR Pipeline" data-service="transkribus-htr-pipeline">
+          <i class="nopaque-icons service-icons" data-service="transkribus-htr-pipeline"></i>
+        </a>
+      </li>
+      {% endif %}
+      <li>
+        <a class="btn-floating service-color darken tooltipped" data-position="left" data-tooltip="SpaCy NLP Pipeline" data-service="spacy-nlp-pipeline">
+          <i class="nopaque-icons service-icons" data-service="spacy-nlp-pipeline"></i>
+        </a>
+      </li>
+    </ul>
+  </div>
+
+  <div style="position: relative; top: -90px;">
+    <div class="card">
+      <div class="card-content">
+        <div class="job-list" data-user-id="{{ current_user.hashid }}"></div>
+      </div>
+      <div class="card-action right-align">
+        <a class="btn modal-trigger waves-effect waves-light" data-target="create-job-modal">Create job<i class="material-icons right">add</i></a>
+      </div>
+    </div>
+  </div>
+</div>
+#}
+{% endblock page_content %}

app/templates/main/dashboard.html.j2

@@ -9,6 +9,7 @@
 
     <div class="col s12" id="corpora">
       <h2>My Corpora</h2>
+      <p>Hallo <span class="pink-text">Audrey</span></p>
       <p>Create a corpus to interactively perform linguistic analysis.</p>
     </div>
 
@@ -18,7 +19,6 @@
           <div class="corpus-list" data-user-id="{{ current_user.hashid }}"></div>
         </div>
         <div class="card-action right-align">
-          <a class="btn disabled waves-effect waves-light" href="{{ url_for('corpora.import_corpus') }}">Import Corpus<i class="material-icons right">import_export</i></a>
           <a class="btn waves-effect waves-light" href="{{ url_for('corpora.create_corpus') }}">Create corpus<i class="material-icons right">add</i></a>
         </div>
       </div>
@@ -43,7 +43,7 @@
           <div class="job-list" data-user-id="{{ current_user.hashid }}"></div>
         </div>
         <div class="card-action right-align">
-          <p><a class="btn modal-trigger waves-effect waves-light" data-target="create-job-modal"><i class="material-icons left">add</i>Create job</a></p>
+          <p><a class="btn modal-trigger waves-effect waves-light" data-target="create-job-modal">Create job<i class="material-icons right">add</i></a></p>
         </div>
       </div>
     </div>
@@ -72,6 +72,7 @@
       </div>
     </div>
 
+    {% if config.NOPAQUE_TRANSKRIBUS_ENABLED %}
     <div class="col s4">
       <div class="card extension-selector hoverable service-color" data-service="transkribus-htr-pipeline">
       <a href="{{ url_for('contributions.transkribus_htr_pipeline_models') }}" style="position: absolute; width: 100%; height: 100%;"></a>
@@ -81,6 +82,7 @@
         </div>
       </div>
     </div>
+    {% endif %}
   </div>
 </div>
 {% endblock page_content %}