aboutsummaryrefslogtreecommitdiff
path: root/newspipe
diff options
context:
space:
mode:
Diffstat (limited to 'newspipe')
-rw-r--r--newspipe/templates/edit_bookmark.html93
-rw-r--r--newspipe/templates/layout.html4
-rw-r--r--newspipe/templates/login.html2
-rw-r--r--newspipe/templates/management.html4
-rw-r--r--newspipe/templates/user_stream.html22
5 files changed, 64 insertions, 61 deletions
diff --git a/newspipe/templates/edit_bookmark.html b/newspipe/templates/edit_bookmark.html
index ee0e0243..bc28b171 100644
--- a/newspipe/templates/edit_bookmark.html
+++ b/newspipe/templates/edit_bookmark.html
@@ -1,67 +1,70 @@
{% extends "layout.html" %}
{% block content %}
<div class="container">
- <div class="well">
- <h3>{{ action }}</h3>
- <form action="" method="post" name="save" class="form-horizontal">
- {{ form.hidden_tag() }}
- <div class="form-group">
- <label for="{{ form.href.id }}" class="col-sm-3 control-label">{{ form.href.label }}</label>
- <div class="col-sm-9">
- {{ form.href(class_="form-control", size="100%") }}
+ <div class="row">
+ <div class="col">
+ <h3>{{ action }}</h3>
+ <form action="" method="post" name="save" class="form-horizontal">
+ {{ form.hidden_tag() }}
+ <div class="form-group">
+ <label for="{{ form.href.id }}" class="col-sm-3 control-label">{{ form.href.label }}</label>
+ <div class="col-sm-9">
+ {{ form.href(class_="form-control", size="100%") }}
+ </div>
+ {% for error in form.href.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
</div>
- {% for error in form.href.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
- </div>
- <div class="form-group">
- <label for="{{ form.title.id }}" class="col-sm-3 control-label">{{ form.title.label }}</label>
- <div class="col-sm-9">
- {{ form.title(class_="form-control", size="100%") }}
+ <div class="form-group">
+ <label for="{{ form.title.id }}" class="col-sm-3 control-label">{{ form.title.label }}</label>
+ <div class="col-sm-9">
+ {{ form.title(class_="form-control", size="100%") }}
+ </div>
+ {% for error in form.title.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
</div>
- {% for error in form.title.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
- </div>
- <div class="form-group">
- <label for="{{ form.description.id }}" class="col-sm-3 control-label">{{ form.description.label }}</label>
- <div class="col-sm-9">
- {{ form.description(class_="form-control", size="100%") }}
+ <div class="form-group">
+ <label for="{{ form.description.id }}" class="col-sm-3 control-label">{{ form.description.label }}</label>
+ <div class="col-sm-9">
+ {{ form.description(class_="form-control", size="100%") }}
+ </div>
+ {% for error in form.description.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
</div>
- {% for error in form.description.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
- </div>
- <div class="form-group">
- <label for="{{ form.tags.id }}" class="col-sm-3 control-label">{{ form.tags.label }}</label>
- <div class="col-sm-9">
- {{ form.tags(class_="form-control", size="100%") }}
+ <div class="form-group">
+ <label for="{{ form.tags.id }}" class="col-sm-3 control-label">{{ form.tags.label }}</label>
+ <div class="col-sm-9">
+ {{ form.tags(class_="form-control", size="100%") }}
+ </div>
+ {% for error in form.tags.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
</div>
- {% for error in form.tags.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %}
- </div>
- <div class="form-group">
- <label for="{{ form.shared.id }}" class="col-sm-3 control-label">{{ form.shared.label }}</label>
- <div class="col-sm-9">
- <div class="checkbox">
- {{ form.shared(class_="checkbox", style="margin-left: 0px;") }}
+ <div class="form-group">
+ <label for="{{ form.shared.id }}" class="col-sm-3 control-label">{{ form.shared.label }}</label>
+ <div class="col-sm-9">
+ <div class="checkbox">
+ {{ form.shared(class_="checkbox", style="margin-left: 0px;") }}
+ </div>
</div>
</div>
- </div>
- <div class="form-group">
- <label for="{{ form.to_read.id }}" class="col-sm-3 control-label">{{ form.to_read.label }}</label>
- <div class="col-sm-9">
- <div class="checkbox">
- {{ form.to_read(class_="checkbox", style="margin-left: 0px;") }}
+ <div class="form-group">
+ <label for="{{ form.to_read.id }}" class="col-sm-3 control-label">{{ form.to_read.label }}</label>
+ <div class="col-sm-9">
+ <div class="checkbox">
+ {{ form.to_read(class_="checkbox", style="margin-left: 0px;") }}
+ </div>
</div>
</div>
- </div>
- <div class="form-group">
- <div class="col-sm-offset-3 col-sm-9">
- {{ form.submit(class_="btn btn-primary") }}
+ <div class="form-group">
+ <div class="col-sm-offset-3 col-sm-9">
+ {{ form.submit(class_="btn btn-primary") }}
+ </div>
</div>
- </div>
- </form>
+ </form>
+ </div>
</div>
+
{% if action == _('Add a new bookmark') %}
<div class="row">
<div class="col-md-6 pull-right">
diff --git a/newspipe/templates/layout.html b/newspipe/templates/layout.html
index 45ad7fdf..ad859070 100644
--- a/newspipe/templates/layout.html
+++ b/newspipe/templates/layout.html
@@ -40,7 +40,7 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownRSS" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-rss" aria-hidden="true"></i>&nbsp;{{ _('Feeds') }}</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownRSS">
- <a class="dropdown-item" href="{{ url_for('feeds.feeds') }}">{{ _('Subscribed') }}</a>
+ <a class="dropdown-item" href="{{ url_for('feeds.feeds') }}">{{ _('Feeds') }}</a>
<a class="dropdown-item" href="{{ url_for('feeds.inactives') }}">{{ _('Inactive') }}</a>
<a class="dropdown-item" href="{{ url_for('popular') }}">{{ _('Popular') }}</a>
<a class="dropdown-item" href="{{ url_for('articles.history') }}">{{ _('History') }}</a>
@@ -141,7 +141,7 @@
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<div class="row justify-content-center">
- <div class="col-6">
+ <div class="col-md-6">
{% for category, message in messages %}
<div class="alert alert-{{category}}">
<button type="button" class="close" data-dismiss="alert">&times;</button>
diff --git a/newspipe/templates/login.html b/newspipe/templates/login.html
index d0849c0b..cade2777 100644
--- a/newspipe/templates/login.html
+++ b/newspipe/templates/login.html
@@ -2,7 +2,7 @@
{% block content %}
<div class="container">
<div class="row justify-content-center">
- <div class="col-4">
+ <div class="col-md-6">
<h2>{{ _('Log In') }}</h2>
<form action="{{ url_for('login') }}" method=post>
{{ form.hidden_tag() }}
diff --git a/newspipe/templates/management.html b/newspipe/templates/management.html
index 22ebde8a..eb5dbeb9 100644
--- a/newspipe/templates/management.html
+++ b/newspipe/templates/management.html
@@ -48,7 +48,7 @@
<a href="{{ url_for('articles.export') }}" class="btn btn-primary">{{ _('Export') }}</a>
</div>
</div>
- <br />
+ <hr />
<div class="row">
<div class="col">
<h3 id="import">{{ _('Feeds') }}</h3>
@@ -85,7 +85,7 @@
</form>
</div>
</div>
-
+ <hr />
<div class="row">
<div class="col-md-12">
<br />
diff --git a/newspipe/templates/user_stream.html b/newspipe/templates/user_stream.html
index b05376a8..2cf0ab7a 100644
--- a/newspipe/templates/user_stream.html
+++ b/newspipe/templates/user_stream.html
@@ -2,17 +2,17 @@
{% block content %}
<div class="container">
<div class="row">
- <div class="col-md-8">
+ <div class="col">
<form class="form-inline">
<div class="form-group">
- <label>Filter per category</label>
+ <label>Filter per category</label>&nbsp;
<select class="form-control" id="category-select" name="category_id">
- <option value="0">All</option>
- {% for cur_category in user.categories %}
- <option value="{{cur_category.id}}" {% if cur_category.id==category.id %}selected{% endif %}>{{ cur_category.name }}</option>
- {% endfor %}
+ <option value="0">All</option>
+ {% for cur_category in user.categories %}
+ <option value="{{cur_category.id}}" {% if cur_category.id==category.id %}selected{% endif %}>{{ cur_category.name }}</option>
+ {% endfor %}
</select>
- <button type="submit" class="btn btn-primary mb-2">OK</button>
+ &nbsp;<button type="submit" class="btn btn-primary">OK</button>
</div>
</form>
</div>
@@ -22,20 +22,20 @@
{% if category %}
<div class="row">
- <div class="col-md-8 offset-md-1">
+ <div class="col">
<p class="lead">Articles from the category <a href="{{ url_for('user.profile_public', nickname=user.nickname, category_id=category.id) }}">{{ category.name }}</a></p>
</div>
</div>
{% endif %}
<div class="row">
- <div class="col-md-8 offset-md-1">
+ <div class="col">
{{ pagination.info }}
</div>
</div>
<div class="row">
- <div class="col-md-8 offset-md-1">
+ <div class="col">
{{ pagination.links }}
</div>
</div>
@@ -62,7 +62,7 @@
</div>
<div class="row">
- <div class="col-md-8 offset-md-1">
+ <div class="col">
{{ pagination.links }}
</div>
</div>
bgstack15