diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php index 0d3e69d0d..711b4ee07 100644 --- a/inc/3rdparty/FlattrItem.class.php +++ b/inc/3rdparty/FlattrItem.class.php @@ -14,12 +14,12 @@ class FlattrItem { $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache"); if($flattrResponse != FALSE) { $result = json_decode($flattrResponse); - if (isset($result->message)){ + if (isset($result->message)){ if ($result->message == "flattrable") { $this->status = FLATTRABLE; } } - elseif ($result->link) { + elseif (is_object($result) && $result->link) { $this->status = FLATTRED; $this->flattrItemURL = $result->link; $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 000000000..a9d4f8ca5 --- /dev/null +++ b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt @@ -0,0 +1,4 @@ +title: //title +body: //div[contains(@class, 'block')] + +test_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 ede74b976..000000000 --- a/inc/3rdparty/site_config/custom/inthepoche.com.txt +++ /dev/null @@ -1,7 +0,0 @@ -title: //title -body: //div[@class='post-content'] - -prune: no -tidy: no - -test_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 afe02a41e..04731821f 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -81,7 +81,7 @@ class Database { if (STORAGE == 'sqlite') { $sql = ' - CREATE TABLE tags_entries ( + CREATE TABLE IF NOT EXISTS tags_entries ( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, entry_id INTEGER, tag_id INTEGER, @@ -337,7 +337,7 @@ class Database { public function retrieveEntriesByTag($tag_id) { $sql = - "SELECT * FROM entries + "SELECT entries.* FROM entries LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id WHERE tags_entries.tag_id = ?"; $query = $this->executeQuery($sql, array($tag_id)); @@ -348,7 +348,7 @@ class Database { public function retrieveTagsByEntry($entry_id) { $sql = - "SELECT * FROM tags + "SELECT tags.* FROM tags LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags_entries.entry_id = ?"; $query = $this->executeQuery($sql, array($entry_id)); diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4f70afb75..76a73be2b 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -333,7 +333,9 @@ class Poche switch ($action) { case 'add': - $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed'); + $options = array('http' => array('user_agent' => 'poche')); + $context = stream_context_create($options); + $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); $content = json_decode($json, true); $title = $content['rss']['channel']['item']['title']; $body = $content['rss']['channel']['item']['description']; @@ -806,34 +808,37 @@ class Poche $url = NULL; $favorite = FALSE; $archive = FALSE; - foreach ($value as $attr => $attr_value) { - if ($attr == 'article__url') { - $url = new Url(base64_encode($attr_value)); - } - $sequence = ''; - if (STORAGE == 'postgres') { - $sequence = 'entries_id_seq'; - } - if ($attr_value == 'true') { - if ($attr == 'favorite') { - $favorite = TRUE; + foreach ($value as $item) { + foreach ($item as $attr => $value) { + if ($attr == 'article__url') { + $url = new Url(base64_encode($value)); } - if ($attr == 'archive') { - $archive = TRUE; + $sequence = ''; + if (STORAGE == 'postgres') { + $sequence = 'entries_id_seq'; + } + if ($value == 'true') { + if ($attr == 'favorite') { + $favorite = TRUE; + } + if ($attr == 'archive') { + $archive = TRUE; + } } } - } - # we can add the url - if (!is_null($url) && $url->isCorrect()) { - $this->action('add', $url, 0, TRUE); - $count++; - if ($favorite) { - $last_id = $this->store->getLastId($sequence); - $this->action('toggle_fav', $url, $last_id, TRUE); - } - if ($archive) { - $last_id = $this->store->getLastId($sequence); - $this->action('toggle_archive', $url, $last_id, TRUE); + + # we can add the url + if (!is_null($url) && $url->isCorrect()) { + $this->action('add', $url, 0, TRUE); + $count++; + if ($favorite) { + $last_id = $this->store->getLastId($sequence); + $this->action('toggle_fav', $url, $last_id, TRUE); + } + if ($archive) { + $last_id = $this->store->getLastId($sequence); + $this->action('toggle_archive', $url, $last_id, TRUE); + } } } } @@ -951,7 +956,7 @@ class Poche if (count($entries) > 0) { foreach ($entries as $entry) { $newItem = $feed->createNewItem(); - $newItem->setTitle(htmlentities($entry['title'])); + $newItem->setTitle($entry['title']); $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']); $newItem->setDate(time()); $newItem->setDescription($entry['content']); diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php index 4e4a0b085..b0cfb9df8 100644 --- a/inc/poche/pochePictures.php +++ b/inc/poche/pochePictures.php @@ -84,12 +84,12 @@ function create_assets_directory($id) { $assets_path = ABS_PATH; if(!is_dir($assets_path)) { - mkdir($assets_path, 0705); + mkdir($assets_path, 0715); } $article_directory = $assets_path . $id; if(!is_dir($article_directory)) { - mkdir($article_directory, 0705); + mkdir($article_directory, 0715); } return $article_directory; @@ -107,4 +107,4 @@ function remove_directory($directory) } return rmdir($directory); } -} \ No newline at end of file +} 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 bdf19250c..0e8f88bfc 100644 Binary files a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo and b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo 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 a99d39032..8209a9cdd 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" msgid "Please execute the import script locally, it can take a very long time." msgstr "Spusťte importní skript lokálně, může to dlouho trvat." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Více informací v oficiální dokumentaci:" msgid "import from Pocket" @@ -85,13 +85,13 @@ msgstr "importovat z Readability" msgid "import from Instapaper" msgstr "importovat z Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Export dat" msgid "Click here" msgstr "Klikněte zde" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "pro export vašich dat." msgid "back to home" @@ -105,11 +105,11 @@ msgstr "instalovat" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. " -"Nezapomeňte si přečíst dokumentaci " +"Nezapomeňte si přečíst dokumentaci " "na stránkách programu." msgid "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 cf8ae292b..253d8c7e4 100644 Binary files a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo and b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo 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 14aeb0f51..5b30d3d71 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" msgid "Please execute the import script locally, it can take a very long time." msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Mehr Informationen in der offiziellen Dokumentation:" msgid "import from Pocket" @@ -79,13 +79,13 @@ msgstr "Import aus Readability" msgid "import from Instapaper" msgstr "Import aus Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Exportieren Sie Ihre Poche Daten." msgid "Click here" msgstr "Klicke hier" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "um deine Daten aus Poche zu exportieren." msgid "back to home" @@ -99,7 +99,7 @@ msgstr "Installiere dein Poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "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 f387889df..974ca4f36 100644 Binary files a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo and b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo 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 8e56560de..b78759f53 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." msgstr "" "Please execute the import script locally, it can take a very long time." -msgid "More infos in the official doc:" -msgstr "More infos in the official doc:" +msgid "More info in the official doc:" +msgstr "More info in the official doc:" msgid "import from Pocket" msgstr "import from Pocket" @@ -80,14 +80,14 @@ msgstr "import from Readability" msgid "import from Instapaper" msgstr "import from Instapaper" -msgid "Export your poche datas" -msgstr "Export your poche datas" +msgid "Export your poche data" +msgstr "Export your poche data" msgid "Click here" msgstr "Click here" -msgid "to export your poche datas." -msgstr "to export your poche datas." +msgid "to export your poche data." +msgstr "to export your poche data." msgid "back to home" msgstr "back to home" @@ -100,11 +100,11 @@ msgstr "install your poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgid "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 0122cebcd..209782397 100644 Binary files a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo and b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo 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 833d18039..afe0595de 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." msgstr "" "Por favor, ejecute la importación en local, esto puede demorar un tiempo." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Más información en la documentación oficial :" msgid "import from Pocket" @@ -80,13 +80,13 @@ msgstr "importación desde Readability" msgid "import from Instapaper" msgstr "importación desde Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Exportar sus datos de poche" msgid "Click here" msgstr "Haga clic aquí" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "para exportar sus datos de poche." msgid "back to home" @@ -100,11 +100,11 @@ msgstr "instala tu Poche" msgid "" "Poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "Poche todavia no està instalado. Por favor, completa los campos siguientes " -"para instalarlo. No dudes de leer la " +"para instalarlo. No dudes de leer la " "documentación en el sitio de Poche." msgid "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 001782086..a7bb6f646 100644 Binary files a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo and b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo 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 4bc118fd2..74a763c62 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 "درون‌ریزی" msgid "Please execute the import script locally, it can take a very long time." msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "اطلاعات بیشتر در راهنمای رسمی:" msgid "import from Pocket" @@ -79,13 +79,13 @@ msgstr "درون‌ریزی از Readability" msgid "import from Instapaper" msgstr "درون‌ریزی از Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "داده‌های poche خود را برون‌بری کنید" msgid "Click here" msgstr "اینجا را کلیک کنید" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "برای برون‌بری داده‌های poche شما" msgid "back to home" @@ -99,11 +99,11 @@ msgstr "poche خود را نصب کنید" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن راهنما در وبگاه poche را از یاد نبرید." +"href='http://doc.inthepoche.com'>راهنما در وبگاه poche را از یاد نبرید." msgid "Login" msgstr "ورود" 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 e3baaaa10..99e7142c0 100644 Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo 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 779aadae5..f105d1801 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" msgid "Please execute the import script locally, it can take a very long time." msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Plus d'infos sur la documentation officielle" msgid "import from Pocket" @@ -79,13 +79,13 @@ msgstr "import depuis Readability" msgid "import from Instapaper" msgstr "import depuis Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Exporter vos données de poche" msgid "Click here" msgstr "Cliquez-ici" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "pour exporter vos données de poche." msgid "back to home" @@ -99,11 +99,11 @@ msgstr "installez votre poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche n'est pas encore installé. Merci de remplir le formulaire suivant pour " -"l'installer. N'hésitez pas à lire la " +"l'installer. N'hésitez pas à lire la " "documentation sur le site de poche." msgid "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 e4d4fb3da..d6ef98900 100644 Binary files a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo and b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo 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 f4e69c075..429d5d558 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 "" "Si prega di eseguire lo script di importazione a livello locale, può " "richiedere un tempo molto lungo." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Maggiori info nella documentazione ufficiale" msgid "import from Pocket" @@ -87,13 +87,13 @@ msgstr "Importa da Readability" msgid "import from Instapaper" msgstr "Importa da Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Esporta i tuoi dati di poche" msgid "Click here" msgstr "Fai clic qui" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "per esportare i tuoi dati di poche." msgid "back to home" @@ -107,11 +107,11 @@ msgstr "installa il tuo poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche non è ancora installato. Si prega di riempire il modulo sottostante " -"per completare l'installazione. Leggere " +"per completare l'installazione. Leggere " "la documentazione sul sito di poche." msgid "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 eea7ff0be..970898dba 100644 Binary files a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo and b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo 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 78ddb1589..6f647e36a 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." msgstr "" "Выполните сценарий импорта локально - он может занять слишком много времени." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Больше сведений в официальной документации:" msgid "import from Pocket" @@ -80,13 +80,13 @@ msgstr "импортировать из Readability" msgid "import from Instapaper" msgstr "импортировать из Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Экспортировать данные poche" msgid "Click here" msgstr "Кликни сюда" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "чтобы экспортировать твои записи из poche." msgid "back to home" @@ -100,11 +100,11 @@ msgstr "установить твой poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить " -"его. Неплохо также прочесть документацию " +"его. Неплохо также прочесть документацию " "на сайте poche." msgid "Login" diff --git a/poche_compatibility_test.php b/poche_compatibility_test.php index eed3c3913..42faaa2ce 100644 --- a/poche_compatibility_test.php +++ b/poche_compatibility_test.php @@ -1,5 +1,5 @@ =')); $pcre_ok = extension_loaded('pcre'); diff --git a/themes/README.md b/themes/README.md index 9e5d65605..b5d925b46 100644 --- a/themes/README.md +++ b/themes/README.md @@ -24,7 +24,7 @@ That's all ! ## create a theme -Just have a look to this short documentation : http://inthepoche.com/doc/doku.php?id=designers:creating_theme +Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme ## send a theme diff --git a/themes/default/_top.twig b/themes/default/_top.twig index b5f650287..083be1527 100644 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}logo poche{% endblock %} {% else %}{{ block('logo') }} {% endif %}

diff --git a/themes/default/config.twig b/themes/default/config.twig index c01556ba8..10df726e0 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -6,11 +6,11 @@ {% endblock %} {% block content %}

{% trans "Poching links" %}

-

{% trans "There are several ways to poche a link::" %} (?)

+

{% trans "There are several ways to poche a link:" %} (?)

- -

{% trans "you can type several tags, separated by comma" %}

+ +

{% trans "You can enter multiple tags, separated by commas." %}

- + -{% trans "back to the article" %} -{% endblock %} \ No newline at end of file +{% trans "return to article" %} +{% endblock %} diff --git a/themes/default/img/apple-touch-icon-144x144-precomposed.png b/themes/default/img/apple-touch-icon-144x144-precomposed.png index 557b479ce..9e951230a 100644 Binary files a/themes/default/img/apple-touch-icon-144x144-precomposed.png and b/themes/default/img/apple-touch-icon-144x144-precomposed.png differ diff --git a/themes/default/img/apple-touch-icon-72x72-precomposed.png b/themes/default/img/apple-touch-icon-72x72-precomposed.png index e167d3a41..263419b18 100644 Binary files a/themes/default/img/apple-touch-icon-72x72-precomposed.png and b/themes/default/img/apple-touch-icon-72x72-precomposed.png differ diff --git a/themes/default/img/apple-touch-icon.png b/themes/default/img/apple-touch-icon.png index 4d222fbac..ac8a1cf04 100644 Binary files a/themes/default/img/apple-touch-icon.png and b/themes/default/img/apple-touch-icon.png differ diff --git a/themes/default/img/logo.png b/themes/default/img/logo.png deleted file mode 100644 index 5305c77da..000000000 Binary files a/themes/default/img/logo.png and /dev/null differ diff --git a/themes/default/img/logo.svg b/themes/default/img/logo.svg new file mode 100644 index 000000000..865da440d --- /dev/null +++ b/themes/default/img/logo.svg @@ -0,0 +1,8 @@ + + + + + + + +