Merge branch 'dev' into savewithtags

This commit is contained in:
Thomas Citharel 2015-02-10 01:28:24 +01:00
commit 2e4e94a7a4
24 changed files with 840 additions and 79 deletions

View file

@ -1,6 +1,4 @@
body: //div[@class="highlight"]/pre
prune: no
tidy: no
test_url: https://gist.github.com/1258908
title: //div[contains(@class,'gist-description')]
body: //div[contains(@class,'blob-wrapper')]
test_url: https://gist.github.com/staltz/868e7e9bc2a7b8c1f754

View file

@ -0,0 +1,3 @@
title: //h1
body: //div[contains(@class,'story')]
test_url: http://jungle-world.com/artikel/2015/02/51207.html

View file

@ -0,0 +1,5 @@
title: //h2[contains(@class,'news')]
body: //div[contains(@class,'articleContent')]
date: substring-after(//div[@class = 'SupaDate']/text(), 'le')
test_url: http://www.toolinux.com/Wi-Fi-Linksys-WRT-la-legende-de

View file

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

View file

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

View file

@ -44,6 +44,7 @@
@define ('SHARE_MAIL', TRUE);
@define ('SHARE_SHAARLI', FALSE);
@define ('SHAARLI_URL', 'http://myshaarliurl.com');
@define ('SHARE_EVERNOTE', FALSE);
@define ('SHARE_DIASPORA', FALSE);
@define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end
@define ('FLATTR', TRUE);

File diff suppressed because one or more lines are too long

View file

@ -26,7 +26,10 @@ $allow_url_fopen_ok = (bool)ini_get('allow_url_fopen');
$filter_ok = extension_loaded('filter');
$gettext_ok = function_exists("gettext");
$gd_ok = extension_loaded('gd');
$pdo_drivers_passing = extension_loaded('pdo_sqlite') || extension_loaded('pdo_mysql') || extension_loaded('pdo_pgsql');
$pdo_drivers = pdoDrivers();
$pdo_drivers_passing = $pdo_drivers['sqlite'] || $pdo_drivers['mysql'] || $pdo_drivers['postgres'];
if (extension_loaded('xmlreader')) {
$xml_ok = true;
@ -39,7 +42,11 @@ if (extension_loaded('xmlreader')) {
$xml_ok = false;
}
$status = array('app_name' => $app_name, 'php' => $php_ok, 'pdo' => $pdo_ok, 'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok, 'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok, 'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok, 'gettext' => $gettext_ok, 'gd' => $gd_ok);
$status = array('app_name' => $app_name, 'php' => $php_ok, 'pdo' => $pdo_ok,
'pdo_drivers_passing' => $pdo_drivers_passing, 'xml' => $xml_ok, 'pcre' => $pcre_ok,
'zlib' => $zlib_ok, 'mbstring' => $mbstring_ok, 'dom' => $dom_ok, 'iconv' => $iconv_ok, 'tidy' => $tidy_ok, 'curl' => $curl_ok,
'parse_ini' => $parse_ini_ok, 'parallel' => $parallel_ok, 'allow_url_fopen' => $allow_url_fopen_ok, 'filter' => $filter_ok,
'gettext' => $gettext_ok, 'gd' => $gd_ok);
return $status;
}
@ -53,6 +60,17 @@ function isPassing() {
return !in_array(false, $status);
}
function pdoDrivers() {
$pdo_driver_sqlite = extension_loaded('pdo_sqlite');
$pdo_driver_mysql = extension_loaded('pdo_mysql');
$pdo_driver_postgres = extension_loaded('pdo_pgsql');
$pdo_drivers = array('sqlite' => $pdo_driver_sqlite, 'mysql' => $pdo_driver_mysql,
'postgres' => $pdo_driver_postgres);
return $pdo_drivers;
}
/* Function taken from at http://php.net/manual/en/function.rmdir.php#110489
* Idea : nbari at dalmp dot com
* Rights unknown

Binary file not shown.

View file

@ -0,0 +1,681 @@
msgid ""
msgstr ""
"Project-Id-Version: wallabag\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-25 15:17+0300\n"
"PO-Revision-Date: \n"
"Last-Translator: tcit <tcit@openmailbox.org>\n"
"Language-Team: \n"
"Language: en-GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
"X-Poedit-Basepath: .\n"
msgid "wallabag, a read it later open source system"
msgstr "wallabag, an open source \"Read It Later\" service"
msgid "login failed: user doesn't exist"
msgstr "Login failed: user doesn't exist"
msgid "return home"
msgstr "Return Home"
msgid "config"
msgstr "Config"
msgid "Saving articles"
msgstr "Saving articles"
msgid "There are several ways to save an article:"
msgstr "There are several ways to save an article:"
msgid "read the documentation"
msgstr "Read the documentation"
msgid "download the extension"
msgstr "Download the extension"
msgid "Firefox Add-On"
msgstr "Firefox Add-On"
msgid "Chrome Extension"
msgstr "Chrome Extension"
msgid "via F-Droid"
msgstr "via F-Droid"
msgid " or "
msgstr " or "
msgid "via Google Play"
msgstr "via Google Play"
msgid "download the application"
msgstr "Download the application"
msgid "By filling this field"
msgstr "By filling in this field"
msgid "bag it!"
msgstr "bag it!"
msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar"
msgid "Upgrading wallabag"
msgstr "Upgrading wallabag"
msgid "Installed version"
msgstr "Installed version"
msgid "Latest stable version"
msgstr "Latest stable version"
msgid "A more recent stable version is available."
msgstr "A more recent stable version is available."
msgid "You are up to date."
msgstr "You are up to date."
msgid "Latest dev version"
msgstr "Latest dev version"
msgid "A more recent development version is available."
msgstr "A more recent development version is available."
msgid "Feeds"
msgstr "Feeds"
msgid ""
"Your feed token is currently empty and must first be generated to enable "
"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
msgstr ""
"Your feed token is currently empty. You must generated it to enable feeds. "
"<a href='?feed&amp;action=generate'>Generate Feed Token</a>."
msgid "Unread feed"
msgstr "Unread feed"
msgid "Favorites feed"
msgstr "Favourites feed"
msgid "Archive feed"
msgstr "Archive feed"
msgid "Your token:"
msgstr "Your token:"
msgid "Your user id:"
msgstr "Your user ID:"
msgid ""
"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
"</a>."
msgstr "<a href='?feed&amp;action=generate'>Regenerate Token</a>"
msgid "Change your theme"
msgstr "Change Your Theme"
msgid "Theme:"
msgstr "Theme:"
msgid "Update"
msgstr "Update"
msgid "Change your language"
msgstr "Change Your Language"
msgid "Language:"
msgstr "Language:"
msgid "Change your password"
msgstr "Change Your Password"
msgid "New password:"
msgstr "New password:"
msgid "Password"
msgstr "Password"
msgid "Repeat your new password:"
msgstr "Repeat your new password:"
msgid "Import"
msgstr "Import"
msgid ""
"You can import your Pocket, Readability, Instapaper, Wallabag or any data in "
"appropriate json or html format."
msgstr ""
"You can import your Pocket, Readability, Instapaper, wallabag or any other "
"data in JSON or HTML format."
msgid ""
"Please execute the import script locally as it can take a very long time."
msgstr "Please run the import script locally as it can take a very long time."
msgid ""
"Please select export file on your computer and press \"Import\" button "
"below. Wallabag will parse your file, insert all URLs and start fetching of "
"articles if required."
msgstr ""
"Please select export file on your computer and press the &ldquo;"
"Import&rdquo; button below. wallabag will parse your file, insert all URLs "
"and start fetching articles if required. Please execute the import script "
"locally as it can take a very long time."
msgid "You can click here to fetch content for articles with no content."
msgstr "Fetch content for articles with no content"
msgid "More info in the official documentation:"
msgstr "More info in the official documentation:"
msgid ""
"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
msgstr ""
"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
msgid "Import from Pocket"
msgstr "Import from Pocket"
#, php-format
msgid "(you must have a %s file on your server)"
msgstr "(you must have a %s file on your server)"
msgid "Import from Readability"
msgstr "Import from Readability"
msgid "Import from Instapaper"
msgstr "Import from Instapaper"
msgid "Import from wallabag"
msgstr "Import from wallabag"
msgid "Export your wallabag data"
msgstr "Export your wallabag data"
msgid "Click here"
msgstr "Click here"
msgid "to download your database."
msgstr "to download your database."
msgid "to export your wallabag data."
msgstr "to export your wallabag data."
msgid "Export JSON"
msgstr "Export JSON"
msgid "Cache"
msgstr "Cache"
msgid "to delete cache."
msgstr "to delete cache."
msgid "Delete Cache"
msgstr "Delete Cache"
msgid "You can enter multiple tags, separated by commas."
msgstr "You can enter multiple tags, separated by commas."
msgid "Add tags:"
msgstr "Add tags:"
msgid "no tags"
msgstr "no tags"
msgid "The tag has been applied successfully"
msgstr "The tag has been applied successfully"
msgid "interview"
msgstr "interview"
msgid "editorial"
msgstr "editorial"
msgid "video"
msgstr "video"
msgid "return to article"
msgstr "Return to article"
msgid "plop"
msgstr "plop"
msgid ""
"You can <a href='wallabag_compatibility_test.php'>check your configuration "
"here</a>."
msgstr ""
"You can <a href='wallabag_compatibility_test.php'>check your configuration "
"here</a>."
msgid "favoris"
msgstr "Favourites"
msgid "archive"
msgstr "Archive"
msgid "unread"
msgstr "Unread"
msgid "by date asc"
msgstr "by date ascending"
msgid "by date"
msgstr "by date"
msgid "by date desc"
msgstr "by date descending"
msgid "by title asc"
msgstr "by title ascending"
msgid "by title"
msgstr "by title"
msgid "by title desc"
msgstr "by title descending"
msgid "Tag"
msgstr "Tag"
msgid "No articles found."
msgstr "No articles found."
msgid "Toggle mark as read"
msgstr "Toggle mark as read"
msgid "toggle favorite"
msgstr "Toggle favourite"
msgid "delete"
msgstr "Delete"
msgid "original"
msgstr "Original"
msgid "estimated reading time:"
msgstr "Estimated reading time:"
msgid "mark all the entries as read"
msgstr "Mark all the entries as read"
msgid "results"
msgstr "Results"
msgid "installation"
msgstr "Installation"
msgid "install your wallabag"
msgstr "Install your wallabag"
msgid ""
"wallabag is still not installed. Please fill the below form to install it. "
"Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation "
"on wallabag website</a>."
msgstr ""
"wallabag is still not installed. Please fill in the form to install it. If "
"you need help, please <a href='http://doc.wallabag.org/'>read the "
"documentation on wallabag website</a>."
msgid "Login"
msgstr "Login"
msgid "Repeat your password"
msgstr "Repeat your password"
msgid "Install"
msgstr "Install"
msgid "login to your wallabag"
msgstr "Login to your wallabag"
msgid "Login to wallabag"
msgstr "Login to wallabag"
msgid "you are in demo mode, some features may be disabled."
msgstr "You are in demo mode; some features may be disabled."
msgid "Username"
msgstr "Username"
msgid "Stay signed in"
msgstr "Stay signed in"
msgid "(Do not check on public computers)"
msgstr "(Do not check on public computers)"
msgid "Sign in"
msgstr "Sign in"
msgid "favorites"
msgstr "Favourites"
msgid "estimated reading time :"
msgstr "Estimated reading time:"
msgid "Mark all the entries as read"
msgstr "Mark all the entries as read"
msgid "Return home"
msgstr "Return home"
msgid "Back to top"
msgstr "Back to top"
msgid "Mark as read"
msgstr "Mark as read"
msgid "Favorite"
msgstr "Favourite"
msgid "Toggle favorite"
msgstr "Toggle favourite"
msgid "Delete"
msgstr "Delete"
msgid "Tweet"
msgstr "Tweet"
msgid "Email"
msgstr "Email"
msgid "shaarli"
msgstr "shaarli"
msgid "flattr"
msgstr "flattr"
msgid "Does this article appear wrong?"
msgstr "Does this article display incorrectly?"
msgid "tags:"
msgstr "tags:"
msgid "Edit tags"
msgstr "Edit Tags"
msgid "save link!"
msgstr "Save Link"
msgid "home"
msgstr "Home"
msgid "tags"
msgstr "Tags"
msgid "logout"
msgstr "Logout"
msgid "powered by"
msgstr "Powered by"
msgid "debug mode is on so cache is off."
msgstr "Debug mode is on, so the cache is off."
msgid "your wallabag version:"
msgstr "Your wallabag version:"
msgid "storage:"
msgstr "Storage:"
msgid "save a link"
msgstr "Save a Link"
msgid "back to home"
msgstr "Back to Home"
msgid "toggle mark as read"
msgstr "Toggle mark as read"
msgid "tweet"
msgstr "Tweet"
msgid "email"
msgstr "Email"
msgid "this article appears wrong?"
msgstr "This article displays incorrectly?"
msgid "No link available here!"
msgstr "No link available here"
msgid "Poching a link"
msgstr "bagging a link"
msgid "by filling this field"
msgstr "by filling in this field"
msgid "bookmarklet: drag & drop this link to your bookmarks bar"
msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar"
msgid "Drag &amp; drop this link to your bookmarks bar:"
msgstr "Drag &amp; drop this link to your bookmarks bar:"
msgid "your version"
msgstr "your version"
msgid "latest stable version"
msgstr "latest stable version"
msgid "a more recent stable version is available."
msgstr "A more recent stable version is available."
msgid "you are up to date."
msgstr "You are up to date."
msgid "latest dev version"
msgstr "latest development version"
msgid "a more recent development version is available."
msgstr "A more recent development version is available."
msgid "You can clear cache to check the latest release."
msgstr ""
"You can <a href=\"#cache\">clear the cache</a> to check for the latest "
"release."
msgid "Please execute the import script locally, it can take a very long time."
msgstr "Please run the import script locally as it can take a very long time."
msgid "More infos in the official doc:"
msgstr "More information in the official doc:"
msgid "import from Pocket"
msgstr "Import from Pocket"
msgid "import from Readability"
msgstr "Import from Readability"
msgid "import from Instapaper"
msgstr "Import from Instapaper"
msgid "Tags"
msgstr "Tags"
msgid "Untitled"
msgstr "Untitled"
msgid "the link has been added successfully"
msgstr "The link has been added successfully."
msgid "error during insertion : the link wasn't added"
msgstr "Error during insertion: the link wasn't added."
msgid "the link has been deleted successfully"
msgstr "The link has been deleted successfully."
msgid "the link wasn't deleted"
msgstr "The link wasn't deleted."
msgid "Article not found!"
msgstr "Article not found."
msgid "previous"
msgstr "Previous"
msgid "next"
msgstr "Next"
msgid "in demo mode, you can't update your password"
msgstr "In demo mode, you can't update your password."
msgid "your password has been updated"
msgstr "Your password has been updated."
msgid ""
"the two fields have to be filled & the password must be the same in the two "
"fields"
msgstr ""
"The two fields must be filled in, and the password must be the same in both "
"fields"
msgid "still using the \""
msgstr "Still using the \""
msgid "that theme does not seem to be installed"
msgstr "That theme is not installed."
msgid "you have changed your theme preferences"
msgstr "You have changed your theme preferences."
msgid "that language does not seem to be installed"
msgstr "That language is not installed."
msgid "you have changed your language preferences"
msgstr "You have changed your language preferences."
msgid "login failed: you have to fill all fields"
msgstr "Login failed: you have to fill in all the fields."
msgid "welcome to your wallabag"
msgstr "Welcome to your wallabag."
msgid "login failed: bad login or password"
msgstr "Login failed: bad login or password."
msgid "import from instapaper completed"
msgstr "Import from Instapaper completed."
msgid "import from pocket completed"
msgstr "Import from Pocket completed."
msgid "import from Readability completed. "
msgstr "Import from Readability completed."
msgid "import from Poche completed. "
msgstr "Import from Poche completed. "
msgid "Unknown import provider."
msgstr "Unknown import provider."
msgid "Incomplete inc/poche/define.inc.php file, please define \""
msgstr "Incomplete inc/poche/define.inc.php file, please define \""
msgid "Could not find required \""
msgstr "Could not find required \""
msgid "Uh, there is a problem while generating feeds."
msgstr "There is a problem generating feeds."
msgid "Cache deleted."
msgstr "Cache deleted."
msgid "Oops, it seems you don't have PHP 5."
msgstr "Oops, it seems you don't have PHP 5."
msgid "Add user"
msgstr "Add User"
msgid "Add a new user :"
msgstr "Add a new user:"
msgid "Login for new user"
msgstr "Login for new user:"
msgid "Password for new user"
msgstr "Password for new user:"
msgid "Email for new user (not required)"
msgstr "Email for new user (not required):"
msgid "Send"
msgstr "Send"
msgid "Delete account"
msgstr "Delete Account"
msgid "You can delete your account by entering your password and validating."
msgstr "You can delete your account by entering your password and confirming."
msgid "Be careful, data will be erased forever (that is a very long time)."
msgstr "Be careful, data will be erased forever (that is a very long time)."
msgid "Type here your password"
msgstr "Enter your password"
msgid "You are the only user, you cannot delete your own account."
msgstr "You are the only user; you cannot delete your own account."
msgid ""
"To completely remove wallabag, delete the wallabag folder on your web server "
"(and eventual databases)."
msgstr ""
"To completely remove wallabag, delete the wallabag folder on your web "
"server. Then delete any any databases you have created for wallabag."
msgid "Enter your search here"
msgstr "Enter your search here"
msgid "Tag these results as"
msgstr "Tag these results as"
# ebook
msgid "Fancy an E-Book ?"
msgstr "Fancy an E-Book?"
msgid ""
"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
"link</a> to get all your articles in one ebook (ePub 3 format)."
msgstr ""
"You can <a href=\"./?epub&amp;method=all\" title=\"Generate EPUB\">Generate "
"an EPUB</a> to get all your articles in one ebook (EPUB 3 format)."
msgid ""
"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
"articles, depending on your server configuration."
msgstr ""
"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
"articles, depending on your server configuration."
msgid "Download the articles from this tag in an epub"
msgstr "Download the articles from this tag as an EPUB"
msgid "Download the articles from this search in an epub"
msgstr "Download the articles from this search as an EPUB"
msgid "Download the articles from this category in an epub"
msgstr "Download the articles from this category as an EPUB"
#~ msgid "poche it!"
#~ msgstr "poche it!"
#~ msgid "Updating poche"
#~ msgstr "Updating poche"
#~ msgid "create an issue"
#~ msgstr "create an issue"
#~ msgid "or"
#~ msgstr "or"
#~ msgid "contact us by mail"
#~ msgstr "contact us by mail"
#~ msgid "your poche version:"
#~ msgstr "your poche version:"

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generated by IcoMoon.io -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="640" height="640" viewBox="0 0 640 640"><g id="icomoon-ignore">
</g>
<path d="M554.848 137.824c0-36.8-55.424-40.864-55.424-40.864l-130.208-8.192c0 0-2.784-35.424-29.088-47.744-26.304-12.256-55.232-8.512-76.032-8.32-20.8 0.224-25.696 26.72-25.696 51.744 0 24.992 0.448 53.888 0.448 72 0 32.576-14.304 46.368-50.112 46.368h-73.824c-20.64-1.312-36.704 2.048-36.704 18.752 0 16.736 24.288 159.136 57.632 192 19.36 19.072 137.76 32.448 162.688 32.448s16.608-73.632 23.552-73.632c6.944 0 14.528 41.568 53.824 51.296 39.232 9.824 91.648 8 94.432 35.936 3.616 36.864 6.944 84.544-17.312 87.936l-54.912 2.176c-37.632-2.688-27.52-43.808-10.912-43.808s24.928-0.608 24.928-0.608l2.080-44.992c0 0-86.176-10.176-89.824 47.936-3.36 53.12 5.76 78.176 12.448 83.616 6.688 5.504 18.272 16.128 123.808 16.128 148.704 0 94.208-433.376 94.208-470.176zM494.080 330.24c-5.824 6.272-26.944-10.24-47.104-10.24-20.192 0-41.952 10.688-47.072 3.616-5.12-7.008 4.672-63.68 42.688-63.68s57.376 64.128 51.488 70.304z" fill="rgb(68, 68, 68)"></path>
<path d="M185.728 133.312c0-7.328 1.856-95.488 1.856-95.488l-112.16 110.080c0 0 77.504 0 92.736 0 15.232-0.032 17.568-7.328 17.568-14.592z" fill="rgb(68, 68, 68)"></path>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

@ -7,6 +7,8 @@
{% block content %}
<h2>{% trans "About wallabag" %}</h2>
<p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
<dl>
<dt>{% trans "Project website" %}</dt>
<dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
@ -27,8 +29,6 @@
<dd>{{ constant('POCHE') }}</dd>
</dl>
<p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
<h2>{% trans "Getting help" %}</h2>
<dl>

View file

@ -27,7 +27,7 @@
</ul>
<h3>{% trans "Bookmarklet" %}</h3>
<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>
<h2>{% trans "Feeds" %}</h2>

View file

@ -742,6 +742,9 @@ a.add-to-wallabag-link-after:after {
.icon-reload:before {
content: "\ea2e";
}
.icon-evernote:before {
content: "\e603";
}
/* .icon-image class, for image-based icons

Binary file not shown.

View file

@ -10,6 +10,7 @@
<glyph unicode="&#xe600;" d="M512 778.666c-188.544 0-341.334-152.832-341.334-341.332s152.788-341.334 341.334-341.334 341.334 152.832 341.334 341.334-152.788 341.332-341.334 341.332zM670.164 339.498c16.682-16.682 16.682-43.648 0-60.332-8.32-8.32-19.244-12.5-30.164-12.5s-21.846 4.182-30.164 12.5l-97.836 97.836-97.834-97.836c-8.32-8.32-19.242-12.5-30.166-12.5s-21.846 4.182-30.166 12.5c-16.682 16.682-16.682 43.648 0 60.332l97.834 97.836-97.834 97.834c-16.682 16.682-16.682 43.648 0 60.332s43.648 16.682 60.332 0l97.834-97.834 97.836 97.834c16.682 16.682 43.648 16.682 60.332 0s16.682-43.648 0-60.332l-97.836-97.834 97.836-97.836z" />
<glyph unicode="&#xe601;" d="M490.666 146.218c-74.070 0-143.7 28.842-196.096 81.196-52.352 52.394-81.236 122.028-81.236 196.14s28.884 143.744 81.236 196.14c16.682 16.682 43.648 16.682 60.332 0s16.682-43.648 0-60.332c-36.266-36.308-56.236-84.522-56.236-135.808s19.968-99.542 56.236-135.808c36.266-36.268 84.438-56.192 135.764-56.192s99.498 19.968 135.766 56.192c36.308 36.268 56.236 84.48 56.236 135.808s-19.968 99.542-56.236 135.808c-16.682 16.682-16.682 43.648 0 60.332s43.648 16.682 60.332 0c52.352-52.438 81.236-122.070 81.236-196.14s-28.884-143.744-81.236-196.14c-52.394-52.352-122.028-81.194-196.096-81.194zM490.666 469.334c-23.594 0-42.666 19.116-42.666 42.666v213.334c0 23.552 19.072 42.666 42.668 42.666s42.668-19.116 42.668-42.666v-213.334c0-23.552-19.072-42.666-42.668-42.666z" />
<glyph unicode="&#xe602;" d="M512 803.328l-273.664-273.664c-33.324-33.322-33.324-87.34 0-120.662s87.338-33.322 120.662 0l67.668 67.67v-308.992c0-47.104 38.188-85.332 85.334-85.332 47.104 0 85.332 38.23 85.332 85.332v308.992l67.668-67.67c16.682-16.682 38.486-25.004 60.332-25.004s43.648 8.32 60.332 25.004c33.322 33.322 33.322 87.34 0 120.662l-273.664 273.664z" />
<glyph unicode="&#xe603;" d="M887.757 752.282c0 58.88-88.678 65.382-88.678 65.382l-208.333 13.107c0 0-4.454 56.678-46.541 76.39-42.086 19.61-88.371 13.619-121.651 13.312-33.28-0.358-41.114-42.752-41.114-82.79 0-39.987 0.717-86.221 0.717-115.2 0-52.122-22.886-74.189-80.179-74.189h-118.118c-33.024 2.099-58.726-3.277-58.726-30.003 0-26.778 38.861-254.618 92.211-307.2 30.976-30.515 220.416-51.917 260.301-51.917s26.573 117.811 37.683 117.811c11.11 0 23.245-66.509 86.118-82.074 62.771-15.718 146.637-12.8 151.091-57.498 5.786-58.982 11.11-135.27-27.699-140.698l-87.859-3.482c-60.211 4.301-44.032 70.093-17.459 70.093s39.885 0.973 39.885 0.973l3.328 71.987c0 0-137.882 16.282-143.718-76.698-5.376-84.992 9.216-125.082 19.917-133.786 10.701-8.806 29.235-25.805 198.093-25.805 237.926 0 150.733 693.402 150.733 752.282zM790.528 444.416c-9.318-10.035-43.11 16.384-75.366 16.384-32.307 0-67.123-17.101-75.315-5.786-8.192 11.213 7.475 101.888 68.301 101.888s91.802-102.605 82.381-112.486zM297.165 759.501c0 11.725 2.97 152.781 2.97 152.781l-179.456-176.128c0 0 124.006 0 148.378 0 24.371 0.051 28.109 11.725 28.109 23.347z" />
<glyph unicode="&#xe800;" d="M0 51.712v526.336q0 183.296 87.040 284.672t265.216 101.376h561.152q-5.12-5.12-53.248-54.272t-102.4-103.424-111.616-111.616-97.28-95.232-43.008-37.888q-15.36 0-15.36 16.384v159.744h-49.152q-60.416 0-96.256-6.144t-64.512-26.624-39.936-58.368-12.288-98.304v-268.288zM68.608-68.096q5.12 5.12 54.272 54.272t102.4 103.424 111.616 112.64 97.28 95.232 41.984 36.864q15.36 0 15.36-16.384v-159.744h49.152q118.784 0 165.888 36.864t46.080 152.576v268.288l229.376 228.352v-526.336q0-183.296-86.016-284.672t-266.24-101.376h-561.152z" horiz-adv-x="982" />
<glyph unicode="&#xe801;" d="M301.056 208.384q14.336 14.336 34.816 14.336t36.864-14.336q32.768-34.816 0-71.68l-43.008-40.96q-57.344-57.344-135.168-57.344-79.872 0-137.216 57.344t-57.344 135.168q0 79.872 57.344 137.216l151.552 151.552q71.68 69.632 147.456 78.848t131.072-44.032q16.384-16.384 16.384-36.864t-16.384-36.864q-36.864-32.768-71.68 0-51.2 49.152-135.168-34.816l-151.552-149.504q-26.624-26.624-26.624-65.536t26.624-63.488q26.624-26.624 64.512-26.624t64.512 26.624zM761.856 796.16q57.344-57.344 57.344-135.168 0-79.872-57.344-137.216l-161.792-161.792q-75.776-73.728-153.6-73.728-63.488 0-114.688 51.2-14.336 14.336-14.336 34.816t14.336 36.864q14.336 14.336 35.84 14.336t35.84-14.336q51.2-49.152 124.928 24.576l161.792 159.744q28.672 28.672 28.672 65.536 0 38.912-28.672 63.488-24.576 26.624-57.344 31.744t-61.44-21.504l-51.2-51.2q-16.384-14.336-36.864-14.336t-34.816 14.336q-34.816 34.816 0 71.68l51.2 51.2q55.296 55.296 130.048 52.224t132.096-62.464z" horiz-adv-x="820" />
<glyph unicode="&#xe802;" d="M877.568 192v-72.704q0-15.36-10.24-25.6t-26.624-11.264h-803.84q-15.36 0-25.6 11.264t-11.264 25.6v72.704q0 15.36 11.264 25.6t25.6 11.264h803.84q15.36 0 26.624-11.264t10.24-25.6zM877.568 484.864v-73.728q0-14.336-10.24-25.6t-26.624-10.24h-803.84q-15.36 0-25.6 10.24t-11.264 25.6v73.728q0 14.336 11.264 25.6t25.6 10.24h803.84q15.36 0 26.624-10.24t10.24-25.6zM877.568 776.704v-72.704q0-15.36-10.24-25.6t-26.624-11.264h-803.84q-15.36 0-25.6 11.264t-11.264 25.6v72.704q0 15.36 11.264 26.624t25.6 10.24h803.84q15.36 0 26.624-10.24t10.24-26.624z" horiz-adv-x="878" />

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Binary file not shown.

View file

@ -15,6 +15,7 @@
{% 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 %}
{% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
{% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
{% if constant('SHARE_EVERNOTE') == 1 %}<li><a href="https://www.evernote.com/clip.action?url={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool evernote icon icon-evernote" title="{% trans "evernote" %}"><span>{% trans "evernote" %}</span></a></li>{% endif %}
{% if constant('SHARE_DIASPORA') == 1 %}<li><a href="{{ constant('DIASPORA_URL') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="{% trans "diaspora" %}"><span>{% trans "diaspora" %}</span></a></li>{% endif %}
{% 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 %}
{% 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 %}

View file

@ -7,6 +7,8 @@
{% block content %}
<h2>{% trans "About wallabag" %}</h2>
<p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
<dl>
<dt>{% trans "Project website" %}</dt>
<dd><a href="http://www.wallabag.org">http://www.wallabag.org</a></dd>
@ -27,8 +29,6 @@
<dd>{{ constant('POCHE') }}</dd>
</dl>
<p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
<h2>{% trans "Helping wallabag" %}</h2>
<p>{% trans "wallabag is free and opensource. You can help us:" %}</p>

View file

@ -27,7 +27,7 @@
</ul>
<h3>{% trans "Bookmarklet" %}</h3>
<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>
<h2>{% trans "Feeds" %}</h2>

View file

@ -43,6 +43,11 @@ a.carrot span {
background-size: 16px 16px;
}
a.evernote span {
background-image: url('../../_global/img/icons/evernote-icon--black.svg');
background-size: 16px 16px;
}
a.diaspora span {
background-image: url('../../_global/img/icons/diaspora-icon--black.png');
background-size: 16px 16px;

View file

@ -32,7 +32,7 @@
{% if nb_results > 1 %}
<div class="results">
<div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
<a class="random" href="?view=view&id={{ random }}"><span>{% trans "random" %}</span></a></div>
<a class="random" href="?action=random"><span>{% trans "random" %}</span></a></div>
{{ page_links | raw }}
</div>
{% elseif nb_results == 1 %}

View file

@ -14,6 +14,7 @@
{% 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" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
{% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
{% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
{% if constant('SHARE_EVERNOTE') == 1 %}<li><a href="https://www.evernote.com/clip.action?url={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool evernote" title="{% trans "evernote" %}"><span>{% trans "evernote" %}</span></a></li>{% endif %}
{% if constant('SHARE_DIASPORA') == 1 %}<li><a href="{{ constant('DIASPORA_URL') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora" title="{% trans "diaspora" %}"><span>{% trans "diaspora" %}</span></a></li>{% endif %}
{% 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 %}
{% 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 %}