diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2020-03-30 13:57:56 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2020-03-30 13:57:56 +0200 |
| commit | 575c687b8549f2e655bc008fe0a07fbdad32845a (patch) | |
| tree | 7471759df44f0af6903f2f48ac206a04e00e8e34 | |
| parent | hide feeds with too much erros from the menu (diff) | |
| download | newspipe-575c687b8549f2e655bc008fe0a07fbdad32845a.tar.gz newspipe-575c687b8549f2e655bc008fe0a07fbdad32845a.tar.bz2 newspipe-575c687b8549f2e655bc008fe0a07fbdad32845a.zip | |
display feeds icon in public pages for feeds
| -rw-r--r-- | newspipe/templates/feed.html | 5 | ||||
| -rw-r--r-- | newspipe/templates/home.html | 6 | ||||
| -rw-r--r-- | newspipe/templates/user_stream.html | 4 | ||||
| -rw-r--r-- | newspipe/web/views/user.py | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/newspipe/templates/feed.html b/newspipe/templates/feed.html index af58e939..34312980 100644 --- a/newspipe/templates/feed.html +++ b/newspipe/templates/feed.html @@ -2,7 +2,10 @@ {% block content %} <div class="container"> <div class="well"> - <h2>{{ feed.title }}</h2> + <h2> + <img src="{{ url_for('icon.icon', url=feed.icon_url) }}" /> + {{ feed.title }} + </h2> {% if feed.description %} <p>{{ feed.description }}</p> {% endif %} {% if current_user.is_authenticated %} <a href="{{ url_for("feed.delete", feed_id=feed.id) }}"><i class="fa fa-times" aria-hidden="true" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a> diff --git a/newspipe/templates/home.html b/newspipe/templates/home.html index d941adbc..3238ad9e 100644 --- a/newspipe/templates/home.html +++ b/newspipe/templates/home.html @@ -102,7 +102,7 @@ {% endif%} </th> {% if not feed_id %} - <th>{{ _('Feed') }}</th> + <th class="d-none d-md-block">{{ _('Feed') }}</th> {% endif %} <th>{{ _('Article') }}</th> <th class="d-none d-lg-block">{{ _('Date') }}</th> @@ -126,7 +126,7 @@ {% endif %} </td> {% if not feed_id %} - <td> + <td class="d-none d-md-block"> <img src="{{ url_for('icon.icon', url=feeds[article.source.id].icon_url) }}" width="16px"> <a href="/article/redirect/{{ article.id}}" target="_blank">{{ article.source.title | safe }}</a> </td> @@ -135,7 +135,7 @@ <img src="{{ url_for('icon.icon', url=feeds[article.source.id].icon_url) }}" width="16px"> <a href="/article/{{ article.id }}">{{ article.title | safe }}</a> </td> - <td class="date d-none d-lg-block">{{ article.date | datetime(format='short') }}</a></td> + <td class="date d-none d-lg-block">{{ article.date | datetime(format='short') }}</td> </tr> {% endfor %} </tbody> diff --git a/newspipe/templates/user_stream.html b/newspipe/templates/user_stream.html index 2cf0ab7a..87a3698b 100644 --- a/newspipe/templates/user_stream.html +++ b/newspipe/templates/user_stream.html @@ -53,7 +53,9 @@ {% for article in articles %} <tr> <td>{{ loop.index }}</td> - <td><a href="{{ url_for('article.article_pub', article_id=article.id) }}">{{ article.title }}</a></td> + <td><img src="{{ url_for('icon.icon', url=article.source.icon_url) }}" width="16px" /> + <a href="{{ url_for('article.article_pub', article_id=article.id) }}">{{ article.title }}</a> + </td> <td>{{ article.date }}</td> </tr> {% endfor %} diff --git a/newspipe/web/views/user.py b/newspipe/web/views/user.py index 4e34bbeb..f4f26b71 100644 --- a/newspipe/web/views/user.py +++ b/newspipe/web/views/user.py @@ -73,7 +73,7 @@ def user_stream(per_page, nickname=None): filters["feed_id__in"] = [feed.id for feed in feeds] if category: filters["category_id"] = category_id - articles = ArticleController(user.id).read_light(**filters) + articles = ArticleController(user.id).read(**filters) # Server-side pagination page, per_page, offset = get_page_args(per_page_parameter="per_page") |