From 501871f9a782f53affac2ff80c4ef5e833e81253 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Sun, 22 Nov 2020 16:03:41 +0100
Subject: [PATCH] Remove double paginations
---
web/app/templates/admin/user.html.j2 | 6 ++----
web/app/templates/corpora/corpus.html.j2 | 6 +++---
web/app/templates/jobs/job.html.j2 | 3 +--
web/app/templates/main/dashboard.html.j2 | 9 +++------
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/web/app/templates/admin/user.html.j2 b/web/app/templates/admin/user.html.j2
index 570b6dd3..97e3137a 100644
--- a/web/app/templates/admin/user.html.j2
+++ b/web/app/templates/admin/user.html.j2
@@ -45,7 +45,6 @@
<input id="search-corpus" class="search" type="search"></input>
<label for="search-corpus">Search corpus</label>
</div>
- <ul class="pagination paginationTop"></ul>
<table class="highlight">
<thead>
<tr>
@@ -60,7 +59,7 @@
</thead>
<tbody class="list"></tbody>
</table>
- <ul class="pagination paginationBottom"></ul>
+ <ul class="pagination"></ul>
</div>
</div>
</div>
@@ -74,7 +73,6 @@
<input id="search-job" class="search" type="search"></input>
<label for="search-job">Search job</label>
</div>
- <ul class="pagination paginationTop"></ul>
<table class="highlight">
<thead>
<tr>
@@ -89,7 +87,7 @@
</thead>
<tbody class="list"></tbody>
</table>
- <ul class="pagination paginationBottom"></ul>
+ <ul class="pagination"></ul>
</div>
</div>
</div>
diff --git a/web/app/templates/corpora/corpus.html.j2 b/web/app/templates/corpora/corpus.html.j2
index c60b9e01..f89b1a22 100644
--- a/web/app/templates/corpora/corpus.html.j2
+++ b/web/app/templates/corpora/corpus.html.j2
@@ -82,13 +82,13 @@
<input id="search-results" class="search" type="search"></input>
<label for="search-results">Search results</label>
</div>
- <ul class="pagination paginationTop"></ul>
<table class="highlight responsive-table">
<thead>
<tr>
<th class="sort" data-sort="filename">Filename</th>
<th class="sort" data-sort="author">Author</th>
<th class="sort" data-sort="title">Title</th>
+ <th class="sort" data-sort="publishing-year">Publishing year</th>
<th>{# Actions #}</th>
</tr>
</thead>
@@ -102,7 +102,7 @@
</tr>
{% endif %}
</table>
- <ul class="pagination paginationBottom"></ul>
+ <ul class="pagination"></ul>
</div>
<div class="card-action right-align">
<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>
@@ -116,7 +116,7 @@
<div id="delete-corpus-modal" class="modal">
<div class="modal-content">
<h4>Confirm corpus deletion</h4>
- <p>Do you really want to delete the corpus {{corpus.title}}? All files will be permanently deleted!</p>
+ <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="btn modal-close waves-effect waves-light">Cancel</a>
diff --git a/web/app/templates/jobs/job.html.j2 b/web/app/templates/jobs/job.html.j2
index 91e79a01..ed10d51d 100644
--- a/web/app/templates/jobs/job.html.j2
+++ b/web/app/templates/jobs/job.html.j2
@@ -114,7 +114,6 @@
<p>Original input files.</p>
</div>
<div class="col s12 m10">
- <ul class="pagination paginationTop"></ul>
<table class="highlight responsive-table">
<thead>
<tr>
@@ -125,7 +124,7 @@
<tbody class="list">
</tbody>
</table>
- <ul class="pagination paginationBottom"></ul>
+ <ul class="pagination"></ul>
</div>
</div>
</div>
diff --git a/web/app/templates/main/dashboard.html.j2 b/web/app/templates/main/dashboard.html.j2
index 4336178a..56602f8c 100644
--- a/web/app/templates/main/dashboard.html.j2
+++ b/web/app/templates/main/dashboard.html.j2
@@ -29,7 +29,6 @@
<input id="search-corpus" class="search" type="search"></input>
<label for="search-corpus">Search corpus</label>
</div>
- <ul class="pagination paginationTop"></ul>
<table class="highlight">
<thead>
<tr>
@@ -44,7 +43,7 @@
</thead>
<tbody class="list"></tbody>
</table>
- <ul class="pagination paginationBottom"></ul>
+ <ul class="pagination"></ul>
</div>
<div class="card-action right-align">
<a class="waves-effect waves-light btn" href="{{ url_for('corpora.import_corpus') }}"><i class="material-icons right">import_export</i>Import Corpus</a>
@@ -60,7 +59,6 @@
<input id="search-query-results" class="search" type="search"></input>
<label for="search-query-results">Search query result</label>
</div>
- <ul class="pagination paginationTop"></ul>
<table class="highlight responsive-table">
<thead>
<tr>
@@ -84,7 +82,7 @@
</tr>
</tbody>
</table>
- <ul class="pagination paginationBottom"></ul>
+ <ul class="pagination"></ul>
</div>
<div class="card-action right-align">
<a class="waves-effect waves-light btn" href="{{ url_for('corpora.add_query_result') }}">Add query result<i class="material-icons right">file_upload</i></a>
@@ -104,7 +102,6 @@
<input id="search-job" class="search" type="search"></input>
<label for="search-job">Search job</label>
</div>
- <ul class="pagination paginationTop"></ul>
<table class="highlight">
<thead>
<tr>
@@ -119,7 +116,7 @@
</thead>
<tbody class="list"></tbody>
</table>
- <ul class="pagination paginationBottom"></ul>
+ <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>
--
GitLab