aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/templates
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2015-07-06 23:24:01 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2015-07-06 23:24:01 +0200
commit2c1629e5974195899411da73e3b601dad5c24a3e (patch)
tree3cf8c10e2eb99bdfb2c95fb3a0ebdcf8b887d1fc /pyaggr3g470r/templates
parentUpdated translations. (diff)
parentMerged in jaesivsm/pyaggr3g470r (pull request #17) (diff)
downloadnewspipe-2c1629e5974195899411da73e3b601dad5c24a3e.tar.gz
newspipe-2c1629e5974195899411da73e3b601dad5c24a3e.tar.bz2
newspipe-2c1629e5974195899411da73e3b601dad5c24a3e.zip
Merge branch 'master' of bitbucket.org:cedricbonhomme/pyaggr3g470r
Diffstat (limited to 'pyaggr3g470r/templates')
-rw-r--r--pyaggr3g470r/templates/admin/user.html4
-rw-r--r--pyaggr3g470r/templates/feeds.html5
-rw-r--r--pyaggr3g470r/templates/inactives.html9
3 files changed, 13 insertions, 5 deletions
diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html
index e50741ee..21bcd6b6 100644
--- a/pyaggr3g470r/templates/admin/user.html
+++ b/pyaggr3g470r/templates/admin/user.html
@@ -23,7 +23,7 @@
<thead>
<tr>
<th>#</th>
- <th>{{ _('Name') }}</th>
+ <th>{{ _('Title') }}</th>
<th>{{ _('Feed link') }}</th>
<th>{{ _('Site link') }}</th>
<th>{{ _('(unread) articles') }}</th>
@@ -34,7 +34,7 @@
{% for feed in user.feeds|sort(attribute="title") %}
<tr>
<td>{{ loop.index }}</td>
- <td><a href="/feed/{{ feed.id }}">{{ feed.title }}</a></td>
+ <td><a href="{{ url_for("feed.feed", feed_id=feed.id) }}">{%if feed.icon%}<img src="{{ url_for('feed.icon', feed_id=feed.id) }}" width="16px" />{%endif%}{{ feed.title }}</a></td>
<td>{{ feed.link }}</td>
<td>{{ feed.site_link }}</td>
<td>( {{ unread_article_count.get(feed.id, 0) }} ) {{ article_count.get(feed.id, 0) }}</td>
diff --git a/pyaggr3g470r/templates/feeds.html b/pyaggr3g470r/templates/feeds.html
index 789decf5..20e0cccb 100644
--- a/pyaggr3g470r/templates/feeds.html
+++ b/pyaggr3g470r/templates/feeds.html
@@ -28,7 +28,10 @@
<i class="glyphicon glyphicon-exclamation-sign" title="{{ _('Feed encountered too much errors.') }}"></i>
{% endif %}
</td>
- <td><a href="{{ url_for("feed.feed", feed_id=feed.id) }}" {% if feed.description %}title="{{ feed.description }}"{% endif %}>{{ feed.title }}</a></td>
+ <td><a href="{{ url_for("feed.feed", feed_id=feed.id) }}" {% if feed.description %}title="{{ feed.description }}"{% endif %}>
+ {% if feed.icon %}<img src="{{ url_for('feed.icon', feed_id=feed.id) }}" width="16px" />{% endif %}
+ {{ feed.title }}
+ </a></td>
<td><a href="{{ feed.site_link }}">{{ feed.site_link }}</a></td>
<td>( {{ unread_article_count.get(feed.id, 0) }} ) {{ article_count.get(feed.id, 0) }}</td>
<td>
diff --git a/pyaggr3g470r/templates/inactives.html b/pyaggr3g470r/templates/inactives.html
index 6a4ff055..eb546eca 100644
--- a/pyaggr3g470r/templates/inactives.html
+++ b/pyaggr3g470r/templates/inactives.html
@@ -9,8 +9,13 @@
<br />
{% if inactives != [] %}
<ul class="list-group">
- {% for item in inactives %}
- <li class="list-group-item"><a href="/feed/{{ item[0].id }}">{{ item[0].title }}</a> - {{ item[1].days }} {{ _('days') }}</li>
+ {% for feed, delta in inactives %}
+ <li class="list-group-item">
+ <a href="{{ url_for('feed.feed', feed_id=feed.id) }}">
+ {% if feed.icon %}<img src="{{ url_for('feed.icon', feed_id=feed.id) }}" width="16px" />{% endif %}
+ {{ feed.title }}
+ </a> - {{ delta.days }} {{ _('days') }}
+ </li>
{% endfor %}
</ul>
{% else %}
bgstack15