diff options
| -rw-r--r-- | newspipe/bootstrap.py | 16 | ||||
| -rw-r--r-- | newspipe/templates/article.html | 2 | ||||
| -rw-r--r-- | newspipe/templates/duplicates.html | 6 | ||||
| -rw-r--r-- | newspipe/templates/history.html | 2 | ||||
| -rw-r--r-- | newspipe/templates/home.html | 8 | ||||
| -rw-r--r-- | newspipe/templates/layout.html | 2 | ||||
| -rw-r--r-- | newspipe/templates/login.html | 2 | ||||
| -rw-r--r-- | newspipe/templates/management.html | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/newspipe/bootstrap.py b/newspipe/bootstrap.py index 915c29db..3ca573b1 100644 --- a/newspipe/bootstrap.py +++ b/newspipe/bootstrap.py @@ -117,13 +117,13 @@ application.jinja_env.globals["application"] = application @application.context_processor def utility_processor(): - def url_for(endpoint, **values): - """ Custom reverse-proxy support for url_for """ - _uf = f_url_for(endpoint, **values) - #if prefix: - # _uf = str(prefix) + _uf - print(f"DEBUG: generating url_for {endpoint}, of {_uf}") - return _uf + #def url_for(endpoint, **values): + # """ Custom reverse-proxy support for url_for """ + # _uf = f_url_for(endpoint, **values) + # #if prefix: + # # _uf = str(prefix) + _uf + # print(f"DEBUG: generating url_for {endpoint}, of {_uf}") + # return _uf def prefix(): return _prefix.rstrip("/") - return dict(url_for=url_for,prefix=prefix) + return dict(prefix=prefix) diff --git a/newspipe/templates/article.html b/newspipe/templates/article.html index ef70d2df..256b7166 100644 --- a/newspipe/templates/article.html +++ b/newspipe/templates/article.html @@ -4,7 +4,7 @@ <div class="row" data-article="{{ article.id }}" id="filters" data-filter="{{ filter_ }}"> <div class="col"> <h2><a href="{{ article.link }}" target="_blank">{{ article.title|safe }}</a></h2> - <h3>{{ _('from') }} <a href="{{ prefix }}/feed/{{ article.source.id }}">{{ article.source.title }}</a></h3> + <h3>{{ _('from') }} <a href="{{ prefix() }}/feed/{{ article.source.id }}">{{ article.source.title }}</a></h3> <a href="{{ url_for("article.delete", article_id=article.id) }}"><i class="fa fa-times delete" aria-hidden="true" title="{{ _('Delete this article') }}"></i></a> {% if article.like %} <a href="#"><i class="fa fa-star like" aria-hidden="true" title="{{ _('One of your favorites') }}"></i></a> diff --git a/newspipe/templates/duplicates.html b/newspipe/templates/duplicates.html index 02fe83c0..d1382268 100644 --- a/newspipe/templates/duplicates.html +++ b/newspipe/templates/duplicates.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %} <div class="container"> - <p><h1>{{ _('Duplicates in the feed') }} <a href="{{ prefix }}/feed/{{ feed.id }}">{{ feed.title }}</a>.</h1><p> + <p><h1>{{ _('Duplicates in the feed') }} <a href="{{ prefix() }}/feed/{{ feed.id }}">{{ feed.title }}</a>.</h1><p> <div class="table-responsive"> <table class="table table-striped"> <thead> @@ -19,8 +19,8 @@ {% for pair in duplicates %} <tr> <td>{{ loop.index }}</td> - <td id="{{ pair[0].id }}"><a href="{{ url_for("article.delete", article_id=pair[0].id) }}"><i class="fa fa-times" aria-hidden="true" title="{{ _('Delete this article') }}"></i></a> <a href="{{ prefix }}/article/{{ pair[0].id }}">{{ pair[0].title }}</a> ({{ pair[0].retrieved_date }})</td> - <td id="{{ pair[1].id }}"><a href="{{ url_for("article.delete", article_id=pair[1].id) }}"><i class="fa fa-times" aria-hidden="true" title="{{ _('Delete this article') }}"></i></a> <a href="{{ prefix }}/article/{{ pair[1].id }}">{{ pair[1].title }}</a> ({{ pair[1].retrieved_date }})</td> + <td id="{{ pair[0].id }}"><a href="{{ url_for("article.delete", article_id=pair[0].id) }}"><i class="fa fa-times" aria-hidden="true" title="{{ _('Delete this article') }}"></i></a> <a href="{{ prefix() }}/article/{{ pair[0].id }}">{{ pair[0].title }}</a> ({{ pair[0].retrieved_date }})</td> + <td id="{{ pair[1].id }}"><a href="{{ url_for("article.delete", article_id=pair[1].id) }}"><i class="fa fa-times" aria-hidden="true" title="{{ _('Delete this article') }}"></i></a> <a href="{{ prefix() }}/article/{{ pair[1].id }}">{{ pair[1].title }}</a> ({{ pair[1].retrieved_date }})</td> </tr> {% endfor %} </tbody> diff --git a/newspipe/templates/history.html b/newspipe/templates/history.html index c2da83d5..00e22ef3 100644 --- a/newspipe/templates/history.html +++ b/newspipe/templates/history.html @@ -43,7 +43,7 @@ <ul class="list-group"> {% for date in articles_counter | sort(reverse = True) %} {% for article in articles %} - <li class="list-group-item">{{ article.date | datetime }} - <a href="{{ prefix }}/article/{{ article.id }}">{{ article.title | safe }}</a></li> + <li class="list-group-item">{{ article.date | datetime }} - <a href="{{ prefix() }}/article/{{ article.id }}">{{ article.title | safe }}</a></li> {% endfor %} {% endfor %} </ul> diff --git a/newspipe/templates/home.html b/newspipe/templates/home.html index c292a32f..5feb18d1 100644 --- a/newspipe/templates/home.html +++ b/newspipe/templates/home.html @@ -42,7 +42,7 @@ {% if feed_id == feed.id %}</b>{% endif %} </a></li> <li class="nav-item feed-commands {% if in_error.get(fid, 0) > 0 %}d-none{% endif %}" data-bs-feed="{{ feed.id }}"><span class="nav-link"> - <a href="{{ prefix }}/feed/{{ feed.id }}"><i class="fa fa-info" aria-hidden="true" title="{{ _('Details') }}"></i></a> + <a href="{{ prefix() }}/feed/{{ feed.id }}"><i class="fa fa-info" aria-hidden="true" title="{{ _('Details') }}"></i></a> <a href="{{ url_for('feed.form', feed_id=feed.id) }}"><i class="fa fa-pencil-square-o" aria-hidden="true" title="{{ _('Edit this feed') }}"></i></a> <a href="{{ url_for('article.mark_as', new_value='unread', feed_id=feed.id) }}"><i class="fa fa-square-o" aria-hidden="true" title="{{ _('Mark this feed as unread') }}"></i></a> <a href="{{ url_for('article.mark_as', new_value='read', feed_id=feed.id) }}"><i class="fa fa-check-square-o" aria-hidden="true" title="{{ _('Mark this feed as read') }}"></i></a> @@ -73,7 +73,7 @@ {% if feed_id == fid %}</b>{% endif %} </a></li> <li class="nav-item feed-commands {% if in_error.get(fid, 0) > 0 %}d-none{% endif %}" data-bs-feed="{{ fid }}"><span class="nav-link"> - <a href="{{ prefix }}/feed/{{ fid }}"><i class="fa fa-info" aria-hidden="true" title="{{ _('Details') }}"></i></a> + <a href="{{ prefix() }}/feed/{{ fid }}"><i class="fa fa-info" aria-hidden="true" title="{{ _('Details') }}"></i></a> <a href="{{ url_for('feed.form', feed_id=fid) }}"><i class="fa fa-pencil-square-o" aria-hidden="true" title="{{ _('Edit this feed') }}"></i></a> <a href="{{ url_for('article.mark_as', new_value='unread', feed_id=fid) }}"><i class="fa fa-square-o" aria-hidden="true" title="{{ _('Mark this feed as unread') }}"></i></a> <a href="{{ url_for('article.mark_as', new_value='read', feed_id=fid) }}"><i class="fa fa-check-square-o" aria-hidden="true" title="{{ _('Mark this feed as read') }}"></i></a> @@ -102,7 +102,7 @@ {% if feed_id == fid %}</b>{% endif %} </a></li> <li class="nav-item feed-commands {% if in_error.get(fid, 0) > 0 %}d-none{% endif %}" data-bs-feed="{{ fid }}"><span class="nav-link"> - <a href="{{ prefix }}/feed/{{ fid }}"><i class="fa fa-info" aria-hidden="true" title="{{ _('Details') }}"></i></a> + <a href="{{ prefix() }}/feed/{{ fid }}"><i class="fa fa-info" aria-hidden="true" title="{{ _('Details') }}"></i></a> <a href="{{ url_for('feed.form', feed_id=fid) }}"><i class="fa fa-pencil-square-o" aria-hidden="true" title="{{ _('Edit this feed') }}"></i></a> <a href="{{ url_for('article.mark_as', new_value='unread', feed_id=fid) }}"><i class="fa fa-square-o" aria-hidden="true" title="{{ _('Mark this feed as unread') }}"></i></a> <a href="{{ url_for('article.mark_as', new_value='read', feed_id=fid) }}"><i class="fa fa-check-square-o" aria-hidden="true" title="{{ _('Mark this feed as read') }}"></i></a> @@ -174,7 +174,7 @@ {% if not feed_id %} <td class="d-none d-md-block"> <img src="{{ url_for('icon.icon', url=feeds[article.source.id].icon_url) }}" width="16px"> - <a href="{{ prefix }}/article/redirect/{{ article.id}}" target="_blank">{{ article.source.title | safe }}</a> + <a href="{{ prefix() }}/article/redirect/{{ article.id}}" target="_blank">{{ article.source.title | safe }}</a> </td> {% endif %} <td {%if filter_ == 'all' and article.readed == False %}style='font-weight:bold'{% endif %}> diff --git a/newspipe/templates/layout.html b/newspipe/templates/layout.html index 29efd623..90919a7a 100644 --- a/newspipe/templates/layout.html +++ b/newspipe/templates/layout.html @@ -21,7 +21,7 @@ {% block menu %} <nav class="navbar navbar-expand-lg navbar-dark bg-newspipe-blue"> <div class="container-fluid"> - <a class="navbar-brand" href="{{ prefix }}/">Newspipe</a> + <a class="navbar-brand" href="{{ prefix() }}/">Newspipe</a> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button> diff --git a/newspipe/templates/login.html b/newspipe/templates/login.html index d6d3f462..78af3c4a 100644 --- a/newspipe/templates/login.html +++ b/newspipe/templates/login.html @@ -19,7 +19,7 @@ <div class="alert alert-warning" role="alert">{{ message }}</div> {% endfor %} {{ form.submit(class_="btn btn-primary") }} - {% if self_registration %}<a href="{{ prefix }}/signup" class="btn btn-info">{{ _('Sign up') }}</a>{% endif %} + {% if self_registration %}<a href="{{ prefix() }}/signup" class="btn btn-info">{{ _('Sign up') }}</a>{% endif %} </form> </div> </div> diff --git a/newspipe/templates/management.html b/newspipe/templates/management.html index 649fe4c6..19dbded0 100644 --- a/newspipe/templates/management.html +++ b/newspipe/templates/management.html @@ -6,7 +6,7 @@ <div class="row"> <div class="col"> <h2>{{ _('Your subscriptions') }}</h2> - <p>{{ _('You are subscribed to') }} {{ nb_feeds }} <a href="{{ prefix }}/feeds">{{ _('feeds') }}</a>. <a href="{{ url_for("feed.form") }}">{{ _('Add') }}</a> {{ _('a feed') }}.</p> + <p>{{ _('You are subscribed to') }} {{ nb_feeds }} <a href="{{ prefix() }}/feeds">{{ _('feeds') }}</a>. <a href="{{ url_for("feed.form") }}">{{ _('Add') }}</a> {{ _('a feed') }}.</p> <p>{{ nb_articles }} {{ _('articles are stored in the database with') }} {{ nb_unread_articles }} {{ _('unread articles') }}.</p> <p>{{ _('You have') }} {{ nb_categories }} <a href="{{ url_for("categories.list_")}}">{{ _('categories') }}</a>.</p> <a href="{{ url_for("articles.expire", weeks=10) }}" class="btn btn-primary" onclick="return confirm('{{ _('You are going to delete old articles.') }}');">{{ _('Delete articles older than 10 weeks') }}</a> |