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

app/main/views.py

@@ -38,4 +38,4 @@ def poster():
             return redirect(url_for('main.dashboard'))
         flash('Invalid email/username or password.')
     return render_template('main/poster.html.j2', login_form=login_form,
-                           title=' ')
+                           title='Poster')

app/templates/auth/login.html.j2

@@ -12,8 +12,7 @@
 <div class="col s12 m4">
   <div class="card medium">
     <div class="card-content">
-      <span class="card-title">Cyber cyber</span>
+      <p>Want to boost your research and get going? nopaque is free and no download is needed. Register now!</p>
-      <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
     </div>
     <div class="card-action right-align">
       <a class="btn" href="{{ url_for('auth.register') }}"><i class="material-icons left">person_add</i>Register</a>

app/templates/auth/register.html.j2

@@ -1,5 +1,7 @@
 {% extends "nopaque.html.j2" %}
 
+{% set headline = ' ' %}
+
 {% block page_content %}
 <style>
   main {
@@ -12,8 +14,9 @@
 <div class="col s12 m4">
   <div class="card medium">
     <div class="card-content">
-      <h3>DSGVO</h3>
+      <h2>Register</h2>
-      <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
+      <p>Simply enter a username and password to receive your registration email. After that you can start right away.</p>
+      <p>It goes without saying that the <a>General Data Protection Regulation</a> applies, only necessary data is stored.</p>
     </div>
   </div>
 </div>

app/templates/main/dashboard.html.j2

@@ -3,7 +3,7 @@
 {% block page_content %}
 <div class="col s12" id="corpora">
   <h3>My Corpora</h3>
-  <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,</p>
+  <p>This service enables you to group your files into corpora. You can create as many as you want and edit them at all times.</p>
   <div class="card">
     <div class="card-content">
       <div class="input-field">
@@ -35,7 +35,7 @@
 
 <div class="col s12" id="jobs">
   <h3>My Jobs</h3>
-  <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,</p>
+  <p>A job is the execution of a service provided by nopaque. You can create any number of jobs and let them be processed simultaneously.</p>
   <div class="card">
     <div class="card-content">
       <div class="input-field">
@@ -60,7 +60,7 @@
       <ul class="pagination"></ul>
     </div>
     <div class="card-action right-align">
-        <p><a class="modal-trigger waves-effect waves-light btn" href="#" data-target="new-job-modal"><i class="material-icons left">add</i>New job</a></p>
+      <p><a class="modal-trigger waves-effect waves-light btn" href="#" data-target="new-job-modal"><i class="material-icons left">add</i>New job</a></p>
     </div>
   </div>
 </div>
@@ -68,17 +68,35 @@
 <div id="new-job-modal" class="modal">
   <div class="modal-content">
     <h4>Select a service</h4>
-    <ul class="collection">
+    <div class="row">
-      <a href="{{ url_for('services.service', service='setup_files') }}" class="collection-item">
+      <div class="col s12 m4">
-        <i class="material-icons left">burst_mode</i>Setup files
+        <a href="{{ url_for('services.service', service='setup_files') }}" style="color: rgba(0,0,0,0.87);">
-      </a>
+          <div class="card-panel center-align hoverable">
-      <a href="{{ url_for('services.service', service='nlp') }}" class="collection-item">
+            <i class="large material-icons" style="color: #ee6e73;">burst_mode</i>
-        <i class="material-icons left">format_textdirection_l_to_r</i>Natural Language Processing
+            <p>File setup</p>
-      </a>
+            <p class="light">Digital copies of text based research data (books, letters, etc.) often comprise various files and formats. nopaque converts and merges those files to facilitate further processing and the application of other services.</p>
-      <a href="{{ url_for('services.service', service='ocr') }}" class="collection-item">
+          </div>
-        <i class="material-icons left">find_in_page</i>Optical Character Recognition
+        </a>
-      </a>
+      </div>
-    </ul>
+      <div class="col s12 m4">
+        <a href="{{ url_for('services.service', service='ocr') }}" style="color: rgba(0,0,0,0.87);">
+          <div class="card-panel center-align hoverable">
+            <i class="large material-icons" style="color: #ee6e73;">find_in_page</i>
+            <p>Optical Character Recognition</p>
+            <p class="light">nopaque converts your image data – like photos or scans – into text data through a process called OCR. This step enables you to proceed with further computational analysis of your documents.</p>
+          </div>
+        </a>
+      </div>
+      <div class="col s12 m4">
+        <a href="{{ url_for('services.service', service='nlp') }}" style="color: rgba(0,0,0,0.87);">
+          <div class="card-panel center-align hoverable">
+            <i class="large material-icons" style="color: #ee6e73;">format_textdirection_l_to_r</i>
+            <p>Natural Language Processing</p>
+            <p class="light">By means of computational linguistic data processing (tokenization, lemmatization, part-of-speech tagging and named-entity recognition) nopaque extracts additional information from your text.</p>
+          </div>
+        </a>
+      </div>
+    </div>
   </div>
   <div class="modal-footer">
     <a href="#!" class="modal-close waves-effect waves-light btn-flat">Close</a>