From 2b191d8c37bd774bd3eecbf42a5ac9d948ee61a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Sat, 26 Oct 2013 13:23:31 +0200
Subject: fix download links

---
 themes/default/config.twig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'themes')

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>
-- 
cgit v1.2.3


From 363bc4eb8642d464cc0c099f7ab72a425b56b463 Mon Sep 17 00:00:00 2001
From: banux <banux@helheim.net>
Date: Sun, 27 Oct 2013 07:37:05 +0100
Subject: Add a autoclose parameters. When we use sharing method in plugins
 like the tiny tiny rss one or the firefox plugins we can passe the
 autoclose=true parameters that close the popup.

---
 themes/default/_head.twig      | 1 +
 themes/default/js/autoClose.js | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 themes/default/js/autoClose.js

(limited to 'themes')

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/js/autoClose.js b/themes/default/js/autoClose.js
new file mode 100644
index 00000000..3035d423
--- /dev/null
+++ b/themes/default/js/autoClose.js
@@ -0,0 +1,6 @@
+$(document).ready(function() {
+	current_url = window.location.href
+	if (current_url.match("&autoclose=true")) {
+		window.close();
+	}
+});
\ No newline at end of file
-- 
cgit v1.2.3


From f616ab60efc502b919b9b72f81aee2975b2e8465 Mon Sep 17 00:00:00 2001
From: banux <banux@helheim.net>
Date: Sun, 27 Oct 2013 07:47:14 +0100
Subject: use 2 seprate variable for autoclosing windows to avoid to quick
 closing when sharing, the popup can be close before the link is save

---
 themes/default/js/autoClose.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes')

diff --git a/themes/default/js/autoClose.js b/themes/default/js/autoClose.js
index 3035d423..e9145b7e 100644
--- a/themes/default/js/autoClose.js
+++ b/themes/default/js/autoClose.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
 	current_url = window.location.href
-	if (current_url.match("&autoclose=true")) {
+	if (current_url.match("&closewin=true")) {
 		window.close();
 	}
-});
\ No newline at end of file
+});
-- 
cgit v1.2.3


From c7abf20bbe5a0dd504007c16ff42265f67604516 Mon Sep 17 00:00:00 2001
From: jno <jno@pisem.net>
Date: Tue, 12 Nov 2013 20:34:55 +0400
Subject: dark theme images replaced to visible set, no executable bits for
 pictures

---
 themes/dark/img/dark/backtotop.png     | Bin 326 -> 250 bytes
 themes/dark/img/dark/bad-display.png   | Bin 343 -> 403 bytes
 themes/dark/img/dark/checkmark-off.png | Bin 277 -> 339 bytes
 themes/dark/img/dark/checkmark-on.png  | Bin 235 -> 288 bytes
 themes/dark/img/dark/down.png          | Bin 216 -> 269 bytes
 themes/dark/img/dark/envelop.png       | Bin 285 -> 361 bytes
 themes/dark/img/dark/flattr.png        | Bin 270 -> 331 bytes
 themes/dark/img/dark/left.png          | Bin 196 -> 264 bytes
 themes/dark/img/dark/link.png          | Bin 341 -> 404 bytes
 themes/dark/img/dark/remove.png        | Bin 252 -> 300 bytes
 themes/dark/img/dark/shaarli.png       | Bin 729 -> 841 bytes
 themes/dark/img/dark/star-off.png      | Bin 314 -> 382 bytes
 themes/dark/img/dark/star-on.png       | Bin 281 -> 327 bytes
 themes/dark/img/dark/top.png           | Bin 212 -> 250 bytes
 themes/dark/img/dark/twitter.png       | Bin 297 -> 375 bytes
 15 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 themes/dark/img/dark/backtotop.png
 mode change 100755 => 100644 themes/dark/img/dark/bad-display.png
 mode change 100755 => 100644 themes/dark/img/dark/flattr.png
 mode change 100755 => 100644 themes/dark/img/dark/link.png

(limited to 'themes')

