From 62263a1f88656e419b1f1d0b09c465ad9df7fc76 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 20 Feb 2020 15:59:08 +0100
Subject: [PATCH] Update buttons
---
app/templates/admin/user.html.j2 | 8 +++----
app/templates/corpora/analyse_corpus.html.j2 | 6 ++---
app/templates/corpora/corpus.html.j2 | 22 ++++++++---------
.../corpora/edit_corpus_file.html.j2 | 2 +-
app/templates/jobs/job.html.j2 | 6 ++---
app/templates/main/dashboard.html.j2 | 2 +-
app/templates/main/index.html.j2 | 24 +++++++++++++------
app/templates/main/poster.html.j2 | 1 +
app/templates/services/nlp.html.j2 | 2 +-
app/templates/services/ocr.html.j2 | 2 +-
app/templates/services/setup_files.html.j2 | 2 +-
11 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2
index 9d2f7b05..76b3e509 100644
--- a/app/templates/admin/user.html.j2
+++ b/app/templates/admin/user.html.j2
@@ -23,8 +23,8 @@
</ul>
</div>
<div class="card-action right-align">
- <a href="{{ url_for('admin.edit_user', user_id=user.id) }}" class="waves-effect waves-light btn"><i class="material-icons left">edit</i>Edit user</a>
- <a data-target="delete-user-modal" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete user</a>
+ <a href="{{ url_for('admin.edit_user', user_id=user.id) }}" class="waves-effect waves-light btn"><i class="material-icons left">edit</i>Edit</a>
+ <a data-target="delete-user-modal" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>
</div>
@@ -93,8 +93,8 @@
<p>Do you really want to delete the user {{ user.username }}? All associated data will be permanently deleted!</p>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
- <a href="{{ url_for('admin.delete_user', user_id=user.id) }}" class="modal-close waves-effect waves-green btn red">Confirm<i class="material-icons right">send</i></a>
+ <a href="#!" class="modal-close waves-effect waves-light btn">Cancel</a>
+ <a href="{{ url_for('admin.delete_user', user_id=user.id) }}" class="modal-close waves-effect waves-light btn red"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>
diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2
index 964b847b..71bdf95d 100644
--- a/app/templates/corpora/analyse_corpus.html.j2
+++ b/app/templates/corpora/analyse_corpus.html.j2
@@ -131,7 +131,7 @@
</table>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green red btn">Close</a>
+ <a href="#!" class="modal-close waves-effect waves-light red btn">Close</a>
</div>
</div>
@@ -203,8 +203,8 @@
</div>
</div>
<div class="modal-footer">
- <a href="#!" class="left waves-effect waves-green btn">Export</a>
- <a href="#!" class="modal-close waves-effect waves-green red btn">Close</a>
+ <a href="#!" class="left waves-effect waves-light btn">Export</a>
+ <a href="#!" class="modal-close waves-effect waves-light red btn">Close</a>
</div>
</div>
diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2
index 67a3ec29..efd6e380 100644
--- a/app/templates/corpora/corpus.html.j2
+++ b/app/templates/corpora/corpus.html.j2
@@ -34,11 +34,11 @@
</div>
</div>
<div class="card-action right-align">
- <a href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}" class="waves-effect waves-light btn hide" id="analyse"><i class="material-icons left">help</i>Analyse</a>
+ <a href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}" class="btn hide waves-effect waves-light" id="analyse"><i class="material-icons left">help</i>Analyse</a>
{% if corpus.files[0] is defined %}
- <a href="{{ url_for('corpora.prepare_corpus', corpus_id=corpus.id) }}" class="waves-effect waves-light btn" id="prepare"><i class="material-icons left">whatshot</i>Prepare</a>
+ <a href="{{ url_for('corpora.prepare_corpus', corpus_id=corpus.id) }}" class="btn waves-effect waves-light" id="prepare"><i class="material-icons left">whatshot</i>Prepare</a>
{% endif %}
- <a data-target="delete-corpus-modal" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete Corpus</a>
+ <a data-target="delete-corpus-modal" class="btn modal-trigger red waves-effect waves-light"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>
</div>
@@ -67,9 +67,9 @@
<td>{{ file.title }}</td>
<td>{{ file.publishing_year }}</td>
<td class="right-align">
- <a class="waves-effect waves-light btn-small" href="{{ url_for('corpora.edit_corpus_file', corpus_file_id=file.id, corpus_id=corpus.id) }}"><i class="material-icons">edit</i></a>
- <a class="waves-effect waves-light btn-small" href="{{ url_for('corpora.download_corpus_file', corpus_file_id=file.id, corpus_id=corpus.id) }}"><i class="material-icons">file_download</i></a>
- <a data-target="delete-corpus-file-{{ file.id }}-modal" class="waves-effect waves-light btn-small red modal-trigger"><i class="material-icons">delete</i></a>
+ <a class="btn-small waves-effect waves-light" href="{{ url_for('corpora.edit_corpus_file', corpus_file_id=file.id, corpus_id=corpus.id) }}"><i class="material-icons">edit</i></a>
+ <a class="btn-small waves-effect waves-light" href="{{ url_for('corpora.download_corpus_file', corpus_file_id=file.id, corpus_id=corpus.id) }}"><i class="material-icons">file_download</i></a>
+ <a data-target="delete-corpus-file-{{ file.id }}-modal" class="btn-small modal-trigger red waves-effect waves-light"><i class="material-icons">delete</i></a>
</td>
</tr>
{% endfor %}
@@ -77,7 +77,7 @@
</table>
</div>
<div class="card-action right-align">
- <a href="{{ url_for('corpora.add_corpus_file', corpus_id=corpus.id) }}" class="waves-effect waves-light btn"><i class="material-icons left">add</i>Add corpus file</a>
+ <a href="{{ url_for('corpora.add_corpus_file', corpus_id=corpus.id) }}" class="btn waves-effect waves-light"><i class="material-icons left">add</i>Add corpus file</a>
</div>
</div>
</div>
@@ -90,8 +90,8 @@
<p>Do you really want to delete the corpus {{corpus.title}}? All files will be permanently deleted!</p>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
- <a href="{{ url_for('corpora.delete_corpus', corpus_id=corpus.id) }}" class="modal-close waves-effect waves-green btn red">Confirm<i class="material-icons right">send</i></a>
+ <a href="#!" class="btn modal-close waves-effect waves-light">Cancel</a>
+ <a href="{{ url_for('corpora.delete_corpus', corpus_id=corpus.id) }}" class="btn modal-close red waves-effect waves-light"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>
@@ -102,8 +102,8 @@
<p>Do you really want to delete the corpus file {{ file.filename }}? The file will be permanently deleted!</p>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
- <a class="modal-close waves-effect waves-green btn red" href="{{ url_for('corpora.delete_corpus_file', corpus_file_id=file.id, corpus_id=corpus.id) }}">Confirm<i class="material-icons right">send</i></a>
+ <a href="#!" class="btn modal-close waves-effect waves-light">Cancel</a>
+ <a class="btn modal-close red waves-effect waves-light" href="{{ url_for('corpora.delete_corpus_file', corpus_file_id=file.id, corpus_id=corpus.id) }}"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>
{% endfor %}
diff --git a/app/templates/corpora/edit_corpus_file.html.j2 b/app/templates/corpora/edit_corpus_file.html.j2
index 071c91d1..249effed 100644
--- a/app/templates/corpora/edit_corpus_file.html.j2
+++ b/app/templates/corpora/edit_corpus_file.html.j2
@@ -4,7 +4,7 @@
<div class="col s12 m4">
<h3 id="title">...</h3>
<p id="description">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</p>
- <a class="waves-effect waves-light btn" href="{{ url_for('corpora.corpus', corpus_id=corpus_file.corpus.id) }}"><i class="material-icons left">arrow_back</i>Back to corpus</a>
+ <a class="btn waves-effect waves-light" href="{{ url_for('corpora.corpus', corpus_id=corpus_file.corpus.id) }}"><i class="material-icons left">arrow_back</i>Back to corpus</a>
</div>
<div class="col s12 m8">
diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2
index 2d1d97a7..a5fe6924 100644
--- a/app/templates/jobs/job.html.j2
+++ b/app/templates/jobs/job.html.j2
@@ -119,7 +119,7 @@
</div>
<div class="col s12 right-align">
<a href="#" class="waves-effect waves-light btn"><i class="material-icons left">settings</i>Export Parameters</a>
- <a data-target="delete-job-modal" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete Job</a>
+ <a data-target="delete-job-modal" class="waves-effect waves-light btn red modal-trigger"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>
</div>
@@ -135,8 +135,8 @@
<p>Do you really want to delete the job {{job.title}}? All associated files will be permanently deleted.</p>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green btn cancel">Cancel</a>
- <a class="modal-close waves-effect waves-green btn red" href="{{ url_for('jobs.delete_job', job_id=job.id) }}">Delete<i class="material-icons right">send</i></a>
+ <a href="#!" class="btn modal-close waves-effect waves-light">Cancel</a>
+ <a class="btn modal-close red waves-effect waves-light" href="{{ url_for('jobs.delete_job', job_id=job.id) }}"><i class="material-icons left">delete</i>Delete</a>
</div>
</div>
diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2
index 50dfdf04..330d2682 100644
--- a/app/templates/main/dashboard.html.j2
+++ b/app/templates/main/dashboard.html.j2
@@ -81,7 +81,7 @@
</ul>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green btn-flat">Close</a>
+ <a href="#!" class="modal-close waves-effect waves-light btn-flat">Close</a>
</div>
</div>
diff --git a/app/templates/main/index.html.j2 b/app/templates/main/index.html.j2
index 90998a15..8e53aa6d 100644
--- a/app/templates/main/index.html.j2
+++ b/app/templates/main/index.html.j2
@@ -3,6 +3,15 @@
{% set parallax = True %}
{% block page_content %}
+<div class="section">
+ <div class="row container">
+ <div class="col s12">
+ <h2>nopaque</h2>
+ <p>Catch phrase - From image collection to corpus analysis</p>
+ </div>
+ </div>
+</div>
+
<div class="parallax-container">
<div class="parallax">
<img src="{{ url_for('static', filename='images/bible_text.jpg') }}" alt="">
@@ -14,9 +23,10 @@
<div class="col s12 m10">
<div class="row">
<div class="col s12 m4">
- <h2>nopaque</h2>
+ <h3>Information</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, no sea takimata sanctus est Lorem ipsum dolor sit amet. 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.</p>
</div>
+
<div class="col s12 m8">
<br class="hide-on-small-only">
<div class="row">
@@ -50,7 +60,7 @@
{% if current_user.is_anonymous %}
<li><a href="#registration-and-log-in">Registration and log in</a></li>
{% endif %}
- <li><a href="#services">Services and Processes</a></li>
+ <li><a href="#services">Processes and Services</a></li>
<li><a href="#workflow">Workflow</a></li>
</ul>
</div>
@@ -69,9 +79,9 @@
<div class="col s12 m10">
<div class="row">
<div class="col s12 m4">
- <h3>No account?</h3>
+ <h3>Registration and log in</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, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
- <a class="btn" href="{{ url_for('auth.register') }}"><i class="material-icons left">person_add</i>Register</a>
+ <a class="btn waves-effect waves-light" href="{{ url_for('auth.register') }}"><i class="material-icons left">person_add</i>Register</a>
</div>
<div class="col s12 m8">
@@ -126,7 +136,7 @@
{% if current_user.is_anonymous %}
<li><a href="#registration-and-log-in">Registration and log in</a></li>
{% endif %}
- <li><a href="#services">Services and Processes</a></li>
+ <li><a href="#services">Processes and Services</a></li>
<li><a href="#workflow">Workflow</a></li>
</ul>
</div>
@@ -182,7 +192,7 @@
{% if current_user.is_anonymous %}
<li><a href="#registration-and-log-in">Registration and log in</a></li>
{% endif %}
- <li><a href="#services">Services and Processes</a></li>
+ <li><a href="#services">Processes and Services</a></li>
<li><a href="#workflow">Workflow</a></li>
</ul>
</div>
@@ -212,7 +222,7 @@
{% if current_user.is_anonymous %}
<li><a href="#registration-and-log-in">Registration and log in</a></li>
{% endif %}
- <li><a href="#services">Services and Processes</a></li>
+ <li><a href="#services">Processes and Services</a></li>
<li><a href="#workflow">Workflow</a></li>
</ul>
</div>
diff --git a/app/templates/main/poster.html.j2 b/app/templates/main/poster.html.j2
index 140bebd6..c871558c 100644
--- a/app/templates/main/poster.html.j2
+++ b/app/templates/main/poster.html.j2
@@ -231,5 +231,6 @@
);
tooltip.open();
});
+ //DarkReader.enable({"brightness": 100, "contrast": 100, "sepia": 0});
</script>
{% endblock %}
diff --git a/app/templates/services/nlp.html.j2 b/app/templates/services/nlp.html.j2
index a2703baf..7c05abeb 100644
--- a/app/templates/services/nlp.html.j2
+++ b/app/templates/services/nlp.html.j2
@@ -129,7 +129,7 @@
</div>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green btn red abort-request">Cancel</a>
+ <a href="#!" class="modal-close waves-effect waves-light btn red abort-request">Cancel</a>
</div>
</div>
{% endblock %}
diff --git a/app/templates/services/ocr.html.j2 b/app/templates/services/ocr.html.j2
index 0e3de607..de2a514b 100644
--- a/app/templates/services/ocr.html.j2
+++ b/app/templates/services/ocr.html.j2
@@ -204,7 +204,7 @@
</div>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green btn red abort-request">Cancel</a>
+ <a href="#!" class="modal-close waves-effect waves-light btn red abort-request">Cancel</a>
</div>
</div>
{% endblock %}
diff --git a/app/templates/services/setup_files.html.j2 b/app/templates/services/setup_files.html.j2
index 57c677e4..f9b74939 100644
--- a/app/templates/services/setup_files.html.j2
+++ b/app/templates/services/setup_files.html.j2
@@ -95,7 +95,7 @@
</div>
</div>
<div class="modal-footer">
- <a href="#!" class="modal-close waves-effect waves-green btn red abort-request">Cancel</a>
+ <a href="#!" class="modal-close waves-effect waves-light btn red abort-request">Cancel</a>
</div>
</div>
{% endblock %}
--
GitLab