aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorMaryana Rozhankivska <mariroz@mr.lviv.ua>2014-04-22 10:45:09 +0300
committerMaryana Rozhankivska <mariroz@mr.lviv.ua>2014-04-22 10:45:09 +0300
commitc2cf7075c24c1539befd4ba09881eed761c9d769 (patch)
tree7e00deb3d973146a95976072523c9a206b6b079b /inc
parentbfe1ad6dbc9dc10997d5325da9186ba2a9f5ebfe (diff)
downloadwallabag-c2cf7075c24c1539befd4ba09881eed761c9d769.tar.gz
wallabag-c2cf7075c24c1539befd4ba09881eed761c9d769.tar.zst
wallabag-c2cf7075c24c1539befd4ba09881eed761c9d769.zip
print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view
Diffstat (limited to 'inc')
-rwxr-xr-xinc/poche/Poche.class.php16
-rwxr-xr-xinc/poche/config.inc.php.new4
2 files changed, 18 insertions, 2 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 811895dc..dcfdc167 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -434,12 +434,24 @@ class Poche
434 case 'toggle_fav' : 434 case 'toggle_fav' :
435 $this->store->favoriteById($id, $this->user->getId()); 435 $this->store->favoriteById($id, $this->user->getId());
436 Tools::logm('mark as favorite link #' . $id); 436 Tools::logm('mark as favorite link #' . $id);
437 Tools::redirect(); 437 if ( Tools::isAjaxRequest() ) {
438 echo 1;
439 exit;
440 }
441 else {
442 Tools::redirect();
443 }
438 break; 444 break;
439 case 'toggle_archive' : 445 case 'toggle_archive' :
440 $this->store->archiveById($id, $this->user->getId()); 446 $this->store->archiveById($id, $this->user->getId());
441 Tools::logm('archive link #' . $id); 447 Tools::logm('archive link #' . $id);
442 Tools::redirect(); 448 if ( Tools::isAjaxRequest() ) {
449 echo 1;
450 exit;
451 }
452 else {
453 Tools::redirect();
454 }
443 break; 455 break;
444 case 'archive_all' : 456 case 'archive_all' :
445 $this->store->archiveAll($this->user->getId()); 457 $this->store->archiveAll($this->user->getId());
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 83b3c4c0..3b08c212 100755
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -42,6 +42,10 @@ define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
42define ('NOT_FLATTRABLE', '0'); 42define ('NOT_FLATTRABLE', '0');
43define ('FLATTRABLE', '1'); 43define ('FLATTRABLE', '1');
44define ('FLATTRED', '2'); 44define ('FLATTRED', '2');
45// display or not print link in article view
46define ('SHOW_PRINTLINK', '1');
47// display or not percent of read in article view. Affects only default theme.
48define ('SHOW_READPERCENT', '1');
45define ('ABS_PATH', 'assets/'); 49define ('ABS_PATH', 'assets/');
46 50
47define ('DEFAULT_THEME', 'baggy'); 51define ('DEFAULT_THEME', 'baggy');