diff options
-rw-r--r-- | inc/3rdparty/site_config/custom/interviewmagazine.com.txt | 4 | ||||
-rw-r--r-- | inc/3rdparty/site_config/custom/inthepoche.com.txt | 7 | ||||
-rw-r--r-- | inc/poche/Database.class.php | 4 | ||||
-rw-r--r-- | inc/poche/Poche.class.php | 2 | ||||
-rw-r--r-- | themes/default/config.twig | 22 | ||||
-rw-r--r-- | themes/default/css/print.css | 4 | ||||
-rw-r--r-- | themes/default/edit-tags.twig | 10 |
7 files changed, 27 insertions, 26 deletions
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 @@ | |||
1 | title: //title | ||
2 | body: //div[contains(@class, 'block')] | ||
3 | |||
4 | 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 ede74b97..00000000 --- a/inc/3rdparty/site_config/custom/inthepoche.com.txt +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | title: //title | ||
2 | body: //div[@class='post-content'] | ||
3 | |||
4 | prune: no | ||
5 | tidy: no | ||
6 | |||
7 | 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 afe02a41..d8b63859 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php | |||
@@ -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..d3eb71d2 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -951,7 +951,7 @@ class Poche | |||
951 | if (count($entries) > 0) { | 951 | if (count($entries) > 0) { |
952 | foreach ($entries as $entry) { | 952 | foreach ($entries as $entry) { |
953 | $newItem = $feed->createNewItem(); | 953 | $newItem = $feed->createNewItem(); |
954 | $newItem->setTitle(htmlentities($entry['title'])); | 954 | $newItem->setTitle($entry['title']); |
955 | $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']); | 955 | $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']); |
956 | $newItem->setDate(time()); | 956 | $newItem->setDate(time()); |
957 | $newItem->setDescription($entry['content']); | 957 | $newItem->setDescription($entry['content']); |
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&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&action=generate'>here to generate it</a>." %}</p> |
35 | {% else %} | 35 | {% else %} |
36 | <ul> | 36 | <ul> |
37 | <li><a href="?feed&type=home&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "unread feed" %}</a></li> | 37 | <li><a href="?feed&type=home&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li> |
38 | <li><a href="?feed&type=fav&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "favorites feed" %}</a></li> | 38 | <li><a href="?feed&type=fav&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li> |
39 | <li><a href="?feed&type=archive&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "archive feed" %}</a></li> | 39 | <li><a href="?feed&type=archive&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li> |
40 | </ul> | 40 | </ul> |
41 | <p>{% trans "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>." %}</p> | 41 | <p>{% trans "You can regenerate your token: <a href='?feed&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&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&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&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&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&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&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 | ||
36 | pre 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&tag_id={{ tag.id }}&id={{ entry_id }}">✘</a></li>{% endfor %} | 11 | {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&tag_id={{ tag.id }}&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 %} |