aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--inc/3rdparty/FlattrItem.class.php4
-rw-r--r--inc/3rdparty/site_config/custom/interviewmagazine.com.txt4
-rw-r--r--inc/3rdparty/site_config/custom/inthepoche.com.txt7
-rw-r--r--inc/poche/Database.class.php6
-rw-r--r--inc/poche/Poche.class.php59
-rw-r--r--inc/poche/pochePictures.php6
-rw-r--r--locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mobin4826 -> 4823 bytes
-rw-r--r--locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po10
-rw-r--r--locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mobin4779 -> 4776 bytes
-rw-r--r--locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po8
-rw-r--r--locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mobin4487 -> 4481 bytes
-rw-r--r--locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po16
-rw-r--r--locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mobin4198 -> 4195 bytes
-rw-r--r--locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po10
-rw-r--r--locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mobin5635 -> 5632 bytes
-rw-r--r--locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po10
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mobin4813 -> 4810 bytes
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po10
-rw-r--r--locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mobin4900 -> 4897 bytes
-rw-r--r--locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po10
-rw-r--r--locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mobin5806 -> 5803 bytes
-rw-r--r--locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po10
-rw-r--r--poche_compatibility_test.php2
-rw-r--r--themes/README.md2
-rw-r--r--themes/default/_top.twig2
-rw-r--r--themes/default/config.twig22
-rw-r--r--themes/default/css/print.css4
-rw-r--r--themes/default/edit-tags.twig10
-rw-r--r--themes/default/img/apple-touch-icon-144x144-precomposed.pngbin7349 -> 2361 bytes
-rw-r--r--themes/default/img/apple-touch-icon-72x72-precomposed.pngbin6168 -> 1375 bytes
-rw-r--r--themes/default/img/apple-touch-icon.pngbin5803 -> 1174 bytes
-rw-r--r--themes/default/img/logo.pngbin1350 -> 0 bytes
-rw-r--r--themes/default/img/logo.svg8
33 files changed, 117 insertions, 103 deletions
diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php
index 0d3e69d0..711b4ee0 100644
--- a/inc/3rdparty/FlattrItem.class.php
+++ b/inc/3rdparty/FlattrItem.class.php
@@ -14,12 +14,12 @@ class FlattrItem {
14 $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache"); 14 $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache");
15 if($flattrResponse != FALSE) { 15 if($flattrResponse != FALSE) {
16 $result = json_decode($flattrResponse); 16 $result = json_decode($flattrResponse);
17 if (isset($result->message)){ 17 if (isset($result->message)){
18 if ($result->message == "flattrable") { 18 if ($result->message == "flattrable") {
19 $this->status = FLATTRABLE; 19 $this->status = FLATTRABLE;
20 } 20 }
21 } 21 }
22 elseif ($result->link) { 22 elseif (is_object($result) && $result->link) {
23 $this->status = FLATTRED; 23 $this->status = FLATTRED;
24 $this->flattrItemURL = $result->link; 24 $this->flattrItemURL = $result->link;
25 $this->numflattrs = $result->flattrs; 25 $this->numflattrs = $result->flattrs;
diff --git a/inc/3rdparty/site_config/custom/interviewmagazine.com.txt b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt
new file mode 100644
index 00000000..a9d4f8ca
--- /dev/null
+++ b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt
@@ -0,0 +1,4 @@
1title: //title
2body: //div[contains(@class, 'block')]
3
4test_url: http://www.interviewmagazine.com/film/spike-jonze \ No newline at end of file
diff --git a/inc/3rdparty/site_config/custom/inthepoche.com.txt b/inc/3rdparty/site_config/custom/inthepoche.com.txt
deleted file mode 100644
index ede74b97..00000000
--- a/inc/3rdparty/site_config/custom/inthepoche.com.txt
+++ /dev/null
@@ -1,7 +0,0 @@
1title: //title
2body: //div[@class='post-content']
3
4prune: no
5tidy: no
6
7test_url: http://www.inthepoche.com/?post/poche-hosting \ No newline at end of file
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index afe02a41..04731821 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -81,7 +81,7 @@ class Database {
81 81
82 if (STORAGE == 'sqlite') { 82 if (STORAGE == 'sqlite') {
83 $sql = ' 83 $sql = '
84 CREATE TABLE tags_entries ( 84 CREATE TABLE IF NOT EXISTS tags_entries (
85 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, 85 id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE,
86 entry_id INTEGER, 86 entry_id INTEGER,
87 tag_id INTEGER, 87 tag_id INTEGER,
@@ -337,7 +337,7 @@ class Database {
337 337
338 public function retrieveEntriesByTag($tag_id) { 338 public function retrieveEntriesByTag($tag_id) {
339 $sql = 339 $sql =
340 "SELECT * FROM entries 340 "SELECT entries.* FROM entries
341 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id 341 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
342 WHERE tags_entries.tag_id = ?"; 342 WHERE tags_entries.tag_id = ?";
343 $query = $this->executeQuery($sql, array($tag_id)); 343 $query = $this->executeQuery($sql, array($tag_id));
@@ -348,7 +348,7 @@ class Database {
348 348
349 public function retrieveTagsByEntry($entry_id) { 349 public function retrieveTagsByEntry($entry_id) {
350 $sql = 350 $sql =
351 "SELECT * FROM tags 351 "SELECT tags.* FROM tags
352 LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id 352 LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id
353 WHERE tags_entries.entry_id = ?"; 353 WHERE tags_entries.entry_id = ?";
354 $query = $this->executeQuery($sql, array($entry_id)); 354 $query = $this->executeQuery($sql, array($entry_id));
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 4f70afb7..76a73be2 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -333,7 +333,9 @@ class Poche
333 switch ($action) 333 switch ($action)
334 { 334 {
335 case 'add': 335 case 'add':
336 $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed'); 336 $options = array('http' => array('user_agent' => 'poche'));
337 $context = stream_context_create($options);
338 $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed', false, $context);
337 $content = json_decode($json, true); 339 $content = json_decode($json, true);
338 $title = $content['rss']['channel']['item']['title']; 340 $title = $content['rss']['channel']['item']['title'];
339 $body = $content['rss']['channel']['item']['description']; 341 $body = $content['rss']['channel']['item']['description'];
@@ -806,34 +808,37 @@ class Poche
806 $url = NULL; 808 $url = NULL;
807 $favorite = FALSE; 809 $favorite = FALSE;
808 $archive = FALSE; 810 $archive = FALSE;
809 foreach ($value as $attr => $attr_value) { 811 foreach ($value as $item) {
810 if ($attr == 'article__url') { 812 foreach ($item as $attr => $value) {
811 $url = new Url(base64_encode($attr_value)); 813 if ($attr == 'article__url') {
812 } 814 $url = new Url(base64_encode($value));
813 $sequence = '';
814 if (STORAGE == 'postgres') {
815 $sequence = 'entries_id_seq';
816 }
817 if ($attr_value == 'true') {
818 if ($attr == 'favorite') {
819 $favorite = TRUE;
820 } 815 }
821 if ($attr == 'archive') { 816 $sequence = '';
822 $archive = TRUE; 817 if (STORAGE == 'postgres') {
818 $sequence = 'entries_id_seq';
819 }
820 if ($value == 'true') {
821 if ($attr == 'favorite') {
822 $favorite = TRUE;
823 }
824 if ($attr == 'archive') {
825 $archive = TRUE;
826 }
823 } 827 }
824 } 828 }
825 } 829
826 # we can add the url 830 # we can add the url
827 if (!is_null($url) && $url->isCorrect()) { 831 if (!is_null($url) && $url->isCorrect()) {
828 $this->action('add', $url, 0, TRUE); 832 $this->action('add', $url, 0, TRUE);
829 $count++; 833 $count++;
830 if ($favorite) { 834 if ($favorite) {
831 $last_id = $this->store->getLastId($sequence); 835 $last_id = $this->store->getLastId($sequence);
832 $this->action('toggle_fav', $url, $last_id, TRUE); 836 $this->action('toggle_fav', $url, $last_id, TRUE);
833 } 837 }
834 if ($archive) { 838 if ($archive) {
835 $last_id = $this->store->getLastId($sequence); 839 $last_id = $this->store->getLastId($sequence);
836 $this->action('toggle_archive', $url, $last_id, TRUE); 840 $this->action('toggle_archive', $url, $last_id, TRUE);
841 }
837 } 842 }
838 } 843 }
839 } 844 }
@@ -951,7 +956,7 @@ class Poche
951 if (count($entries) > 0) { 956 if (count($entries) > 0) {
952 foreach ($entries as $entry) { 957 foreach ($entries as $entry) {
953 $newItem = $feed->createNewItem(); 958 $newItem = $feed->createNewItem();
954 $newItem->setTitle(htmlentities($entry['title'])); 959 $newItem->setTitle($entry['title']);
955 $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']); 960 $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']);
956 $newItem->setDate(time()); 961 $newItem->setDate(time());
957 $newItem->setDescription($entry['content']); 962 $newItem->setDescription($entry['content']);
diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php
index 4e4a0b08..b0cfb9df 100644
--- a/inc/poche/pochePictures.php
+++ b/inc/poche/pochePictures.php
@@ -84,12 +84,12 @@ function create_assets_directory($id)
84{ 84{
85 $assets_path = ABS_PATH; 85 $assets_path = ABS_PATH;
86 if(!is_dir($assets_path)) { 86 if(!is_dir($assets_path)) {
87 mkdir($assets_path, 0705); 87 mkdir($assets_path, 0715);
88 } 88 }
89 89
90 $article_directory = $assets_path . $id; 90 $article_directory = $assets_path . $id;
91 if(!is_dir($article_directory)) { 91 if(!is_dir($article_directory)) {
92 mkdir($article_directory, 0705); 92 mkdir($article_directory, 0715);
93 } 93 }
94 94
95 return $article_directory; 95 return $article_directory;
@@ -107,4 +107,4 @@ function remove_directory($directory)
107 } 107 }
108 return rmdir($directory); 108 return rmdir($directory);
109 } 109 }
110} \ No newline at end of file 110}
diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo
index bdf19250..0e8f88bf 100644
--- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo
+++ b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo
Binary files differ
diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po
index a99d3903..8209a9cd 100644
--- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po
+++ b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po
@@ -73,7 +73,7 @@ msgstr "Importovat"
73msgid "Please execute the import script locally, it can take a very long time." 73msgid "Please execute the import script locally, it can take a very long time."
74msgstr "Spusťte importní skript lokálně, může to dlouho trvat." 74msgstr "Spusťte importní skript lokálně, může to dlouho trvat."
75 75
76msgid "More infos in the official doc:" 76msgid "More info in the official doc:"
77msgstr "Více informací v oficiální dokumentaci:" 77msgstr "Více informací v oficiální dokumentaci:"
78 78
79msgid "import from Pocket" 79msgid "import from Pocket"
@@ -85,13 +85,13 @@ msgstr "importovat z Readability"
85msgid "import from Instapaper" 85msgid "import from Instapaper"
86msgstr "importovat z Instapaper" 86msgstr "importovat z Instapaper"
87 87
88msgid "Export your poche datas" 88msgid "Export your poche data"
89msgstr "Export dat" 89msgstr "Export dat"
90 90
91msgid "Click here" 91msgid "Click here"
92msgstr "Klikněte zde" 92msgstr "Klikněte zde"
93 93
94msgid "to export your poche datas." 94msgid "to export your poche data."
95msgstr "pro export vašich dat." 95msgstr "pro export vašich dat."
96 96
97msgid "back to home" 97msgid "back to home"
@@ -105,11 +105,11 @@ msgstr "instalovat"
105 105
106msgid "" 106msgid ""
107"poche is still not installed. Please fill the below form to install it. " 107"poche is still not installed. Please fill the below form to install it. "
108"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 108"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
109"on poche website</a>." 109"on poche website</a>."
110msgstr "" 110msgstr ""
111"poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. " 111"poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. "
112"Nezapomeňte <a href='http://inthepoche.com/doc'>si přečíst dokumentaci</a> " 112"Nezapomeňte <a href='http://doc.inthepoche.com'>si přečíst dokumentaci</a> "
113"na stránkách programu." 113"na stránkách programu."
114 114
115msgid "Login" 115msgid "Login"
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 cf8ae292..253d8c7e 100644
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
Binary files differ
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 14aeb0f5..5b30d3d7 100644
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
@@ -67,7 +67,7 @@ msgstr "Import"
67msgid "Please execute the import script locally, it can take a very long time." 67msgid "Please execute the import script locally, it can take a very long time."
68msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern." 68msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern."
69 69
70msgid "More infos in the official doc:" 70msgid "More info in the official doc:"
71msgstr "Mehr Informationen in der offiziellen Dokumentation:" 71msgstr "Mehr Informationen in der offiziellen Dokumentation:"
72 72
73msgid "import from Pocket" 73msgid "import from Pocket"
@@ -79,13 +79,13 @@ msgstr "Import aus Readability"
79msgid "import from Instapaper" 79msgid "import from Instapaper"
80msgstr "Import aus Instapaper" 80msgstr "Import aus Instapaper"
81 81
82msgid "Export your poche datas" 82msgid "Export your poche data"
83msgstr "Exportieren Sie Ihre Poche Daten." 83msgstr "Exportieren Sie Ihre Poche Daten."
84 84
85msgid "Click here" 85msgid "Click here"
86msgstr "Klicke hier" 86msgstr "Klicke hier"
87 87
88msgid "to export your poche datas." 88msgid "to export your poche data."
89msgstr "um deine Daten aus Poche zu exportieren." 89msgstr "um deine Daten aus Poche zu exportieren."
90 90
91msgid "back to home" 91msgid "back to home"
@@ -99,7 +99,7 @@ msgstr "Installiere dein Poche"
99 99
100msgid "" 100msgid ""
101"poche is still not installed. Please fill the below form to install it. " 101"poche is still not installed. Please fill the below form to install it. "
102"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 102"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
103"on poche website</a>." 103"on poche website</a>."
104msgstr "" 104msgstr ""
105"Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die " 105"Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die "
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
index f387889d..974ca4f3 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
Binary files differ
diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
index 8e56560d..b78759f5 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -68,8 +68,8 @@ msgid "Please execute the import script locally, it can take a very long time."
68msgstr "" 68msgstr ""
69"Please execute the import script locally, it can take a very long time." 69"Please execute the import script locally, it can take a very long time."
70 70
71msgid "More infos in the official doc:" 71msgid "More info in the official doc:"
72msgstr "More infos in the official doc:" 72msgstr "More info in the official doc:"
73 73
74msgid "import from Pocket" 74msgid "import from Pocket"
75msgstr "import from Pocket" 75msgstr "import from Pocket"
@@ -80,14 +80,14 @@ msgstr "import from Readability"
80msgid "import from Instapaper" 80msgid "import from Instapaper"
81msgstr "import from Instapaper" 81msgstr "import from Instapaper"
82 82
83msgid "Export your poche datas" 83msgid "Export your poche data"
84msgstr "Export your poche datas" 84msgstr "Export your poche data"
85 85
86msgid "Click here" 86msgid "Click here"
87msgstr "Click here" 87msgstr "Click here"
88 88
89msgid "to export your poche datas." 89msgid "to export your poche data."
90msgstr "to export your poche datas." 90msgstr "to export your poche data."
91 91
92msgid "back to home" 92msgid "back to home"
93msgstr "back to home" 93msgstr "back to home"
@@ -100,11 +100,11 @@ msgstr "install your poche"
100 100
101msgid "" 101msgid ""
102"poche is still not installed. Please fill the below form to install it. " 102"poche is still not installed. Please fill the below form to install it. "
103"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 103"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
104"on poche website</a>." 104"on poche website</a>."
105msgstr "" 105msgstr ""
106"poche is still not installed. Please fill the below form to install it. " 106"poche is still not installed. Please fill the below form to install it. "
107"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 107"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
108"on poche website</a>." 108"on poche website</a>."
109 109
110msgid "Login" 110msgid "Login"
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 0122cebc..20978239 100644
--- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
+++ b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
Binary files differ
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 833d1803..afe0595d 100644
--- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
+++ b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po
@@ -68,7 +68,7 @@ msgid "Please execute the import script locally, it can take a very long time."
68msgstr "" 68msgstr ""
69"Por favor, ejecute la importación en local, esto puede demorar un tiempo." 69"Por favor, ejecute la importación en local, esto puede demorar un tiempo."
70 70
71msgid "More infos in the official doc:" 71msgid "More info in the official doc:"
72msgstr "Más información en la documentación oficial :" 72msgstr "Más información en la documentación oficial :"
73 73
74msgid "import from Pocket" 74msgid "import from Pocket"
@@ -80,13 +80,13 @@ msgstr "importación desde Readability"
80msgid "import from Instapaper" 80msgid "import from Instapaper"
81msgstr "importación desde Instapaper" 81msgstr "importación desde Instapaper"
82 82
83msgid "Export your poche datas" 83msgid "Export your poche data"
84msgstr "Exportar sus datos de poche" 84msgstr "Exportar sus datos de poche"
85 85
86msgid "Click here" 86msgid "Click here"
87msgstr "Haga clic aquí" 87msgstr "Haga clic aquí"
88 88
89msgid "to export your poche datas." 89msgid "to export your poche data."
90msgstr "para exportar sus datos de poche." 90msgstr "para exportar sus datos de poche."
91 91
92msgid "back to home" 92msgid "back to home"
@@ -100,11 +100,11 @@ msgstr "instala tu Poche"
100 100
101msgid "" 101msgid ""
102"Poche is still not installed. Please fill the below form to install it. " 102"Poche is still not installed. Please fill the below form to install it. "
103"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 103"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
104"on poche website</a>." 104"on poche website</a>."
105msgstr "" 105msgstr ""
106"Poche todavia no està instalado. Por favor, completa los campos siguientes " 106"Poche todavia no està instalado. Por favor, completa los campos siguientes "
107"para instalarlo. No dudes de <a href='http://inthepoche.com/doc'>leer la " 107"para instalarlo. No dudes de <a href='http://doc.inthepoche.com'>leer la "
108"documentación en el sitio de Poche</a>." 108"documentación en el sitio de Poche</a>."
109 109
110msgid "Login" 110msgid "Login"
diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo
index 00178208..a7bb6f64 100644
--- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo
+++ b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo
Binary files differ
diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po
index 4bc118fd..74a763c6 100644
--- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po
+++ b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po
@@ -67,7 +67,7 @@ msgstr "درون‌ریزی"
67msgid "Please execute the import script locally, it can take a very long time." 67msgid "Please execute the import script locally, it can take a very long time."
68msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد." 68msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد."
69 69
70msgid "More infos in the official doc:" 70msgid "More info in the official doc:"
71msgstr "اطلاعات بیشتر در راهنمای رسمی:" 71msgstr "اطلاعات بیشتر در راهنمای رسمی:"
72 72
73msgid "import from Pocket" 73msgid "import from Pocket"
@@ -79,13 +79,13 @@ msgstr "درون‌ریزی از Readability"
79msgid "import from Instapaper" 79msgid "import from Instapaper"
80msgstr "درون‌ریزی از Instapaper" 80msgstr "درون‌ریزی از Instapaper"
81 81
82msgid "Export your poche datas" 82msgid "Export your poche data"
83msgstr "داده‌های poche خود را برون‌بری کنید" 83msgstr "داده‌های poche خود را برون‌بری کنید"
84 84
85msgid "Click here" 85msgid "Click here"
86msgstr "اینجا را کلیک کنید" 86msgstr "اینجا را کلیک کنید"
87 87
88msgid "to export your poche datas." 88msgid "to export your poche data."
89msgstr "برای برون‌بری داده‌های poche شما" 89msgstr "برای برون‌بری داده‌های poche شما"
90 90
91msgid "back to home" 91msgid "back to home"
@@ -99,11 +99,11 @@ msgstr "poche خود را نصب کنید"
99 99
100msgid "" 100msgid ""
101"poche is still not installed. Please fill the below form to install it. " 101"poche is still not installed. Please fill the below form to install it. "
102"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 102"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
103"on poche website</a>." 103"on poche website</a>."
104msgstr "" 104msgstr ""
105"poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن <a " 105"poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن <a "
106"href='http://inthepoche.com/doc'>راهنما در وبگاه poche</a> را از یاد نبرید." 106"href='http://doc.inthepoche.com'>راهنما در وبگاه poche</a> را از یاد نبرید."
107 107
108msgid "Login" 108msgid "Login"
109msgstr "ورود" 109msgstr "ورود"
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 e3baaaa1..99e7142c 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
Binary files differ
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 779aadae..f105d180 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
@@ -67,7 +67,7 @@ msgstr "Importer"
67msgid "Please execute the import script locally, it can take a very long time." 67msgid "Please execute the import script locally, it can take a very long time."
68msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." 68msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps."
69 69
70msgid "More infos in the official doc:" 70msgid "More info in the official doc:"
71msgstr "Plus d'infos sur la documentation officielle" 71msgstr "Plus d'infos sur la documentation officielle"
72 72
73msgid "import from Pocket" 73msgid "import from Pocket"
@@ -79,13 +79,13 @@ msgstr "import depuis Readability"
79msgid "import from Instapaper" 79msgid "import from Instapaper"
80msgstr "import depuis Instapaper" 80msgstr "import depuis Instapaper"
81 81
82msgid "Export your poche datas" 82msgid "Export your poche data"
83msgstr "Exporter vos données de poche" 83msgstr "Exporter vos données de poche"
84 84
85msgid "Click here" 85msgid "Click here"
86msgstr "Cliquez-ici" 86msgstr "Cliquez-ici"
87 87
88msgid "to export your poche datas." 88msgid "to export your poche data."
89msgstr "pour exporter vos données de poche." 89msgstr "pour exporter vos données de poche."
90 90
91msgid "back to home" 91msgid "back to home"
@@ -99,11 +99,11 @@ msgstr "installez votre poche"
99 99
100msgid "" 100msgid ""
101"poche is still not installed. Please fill the below form to install it. " 101"poche is still not installed. Please fill the below form to install it. "
102"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 102"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
103"on poche website</a>." 103"on poche website</a>."
104msgstr "" 104msgstr ""
105"poche n'est pas encore installé. Merci de remplir le formulaire suivant pour " 105"poche n'est pas encore installé. Merci de remplir le formulaire suivant pour "
106"l'installer. N'hésitez pas à <a href='http://inthepoche.com/doc'>lire la " 106"l'installer. N'hésitez pas à <a href='http://doc.inthepoche.com'>lire la "
107"documentation sur le site de poche</a>." 107"documentation sur le site de poche</a>."
108 108
109msgid "Login" 109msgid "Login"
diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
index e4d4fb3d..d6ef9890 100644
--- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
+++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
Binary files differ
diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
index f4e69c07..429d5d55 100644
--- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
+++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
@@ -75,7 +75,7 @@ msgstr ""
75"Si prega di eseguire lo script di importazione a livello locale, può " 75"Si prega di eseguire lo script di importazione a livello locale, può "
76"richiedere un tempo molto lungo." 76"richiedere un tempo molto lungo."
77 77
78msgid "More infos in the official doc:" 78msgid "More info in the official doc:"
79msgstr "Maggiori info nella documentazione ufficiale" 79msgstr "Maggiori info nella documentazione ufficiale"
80 80
81msgid "import from Pocket" 81msgid "import from Pocket"
@@ -87,13 +87,13 @@ msgstr "Importa da Readability"
87msgid "import from Instapaper" 87msgid "import from Instapaper"
88msgstr "Importa da Instapaper" 88msgstr "Importa da Instapaper"
89 89
90msgid "Export your poche datas" 90msgid "Export your poche data"
91msgstr "Esporta i tuoi dati di poche" 91msgstr "Esporta i tuoi dati di poche"
92 92
93msgid "Click here" 93msgid "Click here"
94msgstr "Fai clic qui" 94msgstr "Fai clic qui"
95 95
96msgid "to export your poche datas." 96msgid "to export your poche data."
97msgstr "per esportare i tuoi dati di poche." 97msgstr "per esportare i tuoi dati di poche."
98 98
99msgid "back to home" 99msgid "back to home"
@@ -107,11 +107,11 @@ msgstr "installa il tuo poche"
107 107
108msgid "" 108msgid ""
109"poche is still not installed. Please fill the below form to install it. " 109"poche is still not installed. Please fill the below form to install it. "
110"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 110"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
111"on poche website</a>." 111"on poche website</a>."
112msgstr "" 112msgstr ""
113"poche non è ancora installato. Si prega di riempire il modulo sottostante " 113"poche non è ancora installato. Si prega di riempire il modulo sottostante "
114"per completare l'installazione. <a href='http://inthepoche.com/doc'>Leggere " 114"per completare l'installazione. <a href='http://doc.inthepoche.com'>Leggere "
115"la documentazione sul sito di poche</a>." 115"la documentazione sul sito di poche</a>."
116 116
117msgid "Login" 117msgid "Login"
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
index eea7ff0b..970898db 100644
--- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
+++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
Binary files differ
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
index 78ddb158..6f647e36 100644
--- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
+++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
@@ -68,7 +68,7 @@ msgid "Please execute the import script locally, it can take a very long time."
68msgstr "" 68msgstr ""
69"Выполните сценарий импорта локально - он может занять слишком много времени." 69"Выполните сценарий импорта локально - он может занять слишком много времени."
70 70
71msgid "More infos in the official doc:" 71msgid "More info in the official doc:"
72msgstr "Больше сведений в официальной документации:" 72msgstr "Больше сведений в официальной документации:"
73 73
74msgid "import from Pocket" 74msgid "import from Pocket"
@@ -80,13 +80,13 @@ msgstr "импортировать из Readability"
80msgid "import from Instapaper" 80msgid "import from Instapaper"
81msgstr "импортировать из Instapaper" 81msgstr "импортировать из Instapaper"
82 82
83msgid "Export your poche datas" 83msgid "Export your poche data"
84msgstr "Экспортировать данные poche" 84msgstr "Экспортировать данные poche"
85 85
86msgid "Click here" 86msgid "Click here"
87msgstr "Кликни сюда" 87msgstr "Кликни сюда"
88 88
89msgid "to export your poche datas." 89msgid "to export your poche data."
90msgstr "чтобы экспортировать твои записи из poche." 90msgstr "чтобы экспортировать твои записи из poche."
91 91
92msgid "back to home" 92msgid "back to home"
@@ -100,11 +100,11 @@ msgstr "установить твой poche"
100 100
101msgid "" 101msgid ""
102"poche is still not installed. Please fill the below form to install it. " 102"poche is still not installed. Please fill the below form to install it. "
103"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation " 103"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
104"on poche website</a>." 104"on poche website</a>."
105msgstr "" 105msgstr ""
106"poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить " 106"poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить "
107"его. Неплохо также <a href='http://inthepoche.com/doc'>прочесть документацию " 107"его. Неплохо также <a href='http://doc.inthepoche.com'>прочесть документацию "
108"на сайте poche</a>." 108"на сайте poche</a>."
109 109
110msgid "Login" 110msgid "Login"
diff --git a/poche_compatibility_test.php b/poche_compatibility_test.php
index eed3c391..42faaa2c 100644
--- a/poche_compatibility_test.php
+++ b/poche_compatibility_test.php
@@ -1,5 +1,5 @@
1<?php 1<?php
2$app_name = 'poche 1.0'; 2$app_name = 'poche 1.3';
3 3
4$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.3.3', '>=')); 4$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.3.3', '>='));
5$pcre_ok = extension_loaded('pcre'); 5$pcre_ok = extension_loaded('pcre');
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 !
24 24
25## create a theme 25## create a theme
26 26
27Just have a look to this short documentation : http://inthepoche.com/doc/doku.php?id=designers:creating_theme 27Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme
28 28
29## send a theme 29## send a theme
30 30
diff --git a/themes/default/_top.twig b/themes/default/_top.twig
index b5f65028..083be152 100644
--- a/themes/default/_top.twig
+++ b/themes/default/_top.twig
@@ -1,6 +1,6 @@
1 <header class="w600p center mbm"> 1 <header class="w600p center mbm">
2 <h1> 2 <h1>
3 {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/logo.png" alt="logo poche" />{% endblock %} 3 {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/logo.svg" alt="logo poche" />{% endblock %}
4 {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a> 4 {% else %}<a href="./" title="{% trans "return home" %}" >{{ block('logo') }}</a>
5 {% endif %} 5 {% endif %}
6 </h1> 6 </h1>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index c01556ba..10df726e 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -6,11 +6,11 @@
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans "Poching links" %}</h2> 8 <h2>{% trans "Poching links" %}</h2>
9 <p>{% trans "There are several ways to poche a link::" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p> 9 <p>{% trans "There are several ways to poche a link:" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p>
10 <ul> 10 <ul>
11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li> 11 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
12 <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> 12 <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>
13 <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> 13 <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>
14 <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> 14 <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>
15 <li> 15 <li>
16 <form method="get" action="index.php"> 16 <form method="get" action="index.php">
@@ -31,12 +31,12 @@
31 31
32 <h2>{% trans "Feeds" %}</h2> 32 <h2>{% trans "Feeds" %}</h2>
33 {% if token == '' %} 33 {% if token == '' %}
34 <p>{% trans "The token is empty, you have to generate it to use feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p> 34 <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>
35 {% else %} 35 {% else %}
36 <ul> 36 <ul>
37 <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "unread feed" %}</a></li> 37 <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
38 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "favorites feed" %}</a></li> 38 <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
39 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "archive feed" %}</a></li> 39 <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
40 </ul> 40 </ul>
41 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p> 41 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
42 {% endif %} 42 {% endif %}
@@ -101,12 +101,12 @@
101 {% endif %} 101 {% endif %}
102 102
103 <h2>{% trans "Import" %}</h2> 103 <h2>{% trans "Import" %}</h2>
104 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p> 104 <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
105 <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/">inthepoche.com</a></p> 105 <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/doku.php?id=users:migrate">inthepoche.com</a></p>
106 <ul> 106 <ul>
107 <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> 107 <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>
108 <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> 108 <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>
109 <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> 109 <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>
110 </ul> 110 </ul>
111 111
112 <h2>{% trans "Export your poche data" %}</h2> 112 <h2>{% trans "Export your poche data" %}</h2>
diff --git a/themes/default/css/print.css b/themes/default/css/print.css
index 99c00bdf..625478e1 100644
--- a/themes/default/css/print.css
+++ b/themes/default/css/print.css
@@ -33,6 +33,10 @@ article {
33 border: none !important; 33 border: none !important;
34} 34}
35 35
36pre code {
37 line-height: 1.6em;
38}
39
36/* Add URL after links */ 40/* Add URL after links */
37.vieworiginal a:after { 41.vieworiginal a:after {
38 content: " (" attr(href) ")"; 42 content: " (" attr(href) ")";
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index 7116bba9..53852d39 100644
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -11,10 +11,10 @@ no tags
11{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %} 11{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
12</ul> 12</ul>
13<form method="post" action="./?action=add_tag"> 13<form method="post" action="./?action=add_tag">
14 <label for="value">New tags: </label><input type="text" id="value" name="value" required="required" /> 14 <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
15 <p>{% trans "you can type several tags, separated by comma" %}</p> 15 <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
16 <input type="hidden" name="entry_id" value="{{ entry_id }}" /> 16 <input type="hidden" name="entry_id" value="{{ entry_id }}" />
17 <input type="submit" value="add tags" /> 17 <input type="submit" value="Tag" />
18</form> 18</form>
19<a href="./?view=view&id={{ entry_id }}">{% trans "back to the article" %}</a> 19<a href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
20{% endblock %} \ No newline at end of file 20{% endblock %}
diff --git a/themes/default/img/apple-touch-icon-144x144-precomposed.png b/themes/default/img/apple-touch-icon-144x144-precomposed.png
index 557b479c..9e951230 100644
--- a/themes/default/img/apple-touch-icon-144x144-precomposed.png
+++ b/themes/default/img/apple-touch-icon-144x144-precomposed.png
Binary files differ
diff --git a/themes/default/img/apple-touch-icon-72x72-precomposed.png b/themes/default/img/apple-touch-icon-72x72-precomposed.png
index e167d3a4..263419b1 100644
--- a/themes/default/img/apple-touch-icon-72x72-precomposed.png
+++ b/themes/default/img/apple-touch-icon-72x72-precomposed.png
Binary files differ
diff --git a/themes/default/img/apple-touch-icon.png b/themes/default/img/apple-touch-icon.png
index 4d222fba..ac8a1cf0 100644
--- a/themes/default/img/apple-touch-icon.png
+++ b/themes/default/img/apple-touch-icon.png
Binary files differ
diff --git a/themes/default/img/logo.png b/themes/default/img/logo.png
deleted file mode 100644
index 5305c77d..00000000
--- a/themes/default/img/logo.png
+++ /dev/null
Binary files differ
diff --git a/themes/default/img/logo.svg b/themes/default/img/logo.svg
new file mode 100644
index 00000000..865da440
--- /dev/null
+++ b/themes/default/img/logo.svg
@@ -0,0 +1,8 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
3 <circle cx="32" cy="32" r="29.5" style="fill:#000" />
4 <path d="m 16,18 33,0 0,26 -16.5,6 -16.5,-6 z" fill="#fff" />
5 <rect width="9" height="2.5" x="17.5" y="24.5" fill="#000" />
6 <rect width="9" height="2.5" x="28" y="24.5" fill="#000" />
7 <rect width="9" height="2.5" x="38.5" y="24.5" fill="#000" />
8</svg>