aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2020-06-30 14:00:30 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2020-06-30 14:00:30 +0200
commit4901f10048196289cb76822e89330ad3ce82ee27 (patch)
treeed1f1e928b5a1ef87a2b49d5a1aa712e6416d69e
parentchg: [template] Minor improvements and fixed to the edit_feed.html template. (diff)
downloadnewspipe-4901f10048196289cb76822e89330ad3ce82ee27.tar.gz
newspipe-4901f10048196289cb76822e89330ad3ce82ee27.tar.bz2
newspipe-4901f10048196289cb76822e89330ad3ce82ee27.zip
minor fixes for the templates.
-rw-r--r--newspipe/templates/admin/create_user.html5
-rw-r--r--newspipe/templates/admin/dashboard.html29
-rw-r--r--newspipe/templates/edit_category.html7
-rw-r--r--newspipe/templates/feed_list.html13
-rw-r--r--newspipe/templates/feed_list_per_categories.html13
5 files changed, 4 insertions, 63 deletions
diff --git a/newspipe/templates/admin/create_user.html b/newspipe/templates/admin/create_user.html
index 04d9d631..2cfe4518 100644
--- a/newspipe/templates/admin/create_user.html
+++ b/newspipe/templates/admin/create_user.html
@@ -1,7 +1,4 @@
{% extends "layout.html" %}
-{% block head%}
-{{super()}}
-{% endblock %}
{% block content %}
<div class="container">
<h2>{{ message | safe }}</h2>
@@ -15,7 +12,7 @@
{{ form.password(class_="form-control") }} {% for error in form.password.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
{{ form.automatic_crawling.label }}
- {{ form.automatic_crawling(class_="form-control") }} {% for error in form.automatic_crawling.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
+ {{ form.automatic_crawling(class_="form-check-input") }} {% for error in form.automatic_crawling.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
<br />
{{ form.submit(class_="btn btn-primary") }}
diff --git a/newspipe/templates/admin/dashboard.html b/newspipe/templates/admin/dashboard.html
index 8bcc2db0..db56be25 100644
--- a/newspipe/templates/admin/dashboard.html
+++ b/newspipe/templates/admin/dashboard.html
@@ -1,7 +1,4 @@
{% extends "layout.html" %}
-{% block head%}
-{{super()}}
-{% endblock %}
{% block content %}
<div class="container">
<h1>{{ _('Registered users') }}</h1>
@@ -17,7 +14,7 @@
</thead>
<tbody>
{% for user in users %}
- <tr {% if not user.is_active %}class="warning"{% endif %}>
+ <tr {% if not user.is_active %}class="table-warning"{% endif %} {% if user.is_public_profile %}class="table-info"{% endif %}>
<td>{{ loop.index }}</td>
<td>
{% if user.is_public_profile %}
@@ -33,12 +30,7 @@
<a href="{{ url_for("admin.user_form", user_id=user.id) }}"><i class="fa fa-pencil-square-o" aria-hidden="true" title="{{ _('Edit this user') }}"></i></a>
{% if user.id != current_user.id %}
<a href="{{ url_for("admin.toggle_user", user_id=user.id) }}">
- {% if user.is_active %}
- <i class="fa fa-ban" title="{{ _("Disable this account") }}"></i>
- {% else %}
- <i class="fa fa-check-circle-o" aria-hidden="true" title="{{ _("Enable this account") }}"></i>
- {% endif %}
- </a>
+ {% if user.is_active %}<i class="fa fa-ban" title="{{ _("Disable this account") }}"></i>{% else %}<i class="fa fa-check-circle-o" aria-hidden="true" title="{{ _("Enable this account") }}"></i>{% endif %}</a>
<a href="{{ url_for("admin.delete_user", user_id=user.id) }}"><i class="fa fa-times" aria-hidden="true" title="{{ _('Delete this user') }}" onclick="return confirm('{{ _('You are going to delete this account.') }}');"></i></a>
{% endif %}
</td>
@@ -48,21 +40,4 @@
</table>
<a href="{{ url_for("admin.user_form") }}" class="btn btn-primary">{{ _('Add a new user') }}</a>
</div>
-<script>
-$(document).ready(function() {
- $('#table-users').DataTable( {
- responsive: true,
- columnDefs: [
- {
- targets: [0, 4],
- "searchable": false
- },
- {
- targets: [3],
- "orderSequence": ["desc"]
- }
- ]
- });
-});
-</script>
{% endblock %}
diff --git a/newspipe/templates/edit_category.html b/newspipe/templates/edit_category.html
index 3971fdf5..befbd3b9 100644
--- a/newspipe/templates/edit_category.html
+++ b/newspipe/templates/edit_category.html
@@ -15,7 +15,7 @@
<div class="form-group">
<label for="{{ form.name.id }}" class="col-sm-3 control-label">{{ form.feeds.label }}</label>
<div class="col-sm-9">
- {{ form.feeds(class_="selectpicker", **{'data-live-search':'true', 'data-width':'auto'}) }}
+ {{ form.feeds(class_="", **{'data-live-search':'true', 'data-width':'auto'}) }}
</div>
{% for error in form.feeds.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
</div>
@@ -27,9 +27,4 @@
</form>
</div>
</div><!-- /.container -->
-<script>
-$(document).ready(function() {
- $('.selectpicker').selectpicker();
-});
-</script>
{% endblock %}
diff --git a/newspipe/templates/feed_list.html b/newspipe/templates/feed_list.html
index 2ce7841f..56cec7c2 100644
--- a/newspipe/templates/feed_list.html
+++ b/newspipe/templates/feed_list.html
@@ -39,17 +39,4 @@
</tbody>
</table>
</div>
-<script>
-$(document).ready(function() {
- $('#table-feeds').DataTable( {
- responsive: true,
- columnDefs: [
- {
- bSortable: false,
- targets: [0, 1, 4, 5]
- }
- ]
- });
-});
-</script>
{% endif %}
diff --git a/newspipe/templates/feed_list_per_categories.html b/newspipe/templates/feed_list_per_categories.html
index 34d10ddd..7d9ee231 100644
--- a/newspipe/templates/feed_list_per_categories.html
+++ b/newspipe/templates/feed_list_per_categories.html
@@ -37,16 +37,3 @@
</tbody>
</table>
</div>
-<script>
-$(document).ready(function() {
- $('#table-feeds').DataTable( {
- responsive: true,
- columnDefs: [
- {
- bSortable: false,
- targets: [0]
- }
- ]
- });
-});
-</script>
bgstack15