From f8f10ec2f34b3b6f2c992a3b7d6022f25b3fdfbb Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <kimble.mandel@gmail.com>
Date: Mon, 15 Apr 2013 19:16:50 +0200
Subject: Improvement of the display of the /article view.

---
 source/static/templates/article.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'source')

diff --git a/source/static/templates/article.html b/source/static/templates/article.html
index fcb29522..3a845b2c 100644
--- a/source/static/templates/article.html
+++ b/source/static/templates/article.html
@@ -2,7 +2,7 @@
 <%inherit file="base.html"/>
 <div>
     <div style="width: 50%; overflow:hidden; text-align: justify; margin:0 auto">
-        <h1><i>${article["article_title"]}</i> from <a href="/feed/${feed['feed_id']}">${feed["feed_title"]}</a></h1>
+        <h1><i><a href="${article['article_link']}">${article["article_title"]}</a></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="/static/img/heart.png" title="I like this article!" /></a>
@@ -22,9 +22,8 @@
                 <img src="/static/img/previous-article.png" />
             </a>
         </div>
-    </div>
+    <br /><br /><br />
 
-    <hr />
     %if plain_text == "1":
         <a href="/article/${feed['feed_id']}:${article['article_id']}">HTML version</a>
     %else:
@@ -32,10 +31,8 @@
     %endif
     - <a href="/epub/${feed['feed_id']}:${article['article_id']}">Export to EPUB</a>
     <br />
-    <a href="${article['article_link']}">Complete story</a>
-    <br />
 
-    Share this article:<br />
+    Share this article:<br /><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="/static/img/diaspora.png" title="Share on Diaspora" /></a>
 
@@ -64,5 +61,6 @@
     <g:plusone size="standard" count="true" href="${article['article_link']}"></g:plusone>
 
 
-    <br />
-    <a href="/var/qrcode/${article['article_id']}.png"><img src="/var/qrcode/${article['article_id']}.png" title="Share with your smartphone" width="500" height="500" /></a>
\ No newline at end of file
+    <br /><br />
+    <a href="/var/qrcode/${article['article_id']}.png"><img src="/var/qrcode/${article['article_id']}.png" title="Share with your smartphone" width="500" height="500" /></a>
+    </div>
\ No newline at end of file
-- 
cgit