From c6f522a776227199d8d03878d7ac28087ae029ef Mon Sep 17 00:00:00 2001
From: stephan <sporada@uni-bielefeld.de>
Date: Mon, 2 Mar 2020 14:19:54 +0100
Subject: [PATCH] new layout
---
app/templates/services/corpus_analysis.html.j2 | 13 ++++++++-----
app/templates/services/nlp.html.j2 | 10 ++++++----
app/templates/services/ocr.html.j2 | 10 ++++++----
app/templates/services/setup_files.html.j2 | 6 ++++++
4 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/app/templates/services/corpus_analysis.html.j2 b/app/templates/services/corpus_analysis.html.j2
index d350dfd2..652078d3 100644
--- a/app/templates/services/corpus_analysis.html.j2
+++ b/app/templates/services/corpus_analysis.html.j2
@@ -3,8 +3,15 @@
{% set headline = '<i class="material-icons left service" data-service="corpus_analysis" style="font-size: inherit;"></i>Corpus analysis' %}
{% block page_content %}
-<div class="col s12 m9 l10">
+<div class="col s12 m9 l9">
<p>Nopaque lets you create and upload as many text corpora as you want. It makes use of CQP Query Language, which allows for complex search requests with the aid of metadata and NLP tags. The results can either be displayed as text or abstract visualizations.</p>
+</div>
+
+<div class="col m3 l3">
+ {% include 'services/roadmap.html.j2' %}
+</div>
+
+<div class="col s12">
<div class="card">
<div class="card-content" id="corpora">
<div class="input-field">
@@ -34,10 +41,6 @@
</div>
</div>
-<div class="col hide-on-small-only m3 l2">
- {% include 'services/roadmap.html.j2' %}
-</div>
-
<script>
var corpusList = new RessourceList("corpora", nopaque.corporaSubscribers,
"corpus", {page: 10});
diff --git a/app/templates/services/nlp.html.j2 b/app/templates/services/nlp.html.j2
index 330323e4..a7db5a83 100644
--- a/app/templates/services/nlp.html.j2
+++ b/app/templates/services/nlp.html.j2
@@ -34,7 +34,13 @@
</div>
</div>
</div>
+</div>
+
+<div class="col m3 l2">
+ {% include 'services/roadmap.html.j2' %}
+</div>
+<div class="col s12">
<h3>Submit a job</h3>
<div class="card">
<form class="nopaque-job-form" data-progress-modal="progress-modal">
@@ -127,10 +133,6 @@
</div>
</div>
-<div class="col hide-on-small-only m3 l2">
- {% include 'services/roadmap.html.j2' %}
-</div>
-
<div id="progress-modal" class="modal">
<div class="modal-content">
<h4><i class="material-icons prefix">file_upload</i> Uploading files for <span class="title"></span></h4>
diff --git a/app/templates/services/ocr.html.j2 b/app/templates/services/ocr.html.j2
index 685f236a..78e4d54e 100644
--- a/app/templates/services/ocr.html.j2
+++ b/app/templates/services/ocr.html.j2
@@ -16,7 +16,13 @@
</div>
</div>
</div>
+</div>
+
+<div class="col s12 m3 l2">
+ {% include 'services/roadmap.html.j2' %}
+</div>
+<div class="col s12">
<h3>Submit a job</h3>
<div class="card">
<form class="nopaque-job-form" data-progress-modal="progress-modal">
@@ -152,10 +158,6 @@
</div>
</div>
-<div class="col hide-on-small-only m3 l2">
- {% include 'services/roadmap.html.j2' %}
-</div>
-
<div id="progress-modal" class="modal">
<div class="modal-content">
<h4><i class="material-icons left">file_upload</i>Uploading files for <span class="title"></span></h4>
diff --git a/app/templates/services/setup_files.html.j2 b/app/templates/services/setup_files.html.j2
index cef684ed..cbe6e877 100644
--- a/app/templates/services/setup_files.html.j2
+++ b/app/templates/services/setup_files.html.j2
@@ -16,7 +16,13 @@
</div>
</div>
</div>
+</div>
+
+<div class="col m3 l2">
+ {% include 'services/roadmap.html.j2' %}
+</div>
+<div class="col s12">
<h3>Submit a job</h3>
<div class="card">
<form class="nopaque-job-form" data-progress-modal="progress-modal">
--
GitLab