From f7e02efc9cfdaf9a993b7b62384f6d9d5e826700 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <kimble.mandel@gmail.com>
Date: Fri, 15 Mar 2013 08:26:57 +0100
Subject: Updated templates.

---
 source/static/templates/article.html | 24 ++++++++++++------------
 source/static/templates/base.html    |  4 ++--
 source/static/templates/index.html   | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/source/static/templates/article.html b/source/static/templates/article.html
index bd459c4e..9225993a 100644
--- a/source/static/templates/article.html
+++ b/source/static/templates/article.html
@@ -5,17 +5,17 @@
         <h1><i>${article["article_title"]}</i> from <a href="/feed/${feed['feed_id']}">${feed["feed_title"]}</a></h1>
         <br />
         %if article["article_like"]:
-            <a href="/like/0:${feed['feed_id']}:${article['article_id']}"><img src="/img/heart.png" title="I like this article!" /></a>
+            <a href="/like/0:${feed['feed_id']}:${article['article_id']}"><img src="/static/img/heart.png" title="I like this article!" /></a>
         %else:
-            <a href="/like/1:${feed['feed_id']}:${article['article_id']}"><img src="/img/heart_open.png" title="Click if you like this article." /></a>
+            <a href="/like/1:${feed['feed_id']}:${article['article_id']}"><img src="/static/img/heart_open.png" title="Click if you like this article." /></a>
         %endif
-        &nbsp;&nbsp;<a href="/delete_article/${feed['feed_id']}:${article['article_id']}"><img src="/img/cross.png" title="Delete this article" /></a>
+        &nbsp;&nbsp;<a href="/delete_article/${feed['feed_id']}:${article['article_id']}"><img src="/static/img/cross.png" title="Delete this article" /></a>
         <br /><br />
 
         ${description}
 
-        <div style="float:right;"><a href="/article/${feed['feed_id']}:${following['article_id']}" title="${following['article_title']}"><img src="/img/following-article.png" /></a></div>
-        <div style="float:left;"><a href="/article/${feed['feed_id']}:${previous['article_id']}" title="${previous['article_title']}"><img src="/img/previous-article.png" /></a></div>
+        <div style="float:right;"><a href="/article/${feed['feed_id']}:${following['article_id']}" title="${following['article_title']}"><img src="/static/img/following-article.png" /></a></div>
+        <div style="float:left;"><a href="/article/${feed['feed_id']}:${previous['article_id']}" title="${previous['article_title']}"><img src="/static/img/previous-article.png" /></a></div>
         </div>
 
         <hr />
@@ -27,29 +27,29 @@
 
         Share this article:<br />
         <a href="javascript:(function(){f='https://${diaspora}/bookmarklet?url=${article['article_link']}&amp;title=${article['article_title']}&amp;notes=via pyAggr3g470r&amp;v=1&amp;';a=function(){if(!window.open(f+'noui=1&amp;jump=doclose','diasporav1','location=yes,links=no,scrollbars=no,toolbar=no,width=620,height=250'))location.href=f+'jump=yes'};if(/Firefox/.test(navigator.userAgent)){setTimeout(a,0)}else{a()}})()">
-                <img src="/img/diaspora.png" title="Share on Diaspora" /></a>
+                <img src="/static/img/diaspora.png" title="Share on Diaspora" /></a>
 
-        <a href="http://identi.ca/index.php?action=newnotice&status_textarea=${article['article_title']}:${article['article_link']}" title="Share on Identi.ca" target="_blank"><img src="/img/identica.png" /></a>
+        <a href="http://identi.ca/index.php?action=newnotice&status_textarea=${article['article_title']}:${article['article_link']}" title="Share on Identi.ca" target="_blank"><img src="/static/img/identica.png" /></a>
 
         <a href="https://api.pinboard.in/v1/posts/add?url=${article['article_link']}&description=${article['article_title']}"
                 rel="noreferrer" target="_blank">
-                <img src="/img/pinboard.png" title="Share on Pinboard" /></a>
+                <img src="/static/img/pinboard.png" title="Share on Pinboard" /></a>
 
         <a href="http://digg.com/submit?url=${article['article_link']}&title=${article['article_title']}"
                 rel="noreferrer" target="_blank">
-                <img src="/img/digg.png" title="Share on Digg" /></a>
+                <img src="/static/img/digg.png" title="Share on Digg" /></a>
 
         <a href="http://reddit.com/submit?url=${article['article_link']}&title=${article['article_title']}"
                 rel="noreferrer" target="_blank">
-                <img src="/img/reddit.png" title="Share on reddit" /></a>
+                <img src="/static/img/reddit.png" title="Share on reddit" /></a>
 
         <a href="http://scoopeo.com/scoop/new?newurl=${article['article_link']}&title=${article['article_title']}"
                 rel="noreferrer" target="_blank">
