diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/web/templates/article.html | 10 | ||||
| -rw-r--r-- | src/web/views/article.py | 11 |
3 files changed, 2 insertions, 21 deletions
diff --git a/package.json b/package.json index aa7e97ce..e8921eb2 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "type": "git", "url": "https://github.com/JARR-aggregator/JARR" }, - "license": "GNU Affero General Public License version 3", + "license": "AGPL-3.0", "engines": { "npm": "^3.3.12" }, diff --git a/src/web/templates/article.html b/src/web/templates/article.html index 6ab9d0bb..a95d86d9 100644 --- a/src/web/templates/article.html +++ b/src/web/templates/article.html @@ -21,16 +21,6 @@ {{ article.content | safe }} </div> <div class="well"> - <div class="row"> - <div class="col-md-6"> - {{ _('Next post:') }} <a href="/article/{{ next_article.id }}">{{ next_article.title }}</a> - </div> - <div class="col-md-6 text-right"> - {{ _('Previous post:') }} <a href="/article/{{ previous_article.id }}">{{ previous_article.title }}</a> - </div> - </div> - </div> - <div class="well"> <a href="https://api.pinboard.in/v1/posts/add?url={{ article.link }}&description={{ article.title }}" rel="noreferrer" target="_blank"> <img src="{{ url_for('static', filename='img/pinboard.png') }}" title="{{ _('Share on') }} Pinboard" /> </a> diff --git a/src/web/views/article.py b/src/web/views/article.py index 407345c3..fea4aa06 100644 --- a/src/web/views/article.py +++ b/src/web/views/article.py @@ -35,18 +35,9 @@ def article(article_id=None): Presents the content of an article. """ article = ArticleController(current_user.id).get(id=article_id) - previous_article = article.previous_article() - if previous_article is None: - previous_article = article.source.articles[0] - next_article = article.next_article() - if next_article is None: - next_article = article.source.articles[-1] - return render_template('article.html', head_titles=[clear_string(article.title)], - article=article, - previous_article=previous_article, - next_article=next_article) + article=article) @article_bp.route('/like/<int:article_id>', methods=['GET']) |