Merge pull request #1 from inthepoche/dev

Dev

32 files changed, 142 insertions, 40 deletions

diff --git a/themes/README.md b/themes/README.md
index 9e5d6560..b5d925b4 100644
--- a/themes/README.md
+++ b/themes/README.md
@@ -24,7 +24,7 @@ That's all !
 
 ## create a theme
 
-Just have a look to this short documentation : http://inthepoche.com/doc/doku.php?id=designers:creating_theme
+Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme
 
 ## send a theme
 
diff --git a/themes/dark/img/dark/backtotop.png b/themes/dark/img/dark/backtotop.png
index 051238ef..c885086d 100755..100644
--- a/themes/dark/img/dark/backtotop.png
+++ b/themes/dark/img/dark/backtotop.png
diff --git a/themes/dark/img/dark/bad-display.png b/themes/dark/img/dark/bad-display.png
index 6866799f..66ea2e16 100755..100644
--- a/themes/dark/img/dark/bad-display.png
+++ b/themes/dark/img/dark/bad-display.png
diff --git a/themes/dark/img/dark/checkmark-off.png b/themes/dark/img/dark/checkmark-off.png
index 3db5a06d..661ea997 100644
--- a/themes/dark/img/dark/checkmark-off.png
+++ b/themes/dark/img/dark/checkmark-off.png
diff --git a/themes/dark/img/dark/checkmark-on.png b/themes/dark/img/dark/checkmark-on.png
index cd3abb2c..5ee8c8d3 100644
--- a/themes/dark/img/dark/checkmark-on.png
+++ b/themes/dark/img/dark/checkmark-on.png
diff --git a/themes/dark/img/dark/down.png b/themes/dark/img/dark/down.png
index b9d536a7..4150e17c 100644
--- a/themes/dark/img/dark/down.png
+++ b/themes/dark/img/dark/down.png
diff --git a/themes/dark/img/dark/envelop.png b/themes/dark/img/dark/envelop.png
index 6be1c886..73d9b0b9 100644
--- a/themes/dark/img/dark/envelop.png
+++ b/themes/dark/img/dark/envelop.png
diff --git a/themes/dark/img/dark/flattr.png b/themes/dark/img/dark/flattr.png
index 0404aaea..b457d080 100755..100644
--- a/themes/dark/img/dark/flattr.png
+++ b/themes/dark/img/dark/flattr.png
diff --git a/themes/dark/img/dark/left.png b/themes/dark/img/dark/left.png
index a0a53631..c2f7a20e 100644
--- a/themes/dark/img/dark/left.png
+++ b/themes/dark/img/dark/left.png
diff --git a/themes/dark/img/dark/link.png b/themes/dark/img/dark/link.png
index db62819d..a5b8d8d2 100755..100644
--- a/themes/dark/img/dark/link.png
+++ b/themes/dark/img/dark/link.png
diff --git a/themes/dark/img/dark/remove.png b/themes/dark/img/dark/remove.png
index f8ad56a3..0c3dcfdf 100644
--- a/themes/dark/img/dark/remove.png
+++ b/themes/dark/img/dark/remove.png
diff --git a/themes/dark/img/dark/shaarli.png b/themes/dark/img/dark/shaarli.png
index 1eb30f60..e68ac8b5 100644
--- a/themes/dark/img/dark/shaarli.png
+++ b/themes/dark/img/dark/shaarli.png
diff --git a/themes/dark/img/dark/star-off.png b/themes/dark/img/dark/star-off.png
index 6a0133a7..8194bc2d 100644
--- a/themes/dark/img/dark/star-off.png
+++ b/themes/dark/img/dark/star-off.png
diff --git a/themes/dark/img/dark/star-on.png b/themes/dark/img/dark/star-on.png
index a9f96eaa..109c3aec 100644
--- a/themes/dark/img/dark/star-on.png
+++ b/themes/dark/img/dark/star-on.png
diff --git a/themes/dark/img/dark/top.png b/themes/dark/img/dark/top.png
index 954a8c0a..d137bd24 100644
--- a/themes/dark/img/dark/top.png
+++ b/themes/dark/img/dark/top.png
diff --git a/themes/dark/img/dark/twitter.png b/themes/dark/img/dark/twitter.png
index cfcfe419..6ce8a4d9 100644
--- a/themes/dark/img/dark/twitter.png
+++ b/themes/dark/img/dark/twitter.png
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index d0cbd320..577cc693 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -8,3 +8,4 @@
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
         <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script>
