diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-03-08 00:22:47 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-03-08 00:22:47 +0100 |
commit | 8a66458ba267f01f3525cd635c912574861926fe (patch) | |
tree | cf97db46bfb415a8446e1dbee74f4c80244e422a | |
parent | e139258bb1039175827c8debce6101ff0c9a5b86 (diff) | |
download | wallabag-8a66458ba267f01f3525cd635c912574861926fe.tar.gz wallabag-8a66458ba267f01f3525cd635c912574861926fe.tar.zst wallabag-8a66458ba267f01f3525cd635c912574861926fe.zip |
mark read and go to next now in the right direction
-rwxr-xr-x | inc/poche/Poche.class.php | 2 | ||||
-rwxr-xr-x | themes/baggy/view.twig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 18e1d051..c6c91c4a 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -315,7 +315,7 @@ class Poche | |||
315 | } | 315 | } |
316 | break; | 316 | break; |
317 | case 'archive_and_next' : | 317 | case 'archive_and_next' : |
318 | $nextid = $this->store->getNextArticle($id, $this->user->getId()); | 318 | $nextid = $this->store->getPreviousArticle($id, $this->user->getId()); |
319 | $this->store->archiveById($id, $this->user->getId()); | 319 | $this->store->archiveById($id, $this->user->getId()); |
320 | Tools::logm('archive link #' . $id); | 320 | Tools::logm('archive link #' . $id); |
321 | Tools::redirect('?view=view&id=' . $nextid); | 321 | Tools::redirect('?view=view&id=' . $nextid); |
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 12024cdc..a57d1771 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig | |||
@@ -12,7 +12,7 @@ | |||
12 | {% if navigate.next %}<li class="leftPosF"><a href="./?view=view&id={{ navigate.nextid|e }}" class="top tool icon icon-previous"><span>{% trans "Next Article" %}</span></a></li>{% endif %} | 12 | {% if navigate.next %}<li class="leftPosF"><a href="./?view=view&id={{ navigate.nextid|e }}" class="top tool icon icon-previous"><span>{% trans "Next Article" %}</span></a></li>{% endif %} |
13 | <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.url | e | getDomain }}</span></a></li> | 13 | <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.url | e | getDomain }}</span></a></li> |
14 | <li><a title="{% trans "Mark as read" %}" class="tool icon icon-check {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="javascript: void(null);" id="markAsRead"><span>{% trans "Toggle mark as read" %}</span></a></li> | 14 | <li><a title="{% trans "Mark as read" %}" class="tool icon icon-check {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="javascript: void(null);" id="markAsRead"><span>{% trans "Toggle mark as read" %}</span></a></li> |
15 | {% if navigate.next %}<li><a title="{% trans "Mark as read and go to next article" %}" class="tool icon archiveandnext-icon" href="./?action=archive_and_next&id={{ entry.id|e }}" id="markAsReadAndNext"><span>{% trans "Toggle mark as read and go to next article" %}</span></a></li>{% endif %} | 15 | {% if navigate.previous %}<li><a title="{% trans "Mark as read and go to next article" %}" class="tool icon icon-archiveandnext" href="./?action=archive_and_next&id={{ entry.id|e }}" id="markAsReadAndNext"><span>{% trans "Toggle mark as read and go to next article" %}</span></a></li>{% endif %} |
16 | <li><a title="{% trans "Favorite" %}" class="tool icon icon-star {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="javascript: void(null);" id="setFav"><span>{% trans "Toggle favorite" %}</span></a></li> | 16 | <li><a title="{% trans "Favorite" %}" class="tool icon icon-star {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="javascript: void(null);" id="setFav"><span>{% trans "Toggle favorite" %}</span></a></li> |
17 | <li><a title="{% trans "Delete" %}" class="tool delete icon icon-trash" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li> | 17 | <li><a title="{% trans "Delete" %}" class="tool delete icon icon-trash" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li> |
18 | {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %} | 18 | {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %} |