19 files changed, 15 insertions, 3 deletions

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/config.twig b/themes/default/config.twig
index 72671702..21345827 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -8,9 +8,10 @@
             <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>
             <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/fr/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.Poche" title="download the application">{% trans "via google play" %}</a></li>
+                <li>windows phone: <a href="http://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>
diff --git a/themes/default/css/print.css b/themes/default/css/print.css
index 9aefa779..914efbd5 100644
--- a/themes/default/css/print.css
+++ b/themes/default/css/print.css
@@ -32,6 +32,10 @@ article {
     border: none !important;
 }
 
+#article_toolbar {
+    display: none;
+}
+
 /* Add URL after links */
 .vieworiginal a:after {
     content: " (" attr(href) ")";
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();
+        }
+});