diff options
| -rw-r--r-- | pyaggr3g470r/templates/home.html | 54 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/management.html | 2 |
2 files changed, 30 insertions, 26 deletions
diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html index 836ef2e6..e79d0603 100644 --- a/pyaggr3g470r/templates/home.html +++ b/pyaggr3g470r/templates/home.html @@ -1,39 +1,43 @@ {% extends "layout.html" %} {% block content %} <div class="container"> - {% for feed in feeds %} - <div class="row"> - <div class="col-md-6 col-md-offset-3"> - <h1>{{ feed.title }}</h1> - <a href="/articles/{{ feed.oid }}"><i class="glyphicon glyphicon-th-list" title="All articles"></i></a> - <a href="/feed/{{ feed.oid }}"><i class="glyphicon glyphicon-eye-open" title="Details"></i></a> - <a href="/edit_feed/{{ feed.oid }}"><i class="glyphicon glyphicon-edit" title="Edit this feed"></i></a> - </div> - </div> - {% for number in range(0, feed.articles|length-(feed.articles|length % 3), 3) %} + {% if feeds|count == 0 %} + <h1>You are not subscribed to any feed. <a href="/edit_feed/">Fix this</a>.</h1> + {% else %} + {% for feed in feeds %} <div class="row"> - {% for n in range(number, number+3) %} - <div class="col-xs-6 col-sm-4 col-md-4"> - {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %} - <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2> - {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %} - <h6>{{ feed.articles[n].date }}</h6> + <div class="col-md-6 col-md-offset-3"> + <h1>{{ feed.title }}</h1> + <a href="/articles/{{ feed.oid }}"><i class="glyphicon glyphicon-th-list" title="All articles"></i></a> + <a href="/feed/{{ feed.oid }}"><i class="glyphicon glyphicon-eye-open" title="Details"></i></a> + <a href="/edit_feed/{{ feed.oid }}"><i class="glyphicon glyphicon-edit" title="Edit this feed"></i></a> </div> - {% endfor %} </div> - {% endfor %} - {% if feed.articles|length % 3 != 0 %} - <div class="row"> - {% for n in range(feed.articles|length-(feed.articles|length % 3), feed.articles|length) %} + {% for number in range(0, feed.articles|length-(feed.articles|length % 3), 3) %} + <div class="row"> + {% for n in range(number, number+3) %} <div class="col-xs-6 col-sm-4 col-md-4"> {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %} <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2> {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %} <h6>{{ feed.articles[n].date }}</h6> </div> - {% endfor %} - </div> - {% endif %} - {% endfor %} + {% endfor %} + </div> + {% endfor %} + {% if feed.articles|length % 3 != 0 %} + <div class="row"> + {% for n in range(feed.articles|length-(feed.articles|length % 3), feed.articles|length) %} + <div class="col-xs-6 col-sm-4 col-md-4"> + {% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %} + <a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title }}</a><h2> + {% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %} + <h6>{{ feed.articles[n].date }}</h6> + </div> + {% endfor %} + </div> + {% endif %} + {% endfor %} + {% endif %} </div><!-- /.container --> {% endblock %}
\ No newline at end of file diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html index 031e3e7e..61da8943 100644 --- a/pyaggr3g470r/templates/management.html +++ b/pyaggr3g470r/templates/management.html @@ -3,7 +3,7 @@ <div class="container"> <div class="jumbotron"> <h1>Your subscriptions</h1> - <p>You are subscribed to {{ nb_feeds }} <a href="/feeds">feeds</a>.</p> + <p>You are subscribed to {{ nb_feeds }} <a href="/feeds">feeds</a>. Add a <a href="/edit_feed/">feed</a>.</p> <p>{{ nb_articles }} articles are stored in the database with {{ nb_unread_articles }} <a href="/unread/">unread articles</a>.</p> </div> </div><!-- /.container --> |