mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-07 07:25:25 +00:00
Code Issues Projects Releases Wiki Activity

fix autoclose (#984) and bookmarklet mode

Browse source
This commit is contained in:
Thomas Citharel 2015-02-04 23:37:37 +01:00
parent 3fb0d44a67
commit 1c91178932
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
inc/poche/Poche.class.php
View file

@ -195,9 +195,9 @@ class Poche
} }
if ($autoclose == TRUE) { if ($autoclose == TRUE) {
Tools::redirect('?view=home'); Tools::redirect('?view=home&closewin=true');
} else { } else {
Tools::redirect('?view=home&closewin=true'); Tools::redirect('?view=home');
} }
return $last_id; return $last_id;
break; break;

3
inc/poche/Routing.class.php
View file

@ -33,6 +33,7 @@ class Routing
$this->view = Tools::checkVar('view', 'home'); $this->view = Tools::checkVar('view', 'home');
$this->action = Tools::checkVar('action'); $this->action = Tools::checkVar('action');
$this->id = Tools::checkVar('id'); $this->id = Tools::checkVar('id');
$this->autoclose = Tools::checkVar('autoclose',FALSE);
$_SESSION['sort'] = Tools::checkVar('sort', 'id'); $_SESSION['sort'] = Tools::checkVar('sort', 'id');
$this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : ''); $this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
} }
@ -64,7 +65,7 @@ class Routing
$tplVars = array(); $tplVars = array();
if (\Session::isLogged()) { if (\Session::isLogged()) {
$this->wallabag->action($this->action, $this->url, $this->id); $this->wallabag->action($this->action, $this->url, $this->id, FALSE, $this->autoclose);
$tplFile = Tools::getTplFile($this->view); $tplFile = Tools::getTplFile($this->view);
$tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id)); $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
} elseif(isset($_SERVER['PHP_AUTH_USER'])) { } elseif(isset($_SERVER['PHP_AUTH_USER'])) {

2
themes/baggy/config.twig
View file

@ -27,7 +27,7 @@
</ul> </ul>
<h3>{% trans "Bookmarklet" %}</h3> <h3>{% trans "Bookmarklet" %}</h3>
<p> <p>
{% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a> {% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&autoclose=true&url='%20+%20btoa(url),'_blank');})();void(0);}">{% trans "bag it!" %}</a>
</p> </p>
<h2>{% trans "Feeds" %}</h2> <h2>{% trans "Feeds" %}</h2>

2
themes/default/config.twig
View file

@ -27,7 +27,7 @@
</ul> </ul>
<h3>{% trans "Bookmarklet" %}</h3> <h3>{% trans "Bookmarklet" %}</h3>
<p> <p>
{% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&url='%20+%20btoa(url),'_self');})();void(0);}">{% trans "bag it!" %}</a> {% trans "Drag &amp; drop this link to your bookmarks bar:" %} <a id="bookmarklet" ondragend="this.click();" href="javascript:if(top['bookmarklet-url@wallabag.org']){top['bookmarklet-url@wallabag.org'];}else{(function(){var%20url%20=%20location.href%20||%20url;window.open('{{ poche_url }}?action=add&autoclose=true&url='%20+%20btoa(url),'_blank');})();void(0);}">{% trans "bag it!" %}</a>
</p> </p>
<h2>{% trans "Feeds" %}</h2> <h2>{% trans "Feeds" %}</h2>