-                <img src="/img/scoopeo.png" title="Share on Scoopeo" /></a>
+                <img src="/static/img/scoopeo.png" title="Share on Scoopeo" /></a>
 
         <a href="http://blogmarks.net/my/new.php?url=${article['article_link']}&title=${article['article_title']}"
                 rel="noreferrer" target="_blank">
-                <img src="/img/blogmarks.png" title="Share on Blogmarks" /></a>
+                <img src="/static/img/blogmarks.png" title="Share on Blogmarks" /></a>
 
         <g:plusone size="standard" count="true" href="${article['article_link']}"></g:plusone>
 
diff --git a/source/static/templates/base.html b/source/static/templates/base.html
index aa375470..29e81450 100644
--- a/source/static/templates/base.html
+++ b/source/static/templates/base.html
@@ -10,12 +10,12 @@
     %else:
         <title>${header_text} - pyAggr3g470r</title>
     %endif
-    <link rel="stylesheet" href="/css/style.css" />
+    <link rel="stylesheet" href="/static/css/style.css" />
     <script src="https://apis.google.com/js/plusone.js"></script>
 </head>
 <body>
     <div class="right innerlogo">
-        <a href="/"><img src="/img/tuxrss.png" title="What's new today?"/></a>
+        <a href="/"><img src="/static/img/tuxrss.png" title="What's new today?"/></a>
     </div>
     <a href="/"><h1 id="top">pyAggr3g470r</h1></a>
     ${self.body()}
diff --git a/source/static/templates/index.html b/source/static/templates/index.html
index 43269f0a..f4cada50 100644
--- a/source/static/templates/index.html
+++ b/source/static/templates/index.html
@@ -30,20 +30,20 @@ import utils
 <div class="left inner">
     <div class="menu_container">
     %if feeds:
-        <a href="/management/"><img src="/img/management.png" title="Management" /></a>
-        <a href="/history/"><img src="/img/history.png" title="History" /></a>
+        <a href="/management/"><img src="/static/img/management.png" title="Management" /></a>
+        <a href="/history/"><img src="/static/img/history.png" title="History" /></a>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <a href="/favorites/"><img src="/img/heart-32x32.png" title="Your favorites (${nb_favorites})" /></a>
-        <a href="/notifications/"><img src="/img/email-follow.png" title="Active e-mail notifications (${nb_mail_notifications})" /></a>
+        <a href="/favorites/"><img src="/static/img/heart-32x32.png" title="Your favorites (${nb_favorites})" /></a>
+        <a href="/notifications/"><img src="/static/img/email-follow.png" title="Active e-mail notifications (${nb_mail_notifications})" /></a>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         %if nb_unread_articles != 0:
-            <a href="/mark_as_read/"><img src="/img/mark-as-read.png" title="Mark articles as read" /></a>
-            <a href="/unread/"><img src="/img/unread.png" title="Unread article(s): ${nb_unread_articles}" /></a>
+            <a href="/mark_as_read/"><img src="/static/img/mark-as-read.png" title="Mark articles as read" /></a>
+            <a href="/unread/"><img src="/static/img/unread.png" title="Unread article(s): ${nb_unread_articles}" /></a>
         %endif
     %endif
-    <a href="/fetch/"><img src="/img/check-news.png" title="Check for news" /></a>
+    <a href="/fetch/"><img src="/static/img/check-news.png" title="Check for news" /></a>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    <a href="/logout/"><img src="/img/logout.png" title="Logout" /></a>
+    <a href="/logout/"><img src="/static/img/logout.png" title="Logout" /></a>
     </div><br/>
     <%
         html = ""
@@ -68,7 +68,7 @@ import utils
 
                 # display a heart for faved articles
                 if article["article_like"] == True:
-                    like = """ <img src="/img/heart.png" title="I like this article!" />"""
+                    like = """ <img src="/static/img/heart.png" title="I like this article!" />"""
                 else:
                     like = ""
 
@@ -94,7 +94,7 @@ import utils
             # some options for the current feed
             html += """<a href="/articles/%s">All articles</a>&nbsp;&nbsp;&nbsp;""" % (feed["feed_id"],)
             html += """<a href="/feed/%s">Feed summary</a>&nbsp;&nbsp;&nbsp;""" % (feed["feed_id"],)
-            html += """<div class="right"><h2><a href="/fetch/%s"><img src="/img/check-news.png" title="Check this feed for news" /></a></h2></div>\n""" % (feed["feed_id"],)
+            html += """<div class="right"><h2><a href="/fetch/%s"><img src="/static/img/check-news.png" title="Check this feed for news" /></a></h2></div>\n""" % (feed["feed_id"],)
             if mongo.nb_unread_articles(feed["feed_id"]) != 0:
                 html += """&nbsp;&nbsp;<a href="/mark_as_read/Feed_FromMainPage:%s">Mark all as read</a>""" % (feed["feed_id"],)
                 html += """&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/unread/%s" title="Unread article(s)">Unread article(s) (%s)</a>""" % (feed["feed_id"], mongo.nb_unread_articles(feed["feed_id"]))
-- 
cgit