Skip to content

Commit

Permalink
Preparing new 9.1.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
cedricbonhomme committed Mar 12, 2020
1 parent 5bd6dd9 commit 9dd9391
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 70 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Newspipe Changelog
==================

## 9.1.0 (2020-03-12)

Improvements:
* the Web graphical interface is now using Bootstrap 4;
* a lot of responsiveness work has been done;
* the back-end code has been refactored and cleaned;
* the configuration and deployment of Newspipe is now a lot easier.


## 9.0 (2020-02-27)

New:
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ $ vim instance/postgresql.py # customize it
$ export Newspipe_CONFIG=postgresql.py
```

For production you can use [Gunicorn](https://gunicorn.org) or ``mod_wsgi``.


## License

[Newspipe](https://git.sr.ht/~cedric/newspipe) is under the
Expand Down
93 changes: 48 additions & 45 deletions newspipe/templates/edit_bookmark.html
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
4 changes: 2 additions & 2 deletions newspipe/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion newspipe/templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -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() }}
Expand Down
4 changes: 2 additions & 2 deletions newspipe/templates/management.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h5>{{ _('Export') }}</h5>
<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>
Expand Down Expand Up @@ -85,7 +85,7 @@ <h5>{{ _('Export') }}</h5>
</form>
</div>
</div>

<hr />
<div class="row">
<div class="col-md-12">
<br />
Expand Down
22 changes: 11 additions & 11 deletions newspipe/templates/user_stream.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -62,7 +62,7 @@
</div>

<div class="row">
<div class="col-md-8 offset-md-1">
<div class="col">
{{ pagination.links }}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "newspipe",
"version": "9.0.0",
"version": "9.1.0",
"license": "AGPL-3.0",
"private": true,
"dependencies": {
Expand Down
9 changes: 2 additions & 7 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "newspipe"
version = "9.0.0"
version = "9.1.0"
description = "Newspipe is a web news aggregator."
authors = ["Cédric Bonhomme <[email protected]>"]
license = "AGPL-3.0-or-later"
Expand Down

0 comments on commit 9dd9391

Please sign in to comment.