diff --git a/themes/dark/img/dark/backtotop.png b/themes/dark/img/dark/backtotop.png
old mode 100755
new mode 100644
index 051238ef..c885086d
Binary files a/themes/dark/img/dark/backtotop.png and b/themes/dark/img/dark/backtotop.png differ
diff --git a/themes/dark/img/dark/bad-display.png b/themes/dark/img/dark/bad-display.png
old mode 100755
new mode 100644
index 6866799f..66ea2e16
Binary files a/themes/dark/img/dark/bad-display.png and b/themes/dark/img/dark/bad-display.png differ
diff --git a/themes/dark/img/dark/checkmark-off.png b/themes/dark/img/dark/checkmark-off.png
index 3db5a06d..661ea997 100644
Binary files a/themes/dark/img/dark/checkmark-off.png and b/themes/dark/img/dark/checkmark-off.png differ
diff --git a/themes/dark/img/dark/checkmark-on.png b/themes/dark/img/dark/checkmark-on.png
index cd3abb2c..5ee8c8d3 100644
Binary files a/themes/dark/img/dark/checkmark-on.png and b/themes/dark/img/dark/checkmark-on.png differ
diff --git a/themes/dark/img/dark/down.png b/themes/dark/img/dark/down.png
index b9d536a7..4150e17c 100644
Binary files a/themes/dark/img/dark/down.png and b/themes/dark/img/dark/down.png differ
diff --git a/themes/dark/img/dark/envelop.png b/themes/dark/img/dark/envelop.png
index 6be1c886..73d9b0b9 100644
Binary files a/themes/dark/img/dark/envelop.png and b/themes/dark/img/dark/envelop.png differ
diff --git a/themes/dark/img/dark/flattr.png b/themes/dark/img/dark/flattr.png
old mode 100755
new mode 100644
index 0404aaea..b457d080
Binary files a/themes/dark/img/dark/flattr.png and b/themes/dark/img/dark/flattr.png differ
diff --git a/themes/dark/img/dark/left.png b/themes/dark/img/dark/left.png
index a0a53631..c2f7a20e 100644
Binary files a/themes/dark/img/dark/left.png and b/themes/dark/img/dark/left.png differ
diff --git a/themes/dark/img/dark/link.png b/themes/dark/img/dark/link.png
old mode 100755
new mode 100644
index db62819d..a5b8d8d2
Binary files a/themes/dark/img/dark/link.png and b/themes/dark/img/dark/link.png differ
diff --git a/themes/dark/img/dark/remove.png b/themes/dark/img/dark/remove.png
index f8ad56a3..0c3dcfdf 100644
Binary files a/themes/dark/img/dark/remove.png and b/themes/dark/img/dark/remove.png differ
diff --git a/themes/dark/img/dark/shaarli.png b/themes/dark/img/dark/shaarli.png
index 1eb30f60..e68ac8b5 100644
Binary files a/themes/dark/img/dark/shaarli.png and b/themes/dark/img/dark/shaarli.png differ
diff --git a/themes/dark/img/dark/star-off.png b/themes/dark/img/dark/star-off.png
index 6a0133a7..8194bc2d 100644
Binary files a/themes/dark/img/dark/star-off.png and b/themes/dark/img/dark/star-off.png differ
diff --git a/themes/dark/img/dark/star-on.png b/themes/dark/img/dark/star-on.png
index a9f96eaa..109c3aec 100644
Binary files a/themes/dark/img/dark/star-on.png and b/themes/dark/img/dark/star-on.png differ
diff --git a/themes/dark/img/dark/top.png b/themes/dark/img/dark/top.png
index 954a8c0a..d137bd24 100644
Binary files a/themes/dark/img/dark/top.png and b/themes/dark/img/dark/top.png differ
diff --git a/themes/dark/img/dark/twitter.png b/themes/dark/img/dark/twitter.png
index cfcfe419..6ce8a4d9 100644
Binary files a/themes/dark/img/dark/twitter.png and b/themes/dark/img/dark/twitter.png differ
-- 
cgit v1.2.3


From b7066c033317bf305c93a808c456da1c9d7415f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Wed, 13 Nov 2013 14:50:56 +0100
Subject: [fix] bug fix #311: remove toolbar when printing article

---
 themes/default/css/print.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'themes')

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) ")";
-- 
cgit v1.2.3


From d7aec74403a0ed93d3079883dbc99c291a7e6b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Thu, 14 Nov 2013 11:14:15 +0100
Subject: [change] reuse existing class for article_toolbar

---
 themes/default/css/print.css | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'themes')

diff --git a/themes/default/css/print.css b/themes/default/css/print.css
index 914efbd5..99c00bdf 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,10 +33,6 @@ article {
     border: none !important;
 }
 
-#article_toolbar {
-    display: none;
-}
-
 /* Add URL after links */
 .vieworiginal a:after {
     content: " (" attr(href) ")";
-- 
cgit v1.2.3