Merge pull request #181 from inthepoche/dev

beta4

11 files changed, 161 insertions, 121 deletions

diff --git a/tpl/_head.twig b/tpl/_head.twig
index 60ef8883..cab317a8 100644
--- a/tpl/_head.twig
+++ b/tpl/_head.twig
@@ -6,6 +6,7 @@
         <link rel="stylesheet" href="./tpl/css/style.css" media="all">
         <link rel="stylesheet" href="./tpl/css/style-{{ constant('THEME') }}.css" media="all" title="{{ constant('THEME') }} theme">
         <link rel="stylesheet" href="./tpl/css/messages.css" media="all">
+        <link rel="stylesheet" href="./tpl/css/print.css" media="print">
         <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
         <script src="./tpl/js/jquery-2.0.3.min.js"></script>
-        <script type="text/javascript">$(document).ready(function(){$("body").prepend('<a href="#top" class="top_link" title="{% trans "back to top" %}"><img src="./tpl/img/{{ constant("THEME") }}/backtotop.png" alt={% trans "back to top" %}"/></a>');$(".top_link").css({position:"fixed",right:"15px",bottom:"15px",display:"none",padding:"20px",background:"#ccc","-moz-border-radius":"40px","-webkit-border-radius":"40px","border-radius":"40px",opacity:"0.9","z-index":"2000"});$(window).scroll(function(){posScroll=$(document).scrollTop();if(posScroll>=400)$(".top_link").fadeIn(600);else $(".top_link").fadeOut(600)})})</script>
\ No newline at end of file
+        <script type="text/javascript">$(document).ready(function(){$("body").prepend('<a href="#top" class="top_link" title="{% trans "back to top" %}"><img src="./tpl/img/{{ constant("THEME") }}/backtotop.png" alt={% trans "back to top" %}"/></a>');$(window).scroll(function(){posScroll=$(document).scrollTop();if(posScroll>=400)$(".top_link").fadeIn(600);else $(".top_link").fadeOut(600)})})</script>
\ No newline at end of file
diff --git a/tpl/config.twig b/tpl/config.twig
index 5324cda7..c838c319 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -11,18 +11,21 @@
             </ul>
 {% endblock %}
 {% block content %}
-            <h2>{% trans "Bookmarklet" %}</h2>
-            <p>{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a>.</p>
-            <p>{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}</p>
-            <p class="txtcenter"><a ondragend="this.click();" style="cursor: move; border: 1px dashed grey; background: white; padding: 5px;" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></p>
+            <h2>{% trans "Poching a link" %}</h2>
+            <p>You can poche a link by several methods: (<a href="http://www.inthepoche.com/?pages/Documentation" title="{% trans "read the documentation" %}">?</a>)</p>
+            <ul>
+                <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">download the extension</a></li>
+                <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">download the extension</a></li>
+                <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">download the application</a></li>
+                <li>bookmarklet: drag & drop this link to your bookmarks bar <a id="bookmarklet" ondragend="this.click();" title="i am a bookmarklet, use me !" href="javascript:if(top['bookmarklet-url@inthepoche.com']){top['bookmarklet-url@inthepoche.com'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "poche it!" %}</a></li>
+            </ul>
 
             <h2>{% trans "Updating poche" %}</h2>
-            <p><ul>
+            <ul>
                 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li>
                 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/?pages/T%C3%A9l%C3%A9charger-poche">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
             </ul>
-            </p>
 
             <h2>{% trans "Change your password" %}</h2>
             <form method="post" action="?config" name="loginform">
@@ -46,11 +49,11 @@
             <h2>{% trans "Import" %}</h2>
             <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
             <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p>
-            <p><ul>
-            <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li>
-            <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a>  (you must have a "readability" file on your server)</li>
-            <li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a>  (you must have a "instapaper-export.html" file on your server)</li>
-            </ul></p>
+            <ul>
+                <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "{{ constant('IMPORT_POCKET_FILE')}}" file on your server)</li>
+            <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "{{constant('IMPORT_READABILITY_FILE')}}" file on your server)</li>
+            <li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "{{constant('IMPORT_INSTAPAPER_FILE')}}" file on your server)</li>
+            </ul>
 
             <h2>{% trans "Export your poche datas" %}</h2>
             <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche datas." %}</p>
diff --git a/tpl/css/print.css b/tpl/css/print.css
new file mode 100644
index 00000000..a3b0a599
--- /dev/null
+++ b/tpl/css/print.css
@@ -0,0 +1,19 @@
+body > header,
+body > footer,
+a.top_link,
+div.tools,
+header div
+{
+        display: none !important;
+}
+
+article
+{
+        border: none !important;
+}
+
+div.vieworiginal a::after
+{
+        margin-left: 5px;
+        content: "("attr(href)")";
+}
diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css
index 9ea7955a..e2788a1c 100644
--- a/tpl/css/style-light.css
+++ b/tpl/css/style-light.css
@@ -44,6 +44,10 @@ a.twitter span {
     background: url('../img/light/twitter.png') no-repeat;
 }
 
