Add SHAARLI support to view template

64 files changed, 2 insertions, 0 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9818ae00..9818ae00 100644..100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
diff --git a/COPYING b/COPYING
index ee7d6a54..ee7d6a54 100644..100755
--- a/COPYING
+++ b/COPYING
diff --git a/CREDITS b/CREDITS
index a6dedce4..a6dedce4 100644..100755
--- a/CREDITS
+++ b/CREDITS
diff --git a/INSTALL.md b/INSTALL.md
index 63000f26..63000f26 100644..100755
--- a/INSTALL.md
+++ b/INSTALL.md
diff --git a/README.md b/README.md
index 27f549d9..27f549d9 100644..100755
--- a/README.md
+++ b/README.md
diff --git a/TODO.md b/TODO.md
index ac3c0e98..ac3c0e98 100644..100755
--- a/TODO.md
+++ b/TODO.md
diff --git a/composer.json b/composer.json
index 6c69e48d..6c69e48d 100644..100755
--- a/composer.json
+++ b/composer.json
diff --git a/composer.lock b/composer.lock
index 9e17fca9..9e17fca9 100644..100755
--- a/composer.lock
+++ b/composer.lock
diff --git a/inc/3rdparty/Encoding.php b/inc/3rdparty/Encoding.php
index 577763b4..577763b4 100644..100755
--- a/inc/3rdparty/Encoding.php
+++ b/inc/3rdparty/Encoding.php
diff --git a/inc/3rdparty/JSLikeHTMLElement.php b/inc/3rdparty/JSLikeHTMLElement.php
index 238ba8a8..238ba8a8 100644..100755
--- a/inc/3rdparty/JSLikeHTMLElement.php
+++ b/inc/3rdparty/JSLikeHTMLElement.php
diff --git a/inc/3rdparty/Readability.php b/inc/3rdparty/Readability.php
index 7605871c..7605871c 100644..100755
--- a/inc/3rdparty/Readability.php
+++ b/inc/3rdparty/Readability.php
diff --git a/inc/3rdparty/Session.class.php b/inc/3rdparty/Session.class.php
index 3162f507..3162f507 100644..100755
--- a/inc/3rdparty/Session.class.php
+++ b/inc/3rdparty/Session.class.php
diff --git a/inc/3rdparty/paginator.php b/inc/3rdparty/paginator.php
index 306756c0..306756c0 100644..100755
--- a/inc/3rdparty/paginator.php
+++ b/inc/3rdparty/paginator.php
diff --git a/inc/3rdparty/simple_html_dom.php b/inc/3rdparty/simple_html_dom.php
index 43b94e57..43b94e57 100644..100755
--- a/inc/3rdparty/simple_html_dom.php
+++ b/inc/3rdparty/simple_html_dom.php
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 84916b83..84916b83 100644..100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index e0dc0d20..e0dc0d20 100644..100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 52d0f2d5..52d0f2d5 100644..100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
diff --git a/inc/poche/Url.class.php b/inc/poche/Url.class.php
index 3c74fb43..3c74fb43 100644..100755
--- a/inc/poche/Url.class.php
+++ b/inc/poche/Url.class.php
diff --git a/inc/poche/User.class.php b/inc/poche/User.class.php
index 6dac7839..6dac7839 100644..100755
--- a/inc/poche/User.class.php
+++ b/inc/poche/User.class.php
diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php
index 4e4a0b08..4e4a0b08 100644..100755
--- a/inc/poche/pochePictures.php
+++ b/inc/poche/pochePictures.php
diff --git a/index.php b/index.php
index 5f43b740..5f43b740 100644..100755
--- a/index.php
+++ b/index.php
diff --git a/install/mysql.sql b/install/mysql.sql
index cb232a84..cb232a84 100644..100755
--- a/install/mysql.sql
+++ b/install/mysql.sql
diff --git a/install/postgres.sql b/install/postgres.sql
index 9e0e8276..9e0e8276 100644..100755
--- a/install/postgres.sql
+++ b/install/postgres.sql
diff --git a/install/update.php b/install/update.php
index 8c93af6d..8c93af6d 100644..100755
--- a/install/update.php
+++ b/install/update.php
diff --git a/install/update_sqlite_from_0_to_1.php b/install/update_sqlite_from_0_to_1.php
index 299abf48..299abf48 100644..100755
--- a/install/update_sqlite_from_0_to_1.php
+++ b/install/update_sqlite_from_0_to_1.php
diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
index 3afc2b32..3afc2b32 100644..100755
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
index fafe516c..fafe516c 100644..100755
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
index aa3d4182..aa3d4182 100644..100755
--- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
+++ b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
index 236297d7..236297d7 100644..100755
--- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
+++ b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
index c0d4a9d6..c0d4a9d6 100644..100755
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
index 7f8cf784..7f8cf784 100644..100755
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e69de29b..e69de29b 100644..100755
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
diff --git a/robots.txt b/robots.txt
index 77470cb3..77470cb3 100644..100755
--- a/robots.txt
+++ b/robots.txt
diff --git a/tpl/_bookmarklet.twig b/tpl/_bookmarklet.twig
index 2f3b2d16..2f3b2d16 100644..100755
--- a/tpl/_bookmarklet.twig
+++ b/tpl/_bookmarklet.twig
diff --git a/tpl/_footer.twig b/tpl/_footer.twig
index 6891756a..6891756a 100644..100755
--- a/tpl/_footer.twig
+++ b/tpl/_footer.twig
diff --git a/tpl/_head.twig b/tpl/_head.twig
index 6a8258a2..6a8258a2 100644..100755
--- a/tpl/_head.twig
+++ b/tpl/_head.twig
diff --git a/tpl/_menu.twig b/tpl/_menu.twig
index 699d6a0c..699d6a0c 100644..100755
--- a/tpl/_menu.twig
+++ b/tpl/_menu.twig
diff --git a/tpl/_messages.twig b/tpl/_messages.twig
index 679aa098..679aa098 100644..100755
--- a/tpl/_messages.twig
+++ b/tpl/_messages.twig
diff --git a/tpl/_top.twig b/tpl/_top.twig
index ae01cc3f..ae01cc3f 100644..100755
--- a/tpl/_top.twig
+++ b/tpl/_top.twig
diff --git a/tpl/config.twig b/tpl/config.twig
index 0b231187..0b231187 100644..100755
--- a/tpl/config.twig
+++ b/tpl/config.twig
diff --git a/tpl/css/knacss.css b/tpl/css/knacss.css
index ca0696b7..ca0696b7 100644..100755
--- a/tpl/css/knacss.css
+++ b/tpl/css/knacss.css
diff --git a/tpl/css/print.css b/tpl/css/print.css
index a3b0a599..a3b0a599 100644..100755
--- a/tpl/css/print.css
+++ b/tpl/css/print.css
diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css
index e2788a1c..e2788a1c 100644..100755
--- a/tpl/css/style-light.css
+++ b/tpl/css/style-light.css
diff --git a/tpl/css/style.css b/tpl/css/style.css
index 85df6e95..85df6e95 100644..100755
--- a/tpl/css/style.css
+++ b/tpl/css/style.css
diff --git a/tpl/error.twig b/tpl/error.twig
index 84c3bc1c..84c3bc1c 100644..100755
--- a/tpl/error.twig
+++ b/tpl/error.twig
diff --git a/tpl/export.twig b/tpl/export.twig
index 4adb9540..4adb9540 100644..100755
--- a/tpl/export.twig
+++ b/tpl/export.twig
diff --git a/tpl/home.twig b/tpl/home.twig
index a2fa9a93..a2fa9a93 100644..100755
--- a/tpl/home.twig
+++ b/tpl/home.twig
diff --git a/tpl/img/apple-touch-icon-144x144-precomposed.png b/tpl/img/apple-touch-icon-144x144-precomposed.png
index 557b479c..557b479c 100644..100755
--- a/tpl/img/apple-touch-icon-144x144-precomposed.png
+++ b/tpl/img/apple-touch-icon-144x144-precomposed.png
diff --git a/tpl/img/apple-touch-icon-72x72-precomposed.png b/tpl/img/apple-touch-icon-72x72-precomposed.png
index e167d3a4..e167d3a4 100644..100755
--- a/tpl/img/apple-touch-icon-72x72-precomposed.png
+++ b/tpl/img/apple-touch-icon-72x72-precomposed.png
diff --git a/tpl/img/apple-touch-icon.png b/tpl/img/apple-touch-icon.png
index 4d222fba..4d222fba 100644..100755
--- a/tpl/img/apple-touch-icon.png
+++ b/tpl/img/apple-touch-icon.png
diff --git a/tpl/img/favicon.ico b/tpl/img/favicon.ico
index 0e9ff779..0e9ff779 100644..100755
--- a/tpl/img/favicon.ico
+++ b/tpl/img/favicon.ico
diff --git a/tpl/img/light/checkmark-off.png b/tpl/img/light/checkmark-off.png
index 3db5a06d..3db5a06d 100644..100755
--- a/tpl/img/light/checkmark-off.png
+++ b/tpl/img/light/checkmark-off.png
diff --git a/tpl/img/light/checkmark-on.png b/tpl/img/light/checkmark-on.png
index cd3abb2c..cd3abb2c 100644..100755
--- a/tpl/img/light/checkmark-on.png
+++ b/tpl/img/light/checkmark-on.png
diff --git a/tpl/img/light/down.png b/tpl/img/light/down.png
index b9d536a7..b9d536a7 100644..100755
--- a/tpl/img/light/down.png
+++ b/tpl/img/light/down.png
diff --git a/tpl/img/light/remove.png b/tpl/img/light/remove.png
index f8ad56a3..f8ad56a3 100644..100755
--- a/tpl/img/light/remove.png
+++ b/tpl/img/light/remove.png
diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png
index 1eb30f60..1eb30f60 100644..100755
--- a/tpl/img/light/shaarli.png
+++ b/tpl/img/light/shaarli.png
diff --git a/tpl/img/light/star-off.png b/tpl/img/light/star-off.png
index 6a0133a7..6a0133a7 100644..100755
--- a/tpl/img/light/star-off.png
+++ b/tpl/img/light/star-off.png
diff --git a/tpl/img/light/star-on.png b/tpl/img/light/star-on.png
index a9f96eaa..a9f96eaa 100644..100755
--- a/tpl/img/light/star-on.png
+++ b/tpl/img/light/star-on.png
diff --git a/tpl/img/logo.png b/tpl/img/logo.png
index 5305c77d..5305c77d 100644..100755
--- a/tpl/img/logo.png
+++ b/tpl/img/logo.png
diff --git a/tpl/install.twig b/tpl/install.twig
index afb5b0f6..afb5b0f6 100644..100755
--- a/tpl/install.twig
+++ b/tpl/install.twig
diff --git a/tpl/js/jquery-2.0.3.min.js b/tpl/js/jquery-2.0.3.min.js
index 2be209dd..2be209dd 100644..100755
--- a/tpl/js/jquery-2.0.3.min.js
+++ b/tpl/js/jquery-2.0.3.min.js
diff --git a/tpl/layout.twig b/tpl/layout.twig
index 7084a215..7084a215 100644..100755
--- a/tpl/layout.twig
+++ b/tpl/layout.twig
diff --git a/tpl/login.twig b/tpl/login.twig
index 0ae130bc..0ae130bc 100644..100755
--- a/tpl/login.twig
+++ b/tpl/login.twig
diff --git a/tpl/view.twig b/tpl/view.twig
index 4dee38c8..219faa56 100644..100755
--- a/tpl/view.twig
+++ b/tpl/view.twig
@@ -10,6 +10,7 @@
                     <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|e }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
                 </ul>
             </div>
             <header class="mbm">
@@ -29,6 +30,7 @@
                     <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%20display%20in%20poche&amp;body={{ entry.url|url_encode }}">{% trans "contact us by mail" %}</a></p>
             </div>