]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Revert "Add SHAARLI support to view template"
authorNicolas Frandeboeuf <nicofrand@gmail.com>
Fri, 23 Aug 2013 21:09:43 +0000 (23:09 +0200)
committerNicolas Frandeboeuf <nicofrand@gmail.com>
Fri, 23 Aug 2013 21:09:43 +0000 (23:09 +0200)
This reverts commit 0269cd821311500acffed61edb1bc168d3fb5ec8.

64 files changed:
CONTRIBUTING.md [changed mode: 0755->0644]
COPYING [changed mode: 0755->0644]
CREDITS [changed mode: 0755->0644]
INSTALL.md [changed mode: 0755->0644]
README.md [changed mode: 0755->0644]
TODO.md [changed mode: 0755->0644]
composer.json [changed mode: 0755->0644]
composer.lock [changed mode: 0755->0644]
inc/3rdparty/Encoding.php [changed mode: 0755->0644]
inc/3rdparty/JSLikeHTMLElement.php [changed mode: 0755->0644]
inc/3rdparty/Readability.php [changed mode: 0755->0644]
inc/3rdparty/Session.class.php [changed mode: 0755->0644]
inc/3rdparty/paginator.php [changed mode: 0755->0644]
inc/3rdparty/simple_html_dom.php [changed mode: 0755->0644]
inc/poche/Database.class.php [changed mode: 0755->0644]
inc/poche/Poche.class.php [changed mode: 0755->0644]
inc/poche/Tools.class.php [changed mode: 0755->0644]
inc/poche/Url.class.php [changed mode: 0755->0644]
inc/poche/User.class.php [changed mode: 0755->0644]
inc/poche/pochePictures.php [changed mode: 0755->0644]
index.php [changed mode: 0755->0644]
install/mysql.sql [changed mode: 0755->0644]
install/postgres.sql [changed mode: 0755->0644]
install/update.php [changed mode: 0755->0644]
install/update_sqlite_from_0_to_1.php [changed mode: 0755->0644]
locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo [changed mode: 0755->0644]
locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po [changed mode: 0755->0644]
locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo [changed mode: 0755->0644]
locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po [changed mode: 0755->0644]
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo [changed mode: 0755->0644]
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po [changed mode: 0755->0644]
phpunit.xml.dist [changed mode: 0755->0644]
robots.txt [changed mode: 0755->0644]
tpl/_bookmarklet.twig [changed mode: 0755->0644]
tpl/_footer.twig [changed mode: 0755->0644]
tpl/_head.twig [changed mode: 0755->0644]
tpl/_menu.twig [changed mode: 0755->0644]
tpl/_messages.twig [changed mode: 0755->0644]
tpl/_top.twig [changed mode: 0755->0644]
tpl/config.twig [changed mode: 0755->0644]
tpl/css/knacss.css [changed mode: 0755->0644]
tpl/css/print.css [changed mode: 0755->0644]
tpl/css/style-light.css [changed mode: 0755->0644]
tpl/css/style.css [changed mode: 0755->0644]
tpl/error.twig [changed mode: 0755->0644]
tpl/export.twig [changed mode: 0755->0644]
tpl/home.twig [changed mode: 0755->0644]
tpl/img/apple-touch-icon-144x144-precomposed.png [changed mode: 0755->0644]
tpl/img/apple-touch-icon-72x72-precomposed.png [changed mode: 0755->0644]
tpl/img/apple-touch-icon.png [changed mode: 0755->0644]
tpl/img/favicon.ico [changed mode: 0755->0644]
tpl/img/light/checkmark-off.png [changed mode: 0755->0644]
tpl/img/light/checkmark-on.png [changed mode: 0755->0644]
tpl/img/light/down.png [changed mode: 0755->0644]
tpl/img/light/remove.png [changed mode: 0755->0644]
tpl/img/light/shaarli.png [changed mode: 0755->0644]
tpl/img/light/star-off.png [changed mode: 0755->0644]
tpl/img/light/star-on.png [changed mode: 0755->0644]
tpl/img/logo.png [changed mode: 0755->0644]
tpl/install.twig [changed mode: 0755->0644]
tpl/js/jquery-2.0.3.min.js [changed mode: 0755->0644]
tpl/layout.twig [changed mode: 0755->0644]
tpl/login.twig [changed mode: 0755->0644]
tpl/view.twig [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
diff --git a/COPYING b/COPYING
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/CREDITS b/CREDITS
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/TODO.md b/TODO.md
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 219faa5..4dee38c
@@ -10,7 +10,6 @@
                     <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">
@@ -30,7 +29,6 @@
                     <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>