+a.shaarli span {
+    background: url('../img/light/shaarli.png') no-repeat;
+}
+
 a.email span {
     background: url('../img/light/envelop.png') no-repeat;
 }
diff --git a/tpl/css/style.css b/tpl/css/style.css
index e2a512f7..7633534c 100644
--- a/tpl/css/style.css
+++ b/tpl/css/style.css
@@ -1,7 +1,8 @@
 body {
     font-size: 16px;
-    font-family: 'Roboto', sans-serif;
+    font-family: 'Roboto', Verdana, Geneva, sans-serif;
     margin: 10px;
+    color: #000;
 }
 
 header {
@@ -12,52 +13,67 @@ header h1 {
     font-size: 1.3em;
 }
 
+a, a:hover, a:visited {
+    color: #000;
+}
+
 .bouton {
-        border-radius: 2px;
+    background-color: #000;
+    color: #fff;
+    border: none;
+    border-radius: 2px;
+}
+.bouton:hover {
+    background-color: #222;
+    color: #f1f1f1;
+    cursor: pointer;
 }
 
 #main {
     margin: 0 auto;
 }
 
-#main ul#links {
+#main #links {
     padding: 0;
     list-style-type: none;
     text-align: center;
     font-size: 0.9em;
 }
 
-#main ul#links li {
+#main #links li {
     display: inline;
 }
 
-#main ul#links li a.current {
+#main #links li .current {
+    background-color: #000;
+    color: #fff;
     -webkit-border-radius: 2px;
     border-radius: 2px;
 }
 
-#main ul#sort {
+#main #sort {
     padding: 0;
     list-style-type: none;
     text-align: center;
     opacity: 0.5;
 }
 
-#main ul#sort li {
+#main #sort li {
     display: inline;
     font-size: 0.9em;
 }
 
-#main ul#sort img:hover {
+#main #sort img:hover {
     cursor: pointer;
 }
 
-
-#links a{
+#links a {
     text-decoration: none;
     padding: 5px 10px;
 }
-#links a:hover{
+#links a:hover {
+    background-color: #040707;
+    color: #F1F1F1;
     -webkit-border-radius: 2px;
     border-radius: 2px;
 }
@@ -65,7 +81,7 @@ header h1 {
 /*** ***/
 /*** LINKS DISPLAY ***/
 
-#main a.tool {
+#main .tool {
     text-decoration: none;
     cursor: pointer;
 }
@@ -80,17 +96,23 @@ header h1 {
 }
 
 #main #content .entrie {
-    border-bottom: 1px dashed #222222;
+    border-bottom: 1px dashed #222;
 }
 
-#main .entrie ul.tools {
+#main .entrie .tools {
     list-style-type: none;
 }
 
-#main .entrie ul.tools li {
-    /*display: inline;*/
+#main .entrie .tools + p {
+    min-height: 5.5em;
 }
 
+/*
+#main .entrie .tools li {
+    display: inline;
+}
+*/
+
 .tools {
     float: right;
     text-align: right;
@@ -98,7 +120,8 @@ header h1 {
 }
 
 .tools p {
-    font-size: 0.8em;}
+    font-size: 0.8em;
+}
 
 /*
 .tools ul {
@@ -110,22 +133,32 @@ header h1 {
     line-height: 20px;
 }
 
-.tools a.tool {
+.tools .tool {
     cursor: pointer;
 }*/
 
-#main .entrie .tools a.tool span, #article .tools a.tool span {
+#main .entrie .tools .tool span, #article .tools .tool span {
     display: inline-block;
     width: 16px;
     height: 16px;
+    /* Hide textual content */
+    text-indent: -9999px;
+    text-align: left;
+    overflow: hidden;
 }
 
+
 /*** ***/
 /*** ARTICLE PAGE ***/
 
 #article {
     margin: 0 auto;
 }
+
+#article header, #article article {
+    border-bottom: 1px solid #222;
+}
+
 #article header {
     text-align: left;
 }