\ No newline at end of file
diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig
index 699d6a0c..02bec1dc 100644
--- a/themes/default/_menu.twig
+++ b/themes/default/_menu.twig
@@ -2,6 +2,7 @@
                 <li><a href="./" {% if view == 'home' %}class="current"{% endif %}>{% trans "home" %}</a></li>
                 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
+                <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
                 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                 <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
             </ul>
\ No newline at end of file
diff --git a/themes/default/_top.twig b/themes/default/_top.twig
index 4100f7c4..b5f65028 100644
--- a/themes/default/_top.twig
+++ b/themes/default/_top.twig
@@ -1,7 +1,7 @@
         <header class="w600p center mbm">
             <h1>
                 {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/logo.png" alt="logo poche" />{% endblock %}
-                {% else %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }}</a>
+                {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a>
                 {% endif %}
             </h1>
-        </header>
\ No newline at end of file
+        </header>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 23860ebd..10df726e 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -5,28 +5,41 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
-            <h2>{% trans "Poching a link" %}</h2>
-            <p>{% trans "You can poche a link by several methods:" %} (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p>
+            <h2>{% trans "Poching links" %}</h2>
+            <p>{% trans "There are several ways to poche a link:" %} (<a href="http://doc.inthepoche.com/" 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">{% trans "download the extension" %}</a></li>
-                <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">{% trans "download the extension" %}</a></li>
-                <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">{% trans "download the application" %}</a></li>
+                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <li>Chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
+                <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+                <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
                 <li>
                     <form method="get" action="index.php">
-                        <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label>
-                        <input required placeholder="Ex:mywebsite.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+                        <label class="addurl" for="plainurl">{% trans "By filling this field" %}:</label>
+                        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
                         <input type="submit" value="{% trans "poche it!" %}" />
                     </form>
                 </li>
-                <li>{% trans "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>
+                <li>{% trans "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>
             <ul>
-                <li>{% trans "your version" %} : <strong>{{ constant('POCHE') }}</strong></li>
-                <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
+                <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/">{% 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/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
             </ul>
+
+            <h2>{% trans "Feeds" %}</h2>
+            {% if token == '' %}
+                <p>{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
+            {% else %}
+            <ul>
+                <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
+                <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
+                <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
+            </ul>
+            <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
+            {% endif %}
             
             <h2>{% trans "Change your theme" %}</h2>
             <form method="post" action="?updatetheme" name="changethemeform">
@@ -66,6 +79,7 @@
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
 
+            {% if http_auth == 0 %}
             <h2>{% trans "Change your password" %}</h2>
             <form method="post" action="?config" name="loginform">
                 <fieldset class="w500p">
@@ -84,16 +98,19 @@
                 <input type="hidden" name="returnurl" value="{{ referer }}">
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
+            {% endif %}
 
             <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/doc">inthepoche.com</a></p>
+            <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
+            <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/doku.php?id=users:migrate">inthepoche.com</a></p>
             <ul>
-                <li><a href="./?import&amp;from=pocket">{% trans "import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
-            <li><a href="./?import&amp;from=readability">{% trans "import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
-            <li><a href="./?import&amp;from=instapaper">{% trans "import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
+                <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
+            <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
+            <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</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>
+            <h2>{% trans "Export your poche data" %}</h2>
+            {% if constant('STORAGE') == 'sqlite' %}
+            <p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
+            <p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your poche data." %}</p>
 {% endblock %}
diff --git a/themes/default/css/print.css b/themes/default/css/print.css
index 9aefa779..625478e1 100644
--- a/themes/default/css/print.css
+++ b/themes/default/css/print.css
@@ -24,7 +24,8 @@ body > footer,
 div.tools,
 header div,
 .messages,
-.entrie + .results {
+.entrie + .results,
+#article_toolbar {
     display: none !important;
 }
 
@@ -32,6 +33,10 @@ article {
     border: none !important;
 }
 
+pre code {
+    line-height: 1.6em;
+}
+
 /* Add URL after links */
 .vieworiginal a:after {
     content: " (" attr(href) ")";
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 670eb50f..2088ee2e 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -176,6 +176,12 @@ a:visited {
     text-decoration: none;
 }
 
+#article .tags {
+    font-size: 0.8em;
+    color: #888;
+    padding-bottom: 5px;
+}
+
 .backhome {
     display: inline;
 }
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
new file mode 100644
index 00000000..53852d39
--- /dev/null
+++ b/themes/default/edit-tags.twig
@@ -0,0 +1,20 @@
+{% extends "layout.twig" %}
+{% block title %}edit tags{% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+{% if tags is empty %}
+no tags
+{% endif %}
+<ul>
+{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
+</ul>
+<form method="post" action="./?action=add_tag">
+    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
+    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
+    <input type="hidden" name="entry_id" value="{{ entry_id }}" />
+    <input type="submit" value="Tag" />
+</form>
+<a href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
+{% endblock %}
diff --git a/themes/default/error.twig b/themes/default/error.twig
index 99eb1ed6..4cfc4824 100644
--- a/themes/default/error.twig
+++ b/themes/default/error.twig
@@ -7,5 +7,5 @@
             <li>{{message}}</li>
         {% endfor %}
     </ol>
-    <p>Don't forget <a href="http://inthepoche.com/doc">the documentation</a>.</p>
-{% endblock %}
\ No newline at end of file
+    <p>Don't forget <a href="http://doc.inthepoche.com/">the documentation</a>.</p>
+{% endblock %}
diff --git a/themes/default/home.twig b/themes/default/home.twig
index c1b29ec3..cbe8c62f 100644
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -21,7 +21,7 @@
 {% endblock %}
 {% block content %}
             {% if entries is empty %}
-            <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
+            <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
             {% else %}
                 {% block pager %}
                     {% if nb_results > 1 %}
@@ -35,7 +35,7 @@
             <div id="entry-{{ entry.id|e }}" class="entrie">
                 <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 {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
+                    <li><a title="{% trans "Toggle mark as read" %}" class="tool {% if entry.is_read == 0 %}archive-off{% else %}archive{% 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 {% if entry.is_fav == 0 %}fav-off{% else %}fav{% 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><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
@@ -46,4 +46,4 @@
                 {% endfor %}
             {% endif %}
             {{ block('pager') }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/themes/default/img/default/rss.png b/themes/default/img/default/rss.png
new file mode 100644
index 00000000..21bad1a1
--- /dev/null
+++ b/themes/default/img/default/rss.png
diff --git a/themes/default/install.twig b/themes/default/install.twig
index 6e85e5cb..c4da0954 100644
--- a/themes/default/install.twig
+++ b/themes/default/install.twig
@@ -5,7 +5,7 @@
             <fieldset class="w500p center">
                 <h2 class="mbs txtcenter">{% trans "install your poche" %}</h2>
                 <p>
-                    {% trans "poche is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation on poche website</a>." %}
+                    {% trans "Poche is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.inthepoche.com/'>read the documentation on poche website</a>." %}
                 </p>
                 <p class="row">
                     <label class="col w150p" for="login">{% trans "Login" %}</label>
@@ -25,4 +25,4 @@
             </fieldset>
             <input type="hidden" name="token" value="{{ token }}">
         </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/themes/default/js/autoClose.js b/themes/default/js/autoClose.js
new file mode 100644
index 00000000..e9145b7e
--- /dev/null
+++ b/themes/default/js/autoClose.js
@@ -0,0 +1,6 @@
+$(document).ready(function() {
+        current_url = window.location.href
+        if (current_url.match("&closewin=true")) {
+                window.close();
+        }
+});
diff --git a/themes/default/login.twig b/themes/default/login.twig
index 0ae130bc..e2a9a9f5 100644
--- a/themes/default/login.twig
+++ b/themes/default/login.twig
@@ -2,12 +2,13 @@
 
 {% block title %}{% trans "login to your poche" %}{% endblock %}
 {% block content %}
+    {% if http_auth == 0 %}
             <form method="post" action="?login" name="loginform">
                 <fieldset class="w500p center">
-                    <h2 class="mbs txtcenter">{% trans "login to your poche" %}</h2>
+                    <h2 class="mbs txtcenter">{% trans "Login to poche" %}</h2>
                     {% if constant('MODE_DEMO') == 1 %}<p>{% trans "you are in demo mode, some features may be disabled." %}</p>{% endif %}
                                         <div class="row">
-                                                <label class="col w150p" for="login">{% trans "Login" %}</label>
+                                                <label class="col w150p" for="login">{% trans "Username" %}</label>
                                                 <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
                                         </div>
 
@@ -29,4 +30,5 @@
                 <input type="hidden" name="returnurl" value="{{ referer }}">
                 <input type="hidden" name="token" value="{{ token }}">
             </form>
-{% endblock %}
\ No newline at end of file
+    {% endif %}
+{% endblock %}
diff --git a/themes/default/tag.twig b/themes/default/tag.twig
new file mode 100644
index 00000000..364c7cd4
--- /dev/null
+++ b/themes/default/tag.twig
@@ -0,0 +1,33 @@
+{% extends "layout.twig" %}
+{% block title %}tag {% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+    <h3>{% trans "Tag" %} {{ tag.value }}</h3>
+    {% if entries is empty %}
+    <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
+    {% else %}
+        {% block pager %}
+            {% if nb_results > 1 %}
+        <div class="results">
+            <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                {{ page_links | raw }}
+        </div>
+            {% endif %}
+        {% endblock %}
+        {% for entry in entries %}
+    <div id="entry-{{ entry.id|e }}" class="entrie">
+        <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 {% if entry.is_read == 0 %}archive-off{% else %}archive{% 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 {% if entry.is_fav == 0 %}fav-off{% else %}fav{% 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><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
+            <li><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="reading-time"><span>{{ entry.content| getReadingTime }} min</span></a></li>
+        </ul>
+        <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
+    </div>
+        {% endfor %}
+    {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/tags.twig b/themes/default/tags.twig
new file mode 100644
index 00000000..cff6b1d7
--- /dev/null
+++ b/themes/default/tags.twig
@@ -0,0 +1,8 @@
+{% extends "layout.twig" %}
+{% block title %}tags{% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+{% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} {% endfor %}
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
index 1e54ae38..e4a2fe74 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -3,23 +3,26 @@
 {% block content %}
         <div id="article_toolbar">
             <ul>
-                <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 href="./" title="{% trans "Return home" %}" class="tool back"><span>{% trans "Return 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 href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | getDomain }}</span></a></li>
-                <li><a title="{% trans "toggle mark as read" %}" class="tool {% if entry.is_read == 0 %}archive-off{% else %}archive{% 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 {% if entry.is_fav == 0 %}fav-off{% else %}fav{% 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 %}
+                <li><a title="{% trans "Mark as read" %}" class="tool {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
+                <li><a title="{% trans "Favorite" %}" class="tool {% if entry.is_fav == 0 %}fav-off{% else %}fav{% 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 %}
                 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numflattrs }}</a></li>{% endif %}{% endif %}
-                <li><a href="mailto:support@inthepoche.com?subject=Wrong%20display%20in%20poche&amp;body={{ entry.url|url_encode }}" title="{% trans "this article appears wrong?" %}" class="tool bad-display"><span>{% trans "this article appears wrong?" %}</span></a></li>
+                <li><a href="mailto:support@inthepoche.com?subject=Wrong%20display%20in%20poche&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
             </ul>
         </div>
         <div id="article">
             <header class="mbm">
                 <h1>{{ entry.title|raw }}</h1>
             </header>
+            <aside class="tags">
+                tags: {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
+            </aside>
             <article>
                 {{ content | raw }}
             </article>
@@ -48,4 +51,4 @@
             }
         });
         </script> 
-{% endblock %}
\ No newline at end of file
+{% endblock %}