diff options
-rwxr-xr-x | inc/poche/Poche.class.php | 11 | ||||
-rwxr-xr-x | inc/poche/config.inc.default.php | 1 | ||||
-rwxr-xr-x | themes/baggy/css/main.css | 3 | ||||
-rwxr-xr-x | themes/baggy/view.twig | 1 | ||||
-rwxr-xr-x | themes/default/css/style-default.css | 3 | ||||
-rw-r--r-- | themes/default/img/default/reload.png | bin | 0 -> 343 bytes | |||
-rwxr-xr-x | themes/default/view.twig | 1 |
7 files changed, 19 insertions, 1 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 27d6f4a6..f5262a8e 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -303,6 +303,15 @@ class Poche | |||
303 | $this->messages->add('s', _('The tag has been successfully deleted')); | 303 | $this->messages->add('s', _('The tag has been successfully deleted')); |
304 | Tools::redirect(); | 304 | Tools::redirect(); |
305 | break; | 305 | break; |
306 | case 'reload_article' : | ||
307 | Tools::logm('reload article'); | ||
308 | $id = $_GET['id']; | ||
309 | $entry = $this->store->retrieveOneById($id, $this->user->getId()); | ||
310 | Tools::logm('reload url ' . $entry['url']); | ||
311 | $url = new Url(base64_encode($entry['url'])); | ||
312 | $this->action('add', $url); | ||
313 | break; | ||
314 | |||
306 | default: | 315 | default: |
307 | break; | 316 | break; |
308 | } | 317 | } |
@@ -812,4 +821,4 @@ class Poche | |||
812 | } | 821 | } |
813 | 822 | ||
814 | 823 | ||
815 | } \ No newline at end of file | 824 | } |
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index a159e713..aaaf12a6 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php | |||
@@ -62,6 +62,7 @@ | |||
62 | @define ('SHOW_PRINTLINK', '1'); | 62 | @define ('SHOW_PRINTLINK', '1'); |
63 | // display or not percent of read in article view. Affects only default theme. | 63 | // display or not percent of read in article view. Affects only default theme. |
64 | @define ('SHOW_READPERCENT', '1'); | 64 | @define ('SHOW_READPERCENT', '1'); |
65 | @define ('RELOAD_ARTICLE', TRUE); | ||
65 | @define ('ABS_PATH', 'assets/'); | 66 | @define ('ABS_PATH', 'assets/'); |
66 | 67 | ||
67 | @define ('DEFAULT_THEME', 'baggy'); | 68 | @define ('DEFAULT_THEME', 'baggy'); |
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 1df82910..96b681bf 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css | |||
@@ -736,6 +736,9 @@ a.add-to-wallabag-link-after:after { | |||
736 | .icon-print:before { | 736 | .icon-print:before { |
737 | content: "\e80d"; | 737 | content: "\e80d"; |
738 | } | 738 | } |
739 | .icon-reload:before { | ||
740 | /* TODO */ | ||
741 | } | ||
739 | 742 | ||
740 | 743 | ||
741 | /* .icon-image class, for image-based icons | 744 | /* .icon-image class, for image-based icons |
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 1afd9df6..0a8380de 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig | |||
@@ -19,6 +19,7 @@ | |||
19 | {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %} | 19 | {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %} |
20 | {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans "carrot" %}"><span>Carrot</span></a></li>{% endif %} | 20 | {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans "carrot" %}"><span>Carrot</span></a></li>{% endif %} |
21 | {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %} | 21 | {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %} |
22 | {% if constant('RELOAD_ARTICLE') == 1 %}<li><a class="tool reload icon icon-reload" href="./?action=reload_article&id={{ entry.id|e }}" title="{% trans "Reload article" %}"><span>{% trans "Reload article" %}</span></a></li>{% endif %} | ||
22 | {% if constant('EPUB') == 1 %}<li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %} | 23 | {% if constant('EPUB') == 1 %}<li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %} |
23 | {% if constant('MOBI') == 1 %}<li><a href="./?mobi&method=id&value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %} | 24 | {% if constant('MOBI') == 1 %}<li><a href="./?mobi&method=id&value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %} |
24 | {% if constant('PDF') == 1 %}<li><a href="./?pdf&method=id&value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %} | 25 | {% if constant('PDF') == 1 %}<li><a href="./?pdf&method=id&value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %} |
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index 4406d48f..666c4a28 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css | |||
@@ -67,3 +67,6 @@ a.bad-display span { | |||
67 | a.print span { | 67 | a.print span { |
68 | background-image: url('../img/default/print.png'); | 68 | background-image: url('../img/default/print.png'); |
69 | } | 69 | } |
70 | a.reload span { | ||
71 | background-image: url('../img/default/reload.png'); | ||
72 | } | ||
diff --git a/themes/default/img/default/reload.png b/themes/default/img/default/reload.png new file mode 100644 index 00000000..4c0528e7 --- /dev/null +++ b/themes/default/img/default/reload.png | |||
Binary files differ | |||
diff --git a/themes/default/view.twig b/themes/default/view.twig index 8f3a26c3..be8bf99e 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig | |||
@@ -18,6 +18,7 @@ | |||
18 | {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numFlattrs }}</a></li>{% endif %}{% endif %} | 18 | {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numFlattrs }}</a></li>{% endif %}{% endif %} |
19 | {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon" target="_blank" title="{% trans "carrot" %}"><span>{% trans "carrot" %}</span></a></li>{% endif %} | 19 | {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon" target="_blank" title="{% trans "carrot" %}"><span>{% trans "carrot" %}</span></a></li>{% endif %} |
20 | {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %} | 20 | {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %} |
21 | {% if constant('RELOAD_ARTICLE') == 1 %}<li><a class="tool reload" href="./?action=reload_article&id={{ entry.id|e }}" title="{% trans "Reload article" %}"><span>{% trans "Reload article" %}</span></a></li>{% endif %}} | ||
21 | {% if constant('EPUB') == 1 %}<li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %} | 22 | {% if constant('EPUB') == 1 %}<li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %} |
22 | {% if constant('MOBI') == 1 %}<li><a href="./?mobi&method=id&value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %} | 23 | {% if constant('MOBI') == 1 %}<li><a href="./?mobi&method=id&value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %} |
23 | {% if constant('PDF') == 1 %}<li><a href="./?pdf&method=id&value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %} | 24 | {% if constant('PDF') == 1 %}<li><a href="./?pdf&method=id&value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %} |