@@ -136,7 +169,7 @@ header h1 {
 
 .vieworiginal a, .vieworiginal a:hover, .vieworiginal a:visited {
     text-decoration: none;
-    color: #888888;
+    color: #888;
 }
 
 .backhome {
@@ -146,54 +179,16 @@ header h1 {
 #article .tools {
     position: relative;
     display: inline;
-    top: 0px;
-    right: 0px;
+    top: 0;
+    right: 0;
     width: 100%;
 }
 
-#article .tools ul li{
+#article .tools ul li {
     display: inline;
 }
 
 
-/*** GENERAL ***/
-body {
-    color: #000;
-}
-
-a, a:hover, a:visited {
-    color: #000;
-}
-
-.bouton {
-    background-color: #000;
-    color: #fff;
-    border: none;
-}
-.bouton:hover {
-    background-color: #222222;
-    color: #F1F1F1;
-}
-
-#main ul#links li a.current {
-    background-color: #000;
-    color: #fff;
-}
-
-#links a:hover{
-    background-color: #040707;
-    color: #F1F1F1;
-}
-
-
-/*** ***/
-/*** ARTICLE PAGE ***/
-
-#article header, #article article {
-    border-bottom: 1px solid #222222;
-}
-
-
 /* Pagination */
 .pagination {
     clear: both;
@@ -202,42 +197,63 @@ a, a:hover, a:visited {
     text-align: right;
 }
 .pagination a {
-    border: 1px solid #D5D5D5;
+    border: 1px solid #d5d5d5;
     color: #333;
     font-size: 11px;
     font-weight: bold;
     height: 25px;
     padding: 4px 8px;
     text-decoration: none;
-    margin:2px;
+    margin: 2px;
 }
 .pagination a:hover, .pagination a:active {
-    background:#efefef;
+    background-color: #efefef;
 }
-.pagination span.current {
+.pagination .current {
     background-color: #ccc;
-    border: 1px solid #D5D5D5;
+    border: 1px solid #d5d5d5;
     color: #000;
     font-size: 11px;
     font-weight: bold;
     height: 25px;
     padding: 4px 8px;
     text-decoration: none;
-    margin:2px;
+    margin: 2px;
 }
-.pagination span.disabled {
-    border: 1px solid #EEEEEE;
-    color: #DDDDDD;
-    margin:2px;
+.pagination .disabled {
+    border: 1px solid #eee;
+    color: #ddd;
+    margin: 2px;
     padding: 4px 8px;
     font-size: 11px;
     font-weight: bold;
 }
 
+#bookmarklet {
+    padding: 5px;
+    border: 1px dashed #808080;
+    background: #fff;
+    cursor: move;
+}
+
+.top_link {
+    position: fixed;
+    right: 15px;
+    bottom: 15px;
+    display: none;
+    padding: 20px;
+    background: #ccc;
+    -moz-border-radius: 40px;
+    -webkit-border-radius: 40px;
+    border-radius: 40px;
+    opacity: 0.9;
+    z-index: 2000;
+}
+
 footer {
     clear: both;
 }
 
 .reading-time {
     font-size: 0.8em;
-}
\ No newline at end of file
+}
diff --git a/tpl/error.twig b/tpl/error.twig
index 84c3bc1c..14c49925 100644
--- a/tpl/error.twig
+++ b/tpl/error.twig
@@ -1,7 +1,6 @@
 {% extends "layout.twig" %}
-{% block title %}{% trans "error" %}{% endblock %}
+{% block title %}{% trans "plop" %}{% endblock %}
 {% block content %}
-    <h1>error</h1>
-        <p>{{ msg|raw }}</p>
+        {{ msg|raw }}
         <p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p>
 {% endblock %}
\ No newline at end of file
diff --git a/tpl/home.twig b/tpl/home.twig
index 03f9f70d..a2fa9a93 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -5,22 +5,20 @@
 {% endblock %}
 {% block precontent %}
             <ul id="sort">
-                <li><a href="./?sort=ia&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-                <li><a href="./?sort=ta&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
+                <li><a href="./?sort=ia&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
+                <li><a href="./?sort=ta&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
             </ul>
 {% endblock %}
 {% block content %}
             {{ page_links | raw }}
             {% for entry in entries %}
             <div id="entry-{{ entry.id|e }}" class="entrie">
-                <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|e }}</a></h2>
+                <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
                 <ul class="tools">
-                    <li>
-                        <a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span></span></a></li>
-                        <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span></span></a></li>
-                        <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li>
-                        <li class="reading-time">{{ entry.content| getReadingTime }} min</li>
-                    </li>
+                    <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
+                    <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
+                    <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
+                    <li class="reading-time">{{ entry.content| getReadingTime }} min</li>
                 </ul>
                 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
                 <p class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></p>
diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png
new file mode 100644
index 00000000..1eb30f60
--- /dev/null
+++ b/tpl/img/light/shaarli.png
diff --git a/tpl/layout.twig b/tpl/layout.twig
index b86983da..07ca231c 100644
--- a/tpl/layout.twig
+++ b/tpl/layout.twig
@@ -1,13 +1,15 @@
 <!DOCTYPE html>
-<!--[if lte IE 6]> <html class="no-js ie6 ie67 ie678" lang="en"> <![endif]-->
-<!--[if lte IE 7]> <html class="no-js ie7 ie67 ie678" lang="en"> <![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 ie678" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
+<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
+<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
+<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
+<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
 <html>
     <head>
         <meta name="viewport" content="initial-scale=1.0">
         <meta charset="utf-8">
+        <!--[if IE]>
         <meta http-equiv="X-UA-Compatible" content="IE=10">
+        <![endif]-->
         <title>{% block title %}{% endblock %} - poche</title>
 {% include '_head.twig' %}
 {% include '_bookmarklet.twig' %}
diff --git a/tpl/login.twig b/tpl/login.twig
index 0ae130bc..b24674e2 100644
--- a/tpl/login.twig
+++ b/tpl/login.twig
@@ -23,7 +23,7 @@
                                                 </div>
                                         </div>
                                         <div class="row mts txtcenter">
-                                                <button class="bouton" type="submit" tabindex="4">{% trans "Login" %}</button>
+                                                <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
                                         </div>
                 </fieldset>
                 <input type="hidden" name="returnurl" value="{{ referer }}">
diff --git a/tpl/view.twig b/tpl/view.twig
index 2cbb9ca9..28508772 100644
--- a/tpl/view.twig
+++ b/tpl/view.twig
@@ -1,21 +1,20 @@
 {% extends "layout.twig" %}
-{% block title %}{% trans "home" %}{% endblock %}
+{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
 {% block content %}
         <div id="article">
             <div class="tools">
                 <ul class="tools">
-                    <li>
-                        <li><a href="./" title="{% trans "back to home" %}" class="tool back"><span></span></a></li>
-                        <a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span></span></a></li>
-                        <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span></span></a></li>
-                        <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li>
-                        {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title}}%20{{ entry.url|e }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span></span></a></li>{% endif %}
-                        {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|e }}&body={{ entry.url|e }} via @getpoche" class="tool email" title="{% trans "email" %}"><span></span></a></li>{% endif %}
-                    </li>
+                    <li><a href="./" title="{% trans "back to home" %}" class="tool back"><span>{% trans "back to home" %}</span></a></li>
+                    <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
+                    <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
+                    <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
+                    {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span>{% trans "tweet" %}</span></a></li>{% endif %}
+                    {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@getpoche" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %}
+                    {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
                 </ul>
             </div>
             <header class="mbm">
-                <h1>{{ entry.title|e }}</h1>
+                <h1>{{ entry.title|raw }}</h1>
                 <div class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></div>
             </header>
             <article>
@@ -24,17 +23,16 @@
             </article>
             <div class="tools">
                 <ul class="tools">
-                    <li>
-                        <li><a href="./?" title="{% trans "back to home" %}" class="tool back"><span></span></a></li>
-                        <li><a href="#top" title="{% trans "back to top" %}" class="tool top"><span></span></a></li>
-                        <a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span></span></a></li>
-                        <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span></span></a></li>
-                        <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li>
-                        {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title}}%20{{ entry.url|e }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span></span></a></li>{% endif %}
-                        {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|e }}&body={{ entry.url|e }} via @getpoche" class="tool email" title="{% trans "email" %}"><span></span></a></li>{% endif %}
-                    </li>
+                    <li><a href="./?" title="{% trans "back to home" %}" class="tool back"><span>{% trans "back to home" %}</span></a></li>
+                    <li><a href="#top" title="{% trans "back to top" %}" class="tool top"><span>{% trans "back to top" %}</span></a></li>
+                    <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
+                    <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
+                    <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
+                    {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span>{% trans "tweet" %}</span></a></li>{% endif %}
+                    {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@getpoche" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %}
+                    {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
                 </ul>
-                <p>{% trans "this article appears wrong?" %} <a href="https://github.com/inthepoche/poche/issues/new">{% trans "create an issue" %}</a> {% trans "or" %} <a href="mailto:support@inthepoche.com?subject=Wrong display in poche&body={{ entry.url|e }}">{% trans "contact us by mail" %}</a></p>
+                <p>{% trans "this article appears wrong?" %} <a href="https://github.com/inthepoche/poche/issues/new">{% trans "create an issue" %}</a> {% trans "or" %} <a href="mailto:support@inthepoche.com?subject=Wrong%20display%20in%20poche&amp;body={{ entry.url|url_encode }}">{% trans "contact us by mail" %}</a></p>
             </div>
         </div>
 {% endblock %}
\ No newline at end of file