diff --git a/src/Wallabag/Wallabag/Database.php b/src/Wallabag/Wallabag/Database.php deleted file mode 100755 index 290731088..000000000 --- a/src/Wallabag/Wallabag/Database.php +++ /dev/null @@ -1,606 +0,0 @@ - - * @copyright 2013 - * @license http://opensource.org/licenses/MIT see COPYING file - */ - -namespace Wallabag\Wallabag; - -use \PDO; -use CoreBundle\Entity; - -class Database { - - var $handle; - private $order = array ( - 'ia' => 'ORDER BY entries.id', - 'id' => 'ORDER BY entries.id DESC', - 'ta' => 'ORDER BY lower(entries.title)', - 'td' => 'ORDER BY lower(entries.title) DESC', - 'default' => 'ORDER BY entries.id' - ); - - function __construct() - { - switch (STORAGE) { - case 'sqlite': - // Check if /db is writeable - if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) { - die('An error occured: ' . STORAGE_SQLITE . ' directory must be writeable for your web server user!'); - } - $db_path = 'sqlite:' . STORAGE_SQLITE; - $this->handle = new PDO($db_path); - break; - case 'mysql': - $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB . ';charset=utf8mb4'; - $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD, array( - PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', - )); - break; - case 'postgres': - $db_path = 'pgsql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB; - $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD); - break; - default: - die(STORAGE . ' is not a recognised database system !'); - } - - $this->handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); - $this->_checkTags(); - Tools::logm('storage type ' . STORAGE); - } - - private function getHandle() - { - return $this->handle; - } - - private function _checkTags() - { - - if (STORAGE == 'sqlite') { - $sql = ' - CREATE TABLE IF NOT EXISTS tags ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, - value TEXT - )'; - } - elseif(STORAGE == 'mysql') { - $sql = ' - CREATE TABLE IF NOT EXISTS `tags` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `value` varchar(255) NOT NULL, - PRIMARY KEY (`id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - '; - } - else { - $sql = ' - CREATE TABLE IF NOT EXISTS tags ( - id bigserial primary key, - value varchar(255) NOT NULL - ); - '; - } - - $query = $this->executeQuery($sql, array()); - - if (STORAGE == 'sqlite') { - $sql = ' - CREATE TABLE IF NOT EXISTS tags_entries ( - id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, - entry_id INTEGER, - tag_id INTEGER, - FOREIGN KEY(entry_id) REFERENCES entries(id) ON DELETE CASCADE, - FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE - )'; - } - elseif(STORAGE == 'mysql') { - $sql = ' - CREATE TABLE IF NOT EXISTS `tags_entries` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `entry_id` int(11) NOT NULL, - `tag_id` int(11) NOT NULL, - FOREIGN KEY(entry_id) REFERENCES entries(id) ON DELETE CASCADE, - FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE, - PRIMARY KEY (`id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - '; - } - else { - $sql = ' - CREATE TABLE IF NOT EXISTS tags_entries ( - id bigserial primary key, - entry_id integer NOT NULL, - tag_id integer NOT NULL - ) - '; - } - - $query = $this->executeQuery($sql, array()); - } - - public function install($login, $password, $email = '') - { - $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)'; - $params = array($login, $password, $login, $email); - $query = $this->executeQuery($sql, $params); - - $sequence = ''; - if (STORAGE == 'postgres') { - $sequence = 'users_id_seq'; - } - - $id_user = intval($this->getLastId($sequence)); - - $sql = 'INSERT INTO users_config ( user_id, name, value ) VALUES (?, ?, ?)'; - $params = array($id_user, 'pager', PAGINATION); - $query = $this->executeQuery($sql, $params); - - $sql = 'INSERT INTO users_config ( user_id, name, value ) VALUES (?, ?, ?)'; - $params = array($id_user, 'language', LANG); - $query = $this->executeQuery($sql, $params); - - $sql = 'INSERT INTO users_config ( user_id, name, value ) VALUES (?, ?, ?)'; - $params = array($id_user, 'theme', DEFAULT_THEME); - $query = $this->executeQuery($sql, $params); - - return TRUE; - } - - public function getConfigUser($id) - { - $sql = "SELECT * FROM users_config WHERE user_id = ?"; - $query = $this->executeQuery($sql, array($id)); - $result = $query->fetchAll(); - $user_config = array(); - - foreach ($result as $key => $value) { - $user_config[$value['name']] = $value['value']; - } - - return $user_config; - } - - public function userExists($username) - { - $sql = "SELECT * FROM users WHERE username=?"; - $query = $this->executeQuery($sql, array($username)); - $login = $query->fetchAll(); - if (isset($login[0])) { - return true; - } else { - return false; - } - } - - public function login($username, $password, $isauthenticated = FALSE) - { - if ($isauthenticated) { - $sql = "SELECT * FROM users WHERE username=?"; - $query = $this->executeQuery($sql, array($username)); - } else { - $sql = "SELECT * FROM users WHERE username=? AND password=?"; - $query = $this->executeQuery($sql, array($username, $password)); - } - $login = $query->fetchAll(); - - $user = array(); - if (isset($login[0])) { - $user['id'] = $login[0]['id']; - $user['username'] = $login[0]['username']; - $user['password'] = $login[0]['password']; - $user['name'] = $login[0]['name']; - $user['email'] = $login[0]['email']; - $user['config'] = $this->getConfigUser($login[0]['id']); - } - - return $user; - } - - public function updatePassword($userId, $password) - { - $sql_update = "UPDATE users SET password=? WHERE id=?"; - $params_update = array($password, $userId); - $query = $this->executeQuery($sql_update, $params_update); - } - - public function updateUserConfig($userId, $key, $value) - { - $config = $this->getConfigUser($userId); - - if (! isset($config[$key])) { - $sql = "INSERT INTO users_config (value, user_id, name) VALUES (?, ?, ?)"; - } - else { - $sql = "UPDATE users_config SET value=? WHERE user_id=? AND name=?"; - } - - $params = array($value, $userId, $key); - $query = $this->executeQuery($sql, $params); - } - - private function executeQuery($sql, $params) - { - try - { - $query = $this->getHandle()->prepare($sql); - $query->execute($params); - return $query; - } - catch (Exception $e) - { - Tools::logm('execute query error : '.$e->getMessage()); - return FALSE; - } - } - - public function listUsers($username = NULL) - { - $sql = 'SELECT count(*) FROM users'.( $username ? ' WHERE username=?' : ''); - $query = $this->executeQuery($sql, ( $username ? array($username) : array())); - list($count) = $query->fetch(); - return $count; - } - - public function getUserPassword($userID) - { - $sql = "SELECT * FROM users WHERE id=?"; - $query = $this->executeQuery($sql, array($userID)); - $password = $query->fetchAll(); - return isset($password[0]['password']) ? $password[0]['password'] : null; - } - - public function deleteUserConfig($userID) - { - $sql_action = 'DELETE from users_config WHERE user_id=?'; - $params_action = array($userID); - $query = $this->executeQuery($sql_action, $params_action); - return $query; - } - - public function deleteTagsEntriesAndEntries($userID) - { - $entries = $this->retrieveAll($userID); - foreach($entries as $entryid) { - $tags = $this->retrieveTagsByEntry($entryid); - foreach($tags as $tag) { - $this->removeTagForEntry($entryid,$tags); - } - $this->deleteById($entryid,$userID); - } - } - - public function deleteUser($userID) - { - $sql_action = 'DELETE from users WHERE id=?'; - $params_action = array($userID); - $query = $this->executeQuery($sql_action, $params_action); - } - - public function updateContentAndTitle($id, $title, $body, $user_id) - { - $sql_action = 'UPDATE entries SET content = ?, title = ? WHERE id=? AND user_id=?'; - $params_action = array($body, $title, $id, $user_id); - $query = $this->executeQuery($sql_action, $params_action); - return $query; - } - - public function retrieveUnfetchedEntries($user_id, $limit) - { - - $sql_limit = "LIMIT 0,".$limit; - if (STORAGE == 'postgres') { - $sql_limit = "LIMIT ".$limit." OFFSET 0"; - } - - $sql = "SELECT * FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=? ORDER BY id " . $sql_limit; - $query = $this->executeQuery($sql, array($user_id)); - $entries = $query->fetchAll(); - - return $entries; - } - - public function retrieveUnfetchedEntriesCount($user_id) - { - $sql = "SELECT count(*) FROM entries WHERE (content = '' OR content IS NULL) AND title LIKE 'Untitled - Import%' AND user_id=?"; - $query = $this->executeQuery($sql, array($user_id)); - list($count) = $query->fetch(); - - return $count; - } - - public function retrieveAll($user_id) - { - $sql = "SELECT * FROM entries WHERE user_id=? ORDER BY id"; - $query = $this->executeQuery($sql, array($user_id)); - $entries = $query->fetchAll(); - - return $entries; - } - - public function retrieveOneById($id, $user_id) - { - $entry = NULL; - $sql = "SELECT * FROM entries WHERE id=? AND user_id=?"; - $params = array(intval($id), $user_id); - $query = $this->executeQuery($sql, $params); - $entry = $query->fetchAll(); - - return isset($entry[0]) ? $entry[0] : null; - } - - public function retrieveOneByURL($url, $user_id) - { - $entry = NULL; - $sql = "SELECT * FROM entries WHERE url=? AND user_id=?"; - $params = array($url, $user_id); - $query = $this->executeQuery($sql, $params); - $entry = $query->fetchAll(); - - return isset($entry[0]) ? $entry[0] : null; - } - - public function reassignTags($old_entry_id, $new_entry_id) - { - $sql = "UPDATE tags_entries SET entry_id=? WHERE entry_id=?"; - $params = array($new_entry_id, $old_entry_id); - $query = $this->executeQuery($sql, $params); - } - - public function getEntriesByView($view, $user_id, $limit = '', $tag_id = 0) - { - switch ($view) { - case 'archive': - $sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? "; - $params = array($user_id, 1); - break; - case 'fav' : - $sql = "SELECT * FROM entries WHERE user_id=? AND is_fav=? "; - $params = array($user_id, 1); - break; - case 'tag' : - $sql = "SELECT entries.* FROM entries - LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id - WHERE entries.user_id=? AND tags_entries.tag_id = ? "; - $params = array($user_id, $tag_id); - break; - default: - $sql = "SELECT * FROM entries WHERE user_id=? AND is_read=? "; - $params = array($user_id, 0); - break; - } - - $sql .= $this->getEntriesOrder().' ' . $limit; - - $query = $this->executeQuery($sql, $params); - $entries = $query->fetchAll(); - - return $entries; - } - - public function getEntriesByViewCount($view, $user_id, $tag_id = 0) - { - switch ($view) { - case 'archive': - $sql = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? "; - $params = array($user_id, 1); - break; - case 'fav' : - $sql = "SELECT count(*) FROM entries WHERE user_id=? AND is_fav=? "; - $params = array($user_id, 1); - break; - case 'tag' : - $sql = "SELECT count(*) FROM entries - LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id - WHERE entries.user_id=? AND tags_entries.tag_id = ? "; - $params = array($user_id, $tag_id); - break; - default: - $sql = "SELECT count(*) FROM entries WHERE user_id=? AND is_read=? "; - $params = array($user_id, 0); - break; - } - - $query = $this->executeQuery($sql, $params); - list($count) = $query->fetch(); - - return $count; - } - - public function updateContent($id, $content, $user_id) - { - $sql_action = 'UPDATE entries SET content = ? WHERE id=? AND user_id=?'; - $params_action = array($content, $id, $user_id); - $query = $this->executeQuery($sql_action, $params_action); - return $query; - } - - /** - * - * @param string $url - * @param string $title - * @param string $content - * @param integer $user_id - * @return integer $id of inserted record - */ - public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0) - { - $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read ) VALUES (?, ?, ?, ?, ?, ?)'; - $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead); - - if ( !$this->executeQuery($sql_action, $params_action) ) { - $id = null; - } - else { - $id = intval($this->getLastId( (STORAGE == 'postgres') ? 'entries_id_seq' : '') ); - } - return $id; - } - - public function deleteById($id, $user_id) - { - $sql_action = "DELETE FROM entries WHERE id=? AND user_id=?"; - $params_action = array($id, $user_id); - $query = $this->executeQuery($sql_action, $params_action); - return $query; - } - - public function favoriteById($id, $user_id) - { - $sql_action = "UPDATE entries SET is_fav=NOT is_fav WHERE id=? AND user_id=?"; - $params_action = array($id, $user_id); - $query = $this->executeQuery($sql_action, $params_action); - } - - public function archiveById($id, $user_id) - { - $sql_action = "UPDATE entries SET is_read=NOT is_read WHERE id=? AND user_id=?"; - $params_action = array($id, $user_id); - $query = $this->executeQuery($sql_action, $params_action); - } - - public function archiveAll($user_id) - { - $sql_action = "UPDATE entries SET is_read=? WHERE user_id=? AND is_read=?"; - $params_action = array($user_id, 1, 0); - $query = $this->executeQuery($sql_action, $params_action); - } - - public function getLastId($column = '') - { - return $this->getHandle()->lastInsertId($column); - } - - public function search($term, $user_id, $limit = '') - { - $search = '%'.$term.'%'; - $sql_action = "SELECT * FROM entries WHERE user_id=? AND (content LIKE ? OR title LIKE ? OR url LIKE ?) "; //searches in content, title and URL - $sql_action .= $this->getEntriesOrder().' ' . $limit; - $params_action = array($user_id, $search, $search, $search); - $query = $this->executeQuery($sql_action, $params_action); - return $query->fetchAll(); - } - - public function retrieveAllTags($user_id, $term = NULL) - { - $sql = "SELECT DISTINCT tags.*, count(entries.id) AS entriescount FROM tags - LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id - LEFT JOIN entries ON tags_entries.entry_id=entries.id - WHERE entries.user_id=? - ". (($term) ? "AND lower(tags.value) LIKE ?" : '') ." - GROUP BY tags.id, tags.value - ORDER BY tags.value"; - $query = $this->executeQuery($sql, (($term)? array($user_id, strtolower('%'.$term.'%')) : array($user_id) )); - $tags = $query->fetchAll(); - - return $tags; - } - - public function retrieveTag($id, $user_id) - { - $tag = NULL; - $sql = "SELECT DISTINCT tags.* FROM tags - LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id - LEFT JOIN entries ON tags_entries.entry_id=entries.id - WHERE tags.id=? AND entries.user_id=?"; - $params = array(intval($id), $user_id); - $query = $this->executeQuery($sql, $params); - $tag = $query->fetchAll(); - - return isset($tag[0]) ? $tag[0] : NULL; - } - - public function retrieveEntriesByTag($tag_id, $user_id) - { - $sql = - "SELECT entries.* FROM entries - LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id - WHERE tags_entries.tag_id = ? AND entries.user_id=? ORDER by entries.id DESC"; - $query = $this->executeQuery($sql, array($tag_id, $user_id)); - $entries = $query->fetchAll(); - - return $entries; - } - - public function retrieveTagsByEntry($entry_id) - { - $sql = - "SELECT tags.* FROM tags - LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id - WHERE tags_entries.entry_id = ?"; - $query = $this->executeQuery($sql, array($entry_id)); - $tags = $query->fetchAll(); - - return $tags; - } - - public function removeTagForEntry($entry_id, $tag_id) - { - $sql_action = "DELETE FROM tags_entries WHERE tag_id=? AND entry_id=?"; - $params_action = array($tag_id, $entry_id); - $query = $this->executeQuery($sql_action, $params_action); - return $query; - } - - public function cleanUnusedTag($tag_id) - { - $sql_action = "SELECT tags.* FROM tags JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags.id=?"; - $query = $this->executeQuery($sql_action,array($tag_id)); - $tagstokeep = $query->fetchAll(); - $sql_action = "SELECT tags.* FROM tags LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags.id=?"; - $query = $this->executeQuery($sql_action,array($tag_id)); - $alltags = $query->fetchAll(); - - foreach ($alltags as $tag) { - if ($tag && !in_array($tag,$tagstokeep)) { - $sql_action = "DELETE FROM tags WHERE id=?"; - $params_action = array($tag[0]); - $this->executeQuery($sql_action, $params_action); - return true; - } - } - - } - - public function retrieveTagByValue($value) - { - $tag = NULL; - $sql = "SELECT * FROM tags WHERE value=?"; - $params = array($value); - $query = $this->executeQuery($sql, $params); - $tag = $query->fetchAll(); - - return isset($tag[0]) ? $tag[0] : null; - } - - public function createTag($value) - { - $sql_action = 'INSERT INTO tags ( value ) VALUES (?)'; - $params_action = array($value); - $query = $this->executeQuery($sql_action, $params_action); - return $query; - } - - public function setTagToEntry($tag_id, $entry_id) - { - $sql_action = 'INSERT INTO tags_entries ( tag_id, entry_id ) VALUES (?, ?)'; - $params_action = array($tag_id, $entry_id); - $query = $this->executeQuery($sql_action, $params_action); - return $query; - } - - private function getEntriesOrder() - { - if (isset($_SESSION['sort']) and array_key_exists($_SESSION['sort'], $this->order)) { - return $this->order[$_SESSION['sort']]; - } - else { - return $this->order['default']; - } - } -} diff --git a/src/Wallabag/Wallabag/Ebooks.php b/src/Wallabag/Wallabag/Ebooks.php deleted file mode 100644 index 2ad89a1cb..000000000 --- a/src/Wallabag/Wallabag/Ebooks.php +++ /dev/null @@ -1,247 +0,0 @@ - - * @copyright 2013 - * @license http://opensource.org/licenses/MIT see COPYING file - */ - -namespace Wallabag\Wallabag; - -class Ebooks -{ - protected $wallabag; - protected $method; - protected $value; - protected $entries; - protected $bookTitle; - protected $bookFileName; - protected $author = 'wallabag'; - - public function __construct(Wallabag $wallabag, $method, $value) - { - $this->wallabag = $wallabag; - $this->method = $method; - $this->value = $value; - } - - public function prepareData() - { - switch ($this->method) { - case 'id': - $entryID = filter_var($this->value, FILTER_SANITIZE_NUMBER_INT); - $entry = $this->wallabag->store->retrieveOneById($entryID, $this->wallabag->user->getId()); - $this->entries = array($entry); - $this->bookTitle = $entry['title']; - $this->bookFileName = substr($this->bookTitle, 0, 200); - $this->author = preg_replace('#^w{3}.#', '', Tools::getdomain($entry["url"])); # if only one article, set author to domain name (we strip the eventual www part) - Tools::logm('Producing ebook from article ' . $this->bookTitle); - break; - case 'all': - $this->entries = $this->wallabag->store->retrieveAll($this->wallabag->user->getId()); - $this->bookTitle = sprintf(_('All my articles on %s'), date(_('d.m.y'))); #translatable because each country has it's own date format system - $this->bookFileName = _('Allarticles') . date(_('dmY')); - Tools::logm('Producing ebook from all articles'); - break; - case 'tag': - $tag = filter_var($this->value, FILTER_SANITIZE_STRING); - $tags_id = $this->wallabag->store->retrieveAllTags($this->wallabag->user->getId(), $tag); - $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround. - $this->entries = $this->wallabag->store->retrieveEntriesByTag($tag_id, $this->wallabag->user->getId()); - $this->bookTitle = sprintf(_('Articles tagged %s'), $tag); - $this->bookFileName = substr(sprintf(_('Tag %s'), $tag), 0, 200); - Tools::logm('Producing ebook from tag ' . $tag); - break; - case 'category': - $category = filter_var($this->value, FILTER_SANITIZE_STRING); - $this->entries = $this->wallabag->store->getEntriesByView($category, $this->wallabag->user->getId()); - $this->bookTitle = sprintf(_('Articles in category %s'), $category); - $this->bookFileName = substr(sprintf(_('Category %s'), $category), 0, 200); - Tools::logm('Producing ebook from category ' . $category); - break; - case 'search': - $search = filter_var($this->value, FILTER_SANITIZE_STRING); - Tools::logm($search); - $this->entries = $this->wallabag->store->search($search, $this->wallabag->user->getId()); - $this->bookTitle = sprintf(_('Articles for search %s'), $search); - $this->bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200); - Tools::logm('Producing ebook from search ' . $search); - break; - case 'default': - die(_('Uh, there is a problem while generating eBook.')); - } - } -} - -class WallabagEpub extends WallabagEBooks -{ - /** - * handle ePub - */ - public function produceEpub() - { - Tools::logm('Starting to produce ePub 3 file'); - $content_start = - "\n" - . "\n" - . "
" - . "\n" - . "' . _('Produced by wallabag with PHPePub') . '
'. _('Please open an issue if you have trouble with the display of this E-Book on your device.') . '
' . _('Produced by wallabag with PHPMobi') . '
'. _('Please open an issue if you have trouble with the display of this E-Book on your device.') . '
' . _('Produced by wallabag with tcpdf') . '
-'. _('Please open an issue if you have trouble with the display of this E-Book on your device.') . '
-IMPORT_LIMIT"
-"code> (nombre d'éléments téléchargés à la fois) et IMPORT_DELAY
"
-"(le délai d'attente entre deux séquences de téléchargement)."
-
-msgid "File:"
-msgstr "Fichier : "
-
-msgid "You can click here to fetch content for articles with no content."
-msgstr ""
-"Vous pouvez cliquer ici pour télécharger le contenu des articles vides."
-
-msgid "Export your wallabag data"
-msgstr "Exporter vos données de wallabag"
-
-msgid "Click here"
-msgstr "Cliquez ici"
-
-msgid "to download your database."
-msgstr "pour télécharger votre base de données."
-
-msgid "to export your wallabag data."
-msgstr "pour exporter vos données de wallabag."
-
-msgid "Cache"
-msgstr "Cache"
-
-msgid "to delete cache."
-msgstr "pour effacer le cache."
-
-msgid "Add user"
-msgstr "Ajouter un utilisateur"
-
-msgid "Add a new user :"
-msgstr "Ajouter un nouvel utilisateur : "
-
-msgid "Login for new user"
-msgstr "Identifiant du nouvel utilisateur"
-
-msgid "Login"
-msgstr "Nom d'utilisateur"
-
-msgid "Password for new user"
-msgstr "Mot de passe du nouvel utilisateur"
-
-msgid "Email for new user (not required)"
-msgstr "E-mail pour le nouvel utilisateur (facultatif)"
-
-msgid "Send"
-msgstr "Envoyer"
-
-msgid "Delete account"
-msgstr "Supprimer le compte"
-
-msgid "You can delete your account by entering your password and validating."
-msgstr ""
-"Vous pouvez supprimer votre compte en entrant votre mot de passe et en "
-"validant."
-
-msgid "Be careful, data will be erased forever (that is a very long time)."
-msgstr "Attention, les données seront perdues pour toujours."
-
-msgid "Type here your password"
-msgstr "Entrez votre mot de passe ici"
-
-msgid "You are the only user, you cannot delete your own account."
-msgstr ""
-"Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte."
-
-msgid ""
-"To completely remove wallabag, delete the wallabag folder on your web server "
-"(and eventual databases)."
-msgstr ""
-"Pour désinstaller complètement wallabag, supprimez le répertoire "
-"wallabag
de votre serveur Web (ainsi que les bases de données "
-"éventuelles)."
-
-msgid "Save a link"
-msgstr "Ajouter un lien"
-
-msgid "Return home"
-msgstr "Retour accueil"
-
-msgid "Back to top"
-msgstr "Haut de page"
-
-msgid "Mark as read"
-msgstr "Marquer comme lu"
-
-msgid "Favorite"
-msgstr "Favoris"
-
-msgid "Toggle favorite"
-msgstr "Marquer / enlever comme favori"
-
-msgid "Delete"
-msgstr "Effacer"
-
-msgid "Tweet"
-msgstr "Tweet"
-
-msgid "Email"
-msgstr "E-mail"
-
-msgid "shaarli"
-msgstr "Shaarli"
-
-msgid "flattr"
-msgstr "Flattr"
-
-msgid "Print"
-msgstr "Imprimer"
-
-msgid "Does this article appear wrong?"
-msgstr "Cet article s'affiche mal ?"
-
-msgid "tags:"
-msgstr "tags :"
-
-msgid "Add tags:"
-msgstr "Ajouter des tags :"
-
-msgid "no tags"
-msgstr "pas de tags"
-
-msgid "The tag has been applied successfully"
-msgstr "Le tag a été appliqué avec succès"
-
-msgid "interview"
-msgstr "interview"
-
-msgid "editorial"
-msgstr "éditorial"
-
-msgid "video"
-msgstr "vidéo"
-
-msgid "Edit tags"
-msgstr "Modifier les tags"
-
-msgid "favoris"
-msgstr "favoris"
-
-msgid "mark all the entries as read"
-msgstr "marquer tous les articles comme lus"
-
-msgid "toggle view mode"
-msgstr "changer de mode de visualisation"
-
-msgid "return home"
-msgstr "retour à l'accueil"
-
-msgid "Poching a link"
-msgstr "Enregistrer un lien"
-
-msgid "by filling this field"
-msgstr "en remplissant ce champ"
-
-msgid "bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "bookmarklet : glissez-déposez ce lien dans votre barre de favoris"
-
-msgid "your version"
-msgstr "votre version"
-
-msgid "latest stable version"
-msgstr "dernière version stable"
-
-msgid "a more recent stable version is available."
-msgstr "une version stable plus récente est disponible."
-
-msgid "you are up to date."
-msgstr "vous êtes à jour."
-
-msgid "latest dev version"
-msgstr "dernière version de développement"
-
-msgid "a more recent development version is available."
-msgstr "une version de développement plus récente est disponible."
-
-msgid "Please execute the import script locally, it can take a very long time."
-msgstr ""
-"Merci d'exécuter le script d'importation en local car cela peut prendre du "
-"temps."
-
-msgid "More infos in the official doc:"
-msgstr "Plus d'infos dans la documentation officielle :"
-
-msgid "import from Pocket"
-msgstr "importer depuis Pocket"
-
-#, php-format
-msgid "(you must have a %s file on your server)"
-msgstr "(le fichier %s doit être présent sur le serveur)"
-
-msgid "import from Readability"
-msgstr "importer depuis Readability"
-
-msgid "import from Instapaper"
-msgstr "importer depuis Instapaper"
-
-msgid "Start typing for auto complete."
-msgstr "Commencez à taper pour activer l'auto-complétion."
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr "Vous pouvez entrer plusieurs tags, séparés par des virgules."
-
-msgid "return to article"
-msgstr "retourner à l'article"
-
-msgid "by date asc"
-msgstr "par date asc"
-
-msgid "by date"
-msgstr "par date"
-
-msgid "by date desc"
-msgstr "par date desc"
-
-msgid "by title asc"
-msgstr "par titre asc"
-
-msgid "by title"
-msgstr "par titre"
-
-msgid "by title desc"
-msgstr "par titre desc"
-
-msgid "home"
-msgstr "accueil"
-
-msgid "tags"
-msgstr "tags"
-
-msgid "save a link"
-msgstr "sauver un lien"
-
-msgid "search"
-msgstr "rechercher"
-
-msgid "logout"
-msgstr "déconnexion"
-
-msgid "installation"
-msgstr "installation"
-
-msgid "install your wallabag"
-msgstr "installez votre wallabag"
-
-msgid ""
-"wallabag is still not installed. Please fill the below form to install it. "
-"Don't hesitate to read the documentation "
-"on wallabag website."
-msgstr ""
-"wallabag n'est pas encore installé. Merci de remplir le formulaire suivant "
-"pour l'installer. N'hésitez pas à lire la "
-"documentation sur le site de wallabag."
-
-msgid "Repeat your password"
-msgstr "Répétez votre mot de passe"
-
-msgid "Install"
-msgstr "Installer"
-
-msgid ""
-"You can check your configuration "
-"here."
-msgstr ""
-"Vous pouvez vérifier votre configuration ici."
-
-msgid "Tags"
-msgstr "Tags"
-
-msgid "No link available here!"
-msgstr "Aucun lien n'est disponible ici !"
-
-msgid "toggle mark as read"
-msgstr "marquer comme lu / non lu"
-
-msgid "tweet"
-msgstr "tweet"
-
-msgid "email"
-msgstr "e-mail"
-
-msgid "this article appears wrong?"
-msgstr "cet article s'affiche mal ?"
-
-msgid "Search"
-msgstr "Rechercher"
-
-msgid "Download required for "
-msgstr "Téléchargement requis pour "
-
-msgid "records"
-msgstr " articles"
-
-msgid "Downloading next "
-msgstr "Téléchargement des "
-
-msgid "articles, please wait"
-msgstr " articles suivants, veuillez patienter..."
-
-msgid "Enter your search here"
-msgstr "Entrez votre recherche ici"
-
-#, php-format
-msgid ""
-"The new user %s has been installed. Do you want to logout ?"
-msgstr ""
-"Le nouvel utilisateur « %s » a été ajouté. Voulez-vous vous déconnecter ?"
-
-#, php-format
-msgid "Error : An user with the name %s already exists !"
-msgstr "Erreur : Un utilisateur avec le nom « %s » existe déjà !"
-
-#, php-format
-msgid "User %s has been successfully deleted !"
-msgstr "L'utilisateur « %s » a été supprimé avec succès !"
-
-msgid "Error : The password is wrong !"
-msgstr "Erreur : le mot de passe est incorrect !"
-
-msgid "Error : You are the only user, you cannot delete your account !"
-msgstr ""
-"Erreur : Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre "
-"compte !"
-
-msgid "Untitled"
-msgstr "Sans titre"
-
-msgid "the link has been added successfully"
-msgstr "le lien a été ajouté avec succès"
-
-msgid "error during insertion : the link wasn't added"
-msgstr "erreur pendant l'insertion : le lien n'a pas été ajouté"
-
-msgid "the link has been deleted successfully"
-msgstr "le lien a été effacé avec succès"
-
-msgid "the link wasn't deleted"
-msgstr "le lien n'a pas été effacé"
-
-msgid "Article not found!"
-msgstr "Article non trouvé !"
-
-msgid "previous"
-msgstr "précédent"
-
-msgid "next"
-msgstr "suivant"
-
-msgid "in demo mode, you can't update your password"
-msgstr "en mode démo, vous ne pouvez pas mettre à jour votre mot de passe"
-
-msgid "your password has been updated"
-msgstr "votre mot de passe a été mis à jour"
-
-msgid ""
-"the two fields have to be filled & the password must be the same in the two "
-"fields"
-msgstr ""
-"les deux champs doivent être remplis & le mot de passe doit être le même "
-"dans les deux"
-
-msgid "still using the \""
-msgstr "vous utilisez toujours \""
-
-msgid "that theme does not seem to be installed"
-msgstr "ce thème ne semble pas installé"
-
-msgid "you have changed your theme preferences"
-msgstr "vous avez changé vos préférences de thème"
-
-msgid "that language does not seem to be installed"
-msgstr "cette langue ne semble pas être installée"
-
-msgid "you have changed your language preferences"
-msgstr "vous avez changé vos préférences de langue"
-
-msgid "login failed: you have to fill all fields"
-msgstr "échec de l'identification : vous devez remplir tous les champs"
-
-msgid "welcome to your wallabag"
-msgstr "bienvenue dans votre wallabag"
-
-msgid "login failed: bad login or password"
-msgstr "échec de l'identification : mauvais identifiant ou mot de passe"
-
-msgid "Untitled - Import - "
-msgstr "Sans titre - Importer - "
-
-msgid "click to finish import"
-msgstr "cliquez pour terminer l'importation"
-
-msgid "Articles inserted: "
-msgstr "Articles ajoutés : "
-
-msgid ". Please note, that some may be marked as \"read\"."
-msgstr ". Notez que certains pourraient être marqués comme \"lus\"."
-
-msgid "Import finished."
-msgstr "Importation terminée."
-
-msgid "Undefined"
-msgstr "Non défini"
-
-msgid "User with this id ("
-msgstr "Utilisateur avec cet identifiant ("
-
-msgid "Uh, there is a problem while generating feeds."
-msgstr "Hum, il y a un problème lors de la génération des flux."
-
-msgid "Cache deleted."
-msgstr "Cache effacé."
-
-msgid "Oops, it seems you don't have PHP 5."
-msgstr "Oups, vous ne semblez pas avoir PHP 5."
-
-msgid "Tag these results as"
-msgstr "Appliquer à ces résultats le tag"
-
-# ebook
-msgid "Fancy an E-Book ?"
-msgstr "Envie d'un E-Book ?"
-
-msgid "Click to get all your articles in one ebook :"
-msgstr "Cliquez pour obtenir tous vos articles dans un E-Book :"
-
-msgid "Generate ePub file"
-msgstr "Générer fichier ePub"
-
-msgid "Generate Mobi file"
-msgstr "Générer fichier Mobi"
-
-msgid "Generate PDF file"
-msgstr "Générer fichier PDF"
-
-msgid ""
-"This can take a while and can even fail if you have too many "
-"articles, depending on your server configuration."
-msgstr ""
-"Ceci peut prendre un moment et même échouer si vous avez trop "
-"d'articles, selon la configuration matérielle de votre serveur."
-
-msgid "Download the articles from this tag in an epub"
-msgstr "Télécharger les articles de ce tag dans un epub"
-
-msgid "Download the articles from this search in an epub"
-msgstr "Télécharger les articles de cette recherche dans un epub"
-
-msgid "Download the articles from this category in an epub"
-msgstr "Télécharger les articles de cette catégorie dans un epub"
-
-msgid "Download the articles from this tag in an ePub file"
-msgstr "Télécharger les articles de ce tag dans un fichier ePub"
-
-msgid "Download the articles from this tag in an Mobi file"
-msgstr "Télécharger les articles de ce tag dans un fichier Mobi"
-
-msgid "Download the articles from this tag in an PDF file"
-msgstr "Télécharger les articles de ce tag dans un fichier PDF"
-
-msgid "Download the articles from this search in an ePub"
-msgstr "Télécharger les articles de cette recherche dans un fichier ePub"
-
-msgid "Download the articles from this search in a Mobi file"
-msgstr "Télécharger les articles de cette recherche dans un fichier Mobi"
-
-msgid "Download the articles from this search in a PDF file"
-msgstr "Télécharger les articles de cette recherche dans un fichier PDF"
-
-msgid "Download the articles from this category in an ePub"
-msgstr "Télécharger les articles de cette catégorie dans un fichier ePub"
-
-msgid "Download the articles from this category in a Mobi file"
-msgstr "Télécharger les articles de cette catégorie dans un fichier Mobi"
-
-msgid "Download the articles from this category in a PDF file"
-msgstr "Télécharger les articles de cette catégorie dans un fichier PDF"
-
-msgid "Download as ePub3"
-msgstr "Télécharger en ePub3"
-
-msgid "Download as Mobi"
-msgstr "Télécharger en Mobi"
-
-msgid "Download as PDF"
-msgstr "Télécharger en PDF"
-
-msgid "All my articles on %s"
-msgstr "Tous mes articles le %s"
-
-msgid "Allarticles"
-msgstr "TousArticles"
-
-msgid "Articles tagged %s"
-msgstr "Articles avec le tag %s"
-
-msgid "Tag %s"
-msgstr "Tag %s"
-
-msgid "Articles in category %s"
-msgstr "Articles de la catégorie %s"
-
-msgid "Category %s"
-msgstr "Catégorie %s"
-
-msgid "Articles for search %s"
-msgstr "Articles pour la recherche %s"
-
-msgid "Search %s"
-msgstr "Recherche %s"
-
-msgid "wallabag articles book"
-msgstr "Livre d'articles issus de wallabag"
-
-msgid "Some articles saved on my wallabag"
-msgstr "Des articles sauvegardés sur wallabag"
-
-msgid "Produced by wallabag with PHPePub"
-msgstr "Produit par wallabag avec PHPePub"
-
-msgid ""
-"Please open an issue"
-"a> if you have trouble with the display of this E-Book on your device."
-msgstr ""
-"Merci d'ouvrir un "
-"ticket si vous avez des problèmes d'affichage de cet E-Book sur votre "
-"appareil."
-
-msgid "Produced by wallabag with PHPMobi"
-msgstr "Produit par wallabag avec PHPMobi"
-
-msgid "Mail function is disabled. You can't send emails from your server"
-msgstr ""
-"La fonction mail est désactivée. Vous ne pouvez pas envoyer d'E-mails depuis "
-"votre serveur"
-
-msgid "You didn't set your kindle's email adress !"
-msgstr "Vous n'avez pas renseigné l'adresse E-mail de votre Kindle !"
-
-msgid "The email has been sent to your kindle !"
-msgstr "L'E-mail a été envoyé à votre Kindle !"
-
-msgid "Produced by wallabag with mPDF"
-msgstr "Produit par wallabag avec mPDF"
diff --git a/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
deleted file mode 100644
index 42e26ba02..000000000
Binary files a/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po b/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
deleted file mode 100644
index 41cc01e01..000000000
--- a/src/Wallabag/Wallabag/Resources/translations/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
+++ /dev/null
@@ -1,568 +0,0 @@
-#
-# Translators:
-# Damtux , 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: poche\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:13+0300\n"
-"PO-Revision-Date: 2014-02-25 15:13+0300\n"
-"Last-Translator: Maryana \n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/poche/language/it/)\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
-
-msgid "wallabag, a read it later open source system"
-msgstr ""
-
-msgid "login failed: user doesn't exist"
-msgstr ""
-
-msgid "return home"
-msgstr ""
-
-msgid "config"
-msgstr "configurazione"
-
-msgid "Saving articles"
-msgstr ""
-
-msgid "There are several ways to save an article:"
-msgstr ""
-
-msgid "read the documentation"
-msgstr "leggi la documentazione"
-
-msgid "download the extension"
-msgstr ""
-
-msgid "via F-Droid"
-msgstr ""
-
-msgid " or "
-msgstr ""
-
-msgid "via Google Play"
-msgstr ""
-
-msgid "download the application"
-msgstr ""
-
-#, fuzzy
-msgid "By filling this field"
-msgstr "compilando questo campo"
-
-msgid "bag it!"
-msgstr ""
-
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr ""
-
-msgid "Upgrading wallabag"
-msgstr ""
-
-#, fuzzy
-msgid "Installed version"
-msgstr "ultima versione stabile"
-
-#, fuzzy
-msgid "Latest stable version"
-msgstr "ultima versione stabile"
-
-#, fuzzy
-msgid "A more recent stable version is available."
-msgstr "è disponibile una versione stabile più recente."
-
-#, fuzzy
-msgid "You are up to date."
-msgstr "sei aggiornato."
-
-#, fuzzy
-msgid "Latest dev version"
-msgstr "ultima versione di sviluppo"
-
-#, fuzzy
-msgid "A more recent development version is available."
-msgstr "è disponibile una versione di sviluppo più recente."
-
-msgid "Feeds"
-msgstr ""
-
-msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it."
-msgstr ""
-
-msgid "Unread feed"
-msgstr ""
-
-#, fuzzy
-msgid "Favorites feed"
-msgstr "preferiti"
-
-#, fuzzy
-msgid "Archive feed"
-msgstr "archivio"
-
-msgid "Your token:"
-msgstr ""
-
-msgid "Your user id:"
-msgstr ""
-
-msgid "You can regenerate your token: generate!."
-msgstr ""
-
-#, fuzzy
-msgid "Change your theme"
-msgstr "Cambia la tua password"
-
-msgid "Theme:"
-msgstr ""
-
-msgid "Update"
-msgstr "Aggiorna"
-
-#, fuzzy
-msgid "Change your language"
-msgstr "Cambia la tua password"
-
-msgid "Language:"
-msgstr ""
-
-msgid "Change your password"
-msgstr "Cambia la tua password"
-
-msgid "New password:"
-msgstr "Nuova password:"
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Repeat your new password:"
-msgstr "Ripeti la nuova password:"
-
-msgid "Import"
-msgstr "Importa"
-
-#, fuzzy
-msgid "Please execute the import script locally as it can take a very long time."
-msgstr "Si prega di eseguire lo script di importazione a livello locale, può richiedere un tempo molto lungo."
-
-#, fuzzy
-msgid "More info in the official documentation:"
-msgstr "Maggiori info nella documentazione ufficiale"
-
-#, fuzzy
-msgid "Import from Pocket"
-msgstr "Importa da Pocket"
-
-#, php-format
-msgid "(you must have a %s file on your server)"
-msgstr ""
-
-#, fuzzy
-msgid "Import from Readability"
-msgstr "Importa da Readability"
-
-#, fuzzy
-msgid "Import from Instapaper"
-msgstr "Importa da Instapaper"
-
-#, fuzzy
-msgid "Import from wallabag"
-msgstr "Importa da Readability"
-
-#, fuzzy
-msgid "Export your wallabag data"
-msgstr "Esporta i tuoi dati di poche"
-
-msgid "Click here"
-msgstr "Fai clic qui"
-
-msgid "to download your database."
-msgstr ""
-
-#, fuzzy
-msgid "to export your wallabag data."
-msgstr "per esportare i tuoi dati di poche."
-
-msgid "Cache"
-msgstr ""
-
-msgid "to delete cache."
-msgstr ""
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr ""
-
-msgid "return to article"
-msgstr ""
-
-msgid "plop"
-msgstr "plop"
-
-msgid "You can check your configuration here."
-msgstr ""
-
-msgid "favoris"
-msgstr "preferiti"
-
-msgid "archive"
-msgstr "archivio"
-
-msgid "unread"
-msgstr "non letti"
-
-msgid "by date asc"
-msgstr "per data cresc"
-
-msgid "by date"
-msgstr "per data"
-
-msgid "by date desc"
-msgstr "per data decr"
-
-msgid "by title asc"
-msgstr "per titolo cresc"
-
-msgid "by title"
-msgstr "per titolo"
-
-msgid "by title desc"
-msgstr "per titolo decr"
-
-msgid "Tag"
-msgstr ""
-
-msgid "No articles found."
-msgstr ""
-
-#, fuzzy
-msgid "Toggle mark as read"
-msgstr "segna come letto / non letto"
-
-msgid "toggle favorite"
-msgstr "segna come preferito"
-
-msgid "delete"
-msgstr "elimina"
-
-msgid "original"
-msgstr "originale"
-
-msgid "estimated reading time:"
-msgstr ""
-
-msgid "mark all the entries as read"
-msgstr ""
-
-msgid "results"
-msgstr "risultati"
-
-msgid "installation"
-msgstr "installazione"
-
-#, fuzzy
-msgid "install your wallabag"
-msgstr "installa il tuo poche"
-
-#, fuzzy
-msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website."
-msgstr "poche non è ancora installato. Si prega di riempire il modulo sottostante per completare l'installazione. Leggere la documentazione sul sito di poche."
-
-msgid "Login"
-msgstr "Nome utente"
-
-msgid "Repeat your password"
-msgstr "Ripeti la tua password"
-
-msgid "Install"
-msgstr "Installa"
-
-#, fuzzy
-msgid "login to your wallabag"
-msgstr "accedi al tuo poche"
-
-msgid "Login to wallabag"
-msgstr ""
-
-msgid "you are in demo mode, some features may be disabled."
-msgstr "sei in modalità dimostrazione, alcune funzionalità potrebbero essere disattivate."
-
-msgid "Username"
-msgstr ""
-
-msgid "Stay signed in"
-msgstr "Resta connesso"
-
-msgid "(Do not check on public computers)"
-msgstr "(non selezionare su computer pubblici)"
-
-msgid "Sign in"
-msgstr "Accedi"
-
-msgid "favorites"
-msgstr "preferiti"
-
-msgid "estimated reading time :"
-msgstr ""
-
-msgid "Mark all the entries as read"
-msgstr ""
-
-msgid "Return home"
-msgstr ""
-
-#, fuzzy
-msgid "Back to top"
-msgstr "torna a inizio pagina"
-
-#, fuzzy
-msgid "Mark as read"
-msgstr "segna come letto / non letto"
-
-#, fuzzy
-msgid "Favorite"
-msgstr "preferiti"
-
-#, fuzzy
-msgid "Toggle favorite"
-msgstr "segna come preferito"
-
-#, fuzzy
-msgid "Delete"
-msgstr "elimina"
-
-#, fuzzy
-msgid "Tweet"
-msgstr "twitta"
-
-#, fuzzy
-msgid "Email"
-msgstr "email"
-
-msgid "shaarli"
-msgstr "shaarli"
-
-msgid "flattr"
-msgstr "flattr"
-
-#, fuzzy
-msgid "Does this article appear wrong?"
-msgstr "articolo non visualizzato correttamente?"
-
-msgid "tags:"
-msgstr ""
-
-msgid "Edit tags"
-msgstr ""
-
-msgid "save link!"
-msgstr ""
-
-msgid "home"
-msgstr "home"
-
-msgid "tags"
-msgstr ""
-
-msgid "logout"
-msgstr "esci"
-
-msgid "powered by"
-msgstr "realizzato con"
-
-msgid "debug mode is on so cache is off."
-msgstr "modalità di debug attiva, cache disattivata."
-
-#, fuzzy
-msgid "your wallabag version:"
-msgstr "la tua versione"
-
-msgid "storage:"
-msgstr "memoria:"
-
-msgid "save a link"
-msgstr ""
-
-msgid "back to home"
-msgstr "torna alla home"
-
-msgid "toggle mark as read"
-msgstr "segna come letto / non letto"
-
-msgid "tweet"
-msgstr "twitta"
-
-msgid "email"
-msgstr "email"
-
-msgid "this article appears wrong?"
-msgstr "articolo non visualizzato correttamente?"
-
-msgid "No link available here!"
-msgstr "Nessun link disponibile!"
-
-msgid "Poching a link"
-msgstr "Pochare un link"
-
-msgid "by filling this field"
-msgstr "compilando questo campo"
-
-msgid "bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr ""
-
-msgid "your version"
-msgstr "la tua versione"
-
-msgid "latest stable version"
-msgstr "ultima versione stabile"
-
-msgid "a more recent stable version is available."
-msgstr "è disponibile una versione stabile più recente."
-
-msgid "you are up to date."
-msgstr "sei aggiornato."
-
-msgid "latest dev version"
-msgstr "ultima versione di sviluppo"
-
-msgid "a more recent development version is available."
-msgstr "è disponibile una versione di sviluppo più recente."
-
-msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Si prega di eseguire lo script di importazione a livello locale, può richiedere un tempo molto lungo."
-
-#, fuzzy
-msgid "More infos in the official doc:"
-msgstr "Maggiori info nella documentazione ufficiale"
-
-msgid "import from Pocket"
-msgstr "Importa da Pocket"
-
-msgid "import from Readability"
-msgstr "Importa da Readability"
-
-msgid "import from Instapaper"
-msgstr "Importa da Instapaper"
-
-msgid "Tags"
-msgstr ""
-
-#, fuzzy
-msgid "Untitled"
-msgstr "per titolo"
-
-msgid "the link has been added successfully"
-msgstr ""
-
-msgid "error during insertion : the link wasn't added"
-msgstr ""
-
-msgid "the link has been deleted successfully"
-msgstr ""
-
-msgid "the link wasn't deleted"
-msgstr ""
-
-msgid "Article not found!"
-msgstr ""
-
-msgid "previous"
-msgstr ""
-
-msgid "next"
-msgstr ""
-
-msgid "in demo mode, you can't update your password"
-msgstr ""
-
-msgid "your password has been updated"
-msgstr ""
-
-msgid "the two fields have to be filled & the password must be the same in the two fields"
-msgstr ""
-
-msgid "still using the \""
-msgstr ""
-
-msgid "that theme does not seem to be installed"
-msgstr ""
-
-msgid "you have changed your theme preferences"
-msgstr ""
-
-msgid "that language does not seem to be installed"
-msgstr ""
-
-msgid "you have changed your language preferences"
-msgstr ""
-
-msgid "login failed: you have to fill all fields"
-msgstr ""
-
-msgid "welcome to your wallabag"
-msgstr ""
-
-msgid "login failed: bad login or password"
-msgstr ""
-
-#, fuzzy
-msgid "import from instapaper completed"
-msgstr "Importa da Instapaper"
-
-#, fuzzy
-msgid "import from pocket completed"
-msgstr "Importa da Pocket"
-
-#, fuzzy
-msgid "import from Readability completed. "
-msgstr "Importa da Readability"
-
-#, fuzzy
-msgid "import from Poche completed. "
-msgstr "Importa da Pocket"
-
-msgid "Unknown import provider."
-msgstr ""
-
-msgid "Incomplete inc/poche/define.inc.php file, please define \""
-msgstr ""
-
-msgid "Could not find required \""
-msgstr ""
-
-msgid "Uh, there is a problem while generating feeds."
-msgstr ""
-
-#, fuzzy
-msgid "Cache deleted."
-msgstr "elimina"
-
-msgid "Oops, it seems you don't have PHP 5."
-msgstr ""
-
-#~ msgid "poche it!"
-#~ msgstr "pochalo!"
-
-#~ msgid "Updating poche"
-#~ msgstr "Aggiornamento poche"
-
-#~ msgid "create an issue"
-#~ msgstr "crea una segnalazione"
-
-#~ msgid "or"
-#~ msgstr "oppure"
-
-#~ msgid "contact us by mail"
-#~ msgstr "contattaci via email"
-
-#~ msgid "your poche version:"
-#~ msgstr "la tua versione di poche:"
diff --git a/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
deleted file mode 100644
index 297516c00..000000000
Binary files a/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po b/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
deleted file mode 100755
index e39156e61..000000000
--- a/src/Wallabag/Wallabag/Resources/translations/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
+++ /dev/null
@@ -1,553 +0,0 @@
-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: skibbipl \n"
-"Language-Team: \n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.6\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-"
-"testing\n"
-
-msgid "wallabag, a read it later open source system"
-msgstr "wallabag, open source'owy system typu \"przeczytaj to później\""
-
-msgid "login failed: user doesn't exist"
-msgstr "logowanie się nie powiodło: użytkownik nie istnieje"
-
-msgid "return home"
-msgstr "powrót do strony domowej"
-
-msgid "config"
-msgstr "konfiguracja"
-
-msgid "Saving articles"
-msgstr "Zapisywanie artykułów"
-
-msgid "There are several ways to save an article:"
-msgstr "Istnieje kilka sposobów aby zapisać artykuł:"
-
-msgid "read the documentation"
-msgstr "przeczytaj dokumentację"
-
-msgid "download the extension"
-msgstr "pobierz rozszerzenie"
-
-msgid "via F-Droid"
-msgstr "przez F-Droid"
-
-msgid " or "
-msgstr "albo "
-
-msgid "via Google Play"
-msgstr "przez Google Play"
-
-msgid "download the application"
-msgstr "pobierz aplikację"
-
-msgid "By filling this field"
-msgstr "Poprzez wypełnienie tego pola"
-
-msgid "bag it!"
-msgstr "zapisz!"
-
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Skryptozakładka: przeciągnij i upuść ten link na twój pasek zakładek"
-
-msgid "Upgrading wallabag"
-msgstr "Aktualizacja wallabag"
-
-msgid "Installed version"
-msgstr "Zainstalowana wersja"
-
-msgid "Latest stable version"
-msgstr "Najnowsza stabilna wersja"
-
-msgid "A more recent stable version is available."
-msgstr "Nowsza stabilna wersja jest dostępna."
-
-msgid "You are up to date."
-msgstr "Posiadasz najnowszą wersję."
-
-msgid "Latest dev version"
-msgstr "Najnowsza wersja developerska"
-
-msgid "A more recent development version is available."
-msgstr "Nowsza developerska wersja jest dostępna."
-
-msgid "Feeds"
-msgstr "Kanały"
-
-msgid ""
-"Your feed token is currently empty and must first be generated to enable "
-"feeds. Click here to generate it."
-msgstr ""
-"Twój token kanału jest aktualnie pusty i musi zostać wygenerowany, aby "
-"włączyć kanały. Kliknij tutaj, aby go "
-"wygenerować."
-
-msgid "Unread feed"
-msgstr "Nieprzeczytane kanały"
-
-msgid "Favorites feed"
-msgstr "Ulubione kanały"
-
-msgid "Archive feed"
-msgstr "Kanały archiwum"
-
-msgid "Your token:"
-msgstr "Twój token:"
-
-msgid "Your user id:"
-msgstr "Twój id użytkownika:"
-
-msgid ""
-"You can regenerate your token: generate!"
-"."
-msgstr ""
-"Możesz wygenewrować ponownie swój token: generuj!."
-
-msgid "Change your theme"
-msgstr "Zmień swój motyw"
-
-msgid "Theme:"
-msgstr "Motyw:"
-
-msgid "Update"
-msgstr "Aktualizuj"
-
-msgid "Change your language"
-msgstr "Zmień język"
-
-msgid "Language:"
-msgstr "Język:"
-
-msgid "Change your password"
-msgstr "Zmień swoje hasło"
-
-msgid "New password:"
-msgstr "Nowe hasło:"
-
-msgid "Password"
-msgstr "Hasło"
-
-msgid "Repeat your new password:"
-msgstr "Powtórz twoje nowe hasło:"
-
-msgid "Import"
-msgstr "Import"
-
-msgid ""
-"Please execute the import script locally as it can take a very long time."
-msgstr ""
-"Proszę wykonaj skrypt importu lokalnie, ponieważ może to trwać bardzo długo."
-
-msgid "More info in the official documentation:"
-msgstr "Więcej informacji znajdziesz w oficjalnej dokumentacji:"
-
-msgid "Import from Pocket"
-msgstr "Importuj z Pocket"
-
-#, php-format
-msgid "(you must have a %s file on your server)"
-msgstr "(musisz mieć plik %s na swoim serwerze)"
-
-msgid "Import from Readability"
-msgstr "Importuj z Readability"
-
-msgid "Import from Instapaper"
-msgstr "Importuj z Instapaper"
-
-msgid "Import from wallabag"
-msgstr "Importuj z wallabag"
-
-msgid "Export your wallabag data"
-msgstr "Wyeksportuj swoje dane wallabag"
-
-msgid "Click here"
-msgstr "Kliknij tu"
-
-msgid "to download your database."
-msgstr "aby pobrać twoją bazę danych."
-
-msgid "to export your wallabag data."
-msgstr "aby wyeksportować dane wallabag."
-
-msgid "Cache"
-msgstr "Cache"
-
-msgid "to delete cache."
-msgstr "aby wyczyścić cache."
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr "Możesz wprowadzić wiele tagów, oddzielonych przecinkami."
-
-msgid "return to article"
-msgstr "powrót do artykułu"
-
-msgid "plop"
-msgstr "plop"
-
-msgid ""
-"You can check your configuration "
-"here."
-msgstr ""
-"Możesz sprawdzić swoją "
-"konfigurację tutaj."
-
-msgid "favoris"
-msgstr "favoris"
-
-msgid "archive"
-msgstr "archiwum"
-
-msgid "unread"
-msgstr "nieprzeczytane"
-
-msgid "by date asc"
-msgstr "po dacie rosnąco"
-
-msgid "by date"
-msgstr "po dacie"
-
-msgid "by date desc"
-msgstr "po dacie malejąco"
-
-msgid "by title asc"
-msgstr "po tytule rosnąco"
-
-msgid "by title"
-msgstr "po tytule"
-
-msgid "by title desc"
-msgstr "po tytule malejąco"
-
-msgid "Tag"
-msgstr "Otaguj"
-
-msgid "No articles found."
-msgstr "Nie znaleziono artykułów."
-
-msgid "Toggle mark as read"
-msgstr "Przełącz jako przeczytane"
-
-msgid "toggle favorite"
-msgstr "przełącz ulubione"
-
-msgid "delete"
-msgstr "usuń"
-
-msgid "original"
-msgstr "oryginał"
-
-msgid "estimated reading time:"
-msgstr "szacowany czas czytania:"
-
-msgid "mark all the entries as read"
-msgstr "zaznacz wszystkie wpisy jako przeczytane"
-
-msgid "results"
-msgstr "rezultaty"
-
-msgid "installation"
-msgstr "instalacja"
-
-msgid "install your wallabag"
-msgstr "zainstauj wallabag"
-
-msgid ""
-"wallabag is still not installed. Please fill the below form to install it. "
-"Don't hesitate to read the documentation "
-"on wallabag website."
-msgstr ""
-"wallabag wciąż nie jest zainstalowany. Proszę wypełnij poniższy formularz "
-"aby go zainstalować. Nie wahaj się przeczytać dokumentacji na stronie wallabag."
-
-msgid "Login"
-msgstr "Login"
-
-msgid "Repeat your password"
-msgstr "Powtórz swoje hasło"
-
-msgid "Install"
-msgstr "Zainstauj"
-
-msgid "login to your wallabag"
-msgstr "zaloguj się do twojego wallabag"
-
-msgid "Login to wallabag"
-msgstr "Logowanie do wallabag"
-
-msgid "you are in demo mode, some features may be disabled."
-msgstr "jesteś w trybie demo, niektóre funkcjonalności mogą być wyłączone."
-
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-msgid "Stay signed in"
-msgstr "Pozostań zalogowany"
-
-msgid "(Do not check on public computers)"
-msgstr "(Nie zaznaczaj na komputerach z publicznym dostępem)"
-
-msgid "Sign in"
-msgstr "Zaloguj się"
-
-msgid "favorites"
-msgstr "ulubione"
-
-msgid "estimated reading time :"
-msgstr "szacowany czas czytania :"
-
-msgid "Mark all the entries as read"
-msgstr "Zaznacz wszystkie wpisy jako przeczytane"
-
-msgid "Return home"
-msgstr "Powrót na stronę domową"
-
-msgid "Back to top"
-msgstr "Powrót na górę"
-
-msgid "Mark as read"
-msgstr "Oznacz jako przeczytane"
-
-msgid "Favorite"
-msgstr "Ulubione"
-
-msgid "Toggle favorite"
-msgstr "Przełącz ulubione"
-
-msgid "Delete"
-msgstr "Usuń"
-
-msgid "Tweet"
-msgstr "Tweet"
-
-msgid "Email"
-msgstr "Email"
-
-msgid "shaarli"
-msgstr "shaarli"
-
-msgid "flattr"
-msgstr "flattr"
-
-msgid "Does this article appear wrong?"
-msgstr "Czy ten artykuł jest wyświetlany niepoprawnie?"
-
-msgid "tags:"
-msgstr "tagi:"
-
-msgid "Edit tags"
-msgstr "Edytuj tagi"
-
-msgid "save link!"
-msgstr "zapisz link!"
-
-msgid "home"
-msgstr "strona domowa"
-
-msgid "tags"
-msgstr "tagi"
-
-msgid "logout"
-msgstr "wyloguj"
-
-msgid "powered by"
-msgstr "w oparciu o"
-
-msgid "debug mode is on so cache is off."
-msgstr "tryb debug jest włączony zatem cache jest wyłączony."
-
-msgid "your wallabag version:"
-msgstr "wersja twojego wallabag:"
-
-msgid "storage:"
-msgstr "storage:"
-
-msgid "save a link"
-msgstr "zapisz link"
-
-msgid "back to home"
-msgstr "powrót do strony domowej"
-
-msgid "toggle mark as read"
-msgstr "przełącz jako przeczytane"
-
-msgid "tweet"
-msgstr "tweet"
-
-msgid "email"
-msgstr "email"
-
-msgid "this article appears wrong?"
-msgstr "ten artykuł wygląda niepoprawnie?"
-
-msgid "No link available here!"
-msgstr "No link available here!"
-
-#, fuzzy
-msgid "Poching a link"
-msgstr "Poching a link"
-
-msgid "by filling this field"
-msgstr "przez wypełnienie tego pola"
-
-msgid "bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "skryptozakładka: przeciągnij i upuść ten link na twój pasek zakładek"
-
-msgid "your version"
-msgstr "twoja wersja"
-
-msgid "latest stable version"
-msgstr "najnowsza stabilna wersja"
-
-msgid "a more recent stable version is available."
-msgstr "nowsza wersja stabilna jest dostępna."
-
-msgid "you are up to date."
-msgstr "posiadasz najnowszą wersję."
-
-msgid "latest dev version"
-msgstr "najnowsza wersja developerska"
-
-msgid "a more recent development version is available."
-msgstr "nowsza wersja developerska jest dostępna."
-
-msgid "Please execute the import script locally, it can take a very long time."
-msgstr ""
-"Please execute the import script locally, it can take a very long time."
-
-msgid "More infos in the official doc:"
-msgstr "More infos 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 "Tagi"
-
-msgid "Untitled"
-msgstr "Untitled"
-
-msgid "the link has been added successfully"
-msgstr "link został dodany pomyślnie"
-
-msgid "error during insertion : the link wasn't added"
-msgstr "błąd podczas dodawania : link nie został dodany"
-
-msgid "the link has been deleted successfully"
-msgstr "link został usunięty pomyślnie"
-
-msgid "the link wasn't deleted"
-msgstr "link nie został usunięty"
-
-msgid "Article not found!"
-msgstr "Artykuł nie znaleziony!"
-
-msgid "previous"
-msgstr "poprzedni"
-
-msgid "next"
-msgstr "następny"
-
-msgid "in demo mode, you can't update your password"
-msgstr "w trybie demo nie możesz zaktualizować swojego hasła"
-
-msgid "your password has been updated"
-msgstr "twoje hasło zostało zaktualizowane"
-
-msgid ""
-"the two fields have to be filled & the password must be the same in the two "
-"fields"
-msgstr ""
-"oba pola muszą być wypełnione oraz hasło musi być takie same w obu polach"
-
-msgid "still using the \""
-msgstr "wciąż używam \""
-
-msgid "that theme does not seem to be installed"
-msgstr "ten motyw nie wygląda na zainstalowany"
-
-msgid "you have changed your theme preferences"
-msgstr "zmieniłeś swoje preferencje motywu"
-
-msgid "that language does not seem to be installed"
-msgstr "ten język nie wygląda na zainstalowany"
-
-msgid "you have changed your language preferences"
-msgstr "zmieniłeś swoje preferencje językowe"
-
-msgid "login failed: you have to fill all fields"
-msgstr "logowanie się nie powiodło: musisz wypełnić wszystkie pola"
-
-msgid "welcome to your wallabag"
-msgstr "witaj w twoim wallabag"
-
-msgid "login failed: bad login or password"
-msgstr "logowanie się nie powiodło: nieprawidłowy login lub hasło"
-
-msgid "import from instapaper completed"
-msgstr "import z instapaper zakończony"
-
-msgid "import from pocket completed"
-msgstr "import z pocket zakończony"
-
-msgid "import from Readability completed. "
-msgstr "import z Readability zakończony. "
-
-msgid "import from Poche completed. "
-msgstr "import z Poche zakończony. "
-
-msgid "Unknown import provider."
-msgstr "Nieznany dostawca importu."
-
-msgid "Incomplete inc/poche/define.inc.php file, please define \""
-msgstr "Niekompletny plik inc/poche/define.inc.php, proszę zdefiniuj \""
-
-msgid "Could not find required \""
-msgstr "Nie znaleziono wymaganego \""
-
-msgid "Uh, there is a problem while generating feeds."
-msgstr "Ah, wystąpił problem podczas generowania kanałów."
-
-msgid "Cache deleted."
-msgstr "Cache usunięty."
-
-msgid "Oops, it seems you don't have PHP 5."
-msgstr "Oops, wygląda na to że nie masz PHP 5."
-
-#~ 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:"
diff --git a/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo
deleted file mode 100644
index c1ce317fb..000000000
Binary files a/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po b/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po
deleted file mode 100644
index e1453922a..000000000
--- a/src/Wallabag/Wallabag/Resources/translations/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po
+++ /dev/null
@@ -1,549 +0,0 @@
-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: @iancamporez \n"
-"Language-Team: @iancamporez \n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: /home/ian/Projetos/wallabag/locale/en_EN.utf8/"
-"LC_MESSAGES\n"
-
-msgid "wallabag, a read it later open source system"
-msgstr "wallabag, um \"read it later\" de código aberto"
-
-msgid "login failed: user doesn't exist"
-msgstr "falha ao entrar: o usuário não existe"
-
-msgid "return home"
-msgstr "retornar à página inicial"
-
-msgid "config"
-msgstr "configurar"
-
-msgid "Saving articles"
-msgstr "Salvando artigos"
-
-msgid "There are several ways to save an article:"
-msgstr "Existem várias maneiras de salvar um artigo:"
-
-msgid "read the documentation"
-msgstr "ler a documentação"
-
-msgid "download the extension"
-msgstr "baixar a extensão"
-
-msgid "via F-Droid"
-msgstr "via F-Droid"
-
-msgid " or "
-msgstr "ou "
-
-msgid "via Google Play"
-msgstr "via Google Play"
-
-msgid "download the application"
-msgstr "baixar o aplicativo"
-
-msgid "By filling this field"
-msgstr "Preenchendo esse campo"
-
-msgid "bag it!"
-msgstr "adicionar ao wallabag"
-
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Bookmarklet: arraste esse link para sua barra de favoritos"
-
-msgid "Upgrading wallabag"
-msgstr "Atualizando o wallabag"
-
-msgid "Installed version"
-msgstr "Versão instalada"
-
-msgid "Latest stable version"
-msgstr "Última versão estável"
-
-msgid "A more recent stable version is available."
-msgstr "Uma versão estável mais nova está disponível"
-
-msgid "You are up to date."
-msgstr "Você está atualizado."
-
-msgid "Latest dev version"
-msgstr "Última versão em desenvolvimento"
-
-msgid "A more recent development version is available."
-msgstr "Uma versão em desenvolvimento mais recente está disponível"
-
-msgid "Feeds"
-msgstr "Feeds"
-
-msgid ""
-"Your feed token is currently empty and must first be generated to enable "
-"feeds. Click here to generate it."
-msgstr ""
-"Seu token do feed e precisa ser gerado para ativar os feeds. Clique aqui para gerar um token."
-
-msgid "Unread feed"
-msgstr "Feed de artigos não lidos"
-
-msgid "Favorites feed"
-msgstr "Feed dos favoritos"
-
-msgid "Archive feed"
-msgstr "Feed de arquivados"
-
-msgid "Your token:"
-msgstr "Seu token:"
-
-msgid "Your user id:"
-msgstr "Seu código de usuário:"
-
-msgid ""
-"You can regenerate your token: generate!"
-"."
-msgstr ""
-"Você pode regerar seu token: gerar!."
-
-msgid "Change your theme"
-msgstr "Mudar seu tema"
-
-msgid "Theme:"
-msgstr "Tema:"
-
-msgid "Update"
-msgstr "Atualizar"
-
-msgid "Change your language"
-msgstr "Alterar seu idioma"
-
-msgid "Language:"
-msgstr "Idioma:"
-
-msgid "Change your password"
-msgstr "Alterar sua senha"
-
-msgid "New password:"
-msgstr "Nova senha:"
-
-msgid "Password"
-msgstr "Senha"
-
-msgid "Repeat your new password:"
-msgstr "Repetir sua nova senha:"
-
-msgid "Import"
-msgstr "Importar"
-
-msgid ""
-"Please execute the import script locally as it can take a very long time."
-msgstr ""
-"Por favor, execute o script de importação localmente, pois pode demorar "
-"muito tempo."
-
-msgid "More info in the official documentation:"
-msgstr "Mais informações na documentação oficial:"
-
-msgid "Import from Pocket"
-msgstr "Importar do Pocket"
-
-#, php-format
-msgid "(you must have a %s file on your server)"
-msgstr "(você deve ter um arquivo %s no seu servidor)"
-
-msgid "Import from Readability"
-msgstr "Importar do Readability"
-
-msgid "Import from Instapaper"
-msgstr "Importar do Instapaper"
-
-msgid "Import from wallabag"
-msgstr "Importar do wallabag"
-
-msgid "Export your wallabag data"
-msgstr "Exportar seus dados do wallabag"
-
-msgid "Click here"
-msgstr "Clique aqui"
-
-msgid "to download your database."
-msgstr "para baixar seu banco de dados."
-
-msgid "to export your wallabag data."
-msgstr "para exportar seus dados do wallabag."
-
-msgid "Cache"
-msgstr "Cache"
-
-msgid "to delete cache."
-msgstr "para apagar o cache."
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr "Você pode inserir várias tags, separadas por vírgulas."
-
-msgid "return to article"
-msgstr "retornar ao artigo"
-
-msgid "plop"
-msgstr "plop"
-
-msgid ""
-"You can check your configuration "
-"here."
-msgstr ""
-"Você pode checar suas "
-"configurações aqui."
-
-msgid "favoris"
-msgstr "favoritos"
-
-msgid "archive"
-msgstr "arquivo"
-
-msgid "unread"
-msgstr "não lidos"
-
-msgid "by date asc"
-msgstr "por data (cresc.)"
-
-msgid "by date"
-msgstr "por data"
-
-msgid "by date desc"
-msgstr "por data (decr.)"
-
-msgid "by title asc"
-msgstr "por título (cresc.)"
-
-msgid "by title"
-msgstr "por título"
-
-msgid "by title desc"
-msgstr "por título (decr.)"
-
-msgid "Tag"
-msgstr "Tag"
-
-msgid "No articles found."
-msgstr "Nenhum artigo encontrado."
-
-msgid "Toggle mark as read"
-msgstr "Alterar \"marcar como lido\""
-
-msgid "toggle favorite"
-msgstr "alterar \"favorito\""
-
-msgid "delete"
-msgstr "deletar"
-
-msgid "original"
-msgstr "original"
-
-msgid "estimated reading time:"
-msgstr "tempo estimado de leitura:"
-
-msgid "mark all the entries as read"
-msgstr "marcar todas as entradas como lidas"
-
-msgid "results"
-msgstr "resultados"
-
-msgid "installation"
-msgstr "instalação"
-
-msgid "install your wallabag"
-msgstr "instalar seu wallabag"
-
-msgid ""
-"wallabag is still not installed. Please fill the below form to install it. "
-"Don't hesitate to read the documentation "
-"on wallabag website."
-msgstr ""
-"O wallabag ainda não está instalado. Preencha o formulário abaixo para "
-"instalá-lo. Não hesite em ler a "
-"documentação no site do wallabag."
-
-msgid "Login"
-msgstr "Login"
-
-msgid "Repeat your password"
-msgstr "Repetir sua senha"
-
-msgid "Install"
-msgstr "Instalar"
-
-msgid "login to your wallabag"
-msgstr "entrar no seu wallabag"
-
-msgid "Login to wallabag"
-msgstr "Entrar no wallabag"
-
-msgid "you are in demo mode, some features may be disabled."
-msgstr "você está no modo demo, alguns recursos podem estar desativados."
-
-msgid "Username"
-msgstr "Nome de usuário"
-
-msgid "Stay signed in"
-msgstr "Continuar conectado"
-
-msgid "(Do not check on public computers)"
-msgstr "(Não marque em computadores públicos)"
-
-msgid "Sign in"
-msgstr "Entrar"
-
-msgid "favorites"
-msgstr "favoritos"
-
-msgid "estimated reading time :"
-msgstr "tempo estimado de leitura :"
-
-msgid "Mark all the entries as read"
-msgstr "Marcar todas as entradas como lidas"
-
-msgid "Return home"
-msgstr "Retornar à página inicial"
-
-msgid "Back to top"
-msgstr "Voltar ao topo"
-
-msgid "Mark as read"
-msgstr "Marcar como lido"
-
-msgid "Favorite"
-msgstr "Favoritar"
-
-msgid "Toggle favorite"
-msgstr "Alterar \"favorito\""
-
-msgid "Delete"
-msgstr "Deletar"
-
-msgid "Tweet"
-msgstr "Tweetar"
-
-msgid "Email"
-msgstr "Email"
-
-msgid "shaarli"
-msgstr "shaarli"
-
-msgid "flattr"
-msgstr "flattr"
-
-msgid "Does this article appear wrong?"
-msgstr "Esse artigo está sendo exibido incorretamente?"
-
-msgid "tags:"
-msgstr "tags:"
-
-msgid "Edit tags"
-msgstr "Editar tags"
-
-msgid "save link!"
-msgstr "salvar link!"
-
-msgid "home"
-msgstr "início"
-
-msgid "tags"
-msgstr "tags"
-
-msgid "logout"
-msgstr "sair"
-
-msgid "powered by"
-msgstr "powered by"
-
-msgid "debug mode is on so cache is off."
-msgstr "o modo debug está ativo, então o cache foi desativado."
-
-msgid "your wallabag version:"
-msgstr "sua versão do wallabag:"
-
-msgid "storage:"
-msgstr "armazenamento:"
-
-msgid "save a link"
-msgstr "salvar link"
-
-msgid "back to home"
-msgstr "voltar à página inicial"
-
-msgid "toggle mark as read"
-msgstr "alterar \"marcar como lido\""
-
-msgid "tweet"
-msgstr "tweetar"
-
-msgid "email"
-msgstr "email"
-
-msgid "this article appears wrong?"
-msgstr "esse artigo está sendo mostrado incorretamente?"
-
-msgid "No link available here!"
-msgstr "Nenhum link disponível aqui!"
-
-msgid "Poching a link"
-msgstr "Pocheando um link"
-
-msgid "by filling this field"
-msgstr "preenchendo esse campo"
-
-msgid "bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "bookmarklet: arraste esse link para a sua barra de favoritos"
-
-msgid "your version"
-msgstr "sua versão"
-
-msgid "latest stable version"
-msgstr "última versão estável"
-
-msgid "a more recent stable version is available."
-msgstr "uma versão estável mais nova está disponível"
-
-msgid "you are up to date."
-msgstr "você está atualizado."
-
-msgid "latest dev version"
-msgstr "última versão em desenvolvimento"
-
-msgid "a more recent development version is available."
-msgstr "uma versão em desenvolvimento mais nova está disponível"
-
-msgid "Please execute the import script locally, it can take a very long time."
-msgstr ""
-"Por favor, execute o script de importação localmente, pois pode demorar "
-"muito tempo."
-
-msgid "More infos in the official doc:"
-msgstr "Mais informações na documentação oficial:"
-
-msgid "import from Pocket"
-msgstr "importar do Pocket"
-
-msgid "import from Readability"
-msgstr "importar do Readability"
-
-msgid "import from Instapaper"
-msgstr "importar do Instapaper"
-
-msgid "Tags"
-msgstr "Tags"
-
-msgid "Untitled"
-msgstr "Sem título"
-
-msgid "the link has been added successfully"
-msgstr "o link foi adicionado com sucesso"
-
-msgid "error during insertion : the link wasn't added"
-msgstr "erro durante a inserção: o link não foi adicionado"
-
-msgid "the link has been deleted successfully"
-msgstr "o link foi deletado com sucesso"
-
-msgid "the link wasn't deleted"
-msgstr "o link não foi deletado"
-
-msgid "Article not found!"
-msgstr "Artigo não encontrado!"
-
-msgid "previous"
-msgstr "anterior"
-
-msgid "next"
-msgstr "próximo"
-
-msgid "in demo mode, you can't update your password"
-msgstr "você não pode alterar a senha no modo demo"
-
-msgid "your password has been updated"
-msgstr "sua senha foi atualizada"
-
-msgid ""
-"the two fields have to be filled & the password must be the same in the two "
-"fields"
-msgstr ""
-"os dois campos devem estar preenchidos e as senhas devem ser iguais em ambos"
-
-msgid "still using the \""
-msgstr "ainda usando o \""
-
-msgid "that theme does not seem to be installed"
-msgstr "esse tema aparentemente não está instalado"
-
-msgid "you have changed your theme preferences"
-msgstr "você alterou suas preferências de tema"
-
-msgid "that language does not seem to be installed"
-msgstr "esse idioma aparentemente não está instalado"
-
-msgid "you have changed your language preferences"
-msgstr "você alterou suas preferências de idioma"
-
-msgid "login failed: you have to fill all fields"
-msgstr "falha ao entrar: você deve preencher todos os campos"
-
-msgid "welcome to your wallabag"
-msgstr "bem-vindo ao seu wallabag"
-
-msgid "login failed: bad login or password"
-msgstr "falha ao entrar: login ou senha incorretos"
-
-msgid "import from instapaper completed"
-msgstr "importação do instapaper completa"
-
-msgid "import from pocket completed"
-msgstr "importação do pocket completa"
-
-msgid "import from Readability completed. "
-msgstr "importação do Readability completa. "
-
-msgid "import from Poche completed. "
-msgstr "importação do Poche completa. "
-
-msgid "Unknown import provider."
-msgstr "Serviço de importação desconhecido."
-
-msgid "Incomplete inc/poche/define.inc.php file, please define \""
-msgstr "Arquivo inc/poche/define.inc.php incompleto, por favor defina \""
-
-msgid "Could not find required \""
-msgstr "Não foi possível encontrar o requerido \""
-
-msgid "Uh, there is a problem while generating feeds."
-msgstr "Uh, houve um problema ao gerar os feeds."
-
-msgid "Cache deleted."
-msgstr "Cache deletado."
-
-msgid "Oops, it seems you don't have PHP 5."
-msgstr "Oops, parece que você não tem o PHP 5."
-
-#~ 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:"
diff --git a/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
deleted file mode 100755
index 5cbfad164..000000000
Binary files a/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po b/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
deleted file mode 100755
index 08f12b7cf..000000000
--- a/src/Wallabag/Wallabag/Resources/translations/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
+++ /dev/null
@@ -1,561 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:09+0300\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Maryana \n"
-"Language-Team: \n"
-"Language: \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-Language: Russian\n"
-"X-Poedit-Country: RUSSIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
-
-msgid "wallabag, a read it later open source system"
-msgstr "wallabag, сервис отложенного чтения с открытым исходным кодом"
-
-msgid "login failed: user doesn't exist"
-msgstr "войти не удалось: пользователь не существует"
-
-msgid "return home"
-msgstr "на главную"
-
-msgid "config"
-msgstr "настройки"
-
-msgid "Saving articles"
-msgstr "Сохранение статей"
-
-#, fuzzy
-msgid "There are several ways to save an article:"
-msgstr "Существует несколько способов сохранить ссылку:"
-
-msgid "read the documentation"
-msgstr "читать инструкцию"
-
-msgid "download the extension"
-msgstr "скачать расширение"
-
-msgid "via F-Droid"
-msgstr "с F-Droid"
-
-msgid " or "
-msgstr "или"
-
-msgid "via Google Play"
-msgstr "с Google Play"
-
-msgid "download the application"
-msgstr "скачать приложение"
-
-msgid "By filling this field"
-msgstr "Заполнением этого поля"
-
-msgid "bag it!"
-msgstr "прикарманить!"
-
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Закладка: перетащите и опустите ссылку на панель закладок"
-
-msgid "Upgrading wallabag"
-msgstr "Обновление wallabag"
-
-msgid "Installed version"
-msgstr "Установленная версия"
-
-msgid "Latest stable version"
-msgstr "Последняя стабильная версия"
-
-msgid "A more recent stable version is available."
-msgstr "Доступна новая стабильная версия."
-
-msgid "You are up to date."
-msgstr "У вас всё самое новое."
-
-#, fuzzy
-msgid "Latest dev version"
-msgstr "последняя версия в разработке"
-
-#, fuzzy
-msgid "A more recent development version is available."
-msgstr "есть более свежая версия в разработке."
-
-msgid "Feeds"
-msgstr "Ленты (feeds)"
-
-msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it."
-msgstr "Ваш маркер ленты (feed token) не определен, для того, чтобы активировать ленту, сначала создайте его. Нажмите здесь для его генерации а>."
-
-msgid "Unread feed"
-msgstr "Лента непрочитанного"
-
-msgid "Favorites feed"
-msgstr "Лента избранного"
-
-msgid "Archive feed"
-msgstr "Лента архива"
-
-msgid "Your token:"
-msgstr "Ваш маркер (token):"
-
-msgid "Your user id:"
-msgstr "Ваш идентификатор пользователя (user id):"
-
-msgid "You can regenerate your token: generate!."
-msgstr "Вы можете создать новый маркер: сгенерировать!."
-
-msgid "Change your theme"
-msgstr "Изменить тему"
-
-msgid "Theme:"
-msgstr "Тема:"
-
-msgid "Update"
-msgstr "Обновить"
-
-msgid "Change your language"
-msgstr "Изменить язык"
-
-msgid "Language:"
-msgstr "Язык:"
-
-msgid "Change your password"
-msgstr "Смена пароля"
-
-msgid "New password:"
-msgstr "Новый пароль:"
-
-msgid "Password"
-msgstr "Пароль"
-
-msgid "Repeat your new password:"
-msgstr "Ещё раз новый пароль:"
-
-msgid "Import"
-msgstr "Импортировать"
-
-msgid "Please execute the import script locally as it can take a very long time."
-msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени."
-
-#, fuzzy
-msgid "More info in the official documentation:"
-msgstr "Больше сведений в официальной документации:"
-
-msgid "Import from Pocket"
-msgstr "Импортировать из Pocket"
-
-#, php-format
-msgid "(you must have a %s file on your server)"
-msgstr "(файл %s должен присутствовать на вашем сервере)"
-
-msgid "Import from Readability"
-msgstr "Импортировать из Readability"
-
-msgid "Import from Instapaper"
-msgstr "Импортировать из Instapaper"
-
-msgid "Import from wallabag"
-msgstr "Импортировать из wallabag"
-
-msgid "Export your wallabag data"
-msgstr "Экспортировать данные wallabag"
-
-msgid "Click here"
-msgstr "Кликните здесь"
-
-msgid "to download your database."
-msgstr "чтобы скачать вашу базу данных"
-
-msgid "to export your wallabag data."
-msgstr "чтобы экспортировать свои записи из wallabag."
-
-msgid "Cache"
-msgstr "Кэш"
-
-msgid "to delete cache."
-msgstr "чтобы сбросить кэш."
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr "Вы можете ввести несколько тегов, разделяя их запятой."
-
-msgid "return to article"
-msgstr "вернуться к статье"
-
-msgid "plop"
-msgstr "plop"
-
-msgid "You can check your configuration here."
-msgstr "Вы можете проверить конфигурацию здесь."
-
-msgid "favoris"
-msgstr "избранное"
-
-msgid "archive"
-msgstr "архив"
-
-msgid "unread"
-msgstr "непрочитанное"
-
-msgid "by date asc"
-msgstr "по дате, сперва старые"
-
-msgid "by date"
-msgstr "по дате"
-
-msgid "by date desc"
-msgstr "по дате, сперва новые"
-
-msgid "by title asc"
-msgstr "по заголовку (прямой)"
-
-msgid "by title"
-msgstr "по заголовку"
-
-msgid "by title desc"
-msgstr "по заголовку (обратный)"
-
-msgid "Tag"
-msgstr "Тег"
-
-msgid "No articles found."
-msgstr "Статей не найдено."
-
-msgid "Toggle mark as read"
-msgstr "Изменить отметку 'прочитано'"
-
-msgid "toggle favorite"
-msgstr "изменить метку избранного"
-
-msgid "delete"
-msgstr "удалить"
-
-msgid "original"
-msgstr "источник"
-
-msgid "estimated reading time:"
-msgstr "ориентировочное время чтения:"
-
-msgid "mark all the entries as read"
-msgstr "отметить все статьи как прочитанные "
-
-msgid "results"
-msgstr "найдено"
-
-msgid "installation"
-msgstr "установка"
-
-msgid "install your wallabag"
-msgstr "установка wallabag"
-
-msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website."
-msgstr "wallabag всё ещё не установлен. Надо заполнить форму ниже, чтобы установить его. Неплохо также прочесть документацию на сайте wallabag."
-
-msgid "Login"
-msgstr "Имя пользователя"
-
-msgid "Repeat your password"
-msgstr "Повторите пароль"
-
-msgid "Install"
-msgstr "Установить"
-
-msgid "login to your wallabag"
-msgstr "войти в свой wallabag"
-
-msgid "Login to wallabag"
-msgstr "Войдите в wallabag"
-
-msgid "you are in demo mode, some features may be disabled."
-msgstr "демонстрационный режим - работают не все возможности."
-
-msgid "Username"
-msgstr "Имя пользователя"
-
-msgid "Stay signed in"
-msgstr "Запомнить меня"
-
-msgid "(Do not check on public computers)"
-msgstr "(Не отмечайте на чужих компьютерах)"
-
-msgid "Sign in"
-msgstr "Зарегистрироваться"
-
-msgid "favorites"
-msgstr "избранное"
-
-#, fuzzy
-msgid "estimated reading time :"
-msgstr "ориентировочное время чтения:"
-
-msgid "Mark all the entries as read"
-msgstr "Отметить все как прочитанное"
-
-msgid "Return home"
-msgstr "На главную"
-
-msgid "Back to top"
-msgstr "Наверх"
-
-msgid "Mark as read"
-msgstr "Отметить как прочитанное"
-
-msgid "Favorite"
-msgstr "Избранное"
-
-msgid "Toggle favorite"
-msgstr "Изменить метку избранного"
-
-msgid "Delete"
-msgstr "Удалить"
-
-msgid "Tweet"
-msgstr "Твитнуть"
-
-msgid "Email"
-msgstr "Отправить по почте"
-
-msgid "shaarli"
-msgstr "shaarli"
-
-msgid "flattr"
-msgstr "проспонсировать"
-
-msgid "Does this article appear wrong?"
-msgstr "Статья выглядит криво?"
-
-msgid "tags:"
-msgstr "теги:"
-
-msgid "Edit tags"
-msgstr "Редактировать теги"
-
-msgid "save link!"
-msgstr "сохранить ссылку!"
-
-msgid "home"
-msgstr "главная"
-
-msgid "tags"
-msgstr "теги"
-
-msgid "logout"
-msgstr "выход"
-
-msgid "powered by"
-msgstr "при поддержке"
-
-msgid "debug mode is on so cache is off."
-msgstr "включён режим отладки - кеш выключен."
-
-msgid "your wallabag version:"
-msgstr "Ваша версия wallabag:"
-
-msgid "storage:"
-msgstr "хранилище:"
-
-msgid "save a link"
-msgstr "сохранить ссылку"
-
-msgid "back to home"
-msgstr "домой"
-
-msgid "toggle mark as read"
-msgstr "изменить отметку 'прочитано'"
-
-msgid "tweet"
-msgstr "твитнуть"
-
-msgid "email"
-msgstr "email"
-
-#, fuzzy
-msgid "this article appears wrong?"
-msgstr "Статья выглядит криво?"
-
-msgid "No link available here!"
-msgstr "Здесь нет ссылки!"
-
-#, fuzzy
-msgid "Poching a link"
-msgstr "Сохранение ссылок"
-
-#, fuzzy
-msgid "by filling this field"
-msgstr "Заполнением этого поля"
-
-#, fuzzy
-msgid "bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "Закладка: перетащите и опустите ссылку на панель закладок"
-
-msgid "your version"
-msgstr "Ваша версия"
-
-#, fuzzy
-msgid "latest stable version"
-msgstr "Последняя стабильная версия"
-
-#, fuzzy
-msgid "a more recent stable version is available."
-msgstr "Доступна новая стабильная версия."
-
-msgid "you are up to date."
-msgstr "у вас всё самое новое."
-
-msgid "latest dev version"
-msgstr "последняя версия в разработке"
-
-msgid "a more recent development version is available."
-msgstr "есть более свежая версия в разработке."
-
-#, fuzzy
-msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени."
-
-#, fuzzy
-msgid "More infos in the official doc:"
-msgstr "Больше сведений в официальной документации:"
-
-#, fuzzy
-msgid "import from Pocket"
-msgstr "Импортировать из Pocket"
-
-#, fuzzy
-msgid "import from Readability"
-msgstr "Импортировать из Readability"
-
-#, fuzzy
-msgid "import from Instapaper"
-msgstr "Импортировать из Instapaper"
-
-msgid "Tags"
-msgstr "Теги"
-
-msgid "Untitled"
-msgstr "Без названия"
-
-msgid "the link has been added successfully"
-msgstr "ссылка успешно добавлена"
-
-msgid "error during insertion : the link wasn't added"
-msgstr "ошибка во время вставки: ссылка не добавлена"
-
-msgid "the link has been deleted successfully"
-msgstr "ссылка успешно удалена"
-
-msgid "the link wasn't deleted"
-msgstr "ссылка не удалена"
-
-msgid "Article not found!"
-msgstr "Статью не найдено."
-
-msgid "previous"
-msgstr "предыдущая"
-
-msgid "next"
-msgstr "следующая"
-
-msgid "in demo mode, you can't update your password"
-msgstr "в демонстрационном режиме смена пароля не разрешена"
-
-msgid "your password has been updated"
-msgstr "ваш пароль обновлен"
-
-msgid "the two fields have to be filled & the password must be the same in the two fields"
-msgstr "необходимо заполнить оба поля и пароль в обоих должен совпадать"
-
-msgid "still using the \""
-msgstr "все еще используется \""
-
-msgid "that theme does not seem to be installed"
-msgstr "кажется, эта тема не установлена"
-
-msgid "you have changed your theme preferences"
-msgstr "вы изменили свои настройки темы"
-
-msgid "that language does not seem to be installed"
-msgstr "кажется, что этот язык не установлен"
-
-msgid "you have changed your language preferences"
-msgstr "вы изменили свои настройки языка"
-
-msgid "login failed: you have to fill all fields"
-msgstr "войти не удалось: вы должны заполнить все поля"
-
-msgid "welcome to your wallabag"
-msgstr "добро пожаловать в wallabag"
-
-msgid "login failed: bad login or password"
-msgstr "войти не удалось: неправильное имя пользователя или пароль"
-
-msgid "import from instapaper completed"
-msgstr "импорт из instapaper завершен"
-
-msgid "import from pocket completed"
-msgstr "импорт из pocket завершен"
-
-msgid "import from Readability completed. "
-msgstr "импорт из Readability завершен"
-
-msgid "import from Poche completed. "
-msgstr "импорт из Poche завершен."
-
-msgid "Unknown import provider."
-msgstr "Неизвестный провайдер импорта."
-
-msgid "Incomplete inc/poche/define.inc.php file, please define \""
-msgstr "Незавершенный файл inc/poche/define.inc.php file, пожалуйста определите \""
-
-msgid "Could not find required \""
-msgstr "Не удалось найти требуемый \""
-
-msgid "Uh, there is a problem while generating feeds."
-msgstr "Ох, возникла проблема при создании ленты."
-
-msgid "Cache deleted."
-msgstr "Кэш очищен. "
-
-msgid "Oops, it seems you don't have PHP 5."
-msgstr "Упс, кажется у вас не установлен PHP 5."
-
-#~ msgid "You can poche a link by several methods:"
-#~ msgstr "Вы можете сохранить ссылку несколькими путями:"
-
-#~ msgid "poche it!"
-#~ msgstr "прикарманить!"
-
-#~ msgid "Updating poche"
-#~ msgstr "Обновления poche"
-
-#, fuzzy
-#~ msgid "Export your poche datas"
-#~ msgstr "Экспортировать данные poche"
-
-#, fuzzy
-#~ msgid "to export your poche datas."
-#~ msgstr "чтобы экспортировать свои записи из poche."
-
-#~ msgid "your poche version:"
-#~ msgstr "ваша версия poche:"
-
-#~ msgid "Import from poche"
-#~ msgstr "Импортировать из poche"
-
-#~ msgid "welcome to your poche"
-#~ msgstr "добро пожаловать в ваш poche"
-
-#~ msgid "see you soon!"
-#~ msgstr "увидимся!"
-
-#~ msgid "create an issue"
-#~ msgstr "оповестить об ошибке"
-
-#~ msgid "or"
-#~ msgstr "или"
-
-#~ msgid "contact us by mail"
-#~ msgstr "связаться по почте"
diff --git a/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo
deleted file mode 100644
index 5518fad19..000000000
Binary files a/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.mo and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po b/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po
deleted file mode 100644
index 8ad2ededc..000000000
--- a/src/Wallabag/Wallabag/Resources/translations/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po
+++ /dev/null
@@ -1,568 +0,0 @@
-#
-# Translators:
-# bungabunga, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: wallabag\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:12+0300\n"
-"PO-Revision-Date: 2014-02-25 15:12+0300\n"
-"Last-Translator: Maryana \n"
-"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/wallabag/language/sl_SI/)\n"
-"Language: sl_SI\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
-
-msgid "wallabag, a read it later open source system"
-msgstr ""
-
-msgid "login failed: user doesn't exist"
-msgstr ""
-
-msgid "return home"
-msgstr ""
-
-msgid "config"
-msgstr "nastavitve"
-
-msgid "Saving articles"
-msgstr ""
-
-msgid "There are several ways to save an article:"
-msgstr ""
-
-msgid "read the documentation"
-msgstr "preberite dokumentacijo"
-
-msgid "download the extension"
-msgstr ""
-
-msgid "via F-Droid"
-msgstr ""
-
-msgid " or "
-msgstr ""
-
-msgid "via Google Play"
-msgstr ""
-
-msgid "download the application"
-msgstr ""
-
-#, fuzzy
-msgid "By filling this field"
-msgstr "z vnosom v to polje"
-
-msgid "bag it!"
-msgstr ""
-
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr ""
-
-msgid "Upgrading wallabag"
-msgstr ""
-
-#, fuzzy
-msgid "Installed version"
-msgstr "zadnja stabilna različica"
-
-#, fuzzy
-msgid "Latest stable version"
-msgstr "zadnja stabilna različica"
-
-#, fuzzy
-msgid "A more recent stable version is available."
-msgstr "na voljo je nova stabilna različica."
-
-#, fuzzy
-msgid "You are up to date."
-msgstr "imate najnovejšo različico."
-
-#, fuzzy
-msgid "Latest dev version"
-msgstr "zadnja razvojna različica"
-
-#, fuzzy
-msgid "A more recent development version is available."
-msgstr "na voljo je nova razvojna različica."
-
-msgid "Feeds"
-msgstr ""
-
-msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it."
-msgstr ""
-
-msgid "Unread feed"
-msgstr ""
-
-#, fuzzy
-msgid "Favorites feed"
-msgstr "priljubljeni"
-
-#, fuzzy
-msgid "Archive feed"
-msgstr "arhiv"
-
-msgid "Your token:"
-msgstr ""
-
-msgid "Your user id:"
-msgstr ""
-
-msgid "You can regenerate your token: generate!."
-msgstr ""
-
-#, fuzzy
-msgid "Change your theme"
-msgstr "Zamenjava gesla"
-
-msgid "Theme:"
-msgstr ""
-
-msgid "Update"
-msgstr "Posodobi"
-
-#, fuzzy
-msgid "Change your language"
-msgstr "Zamenjava gesla"
-
-msgid "Language:"
-msgstr ""
-
-msgid "Change your password"
-msgstr "Zamenjava gesla"
-
-msgid "New password:"
-msgstr "Novo geslo:"
-
-msgid "Password"
-msgstr "Geslo"
-
-msgid "Repeat your new password:"
-msgstr "Ponovite novo geslo:"
-
-msgid "Import"
-msgstr "Uvozi"
-
-#, fuzzy
-msgid "Please execute the import script locally as it can take a very long time."
-msgstr "Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej časa."
-
-#, fuzzy
-msgid "More info in the official documentation:"
-msgstr "Več informacij v uradni dokumentaciji:"
-
-#, fuzzy
-msgid "Import from Pocket"
-msgstr "Uvoz iz aplikacije Pocket"
-
-#, php-format
-msgid "(you must have a %s file on your server)"
-msgstr ""
-
-#, fuzzy
-msgid "Import from Readability"
-msgstr "Uvoz iz aplikacije Readability"
-
-#, fuzzy
-msgid "Import from Instapaper"
-msgstr "Uvoz iz aplikacije Instapaper"
-
-#, fuzzy
-msgid "Import from wallabag"
-msgstr "Uvoz iz aplikacije Readability"
-
-#, fuzzy
-msgid "Export your wallabag data"
-msgstr "Izvoz vsebine"
-
-msgid "Click here"
-msgstr "Kliknite tukaj"
-
-#, fuzzy
-msgid "to download your database."
-msgstr "za izvoz vsebine aplikacije Poche."
-
-#, fuzzy
-msgid "to export your wallabag data."
-msgstr "za izvoz vsebine aplikacije Poche."
-
-msgid "Cache"
-msgstr ""
-
-msgid "to delete cache."
-msgstr ""
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr ""
-
-msgid "return to article"
-msgstr ""
-
-msgid "plop"
-msgstr "štrbunk"
-
-msgid "You can check your configuration here."
-msgstr ""
-
-msgid "favoris"
-msgstr "priljubljeni"
-
-msgid "archive"
-msgstr "arhiv"
-
-msgid "unread"
-msgstr "neprebrano"
-
-msgid "by date asc"
-msgstr "po datumu - naraščajoče"
-
-msgid "by date"
-msgstr "po datumu"
-
-msgid "by date desc"
-msgstr "po datumu - padajoče"
-
-msgid "by title asc"
-msgstr "po naslovu - naraščajoče"
-
-msgid "by title"
-msgstr "po naslovu"
-
-msgid "by title desc"
-msgstr "po naslovu - padajoče"
-
-msgid "Tag"
-msgstr ""
-
-msgid "No articles found."
-msgstr ""
-
-#, fuzzy
-msgid "Toggle mark as read"
-msgstr "označi kot prebrano"
-
-msgid "toggle favorite"
-msgstr "označi kot priljubljeno"
-
-msgid "delete"
-msgstr "zavrzi"
-
-msgid "original"
-msgstr "izvirnik"
-
-msgid "estimated reading time:"
-msgstr ""
-
-msgid "mark all the entries as read"
-msgstr ""
-
-msgid "results"
-msgstr "rezultati"
-
-msgid "installation"
-msgstr "Namestitev"
-
-#, fuzzy
-msgid "install your wallabag"
-msgstr "Namestitev aplikacije Poche"
-
-#, fuzzy
-msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website."
-msgstr "Poche še vedno ni nameščen. Za namestitev izpolnite spodnji obrazec. Za več informacij preberite dokumentacijo na spletni strani."
-
-msgid "Login"
-msgstr "Prijava"
-
-msgid "Repeat your password"
-msgstr "Ponovite geslo"
-
-msgid "Install"
-msgstr "Namesti"
-
-#, fuzzy
-msgid "login to your wallabag"
-msgstr "prijavite se v svoj Poche"
-
-msgid "Login to wallabag"
-msgstr ""
-
-msgid "you are in demo mode, some features may be disabled."
-msgstr "uporabljate vzorčno različico programa, zato so lahko nekatere funkcije izklopljene."
-
-msgid "Username"
-msgstr ""
-
-msgid "Stay signed in"
-msgstr "Ostani prijavljen"
-
-msgid "(Do not check on public computers)"
-msgstr "(Ne označi na javnih napravah)"
-
-msgid "Sign in"
-msgstr "Prijava"
-
-msgid "favorites"
-msgstr "priljubljeni"
-
-msgid "estimated reading time :"
-msgstr ""
-
-msgid "Mark all the entries as read"
-msgstr ""
-
-msgid "Return home"
-msgstr ""
-
-#, fuzzy
-msgid "Back to top"
-msgstr "nazaj na vrh"
-
-#, fuzzy
-msgid "Mark as read"
-msgstr "označi kot prebrano"
-
-#, fuzzy
-msgid "Favorite"
-msgstr "priljubljeni"
-
-#, fuzzy
-msgid "Toggle favorite"
-msgstr "označi kot priljubljeno"
-
-#, fuzzy
-msgid "Delete"
-msgstr "zavrzi"
-
-#, fuzzy
-msgid "Tweet"
-msgstr "tvitni"
-
-#, fuzzy
-msgid "Email"
-msgstr "pošlji po e-pošti"
-
-msgid "shaarli"
-msgstr "shaarli"
-
-msgid "flattr"
-msgstr "flattr"
-
-#, fuzzy
-msgid "Does this article appear wrong?"
-msgstr "napaka?"
-
-msgid "tags:"
-msgstr ""
-
-msgid "Edit tags"
-msgstr ""
-
-msgid "save link!"
-msgstr ""
-
-msgid "home"
-msgstr "domov"
-
-msgid "tags"
-msgstr ""
-
-msgid "logout"
-msgstr "odjava"
-
-msgid "powered by"
-msgstr "stran poganja"
-
-msgid "debug mode is on so cache is off."
-msgstr "vklopljen je način odpravljanja napak, zato je predpomnilnik izključen."
-
-#, fuzzy
-msgid "your wallabag version:"
-msgstr "vaša različica"
-
-msgid "storage:"
-msgstr "pomnilnik:"
-
-msgid "save a link"
-msgstr ""
-
-msgid "back to home"
-msgstr "Nazaj domov"
-
-msgid "toggle mark as read"
-msgstr "označi kot prebrano"
-
-msgid "tweet"
-msgstr "tvitni"
-
-msgid "email"
-msgstr "pošlji po e-pošti"
-
-msgid "this article appears wrong?"
-msgstr "napaka?"
-
-msgid "No link available here!"
-msgstr "Povezava ni na voljo!"
-
-msgid "Poching a link"
-msgstr "Shrani povezavo"
-
-msgid "by filling this field"
-msgstr "z vnosom v to polje"
-
-msgid "bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr ""
-
-msgid "your version"
-msgstr "vaša različica"
-
-msgid "latest stable version"
-msgstr "zadnja stabilna različica"
-
-msgid "a more recent stable version is available."
-msgstr "na voljo je nova stabilna različica."
-
-msgid "you are up to date."
-msgstr "imate najnovejšo različico."
-
-msgid "latest dev version"
-msgstr "zadnja razvojna različica"
-
-msgid "a more recent development version is available."
-msgstr "na voljo je nova razvojna različica."
-
-msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej časa."
-
-msgid "More infos in the official doc:"
-msgstr "Več informacij v uradni dokumentaciji:"
-
-msgid "import from Pocket"
-msgstr "Uvoz iz aplikacije Pocket"
-
-msgid "import from Readability"
-msgstr "Uvoz iz aplikacije Readability"
-
-msgid "import from Instapaper"
-msgstr "Uvoz iz aplikacije Instapaper"
-
-msgid "Tags"
-msgstr ""
-
-#, fuzzy
-msgid "Untitled"
-msgstr "po naslovu"
-
-msgid "the link has been added successfully"
-msgstr ""
-
-msgid "error during insertion : the link wasn't added"
-msgstr ""
-
-msgid "the link has been deleted successfully"
-msgstr ""
-
-msgid "the link wasn't deleted"
-msgstr ""
-
-msgid "Article not found!"
-msgstr ""
-
-msgid "previous"
-msgstr ""
-
-msgid "next"
-msgstr ""
-
-msgid "in demo mode, you can't update your password"
-msgstr ""
-
-msgid "your password has been updated"
-msgstr ""
-
-msgid "the two fields have to be filled & the password must be the same in the two fields"
-msgstr ""
-
-msgid "still using the \""
-msgstr ""
-
-msgid "that theme does not seem to be installed"
-msgstr ""
-
-msgid "you have changed your theme preferences"
-msgstr ""
-
-msgid "that language does not seem to be installed"
-msgstr ""
-
-msgid "you have changed your language preferences"
-msgstr ""
-
-msgid "login failed: you have to fill all fields"
-msgstr ""
-
-msgid "welcome to your wallabag"
-msgstr ""
-
-msgid "login failed: bad login or password"
-msgstr ""
-
-#, fuzzy
-msgid "import from instapaper completed"
-msgstr "Uvoz iz aplikacije Instapaper"
-
-#, fuzzy
-msgid "import from pocket completed"
-msgstr "Uvoz iz aplikacije Pocket"
-
-#, fuzzy
-msgid "import from Readability completed. "
-msgstr "Uvoz iz aplikacije Readability"
-
-#, fuzzy
-msgid "import from Poche completed. "
-msgstr "Uvoz iz aplikacije Pocket"
-
-msgid "Unknown import provider."
-msgstr ""
-
-msgid "Incomplete inc/poche/define.inc.php file, please define \""
-msgstr ""
-
-msgid "Could not find required \""
-msgstr ""
-
-msgid "Uh, there is a problem while generating feeds."
-msgstr ""
-
-#, fuzzy
-msgid "Cache deleted."
-msgstr "zavrzi"
-
-msgid "Oops, it seems you don't have PHP 5."
-msgstr ""
-
-#~ msgid "poche it!"
-#~ msgstr "shrani!"
-
-#~ msgid "Updating poche"
-#~ msgstr "Posodabljam Poche"
-
-#~ msgid "create an issue"
-#~ msgstr "prijavi napako"
-
-#~ msgid "or"
-#~ msgstr "ali"
-
-#~ msgid "contact us by mail"
-#~ msgstr "pošlji e-pošto razvijalcem"
-
-#~ msgid "your poche version:"
-#~ msgstr "vaša verzija Poche:"
diff --git a/src/Wallabag/Wallabag/Resources/translations/tools/fillCache.php b/src/Wallabag/Wallabag/Resources/translations/tools/fillCache.php
deleted file mode 100755
index bdd9cc581..000000000
--- a/src/Wallabag/Wallabag/Resources/translations/tools/fillCache.php
+++ /dev/null
@@ -1,59 +0,0 @@
-isDir() and $tplDir!='.' and $tplDir!='..') {
- echo "\n$tplDir\n";
-
- $loader = new Twig_Loader_Filesystem($tplDirRoot.$tplDir);
-
- // force auto-reload to always have the latest version of the template
- $twig = new Twig_Environment($loader, array(
- 'cache' => $tmpDir,
- 'auto_reload' => true
- ));
-
- $twig->addExtension(new Twig_Extensions_Extension_I18n());
-
- $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
- $twig->addFilter($filter);
-
- $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
- $twig->addFilter($filter);
-
- $filter = new Twig_SimpleFilter('getPrettyFilename', function($string) { return str_replace($siteRoot, '', $string); });
- $twig->addFilter($filter);
-
-// // iterate over all your templates
- foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($tplDirRoot.$tplDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
- // force compilation
- if ($file->isFile() and pathinfo($file, PATHINFO_EXTENSION)=='twig') {
- echo "\t$file\n";
- $twig->loadTemplate(str_replace($tplDirRoot.$tplDir.'/', '', $file));
- }
- }
-
- }
-
- }
-
diff --git a/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo b/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo
deleted file mode 100755
index 4884abf5c..000000000
Binary files a/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po b/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po
deleted file mode 100755
index 087977056..000000000
--- a/src/Wallabag/Wallabag/Resources/translations/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po
+++ /dev/null
@@ -1,534 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: wballabag\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:06+0300\n"
-"PO-Revision-Date: 2014-02-25 15:08+0300\n"
-"Last-Translator: Maryana \n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
-"X-Poedit-Basepath: .\n"
-"X-Poedit-Language: Ukrainian\n"
-"X-Poedit-Country: UKRAINE\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
-
-msgid "wallabag, a read it later open source system"
-msgstr "wallabag, сервіс відкладеного читання з відкритим кодом"
-
-msgid "login failed: user doesn't exist"
-msgstr "увійти не вдалося: користувач не існує"
-
-msgid "return home"
-msgstr "повернутися на головну"
-
-msgid "config"
-msgstr "налаштування"
-
-msgid "Saving articles"
-msgstr "Зберігання посилань"
-
-msgid "There are several ways to save an article:"
-msgstr "Є кілька способів зберегти статтю:"
-
-msgid "read the documentation"
-msgstr "читати документацію"
-
-msgid "download the extension"
-msgstr "завантажити розширення"
-
-msgid "via F-Droid"
-msgstr "через F-Droid"
-
-msgid " or "
-msgstr "або"
-
-msgid "via Google Play"
-msgstr "через Google Play"
-
-msgid "download the application"
-msgstr "завантажити додаток"
-
-msgid "By filling this field"
-msgstr "Заповнивши це поле"
-
-msgid "bag it!"
-msgstr "зберегти!"
-
-msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "З допомогою закладки: перетягніть і відпустіть посилання на панель закладок"
-
-msgid "Upgrading wallabag"
-msgstr "Оновлення wallabag"
-
-msgid "Installed version"
-msgstr "Встановлено версію"
-
-msgid "Latest stable version"
-msgstr "Остання стабільна версія"
-
-msgid "A more recent stable version is available."
-msgstr "Є новіша стабільна версія."
-
-msgid "You are up to date."
-msgstr "У вас остання версія."
-
-msgid "Latest dev version"
-msgstr "Остання версія в розробці"
-
-msgid "A more recent development version is available."
-msgstr "Доступна новіша версія в розробці."
-
-msgid "Feeds"
-msgstr "Завантаження (feeds)"
-
-msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it."
-msgstr "Ваш маркер завантажень (feed token) не визначено, ви повинні спочатку згенерувати його для того, щоб активувати завантаження. Натисніть тут для його генерації A>."
-
-msgid "Unread feed"
-msgstr "Завантаження непрочитаного"
-
-msgid "Favorites feed"
-msgstr "Завантаження вибраного"
-
-msgid "Archive feed"
-msgstr "Завантаження архіву"
-
-msgid "Your token:"
-msgstr "Ваш маркер (token): "
-
-msgid "Your user id:"
-msgstr "Ваш ідентифікатор користувача (user id):"
-
-msgid "You can regenerate your token: generate!."
-msgstr "Ви можете перестворити ваш маркер: натисніть згенерувати!."
-
-msgid "Change your theme"
-msgstr "Змінити тему"
-
-msgid "Theme:"
-msgstr "Тема:"
-
-msgid "Update"
-msgstr "Оновити"
-
-msgid "Change your language"
-msgstr "Змінити мову"
-
-msgid "Language:"
-msgstr "Мова:"
-
-msgid "Change your password"
-msgstr "Зміна паролю"
-
-msgid "New password:"
-msgstr "Новий пароль:"
-
-msgid "Password"
-msgstr "Пароль"
-
-msgid "Repeat your new password:"
-msgstr "Новий пароль ще раз:"
-
-msgid "Import"
-msgstr "Імпортування"
-
-msgid "Please execute the import script locally as it can take a very long time."
-msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго."
-
-msgid "More info in the official documentation:"
-msgstr "Більше інформації в офіційній документації:"
-
-msgid "Import from Pocket"
-msgstr "Імпорт з Pocket-а"
-
-#, php-format
-msgid "(you must have a %s file on your server)"
-msgstr "(файл %s повинен бути присутнім на вашому сервері)"
-
-msgid "Import from Readability"
-msgstr "Імпорт з Readability"
-
-msgid "Import from Instapaper"
-msgstr "Імпорт з Instapaper"
-
-msgid "Import from wallabag"
-msgstr "Імпорт з wallabag"
-
-msgid "Export your wallabag data"
-msgstr "Експортувати ваші дані з wallabag"
-
-msgid "Click here"
-msgstr "Клікніть тут"
-
-msgid "to download your database."
-msgstr "щоб завантажити вашу базу даних."
-
-msgid "to export your wallabag data."
-msgstr "щоб експортувати ваші дані wallabag."
-
-msgid "Cache"
-msgstr "Кеш"
-
-msgid "to delete cache."
-msgstr "щоб очистити кеш."
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr "Ви можете ввести декілька тегів, розділених комами."
-
-msgid "return to article"
-msgstr "повернутися до статті"
-
-msgid "plop"
-msgstr "plop"
-
-msgid "You can check your configuration here."
-msgstr "Ви можете перевірити вашу конфігурацію тут."
-
-msgid "favoris"
-msgstr "вибране"
-
-msgid "archive"
-msgstr "архів"
-
-msgid "unread"
-msgstr "непрочитане"
-
-msgid "by date asc"
-msgstr "за датою по зростанню"
-
-msgid "by date"
-msgstr "за датою"
-
-msgid "by date desc"
-msgstr "за датою по спаданню"
-
-msgid "by title asc"
-msgstr "за назвою по зростанню"
-
-msgid "by title"
-msgstr "за назвою"
-
-msgid "by title desc"
-msgstr "за назвою по спаданню"
-
-msgid "Tag"
-msgstr "Тег"
-
-msgid "No articles found."
-msgstr "Статей не знайдено."
-
-msgid "Toggle mark as read"
-msgstr "змінити мітку прочитаного"
-
-msgid "toggle favorite"
-msgstr "змінити мітку вибраного"
-
-msgid "delete"
-msgstr "видалити"
-
-msgid "original"
-msgstr "оригінал"
-
-msgid "estimated reading time:"
-msgstr "приблизний час читання:"
-
-msgid "mark all the entries as read"
-msgstr "відмітити всі статті як прочитані"
-
-msgid "results"
-msgstr "результат(ів)"
-
-msgid "installation"
-msgstr "інсталяція"
-
-msgid "install your wallabag"
-msgstr "встановити wallabag"
-
-msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website."
-msgstr "wallabag ще не встановлено. Будь ласка, заповніть форму нижче, щоб його встановити. Ви можете звертутися до документації на сайті wallabag A>."
-
-msgid "Login"
-msgstr "Логін"
-
-msgid "Repeat your password"
-msgstr "Пароль ще раз"
-
-msgid "Install"
-msgstr "Встановити"
-
-msgid "login to your wallabag"
-msgstr "увійти до wallabag"
-
-msgid "Login to wallabag"
-msgstr "Увійти до wallabag"
-
-msgid "you are in demo mode, some features may be disabled."
-msgstr "ви в демонстраційному режимі, деякі функції можуть бути відключені."
-
-msgid "Username"
-msgstr "Ім’я користувача"
-
-msgid "Stay signed in"
-msgstr "Запам'ятати мене"
-
-msgid "(Do not check on public computers)"
-msgstr "(Не відмічайте на загальнодоступних комп'ютерах)"
-
-msgid "Sign in"
-msgstr "Увійти"
-
-msgid "favorites"
-msgstr "вибране"
-
-msgid "estimated reading time :"
-msgstr "приблизний час читання:"
-
-msgid "Mark all the entries as read"
-msgstr "Відмітити все як прочитане"
-
-msgid "Return home"
-msgstr "Повернутися на головну"
-
-msgid "Back to top"
-msgstr "Догори"
-
-msgid "Mark as read"
-msgstr "Відмітити як прочитано/не прочитано"
-
-msgid "Favorite"
-msgstr "Вибране"
-
-msgid "Toggle favorite"
-msgstr "Відмітити як вибране/не вибране"
-
-msgid "Delete"
-msgstr "Видалити"
-
-msgid "Tweet"
-msgstr "Твітнути"
-
-msgid "Email"
-msgstr "Надіслати по e-mail"
-
-msgid "shaarli"
-msgstr "shaarli"
-
-msgid "flattr"
-msgstr "flattr"
-
-msgid "Does this article appear wrong?"
-msgstr "Ця стаття виглядає не так, як треба?"
-
-msgid "tags:"
-msgstr "теги:"
-
-msgid "Edit tags"
-msgstr "Редагувати теги"
-
-msgid "save link!"
-msgstr "зберегти лінк!"
-
-msgid "home"
-msgstr "головна"
-
-msgid "tags"
-msgstr "теги"
-
-msgid "logout"
-msgstr "вихід"
-
-msgid "powered by"
-msgstr "за підтримки"
-
-msgid "debug mode is on so cache is off."
-msgstr "режим відладки включено, отже кеш виключено."
-
-msgid "your wallabag version:"
-msgstr "версія вашого wallabag:"
-
-msgid "storage:"
-msgstr "сховище:"
-
-msgid "save a link"
-msgstr "зберегти лінк"
-
-msgid "back to home"
-msgstr "назад на головну"
-
-msgid "toggle mark as read"
-msgstr "змінити мітку на прочитано"
-
-msgid "tweet"
-msgstr "твітнути"
-
-msgid "email"
-msgstr "email"
-
-msgid "this article appears wrong?"
-msgstr "ця стаття виглядає не так, як треба?"
-
-msgid "No link available here!"
-msgstr "Немає доступних посилань!"
-
-msgid "Poching a link"
-msgstr "Зберігання посилання"
-
-msgid "by filling this field"
-msgstr "заповнивши це поле"
-
-msgid "bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr "з допомогою закладки: перетягніть і відпустіть посилання на панель закладок"
-
-msgid "your version"
-msgstr "ваша версія:"
-
-msgid "latest stable version"
-msgstr "остання стабільна версія"
-
-msgid "a more recent stable version is available."
-msgstr "є новіша стабільна версія."
-
-msgid "you are up to date."
-msgstr "у вас остання версія."
-
-msgid "latest dev version"
-msgstr "остання версія в розробці"
-
-msgid "a more recent development version is available."
-msgstr "доступна новіша версія в розробці."
-
-msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго."
-
-msgid "More infos in the official doc:"
-msgstr "Більше інформації в офіційній документації:"
-
-msgid "import from Pocket"
-msgstr "імпорт з Pocket-а"
-
-msgid "import from Readability"
-msgstr "імпорт з Readability"
-
-msgid "import from Instapaper"
-msgstr "імпорт з Instapaper"
-
-msgid "Tags"
-msgstr "Теги"
-
-msgid "Untitled"
-msgstr "Без назви"
-
-msgid "the link has been added successfully"
-msgstr "посилання успішно додано"
-
-msgid "error during insertion : the link wasn't added"
-msgstr "помилка при вставці: посилання не додано"
-
-msgid "the link has been deleted successfully"
-msgstr "посилання успішно видалено"
-
-msgid "the link wasn't deleted"
-msgstr "посилання не було видалено"
-
-msgid "Article not found!"
-msgstr "Статтю не знайдено!"
-
-msgid "previous"
-msgstr "попередня"
-
-msgid "next"
-msgstr "наступна"
-
-msgid "in demo mode, you can't update your password"
-msgstr "в демонстраційному режимі ви не можете змінювати свій пароль"
-
-msgid "your password has been updated"
-msgstr "ваш пароль змінено"
-
-msgid "the two fields have to be filled & the password must be the same in the two fields"
-msgstr "обидва поля повинні бути заповнені і пароль повинен співпадати в обох"
-
-msgid "still using the \""
-msgstr "досі використовується \""
-
-msgid "that theme does not seem to be installed"
-msgstr "виглядає, що цю тему не було встановлено"
-
-msgid "you have changed your theme preferences"
-msgstr "ви змінили налаштування своєї теми"
-
-msgid "that language does not seem to be installed"
-msgstr "виглядає, що цю мову не було встановлено"
-
-msgid "you have changed your language preferences"
-msgstr "ви змінили свої налаштування мови"
-
-msgid "login failed: you have to fill all fields"
-msgstr "увійти не вдалося: ви повинні заповнити всі поля"
-
-msgid "welcome to your wallabag"
-msgstr "ласкаво просимо до вашого wallabag"
-
-msgid "login failed: bad login or password"
-msgstr "увійти не вдалося: не вірний логін або пароль"
-
-msgid "import from instapaper completed"
-msgstr "імпорт з instapaper-а завершено"
-
-msgid "import from pocket completed"
-msgstr "імпорт з pocket-а завершено"
-
-msgid "import from Readability completed. "
-msgstr "імпорт з Readability завершено"
-
-msgid "import from Poche completed. "
-msgstr "імпорт з Poche завершено."
-
-msgid "Unknown import provider."
-msgstr "Невідомий провайдер імпорту."
-
-msgid "Incomplete inc/poche/define.inc.php file, please define \""
-msgstr "Неповний файл inc/poche/define.inc.php, будь ласка, визначте \""
-
-msgid "Could not find required \""
-msgstr "Не вдалося знайти потрібний \""
-
-msgid "Uh, there is a problem while generating feeds."
-msgstr "Ох, є проблема при створенні завантажень (feeds)."
-
-msgid "Cache deleted."
-msgstr "Кеш очищено."
-
-msgid "Oops, it seems you don't have PHP 5."
-msgstr "Упс, здається, у вас немає PHP 5."
-
-#~ msgid "You can poche a link by several methods:"
-#~ msgstr "Ви можете зберегти посилання кількома способами:"
-
-#~ msgid "poche it!"
-#~ msgstr "зберегти!"
-
-#~ msgid "Updating poche"
-#~ msgstr "Оновлення poche"
-
-#, fuzzy
-#~ msgid "Export your poche datas"
-#~ msgstr "Експортувати ваші дані з poche"
-
-#, fuzzy
-#~ msgid "to export your poche datas."
-#~ msgstr "щоб експортувати ваші дані poche."
-
-#~ msgid "Import from poche"
-#~ msgstr "Імпорт з poche"
-
-#~ msgid "welcome to your poche"
-#~ msgstr "ласкаво просимо до вашого poche"
-
-#~ msgid "see you soon!"
-#~ msgstr "бувайте, ще побачимось!"
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css b/src/Wallabag/Wallabag/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css
deleted file mode 100644
index 5690172f6..000000000
--- a/src/Wallabag/Wallabag/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.css
+++ /dev/null
@@ -1,560 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-03-09
-* http://jqueryui.com
-* Includes: jquery.ui.core.css, jquery.ui.autocomplete.css, jquery.ui.menu.css, jquery.ui.theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
- display: none;
-}
-.ui-helper-hidden-accessible {
- border: 0;
- clip: rect(0 0 0 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
-}
-.ui-helper-reset {
- margin: 0;
- padding: 0;
- border: 0;
- outline: 0;
- line-height: 1.3;
- text-decoration: none;
- font-size: 100%;
- list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
- content: "";
- display: table;
- border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
- clear: both;
-}
-.ui-helper-clearfix {
- min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- position: absolute;
- opacity: 0;
- filter:Alpha(Opacity=0);
-}
-
-.ui-front {
- z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
- cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
- display: block;
- text-indent: -99999px;
- overflow: hidden;
- background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
-}
-.ui-autocomplete {
- position: absolute;
- top: 0;
- left: 0;
- cursor: default;
-}
-.ui-menu {
- list-style: none;
- padding: 2px;
- margin: 0;
- display: block;
- outline: none;
-}
-.ui-menu .ui-menu {
- margin-top: -3px;
- position: absolute;
-}
-.ui-menu .ui-menu-item {
- margin: 0;
- padding: 0;
- width: 100%;
- /* support: IE10, see #8844 */
- list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-}
-.ui-menu .ui-menu-divider {
- margin: 5px -2px 5px -2px;
- height: 0;
- font-size: 0;
- line-height: 0;
- border-width: 1px 0 0 0;
-}
-.ui-menu .ui-menu-item a {
- text-decoration: none;
- display: block;
- padding: 2px .4em;
- line-height: 1.5;
- min-height: 0; /* support: IE7 */
- font-weight: normal;
-}
-.ui-menu .ui-menu-item a.ui-state-focus,
-.ui-menu .ui-menu-item a.ui-state-active {
- font-weight: normal;
- margin: -1px;
-}
-
-.ui-menu .ui-state-disabled {
- font-weight: normal;
- margin: .4em 0 .2em;
- line-height: 1.5;
-}
-.ui-menu .ui-state-disabled a {
- cursor: default;
-}
-
-/* icon support */
-.ui-menu-icons {
- position: relative;
-}
-.ui-menu-icons .ui-menu-item a {
- position: relative;
- padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
- position: absolute;
- top: .2em;
- left: .2em;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
- position: static;
- float: right;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
- font-family: Verdana,Arial,sans-serif;
- font-size: 1.1em;
-}
-.ui-widget .ui-widget {
- font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
- font-family: Verdana,Arial,sans-serif;
- font-size: 1em;
-}
-.ui-widget-content {
- border: 1px solid #aaaaaa;
- background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
- color: #222222;
-}
-.ui-widget-content a {
- color: #222222;
-}
-.ui-widget-header {
- border: 1px solid #aaaaaa;
- background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
- color: #222222;
- font-weight: bold;
-}
-.ui-widget-header a {
- color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
- border: 1px solid #d3d3d3;
- background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #555555;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited {
- color: #555555;
- text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
- border: 1px solid #999999;
- background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #212121;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited {
- color: #212121;
- text-decoration: none;
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
- border: 1px solid #aaaaaa;
- background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: #212121;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
- color: #212121;
- text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
- border: 1px solid #fcefa1;
- background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
- color: #363636;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
- color: #363636;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
- border: 1px solid #cd0a0a;
- background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
- color: #cd0a0a;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
- color: #cd0a0a;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
- color: #cd0a0a;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
- font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
- opacity: .7;
- filter:Alpha(Opacity=70);
- font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
- opacity: .35;
- filter:Alpha(Opacity=35);
- background-image: none;
-}
-.ui-state-disabled .ui-icon {
- filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
- width: 16px;
- height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
- background-image: url(images/ui-icons_222222_256x240.png);
-}
-.ui-widget-header .ui-icon {
- background-image: url(images/ui-icons_222222_256x240.png);
-}
-.ui-state-default .ui-icon {
- background-image: url(images/ui-icons_888888_256x240.png);
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
- background-image: url(images/ui-icons_454545_256x240.png);
-}
-.ui-state-active .ui-icon {
- background-image: url(images/ui-icons_454545_256x240.png);
-}
-.ui-state-highlight .ui-icon {
- background-image: url(images/ui-icons_2e83ff_256x240.png);
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
- background-image: url(images/ui-icons_cd0a0a_256x240.png);
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
- border-top-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
- border-top-right-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
- border-bottom-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
- border-bottom-right-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
- background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
- opacity: .3;
- filter: Alpha(Opacity=30);
-}
-.ui-widget-shadow {
- margin: -8px 0 0 -8px;
- padding: 8px;
- background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
- opacity: .3;
- filter: Alpha(Opacity=30);
- border-radius: 8px;
-}
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css b/src/Wallabag/Wallabag/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css
deleted file mode 100644
index 4dba92a8a..000000000
--- a/src/Wallabag/Wallabag/Resources/views/_global/public/css/jquery-ui-1.10.4.custom.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-03-09
-* http://jqueryui.com
-* Includes: jquery.ui.core.css, jquery.ui.autocomplete.css, jquery.ui.menu.css, jquery.ui.theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:none}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%;list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:normal}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:normal;margin:-1px}.ui-menu .ui-state-disabled{font-weight:normal;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url(images/ui-icons_222222_256x240.png)}.ui-widget-header .ui-icon{background-image:url(images/ui-icons_222222_256x240.png)}.ui-state-default .ui-icon{background-image:url(images/ui-icons_888888_256x240.png)}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url(images/ui-icons_454545_256x240.png)}.ui-state-active .ui-icon{background-image:url(images/ui-icons_454545_256x240.png)}.ui-state-highlight .ui-icon{background-image:url(images/ui-icons_2e83ff_256x240.png)}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url(images/ui-icons_cd0a0a_256x240.png)}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png
deleted file mode 100755
index 0e96edd5c..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-114.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png
deleted file mode 100755
index dc5aab1c4..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-120.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png
deleted file mode 100755
index 1d005db6f..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-144.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png
deleted file mode 100755
index f915231fa..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-152.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png
deleted file mode 100755
index 5aa19ed96..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-57.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png
deleted file mode 100755
index b8b48e1bc..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-72.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png
deleted file mode 100755
index 9f9dba27e..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon-76.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon.png
deleted file mode 100755
index 9cf29e2b4..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/apple-touch-icon.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/favicon.ico b/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/favicon.ico
deleted file mode 100755
index 0346558ba..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/appicon/favicon.ico and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/carrot-icon--black.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/carrot-icon--black.png
deleted file mode 100644
index 6da7925b5..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/carrot-icon--black.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/carrot-icon--white.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/carrot-icon--white.png
deleted file mode 100644
index a70044b6f..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/carrot-icon--white.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/diaspora-icon--black.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/diaspora-icon--black.png
deleted file mode 100644
index 32bca1947..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/diaspora-icon--black.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/diaspora-icon--white.png b/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/diaspora-icon--white.png
deleted file mode 100644
index fc48d47c4..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/_global/public/img/icons/diaspora-icon--white.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/js/autoClose.js b/src/Wallabag/Wallabag/Resources/views/_global/public/js/autoClose.js
deleted file mode 100644
index e9145b7e2..000000000
--- a/src/Wallabag/Wallabag/Resources/views/_global/public/js/autoClose.js
+++ /dev/null
@@ -1,6 +0,0 @@
-$(document).ready(function() {
- current_url = window.location.href
- if (current_url.match("&closewin=true")) {
- window.close();
- }
-});
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/js/autoCompleteTags.js b/src/Wallabag/Wallabag/Resources/views/_global/public/js/autoCompleteTags.js
deleted file mode 100755
index 90bc982c2..000000000
--- a/src/Wallabag/Wallabag/Resources/views/_global/public/js/autoCompleteTags.js
+++ /dev/null
@@ -1,47 +0,0 @@
-jQuery(function($) {
-
- function split( val ) {
- return val.split( /,\s*/ );
- }
- function extractLast( term ) {
- return split( term ).pop();
- }
-
-
- $("#value").bind("keydown", function(event) {
- if (event.keyCode === $.ui.keyCode.TAB && $(this).data("ui-autocomplete").menu.active) {
- event.preventDefault();
- }
- }).autocomplete({
- source : function(request, response) {
- $.getJSON("./?view=tags", {
- term : extractLast(request.term),
- //id: $(':hidden#entry_id').val()
- }, response);
- },
- search : function() {
- // custom minLength
- var term = extractLast(this.value);
- if (term.length < 1) {
- return false;
- }
- },
- focus : function() {
- // prevent value inserted on focus
- return false;
- },
- select : function(event, ui) {
- var terms = split(this.value);
- // remove the current input
- terms.pop();
- // add the selected item
- terms.push(ui.item.value);
- // add placeholder to get the comma-and-space at the end
- terms.push("");
- this.value = terms.join(", ");
- return false;
- }
- });
-
-
-});
diff --git a/src/Wallabag/Wallabag/Resources/views/_global/public/js/jquery-2.0.3.min.js b/src/Wallabag/Wallabag/Resources/views/_global/public/js/jquery-2.0.3.min.js
deleted file mode 100644
index a4dd0a2f5..000000000
--- a/src/Wallabag/Wallabag/Resources/views/_global/public/js/jquery-2.0.3.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(e,undefined){var t,n,r=typeof undefined,i=e.location,o=e.document,s=o.documentElement,a=e.jQuery,u=e.$,l={},c=[],p="2.0.3",f=c.concat,h=c.push,d=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,x=function(e,n){return new x.fn.init(e,n,t)},b=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^-ms-/,N=/-([\da-z])/gi,E=function(e,t){return t.toUpperCase()},S=function(){o.removeEventListener("DOMContentLoaded",S,!1),e.removeEventListener("load",S,!1),x.ready()};x.fn=x.prototype={jquery:p,constructor:x,init:function(e,t,n){var r,i;if(!e)return this;if("string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:T.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof x?t[0]:t,x.merge(this,x.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:o,!0)),C.test(r[1])&&x.isPlainObject(t))for(r in t)x.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return i=o.getElementById(r[2]),i&&i.parentNode&&(this.length=1,this[0]=i),this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?n.ready(e):(e.selector!==undefined&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return d.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,t,n,r,i,o,s=arguments[0]||{},a=1,u=arguments.length,l=!1;for("boolean"==typeof s&&(l=s,s=arguments[1]||{},a=2),"object"==typeof s||x.isFunction(s)||(s={}),u===a&&(s=this,--a);u>a;a++)if(null!=(e=arguments[a]))for(t in e)n=s[t],r=e[t],s!==r&&(l&&r&&(x.isPlainObject(r)||(i=x.isArray(r)))?(i?(i=!1,o=n&&x.isArray(n)?n:[]):o=n&&x.isPlainObject(n)?n:{},s[t]=x.extend(l,o,r)):r!==undefined&&(s[t]=r));return s},x.extend({expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=a),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){(e===!0?--x.readyWait:x.isReady)||(x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(o,[x]),x.fn.trigger&&x(o).trigger("ready").off("ready")))},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray,isWindow:function(e){return null!=e&&e===e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if("object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(t){return!1}return!0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:JSON.parse,parseXML:function(e){var t,n;if(!e||"string"!=typeof e)return null;try{n=new DOMParser,t=n.parseFromString(e,"text/xml")}catch(r){t=undefined}return(!t||t.getElementsByTagName("parsererror").length)&&x.error("Invalid XML: "+e),t},noop:function(){},globalEval:function(e){var t,n=eval;e=x.trim(e),e&&(1===e.indexOf("use strict")?(t=o.createElement("script"),t.text=e,o.head.appendChild(t).parentNode.removeChild(t)):n(e))},camelCase:function(e){return e.replace(k,"ms-").replace(N,E)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,s=j(e);if(n){if(s){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(s){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:function(e){return null==e?"":v.call(e)},makeArray:function(e,t){var n=t||[];return null!=e&&(j(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:g.call(t,e,n)},merge:function(e,t){var n=t.length,r=e.length,i=0;if("number"==typeof n)for(;n>i;i++)e[r++]=t[i];else while(t[i]!==undefined)e[r++]=t[i++];return e.length=r,e},grep:function(e,t,n){var r,i=[],o=0,s=e.length;for(n=!!n;s>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,s=j(e),a=[];if(s)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(a[a.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(a[a.length]=r);return f.apply([],a)},guid:1,proxy:function(e,t){var n,r,i;return"string"==typeof t&&(n=e[t],t=e,e=n),x.isFunction(e)?(r=d.call(arguments,2),i=function(){return e.apply(t||this,r.concat(d.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):undefined},access:function(e,t,n,r,i,o,s){var a=0,u=e.length,l=null==n;if("object"===x.type(n)){i=!0;for(a in n)x.access(e,t,a,n[a],!0,o,s)}else if(r!==undefined&&(i=!0,x.isFunction(r)||(s=!0),l&&(s?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(x(e),n)})),t))for(;u>a;a++)t(e[a],n,s?r:r.call(e[a],a,t(e[a],n)));return i?e:l?t.call(e):u?t(e[0],n):o},now:Date.now,swap:function(e,t,n,r){var i,o,s={};for(o in t)s[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=s[o];return i}}),x.ready.promise=function(t){return n||(n=x.Deferred(),"complete"===o.readyState?setTimeout(x.ready):(o.addEventListener("DOMContentLoaded",S,!1),e.addEventListener("load",S,!1))),n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function j(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}t=x(o),function(e,undefined){var t,n,r,i,o,s,a,u,l,c,p,f,h,d,g,m,y,v="sizzle"+-new Date,b=e.document,w=0,T=0,C=st(),k=st(),N=st(),E=!1,S=function(e,t){return e===t?(E=!0,0):0},j=typeof undefined,D=1<<31,A={}.hasOwnProperty,L=[],q=L.pop,H=L.push,O=L.push,F=L.slice,P=L.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",W="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",$=W.replace("w","w#"),B="\\["+M+"*("+W+")"+M+"*(?:([*^$|!~]?=)"+M+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+$+")|)|)"+M+"*\\]",I=":("+W+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+B.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=RegExp("^"+M+"*,"+M+"*"),X=RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=RegExp(M+"*[+~]"),Y=RegExp("="+M+"*([^\\]'\"]*)"+M+"*\\]","g"),V=RegExp(I),G=RegExp("^"+$+"$"),J={ID:RegExp("^#("+W+")"),CLASS:RegExp("^\\.("+W+")"),TAG:RegExp("^("+W.replace("w","w*")+")"),ATTR:RegExp("^"+B),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:RegExp("^(?:"+R+")$","i"),needsContext:RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Q=/^[^{]+\{\s*\[native \w/,K=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Z=/^(?:input|select|textarea|button)$/i,et=/^h\d$/i,tt=/'|\\/g,nt=RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),rt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{O.apply(L=F.call(b.childNodes),b.childNodes),L[b.childNodes.length].nodeType}catch(it){O={apply:L.length?function(e,t){H.apply(e,F.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function ot(e,t,r,i){var o,s,a,u,l,f,g,m,x,w;if((t?t.ownerDocument||t:b)!==p&&c(t),t=t||p,r=r||[],!e||"string"!=typeof e)return r;if(1!==(u=t.nodeType)&&9!==u)return[];if(h&&!i){if(o=K.exec(e))if(a=o[1]){if(9===u){if(s=t.getElementById(a),!s||!s.parentNode)return r;if(s.id===a)return r.push(s),r}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(a))&&y(t,s)&&s.id===a)return r.push(s),r}else{if(o[2])return O.apply(r,t.getElementsByTagName(e)),r;if((a=o[3])&&n.getElementsByClassName&&t.getElementsByClassName)return O.apply(r,t.getElementsByClassName(a)),r}if(n.qsa&&(!d||!d.test(e))){if(m=g=v,x=t,w=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){f=gt(e),(g=t.getAttribute("id"))?m=g.replace(tt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",l=f.length;while(l--)f[l]=m+mt(f[l]);x=U.test(e)&&t.parentNode||t,w=f.join(",")}if(w)try{return O.apply(r,x.querySelectorAll(w)),r}catch(T){}finally{g||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,r,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>i.cacheLength&&delete t[e.shift()],t[n]=r}return t}function at(e){return e[v]=!0,e}function ut(e){var t=p.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--)i.attrHandle[n[r]]=t}function ct(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return at(function(t){return t=+t,at(function(n,r){var i,o=e([],n.length,t),s=o.length;while(s--)n[i=o[s]]&&(n[i]=!(r[i]=n[i]))})})}s=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},n=ot.support={},c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:b,r=t.defaultView;return t!==p&&9===t.nodeType&&t.documentElement?(p=t,f=t.documentElement,h=!s(t),r&&r.attachEvent&&r!==r.top&&r.attachEvent("onbeforeunload",function(){c()}),n.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ut(function(e){return e.appendChild(t.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=ut(function(e){return e.innerHTML="",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),n.getById=ut(function(e){return f.appendChild(e).id=v,!t.getElementsByName||!t.getElementsByName(v).length}),n.getById?(i.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){return e.getAttribute("id")===t}}):(delete i.find.ID,i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=n.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==j?t.getElementsByTagName(e):undefined}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.CLASS=n.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==j&&h?t.getElementsByClassName(e):undefined},g=[],d=[],(n.qsa=Q.test(t.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll(":checked").length||d.push(":checked")}),ut(function(e){var n=t.createElement("input");n.setAttribute("type","hidden"),e.appendChild(n).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&d.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||d.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),d.push(",.*:")})),(n.matchesSelector=Q.test(m=f.webkitMatchesSelector||f.mozMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&ut(function(e){n.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",I)}),d=d.length&&RegExp(d.join("|")),g=g.length&&RegExp(g.join("|")),y=Q.test(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},S=f.compareDocumentPosition?function(e,r){if(e===r)return E=!0,0;var i=r.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(r);return i?1&i||!n.sortDetached&&r.compareDocumentPosition(e)===i?e===t||y(b,e)?-1:r===t||y(b,r)?1:l?P.call(l,e)-P.call(l,r):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,o=e.parentNode,s=n.parentNode,a=[e],u=[n];if(e===n)return E=!0,0;if(!o||!s)return e===t?-1:n===t?1:o?-1:s?1:l?P.call(l,e)-P.call(l,n):0;if(o===s)return ct(e,n);r=e;while(r=r.parentNode)a.unshift(r);r=n;while(r=r.parentNode)u.unshift(r);while(a[i]===u[i])i++;return i?ct(a[i],u[i]):a[i]===b?-1:u[i]===b?1:0},t):p},ot.matches=function(e,t){return ot(e,null,null,t)},ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Y,"='$1']"),!(!n.matchesSelector||!h||g&&g.test(t)||d&&d.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return ot(t,p,null,[e]).length>0},ot.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},ot.attr=function(e,t){(e.ownerDocument||e)!==p&&c(e);var r=i.attrHandle[t.toLowerCase()],o=r&&A.call(i.attrHandle,t.toLowerCase())?r(e,t,!h):undefined;return o===undefined?n.attributes||!h?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null:o},ot.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},ot.uniqueSort=function(e){var t,r=[],i=0,o=0;if(E=!n.detectDuplicates,l=!n.sortStable&&e.slice(0),e.sort(S),E){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return e},o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=ot.selectors={cacheLength:50,createPseudo:at,match:J,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(nt,rt),e[3]=(e[4]||e[5]||"").replace(nt,rt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||ot.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&ot.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return J.CHILD.test(e[0])?null:(e[3]&&e[4]!==undefined?e[2]=e[4]:n&&V.test(n)&&(t=gt(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(nt,rt).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=C[e+" "];return t||(t=RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&C(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),s="last"!==e.slice(-4),a="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,h,d,g=o!==s?"nextSibling":"previousSibling",m=t.parentNode,y=a&&t.nodeName.toLowerCase(),x=!u&&!a;if(m){if(o){while(g){p=t;while(p=p[g])if(a?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;d=g="only"===e&&!d&&"nextSibling"}return!0}if(d=[s?m.firstChild:m.lastChild],s&&x){c=m[v]||(m[v]={}),l=c[e]||[],h=l[0]===w&&l[1],f=l[0]===w&&l[2],p=h&&m.childNodes[h];while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[w,h,f];break}}else if(x&&(l=(t[v]||(t[v]={}))[e])&&l[0]===w)f=l[1];else while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if((a?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(x&&((p[v]||(p[v]={}))[e]=[w,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);return r[v]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,o=r(e,t),s=o.length;while(s--)i=P.call(e,o[s]),e[i]=!(n[i]=o[s])}):function(e){return r(e,0,n)}):r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(z,"$1"));return r[v]?at(function(e,t,n,i){var o,s=r(e,null,i,[]),a=e.length;while(a--)(o=s[a])&&(e[a]=!(t[a]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){return G.test(e||"")||ot.error("unsupported lang: "+e),e=e.replace(nt,rt).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return et.test(e.nodeName)},input:function(e){return Z.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},i.pseudos.nth=i.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[t]=pt(t);for(t in{submit:!0,reset:!0})i.pseudos[t]=ft(t);function dt(){}dt.prototype=i.filters=i.pseudos,i.setFilters=new dt;function gt(e,t){var n,r,o,s,a,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);a=e,u=[],l=i.preFilter;while(a){(!n||(r=_.exec(a)))&&(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=X.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(z," ")}),a=a.slice(n.length));for(s in i.filter)!(r=J[s].exec(a))||l[s]&&!(r=l[s](r))||(n=r.shift(),o.push({value:n,type:s,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?ot.error(e):k(e,u).slice(0)}function mt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function yt(e,t,n){var i=t.dir,o=n&&"parentNode"===i,s=T++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,a){var u,l,c,p=w+" "+s;if(a){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,a))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[v]||(t[v]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,a)||r,l[1]===!0)return!0}}function vt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,s=[],a=0,u=e.length,l=null!=t;for(;u>a;a++)(o=e[a])&&(!n||n(o,r,i))&&(s.push(o),l&&t.push(a));return s}function bt(e,t,n,r,i,o){return r&&!r[v]&&(r=bt(r)),i&&!i[v]&&(i=bt(i,o)),at(function(o,s,a,u){var l,c,p,f=[],h=[],d=s.length,g=o||Ct(t||"*",a.nodeType?[a]:a,[]),m=!e||!o&&t?g:xt(g,f,e,a,u),y=n?i||(o?e:d||r)?[]:s:m;if(n&&n(m,y,a,u),r){l=xt(y,h),r(l,[],a,u),c=l.length;while(c--)(p=l[c])&&(y[h[c]]=!(m[h[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?P.call(o,p):f[c])>-1&&(o[l]=!(s[l]=p))}}else y=xt(y===s?y.splice(d,y.length):y),i?i(null,s,y,u):O.apply(s,y)})}function wt(e){var t,n,r,o=e.length,s=i.relative[e[0].type],a=s||i.relative[" "],l=s?1:0,c=yt(function(e){return e===t},a,!0),p=yt(function(e){return P.call(t,e)>-1},a,!0),f=[function(e,n,r){return!s&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>l;l++)if(n=i.relative[e[l].type])f=[yt(vt(f),n)];else{if(n=i.filter[e[l].type].apply(null,e[l].matches),n[v]){for(r=++l;o>r;r++)if(i.relative[e[r].type])break;return bt(l>1&&vt(f),l>1&&mt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&wt(e.slice(l,r)),o>r&&wt(e=e.slice(r)),o>r&&mt(e))}f.push(n)}return vt(f)}function Tt(e,t){var n=0,o=t.length>0,s=e.length>0,a=function(a,l,c,f,h){var d,g,m,y=[],v=0,x="0",b=a&&[],T=null!=h,C=u,k=a||s&&i.find.TAG("*",h&&l.parentNode||l),N=w+=null==C?1:Math.random()||.1;for(T&&(u=l!==p&&l,r=n);null!=(d=k[x]);x++){if(s&&d){g=0;while(m=e[g++])if(m(d,l,c)){f.push(d);break}T&&(w=N,r=++n)}o&&((d=!m&&d)&&v--,a&&b.push(d))}if(v+=x,o&&x!==v){g=0;while(m=t[g++])m(b,y,l,c);if(a){if(v>0)while(x--)b[x]||y[x]||(y[x]=q.call(f));y=xt(y)}O.apply(f,y),T&&!a&&y.length>0&&v+t.length>1&&ot.uniqueSort(f)}return T&&(w=N,u=C),b};return o?at(a):a}a=ot.compile=function(e,t){var n,r=[],i=[],o=N[e+" "];if(!o){t||(t=gt(e)),n=t.length;while(n--)o=wt(t[n]),o[v]?r.push(o):i.push(o);o=N(e,Tt(i,r))}return o};function Ct(e,t,n){var r=0,i=t.length;for(;i>r;r++)ot(e,t[r],n);return n}function kt(e,t,r,o){var s,u,l,c,p,f=gt(e);if(!o&&1===f.length){if(u=f[0]=f[0].slice(0),u.length>2&&"ID"===(l=u[0]).type&&n.getById&&9===t.nodeType&&h&&i.relative[u[1].type]){if(t=(i.find.ID(l.matches[0].replace(nt,rt),t)||[])[0],!t)return r;e=e.slice(u.shift().value.length)}s=J.needsContext.test(e)?0:u.length;while(s--){if(l=u[s],i.relative[c=l.type])break;if((p=i.find[c])&&(o=p(l.matches[0].replace(nt,rt),U.test(u[0].type)&&t.parentNode||t))){if(u.splice(s,1),e=o.length&&mt(u),!e)return O.apply(r,o),r;break}}}return a(e,f)(o,t,!h,r,U.test(e)),r}n.sortStable=v.split("").sort(S).join("")===v,n.detectDuplicates=E,c(),n.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(p.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||lt("type|href|height|width",function(e,t,n){return n?undefined:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||lt("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?undefined:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||lt(R,function(e,t,n){var r;return n?undefined:(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===!0?t.toLowerCase():null}),x.find=ot,x.expr=ot.selectors,x.expr[":"]=x.expr.pseudos,x.unique=ot.uniqueSort,x.text=ot.getText,x.isXMLDoc=ot.isXML,x.contains=ot.contains}(e);var D={};function A(e){var t=D[e]={};return x.each(e.match(w)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?D[e]||A(e):x.extend({},e);var t,n,r,i,o,s,a=[],u=!e.once&&[],l=function(p){for(t=e.memory&&p,n=!0,s=i||0,i=0,o=a.length,r=!0;a&&o>s;s++)if(a[s].apply(p[0],p[1])===!1&&e.stopOnFalse){t=!1;break}r=!1,a&&(u?u.length&&l(u.shift()):t?a=[]:c.disable())},c={add:function(){if(a){var n=a.length;(function s(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==r&&s(n)})})(arguments),r?o=a.length:t&&(i=n,l(t))}return this},remove:function(){return a&&x.each(arguments,function(e,t){var n;while((n=x.inArray(t,a,n))>-1)a.splice(n,1),r&&(o>=n&&o--,s>=n&&s--)}),this},has:function(e){return e?x.inArray(e,a)>-1:!(!a||!a.length)},empty:function(){return a=[],o=0,this},disable:function(){return a=u=t=undefined,this},disabled:function(){return!a},lock:function(){return u=undefined,t||c.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!a||n&&!u||(t=t||[],t=[e,t.slice?t.slice():t],r?u.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!n}};return c},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var s=o[0],a=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var s=o[2],a=o[3];r[o[1]]=s.add,a&&s.add(function(){n=a},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=s.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=d.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),s=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?d.call(arguments):r,n===a?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},a,u,l;if(r>1)for(a=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(s(t,l,n)).fail(o.reject).progress(s(t,u,a)):--i;return i||o.resolveWith(l,n),o.promise()}}),x.support=function(t){var n=o.createElement("input"),r=o.createDocumentFragment(),i=o.createElement("div"),s=o.createElement("select"),a=s.appendChild(o.createElement("option"));return n.type?(n.type="checkbox",t.checkOn=""!==n.value,t.optSelected=a.selected,t.reliableMarginRight=!0,t.boxSizingReliable=!0,t.pixelPosition=!1,n.checked=!0,t.noCloneChecked=n.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!a.disabled,n=o.createElement("input"),n.value="t",n.type="radio",t.radioValue="t"===n.value,n.setAttribute("checked","t"),n.setAttribute("name","t"),r.appendChild(n),t.checkClone=r.cloneNode(!0).cloneNode(!0).lastChild.checked,t.focusinBubbles="onfocusin"in e,i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===i.style.backgroundClip,x(function(){var n,r,s="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",a=o.getElementsByTagName("body")[0];a&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",a.appendChild(n).appendChild(i),i.innerHTML="",i.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",x.swap(a,null!=a.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===i.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(i,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(i,null)||{width:"4px"}).width,r=i.appendChild(o.createElement("div")),r.style.cssText=i.style.cssText=s,r.style.marginRight=r.style.width="0",i.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),a.removeChild(n))}),t):t}({});var L,q,H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,O=/([A-Z])/g;function F(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=x.expando+Math.random()}F.uid=1,F.accepts=function(e){return e.nodeType?1===e.nodeType||9===e.nodeType:!0},F.prototype={key:function(e){if(!F.accepts(e))return 0;var t={},n=e[this.expando];if(!n){n=F.uid++;try{t[this.expando]={value:n},Object.defineProperties(e,t)}catch(r){t[this.expando]=n,x.extend(e,t)}}return this.cache[n]||(this.cache[n]={}),n},set:function(e,t,n){var r,i=this.key(e),o=this.cache[i];if("string"==typeof t)o[t]=n;else if(x.isEmptyObject(o))x.extend(this.cache[i],t);else for(r in t)o[r]=t[r];return o},get:function(e,t){var n=this.cache[this.key(e)];return t===undefined?n:n[t]},access:function(e,t,n){var r;return t===undefined||t&&"string"==typeof t&&n===undefined?(r=this.get(e,t),r!==undefined?r:this.get(e,x.camelCase(t))):(this.set(e,t,n),n!==undefined?n:t)},remove:function(e,t){var n,r,i,o=this.key(e),s=this.cache[o];if(t===undefined)this.cache[o]={};else{x.isArray(t)?r=t.concat(t.map(x.camelCase)):(i=x.camelCase(t),t in s?r=[t,i]:(r=i,r=r in s?[r]:r.match(w)||[])),n=r.length;while(n--)delete s[r[n]]}},hasData:function(e){return!x.isEmptyObject(this.cache[e[this.expando]]||{})},discard:function(e){e[this.expando]&&delete this.cache[e[this.expando]]}},L=new F,q=new F,x.extend({acceptData:F.accepts,hasData:function(e){return L.hasData(e)||q.hasData(e)},data:function(e,t,n){return L.access(e,t,n)},removeData:function(e,t){L.remove(e,t)},_data:function(e,t,n){return q.access(e,t,n)},_removeData:function(e,t){q.remove(e,t)}}),x.fn.extend({data:function(e,t){var n,r,i=this[0],o=0,s=null;if(e===undefined){if(this.length&&(s=L.get(i),1===i.nodeType&&!q.get(i,"hasDataAttrs"))){for(n=i.attributes;n.length>o;o++)r=n[o].name,0===r.indexOf("data-")&&(r=x.camelCase(r.slice(5)),P(i,r,s[r]));q.set(i,"hasDataAttrs",!0)}return s}return"object"==typeof e?this.each(function(){L.set(this,e)}):x.access(this,function(t){var n,r=x.camelCase(e);if(i&&t===undefined){if(n=L.get(i,e),n!==undefined)return n;if(n=L.get(i,r),n!==undefined)return n;if(n=P(i,r,undefined),n!==undefined)return n}else this.each(function(){var n=L.get(this,r);L.set(this,r,t),-1!==e.indexOf("-")&&n!==undefined&&L.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){L.remove(this,e)})}});function P(e,t,n){var r;if(n===undefined&&1===e.nodeType)if(r="data-"+t.replace(O,"-$1").toLowerCase(),n=e.getAttribute(r),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:H.test(n)?JSON.parse(n):n}catch(i){}L.set(e,t,n)}else n=undefined;return n}x.extend({queue:function(e,t,n){var r;return e?(t=(t||"fx")+"queue",r=q.get(e,t),n&&(!r||x.isArray(n)?r=q.access(e,t,x.makeArray(n)):r.push(n)),r||[]):undefined},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),s=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,s,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return q.get(e,n)||q.access(e,n,{empty:x.Callbacks("once memory").add(function(){q.remove(e,[t+"queue",n])})})}}),x.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),n>arguments.length?x.queue(this[0],e):t===undefined?this:this.each(function(){var n=x.queue(this,e,t);x._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=x.Deferred(),o=this,s=this.length,a=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=undefined),e=e||"fx";while(s--)n=q.get(o[s],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(a));return a(),i.promise(t)}});var R,M,W=/[\t\r\n\f]/g,$=/\r/g,B=/^(?:input|select|textarea|button)$/i;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[x.propFix[e]||e]})},addClass:function(e){var t,n,r,i,o,s=0,a=this.length,u="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,s=0,a=this.length,u=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,i=0,o=x(this),s=e.match(w)||[];while(t=s[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===r||"boolean"===n)&&(this.className&&q.set(this,"__className__",this.className),this.className=this.className||e===!1?"":q.get(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(W," ").indexOf(t)>=0)return!0;return!1},val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=x.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,x(this).val()):e,null==i?i="":"number"==typeof i?i+="":x.isArray(i)&&(i=x.map(i,function(e){return null==e?"":e+""})),t=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&t.set(this,i,"value")!==undefined||(this.value=i))});if(i)return t=x.valHooks[i.type]||x.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&(n=t.get(i,"value"))!==undefined?n:(n=i.value,"string"==typeof n?n.replace($,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,s=o?null:[],a=o?i+1:r.length,u=0>i?a:o?i:0;for(;a>u;u++)if(n=r[u],!(!n.selected&&u!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),s=i.length;while(s--)r=i[s],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,t,n){var i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===r?x.prop(e,t,n):(1===s&&x.isXMLDoc(e)||(t=t.toLowerCase(),i=x.attrHooks[t]||(x.expr.match.bool.test(t)?M:R)),n===undefined?i&&"get"in i&&null!==(o=i.get(e,t))?o:(o=x.find.attr(e,t),null==o?undefined:o):null!==n?i&&"set"in i&&(o=i.set(e,n,t))!==undefined?o:(e.setAttribute(t,n+""),n):(x.removeAttr(e,t),undefined))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)&&(e[r]=!1),e.removeAttribute(n)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return o=1!==s||!x.isXMLDoc(e),o&&(t=x.propFix[t]||t,i=x.propHooks[t]),n!==undefined?i&&"set"in i&&(r=i.set(e,n,t))!==undefined?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){return e.hasAttribute("tabindex")||B.test(e.nodeName)||e.href?e.tabIndex:-1}}}}),M={set:function(e,t,n){return t===!1?x.removeAttr(e,n):e.setAttribute(n,n),n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,t){var n=x.expr.attrHandle[t]||x.find.attr;x.expr.attrHandle[t]=function(e,t,r){var i=x.expr.attrHandle[t],o=r?undefined:(x.expr.attrHandle[t]=undefined)!=n(e,t,r)?t.toLowerCase():null;return x.expr.attrHandle[t]=i,o}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,t){return x.isArray(t)?e.checked=x.inArray(x(e).val(),t)>=0:undefined}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var I=/^key/,z=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,X=/^([^.]*)(?:\.(.+)|)$/;function U(){return!0}function Y(){return!1}function V(){try{return o.activeElement}catch(e){}}x.event={global:{},add:function(e,t,n,i,o){var s,a,u,l,c,p,f,h,d,g,m,y=q.get(e);if(y){n.handler&&(s=n,n=s.handler,o=s.selector),n.guid||(n.guid=x.guid++),(l=y.events)||(l=y.events={}),(a=y.handle)||(a=y.handle=function(e){return typeof x===r||e&&x.event.triggered===e.type?undefined:x.event.dispatch.apply(a.elem,arguments)},a.elem=e),t=(t||"").match(w)||[""],c=t.length;while(c--)u=X.exec(t[c])||[],d=m=u[1],g=(u[2]||"").split(".").sort(),d&&(f=x.event.special[d]||{},d=(o?f.delegateType:f.bindType)||d,f=x.event.special[d]||{},p=x.extend({type:d,origType:m,data:i,handler:n,guid:n.guid,selector:o,needsContext:o&&x.expr.match.needsContext.test(o),namespace:g.join(".")},s),(h=l[d])||(h=l[d]=[],h.delegateCount=0,f.setup&&f.setup.call(e,i,g,a)!==!1||e.addEventListener&&e.addEventListener(d,a,!1)),f.add&&(f.add.call(e,p),p.handler.guid||(p.handler.guid=n.guid)),o?h.splice(h.delegateCount++,0,p):h.push(p),x.event.global[d]=!0);e=null}},remove:function(e,t,n,r,i){var o,s,a,u,l,c,p,f,h,d,g,m=q.hasData(e)&&q.get(e);if(m&&(u=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(a=X.exec(t[l])||[],h=g=a[1],d=(a[2]||"").split(".").sort(),h){p=x.event.special[h]||{},h=(r?p.delegateType:p.bindType)||h,f=u[h]||[],a=a[2]&&RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)"),s=o=f.length;while(o--)c=f[o],!i&&g!==c.origType||n&&n.guid!==c.guid||a&&!a.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(f.splice(o,1),c.selector&&f.delegateCount--,p.remove&&p.remove.call(e,c));s&&!f.length&&(p.teardown&&p.teardown.call(e,d,m.handle)!==!1||x.removeEvent(e,h,m.handle),delete u[h])}else for(h in u)x.event.remove(e,h+t[l],n,r,!0);x.isEmptyObject(u)&&(delete m.handle,q.remove(e,"events"))}},trigger:function(t,n,r,i){var s,a,u,l,c,p,f,h=[r||o],d=y.call(t,"type")?t.type:t,g=y.call(t,"namespace")?t.namespace.split("."):[];if(a=u=r=r||o,3!==r.nodeType&&8!==r.nodeType&&!_.test(d+x.event.triggered)&&(d.indexOf(".")>=0&&(g=d.split("."),d=g.shift(),g.sort()),c=0>d.indexOf(":")&&"on"+d,t=t[x.expando]?t:new x.Event(d,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=g.join("."),t.namespace_re=t.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=undefined,t.target||(t.target=r),n=null==n?[t]:x.makeArray(n,[t]),f=x.event.special[d]||{},i||!f.trigger||f.trigger.apply(r,n)!==!1)){if(!i&&!f.noBubble&&!x.isWindow(r)){for(l=f.delegateType||d,_.test(l+d)||(a=a.parentNode);a;a=a.parentNode)h.push(a),u=a;u===(r.ownerDocument||o)&&h.push(u.defaultView||u.parentWindow||e)}s=0;while((a=h[s++])&&!t.isPropagationStopped())t.type=s>1?l:f.bindType||d,p=(q.get(a,"events")||{})[t.type]&&q.get(a,"handle"),p&&p.apply(a,n),p=c&&a[c],p&&x.acceptData(a)&&p.apply&&p.apply(a,n)===!1&&t.preventDefault();return t.type=d,i||t.isDefaultPrevented()||f._default&&f._default.apply(h.pop(),n)!==!1||!x.acceptData(r)||c&&x.isFunction(r[d])&&!x.isWindow(r)&&(u=r[c],u&&(r[c]=null),x.event.triggered=d,r[d](),x.event.triggered=undefined,u&&(r[c]=u)),t.result}},dispatch:function(e){e=x.event.fix(e);var t,n,r,i,o,s=[],a=d.call(arguments),u=(q.get(this,"events")||{})[e.type]||[],l=x.event.special[e.type]||{};if(a[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),t=0;while((i=s[t++])&&!e.isPropagationStopped()){e.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(o.namespace))&&(e.handleObj=o,e.data=o.data,r=((x.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,a),r!==undefined&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,s=[],a=t.delegateCount,u=e.target;if(a&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!==this;u=u.parentNode||this)if(u.disabled!==!0||"click"!==e.type){for(r=[],n=0;a>n;n++)o=t[n],i=o.selector+" ",r[i]===undefined&&(r[i]=o.needsContext?x(i,this).index(u)>=0:x.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&s.push({elem:u,handlers:r})}return t.length>a&&s.push({elem:this,handlers:t.slice(a)}),s},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,s=t.button;return null==e.pageX&&null!=t.clientX&&(n=e.target.ownerDocument||o,r=n.documentElement,i=n.body,e.pageX=t.clientX+(r&&r.scrollLeft||i&&i.scrollLeft||0)-(r&&r.clientLeft||i&&i.clientLeft||0),e.pageY=t.clientY+(r&&r.scrollTop||i&&i.scrollTop||0)-(r&&r.clientTop||i&&i.clientTop||0)),e.which||s===undefined||(e.which=1&s?1:2&s?3:4&s?2:0),e}},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,s=e,a=this.fixHooks[i];a||(this.fixHooks[i]=a=z.test(i)?this.mouseHooks:I.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new x.Event(s),t=r.length;while(t--)n=r[t],e[n]=s[n];return e.target||(e.target=o),3===e.target.nodeType&&(e.target=e.target.parentNode),a.filter?a.filter(e,s):e},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==V()&&this.focus?(this.focus(),!1):undefined},delegateType:"focusin"},blur:{trigger:function(){return this===V()&&this.blur?(this.blur(),!1):undefined},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&x.nodeName(this,"input")?(this.click(),!1):undefined},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==undefined&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)},x.Event=function(e,t){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.getPreventDefault&&e.getPreventDefault()?U:Y):this.type=e,t&&x.extend(this,t),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,undefined):new x.Event(e,t)},x.Event.prototype={isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=U,e&&e.preventDefault&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=U,e&&e.stopPropagation&&e.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=U,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,t,n,r,i){var o,s;if("object"==typeof e){"string"!=typeof t&&(n=n||t,t=undefined);for(s in e)this.on(s,t,n,e[s],i);return this}if(null==n&&null==r?(r=t,n=t=undefined):null==r&&("string"==typeof t?(r=n,n=undefined):(r=n,n=t,t=undefined)),r===!1)r=Y;else if(!r)return this;return 1===i&&(o=r,r=function(e){return x().off(e),o.apply(this,arguments)},r.guid=o.guid||(o.guid=x.guid++)),this.each(function(){x.event.add(this,e,r,n,t)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,x(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return(t===!1||"function"==typeof t)&&(n=t,t=undefined),n===!1&&(n=Y),this.each(function(){x.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];return n?x.event.trigger(e,t,n,!0):undefined}});var G=/^.[^:#\[\.,]*$/,J=/^(?:parents|prev(?:Until|All))/,Q=x.expr.match.needsContext,K={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t=x(e,this),n=t.length;return this.filter(function(){var e=0;for(;n>e;e++)if(x.contains(this,t[e]))return!0})},not:function(e){return this.pushStack(et(this,e||[],!0))},filter:function(e){return this.pushStack(et(this,e||[],!1))},is:function(e){return!!et(this,"string"==typeof e&&Q.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],s=Q.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(s?s.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?g.call(x(e),this[0]):g.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function Z(e,t){while((e=e[t])&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return Z(e,"nextSibling")},prev:function(e){return Z(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return e.contentDocument||x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(K[e]||x.unique(i),J.test(e)&&i.reverse()),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,t,n){var r=[],i=n!==undefined;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&x(e).is(n))break;r.push(e)}return r},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function et(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(G.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return g.call(t,e)>=0!==n})}var tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,nt=/<([\w:]+)/,rt=/<|?\w+;/,it=/<(?:script|style|link)/i,ot=/^(?:checkbox|radio)$/i,st=/checked\s*(?:[^=]|=\s*.checked.)/i,at=/^$|\/(?:java|ecma)script/i,ut=/^true\/(.*)/,lt=/^\s*\s*$/g,ct={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ct.optgroup=ct.option,ct.tbody=ct.tfoot=ct.colgroup=ct.caption=ct.thead,ct.th=ct.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===undefined?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(mt(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&dt(mt(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++)1===e.nodeType&&(x.cleanData(mt(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var t=this[0]||{},n=0,r=this.length;if(e===undefined&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!it.test(e)&&!ct[(nt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(tt,"<$1>$2>");try{for(;r>n;n++)t=this[n]||{},1===t.nodeType&&(x.cleanData(mt(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=f.apply([],e);var r,i,o,s,a,u,l=0,c=this.length,p=this,h=c-1,d=e[0],g=x.isFunction(d);if(g||!(1>=c||"string"!=typeof d||x.support.checkClone)&&st.test(d))return this.each(function(r){var i=p.eq(r);g&&(e[0]=d.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(r=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),i=r.firstChild,1===r.childNodes.length&&(r=i),i)){for(o=x.map(mt(r,"script"),ft),s=o.length;c>l;l++)a=r,l!==h&&(a=x.clone(a,!0,!0),s&&x.merge(o,mt(a,"script"))),t.call(this[l],a,l);if(s)for(u=o[o.length-1].ownerDocument,x.map(o,ht),l=0;s>l;l++)a=o[l],at.test(a.type||"")&&!q.access(a,"globalEval")&&x.contains(u,a)&&(a.src?x._evalUrl(a.src):x.globalEval(a.textContent.replace(lt,"")))}return this}}),x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=[],i=x(e),o=i.length-1,s=0;for(;o>=s;s++)n=s===o?this:this.clone(!0),x(i[s])[t](n),h.apply(r,n.get());return this.pushStack(r)}}),x.extend({clone:function(e,t,n){var r,i,o,s,a=e.cloneNode(!0),u=x.contains(e.ownerDocument,e);if(!(x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(s=mt(a),o=mt(e),r=0,i=o.length;i>r;r++)yt(o[r],s[r]);if(t)if(n)for(o=o||mt(e),s=s||mt(a),r=0,i=o.length;i>r;r++)gt(o[r],s[r]);else gt(e,a);return s=mt(a,"script"),s.length>0&&dt(s,!u&&mt(e,"script")),a},buildFragment:function(e,t,n,r){var i,o,s,a,u,l,c=0,p=e.length,f=t.createDocumentFragment(),h=[];for(;p>c;c++)if(i=e[c],i||0===i)if("object"===x.type(i))x.merge(h,i.nodeType?[i]:i);else if(rt.test(i)){o=o||f.appendChild(t.createElement("div")),s=(nt.exec(i)||["",""])[1].toLowerCase(),a=ct[s]||ct._default,o.innerHTML=a[1]+i.replace(tt,"<$1>$2>")+a[2],l=a[0];while(l--)o=o.lastChild;x.merge(h,o.childNodes),o=f.firstChild,o.textContent=""}else h.push(t.createTextNode(i));f.textContent="",c=0;while(i=h[c++])if((!r||-1===x.inArray(i,r))&&(u=x.contains(i.ownerDocument,i),o=mt(f.appendChild(i),"script"),u&&dt(o),n)){l=0;while(i=o[l++])at.test(i.type||"")&&n.push(i)}return f},cleanData:function(e){var t,n,r,i,o,s,a=x.event.special,u=0;for(;(n=e[u])!==undefined;u++){if(F.accepts(n)&&(o=n[q.expando],o&&(t=q.cache[o]))){if(r=Object.keys(t.events||{}),r.length)for(s=0;(i=r[s])!==undefined;s++)a[i]?x.event.remove(n,i):x.removeEvent(n,i,t.handle);q.cache[o]&&delete q.cache[o]}delete L.cache[n[L.expando]]}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}});function pt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function ft(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function ht(e){var t=ut.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function dt(e,t){var n=e.length,r=0;for(;n>r;r++)q.set(e[r],"globalEval",!t||q.get(t[r],"globalEval"))}function gt(e,t){var n,r,i,o,s,a,u,l;if(1===t.nodeType){if(q.hasData(e)&&(o=q.access(e),s=q.set(t,o),l=o.events)){delete s.handle,s.events={};for(i in l)for(n=0,r=l[i].length;r>n;n++)x.event.add(t,i,l[i][n])}L.hasData(e)&&(a=L.access(e),u=x.extend({},a),L.set(t,u))}}function mt(e,t){var n=e.getElementsByTagName?e.getElementsByTagName(t||"*"):e.querySelectorAll?e.querySelectorAll(t||"*"):[];return t===undefined||t&&x.nodeName(e,t)?x.merge([e],n):n}function yt(e,t){var n=t.nodeName.toLowerCase();"input"===n&&ot.test(e.type)?t.checked=e.checked:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}x.fn.extend({wrapAll:function(e){var t;return x.isFunction(e)?this.each(function(t){x(this).wrapAll(e.call(this,t))}):(this[0]&&(t=x(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this)},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var vt,xt,bt=/^(none|table(?!-c[ea]).+)/,wt=/^margin/,Tt=RegExp("^("+b+")(.*)$","i"),Ct=RegExp("^("+b+")(?!px)[a-z%]+$","i"),kt=RegExp("^([+-])=("+b+")","i"),Nt={BODY:"block"},Et={position:"absolute",visibility:"hidden",display:"block"},St={letterSpacing:0,fontWeight:400},jt=["Top","Right","Bottom","Left"],Dt=["Webkit","O","Moz","ms"];function At(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Dt.length;while(i--)if(t=Dt[i]+n,t in e)return t;return r}function Lt(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function qt(t){return e.getComputedStyle(t,null)}function Ht(e,t){var n,r,i,o=[],s=0,a=e.length;for(;a>s;s++)r=e[s],r.style&&(o[s]=q.get(r,"olddisplay"),n=r.style.display,t?(o[s]||"none"!==n||(r.style.display=""),""===r.style.display&&Lt(r)&&(o[s]=q.access(r,"olddisplay",Rt(r.nodeName)))):o[s]||(i=Lt(r),(n&&"none"!==n||!i)&&q.set(r,"olddisplay",i?n:x.css(r,"display"))));for(s=0;a>s;s++)r=e[s],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[s]||"":"none"));return e}x.fn.extend({css:function(e,t){return x.access(this,function(e,t,n){var r,i,o={},s=0;if(x.isArray(t)){for(r=qt(e),i=t.length;i>s;s++)o[t[s]]=x.css(e,t[s],!1,r);return o}return n!==undefined?x.style(e,t,n):x.css(e,t)},e,t,arguments.length>1)},show:function(){return Ht(this,!0)},hide:function(){return Ht(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Lt(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=vt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,s,a=x.camelCase(t),u=e.style;return t=x.cssProps[a]||(x.cssProps[a]=At(u,a)),s=x.cssHooks[t]||x.cssHooks[a],n===undefined?s&&"get"in s&&(i=s.get(e,!1,r))!==undefined?i:u[t]:(o=typeof n,"string"===o&&(i=kt.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(x.css(e,t)),o="number"),null==n||"number"===o&&isNaN(n)||("number"!==o||x.cssNumber[a]||(n+="px"),x.support.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),s&&"set"in s&&(n=s.set(e,n,r))===undefined||(u[t]=n)),undefined)}},css:function(e,t,n,r){var i,o,s,a=x.camelCase(t);return t=x.cssProps[a]||(x.cssProps[a]=At(e.style,a)),s=x.cssHooks[t]||x.cssHooks[a],s&&"get"in s&&(i=s.get(e,!0,n)),i===undefined&&(i=vt(e,t,r)),"normal"===i&&t in St&&(i=St[t]),""===n||n?(o=parseFloat(i),n===!0||x.isNumeric(o)?o||0:i):i}}),vt=function(e,t,n){var r,i,o,s=n||qt(e),a=s?s.getPropertyValue(t)||s[t]:undefined,u=e.style;return s&&(""!==a||x.contains(e.ownerDocument,e)||(a=x.style(e,t)),Ct.test(a)&&wt.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=s.width,u.width=r,u.minWidth=i,u.maxWidth=o)),a};function Ot(e,t,n){var r=Tt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function Ft(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,s=0;for(;4>o;o+=2)"margin"===n&&(s+=x.css(e,n+jt[o],!0,i)),r?("content"===n&&(s-=x.css(e,"padding"+jt[o],!0,i)),"margin"!==n&&(s-=x.css(e,"border"+jt[o]+"Width",!0,i))):(s+=x.css(e,"padding"+jt[o],!0,i),"padding"!==n&&(s+=x.css(e,"border"+jt[o]+"Width",!0,i)));return s}function Pt(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=qt(e),s=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=vt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Ct.test(i))return i;r=s&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+Ft(e,t,n||(s?"border":"content"),r,o)+"px"}function Rt(e){var t=o,n=Nt[e];return n||(n=Mt(e,t),"none"!==n&&n||(xt=(xt||x("").css("cssText","display:block !important")).appendTo(t.documentElement),t=(xt[0].contentWindow||xt[0].contentDocument).document,t.write(""),t.close(),n=Mt(e,t),xt.detach()),Nt[e]=n),n}function Mt(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,t){x.cssHooks[t]={get:function(e,n,r){return n?0===e.offsetWidth&&bt.test(x.css(e,"display"))?x.swap(e,Et,function(){return Pt(e,t,r)}):Pt(e,t,r):undefined},set:function(e,n,r){var i=r&&qt(e);return Ot(e,n,r?Ft(e,t,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,t){return t?x.swap(e,{display:"inline-block"},vt,[e,"marginRight"]):undefined}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,t){x.cssHooks[t]={get:function(e,n){return n?(n=vt(e,t),Ct.test(n)?x(e).position()[t]+"px":n):undefined}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+jt[r]+t]=o[r]||o[r-2]||o[0];return i}},wt.test(e)||(x.cssHooks[e+t].set=Ot)});var Wt=/%20/g,$t=/\[\]$/,Bt=/\r?\n/g,It=/^(?:submit|button|image|reset|file)$/i,zt=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&zt.test(this.nodeName)&&!It.test(e)&&(this.checked||!ot.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(Bt,"\r\n")}}):{name:t.name,value:n.replace(Bt,"\r\n")}}).get()}}),x.param=function(e,t){var n,r=[],i=function(e,t){t=x.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(t===undefined&&(t=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){i(this.name,this.value)});else for(n in e)_t(n,e[n],t,i);return r.join("&").replace(Wt,"+")};function _t(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||$t.test(e)?r(e,i):_t(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)_t(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var Xt,Ut,Yt=x.now(),Vt=/\?/,Gt=/#.*$/,Jt=/([?&])_=[^&]*/,Qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Kt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Zt=/^(?:GET|HEAD)$/,en=/^\/\//,tn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,nn=x.fn.load,rn={},on={},sn="*/".concat("*");try{Ut=i.href}catch(an){Ut=o.createElement("a"),Ut.href="",Ut=Ut.href}Xt=tn.exec(Ut.toLowerCase())||[];function un(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function ln(e,t,n,r){var i={},o=e===on;function s(a){var u;return i[a]=!0,x.each(e[a]||[],function(e,a){var l=a(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):undefined:(t.dataTypes.unshift(l),s(l),!1)}),u}return s(t.dataTypes[0])||!i["*"]&&s("*")}function cn(e,t){var n,r,i=x.ajaxSettings.flatOptions||{};for(n in t)t[n]!==undefined&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,t,n){if("string"!=typeof e&&nn)return nn.apply(this,arguments);var r,i,o,s=this,a=e.indexOf(" ");return a>=0&&(r=e.slice(a),e=e.slice(0,a)),x.isFunction(t)?(n=t,t=undefined):t&&"object"==typeof t&&(i="POST"),s.length>0&&x.ajax({url:e,type:i,dataType:"html",data:t}).done(function(e){o=arguments,s.html(r?x("").append(x.parseHTML(e)).find(r):e)}).complete(n&&function(e,t){s.each(n,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ut,type:"GET",isLocal:Kt.test(Xt[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":sn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?cn(cn(e,x.ajaxSettings),t):cn(x.ajaxSettings,e)},ajaxPrefilter:un(rn),ajaxTransport:un(on),ajax:function(e,t){"object"==typeof e&&(t=e,e=undefined),t=t||{};var n,r,i,o,s,a,u,l,c=x.ajaxSetup({},t),p=c.context||c,f=c.context&&(p.nodeType||p.jquery)?x(p):x.event,h=x.Deferred(),d=x.Callbacks("once memory"),g=c.statusCode||{},m={},y={},v=0,b="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===v){if(!o){o={};while(t=Qt.exec(i))o[t[1].toLowerCase()]=t[2]}t=o[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===v?i:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return v||(e=y[n]=y[n]||e,m[e]=t),this},overrideMimeType:function(e){return v||(c.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>v)for(t in e)g[t]=[g[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||b;return n&&n.abort(t),k(0,t),this}};if(h.promise(T).complete=d.add,T.success=T.done,T.error=T.fail,c.url=((e||c.url||Ut)+"").replace(Gt,"").replace(en,Xt[1]+"//"),c.type=t.method||t.type||c.method||c.type,c.dataTypes=x.trim(c.dataType||"*").toLowerCase().match(w)||[""],null==c.crossDomain&&(a=tn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===Xt[1]&&a[2]===Xt[2]&&(a[3]||("http:"===a[1]?"80":"443"))===(Xt[3]||("http:"===Xt[1]?"80":"443")))),c.data&&c.processData&&"string"!=typeof c.data&&(c.data=x.param(c.data,c.traditional)),ln(rn,c,t,T),2===v)return T;u=c.global,u&&0===x.active++&&x.event.trigger("ajaxStart"),c.type=c.type.toUpperCase(),c.hasContent=!Zt.test(c.type),r=c.url,c.hasContent||(c.data&&(r=c.url+=(Vt.test(r)?"&":"?")+c.data,delete c.data),c.cache===!1&&(c.url=Jt.test(r)?r.replace(Jt,"$1_="+Yt++):r+(Vt.test(r)?"&":"?")+"_="+Yt++)),c.ifModified&&(x.lastModified[r]&&T.setRequestHeader("If-Modified-Since",x.lastModified[r]),x.etag[r]&&T.setRequestHeader("If-None-Match",x.etag[r])),(c.data&&c.hasContent&&c.contentType!==!1||t.contentType)&&T.setRequestHeader("Content-Type",c.contentType),T.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+("*"!==c.dataTypes[0]?", "+sn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)T.setRequestHeader(l,c.headers[l]);if(c.beforeSend&&(c.beforeSend.call(p,T,c)===!1||2===v))return T.abort();b="abort";for(l in{success:1,error:1,complete:1})T[l](c[l]);if(n=ln(on,c,t,T)){T.readyState=1,u&&f.trigger("ajaxSend",[T,c]),c.async&&c.timeout>0&&(s=setTimeout(function(){T.abort("timeout")},c.timeout));try{v=1,n.send(m,k)}catch(C){if(!(2>v))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,t,o,a){var l,m,y,b,w,C=t;2!==v&&(v=2,s&&clearTimeout(s),n=undefined,i=a||"",T.readyState=e>0?4:0,l=e>=200&&300>e||304===e,o&&(b=pn(c,T,o)),b=fn(c,b,T,l),l?(c.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(x.lastModified[r]=w),w=T.getResponseHeader("etag"),w&&(x.etag[r]=w)),204===e||"HEAD"===c.type?C="nocontent":304===e?C="notmodified":(C=b.state,m=b.data,y=b.error,l=!y)):(y=C,(e||!C)&&(C="error",0>e&&(e=0))),T.status=e,T.statusText=(t||C)+"",l?h.resolveWith(p,[m,C,T]):h.rejectWith(p,[T,C,y]),T.statusCode(g),g=undefined,u&&f.trigger(l?"ajaxSuccess":"ajaxError",[T,c,l?m:y]),d.fireWith(p,[T,C]),u&&(f.trigger("ajaxComplete",[T,c]),--x.active||x.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,t){return x.get(e,undefined,t,"script")}}),x.each(["get","post"],function(e,t){x[t]=function(e,n,r,i){return x.isFunction(n)&&(i=i||r,r=n,n=undefined),x.ajax({url:e,type:t,dataType:i,data:n,success:r})}});function pn(e,t,n){var r,i,o,s,a=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),r===undefined&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in a)if(a[i]&&a[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}s||(s=i)}o=o||s}return o?(o!==u[0]&&u.unshift(o),n[o]):undefined}function fn(e,t,n,r){var i,o,s,a,u,l={},c=e.dataTypes.slice();if(c[1])for(s in e.converters)l[s.toLowerCase()]=e.converters[s];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(s=l[u+" "+o]||l["* "+o],!s)for(i in l)if(a=i.split(" "),a[1]===o&&(s=l[u+" "+a[0]]||l["* "+a[0]])){s===!0?s=l[i]:l[i]!==!0&&(o=a[0],c.unshift(a[1]));break}if(s!==!0)if(s&&e["throws"])t=s(t);else try{t=s(t)}catch(p){return{state:"parsererror",error:s?p:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===undefined&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),x.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(r,i){t=x("
-
-
-
-
-
-
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/_menu.twig b/src/Wallabag/Wallabag/Resources/views/baggy/_menu.twig
deleted file mode 100644
index 8b80f65d8..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/_menu.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- - {% trans "unread" %}
- - {% trans "favorites" %}
- - {% trans "archive" %}
- - {% trans "tags" %}
- - {% trans "save a link" %}
- {% include '_pocheit-form.twig' %}
-
- - {% trans "search" %}
- {% include '_search-form.twig' %}
-
- - {% trans "config" %}
- - {% trans "about" %}
- - {% trans "logout" %}
-
-
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/_pocheit-form.twig b/src/Wallabag/Wallabag/Resources/views/baggy/_pocheit-form.twig
deleted file mode 100755
index bf2ae9037..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/_pocheit-form.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/_search-form.twig b/src/Wallabag/Wallabag/Resources/views/baggy/_search-form.twig
deleted file mode 100644
index 73f7951f8..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/_search-form.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/_top.twig b/src/Wallabag/Wallabag/Resources/views/baggy/_top.twig
deleted file mode 100755
index a31c09259..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/_top.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- {% if view == 'home' %}{% block logo %}
{% endblock %}
- {% else %}{{ block('logo') }}
- {% endif %}
-
-
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/about.twig b/src/Wallabag/Wallabag/Resources/views/baggy/about.twig
deleted file mode 100755
index d18fe1567..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/about.twig
+++ /dev/null
@@ -1,84 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "About" %}{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
- {% trans "About wallabag" %}
-
-
- - {% trans "Project website" %}
- - https://www.wallabag.org
-
- - {% trans "Main developer" %}
- - Nicolas Lœuillet — {% trans "website" %}
-
- - {% trans "Contributors:" %}
- - {% trans "on Github" %}
-
- - {% trans "Bug reports" %}
- - {% trans "On our support website" %} {% trans "or" %} {% trans "on Github" %}
-
- - {% trans "License" %}
- - MIT
-
- - {% trans "Version" %}
- - {{ constant('WALLABAG') }}
-
-
- {% 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." %}
-
- {% trans "Getting help" %}
-
-
- - {% trans "Documentation" %}
- - Offline documentation and online documentation (up to date)
-
- - {% trans "Support" %}
- - http://support.wallabag.org/
-
-
- {% trans "Helping wallabag" %}
-
- {% trans "wallabag is free and opensource. You can help us:" %}
-
-
-
- {% trans "Credits" %}
-
- - PHP Readability
- - https://bitbucket.org/fivefilters/php-readability
-
- - Full Text RSS
- - http://code.fivefilters.org/full-text-rss/src
-
- - logo by Maylis Agniel
- - https://github.com/wallabag/logo
-
- - icons
- - http://icomoon.io
-
- - PHP Simple HTML DOM Parser
- - http://simplehtmldom.sourceforge.net/
-
- - Session
- - https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
-
- - Twig
- - http://twig.sensiolabs.org
-
- - Flash messages
- - https://github.com/plasticbrain/PHP-Flash-Messages
-
- - Pagination
- - https://github.com/daveismyname/pagination
-
- - PHPePub
- - https://github.com/Grandt/PHPePub/
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/config.twig b/src/Wallabag/Wallabag/Resources/views/baggy/config.twig
deleted file mode 100755
index 6031f489c..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/config.twig
+++ /dev/null
@@ -1,187 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "config" %}{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
- {% trans "Saving articles" %}
- {% trans "There are several ways to save an article:" %} {% trans "(?)" %}
-
-
-
- Browser Plugins
-
- Mobile Apps
-
- - Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
- - iOS: {% trans "download the application" %}
- - Windows Phone: {% trans "download the application" %}
-
- {% trans "Bookmarklet" %}
-
- {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %}
-
-
- {% trans "Feeds" %}
- {% if token == '' %}
- {% trans "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." %}
- {% else %}
-
-
- {% trans "Your token:" %} {{token}}
- {% trans "Your user id:" %} {{user_id}}
- {% trans "You can regenerate your token: generate!." %}
-
- {% endif %}
-
- {% trans "Change your theme" %}
-
-
- {% trans "Change your language" %}
-
-
- {% trans "Import" %}
- {% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}
- {% trans "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." %}
-
- {% trans "You can click here to fetch content for articles with no content." %}
- {% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}
-
- {% trans "Export your wallabag data" %}
- {% trans "Export JSON" %}
- Data will be exported in a single JSON file.
-
- {% trans "Fancy an E-Book ?" %}
- {% trans "Click to get all your articles in one ebook :" %}
-
-
- {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}
-
- {% trans "Cache" %}
- {% trans "Delete Cache" %}
- Deleting the cache may help with display or other problems.
-
- {% if http_auth == 0 %}
- {% trans "Change your password" %}
-
- {% endif %}
-
- {% trans 'Add user' %}
-
-
- {% trans "Delete account" %}
- {% if not only_user %}
- {% else %}{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}
{% endif %}
-
- {% trans "Upgrading wallabag" %}
-
- - {% trans "Installed version" %}: {{ constant('WALLABAG') }}
- - {% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}{% trans "A more recent stable version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})
- {% if constant('DEBUG_POCHE') == 1 %}- {% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}{% trans "A more recent development version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}
-
- {% trans "You can clear cache to check the latest release." %}
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/edit-tags.twig b/src/Wallabag/Wallabag/Resources/views/baggy/edit-tags.twig
deleted file mode 100755
index 15f15560f..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/edit-tags.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}edit tags{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-
-
-
-
-
-
- {{ entry.title|raw }}21>
-
-{% if tags is empty %}
-
-{% endif %}
-
-{% for tag in tags %}- {{ tag.value }} ✘
{% endfor %}
-
-
-{% trans "return to article" %}
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/home.twig b/src/Wallabag/Wallabag/Resources/views/baggy/home.twig
deleted file mode 100755
index 93515080d..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/home.twig
+++ /dev/null
@@ -1,81 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}
-{% if view == 'fav' %}
-{% trans "favorites" %}
-{% elseif view == 'archive' %}
-{% trans "archive" %}
-{% else %}
-{% trans "unread" %}
-{% endif %}
-{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
- {% if tag %}
- {% trans "Tag" %}: {{ tag.value }}
- {% endif %}
- {% if entries is empty %}
-
- {% else %}
-
- {% include '_display-mode.twig' %}
- {% include '_sorting.twig' %}
-
- {% block pager %}
- {% if nb_results > 1 %}
-
- {{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %}
- {{ page_links | raw }}
-
- {% elseif nb_results == 1 %}
- {% if search_term is defined %}
-
- {% trans "Only one result found for " %} « {{ search_term }} »
-
- {% endif %}
- {% endif %}
- {% endblock %}
-
- {% for entry in entries %}
-
- {{ entry.title|raw }}
- {% if entry.content| getReadingTime > 0 %}
- {% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
- {% else %}
- {% trans "estimated reading time :" %} < 1 min
- {% endif %}
-
- - {% trans "Toggle mark as read" %}
- - {% trans "toggle favorite" %}
- - {% trans "delete" %}
- - {{ entry.url | e | getDomain }}
-
- {{ entry.content|striptags|slice(0, 300) }}...
-
-
- {% endfor %}
-
- {{ block('pager') }}
- {% if view == 'home' %}{% if nb_results > 1 %}{% trans "Mark all the entries as read" %}
{% endif %}{% endif %}
- {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %}
-
- {% if searchterm is defined %}{% trans "Delete results matching" %} {{ searchterm }}{% endif %}
-
- {% if tag %}{% trans "Mark all articles from this tag as read" %}
{% endif %}
-
- {% if tag %}
- {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %}
- {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %}
- {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %}
- {% elseif searchterm is defined %}
- {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %}
- {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %}
- {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %}
- {% else %}
- {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %}
- {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %}
- {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %}
- {% endif %}
-{% endif %}
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/layout-login.twig b/src/Wallabag/Wallabag/Resources/views/baggy/layout-login.twig
deleted file mode 100644
index 4078fbb08..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/layout-login.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {% block title %}{% endblock %} - wallabag
-{% include '_head.twig' %}
-{% include '_bookmarklet.twig' %}
-
-
- {% include '_top.twig' %}
-
- {% block menu %}{% endblock %}
- {% block precontent %}{% endblock %}
- {% block messages %}
- {% include '_messages.twig' %}
- {% endblock %}
-
- {% block content %}{% endblock %}
-
-
-{% include '_footer.twig' %}
-
-
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/layout.twig b/src/Wallabag/Wallabag/Resources/views/baggy/layout.twig
deleted file mode 100755
index 8de12749f..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/layout.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {% block title %}{% endblock %} - wallabag
-{% include '_head.twig' %}
-{% include '_bookmarklet.twig' %}
-
-
- {% include '_top.twig' %}
-
- {% block menu %}{% endblock %}
- {% block precontent %}{% endblock %}
- {% block messages %}
- {% include '_messages.twig' %}
- {% if includeImport %}
- {% include '_import.twig' %}
- {% endif %}
- {% endblock %}
-
- {% block content %}{% endblock %}
-
-
-{% include '_footer.twig' %}
-
-
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/login.twig b/src/Wallabag/Wallabag/Resources/views/baggy/login.twig
deleted file mode 100644
index 58290e9c6..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/login.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "layout-login.twig" %}
-
-{% block title %}{% trans "login to your wallabag" %}{% endblock %}
-{% block content %}
- {% if http_auth == 0 %}
-
- {% endif %}
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/font.css b/src/Wallabag/Wallabag/Resources/views/baggy/public/css/font.css
deleted file mode 100755
index 7c02a16fb..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/font.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@font-face {
- font-family: 'PT Sans';
- font-style: normal;
- font-weight: 700;
- src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff');
-}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/main.css b/src/Wallabag/Wallabag/Resources/views/baggy/public/css/main.css
deleted file mode 100755
index 1df829101..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/main.css
+++ /dev/null
@@ -1,1071 +0,0 @@
-/* ==========================================================================
- Sommaire
-
- 1 = Style Guide
- 2 = Layout
- 3 = Pictos
- 4 = Messages
- 5 = Article
- 6 = Media queries
-
- ========================================================================== */
-
-html {
- min-height: 100%;
-}
-
-body {
- background-color: #EEE;
-}
-
-.login {
- background-color: #333;
-}
-
-.login #main {
- padding: 0;
- margin: 0;
-}
-
-.login form {
- background-color: #FFF;
- padding: 1.5em;
- box-shadow: 0 1px 8px rgba(0,0,0,0.9);
- width: 20em;
- position: absolute;
- top: 8em;
- left: 50%;
- margin-left: -10em;
-}
-
-.login .logo {
- position: absolute;
- top: 2em;
- left: 50%;
- margin-left: -55px;
-}
-
-/* ==========================================================================
- 1 = Style Guide
- ========================================================================== */
-
-::selection {
- color: #FFF;
- background-color: #000;
-}
-
-.desktopHide {
- display: none;
-}
-
-.logo {
- position: fixed;
- z-index: 20;
- top: 0.4em;
- left: 0.6em;
-}
-
-h2, h3, h4 {
- font-family: 'PT Sans', sans-serif;
- text-transform: uppercase;
-}
-
-p, li, label {
- color: #666;
-}
-
-a {
- color: #000;
- font-weight: bold;
-}
-
-a:hover, a:focus {
- text-decoration: none;
-}
-
-form fieldset {
- border:0;
- padding: 0;
- margin: 0;
-}
-
-form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
- border: 1px solid #999;
- padding: 0.5em 1em;
- min-width: 12em;
- color: #666;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0){
- select{
- -webkit-appearance: none;
- border-radius: 0;
- background: #FFF url(../img/bg-select.png) no-repeat right center;
- }
-}
-
-.inline .row {
- display: inline-block;
- margin-right: 0.5em;
-}
-
-.inline label {
- min-width: 6em;
-}
-
-fieldset label {
- display: inline-block;
- min-width: 12.5em;
- color: #666;
-}
-
-label {
- margin-right: 0.5em;
-}
-
-form .row {
- margin-bottom: 0.5em;
-}
-
-form button, input[type="submit"] {
- cursor:pointer;
- background-color: #000;
- color: #FFF;
- border:0;
- padding: 0.5em 1em;
- display: inline-block;
- border:1px solid #000;
-}
-
- form button:hover, form button:focus, input[type="submit"]:hover, input[type="submit"]:focus {
- background-color: #FFF;
- color: #000;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
- }
-
-#bookmarklet {
- cursor: move;
-}
-
-h2:after {
- content: "";
- height: 4px;
- width: 70px;
- background-color: #000;
- display: block;
-}
-
-.links {
- padding: 0;
- margin: 0;
-}
- .links li {
- list-style: none;
- margin: 0;
- padding: 0;
- }
-
-
-#links {
- position: fixed;
- top: 0;
- width: 10em;
- left: 0;
- text-align: right;
- background-color: #333;
- padding-top: 9.5em;
- height: 100%;
- box-shadow:inset -4px 0 20px rgba(0,0,0,0.6);
- z-index: 15;
-}
-
-#main {
- margin-left: 13em;
- position: relative;
- z-index: 10;
- padding-right: 5%;
- padding-bottom: 1em;
-}
-
- #links > li > a {
- display: block;
- padding: 0.5em 2em 0.5em 1em;
- color: #FFF;
- position: relative;
- text-transform: uppercase;
- text-decoration: none;
- font-weight: normal;
- font-family: 'PT Sans', sans-serif;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
- }
-
- #links > li > a:hover, #links > li > a:focus {
- background-color: #999;
- color: #000;
- }
-
- #links .current:after {
- content: "";
- width: 0;
- height: 0;
- position: absolute;
- border-style: solid;
- border-width: 10px;
- border-color: transparent #EEE transparent transparent;
- right: 0;
- top: 50%;
- margin-top: -10px;
- }
-
- #links li:last-child {
- position: fixed;
- bottom: 1em;
- width: 10em;
- }
-
- #links li:last-child a:before {
- font-size: 1.2em;
- position: relative;
- top: 2px;
- }
-
-
-#sort {
- padding: 0;
- list-style-type: none;
- opacity: 0.5;
- display: inline-block;
-}
-
-#sort li {
- display: inline;
- font-size: 0.9em;
-}
-
-#sort li + li {
- margin-left: 10px;
-}
-
-#sort a {
- padding: 2px 2px 0;
- vertical-align: middle;
-}
-
-#sort img {
- vertical-align: baseline;
-}
-#sort img:hover {
- cursor: pointer;
-}
-
-#display-mode {
- float: right;
- vertical-align: middle;
- margin-top: 10px;
- margin-bottom: 10px;
- opacity: 0.5;
-}
-#listmode {
- width: 16px;
- display: inline-block;
- text-decoration: none;
-}
-#listmode a:hover {
- opacity: 1;
-}
-#listmode.tablemode {
- background-image: url("../img/baggy/table.png");
- background-repeat: no-repeat;
- background-position: bottom;
-}
-#listmode.listmode {
- background-image: url("../img/baggy/list.png");
- background-repeat: no-repeat;
- background-position: bottom;
-}
-
-
-/* ==========================================================================
- 2 = Layout
- ========================================================================== */
-
-#content {
- margin-top: 5em;
- min-height: 30em;
-}
-
-footer {
- text-align: right;
- position: relative;
- bottom: 0;
- right: 5em;
- color: #999;
- font-size: 0.8em;
- font-style: italic;
- z-index: 20;
-}
-
-footer a {
- color: #999;
- font-weight: normal;
-}
-
-.list-entries {
- letter-spacing:-5px;
-}
-
-.listmode .entrie {
- width: 100%!important;
- margin-left: 0!important;
-}
-
-.list-entries + .results {
- margin-bottom: 2em;
-}
-
-.estimatedTime .reading-time {
- color: #999;
- font-style: italic;
- font-weight: normal;
- font-size: 0.9em;
-}
-
-.estimatedTime small {
- position: relative;
- top: -1px;
-}
-
-.entrie {
- background-color: #FFF;
- letter-spacing:normal;
- box-shadow: 0 3px 7px rgba(0,0,0,0.3);
- display: inline-block;
- width: 32%;
- margin-bottom: 1.5em;
- vertical-align: top;
- margin-left: 1.5%;
- position: relative;
- overflow: hidden;
- padding: 1.5em 1.5em 3em 1.5em;
-
- /* Removing CSS transitions because they make the switch from list view to
- * table view jerky
- */
- /* -webkit-transition: all 0.5s ease; */
- /* -moz-transition: all 0.5s ease; */
- /* -ms-transition: all 0.5s ease; */
- /* -o-transition: all 0.5s ease; */
- /* transition: all 0.5s ease; */
-}
-
-.entrie:before {
- content: "";
- width: 0;
- height: 0;
- border-style:solid;
- border-color: transparent transparent #000 transparent;
- border-width: 10px;
- position: absolute;
- bottom: 0.3em;
- z-index: 10;
- right: 1.5em;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
-}
-
-.entrie:after {
- content: "";
- position: absolute;
- height: 7px;
- width: 100%;
- bottom: 0;
- left: 0;
- background-color: #000;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
-}
-
-.entrie:hover {
- box-shadow: 0 3px 10px rgba(0,0,0,1);
-}
-
-.entrie:hover:after {
- height: 40px;
-}
-
-.entrie:hover:before {
- bottom: 2.4em;
-}
-
-.entrie:hover h2 a {
- color: #666;
-}
-
-.entrie h2 {
- text-transform: none;
- margin-bottom: 0;
- line-height: 1.2;
-}
-
- .entrie h2:after {
- content: none;
- }
-
-
-.entrie h2 a {
- display: block;
- text-decoration: none;
- color: #000;
- word-wrap: break-word;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
-}
-/*
-.entrie h2 a:after {
- content: "";
- position: absolute;
- top: 0;
- width: 100%;
- height: 100%;
- left: 0;
-}
-*/
-
-.entrie p {
- color: #666;
- font-size: 0.9em;
- line-height: 1.7;
-}
-
- .entrie h2 a:first-letter {
- text-transform: uppercase;
- }
-
-.entrie:hover .tools {
- bottom: 0;
-}
-
-.entrie .tools {
- position: absolute;
- bottom: -50px;
- left: 0;
- width: 100%;
- z-index: 10;
- padding-right: 0.5em;
- text-align: right;
- -webkit-transition: all 0.5s ease;
- -moz-transition: all 0.5s ease;
- -ms-transition: all 0.5s ease;
- -o-transition: all 0.5s ease;
- transition: all 0.5s ease;
-}
-
- .entrie .tools a {
- color: #666;
- text-decoration: none;
- display: block;
- padding: 0.4em;
- }
-
- .entrie .tools a:hover {
- color: #FFF;
- }
-
- .entrie .tools li {
- display: inline-block;
- }
-
-.entrie:nth-child(3n+1) {
- margin-left: 0;
-}
-
-.results {
- letter-spacing: -5px;
- padding: 0 0 0.5em;
-}
-
-.results > * {
- display: inline-block;
- vertical-align: top;
- letter-spacing: normal;
- width: 50%;
-}
-
-.pagination {
- text-align: right;
- margin-bottom:50px;
-}
-
-.nb-results {
- text-align: left;
- font-style: italic;
- color: #999;
-}
-
-.pagination > * {
- display: inline-block;
- margin-left: 0.5em;
-}
-
-.pagination a {
- color: #999;
- text-decoration: none;
-}
-
- .pagination a:hover, .pagination a:focus {
- text-decoration: underline;
- }
-
-.pagination .disabled {
- display: none;
-}
-
-/* ==========================================================================
- 2.1 = "save a link" related styles
- ========================================================================== */
-
-.popup-form {
- background: rgba(0,0,0,0.5);
- position: absolute;
- top: 0;
- left: 10em;
- z-index: 20;
- height: 100%;
- width: 100%;
- margin: 0;
- margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
- padding: 2em;
- display: none;
- border-left: 1px #EEE solid;
-}
-
- .popup-form form {
- background-color: #FFF;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 20;
- border: 10px solid #000;
- width: 400px;
- height: 200px;
- padding: 2em;
- }
-
-#bagit-form-form .addurl {
- margin-left: 0;
-}
-
-.closeMessage,
-.close-button {
- background-color: #000;
- color: #FFF;
- font-size: 1.2em;
- line-height: 1.6;
- width: 1.6em;
- height: 1.6em;
- text-align: center;
- text-decoration: none;
-}
- .closeMessage:hover,
- .closeMessage:focus,
- .close-button:hover,
- .close-button:focus {
- background-color: #999;
- color: #000;
- }
-
-.close-button--popup {
- display: inline-block;
- position: absolute;
- top: 0;
- right: 0;
- font-size: 1.4em;
-}
-
-.active-current {
- background-color: #999;
-}
-
-.active-current:after {
- content: "";
- width: 0;
- height: 0;
- position: absolute;
- border-style: solid;
- border-width: 10px;
- border-color: transparent #EEE transparent transparent;
- right: 0;
- top: 50%;
- margin-top: -10px;
-}
-
-.opacity03 {
- opacity: 0.3;
-}
-
-.add-to-wallabag-link-after {
- background-color: #000;
- color: #fff;
- padding: 0 3px 2px 3px;
-}
-
-a.add-to-wallabag-link-after {
- visibility: hidden;
- position: absolute;
- opacity: 0;
- transition-duration: 2s;
- transition-timing-function: ease-out;
-}
-
-#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
- opacity: 1;
- visibility: visible;
- transition-duration: .3s;
- transition-timing-function: ease-in;
-}
-
-a.add-to-wallabag-link-after:after {
- content: "w";
-}
-
-#add-link-result {
- font-weight: bold;
- font-size: 0.9em;
-}
-
-/* ==========================================================================
- 3 = Pictos
- ========================================================================== */
-
-@font-face {
- font-family: 'icomoon';
- src:url('../fonts/icomoon.eot?-s0mcsx');
- src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
- url('../fonts/icomoon.woff?-s0mcsx') format('woff'),
- url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'),
- url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-.icon span,
-.icon-image span {
- position: absolute;
- top: -9999px;
-}
-
-[class^="icon-"]:before, [class*=" icon-"]:before {
- font-family: 'icomoon';
- speak: none;
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
- line-height: 1;
-
- /* Better Font Rendering =========== */
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-flattr:before {
- content: "\e800";
-}
-.icon-mail:before {
- content: "\e80a";
-}
-.icon-up-open:before {
- content: "\e80b";
-}
-.icon-star:before {
- content: "\e805";
-}
-.icon-check:before {
- content: "\e804";
-}
-.icon-link:before {
- content: "\e801";
-}
-.icon-reply:before {
- content: "\e806";
-}
-.icon-menu:before {
- content: "\e802";
-}
-.icon-clock:before {
- content: "\e803";
-}
-.icon-twitter:before {
- content: "\e807";
-}
-.icon-down-open:before {
- content: "\e809";
-}
-.icon-trash:before {
- content: "\e80c";
-}
-.icon-delete:before {
- content: "\e600";
-}
-.icon-power:before {
- content: "\e601";
-}
-.icon-arrow-up-thick:before {
- content: "\e602";
-}
-.icon-rss:before {
- content: "\e808";
-}
-.icon-print:before {
- content: "\e80d";
-}
-
-
-/* .icon-image class, for image-based icons
- ========================================================================== */
-
-.icon-image {
- background-size: 16px 16px;
- background-repeat: no-repeat;
- background-position: center;
- padding-right: 1em !important;
- padding-left: 1em !important;
-}
-
-/* Carrot (http://carrot.org) */
-.icon-image--carrot {
- background-image: url('../../_global/img/icons/carrot-icon--white.png');
-}
-
-/* Diaspora */
-.icon-image--diaspora {
- background-image: url('../../_global/img/icons/diaspora-icon--black.png');
-}}
-
-/* ==========================================================================
- Icon selected
- ========================================================================== */
-
-.icon-star.fav:before {
- color: #FFF;
-}
-
-.icon-check.archive:before {
- color: #FFF;
-}
-
-/* ==========================================================================
- 4 = Messages
- ========================================================================== */
-
-.messages {
- text-align: left;
- margin-top: 1em;
-}
-
-.messages > * { display: inline-block;}
-
-.warning {
- /* font-size: 3em;
- color: #999;
- font-style: italic;
- position: absolute;
- top: 50%;
- left: 0;
- width: 100%;
- text-align: center;
- padding-right: 5%;
- margin-top: -2em;*/
- font-weight: bold;
- display: block;
- width: 100%;
-}
-
-.more-info {
- font-size: 0.85em;
- line-height: 1.5;
- color: #aaa;
-}
-
- .more-info a {
- color: #aaa;
- }
-
-/* ==========================================================================
- 5 = Article
- ========================================================================== */
-
-#article {
- width: 70%;
- margin-bottom: 3em;
- text-align: justify;
-}
-
-#article .tags {
- margin-bottom: 1em;
-}
-
-#article i {
- font-style: normal;
-}
-
-blockquote {
- border:1px solid #999;
- background-color: #FFF;
- padding: 1em;
- margin: 0;
-}
-
-#article h1 {
- text-align: left;
-}
-
-#article h2, #article h3, #article h4 {
- text-transform: none;
-}
-
-#article h2:after {
- content: none;
-}
-
-.topPosF {
- position: fixed;
- right: 20%;
- bottom: 2em;
- font-size: 1.5em;
-}
-
-#article_toolbar {
- margin-bottom: 1em;
-}
-
-#article_toolbar li {
- display: inline-block;
-}
-
-#article_toolbar a {
- background-color: #000;
- padding: 0.3em 0.5em 0.2em;
- color: #FFF;
- text-decoration: none;
-}
-
- #article_toolbar a:hover, #article_toolbar a:focus {
- background-color: #999;
- }
-
-.shaarli:before {
- content: "*";
-}
-
-.return {
- text-decoration: none;
- margin-top: 1em;
- display: block;
-}
-
-.return:before {
- margin-right: 0.5em;
-}
-
-.notags {
- font-style: italic;
- color: #999;
-}
-
-.icon-rss {
- background-color: #000;
- color: #FFF;
- padding: 0.2em 0.5em;
-}
-
-.icon-rss:before {
- position: relative;
- top: 2px;
-}
-
-.list-tags li {
- margin-bottom: 0.5em;
-}
-
-.list-tags .icon-rss:hover, .list-tags .icon-rss:focus {
- background-color: #FFF;
- color: #000;
- text-decoration: none;
-}
-
-.list-tags a {
- text-decoration: none;
-}
-
-.list-tags a:hover, .list-tags a:focus {
- text-decoration: underline;
-}
-
-pre code {
- font-family: "Courier New", Courier, monospace;
- border: 1px solid #ccc;
- font-size: 0.96em;
-}
-
-
-/* ==========================================================================
- 6 = Media Queries
- ========================================================================== */
-
-@media screen and (max-width: 1050px) {
- .entrie {
- width: 49%;
- }
- .entrie:nth-child(3n+1) {
- margin-left: 1.5%;
- }
- .entrie:nth-child(2n+1) {
- margin-left: 0;
- }
-}
-
-@media screen and (max-width: 900px) {
- #article {
- width: 80%;
- }
- .topPosF {
- right: 2.5em;
- }
-}
-
-@media screen and (max-width: 700px) {
- .entrie {
- width: 100%;
- margin-left: 0;
- }
- #display-mode {
- display: none;
- }
-}
-
-@media screen and (max-width: 500px) {
- .entrie {
- width: 100%;
- margin-left: 0;
- }
- body > header {
- background-color: #333;
- position: fixed;
- top: 0;
- width: 100%;
- height: 3em;
- z-index: 11;
- }
- #links li:last-child {
- position: static;
- width: auto;
- }
- #links li:last-child a:before {
- content: none;
- }
- .logo {
- width: 1.25em;
- height: 1.25em;
- left: 0;
- top: 0;
- }
- .login > header {
- position: static;
- }
- .login form {
- width: 100%;
- position: static;
- margin-left: 0;
- }
- .login .logo {
- width: auto;
- height: auto;
- top: 0.5em;
- width: 75px;
- height: 75px;
- margin-left: -37.5px;
- }
- .desktopHide {
- display: block;
- position: fixed;
- z-index: 20;
- top: 0;
- right: 0;
- border:0;
- width: 2.5em;
- height: 2.5em;
- cursor: pointer;
- background-color: #999;
- font-size: 1.2em;
- }
- .desktopHide:hover, .desktopHide:focus {
- background-color: #FFF;
- }
- #links {
- display: none;
- width: 100%;
- height: auto;
- padding-top: 3em;
- }
- #links.menu--open {
- display: block;
- }
- footer {
- position: static;
- margin-right: 3em;
- }
- #main {
- margin-left: 1.5em;
- padding-right: 1.5em;
- position: static;
- margin-top: 3em;
- }
- #article_toolbar .topPosF {
- display: none;
- }
-
- #article {
- width: 100%;
- }
-
- #article h1 {
- font-size: 1.5em;
- }
- #article_toolbar a {
- padding: 0.3em 0.4em 0.2em;
- }
-
- #display-mode {
- display: none;
- }
-
- .popup-form, #bagit-form, #search-form {
- left: 0;
- width: 100%;
- border-left: none;
- }
-
- .popup-form form,
- #bagit-form form,
- #search-form form {
- width: 100%;
- }
-}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/messages.css b/src/Wallabag/Wallabag/Resources/views/baggy/public/css/messages.css
deleted file mode 100755
index 42da70b30..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/messages.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.messages.error.install {
- border: 1px solid #c42608;
- color: #c00 !important;
- background: #fff0ef;
- text-align: left;
-}
-
-.messages.notice.install {
- border: 1px solid #ebcd41;
- color: #000;
- background: #fffcd3;
- text-align: left;
-}
-
-.messages.success.install {
- border: 1px solid #6dc70c;
- background: #e0fbcc !important;
- text-align: left;
-}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/print.css b/src/Wallabag/Wallabag/Resources/views/baggy/public/css/print.css
deleted file mode 100755
index 9dd6d295c..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/print.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ### Layout ### */
-
-body {
- font-family: Serif;
- background-color: #fff;
-}
-
-@page {
- margin: 1cm;
-}
-
-img {
- max-width: 100% !important;
-}
-
-/* ### Content ### */
-
-/* Hide useless blocks */
-body > header,
-#article_toolbar,
-#links,
-#sort,
-body > footer,
-.top_link,
-div.tools,
-header div,
-.messages,
-.entrie + .results {
- display: none !important;
-}
-
-article {
- border: none !important;
-}
-
-/* Add URL after links */
-.vieworiginal a:after {
- content: " (" attr(href) ")";
-}
-
-/* Add explanation after abbr */
-abbr[title]:after {
- content: " (" attr(title) ")";
-}
-
-/* Change border on current pager item */
-.pagination span.current {
- border-style: dashed;
-}
-
-#main {
- width: 100%;
- padding: 0;
- margin: 0;
- margin-left: 0;
- padding-right: 0;
- padding-bottom: 0;
-}
-
-#article {
- width: 100%;
-}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/ratatouille.css b/src/Wallabag/Wallabag/Resources/views/baggy/public/css/ratatouille.css
deleted file mode 100644
index b203cbb89..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/css/ratatouille.css
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- Ratatouille mini Framework css by Thomas LEBEAU
- Base on KNACSS => www.KNACSS.com (2013-10) @author: Raphael Goetter, Alsacreations
- and normalize.css
-*/
-
-* {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-html {
- font-family: sans-serif; /* 1 */
- -ms-text-size-adjust: 100%; /* 2 */
- -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-body {
- font-size: 1em;
- line-height:1.5;
- margin: 0;
-}
-
-/* ==========================================================================
- Mise en forme
- ========================================================================== */
-
-h1:first-child,
-h2:first-child,
-h3:first-child,
-h4:first-child,
-h5:first-child,
-h6:first-child,
-p:first-child,
-ul:first-child,
-ol:first-child,
-dl:first-child{
- margin-top: 0;
-}
-
-code,
-kbd,
-pre,
-samp {
- font-family: monospace, serif;
-}
-
-pre {
- white-space: pre-wrap;
-}
-
-
-.upper {
- text-transform: uppercase;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.inner {
- margin: 0 auto;
- max-width: 61.25em;/*980px*/
-}
-
-table, img {
- max-width: 100%;
- height :auto;
-}
-
-iframe {
- max-width: 100%;
-}
-
-.fl {
- float: left;
-}
-
-.fr {
- float: right;
-}
-
-table {
- border-collapse: collapse;
-}
-
-figure {
- margin: 0;
-}
-
-button,
-input,
-select,
-textarea {
- font-family: inherit;
- font-size: 100%;
- margin: 0;
-}
-
-input[type="search"] {
- -webkit-appearance: textfield;
-}
-
-/* ==========================================================================
- Mise en page
- ========================================================================== */
-
-.dib {
- display: inline-block;
- vertical-align: middle;
-}
-
-.dnone {
- display: none;
-}
-
-.dtable { display:table }
-
- .dtable > * { display:table-row; }
-
- .dtable > * > * { display:table-cell; }
-
-.element-invisible {
- border: 0;
- clip: rect(0 0 0 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
-}
-
-.small {
- font-size:0.8em;
-}
-
-.big {
- font-size: 1.2em;
-}
-
-/*Width*/
-
-.w100 { width:100%; }
-.w90 { width:90%; }
-.w80 { width:80%; }
-.w70 { width:70%; }
-.w60 { width:60%; }
-.w50 { width:50%; }
-.w40 { width:40%; }
-.w30 { width:30%; }
-.w20 { width:20%; }
-.w10 { width:10%; }
-
-
-/* ==========================================================================
- Internet Explorer
- ========================================================================== */
-
-/*IE8 and IE9*/
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
- display: block;
-}
-
-/*IE8 and IE9*/
-
-audio,
-canvas,
-video {
- display: inline-block;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0){
- select{
- -webkit-appearance: none;
- border-radius: 0;
- }
-}
-
-/* ==========================================================================
- Medias Queries
- ========================================================================== */
-
-/*Desktop 1080px*/
-
-@media screen and (max-width: 67.50em) {
-}
-
-/*Tablet 800px*/
-
-@media screen and (max-width: 50em) {
-}
-
-/*Mobile 640px*/
-
-@media screen and (max-width: 40em) {
-}
-
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.eot b/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.eot
deleted file mode 100644
index 563235166..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.eot and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.svg b/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.svg
deleted file mode 100644
index b45861363..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.ttf b/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.ttf
deleted file mode 100644
index bb1f21f88..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.ttf and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.woff b/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.woff
deleted file mode 100644
index bab137795..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/icomoon.woff and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/ptsans.woff b/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/ptsans.woff
deleted file mode 100644
index cf7c62e10..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/fonts/ptsans.woff and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/blank.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/blank.png
deleted file mode 100755
index 63e09844e..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/blank.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/down.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/down.png
deleted file mode 100644
index b9d536a7c..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/down.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/list.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/list.png
deleted file mode 100755
index bd5aff5ae..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/list.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/table.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/table.png
deleted file mode 100755
index 859c4cd8f..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/table.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/top.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/top.png
deleted file mode 100644
index 954a8c0ac..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/baggy/top.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/bg-select.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/bg-select.png
deleted file mode 100644
index 951204412..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/bg-select.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-other_themes.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-other_themes.png
deleted file mode 100755
index 32543a449..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-other_themes.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-w.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-w.png
deleted file mode 100755
index 65dc607b7..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-w.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-wallabag.svg b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-wallabag.svg
deleted file mode 100644
index 40193e1c5..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo-wallabag.svg
+++ /dev/null
@@ -1,300 +0,0 @@
-
-
-
-]>
-
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo.png b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo.png
deleted file mode 100755
index 5305c77da..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo.svg b/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo.svg
deleted file mode 100644
index 865da440d..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/img/logo.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/js/closeMessage.js b/src/Wallabag/Wallabag/Resources/views/baggy/public/js/closeMessage.js
deleted file mode 100644
index 527719d5a..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/js/closeMessage.js
+++ /dev/null
@@ -1,17 +0,0 @@
-$(function(){
- //---------------------------------------------------------------------------
- // Show the close icon when the user hover over a message
- //---------------------------------------------------------------------------
- // $('.messages').on('mouseenter', function(){
- // $(this).find('a.closeMessage').stop(true, true).show();
- // }).on('mouseleave', function(){
- // $(this).find('a.closeMessage').stop(true, true).hide();
- // });
- //---------------------------------------------------------------------------
- // Close the message box when the user clicks the close icon
- //---------------------------------------------------------------------------
- $('a.closeMessage').on('click', function(){
- $(this).parents('div.messages').slideUp(300, function(){ $(this).remove(); });
- return false;
- });
-});
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/js/init.js b/src/Wallabag/Wallabag/Resources/views/baggy/public/js/init.js
deleted file mode 100755
index 74cbae683..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/js/init.js
+++ /dev/null
@@ -1,51 +0,0 @@
-$.fn.ready(function() {
-
- var $listmode = $('#listmode'),
- $listentries = $("#list-entries");
-
- /* ==========================================================================
- Menu
- ========================================================================== */
-
- $("#menu").click(function(){
- $("#links").toggleClass('menu--open');
- if ($('#content').hasClass('opacity03')) {
- $('#content').removeClass('opacity03');
- }
- });
-
- /* ==========================================================================
- List mode or Table Mode
- ========================================================================== */
-
- $listmode.click(function(){
- if ( $.cookie("listmode") == 1 ) {
- // Cookie
- $.removeCookie("listmode");
-
- $listentries.removeClass("listmode");
- $listmode.removeClass("tablemode");
- $listmode.addClass("listmode");
- }
- else {
- // Cookie
- $.cookie("listmode", 1, {expires: 365});
-
- $listentries.addClass("listmode");
- $listmode.removeClass("listmode");
- $listmode.addClass("tablemode");
- }
-
- });
-
- /* ==========================================================================
- Cookie listmode
- ========================================================================== */
-
- if ( $.cookie("listmode") == 1 ) {
- $listentries.addClass("listmode");
- $listmode.removeClass("listmode");
- $listmode.addClass("tablemode");
- }
-
-});
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/js/jquery.cookie.js b/src/Wallabag/Wallabag/Resources/views/baggy/public/js/jquery.cookie.js
deleted file mode 100755
index 927190008..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/js/jquery.cookie.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.4.0
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2013 Klaus Hartl
- * Released under the MIT license
- */
-(function (factory) {
- if (typeof define === 'function' && define.amd) {
- // AMD. Register as anonymous module.
- define(['jquery'], factory);
- } else {
- // Browser globals.
- factory(jQuery);
- }
-}(function ($) {
-
- var pluses = /\+/g;
-
- function encode(s) {
- return config.raw ? s : encodeURIComponent(s);
- }
-
- function decode(s) {
- return config.raw ? s : decodeURIComponent(s);
- }
-
- function stringifyCookieValue(value) {
- return encode(config.json ? JSON.stringify(value) : String(value));
- }
-
- function parseCookieValue(s) {
- if (s.indexOf('"') === 0) {
- // This is a quoted cookie as according to RFC2068, unescape...
- s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
- }
-
- try {
- // Replace server-side written pluses with spaces.
- // If we can't decode the cookie, ignore it, it's unusable.
- s = decodeURIComponent(s.replace(pluses, ' '));
- } catch(e) {
- return;
- }
-
- try {
- // If we can't parse the cookie, ignore it, it's unusable.
- return config.json ? JSON.parse(s) : s;
- } catch(e) {}
- }
-
- function read(s, converter) {
- var value = config.raw ? s : parseCookieValue(s);
- return $.isFunction(converter) ? converter(value) : value;
- }
-
- var config = $.cookie = function (key, value, options) {
-
- // Write
- if (value !== undefined && !$.isFunction(value)) {
- options = $.extend({}, config.defaults, options);
-
- if (typeof options.expires === 'number') {
- var days = options.expires, t = options.expires = new Date();
- t.setDate(t.getDate() + days);
- }
-
- return (document.cookie = [
- encode(key), '=', stringifyCookieValue(value),
- options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
- options.path ? '; path=' + options.path : '',
- options.domain ? '; domain=' + options.domain : '',
- options.secure ? '; secure' : ''
- ].join(''));
- }
-
- // Read
-
- var result = key ? undefined : {};
-
- // To prevent the for loop in the first place assign an empty array
- // in case there are no cookies at all. Also prevents odd result when
- // calling $.cookie().
- var cookies = document.cookie ? document.cookie.split('; ') : [];
-
- for (var i = 0, l = cookies.length; i < l; i++) {
- var parts = cookies[i].split('=');
- var name = decode(parts.shift());
- var cookie = parts.join('=');
-
- if (key && key === name) {
- // If second argument (value) is a function it's a converter...
- result = read(cookie, value);
- break;
- }
-
- // Prevent storing a cookie that we couldn't decode.
- if (!key && (cookie = read(cookie)) !== undefined) {
- result[name] = cookie;
- }
- }
-
- return result;
- };
-
- config.defaults = {};
-
- $.removeCookie = function (key, options) {
- if ($.cookie(key) !== undefined) {
- // Must not alter options, thus extending a fresh object...
- $.cookie(key, '', $.extend({}, options, { expires: -1 }));
- return true;
- }
- return false;
- };
-
-}));
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/public/js/restoreScroll.js b/src/Wallabag/Wallabag/Resources/views/baggy/public/js/restoreScroll.js
deleted file mode 100644
index 331c9e196..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/public/js/restoreScroll.js
+++ /dev/null
@@ -1,25 +0,0 @@
-function supportsLocalStorage() {
- try {
- return 'localStorage' in window && window['localStorage'] !== null;
- } catch (e) {
- return false;
- }
-}
-
-function savePercent(id, percent) {
- if (!supportsLocalStorage()) { return false; }
- localStorage["poche.article." + id + ".percent"] = percent;
- return true;
-}
-
-function retrievePercent(id) {
- if (!supportsLocalStorage()) { return false; }
-
- var bheight = $(document).height();
- var percent = localStorage["poche.article." + id + ".percent"];
- var scroll = bheight * percent;
-
- $('html,body').animate({scrollTop: scroll}, 'fast');
-
- return true;
-}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/screenshot.jpg b/src/Wallabag/Wallabag/Resources/views/baggy/screenshot.jpg
deleted file mode 100755
index 19cd24bb3..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/baggy/screenshot.jpg and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/tags.twig b/src/Wallabag/Wallabag/Resources/views/baggy/tags.twig
deleted file mode 100755
index 65930eb25..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/tags.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}Tags{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-{% trans "Tags" %}
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/theme.ini b/src/Wallabag/Wallabag/Resources/views/baggy/theme.ini
deleted file mode 100644
index 31665e18e..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/theme.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-name = Baggy
-description = Responsive black and white theme especially adapted to smartphones.
-requirements[] = default
diff --git a/src/Wallabag/Wallabag/Resources/views/baggy/view.twig b/src/Wallabag/Wallabag/Resources/views/baggy/view.twig
deleted file mode 100755
index 1afd9df6a..000000000
--- a/src/Wallabag/Wallabag/Resources/views/baggy/view.twig
+++ /dev/null
@@ -1,102 +0,0 @@
-{% extends "layout.twig" %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
-{% block content %}
- {% include '_highlight.twig' %}
-
-
- - {% trans "Back to top" %}
- - {{ entry.url | e | getDomain }}
- - {% trans "Toggle mark as read" %}
- - {% trans "Toggle favorite" %}
- - {% trans "Delete" %}
- {% if constant('SHARE_TWITTER') == 1 %}- {% trans "Tweet" %}
{% endif %}
- {% if constant('SHARE_MAIL') == 1 %}- {% trans "Email" %}
{% endif %}
- {% if constant('SHARE_SHAARLI') == 1 %}- {% trans "shaarli" %}
{% endif %}
- {% if constant('SHARE_DIASPORA') == 1 %}- {% trans "diaspora" %}
{% endif %}
- {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}- {% trans "flattr" %}
{% elseif flattr.status == constant('FLATTRED') %}- {% trans "flattr" %} ({{ flattr.numFlattrs }})
{% endif %}{% endif %}
- {% if constant('CARROT') == 1 %}- Carrot
{% endif %}
- {% if constant('SHOW_PRINTLINK') == 1 %}- {% trans "Print" %}
{% endif %}
- {% if constant('EPUB') == 1 %}- EPUB
{% endif %}
- {% if constant('MOBI') == 1 %}- MOBI
{% endif %}
- {% if constant('PDF') == 1 %}- PDF
{% endif %}
- - {% trans "Does this article appear wrong?" %}
-
-
-
-
- {{ entry.title|raw }}
-
-
-
- {{ content | raw }}
-
-
-
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/README.md b/src/Wallabag/Wallabag/Resources/views/dark/README.md
deleted file mode 100644
index 92077994a..000000000
--- a/src/Wallabag/Wallabag/Resources/views/dark/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# dark theme
-
-theme created by Nicolas Lœuillet aka nico_somb
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/css/style-dark.css b/src/Wallabag/Wallabag/Resources/views/dark/public/css/style-dark.css
deleted file mode 100644
index 41782c485..000000000
--- a/src/Wallabag/Wallabag/Resources/views/dark/public/css/style-dark.css
+++ /dev/null
@@ -1,74 +0,0 @@
-body {
- color: #d4d4d4;
- background-color: #262627;
-}
-
-a,
-a:hover,
-a:visited {
- color: #d4d4d4;
-}
-
-a.back span {
- background-image: url('../img/dark/left.png');
-}
-
-a.top span {
- background-image: url('../img/dark/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
- background-image: url('../img/dark/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
- background-image: url('../img/dark/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
- background-image: url('../img/dark/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
- background-image: url('../img/dark/checkmark-off.png');
-}
-
-a.twitter span {
- background-image: url('../img/dark/twitter.png');
-}
-
-a.shaarli span {
- background-image: url('../img/dark/shaarli.png');
-}
-
-a.flattr span {
- background-image: url('../img/dark/flattr.png');
-}
-
-a.email span {
- background-image: url('../img/dark/envelop.png');
-}
-
-a.delete span {
- background-image: url('../img/dark/remove.png');
-}
-
-a.link span {
- background-image: url('../img/dark/link.png');
-}
-
-a.bad-display span {
- background-image: url('../img/dark/bad-display.png');
-}
-
-.pagination a {
- color: #aaa;
-}
-
-#article_toolbar {
- background: #262627;
-}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/backtotop.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/backtotop.png
deleted file mode 100644
index c885086dc..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/backtotop.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/bad-display.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/bad-display.png
deleted file mode 100644
index 66ea2e160..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/bad-display.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/checkmark-off.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/checkmark-off.png
deleted file mode 100644
index 661ea997a..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/checkmark-off.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/checkmark-on.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/checkmark-on.png
deleted file mode 100644
index 5ee8c8d30..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/checkmark-on.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/down.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/down.png
deleted file mode 100644
index 4150e17cb..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/down.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/envelop.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/envelop.png
deleted file mode 100644
index 73d9b0b96..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/envelop.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/flattr.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/flattr.png
deleted file mode 100644
index b457d080b..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/flattr.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/left.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/left.png
deleted file mode 100644
index c2f7a20ec..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/left.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/link.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/link.png
deleted file mode 100644
index a5b8d8d2b..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/link.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/remove.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/remove.png
deleted file mode 100644
index 0c3dcfdff..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/remove.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/rss.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/rss.png
deleted file mode 100644
index 21bad1a17..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/rss.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/shaarli.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/shaarli.png
deleted file mode 100644
index e68ac8b54..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/shaarli.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/star-off.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/star-off.png
deleted file mode 100644
index 8194bc2dc..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/star-off.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/star-on.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/star-on.png
deleted file mode 100644
index 109c3aec7..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/star-on.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/top.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/top.png
deleted file mode 100644
index d137bd240..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/top.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/twitter.png b/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/twitter.png
deleted file mode 100644
index 6ce8a4d96..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/public/img/dark/twitter.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/public/public b/src/Wallabag/Wallabag/Resources/views/dark/public/public
deleted file mode 120000
index fd316b377..000000000
--- a/src/Wallabag/Wallabag/Resources/views/dark/public/public
+++ /dev/null
@@ -1 +0,0 @@
-../../themes/default/public
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/screenshot.jpg b/src/Wallabag/Wallabag/Resources/views/dark/screenshot.jpg
deleted file mode 100644
index daaad6c9e..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dark/screenshot.jpg and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dark/theme.ini b/src/Wallabag/Wallabag/Resources/views/dark/theme.ini
deleted file mode 100644
index 4b020d363..000000000
--- a/src/Wallabag/Wallabag/Resources/views/dark/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Dark
-requirements[] = default
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_bookmarklet.twig b/src/Wallabag/Wallabag/Resources/views/default/_bookmarklet.twig
deleted file mode 100644
index 619963539..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_bookmarklet.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_footer.twig b/src/Wallabag/Wallabag/Resources/views/default/_footer.twig
deleted file mode 100644
index 213a4acad..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_footer.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_head.twig b/src/Wallabag/Wallabag/Resources/views/default/_head.twig
deleted file mode 100755
index 277e38334..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_head.twig
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_highlight.twig b/src/Wallabag/Wallabag/Resources/views/default/_highlight.twig
deleted file mode 100755
index cdb7c6bf3..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_highlight.twig
+++ /dev/null
@@ -1,4 +0,0 @@
- {# include excelent highlight.js library for code highligting, see http://highlightjs.org/ #}
-
-
-
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_import.twig b/src/Wallabag/Wallabag/Resources/views/default/_import.twig
deleted file mode 100755
index c59b7a154..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_import.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_menu.twig b/src/Wallabag/Wallabag/Resources/views/default/_menu.twig
deleted file mode 100644
index eedf84f10..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_menu.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-
- - {% trans "unread" %}
- - {% trans "favorites" %}
- - {% trans "archive" %}
- - {% trans "tags" %}
- - {% trans "save a link" %}
- - {% trans "search" %}
- - {% trans "config" %}
- - {% trans "about" %}
- - {% trans "logout" %}
-
- {% include '_pocheit-form.twig' %}
- {% include '_search-form.twig' %}
-
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_messages.twig b/src/Wallabag/Wallabag/Resources/views/default/_messages.twig
deleted file mode 100644
index 679aa0981..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_messages.twig
+++ /dev/null
@@ -1 +0,0 @@
- {{ messages | raw }}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_pocheit-form.twig b/src/Wallabag/Wallabag/Resources/views/default/_pocheit-form.twig
deleted file mode 100755
index 8c982db09..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_pocheit-form.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_search-form.twig b/src/Wallabag/Wallabag/Resources/views/default/_search-form.twig
deleted file mode 100755
index 0cf6097a5..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_search-form.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_sorting.twig b/src/Wallabag/Wallabag/Resources/views/default/_sorting.twig
deleted file mode 100755
index 3ce9b949f..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_sorting.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-{% if entries|length > 1 %}
-
-{% endif %}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/_top.twig b/src/Wallabag/Wallabag/Resources/views/default/_top.twig
deleted file mode 100755
index 45806f01a..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/_top.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- {% if view == 'home' %}{% block logo %}
{% endblock %}
- {% else %}{{ block('logo') }}
- {% endif %}
-
-
diff --git a/src/Wallabag/Wallabag/Resources/views/default/about.twig b/src/Wallabag/Wallabag/Resources/views/default/about.twig
deleted file mode 100755
index 50ffd8ef4..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/about.twig
+++ /dev/null
@@ -1,74 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "About wallabag" %}{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
- {% trans "About wallabag" %}
-
-
- - {% trans "Project website" %}
- - http://www.wallabag.org
-
- - {% trans "Main developer" %}
- - Nicolas Lœuillet — {% trans "website" %}
-
- - {% trans "Contributors:" %}
- - {% trans "on Github" %}
-
- - {% trans "Bug reports" %}
- - {% trans "On our support website" %} {% trans "or" %} {% trans "on Github" %}
-
- - {% trans "License" %}
- - MIT
-
- - {% trans "Version" %}
- - {{ constant('WALLABAG') }}
-
-
- {% 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." %}
-
- {% trans "Helping wallabag" %}
-
- {% trans "wallabag is free and opensource. You can help us:" %}
-
-
-
- {% trans "Credits" %}
-
- - PHP Readability
- - https://bitbucket.org/fivefilters/php-readability
-
- - Full Text RSS
- - http://code.fivefilters.org/full-text-rss/src
-
- - logo by Maylis Agniel
- - https://github.com/wallabag/logo
-
- - icons
- - http://icomoon.io
-
- - PHP Simple HTML DOM Parser
- - http://simplehtmldom.sourceforge.net/
-
- - Session
- - https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
-
- - Twig
- - http://twig.sensiolabs.org
-
- - Flash messages
- - https://github.com/plasticbrain/PHP-Flash-Messages
-
- - Pagination
- - https://github.com/daveismyname/pagination
-
- - PHPePub
- - https://github.com/Grandt/PHPePub/
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/config.twig b/src/Wallabag/Wallabag/Resources/views/default/config.twig
deleted file mode 100755
index b7d91937b..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/config.twig
+++ /dev/null
@@ -1,188 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "config" %}{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
- {% trans "Saving articles" %}
- {% trans "There are several ways to save an article:" %} {% trans "(?)" %}
-
-
-
- Browser Plugins
-
- Mobile Apps
-
- - Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
- - iOS: {% trans "download the application" %}
- - Windows Phone: {% trans "download the application" %}
-
- {% trans "Bookmarklet" %}
-
- {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %}
-
-
- {% trans "Feeds" %}
- {% if token == '' %}
- {% trans "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." %}
- {% else %}
-
-
- {% trans "Your token:" %} {{token}}
- {% trans "Your user id:" %} {{user_id}}
- {% trans "You can regenerate your token: generate!." %}
-
- {% endif %}
-
- {% trans "Change your theme" %}
-
-
- {% trans "Change your language" %}
-
-
- {% trans "Import" %}
- {% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}
- {% trans "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." %}
-
- {% trans "You can click here to fetch content for articles with no content." %}
- {% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}
-
- {% trans "Export your wallabag data" %}
- {% trans "Export JSON" %}
- Data will be exported in a single JSON file.
-
- {% trans "Fancy an E-Book ?" %}
- {% trans "Click to get all your articles in one ebook :" %}
-
-
-
- {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}
-
- {% trans "Cache" %}
- {% trans "Delete Cache" %}
- Deleting the cache may help with display or other problems.
-
- {% if http_auth == 0 %}
- {% trans "Change your password" %}
-
- {% endif %}
-
- {% trans 'Add user' %}
-
-
- {% trans "Delete account" %}
- {% if not only_user %}
- {% else %}{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}
{% endif %}
-
- {% trans "Upgrading wallabag" %}
-
- - {% trans "Installed version" %}: {{ constant('WALLABAG') }}
- - {% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}{% trans "A more recent stable version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})
- {% if constant('DEBUG_POCHE') == 1 %}- {% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}{% trans "A more recent development version is available." %}{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}
-
- {% trans "You can clear cache to check the latest release." %}
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/edit-tags.twig b/src/Wallabag/Wallabag/Resources/views/default/edit-tags.twig
deleted file mode 100755
index c29427e0a..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/edit-tags.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}edit tags{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-
-
-
-
-
-
-
- {{ entry.title|raw }}
-
-
-
-{% if tags is empty %}
-{% trans "no tags" %}
-{% endif %}
-
-{% for tag in tags %}- {{ tag.value }} ✘
{% endfor %}
-
-
-
-« {% trans "return to article" %}
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/error.twig b/src/Wallabag/Wallabag/Resources/views/default/error.twig
deleted file mode 100644
index 528a09858..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/error.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}{% trans "plop" %}{% endblock %}
-{% block content %}
- Errors
-
- {% for message in msg %}
- - {{message}}
- {% endfor %}
-
- Don't forget the documentation.
-
- {% trans "You can check your configuration here." %}
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/export.twig b/src/Wallabag/Wallabag/Resources/views/default/export.twig
deleted file mode 100644
index 4adb95402..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/export.twig
+++ /dev/null
@@ -1 +0,0 @@
-{{ export }}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/default/home.twig b/src/Wallabag/Wallabag/Resources/views/default/home.twig
deleted file mode 100755
index b90005598..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/home.twig
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}
-{% if view == 'fav' %}
-{% trans "favoris" %}
-{% elseif view == 'archive' %}
-{% trans "archive" %}
-{% else %}
-{% trans "unread" %}
-{% endif %}
-{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block precontent %}
-
-{% include '_sorting.twig' %}
-{% endblock %}
-{% block content %}
-
- {% if includeImport %}
- {% include '_import.twig' %}
- {% endif %}
-
- {% if tag %}
- {% trans "Tag" %}: {{ tag.value }}
- {% endif %}
-
- {% if entries is empty %}
-
- {% else %}
- {% block pager %}
- {% if nb_results > 1 %}
-
- {{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
- {{ page_links | raw }}
-
- {% elseif nb_results == 1 %}
- {% if searchterm is defined %}
-
- {% trans "Only one result found for " %} « {{ searchterm }} »
-
- {% endif %}
- {% endif %}
- {% endblock %}
- {% for entry in entries %}
-
- {{ entry.title|raw }}
-
- - {% trans "Toggle mark as read" %}
- - {% trans "toggle favorite" %}
- - {% trans "delete" %}
- - {{ entry.url | e | getDomain }}
- - {{ entry.content| getReadingTime }} min
-
- {{ entry.content|striptags|slice(0, 300) }}...
-
- {% endfor %}
-
- {{ block('pager') }}
- {% if view == 'home' %}{% if nb_results > 1 %}{% trans "Mark all the entries as read" %}
{% endif %}{% endif %}
- {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %}
-
- {% if searchterm is defined %}{% trans "Delete results matching" %} {{ searchterm }}{% endif %}
-
- {% if tag %}{% trans "Mark all articles from this tag as read" %}
{% endif %}
-
- {% if tag %}
- {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %}
- {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %}
- {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %}
- {% elseif searchterm is defined %}
- {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %}
- {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %}
- {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %}
- {% else %}
- {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %}
- {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %}
- {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %}
- {% endif %}
-
- {% endif %}
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/install.twig b/src/Wallabag/Wallabag/Resources/views/default/install.twig
deleted file mode 100644
index c89c7e47e..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/install.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}{% trans "installation" %}{% endblock %}
-{% block content %}
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/layout.twig b/src/Wallabag/Wallabag/Resources/views/default/layout.twig
deleted file mode 100644
index dfebc3eac..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/layout.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {% block title %}{% endblock %} - wallabag
-{% include '_head.twig' %}
-{% include '_bookmarklet.twig' %}
-
-
- {% include '_top.twig' %}
-
- {% block menu %}{% endblock %}
- {% block precontent %}{% endblock %}
- {% block messages %}
- {% include '_messages.twig' %}
- {% endblock %}
-
- {% block content %}{% endblock %}
-
-
-{% include '_footer.twig' %}
-
-
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/default/login.twig b/src/Wallabag/Wallabag/Resources/views/default/login.twig
deleted file mode 100644
index b9f8b497c..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/login.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "layout.twig" %}
-
-{% block title %}{% trans "login to your wallabag" %}{% endblock %}
-{% block content %}
- {% if http_auth == 0 %}
-
- {% endif %}
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/animated-overlay.gif b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/animated-overlay.gif
deleted file mode 100644
index d441f75eb..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/animated-overlay.gif and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index 9f10cb65d..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100644
index b89b914b9..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index 780d3ffdc..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index da53255b3..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index f6306608b..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index 7d3470653..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index 533c49006..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index bf3a9481a..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_222222_256x240.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_222222_256x240.png
deleted file mode 100644
index c1cb1170c..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 84b601bf0..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_454545_256x240.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_454545_256x240.png
deleted file mode 100644
index b6db1acdd..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_888888_256x240.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_888888_256x240.png
deleted file mode 100644
index feea0e202..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png b/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index ed5b6b093..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/css/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/knacss.css b/src/Wallabag/Wallabag/Resources/views/default/public/css/knacss.css
deleted file mode 100644
index ca0696b7a..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/public/css/knacss.css
+++ /dev/null
@@ -1 +0,0 @@
-html{font-size:62.5%}body{font-family:"Century Gothic",helvetica,arial,sans-serif;font-size:1.4em;line-height:1.5;color:#000;background-color:#FFF}p,ul,ol,dl,blockquote,pre,td,th,label,textarea,caption,details,figure,hgroup{margin:.75em 0 0;font-size:1em;line-height:1.5}h1,.h1-like{margin:.8077em 0 0 0;font-size:1.8571em;font-weight:normal;line-height:1.6154em}h2,.h2-like{margin:.875em 0 0 0;font-size:1.7143em;font-weight:normal;line-height:1.75em}h3,.h3-like{margin:.9545em 0 0 0;font-size:1.5714em;font-weight:normal;line-height:1.909em}h4,.h4-like{margin:1.05em 0 0 0;font-size:1.4286em;font-weight:normal;line-height:1.05em}h5,.h5-like{margin:1.1667em 0 0 0;font-size:1.2857em;font-weight:normal;line-height:1.1667em}h6,.h6-like{margin:1.3125em 0 0 0;font-size:1.1429em;font-weight:normal;line-height:1.3125em}.smaller{font-size:.7143em}.small{font-size:.8571em}.big{font-size:1.1429em}.bigger{font-size:1.2857em}.biggest{font-size:1.4286em}html,body,textarea,figure,label{margin:0;padding:0}ul,ol{padding-left:2em}code,pre,samp,kbd{font-family:consolas,'DejaVu Sans Mono',courier,monospace;line-height:1em;white-space:pre-wrap}code,kbd,mark{border-radius:2px}em{font-style:italic}strong{font-weight:bold}kbd{padding:0 2px;border:1px solid #999}code{padding:2px 4px;color:#B11;background:rgba(0,0,0,.04)}mark{padding:2px 4px;background:#FF0}table{margin-bottom:1.5em}p:first-child,ul:first-child,ol:first-child,dl:first-child,blockquote:first-child,pre:first-child,h1:first-child,h2:first-child,h3:first-child,h4:first-child,h5:first-child,h6:first-child{margin-top:0}li p,li ul,li ol{margin-top:0;margin-bottom:0}img,table,td,blockquote,code,pre,textarea,input,video{max-width:100%}div,textarea,table,td,th,code,pre,samp{word-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;-o-hyphens:auto;hyphens:auto}img{height:auto;vertical-align:middle}#map_canvas img,.gmnoprint img{max-width:none}a img{border:0}body > script{display:none !important}.skip-links{position:absolute}.skip-links a{position:absolute;left:-7000px;padding:.5em;text-decoration:none;color:#FFF;background:#000}.skip-links a:focus{position:static}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.mod,.item{overflow:hidden}.row{display:table;width:100%;table-layout:fixed}.row > *,.col{display:table-cell;vertical-align:top}.clear,.line,.row{clear:both}.clearfix:after,.line:after,.mod:after{content:"";display:table;clear:both}.left{float:left}img.left{margin-right:1em}.right{float:right}img.right{margin-left:1em}img.left,img.right{margin-bottom:5px}.center{margin-right:auto;margin-left:auto}.txtleft{text-align:left}.txtright{text-align:right}.txtcenter{text-align:center}.inbl{display:inline-block;margin-right:-.25em;vertical-align:top}.w10{width:10%}.w20{width:20%}.w25{width:25%}.w30{width:30%}.w33{width:33.333%}.w40{width:40%}.w50{width:50%}.w60{width:60%}.w66{width:66.666%}.w70{width:70%}.w75{width:75%}.w80{width:80%}.w90{width:90%}.w100{width:100%}.w50p{width:50px}.w100p{width:100px}.w150p{width:150px}.w200p{width:200px}.w300p{width:300px}.w400p{width:400px}.w500p{width:500px}.w600p{width:600px}.w700p{width:700px}.w800p{width:800px}.w960p{width:960px}.mw960p{max-width:960px}.m-reset,.ma0{margin:0 !important}.p-reset,.pa0{padding:0 !important}.ma1,.mas{margin:10px !important}.ma2,.mam{margin:20px !important}.ma3,.mal{margin:30px !important}.pa1,.pas{padding:10px}.pa2,.pam{padding:20px}.pa3,.pal{padding:30px}.mt0,.mtn{margin-top:0 !important}.mt1,.mts{margin-top:10px !important}.mt2,.mtm{margin-top:20px !important}.mt3,.mtl{margin-top:30px !important}.mr0,.mrn{margin-right:0}.mr1,.mrs{margin-right:10px}.mr2,.mrm{margin-right:20px}.mr3,.mrl{margin-right:30px}.mb0,.mbn{margin-bottom:0 !important}.mb1,.mbs{margin-bottom:10px !important}.mb2,.mbm{margin-bottom:20px !important}.mb3,.mbl{margin-bottom:30px !important}.ml0,.mln{margin-left:0}.ml1,.mls{margin-left:10px}.ml2,.mlm{margin-left:20px}.ml3,.mll{margin-left:30px}.pt0,.ptn{padding-top:0}.pt1,.pts{padding-top:10px}.pt2,.ptm{padding-top:20px}.pt3,.ptl{padding-top:30px}.pr0,.prn{padding-right:0}.pr1,.prs{padding-right:10px}.pr2,.prm{padding-right:20px}.pr3,.prl{padding-right:30px}.pb0,.pbn{padding-bottom:0}.pb1,.pbs{padding-bottom:10px}.pb2,.pbm{padding-bottom:20px}.pb3,.pbl{padding-bottom:30px}.pl0,.pln{padding-left:0}.pl1,.pls{padding-left:10px}.pl2,.plm{padding-left:20px}.pl3,.pll{padding-left:30px}.visually-hidden{position:absolute;left:-7000px;overflow:hidden}[dir=rtl] .visually-hidden{right:-7000px;left:auto}.desktop-hidden{display:none}form,fieldset{border:none}input,button,select,label,.btn{font-family:inherit;vertical-align:middle}textarea{font-family:inherit;resize:vertical}.ie67 .clearfix,.ie67 .line,.ie67 .mod,.ie67 .row,.ie67 .col{zoom:1}.ie67 .btn,.ie67 .col,.ie67 .inbl{display:inline;zoom:1}.ie8 img{width:auto}@media print{p,blockquote{orphans:2;widows:2}blockquote,ul,ol{page-break-inside:avoid}h1,h2,h3,caption{page-break-after:avoid}}@media(orientation:landscape)and(max-device-width:768px){html,body{-webkit-text-size-adjust:100%}}[class*=grid] > *{float:left}[class*=grid] > * + *{margin-left:2%}.grid2 > *{width:49%}.grid3 > *{width:32%}.grid4 > *{width:23.5%}.grid5 > *{width:18.4%}.grid6 > *{width:15%}.grid2-1 > *:first-child,.grid1-2 > * + *{width:66%}.grid1-2 > *:first-child,.grid2-1 > * + *{width:32%}.grid1-3 > *:first-child,.grid3-1 > * + *{width:23.5%}.grid3-1 > *:first-child,.grid1-3 > * + *{width:74.5%}table,.table{max-width:100%;border-collapse:collapse;table-layout:fixed;vertical-align:top}table{width:100%}.table{display:table}caption{padding:10px;font-style:italic;color:#555}table{border:1px solid #CCC}tr > * + *{border-left:1px solid #CCC}th,td{padding:.3em .8em;border-bottom:1px solid #CCC;text-align:left}td{color:#333}.alternate{border:0}.alternate tbody{border:1px solid #CCC}.alternate thead tr > * + *{border-left:0}.alternate tbody tr > * + *{border-left:1px solid #CCC}.alternate-vert{border:0;border-right:1px solid #CCC}.alternate-vert tr >:first-child{border-bottom:0}.alternate-vert tr > * + *{border-top:1px solid #CCC}.striped tbody tr:nth-child(odd){background:#EEE;background:rgba(0,0,0,.05)}.striped-vert tr >:first-child{background:#EEE;background:rgba(0,0,0,.05)}.btn{display:inline-block}label{display:inline-block;vertical-align:middle;cursor:pointer}legend{border:0;white-space:normal}button,input,select{margin:0;font-family:"Century Gothic",helvetica,arial,sans-serif;font-size:100%;vertical-align:middle}textarea{min-height:5em;overflow:auto;font-size:1.75em;vertical-align:top;resize:vertical}}ol.styled{counter-reset:styled}ol.styled > li{counter-increment:styled;margin-bottom:.3em;list-style-type:none}ol.styled > li:before{content:counter(styled);display:inline-block;width:1em;height:1em;margin-right:.4em;padding:2px;border-radius:50%;text-align:center;text-indent:-.1em;font-size:.9em;line-height:1;vertical-align:middle;color:#FFF;background:rgba(0,0,0,.5)}@media(min-width:1280px){.large-hidden,.tablet-hidden{display:none !important}.large-visible{display:block !important}.large-no-float{float:none}.large-inbl{display:inline-block;float:none;vertical-align:top}.large-row{display:table;width:100% !important;table-layout:fixed}.large-col{display:table-cell;vertical-align:top}.large-w25{width:25% !important}.large-w33{width:33.3333% !important}.large-w50{width:50% !important}.large-w66{width:66.6666% !important}.large-w75{width:75% !important}.large-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.large-ma0,.large-man{margin:0 !important}}@media(max-width:768px){.w60,.w66,.w70,.w75,.w80,.w90,.w100,.w600p,.w700p,.w800p,.w960p,.mw960p,.medium-wauto{width:auto}.medium-hidden,.tablet-hidden{display:none !important}.medium-visible{display:block !important}.medium-no-float{float:none}.medium-inbl{display:inline-block;float:none;vertical-align:top}.medium-row{display:table;width:100% !important;table-layout:fixed}.medium-col{display:table-cell;vertical-align:top}.medium-w25{width:25% !important}.medium-w33{width:33.3333% !important}.medium-w50{width:50% !important}.medium-w66{width:66.6666% !important}.medium-w75{width:75% !important}.medium-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.medium-ma0,.medium-man{margin:0 !important}.grid4 > *{width:49% !important}.grid4 >:first-child + * + *{margin-left:0 !important}.grid6 > *{width:32% !important}.grid6 >:first-child + * + * + *{margin-left:0 !important}}@media(max-width:640px){.mod,.item,.col,fieldset{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.w30,.w33,.w40,.w50,.w300p,.w400p,.w500p{width:auto}.row{display:block !important;width:100% !important}.tiny-hidden,.phone-hidden{display:none !important}.tiny-visible{display:block !important}.tiny-no-float{float:none}.tiny-inbl{display:inline-block;float:none;vertical-align:top}.tiny-row{display:table;width:100% !important;table-layout:fixed}.tiny-col{display:table-cell;vertical-align:top}th,td{display:block !important;width:auto !important;text-align:left !important}thead{display:none}.tiny-w25{width:25% !important}.tiny-w33{width:33.3333% !important}.tiny-w50{width:50% !important}.tiny-w66{width:66.6666% !important}.tiny-w75{width:75% !important}.tiny-w100{display:block !important;float:none !important;clear:none !important;width:auto !important;margin-right:0 !important;margin-left:0 !important;border:0}.tiny-ma0,.tiny-man{margin:0 !important}}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/messages.css b/src/Wallabag/Wallabag/Resources/views/default/public/css/messages.css
deleted file mode 100644
index 46b547956..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/public/css/messages.css
+++ /dev/null
@@ -1,75 +0,0 @@
-.messages {
- display: block;
- clear: both;
- width: 400px;
- margin: 10px auto 10px;
- padding: 10px 0;
- -moz-border-radius: 4px;
- border-radius: 4px;
-}
-
-.messages a.closeMessage {
- display: none;
- float: right;
- width: 16px;
- height: 16px;
- margin: -14px -8px 0 0;
- background: url(../img/messages/close.png) no-repeat;
-}
-
-/*.messages:hover a.closeMessage { visibility:visible; }*/
-
-.messages p {
- margin: 3px 0 3px 10px !important;
- padding: 0 10px 0 23px !important;
- font-size: 14px;
- line-height: 16px;
-}
-
-.messages.error {
- border: 1px solid #c42608;
- color: #c00 !important;
- background: #fff0ef;
-}
-
-.messages.error p {
- color: #c00 !important;
- background: url(../img/messages/cross.png) no-repeat 0 50%;
-}
-
-.messages.success {
- border: 1px solid #6dc70c;
- background: #e0fbcc;
-}
-
-.messages.success p {
- color: #2b6301 !important;
- background: url(../img/messages/tick.png) no-repeat 0 50%;
-}
-
-.messages.warning {
- border: 1px solid #ebcd41;
- color: #000;
- background: #fffcd3;
-}
-
-.messages.warning p {
- color: #5f4e01;
- background: url(../img/messages/warning.png) no-repeat 0 50%;
-}
-
-.messages.information,
-.messages.info {
- border: 1px solid #82aee7;
- background: #dfebfb;
-}
-
-.messages.information p,
-.messages.info p {
- color: #064393;
- background: url(../img/messages/help.png) no-repeat 0 50%;
-}
-
-.messages.information a {
- text-decoration: underline;
-}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/print.css b/src/Wallabag/Wallabag/Resources/views/default/public/css/print.css
deleted file mode 100644
index 625478e19..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/public/css/print.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ### Layout ### */
-
-body {
- font-family: Serif;
- background-color: #fff;
-}
-
-@page {
- margin: 1cm;
-}
-
-img {
- max-width: 100% !important;
-}
-
-/* ### Content ### */
-
-/* Hide useless blocks */
-body > header,
-#links,
-#sort,
-body > footer,
-.top_link,
-div.tools,
-header div,
-.messages,
-.entrie + .results,
-#article_toolbar {
- display: none !important;
-}
-
-article {
- border: none !important;
-}
-
-pre code {
- line-height: 1.6em;
-}
-
-/* Add URL after links */
-.vieworiginal a:after {
- content: " (" attr(href) ")";
-}
-
-/* Add explanation after abbr */
-abbr[title]:after {
- content: " (" attr(title) ")";
-}
-
-/* Change border on current pager item */
-.pagination span.current {
- border-style: dashed;
-}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/style-default.css b/src/Wallabag/Wallabag/Resources/views/default/public/css/style-default.css
deleted file mode 100755
index 4406d48f4..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/public/css/style-default.css
+++ /dev/null
@@ -1,69 +0,0 @@
-a.back span {
- background-image: url('../img/default/left.png');
-}
-
-a.top span {
- background-image: url('../img/default/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
- background-image: url('../img/default/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
- background-image: url('../img/default/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
- background-image: url('../img/default/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
- background-image: url('../img/default/checkmark-off.png');
-}
-
-a.twitter span {
- background-image: url('../img/default/twitter.png');
-}
-
-a.shaarli span {
- background-image: url('../img/default/shaarli.png');
-}
-
-a.flattr span {
- background-image: url('../img/default/flattr.png');
-}
-
-a.carrot span {
- background-image: url('../../_global/img/icons/carrot-icon--black.png');
- background-size: 16px 16px;
-}
-
-a.diaspora span {
- background-image: url('../../_global/img/icons/diaspora-icon--black.png');
- background-size: 16px 16px;
-}
-
-a.email span {
- background-image: url('../img/default/envelop.png');
-}
-
-a.delete span {
- background-image: url('../img/default/remove.png');
-}
-
-a.link span {
- background-image: url('../img/default/link.png');
-}
-
-a.bad-display span {
- background-image: url('../img/default/bad-display.png');
-}
-
-a.print span {
- background-image: url('../img/default/print.png');
-}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/css/style.css b/src/Wallabag/Wallabag/Resources/views/default/public/css/style.css
deleted file mode 100755
index b25373d6c..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/public/css/style.css
+++ /dev/null
@@ -1,447 +0,0 @@
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto Regular'), local('Roboto-Regular'), url(../fonts/Roboto.woff) format('woff');
-}
-
-
-
-body {
- margin: 10px;
- font-family: 'Roboto',Verdana,Geneva,sans-serif;
- font-size: 16px;
- color: #000;
-}
-
-header {
- text-align: center;
-}
-
-header h1 {
- font-size: 1.3em;
-}
-
-a,
-a:hover,
-a:visited {
- color: #000;
-}
-
-.bouton {
- border: none;
- border-radius: 2px;
- color: #fff;
- background-color: #000;
-}
-
-.bouton:hover {
- color: #f1f1f1;
- background-color: #222;
- cursor: pointer;
-}
-
-#main {
- margin: 0 auto;
-}
-
-#main #links {
- padding: 0;
- text-align: center;
- font-size: 0.9em;
- list-style-type: none;
-}
-
-#main #links li {
- display: inline;
-}
-
-#main #links li .current {
- -webkit-border-radius: 2px;
- border-radius: 2px;
- color: #fff;
- background-color: #000;
-}
-
-#main #sort {
- padding: 0;
- text-align: center;
- list-style-type: none;
- opacity: 0.5;
-}
-
-#main #sort li {
- display: inline;
- font-size: 0.9em;
-}
-
-#main #sort li + li {
- margin-left: 10px;
-}
-
-#main #sort a {
- padding: 2px 2px 0;
- vertical-align: middle;
-}
-
-#main #sort img {
- vertical-align: baseline;
-}
-#main #sort img:hover {
- cursor: pointer;
-}
-
-#links a {
- padding: 5px 10px;
- text-decoration: none;
-}
-
-#links a:hover {
- -webkit-border-radius: 2px;
- border-radius: 2px;
- color: #f1f1f1;
- background-color: #040707;
-}
-
-/*** ***/
-
-/*** LINKS DISPLAY ***/
-
-#main .tool {
- text-decoration: none;
- cursor: pointer;
-}
-
-#main #content {
- margin-top: 20px;
-}
-
-#main #content h2 {
- text-decoration: none;
- font-size: 1.3em;
-}
-
-#main #content .entrie {
- margin-top: 15px;
- padding-bottom: 15px;
- border-bottom: 1px dashed #222;
- overflow: hidden;
-}
-
-/* First entry */
-#main #content .results + .entrie {
- clear: both;
- margin-top: 0;
-}
-
-#main .entrie .tools {
- float: right;
- text-align: right;
- list-style-type: none;
- opacity: 0.5;
-}
-
-#main .entrie .tools .tool span {
- display: inline-block;
- width: 16px;
- height: 16px;
- /* Hide textual content */
- overflow: hidden;
- text-align: left;
- text-indent: -9999px;
-}
-
-/*** ***/
-
-/*** ARTICLE PAGE ***/
-
-#article {
- margin: 0 auto;
-}
-
-#article header {
- border-bottom: 1px solid #222;
-}
-
-#article header {
- text-align: left;
-}
-
-#article header h1 small {
- float: right;
- font-size: 0.6em;
-}
-
-#article header a {
- text-decoration: none;
-}
-
-#article .tags {
- font-size: 0.8em;
- color: #888;
- padding-bottom: 5px;
-}
-
-.backhome {
- display: inline;
-}
-
-.results {
- padding: 15px 0;
- overflow: hidden;
-}
-
-.nb-results {
- float: left;
- font-size: 0.9em;
- line-height: 24px;
- vertical-align: middle;
-}
-
-#article_toolbar {
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100%;
- min-height: 50px;
- padding-top: 17px;
- text-align: center;
- color: #fff;
- opacity: 0.8;
- background: #fff;
-}
-
-#article_toolbar li {
- display: inline;
- padding-right: 30px;
-}
-
-#article_toolbar .tool {
- padding: 0 2px;
-}
-
-#article_toolbar .tool span {
- display: inline-block;
- width: 16px;
- height: 16px;
- /* Hide textual content */
- overflow: hidden;
- text-align: left;
- text-indent: -9999px;
-}
-
-/*** ***/
-
-/*** PAGINATION ***/
-
-.pagination {
- float: right;
- text-align: right;
-}
-
-.pagination a {
- height: 25px;
- margin: 2px;
- padding: 4px 8px;
- border: 1px solid #d5d5d5;
- text-decoration: none;
- font-size: 11px;
- font-weight: bold;
- color: #333;
-}
-
-.pagination a:hover,
-.pagination a:active {
- background-color: #efefef;
-}
-
-.pagination .current {
- height: 25px;
- margin: 2px;
- padding: 4px 8px;
- border: 1px solid #d5d5d5;
- text-decoration: none;
- font-size: 11px;
- font-weight: bold;
- color: #000;
- background-color: #ccc;
-}
-
-.pagination .disabled {
- display: none;
-}
-
-#bookmarklet {
- padding: 5px;
- border: 1px dashed #808080;
- background: #fff;
- cursor: move;
-}
-
-.top_link {
- display: none;
- z-index: 2000;
- position: fixed;
- right: 15px;
- bottom: 15px;
- padding: 20px;
- -webkit-border-radius: 40px;
- -moz-border-radius: 40px;
- border-radius: 40px;
- opacity: 0.9;
- background: #ccc;
-}
-
-footer {
- clear: both;
-}
-
-.reading-time {
- font-size: 0.8em;
-}
-
-#inputform {
- display: none;
- margin-top: 5px;
- margin-right: auto;
- margin-left: auto;
- padding-bottom: 5px;
- max-width: 300px;
- border-radius: 3px;
- text-align: center;
- color: #fff;
- opacity: 0.8;
- background-color: rgba(0,0,0,0.9);
-}
-
-a.back span,
-a.top span,
-a.fav span,
-a.fav span:hover,
-a.fav-off span,
-a.fav-off span:hover,
-a.archive span,
-a.archive span:hover,
-a.archive-off span,
-a.archive-off span:hover,
-a.twitter span,
-a.shaarli span,
-a.flattr span,
-a.email span,
-a.delete span,
-a.link span,
-a.bad-display span,
-a.reading-time span,
-a.print span {
- background-repeat: no-repeat;
-}
-
-.arrow-down {
- width: 0px;
- height: 0px;
- border-style: solid;
- border-width: 10px 10px 0 10px;
- border-color: #000 transparent transparent transparent;
-
- position: absolute;
- margin-top: 1.5em;
- margin-left: -30px;
-}
-
-.two-column {
- display: block;
- width: 50%;
- paddig-right: 20px;
- float: left;
- vertical-align: top;
-}
-
-
-/* ==========================================================================
- "save a link" popup div related styles
- ========================================================================== */
-
-#bagit-form {
- display: none;
- padding-left: 30px;
- width: 450px;
-
-}
-
-a#bagit-form-close {
- color: #FFF;
- display: inline-block;
- float: right;
- background: url("../img/messages/close.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
- height: 16px;
- margin: -14px -8px 0 0;
- width: 16px;
- text-decoration: none;
-}
-
-
-.add-to-wallabag-link-after {
- background-color: #000;
- color: #fff;
- padding: 0 4px 1px 3px;
- font-weight: bold;
- font-size: 0.7em;
- border-radius: 4px;
-}
-.add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active {
- color: #fff;
-}
-.add-to-wallabag-link-after:visited {
- color: #999;
-}
-a.add-to-wallabag-link-after {
- visibility: hidden;
- position: absolute;
- opacity: 0;
- transition-duration: 2s;
- transition-timing-function: ease-out;
-}
-#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover {
- opacity: 1;
- visibility: visible;
- transition-duration: .3s;
- transition-timing-function: ease-in;
-}
-a.add-to-wallabag-link-after:after {
- content: "w";
-}
-
-
-#add-link-result {
- display: inline;
- padding-left: 10px;
-}
-
-/* ==========================================================================
- "Search" popup div related styles
- ========================================================================== */
-
-/* Search form message needs a little more width, depending on translations */
-#search-form {
- width: 420px;
-}
-
-.opacity03 {
- /*opacity: 0.3;*/
-}
-
-#readLeftPercent {
- display: inline-block;
- /* Show textual content */
- overflow: visible;
- text-align: left;
- text-indent: 0;
- color: black;
- width: 50px;
-}
-
-pre code {
- font-family: "Courier New", Courier, monospace;
- border: 1px solid #ddd;
- font-size: 0.96em;
-}
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/fonts/Roboto.woff b/src/Wallabag/Wallabag/Resources/views/default/public/fonts/Roboto.woff
deleted file mode 100644
index 1440b1be6..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/default/public/fonts/Roboto.woff and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/default/public/highlightjs/highlight.pack.js b/src/Wallabag/Wallabag/Resources/views/default/public/highlightjs/highlight.pack.js
deleted file mode 100644
index 10a21c34b..000000000
--- a/src/Wallabag/Wallabag/Resources/views/default/public/highlightjs/highlight.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-var hljs=new function(){function j(v){return v.replace(/&/gm,"&").replace(//gm,">")}function t(v){return v.nodeName.toLowerCase()}function h(w,x){var v=w&&w.exec(x);return v&&v.index==0}function r(w){var v=(w.className+" "+(w.parentNode?w.parentNode.className:"")).split(/\s+/);v=v.map(function(x){return x.replace(/^lang(uage)?-/,"")});return v.filter(function(x){return i(x)||x=="no-highlight"})[0]}function o(x,y){var v={};for(var w in x){v[w]=x[w]}if(y){for(var w in y){v[w]=y[w]}}return v}function u(x){var v=[];(function w(y,z){for(var A=y.firstChild;A;A=A.nextSibling){if(A.nodeType==3){z+=A.nodeValue.length}else{if(t(A)=="br"){z+=1}else{if(A.nodeType==1){v.push({event:"start",offset:z,node:A});z=w(A,z);v.push({event:"stop",offset:z,node:A})}}}}return z})(x,0);return v}function q(w,y,C){var x=0;var F="";var z=[];function B(){if(!w.length||!y.length){return w.length?w:y}if(w[0].offset!=y[0].offset){return(w[0].offset"}function E(G){F+=""+t(G)+">"}function v(G){(G.event=="start"?A:E)(G.node)}while(w.length||y.length){var D=B();F+=j(C.substr(x,D[0].offset-x));x=D[0].offset;if(D==w){z.reverse().forEach(E);do{v(D.splice(0,1)[0]);D=B()}while(D==w&&D.length&&D[0].offset==x);z.reverse().forEach(A)}else{if(D[0].event=="start"){z.push(D[0].node)}else{z.pop()}v(D.splice(0,1)[0])}}return F+j(C.substr(x))}function m(y){function v(z){return(z&&z.source)||z}function w(A,z){return RegExp(v(A),"m"+(y.cI?"i":"")+(z?"g":""))}function x(D,C){if(D.compiled){return}D.compiled=true;D.k=D.k||D.bK;if(D.k){var z={};var E=function(G,F){if(y.cI){F=F.toLowerCase()}F.split(" ").forEach(function(H){var I=H.split("|");z[I[0]]=[G,I[1]?Number(I[1]):1]})};if(typeof D.k=="string"){E("keyword",D.k)}else{Object.keys(D.k).forEach(function(F){E(F,D.k[F])})}D.k=z}D.lR=w(D.l||/\b[A-Za-z0-9_]+\b/,true);if(C){if(D.bK){D.b="\\b("+D.bK.split(" ").join("|")+")\\b"}if(!D.b){D.b=/\B|\b/}D.bR=w(D.b);if(!D.e&&!D.eW){D.e=/\B|\b/}if(D.e){D.eR=w(D.e)}D.tE=v(D.e)||"";if(D.eW&&C.tE){D.tE+=(D.e?"|":"")+C.tE}}if(D.i){D.iR=w(D.i)}if(D.r===undefined){D.r=1}if(!D.c){D.c=[]}var B=[];D.c.forEach(function(F){if(F.v){F.v.forEach(function(G){B.push(o(F,G))})}else{B.push(F=="self"?D:F)}});D.c=B;D.c.forEach(function(F){x(F,D)});if(D.starts){x(D.starts,C)}var A=D.c.map(function(F){return F.bK?"\\.?("+F.b+")\\.?":F.b}).concat([D.tE,D.i]).map(v).filter(Boolean);D.t=A.length?w(A.join("|"),true):{exec:function(F){return null}};D.continuation={}}x(y)}function c(S,L,J,R){function v(U,V){for(var T=0;T";U+=Z+'">';return U+X+Y}function N(){if(!I.k){return j(C)}var T="";var W=0;I.lR.lastIndex=0;var U=I.lR.exec(C);while(U){T+=j(C.substr(W,U.index-W));var V=E(I,U);if(V){H+=V[1];T+=w(V[0],j(U[0]))}else{T+=j(U[0])}W=I.lR.lastIndex;U=I.lR.exec(C)}return T+j(C.substr(W))}function F(){if(I.sL&&!f[I.sL]){return j(C)}var T=I.sL?c(I.sL,C,true,I.continuation.top):e(C);if(I.r>0){H+=T.r}if(I.subLanguageMode=="continuous"){I.continuation.top=T.top}return w(T.language,T.value,false,true)}function Q(){return I.sL!==undefined?F():N()}function P(V,U){var T=V.cN?w(V.cN,"",true):"";if(V.rB){D+=T;C=""}else{if(V.eB){D+=j(U)+T;C=""}else{D+=T;C=U}}I=Object.create(V,{parent:{value:I}})}function G(T,X){C+=T;if(X===undefined){D+=Q();return 0}var V=v(X,I);if(V){D+=Q();P(V,X);return V.rB?0:X.length}var W=z(I,X);if(W){var U=I;if(!(U.rE||U.eE)){C+=X}D+=Q();do{if(I.cN){D+=""}H+=I.r;I=I.parent}while(I!=W.parent);if(U.eE){D+=j(X)}C="";if(W.starts){P(W.starts,"")}return U.rE?0:X.length}if(A(X,I)){throw new Error('Illegal lexeme "'+X+'" for mode "'+(I.cN||"")+'"')}C+=X;return X.length||1}var M=i(S);if(!M){throw new Error('Unknown language: "'+S+'"')}m(M);var I=R||M;var D="";for(var K=I;K!=M;K=K.parent){if(K.cN){D+=w(K.cN,D,true)}}var C="";var H=0;try{var B,y,x=0;while(true){I.t.lastIndex=x;B=I.t.exec(L);if(!B){break}y=G(L.substr(x,B.index-x),B[0]);x=B.index+y}G(L.substr(x));for(var K=I;K.parent;K=K.parent){if(K.cN){D+=""}}return{r:H,value:D,language:S,top:I}}catch(O){if(O.message.indexOf("Illegal")!=-1){return{r:0,value:j(L)}}else{throw O}}}function e(y,x){x=x||b.languages||Object.keys(f);var v={r:0,value:j(y)};var w=v;x.forEach(function(z){if(!i(z)){return}var A=c(z,y,false);A.language=z;if(A.r>w.r){w=A}if(A.r>v.r){w=v;v=A}});if(w.language){v.second_best=w}return v}function g(v){if(b.tabReplace){v=v.replace(/^((<[^>]+>|\t)+)/gm,function(w,z,y,x){return z.replace(/\t/g,b.tabReplace)})}if(b.useBR){v=v.replace(/\n/g,"
")}return v}function p(z){var y=b.useBR?z.innerHTML.replace(/\n/g,"").replace(/
|
]*>/g,"\n").replace(/<[^>]*>/g,""):z.textContent;var A=r(z);if(A=="no-highlight"){return}var v=A?c(A,y,true):e(y);var w=u(z);if(w.length){var x=document.createElementNS("http://www.w3.org/1999/xhtml","pre");x.innerHTML=v.value;v.value=q(w,u(x),y)}v.value=g(v.value);z.innerHTML=v.value;z.className+=" hljs "+(!A&&v.language||"");z.result={language:v.language,re:v.r};if(v.second_best){z.second_best={language:v.second_best.language,re:v.second_best.r}}}var b={classPrefix:"hljs-",tabReplace:null,useBR:false,languages:undefined};function s(v){b=o(b,v)}function l(){if(l.called){return}l.called=true;var v=document.querySelectorAll("pre code");Array.prototype.forEach.call(v,p)}function a(){addEventListener("DOMContentLoaded",l,false);addEventListener("load",l,false)}var f={};var n={};function d(v,x){var w=f[v]=x(this);if(w.aliases){w.aliases.forEach(function(y){n[y]=v})}}function k(){return Object.keys(f)}function i(v){return f[v]||f[n[v]]}this.highlight=c;this.highlightAuto=e;this.fixMarkup=g;this.highlightBlock=p;this.configure=s;this.initHighlighting=l;this.initHighlightingOnLoad=a;this.registerLanguage=d;this.listLanguages=k;this.getLanguage=i;this.inherit=o;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE]};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE]};this.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such)\b/};this.CLCM={cN:"comment",b:"//",e:"$",c:[this.PWM]};this.CBCM={cN:"comment",b:"/\\*",e:"\\*/",c:[this.PWM]};this.HCM={cN:"comment",b:"#",e:"$",c:[this.PWM]};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.CSSNM={cN:"number",b:this.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0};this.RM={cN:"regexp",b:/\//,e:/\/[gim]*/,i:/\n/,c:[this.BE,{b:/\[/,e:/\]/,r:0,c:[this.BE]}]};this.TM={cN:"title",b:this.IR,r:0};this.UTM={cN:"title",b:this.UIR,r:0}}();hljs.registerLanguage("bash",function(b){var a={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)\}/}]};var d={cN:"string",b:/"/,e:/"/,c:[b.BE,a,{cN:"variable",b:/\$\(/,e:/\)/,c:[b.BE]}]};var c={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\.]+/,k:{keyword:"if then else elif fi for break continue while in do done exit return set declare case esac export exec",literal:"true false",built_in:"printf echo read cd pwd pushd popd dirs let eval unset typeset readonly getopts source shopt caller type hash bind help sudo",operator:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"shebang",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:true,c:[b.inherit(b.TM,{b:/\w[\w\d_]*/})],r:0},b.HCM,b.NM,d,c,a]}});hljs.registerLanguage("cs",function(b){var a="abstract as base bool break byte case catch char checked const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async await ascending descending from get group into join let orderby partial select set value var where yield";return{aliases:["csharp"],k:a,i:/::/,c:[{cN:"comment",b:"///",e:"$",rB:true,c:[{cN:"xmlDocTag",v:[{b:"///",r:0},{b:""},{b:"?",e:">"}]}]},b.CLCM,b.CBCM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},b.ASM,b.QSM,b.CNM,{bK:"protected public private internal",e:/[{;=]/,k:a,c:[{bK:"class namespace interface",starts:{c:[b.TM]}},{b:b.IR+"\\s*\\(",rB:true,c:[b.TM]}]}]}});hljs.registerLanguage("ruby",function(f){var j="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var i="and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor";var b={cN:"yardoctag",b:"@[A-Za-z]+"};var c={cN:"value",b:"#<",e:">"};var k={cN:"comment",v:[{b:"#",e:"$",c:[b]},{b:"^\\=begin",e:"^\\=end",c:[b],r:10},{b:"^__END__",e:"\\n$"}]};var d={cN:"subst",b:"#\\{",e:"}",k:i};var e={cN:"string",c:[f.BE,d],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:"%[qw]?\\(",e:"\\)"},{b:"%[qw]?\\[",e:"\\]"},{b:"%[qw]?{",e:"}"},{b:"%[qw]?<",e:">"},{b:"%[qw]?/",e:"/"},{b:"%[qw]?%",e:"%"},{b:"%[qw]?-",e:"-"},{b:"%[qw]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}]};var a={cN:"params",b:"\\(",e:"\\)",k:i};var h=[e,c,k,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[f.inherit(f.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+f.IR+"::)?"+f.IR}]},k]},{cN:"function",bK:"def",e:" |$|;",r:0,c:[f.inherit(f.TM,{b:j}),a,k]},{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[e,{b:j}],r:0},{cN:"symbol",b:f.UIR+"(\\!|\\?)?:",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+f.RSR+")\\s*",c:[c,k,{cN:"regexp",c:[f.BE,d],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];d.c=h;a.c=h;var g=[{r:1,cN:"output",b:"^\\s*=> ",e:"$",rB:true,c:[{cN:"status",b:"^\\s*=>"},{b:" ",e:"$",c:h}]},{r:1,cN:"input",b:"^[^ ][^=>]*>+ ",e:"$",rB:true,c:[{cN:"prompt",b:"^[^ ][^=>]*>+"},{b:" ",e:"$",c:h}]}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:i,c:g.concat(h)}});hljs.registerLanguage("diff",function(a){return{aliases:["patch"],c:[{cN:"chunk",r:10,v:[{b:/^\@\@ +\-\d+,\d+ +\+\d+,\d+ +\@\@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"header",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}});hljs.registerLanguage("javascript",function(a){return{aliases:["js"],k:{keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document"},c:[{cN:"pi",b:/^\s*('|")use strict('|")/,r:10},a.ASM,a.QSM,a.CLCM,a.CBCM,a.CNM,{b:"("+a.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[a.CLCM,a.CBCM,a.RM,{b:/,e:/>;/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:true,c:[a.inherit(a.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[a.CLCM,a.CBCM],i:/["'\(]/}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+a.IR,r:0}]}});hljs.registerLanguage("xml",function(a){var c="[A-Za-z0-9\\._:-]+";var d={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php",subLanguageMode:"continuous"};var b={eW:true,i:/,r:0,c:[d,{cN:"attribute",b:c,r:0},{b:"=",r:0,c:[{cN:"value",v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s\/>]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:true,c:[{cN:"doctype",b:"",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"",rE:true,sL:"css"}},{cN:"tag",b:"
-
-{% endblock %}
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/README.md b/src/Wallabag/Wallabag/Resources/views/dmagenta/README.md
deleted file mode 100644
index 6abc37e37..000000000
--- a/src/Wallabag/Wallabag/Resources/views/dmagenta/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# dmagenta (dark magenta) theme
-
-theme created by Nicolas Lœuillet aka nico_somb
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/css/style-dmagenta.css b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/css/style-dmagenta.css
deleted file mode 100644
index 4dc592d21..000000000
--- a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/css/style-dmagenta.css
+++ /dev/null
@@ -1,78 +0,0 @@
-body {
- color: #d4d4d4;
- background-color: #372d37;
-}
-
-a,
-a:hover,
-a:visited {
- color: #8d748d;
-}
-
-a.back span {
- background-image: url('../img/dmagenta/left.png');
-}
-
-a.top span {
- background-image: url('../img/dmagenta/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
- background-image: url('../img/dmagenta/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
- background-image: url('../img/dmagenta/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
- background-image: url('../img/dmagenta/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
- background-image: url('../img/dmagenta/checkmark-off.png');
-}
-
-a.twitter span {
- background-image: url('../img/dmagenta/twitter.png');
-}
-
-a.flattr span {
- background-image: url('../img/dmagenta/flattr.png');
-}
-
-a.shaarli span {
- background-image: url('../img/dmagenta/shaarli.png');
-}
-
-a.email span {
- background-image: url('../img/dmagenta/envelop.png');
-}
-
-a.delete span {
- background-image: url('../img/dmagenta/remove.png');
-}
-
-a.link span {
- background-image: url('../img/dmagenta/link.png');
-}
-
-a.bad-display span {
- background-image: url('../img/dmagenta/bad-display.png');
-}
-
-.pagination a {
- color: #aaa;
-}
-
-#main #links li .current {
- background-color: #2d372d;
-}
-
-#article_toolbar {
- background: #372d37;
-}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/backtotop.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/backtotop.png
deleted file mode 100755
index 051238ef9..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/backtotop.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/bad-display.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/bad-display.png
deleted file mode 100755
index 6866799fc..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/bad-display.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png
deleted file mode 100644
index 3db5a06dc..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/checkmark-off.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png
deleted file mode 100644
index cd3abb2c0..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/checkmark-on.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/down.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/down.png
deleted file mode 100644
index b9d536a7c..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/down.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/envelop.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/envelop.png
deleted file mode 100644
index 6be1c8864..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/envelop.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/flattr.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/flattr.png
deleted file mode 100755
index 0404aaeaf..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/flattr.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/left.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/left.png
deleted file mode 100644
index a0a53631e..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/left.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/link.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/link.png
deleted file mode 100755
index db62819d5..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/link.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/remove.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/remove.png
deleted file mode 100644
index f8ad56a3e..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/remove.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/rss.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/rss.png
deleted file mode 100644
index 21bad1a17..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/rss.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/shaarli.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/shaarli.png
deleted file mode 100644
index 1eb30f60b..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/shaarli.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/star-off.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/star-off.png
deleted file mode 100644
index 6a0133a79..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/star-off.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/star-on.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/star-on.png
deleted file mode 100644
index a9f96eaac..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/star-on.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/top.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/top.png
deleted file mode 100644
index 954a8c0ac..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/top.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/twitter.png b/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/twitter.png
deleted file mode 100644
index cfcfe4195..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/public/img/dmagenta/twitter.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/screenshot.jpg b/src/Wallabag/Wallabag/Resources/views/dmagenta/screenshot.jpg
deleted file mode 100644
index ab8f1ec22..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/dmagenta/screenshot.jpg and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/dmagenta/theme.ini b/src/Wallabag/Wallabag/Resources/views/dmagenta/theme.ini
deleted file mode 100644
index 78fa3a9c9..000000000
--- a/src/Wallabag/Wallabag/Resources/views/dmagenta/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Dmagenta
-requirements[] = default
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/README.md b/src/Wallabag/Wallabag/Resources/views/solarized-dark/README.md
deleted file mode 100644
index 81be1f8cd..000000000
--- a/src/Wallabag/Wallabag/Resources/views/solarized-dark/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# solarized-dark (Solarized Dark) theme
-
-
-Theme created by NumEricR
-
-http://github.com/NumEricR/poche-themes
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/Solarized-LICENSE.txt b/src/Wallabag/Wallabag/Resources/views/solarized-dark/Solarized-LICENSE.txt
deleted file mode 100644
index a842f6638..000000000
--- a/src/Wallabag/Wallabag/Resources/views/solarized-dark/Solarized-LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/css/style-solarized-dark.css b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/css/style-solarized-dark.css
deleted file mode 100644
index 77a97d382..000000000
--- a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/css/style-solarized-dark.css
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Solarized Dark - by NumEricR
- * http://github.com/NumEricR/poche-themes
- * ==================================================
- *
- * Based on Solarized's palette - (c) 2011 Ethan Schoonover
- * See http://ethanschoonover.com/solarized#usage-development
- * See http://ethanschoonover.com/solarized#the-values
- *
- * Background: #002b36 base 03
- * Highlight: #073642 base 02
- * Primary content: #839496 base 0
- * Intermediate: #657b83 base 00
- * Emphasized content: #93a1a1 base 1
- * Secondary content: #586e75 base 01
- * Green: #859900
- * Orange: #cb4b16
- * Red: #dc322f
- * Blue: #268bd2
- *
- * ================================================== */
-
-/* Background */
-
-body,
-#article_toolbar {
- background-color: #002b36;
-}
-
-/* Highlight */
-/* 2 different selectors for selection pseudo-elmt */
-/* See https://developer.mozilla.org/en-US/docs/Web/CSS/::selection */
-::-moz-selection {
- background-color: #073642;
-}
-::selection {
- background-color: #073642;
-}
-
-/* Primary content */
-
-body,
-a,
-a:hover,
-a:visited,
-td {
- color: #839496;
-}
-
-/* Secondary content */
-
-.tools p,
-.vieworiginal a,
-.vieworiginal a:hover,
-.vieworiginal a:visited {
- color: #586e75;
-}
-
-#main #content .entrie,
-#article header,
-#article article {
- border-bottom-color: #586e75;
-}
-
-/* Emphasized content */
-
-.entrie h2 a:hover,
-footer,
-footer a {
- color: #93a1a1;
-}
-
-/* Colored content */
-
-#main .messages.success,
-#main .messages.warning,
-#main .messages.error,
-#main .messages.information,
-#main .messages.info {
- background-color: #073642;
-}
-
-#main .messages.success {
- border-color: #859900;
-}
-
-#main .messages.success p {
- color: #859900 !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.warning {
- border-color: #cb4b16;
-}
-
-#main .messages.warning p {
- color: #cb4b16;
-}
-
-#main .messages.error {
- border-color: #dc322f;
-}
-
-#main .messages.error p {
- color: #dc322f !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.information,
-#main .messages.info {
- border-color: #268bd2;
-}
-
-#main .messages.information p,
-#main .messages.info p {
- color: #268bd2;
-}
-
-/* Miscellaneous */
-
-.bouton,
-.bouton:hover,
-#main #links li a.current,
-#links a:hover,
-.pagination span.current,
-.pagination a:hover,
-.pagination a:active {
- color: #002b36;
- background-color: #586e75;
-}
-
-.bouton:hover {
- background-color: #657b83;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet,
-.top_link {
- background-color: #073642;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet {
- padding: 5px;
- border: 1px solid #586e75;
- color: #839496;
-}
-
-#bookmarklet {
- border-style: dashed;
-}
-
-.pagination a {
- border-color: #586e75;
- color: #586e75;
-}
-
-.pagination span.current {
- border-color: #073642;
-}
-
-/* Images */
-
-a.back span {
- background-image: url('../img/solarized-dark/left.png');
-}
-
-a.top span {
- background-image: url('../img/solarized-dark/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
- background-image: url('../img/solarized-dark/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
- background-image: url('../img/solarized-dark/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
- background-image: url('../img/solarized-dark/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
- background-image: url('../img/solarized-dark/checkmark-off.png');
-}
-
-a.twitter span {
- background-image: url('../img/solarized-dark/twitter.png');
-}
-
-a.flattr span {
- background-image: url('../img/solarized-dark/flattr.png');
-}
-
-a.shaarli span {
- background-image: url('../img/solarized-dark/shaarli.png');
-}
-
-a.email span {
- background-image: url('../img/solarized-dark/envelop.png');
-}
-
-a.delete span {
- background-image: url('../img/solarized-dark/remove.png');
-}
-
-a.link span {
- background-image: url('../img/solarized-dark/link.png');
-}
-
-a.bad-display span {
- background-image: url('../img/solarized-dark/bad-display.png');
-}
-
-.arrow-down {
- width: 0px;
- height: 0px;
- border-style: solid;
- border-width: 10px 10px 0 10px;
- border-color: #586E75 transparent transparent transparent;
-
- position: absolute;
- margin-top: 1.5em;
- margin-left: -30px;
-}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png
deleted file mode 100644
index 1501c2a5d..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/backtotop.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png
deleted file mode 100644
index b2c3ca173..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/bad-display.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png
deleted file mode 100644
index fd7d92fa9..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-off.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png
deleted file mode 100644
index 592965dd4..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/checkmark-on.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/down.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/down.png
deleted file mode 100644
index 5de303157..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/down.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png
deleted file mode 100644
index d34688859..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/envelop.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png
deleted file mode 100644
index 73e3f4218..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/flattr.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/left.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/left.png
deleted file mode 100644
index a953d831d..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/left.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/link.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/link.png
deleted file mode 100644
index 5e859a0e3..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/link.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/remove.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/remove.png
deleted file mode 100644
index 66a5c1ab4..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/remove.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/rss.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/rss.png
deleted file mode 100644
index 21bad1a17..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/rss.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png
deleted file mode 100644
index 1eb30f60b..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/shaarli.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png
deleted file mode 100644
index 1c603ecca..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/star-off.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png
deleted file mode 100644
index bc37772a5..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/star-on.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/top.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/top.png
deleted file mode 100644
index b3f44f31d..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/top.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png b/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png
deleted file mode 100644
index c4a253341..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/public/img/solarized-dark/twitter.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/screenshot.jpg b/src/Wallabag/Wallabag/Resources/views/solarized-dark/screenshot.jpg
deleted file mode 100644
index 2ad879435..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized-dark/screenshot.jpg and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized-dark/theme.ini b/src/Wallabag/Wallabag/Resources/views/solarized-dark/theme.ini
deleted file mode 100644
index c99481464..000000000
--- a/src/Wallabag/Wallabag/Resources/views/solarized-dark/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Solarized Dark
-requirements[] = default
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/README.md b/src/Wallabag/Wallabag/Resources/views/solarized/README.md
deleted file mode 100644
index 255e3cddf..000000000
--- a/src/Wallabag/Wallabag/Resources/views/solarized/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# solarized (Solarized) theme
-
-
-Theme created by NumEricR
-
-http://github.com/NumEricR/poche-themes
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/Solarized-LICENSE.txt b/src/Wallabag/Wallabag/Resources/views/solarized/Solarized-LICENSE.txt
deleted file mode 100644
index a842f6638..000000000
--- a/src/Wallabag/Wallabag/Resources/views/solarized/Solarized-LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/css/style-solarized.css b/src/Wallabag/Wallabag/Resources/views/solarized/public/css/style-solarized.css
deleted file mode 100644
index cf16338f4..000000000
--- a/src/Wallabag/Wallabag/Resources/views/solarized/public/css/style-solarized.css
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Solarized - by NumEricR
- * http://github.com/NumEricR/poche-themes
- * ==================================================
- *
- * Based on Solarized's palette - (c) 2011 Ethan Schoonover
- * See http://ethanschoonover.com/solarized#usage-development
- * See http://ethanschoonover.com/solarized#the-values
- *
- * Background: #fdf6e3 base 3
- * Highlight: #eee8d5 base 2
- * Primary content: #657b83 base 00
- * Intermediate: #839496 base 0
- * Emphasized content: #586e75 base 01
- * Secondary content: #93a1a1 base 1
- * Green: #859900
- * Orange: #cb4b16
- * Red: #dc322f
- * Blue: #268bd2
- *
- * ================================================== */
-
-/* Background */
-
-body,
-#article_toolbar {
- background-color: #fdf6e3;
-}
-
-/* Highlight */
-/* 2 different selectors for selection pseudo-elmt */
-/* See https://developer.mozilla.org/en-US/docs/Web/CSS/::selection */
-::-moz-selection {
- background-color: #eee8d5;
-}
-::selection {
- background-color: #eee8d5;
-}
-
-/* Primary content */
-
-body,
-a,
-a:hover,
-a:visited,
-td {
- color: #657b83;
-}
-
-/* Secondary content */
-
-.tools p,
-.vieworiginal a,
-.vieworiginal a:hover,
-.vieworiginal a:visited {
- color: #93a1a1;
-}
-
-#main #content .entrie,
-#article header,
-#article article {
- border-bottom-color: #93a1a1;
-}
-
-/* Emphasized content */
-
-.entrie h2 a:hover,
-footer,
-footer a {
- color: #586e75;
-}
-
-/* Colored content */
-
-#main .messages.success,
-#main .messages.warning,
-#main .messages.error,
-#main .messages.information,
-#main .messages.info {
- background-color: #eee8d5;
-}
-
-#main .messages.success {
- border-color: #859900;
-}
-
-#main .messages.success p {
- color: #859900 !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.warning {
- border-color: #cb4b16;
-}
-
-#main .messages.warning p {
- color: #cb4b16;
-}
-
-#main .messages.error {
- border-color: #dc322f;
-}
-
-#main .messages.error p {
- color: #dc322f !important; /* Overwrites !important used on messages.css */
-}
-
-#main .messages.information,
-#main .messages.info {
- border-color: #268bd2;
-}
-
-#main .messages.information p,
-#main .messages.info p {
- color: #268bd2;
-}
-
-/* Miscellaneous */
-
-.bouton,
-.bouton:hover,
-#main #links li a.current,
-#links a:hover,
-.pagination span.current,
-.pagination a:hover,
-.pagination a:active {
- color: #fdf6e3;
- background-color: #93a1a1;
-}
-
-.bouton:hover {
- background-color: #657b83;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet,
-.top_link {
- background-color: #eee8d5;
-}
-
-#login,
-#password,
-#password_repeat,
-#bookmarklet {
- padding: 5px;
- border: 1px solid #93a1a1;
- color: #657b83;
-}
-
-#bookmarklet {
- border-style: dashed;
-}
-
-.pagination a {
- border-color: #93a1a1;
- color: #93a1a1;
-}
-
-.pagination span.current {
- border-color: #eee8d5;
-}
-
-/* Images */
-
-a.back span {
- background-image: url('../img/solarized/left.png');
-}
-
-a.top span {
- background-image: url('../img/solarized/top.png');
-}
-
-a.fav span,
-a.fav-off span:hover {
- background-image: url('../img/solarized/star-on.png');
-}
-
-a.fav span:hover,
-a.fav-off span {
- background-image: url('../img/solarized/star-off.png');
-}
-
-a.archive span,
-a.archive-off span:hover {
- background-image: url('../img/solarized/checkmark-on.png');
-}
-
-a.archive span:hover,
-a.archive-off span {
- background-image: url('../img/solarized/checkmark-off.png');
-}
-
-a.twitter span {
- background-image: url('../img/solarized/twitter.png');
-}
-
-a.shaarli span {
- background-image: url('../img/solarized/shaarli.png');
-}
-
-a.flattr span {
- background-image: url('../img/solarized/flattr.png');
-}
-
-a.email span {
- background-image: url('../img/solarized/envelop.png');
-}
-
-a.delete span {
- background-image: url('../img/solarized/remove.png');
-}
-
-a.link span {
- background-image: url('../img/solarized/link.png');
-}
-
-a.bad-display span {
- background-image: url('../img/solarized/bad-display.png');
-}
-
-.arrow-down {
- width: 0px;
- height: 0px;
- border-style: solid;
- border-width: 10px 10px 0 10px;
- border-color: #93A1A1 transparent transparent transparent;
-
- position: absolute;
- margin-top: 1.5em;
- margin-left: -30px;
-}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/backtotop.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/backtotop.png
deleted file mode 100644
index a3e523187..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/backtotop.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/bad-display.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/bad-display.png
deleted file mode 100644
index ae99ab378..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/bad-display.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/checkmark-off.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/checkmark-off.png
deleted file mode 100644
index 20cd26b3e..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/checkmark-off.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/checkmark-on.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/checkmark-on.png
deleted file mode 100644
index 87a2b799e..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/checkmark-on.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/down.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/down.png
deleted file mode 100644
index 622ff87b5..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/down.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/envelop.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/envelop.png
deleted file mode 100644
index 1caf7d435..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/envelop.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/flattr.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/flattr.png
deleted file mode 100644
index 18e00f86c..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/flattr.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/left.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/left.png
deleted file mode 100644
index 9780faeec..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/left.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/link.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/link.png
deleted file mode 100644
index d0e12862d..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/link.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/remove.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/remove.png
deleted file mode 100644
index d5113d176..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/remove.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/rss.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/rss.png
deleted file mode 100644
index 21bad1a17..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/rss.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/shaarli.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/shaarli.png
deleted file mode 100644
index 1eb30f60b..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/shaarli.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/star-off.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/star-off.png
deleted file mode 100644
index afd7d80c8..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/star-off.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/star-on.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/star-on.png
deleted file mode 100644
index 3a7725123..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/star-on.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/top.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/top.png
deleted file mode 100644
index d20001a49..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/top.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/twitter.png b/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/twitter.png
deleted file mode 100644
index 109d71516..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/public/img/solarized/twitter.png and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/screenshot.jpg b/src/Wallabag/Wallabag/Resources/views/solarized/screenshot.jpg
deleted file mode 100644
index 07d402e38..000000000
Binary files a/src/Wallabag/Wallabag/Resources/views/solarized/screenshot.jpg and /dev/null differ
diff --git a/src/Wallabag/Wallabag/Resources/views/solarized/theme.ini b/src/Wallabag/Wallabag/Resources/views/solarized/theme.ini
deleted file mode 100644
index 703997b9e..000000000
--- a/src/Wallabag/Wallabag/Resources/views/solarized/theme.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-name = Solarized
-requirements[] = default
diff --git a/src/Wallabag/Wallabag/Routing.php b/src/Wallabag/Wallabag/Routing.php
deleted file mode 100755
index 85b6af1e1..000000000
--- a/src/Wallabag/Wallabag/Routing.php
+++ /dev/null
@@ -1,163 +0,0 @@
-
- * @copyright 2013
- * @license http://opensource.org/licenses/MIT see COPYING file
- */
-
-namespace Wallabag\Wallabag;
-
-class Routing
-{
- protected $wallabag;
- protected $referer;
- protected $view;
- protected $action;
- protected $id;
- protected $url;
- protected $file;
- protected $defaultVars = array();
- protected $vars = array();
-
- public function __construct(Wallabag $wallabag)
- {
- $this->wallabag = $wallabag;
- $this->_init();
- }
-
- private function _init()
- {
- # Parse GET & REFERER vars
- $this->referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
- $this->view = Tools::checkVar('view', 'home');
- $this->action = Tools::checkVar('action');
- $this->id = Tools::checkVar('id');
- $_SESSION['sort'] = Tools::checkVar('sort', 'id');
- $this->url = new Url((isset ($_GET['url'])) ? $_GET['url'] : '');
- }
-
- public function run()
- {
- # vars to _always_ send to templates
- $this->defaultVars = array(
- 'referer' => $this->referer,
- 'view' => $this->view,
- 'poche_url' => Tools::getPocheUrl(),
- 'title' => _('wallabag, a read it later open source system'),
- 'token' => \Session::getToken(),
- 'theme' => $this->wallabag->tpl->getTheme()
- );
-
- $this->_launchAction();
- $this->_defineTplInformation();
-
- # because messages can be added in $poche->action(), we have to add this entry now (we can add it before)
- $this->vars = array_merge($this->vars, array('messages' => $this->wallabag->messages->display('all', FALSE)));
-
- $this->_render($this->file, $this->vars);
- }
-
- private function _defineTplInformation()
- {
- $tplFile = array();
- $tplVars = array();
-
- if (\Session::isLogged()) {
- $this->wallabag->action($this->action, $this->url, $this->id);
- $tplFile = Tools::getTplFile($this->view);
- $tplVars = array_merge($this->vars, $this->wallabag->displayView($this->view, $this->id));
- } elseif(isset($_SERVER['PHP_AUTH_USER'])) {
- if($this->wallabag->store->userExists($_SERVER['PHP_AUTH_USER'])) {
- $this->wallabag->login($this->referer);
- } else {
- $this->wallabag->messages->add('e', _('login failed: user doesn\'t exist'));
- Tools::logm('user doesn\'t exist');
- $tplFile = Tools::getTplFile('login');
- $tplVars['http_auth'] = 1;
- }
- } elseif(isset($_SERVER['REMOTE_USER'])) {
- if($this->wallabag->store->userExists($_SERVER['REMOTE_USER'])) {
- $this->wallabag->login($this->referer);
- } else {
- $this->wallabag->messages->add('e', _('login failed: user doesn\'t exist'));
- Tools::logm('user doesn\'t exist');
- $tplFile = Tools::getTplFile('login');
- $tplVars['http_auth'] = 1;
- }
- } else {
- $tplFile = Tools::getTplFile('login');
- $tplVars['http_auth'] = 0;
- \Session::logout();
- }
-
- $this->file = $tplFile;
- $this->vars = array_merge($this->defaultVars, $tplVars);
- }
-
- private function _launchAction()
- {
- if (isset($_GET['login'])) {
- // hello to you
- $this->wallabag->login($this->referer);
- } elseif (isset($_GET['feed']) && isset($_GET['user_id'])) {
- $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
- $limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 0);
- $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type'], $limit);
- }
-
- //allowed ONLY to logged in user
- if (\Session::isLogged() === true)
- {
- if (isset($_GET['logout'])) {
- // see you soon !
- $this->wallabag->logout();
- } elseif (isset($_GET['config'])) {
- // update password
- $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
- } elseif (isset($_GET['newuser'])) {
- $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
- } elseif (isset($_GET['deluser'])) {
- $this->wallabag->deleteUser($_POST['password4deletinguser']);
- } elseif (isset($_GET['epub'])) {
- $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']);
- $epub->prepareData();
- $epub->produceEpub();
- } elseif (isset($_GET['mobi'])) {
- $mobi = new WallabagMobi($this->wallabag, $_GET['method'], $_GET['value']);
- $mobi->prepareData();
- $mobi->produceMobi();
- } elseif (isset($_GET['pdf'])) {
- $pdf = new WallabagPDF($this->wallabag, $_GET['method'], $_GET['value']);
- $pdf->prepareData();
- $pdf->producePDF();
- } elseif (isset($_GET['import'])) {
- $import = $this->wallabag->import();
- $tplVars = array_merge($this->vars, $import);
- } elseif (isset($_GET['empty-cache'])) {
- Tools::emptyCache();
- } elseif (isset($_GET['export'])) {
- $this->wallabag->export();
- } elseif (isset($_GET['updatetheme'])) {
- $this->wallabag->tpl->updateTheme($_POST['theme']);
- } elseif (isset($_GET['updatelanguage'])) {
- $this->wallabag->language->updateLanguage($_POST['language']);
- } elseif (isset($_GET['uploadfile'])) {
- $this->wallabag->uploadFile();
- } elseif (isset($_GET['feed']) && isset($_GET['action']) && $_GET['action'] == 'generate') {
- $this->wallabag->updateToken();
- }
- elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) {
- $plainUrl = new Url(base64_encode($_GET['plainurl']));
- $this->wallabag->action('add', $plainUrl);
- }
- }
- }
-
- public function _render($file, $vars)
- {
- echo $this->wallabag->tpl->render($file, $vars);
- }
-}
diff --git a/src/Wallabag/Wallabag/Template.php b/src/Wallabag/Wallabag/Template.php
deleted file mode 100644
index d0fc9b071..000000000
--- a/src/Wallabag/Wallabag/Template.php
+++ /dev/null
@@ -1,244 +0,0 @@
-
- * @copyright 2013
- * @license http://opensource.org/licenses/MIT see COPYING file
- */
-
-namespace Wallabag\Wallabag;
-
-use \Twig_Environment;
-use \Session;
-use \Twig_Loader_Chain;
-use \Twig_Loader_Filesystem;
-use \Twig_Extensions_Extension_I18n;
-use \Twig_SimpleFilter;
-
-class Template extends Twig_Environment
-{
- protected $wallabag;
-
- private $canRenderTemplates = TRUE;
- private $currentTheme = '';
-
- public function __construct(Wallabag $wallabag)
- {
- $this->wallabag = $wallabag;
-
- // Set up theme
- $pocheUser = Session::getParam('poche_user');
-
- $themeDirectory = (is_null($pocheUser) ? DEFAULT_THEME : $pocheUser->getConfigValue('theme'));
-
- if ($themeDirectory === false || !is_dir(THEME . '/' . $themeDirectory)) {
- $themeDirectory = DEFAULT_THEME;
- }
-
- $this->currentTheme = $themeDirectory;
-
- if ($this->_themeIsInstalled() === array()) {
- $this->_init();
- }
- }
-
- /**
- * Returns true if selected theme is installed
- *
- * @return bool
- */
- private function _themeIsInstalled()
- {
- $errors = array();
-
- // Twig is an absolute requirement for wallabag to function.
- // Abort immediately if the Composer installer hasn't been run yet
- if (!$this->canRenderTemplates) {
- $errors[] = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. You can also download vendor.zip and extract it in your wallabag folder.';
- }
-
- // Check if the selected theme and its requirements are present
- $theme = $this->getTheme();
- if ($theme != '' && !is_dir(THEME . '/' . $theme)) {
- $errors[] = 'The currently selected theme (' . $theme . ') does not seem to be properly installed (Missing directory: ' . THEME . '/' . $theme . ')';
- $this->canRenderTemplates = FALSE;
- }
-
- $themeInfo = $this->getThemeInfo($theme);
- if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
- foreach ($themeInfo['requirements'] as $requiredTheme) {
- if (! is_dir(THEME . '/' . $requiredTheme)) {
- $errors[] = 'The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')';
- $this->canRenderTemplates = FALSE;
- }
- }
- }
-
- $currentErrors = (is_null(Session::getParam('errors'))? array() : Session::getParam('errors'));
- Session::setParam('errors', array_merge($errors, $currentErrors));
-
- return $errors;
- }
-
- /**
- * Initialization for templates
- */
- private function _init()
- {
- $loaderChain = new Twig_Loader_Chain();
- $theme = $this->getTheme();
-
- // add the current theme as first to the loader chain
- // so Twig will look there first for overridden template files
- try {
- $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $theme));
- } catch (Twig_Error_Loader $e) {
- # @todo isInstalled() should catch this, inject Twig later
- die('The currently selected theme (' . $theme . ') does not seem to be properly installed (' . THEME . '/' . $theme .' is missing)');
- }
-
- // add all required themes to the loader chain
- $themeInfo = $this->getThemeInfo($theme);
- if (isset($themeInfo['requirements']) && is_array($themeInfo['requirements'])) {
- foreach ($themeInfo['requirements'] as $requiredTheme) {
- try {
- $loaderChain->addLoader(new Twig_Loader_Filesystem(THEME . '/' . $requiredTheme));
- } catch (Twig_Error_Loader $e) {
- # @todo isInstalled() should catch this, inject Twig later
- die('The required "' . $requiredTheme . '" theme is missing for the current theme (' . $theme . ')');
- }
- }
- }
-
- if (DEBUG_POCHE) {
- $twigParams = array();
- } else {
- $twigParams = array('cache' => CACHE);
- }
-
- parent::__construct($loaderChain, $twigParams);
-
- //$tpl = new Twig_Environment($loaderChain, $twigParams);
- $this->addExtension(new Twig_Extensions_Extension_I18n());
-
- # filter to display domain name of an url
- $filter = new Twig_SimpleFilter('getDomain', 'Wallabag\\Wallabag\\Tools::getDomain');
- $this->addFilter($filter);
-
- # filter for reading time
- $filter = new Twig_SimpleFilter('getReadingTime', 'Wallabag\\Wallabag\\Tools::getReadingTime');
- $this->addFilter($filter);
- }
-
- /**
- * Returns current theme
- *
- * @return string
- */
- public function getTheme()
- {
- return $this->currentTheme;
- }
-
- /**
- * Provides theme information by parsing theme.ini file if present in the theme's root directory.
- * In all cases, the following data will be returned:
- * - name: theme's name, or key if the theme is unnamed,
- * - current: boolean informing if the theme is the current user theme.
- *
- * @param string $theme Theme key (directory name)
- * @return array|boolean Theme information, or false if the theme doesn't exist.
- */
- public function getThemeInfo($theme)
- {
- if (!is_dir(THEME . '/' . $theme)) {
- return false;
- }
-
- $themeIniFile = THEME . '/' . $theme . '/theme.ini';
- $themeInfo = array();
-
- if (is_file($themeIniFile) && is_readable($themeIniFile)) {
- $themeInfo = parse_ini_file($themeIniFile);
- }
-
- if ($themeInfo === false) {
- $themeInfo = array();
- }
-
- if (!isset($themeInfo['name'])) {
- $themeInfo['name'] = $theme;
- }
-
- $themeInfo['current'] = ($theme === $this->getTheme());
-
- return $themeInfo;
- }
-
- /**
- * Returns an array with installed themes
- *
- * @return array
- */
- public function getInstalledThemes()
- {
- $handle = opendir(THEME);
- $themes = array();
-
- while (($theme = readdir($handle)) !== false) {
- # Themes are stored in a directory, so all directory names are themes
- # @todo move theme installation data to database
- if (!is_dir(THEME . '/' . $theme) || in_array($theme, array('.', '..', '_global'))) {
- continue;
- }
-
- $themes[$theme] = $this->getThemeInfo($theme);
- }
-
- ksort($themes);
-
- return $themes;
- }
-
- /**
- * Update theme for the current user
- *
- * @param $newTheme
- */
- public function updateTheme($newTheme)
- {
- # we are not going to change it to the current theme...
- if ($newTheme == $this->getTheme()) {
- $this->wallabag->messages->add('w', _('still using the "' . $this->getTheme() . '" theme!'));
- Tools::redirect('?view=config');
- }
-
- $themes = $this->getInstalledThemes();
- $actualTheme = false;
-
- foreach (array_keys($themes) as $theme) {
- if ($theme == $newTheme) {
- $actualTheme = true;
- break;
- }
- }
-
- if (!$actualTheme) {
- $this->wallabag->messages->add('e', _('that theme does not seem to be installed'));
- Tools::redirect('?view=config');
- }
-
- $this->wallabag->store->updateUserConfig($this->wallabag->user->getId(), 'theme', $newTheme);
- $this->wallabag->messages->add('s', _('you have changed your theme preferences'));
-
- $currentConfig = $_SESSION['poche_user']->config;
- $currentConfig['theme'] = $newTheme;
-
- $_SESSION['poche_user']->setConfig($currentConfig);
-
- Tools::emptyCache();
- Tools::redirect('?view=config');
- }
-}
diff --git a/src/Wallabag/Wallabag/Tools.php b/src/Wallabag/Wallabag/Tools.php
deleted file mode 100755
index 9350c6601..000000000
--- a/src/Wallabag/Wallabag/Tools.php
+++ /dev/null
@@ -1,425 +0,0 @@
-
- * @copyright 2013
- * @license http://opensource.org/licenses/MIT see COPYING file
- */
-
-namespace Wallabag\Wallabag;
-
-use \RecursiveIteratorIterator;
-use \RecursiveDirectoryIterator;
-
-final class Tools
-{
- /**
- * Initialize PHP environment
- */
- public static function initPhp()
- {
- define('START_TIME', microtime(true));
-
- function stripslashesDeep($value) {
- return is_array($value)
- ? array_map('stripslashesDeep', $value)
- : stripslashes($value);
- }
-
- if (get_magic_quotes_gpc()) {
- $_POST = array_map('stripslashesDeep', $_POST);
- $_GET = array_map('stripslashesDeep', $_GET);
- $_COOKIE = array_map('stripslashesDeep', $_COOKIE);
- }
-
- ob_start();
- register_shutdown_function('ob_end_flush');
- }
-
- /**
- * Get wallabag instance URL
- *
- * @return string
- */
- public static function getPocheUrl()
- {
- $https = (!empty($_SERVER['HTTPS'])
- && (strtolower($_SERVER['HTTPS']) == 'on'))
- || (isset($_SERVER["SERVER_PORT"])
- && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection.
- || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection
- && $_SERVER["SERVER_PORT"] == SSL_PORT)
- || (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
- && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
-
- $serverport = (!isset($_SERVER["SERVER_PORT"])
- || $_SERVER["SERVER_PORT"] == '80'
- || $_SERVER["SERVER_PORT"] == HTTP_PORT
- || ($https && $_SERVER["SERVER_PORT"] == '443')
- || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
- ? '' : ':' . $_SERVER["SERVER_PORT"]);
-
- if (isset($_SERVER["HTTP_X_FORWARDED_PORT"])) {
- $serverport = ':' . $_SERVER["HTTP_X_FORWARDED_PORT"];
- }
-
- $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);
-
- if (!isset($_SERVER["HTTP_HOST"])) {
- return $scriptname;
- }
-
- $host = (isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
-
- if (strpos($host, ':') !== false) {
- $serverport = '';
- }
-
- return 'http' . ($https ? 's' : '') . '://'
- . $host . $serverport . $scriptname;
- }
-
- /**
- * Redirects to a URL
- *
- * @param string $url
- */
- public static function redirect($url = '')
- {
- if ($url === '') {
- $url = (empty($_SERVER['HTTP_REFERER'])?'?':$_SERVER['HTTP_REFERER']);
- if (isset($_POST['returnurl'])) {
- $url = $_POST['returnurl'];
- }
- }
-
- # prevent loop
- if (empty($url) || parse_url($url, PHP_URL_QUERY) === $_SERVER['QUERY_STRING']) {
- $url = Tools::getPocheUrl();
- }
-
- if (substr($url, 0, 1) !== '?') {
- $ref = Tools::getPocheUrl();
- if (substr($url, 0, strlen($ref)) !== $ref) {
- $url = $ref;
- }
- }
-
- self::logm('redirect to ' . $url);
- header('Location: '.$url);
- exit();
- }
-
- /**
- * Returns name of the template file to display
- *
- * @param $view
- * @return string
- */
- public static function getTplFile($view)
- {
- $views = array(
- 'install', 'import', 'export', 'config', 'tags',
- 'edit-tags', 'view', 'login', 'error', 'about'
- );
-
- return (in_array($view, $views) ? $view . '.twig' : 'home.twig');
- }
-
- /**
- * Download a file (typically, for downloading pictures on web server)
- *
- * @param $url
- * @return bool|mixed|string
- */
- public static function getFile($url)
- {
- $timeout = 15;
- $useragent = "Mozilla/5.0 (Windows NT 5.1; rv:18.0) Gecko/20100101 Firefox/18.0";
-
- if (in_array ('curl', get_loaded_extensions())) {
- # Fetch feed from URL
- $curl = curl_init();
- curl_setopt($curl, CURLOPT_URL, $url);
- curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
- if (!ini_get('open_basedir') && !ini_get('safe_mode')) {
- curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
- }
- curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($curl, CURLOPT_HEADER, false);
-
- # for ssl, do not verified certificate
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
- curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE );
-
- # FeedBurner requires a proper USER-AGENT...
- curl_setopt($curl, CURL_HTTP_VERSION_1_1, true);
- curl_setopt($curl, CURLOPT_ENCODING, "gzip, deflate");
- curl_setopt($curl, CURLOPT_USERAGENT, $useragent);
-
- $data = curl_exec($curl);
- $httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
- $httpcodeOK = isset($httpcode) and ($httpcode == 200 or $httpcode == 301);
- curl_close($curl);
- } else {
- # create http context and add timeout and user-agent
- $context = stream_context_create(
- array(
- 'http' => array(
- 'timeout' => $timeout,
- 'header' => "User-Agent: " . $useragent,
- 'follow_location' => true
- ),
- 'ssl' => array(
- 'verify_peer' => false,
- 'allow_self_signed' => true
- )
- )
- );
-
- # only download page lesser than 4MB
- $data = @file_get_contents($url, false, $context, -1, 4000000);
-
- if (isset($http_response_header) and isset($http_response_header[0])) {
- $httpcodeOK = isset($http_response_header) and isset($http_response_header[0]) and ((strpos($http_response_header[0], '200 OK') !== FALSE) or (strpos($http_response_header[0], '301 Moved Permanently') !== FALSE));
- }
- }
-
- # if response is not empty and response is OK
- if (isset($data) and isset($httpcodeOK) and $httpcodeOK) {
-
- # take charset of page and get it
- preg_match('##Usi', $data, $meta);
-
- # if meta tag is found
- if (!empty($meta[0])) {
- preg_match('#charset="?(.*)"#si', $meta[0], $encoding);
- # if charset is found set it otherwise, set it to utf-8
- $html_charset = (!empty($encoding[1])) ? strtolower($encoding[1]) : 'utf-8';
- if (empty($encoding[1])) $encoding[1] = 'utf-8';
- } else {
- $html_charset = 'utf-8';
- $encoding[1] = '';
- }
-
- # replace charset of url to charset of page
- $data = str_replace('charset=' . $encoding[1], 'charset=' . $html_charset, $data);
-
- return $data;
- }
- else {
- return FALSE;
- }
- }
-
- /**
- * Headers for JSON export
- *
- * @param $data
- */
- public static function renderJson($data)
- {
- header('Cache-Control: no-cache, must-revalidate');
- header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
- header('Content-type: application/json; charset=UTF-8');
- echo json_encode($data);
- exit();
- }
-
- /**
- * Create new line in log file
- *
- * @param $message
- */
- public static function logm($message)
- {
- if (DEBUG_POCHE && php_sapi_name() != 'cli') {
- $t = strval(date('Y/m/d_H:i:s')) . ' - ' . $_SERVER["REMOTE_ADDR"] . ' - ' . strval($message) . "\n";
- file_put_contents(CACHE . '/log.txt', $t, FILE_APPEND);
- error_log('DEBUG POCHE : ' . $message);
- }
- }
-
- /**
- * Encode a URL by using a salt
- *
- * @param $string
- * @return string
- */
- public static function encodeString($string)
- {
- return sha1($string . SALT);
- }
-
- /**
- * Cleans a variable
- *
- * @param $var
- * @param string $default
- * @return string
- */
- public static function checkVar($var, $default = '')
- {
- return ((isset($_REQUEST["$var"])) ? htmlentities($_REQUEST["$var"]) : $default);
- }
-
- /**
- * Returns the domain name for a URL
- *
- * @param $url
- * @return string
- */
- public static function getDomain($url)
- {
- return parse_url($url, PHP_URL_HOST);
- }
-
- /**
- * For a given text, we calculate reading time for an article
- *
- * @param $text
- * @return float
- */
- public static function getReadingTime($text)
- {
- return floor(str_word_count(strip_tags($text)) / 200);
- }
-
- /**
- * Returns the correct header for a status code
- *
- * @param $status_code
- */
- private static function _status($status_code)
- {
- if (strpos(php_sapi_name(), 'apache') !== false) {
-
- header('HTTP/1.0 '.$status_code);
- }
- else {
-
- header('Status: '.$status_code);
- }
- }
-
- /**
- * Get the content for a given URL (by a call to FullTextFeed)
- *
- * @param Url $url
- * @return mixed
- */
- public static function getPageContent(Url $url)
- {
- // Saving and clearing context
- $REAL = array();
- foreach( $GLOBALS as $key => $value ) {
- if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) {
- $GLOBALS[$key] = array();
- $REAL[$key] = $value;
- }
- }
- // Saving and clearing session
- if (isset($_SESSION)) {
- $REAL_SESSION = array();
- foreach( $_SESSION as $key => $value ) {
- $REAL_SESSION[$key] = $value;
- unset($_SESSION[$key]);
- }
- }
-
- // Running code in different context
- $scope = function() {
- extract( func_get_arg(1) );
- $_GET = $_REQUEST = array(
- "url" => $url->getUrl(),
- "max" => 5,
- "links" => "preserve",
- "exc" => "",
- "format" => "json",
- "submit" => "Create Feed"
- );
- ob_start();
- require func_get_arg(0);
- $json = ob_get_contents();
- ob_end_clean();
- return $json;
- };
-
- // Silence $scope function to avoid
- // issues with FTRSS when error_reporting is to high
- // FTRSS generates PHP warnings which break output
- $json = @$scope("vendor/wallabag/Fivefilters_Libraries/makefulltextfeed.php", array("url" => $url));
-
- // Clearing and restoring context
- foreach ($GLOBALS as $key => $value) {
- if($key != "GLOBALS" && $key != "_SESSION" ) {
- unset($GLOBALS[$key]);
- }
- }
- foreach ($REAL as $key => $value) {
- $GLOBALS[$key] = $value;
- }
-
- // Clearing and restoring session
- if (isset($REAL_SESSION)) {
- foreach($_SESSION as $key => $value) {
- unset($_SESSION[$key]);
- }
-
- foreach($REAL_SESSION as $key => $value) {
- $_SESSION[$key] = $value;
- }
- }
-
- return json_decode($json, true);
- }
-
- /**
- * Returns whether we handle an AJAX (XMLHttpRequest) request.
- *
- * @return boolean whether we handle an AJAX (XMLHttpRequest) request.
- */
- public static function isAjaxRequest()
- {
- return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH']==='XMLHttpRequest';
- }
-
- /*
- * Empty cache folder
- */
- public static function emptyCache()
- {
- $files = new RecursiveIteratorIterator(
- new RecursiveDirectoryIterator(CACHE, RecursiveDirectoryIterator::SKIP_DOTS),
- RecursiveIteratorIterator::CHILD_FIRST
- );
-
- foreach ($files as $fileInfo) {
- $todo = ($fileInfo->isDir() ? 'rmdir' : 'unlink');
- $todo($fileInfo->getRealPath());
- }
-
- Tools::logm('empty cache');
- Tools::redirect();
- }
-
- public static function generateToken()
- {
- if (ini_get('open_basedir') === '') {
- if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
- // alternative to /dev/urandom for Windows
- $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
- } else {
- $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
- }
- }
- else {
- $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
- }
-
- return str_replace('+', '', $token);
- }
-
-}
diff --git a/src/Wallabag/Wallabag/Url.php b/src/Wallabag/Wallabag/Url.php
deleted file mode 100644
index b18fe3d43..000000000
--- a/src/Wallabag/Wallabag/Url.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
- * @copyright 2013
- * @license http://opensource.org/licenses/MIT see COPYING file
- */
-
-namespace Wallabag\Wallabag;
-
-class Url
-{
- public $url;
-
- function __construct($url)
- {
- $this->url = base64_decode($url);
- }
-
- public function getUrl() {
- return $this->url;
- }
-
- public function setUrl($url) {
- $this->url = $url;
- }
-
- public function isCorrect() {
- return filter_var($this->url, FILTER_VALIDATE_URL) !== FALSE;
- }
-}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/User.php b/src/Wallabag/Wallabag/User.php
deleted file mode 100644
index 4a10c2edc..000000000
--- a/src/Wallabag/Wallabag/User.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- * @copyright 2013
- * @license http://opensource.org/licenses/MIT see COPYING file
- */
-
-namespace Wallabag\Wallabag;
-
-class User
-{
- public $id;
- public $username;
- public $name;
- public $password;
- public $email;
- public $config;
-
- function __construct($user = array())
- {
- if ($user != array()) {
- $this->id = $user['id'];
- $this->username = $user['username'];
- $this->name = $user['name'];
- $this->password = $user['password'];
- $this->email = $user['email'];
- $this->config = $user['config'];
- }
- }
-
- public function getId()
- {
- return $this->id;
- }
-
- public function getUsername()
- {
- return $this->username;
- }
-
- public function setConfig($config)
- {
- $this->config = $config;
- }
-
- /**
- * Returns configuration entry for a user
- *
- * @param $name
- * @return bool
- */
- public function getConfigValue($name)
- {
- return (isset($this->config[$name])) ? $this->config[$name] : FALSE;
- }
-}
\ No newline at end of file
diff --git a/src/Wallabag/Wallabag/Wallabag.php b/src/Wallabag/Wallabag/Wallabag.php
deleted file mode 100755
index 0a498ebf1..000000000
--- a/src/Wallabag/Wallabag/Wallabag.php
+++ /dev/null
@@ -1,866 +0,0 @@
-
- * @copyright 2013
- * @license http://opensource.org/licenses/MIT see COPYING file
- */
-
-namespace Wallabag\Wallabag;
-
-use \Paginator;
-use \Session;
-use \Messages;
-use \FeedWriter;
-
-class Wallabag
-{
- /**
- * @var User
- */
- public $user;
- /**
- * @var Database
- */
- public $store;
- /**
- * @var Template
- */
- public $tpl;
- /**
- * @var Language
- */
- public $language;
- /**
- * @var Routing
- */
- public $routing;
- /**
- * @var Messages
- */
- public $messages;
- /**
- * @var Paginator
- */
- public $pagination;
-
- public function __construct()
- {
- $this->init();
- }
-
- private function init()
- {
- Tools::initPhp();
-
- $pocheUser = \Session::getParam('poche_user');
-
- if ($pocheUser && $pocheUser != array()) {
- $this->user = $pocheUser;
- } else {
- // fake user, just for install & login screens
- $this->user = new User();
- $this->user->setConfig($this->getDefaultConfig());
- }
-
- $this->pagination = new Paginator($this->user->getConfigValue('pager'), 'p');
- $this->language = new Language($this);
- $this->tpl = new Template($this);
- $this->store = new Database();
- $this->messages = new Messages();
- $this->routing = new Routing($this);
- }
-
- public function run()
- {
- $this->routing->run();
- }
-
- /**
- * Creates a new user
- */
- public function createNewUser($username, $password, $email = "")
- {
- if (!empty($username) && !empty($password)){
- $newUsername = filter_var($username, FILTER_SANITIZE_STRING);
- $email = filter_var($email, FILTER_SANITIZE_STRING);
- if (!$this->store->userExists($newUsername)){
- if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) {
- Tools::logm('The new user ' . $newUsername . ' has been installed');
- $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to logout ?'), $newUsername));
- Tools::redirect();
- }
- else {
- Tools::logm('error during adding new user');
- Tools::redirect();
- }
- }
- else {
- $this->messages->add('e', sprintf(_('Error : An user with the name %s already exists !'), $newUsername));
- Tools::logm('An user with the name ' . $newUsername . ' already exists !');
- Tools::redirect();
- }
- }
- }
-
- /**
- * Delete an existing user
- */
- public function deleteUser($password)
- {
- if ($this->store->listUsers() > 1) {
- if (Tools::encodeString($password . $this->user->getUsername()) == $this->store->getUserPassword($this->user->getId())) {
- $username = $this->user->getUsername();
- $this->store->deleteUserConfig($this->user->getId());
- Tools::logm('The configuration for user '. $username .' has been deleted !');
- $this->store->deleteTagsEntriesAndEntries($this->user->getId());
- Tools::logm('The entries for user '. $username .' has been deleted !');
- $this->store->deleteUser($this->user->getId());
- Tools::logm('User '. $username .' has been completely deleted !');
- Session::logout();
- Tools::logm('logout');
- Tools::redirect();
- $this->messages->add('s', sprintf(_('User %s has been successfully deleted !'), $username));
- }
- else {
- Tools::logm('Bad password !');
- $this->messages->add('e', _('Error : The password is wrong !'));
- }
- }
- else {
- Tools::logm('Only user !');
- $this->messages->add('e', _('Error : You are the only user, you cannot delete your account !'));
- }
- }
-
- public function getDefaultConfig()
- {
- return array(
- 'pager' => PAGINATION,
- 'language' => LANG,
- 'theme' => DEFAULT_THEME
- );
- }
-
- /**
- * Call action (mark as fav, archive, delete, etc.)
- */
- public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE, $tags = null)
- {
- switch ($action)
- {
- case 'add':
- $content = Tools::getPageContent($url);
- $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
- $body = $content['rss']['channel']['item']['description'];
-
- // clean content from prevent xss attack
- $purifier = $this->_getPurifier();
- $title = $purifier->purify($title);
- $body = $purifier->purify($body);
-
- //search for possible duplicate
- $duplicate = NULL;
- $duplicate = $this->store->retrieveOneByURL($url->getUrl(), $this->user->getId());
-
- $last_id = $this->store->add($url->getUrl(), $title, $body, $this->user->getId());
- if ( $last_id ) {
- Tools::logm('add link ' . $url->getUrl());
- if (DOWNLOAD_PICTURES) {
- $content = Picture::filterPicture($body, $url->getUrl(), $last_id);
- Tools::logm('updating content article');
- $this->store->updateContent($last_id, $content, $this->user->getId());
- }
-
- if ($duplicate != NULL) {
- // duplicate exists, so, older entry needs to be deleted (as new entry should go to the top of list), BUT favorite mark and tags should be preserved
- Tools::logm('link ' . $url->getUrl() . ' is a duplicate');
- // 1) - preserve tags and favorite, then drop old entry
- $this->store->reassignTags($duplicate['id'], $last_id);
- if ($duplicate['is_fav']) {
- $this->store->favoriteById($last_id, $this->user->getId());
- }
- if ($this->store->deleteById($duplicate['id'], $this->user->getId())) {
- Tools::logm('previous link ' . $url->getUrl() .' entry deleted');
- }
- }
-
- // if there are tags, add them to the new article
- if (isset($_GET['tags'])) {
- $_POST['value'] = $_GET['tags'];
- $_POST['entry_id'] = $last_id;
- $this->action('add_tag', $url);
- }
-
- $this->messages->add('s', _('the link has been added successfully'));
- }
- else {
- $this->messages->add('e', _('error during insertion : the link wasn\'t added'));
- Tools::logm('error during insertion : the link wasn\'t added ' . $url->getUrl());
- }
-
- if ($autoclose == TRUE) {
- Tools::redirect('?view=home');
- } else {
- Tools::redirect('?view=home&closewin=true');
- }
- break;
- case 'delete':
- if (isset($_GET['search'])) {
- //when we want to apply a delete to a search
- $tags = array($_GET['search']);
- $allentry_ids = $this->store->search($tags[0], $this->user->getId());
- $entry_ids = array();
- foreach ($allentry_ids as $eachentry) {
- $entry_ids[] = $eachentry[0];
- }
- } else { // delete a single article
- $entry_ids = array($id);
- }
- foreach($entry_ids as $id) {
- $msg = 'delete link #' . $id;
- if ($this->store->deleteById($id, $this->user->getId())) {
- if (DOWNLOAD_PICTURES) {
- Picture::removeDirectory(ABS_PATH . $id);
- }
- $this->messages->add('s', _('the link has been deleted successfully'));
- }
- else {
- $this->messages->add('e', _('the link wasn\'t deleted'));
- $msg = 'error : can\'t delete link #' . $id;
- }
- Tools::logm($msg);
- }
- Tools::redirect('?');
- break;
- case 'toggle_fav' :
- $this->store->favoriteById($id, $this->user->getId());
- Tools::logm('mark as favorite link #' . $id);
- if ( Tools::isAjaxRequest() ) {
- echo 1;
- exit;
- }
- else {
- Tools::redirect();
- }
- break;
- case 'toggle_archive' :
- if (isset($_GET['tag_id'])) {
- //when we want to archive a whole tag
- $tag_id = $_GET['tag_id'];
- $allentry_ids = $this->store->retrieveEntriesByTag($tag_id, $this->user->getId());
- $entry_ids = array();
- foreach ($allentry_ids as $eachentry) {
- $entry_ids[] = $eachentry[0];
- }
- } else { //archive a single article
- $entry_ids = array($id);
- }
- foreach($entry_ids as $id) {
- $this->store->archiveById($id, $this->user->getId());
- Tools::logm('archive link #' . $id);
- }
- if ( Tools::isAjaxRequest() ) {
- echo 1;
- exit;
- }
- else {
- Tools::redirect();
- }
- break;
- case 'archive_all' :
- $this->store->archiveAll($this->user->getId());
- Tools::logm('archive all links');
- Tools::redirect();
- break;
- case 'add_tag' :
- if (isset($_GET['search'])) {
- //when we want to apply a tag to a search
- $tags = array($_GET['search']);
- $allentry_ids = $this->store->search($tags[0], $this->user->getId());
- $entry_ids = array();
- foreach ($allentry_ids as $eachentry) {
- $entry_ids[] = $eachentry[0];
- }
- } else { //add a tag to a single article
- $tags = explode(',', $_POST['value']);
- $entry_ids = array($_POST['entry_id']);
- }
- foreach($entry_ids as $entry_id) {
- $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
- if (!$entry) {
- $this->messages->add('e', _('Article not found!'));
- Tools::logm('error : article not found');
- Tools::redirect();
- }
- //get all already set tags to preven duplicates
- $already_set_tags = array();
- $entry_tags = $this->store->retrieveTagsByEntry($entry_id);
- foreach ($entry_tags as $tag) {
- $already_set_tags[] = $tag['value'];
- }
- foreach($tags as $key => $tag_value) {
- $value = trim($tag_value);
- if ($value && !in_array($value, $already_set_tags)) {
- $tag = $this->store->retrieveTagByValue($value);
- if (is_null($tag)) {
- # we create the tag
- $tag = $this->store->createTag($value);
- $sequence = '';
- if (STORAGE == 'postgres') {
- $sequence = 'tags_id_seq';
- }
- $tag_id = $this->store->getLastId($sequence);
- }
- else {
- $tag_id = $tag['id'];
- }
-
- # we assign the tag to the article
- $this->store->setTagToEntry($tag_id, $entry_id);
- }
- }
- }
- $this->messages->add('s', _('The tag has been applied successfully'));
- Tools::logm('The tag has been applied successfully');
- Tools::redirect();
- break;
- case 'remove_tag' :
- $tag_id = $_GET['tag_id'];
- $entry = $this->store->retrieveOneById($id, $this->user->getId());
- if (!$entry) {
- $this->messages->add('e', _('Article not found!'));
- Tools::logm('error : article not found');
- Tools::redirect();
- }
- $this->store->removeTagForEntry($id, $tag_id);
- Tools::logm('tag entry deleted');
- if ($this->store->cleanUnusedTag($tag_id)) {
- Tools::logm('tag deleted');
- }
- $this->messages->add('s', _('The tag has been successfully deleted'));
- Tools::redirect();
- break;
- default:
- break;
- }
- }
-
- function displayView($view, $id = 0)
- {
- $tpl_vars = array();
-
- switch ($view)
- {
- case 'about':
- break;
- case 'config':
- $dev_infos = $this->_getPocheVersion('dev');
- $dev = trim($dev_infos[0]);
- $check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
- $prod_infos = $this->_getPocheVersion('prod');
- $prod = trim($prod_infos[0]);
- $check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
- $compare_dev = version_compare(POCHE, $dev);
- $compare_prod = version_compare(POCHE, $prod);
- $themes = $this->tpl->getInstalledThemes();
- $languages = $this->language->getInstalledLanguages();
- $token = $this->user->getConfigValue('token');
- $http_auth = (isset($_SERVER['PHP_AUTH_USER']) || isset($_SERVER['REMOTE_USER'])) ? true : false;
- $only_user = ($this->store->listUsers() > 1) ? false : true;
- $tpl_vars = array(
- 'themes' => $themes,
- 'languages' => $languages,
- 'dev' => $dev,
- 'prod' => $prod,
- 'check_time_dev' => $check_time_dev,
- 'check_time_prod' => $check_time_prod,
- 'compare_dev' => $compare_dev,
- 'compare_prod' => $compare_prod,
- 'token' => $token,
- 'user_id' => $this->user->getId(),
- 'http_auth' => $http_auth,
- 'only_user' => $only_user
- );
- Tools::logm('config view');
- break;
- case 'edit-tags':
- # tags
- $entry = $this->store->retrieveOneById($id, $this->user->getId());
- if (!$entry) {
- $this->messages->add('e', _('Article not found!'));
- Tools::logm('error : article not found');
- Tools::redirect();
- }
- $tags = $this->store->retrieveTagsByEntry($id);
- $tpl_vars = array(
- 'entry_id' => $id,
- 'tags' => $tags,
- 'entry' => $entry,
- );
- break;
- case 'tags':
- $token = $this->user->getConfigValue('token');
- //if term is set - search tags for this term
- $term = Tools::checkVar('term');
- $tags = $this->store->retrieveAllTags($this->user->getId(), $term);
- if (Tools::isAjaxRequest()) {
- $result = array();
- foreach ($tags as $tag) {
- $result[] = $tag['value'];
- }
- echo json_encode($result);
- exit;
- }
- $tpl_vars = array(
- 'token' => $token,
- 'user_id' => $this->user->getId(),
- 'tags' => $tags,
- );
- break;
- case 'search':
- if (isset($_GET['search'])) {
- $search = filter_var($_GET['search'], FILTER_SANITIZE_STRING);
- $tpl_vars['entries'] = $this->store->search($search, $this->user->getId());
- $count = count($tpl_vars['entries']);
- $this->pagination->set_total($count);
- $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')),
- $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' ));
- $tpl_vars['page_links'] = $page_links;
- $tpl_vars['nb_results'] = $count;
- $tpl_vars['searchterm'] = $search;
- }
- break;
- case 'view':
- $entry = $this->store->retrieveOneById($id, $this->user->getId());
- if ($entry != NULL) {
- Tools::logm('view link #' . $id);
- $content = $entry['content'];
- if (function_exists('tidy_parse_string')) {
- $tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8');
- $tidy->cleanRepair();
- $content = $tidy->value;
- }
-
- # flattr checking
- $flattr = NULL;
- if (FLATTR) {
- $flattr = new FlattrItem();
- $flattr->checkItem($entry['url'], $entry['id']);
- }
-
- # tags
- $tags = $this->store->retrieveTagsByEntry($entry['id']);
-
- $tpl_vars = array(
- 'entry' => $entry,
- 'content' => $content,
- 'flattr' => $flattr,
- 'tags' => $tags
- );
- }
- else {
- Tools::logm('error in view call : entry is null');
- }
- break;
- default: # home, favorites, archive and tag views
- $tpl_vars = array(
- 'entries' => '',
- 'page_links' => '',
- 'nb_results' => '',
- 'listmode' => (isset($_COOKIE['listmode']) ? true : false),
- );
-
- //if id is given - we retrieve entries by tag: id is tag id
- if ($id) {
- $tpl_vars['tag'] = $this->store->retrieveTag($id, $this->user->getId());
- $tpl_vars['id'] = intval($id);
- }
-
- $count = $this->store->getEntriesByViewCount($view, $this->user->getId(), $id);
-
- if ($count > 0) {
- $this->pagination->set_total($count);
- $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')),
- $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . (($id)?'&id='.$id:'') . '&' ));
- $tpl_vars['entries'] = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit(), $id);
- $tpl_vars['page_links'] = $page_links;
- $tpl_vars['nb_results'] = $count;
- }
- Tools::logm('display ' . $view . ' view');
- break;
- }
-
- return $tpl_vars;
- }
-
- /**
- * update the password of the current user.
- * if MODE_DEMO is TRUE, the password can't be updated.
- * @todo add the return value
- * @todo set the new password in function header like this updatePassword($newPassword)
- * @return boolean
- */
- public function updatePassword($password, $confirmPassword)
- {
- if (MODE_DEMO) {
- $this->messages->add('i', _('in demo mode, you can\'t update your password'));
- Tools::logm('in demo mode, you can\'t do this');
- Tools::redirect('?view=config');
- }
- else {
- if (isset($password) && isset($confirmPassword)) {
- if ($password == $confirmPassword && !empty($password)) {
- $this->messages->add('s', _('your password has been updated'));
- $this->store->updatePassword($this->user->getId(), Tools::encodeString($password . $this->user->getUsername()));
- Session::logout();
- Tools::logm('password updated');
- Tools::redirect();
- }
- else {
- $this->messages->add('e', _('the two fields have to be filled & the password must be the same in the two fields'));
- Tools::redirect('?view=config');
- }
- }
- }
- }
-
- /**
- * Get credentials from differents sources
- * It redirects the user to the $referer link
- *
- * @return array
- */
- private function credentials()
- {
- if (isset($_SERVER['PHP_AUTH_USER'])) {
- return array($_SERVER['PHP_AUTH_USER'], 'php_auth', true);
- }
- if (!empty($_POST['login']) && !empty($_POST['password'])) {
- return array($_POST['login'], $_POST['password'], false);
- }
- if (isset($_SERVER['REMOTE_USER'])) {
- return array($_SERVER['REMOTE_USER'], 'http_auth', true);
- }
-
- return array(false, false, false);
- }
-
- /**
- * checks if login & password are correct and save the user in session.
- * it redirects the user to the $referer link
- * @param string $referer the url to redirect after login
- * @todo add the return value
- * @return boolean
- */
- public function login($referer)
- {
- list($login,$password,$isauthenticated)=$this->credentials();
- if($login === false || $password === false) {
- $this->messages->add('e', _('login failed: you have to fill all fields'));
- Tools::logm('login failed');
- Tools::redirect();
- }
- if (!empty($login) && !empty($password)) {
- $user = $this->store->login($login, Tools::encodeString($password . $login), $isauthenticated);
- if ($user != array()) {
- # Save login into Session
- $longlastingsession = isset($_POST['longlastingsession']);
- $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login);
- Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user)));
-
- # reload l10n
- $language = $user['config']['language'];
- @putenv('LC_ALL=' . $language);
- setlocale(LC_ALL, $language);
- bindtextdomain($language, LOCALE);
- textdomain($language);
-
- $this->messages->add('s', _('welcome to your wallabag'));
- Tools::logm('login successful');
- Tools::redirect($referer);
- }
- $this->messages->add('e', _('login failed: bad login or password'));
- // log login failure in web server log to allow fail2ban usage
- error_log('user '.$login.' authentication failure');
- Tools::logm('login failed');
- Tools::redirect();
- }
- }
-
- /**
- * log out the poche user. It cleans the session.
- * @todo add the return value
- * @return boolean
- */
- public function logout()
- {
- $this->user = array();
- Session::logout();
- Tools::logm('logout');
- Tools::redirect();
- }
-
- /**
- * import datas into your wallabag
- * @return boolean
- */
-
- public function import() {
-
- if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) {
- Tools::logm('Import stated: parsing file');
-
- // assume, that file is in json format
- $str_data = file_get_contents($_FILES['file']['tmp_name']);
- $data = json_decode($str_data, true);
-
- if ( $data === null ) {
- //not json - assume html
- $html = new simple_html_dom();
- $html->load_file($_FILES['file']['tmp_name']);
- $data = array();
- $read = 0;
- foreach (array('ol','ul') as $list) {
- foreach ($html->find($list) as $ul) {
- foreach ($ul->find('li') as $li) {
- $tmpEntry = array();
- $a = $li->find('a');
- $tmpEntry['url'] = $a[0]->href;
- $tmpEntry['tags'] = $a[0]->tags;
- $tmpEntry['is_read'] = $read;
- if ($tmpEntry['url']) {
- $data[] = $tmpEntry;
- }
- }
- # the second is for read links
- $read = ((sizeof($data) && $read)?0:1);
- }
- }
- }
-
- // for readability structure
-
- foreach($data as $record) {
- if (is_array($record)) {
- $data[] = $record;
- foreach($record as $record2) {
- if (is_array($record2)) {
- $data[] = $record2;
- }
- }
- }
- }
-
- $urlsInserted = array(); //urls of articles inserted
- foreach($data as $record) {
- $url = trim(isset($record['article__url']) ? $record['article__url'] : (isset($record['url']) ? $record['url'] : ''));
- if ($url and !in_array($url, $urlsInserted)) {
- $title = (isset($record['title']) ? $record['title'] : _('Untitled - Import - ') . ' ' . _('click to finish import') . '');
- $body = (isset($record['content']) ? $record['content'] : '');
- $isRead = (isset($record['is_read']) ? intval($record['is_read']) : (isset($record['archive']) ? intval($record['archive']) : 0));
- $isFavorite = (isset($record['is_fav']) ? intval($record['is_fav']) : (isset($record['favorite']) ? intval($record['favorite']) : 0));
-
- // insert new record
-
- $id = $this->store->add($url, $title, $body, $this->user->getId() , $isFavorite, $isRead);
- if ($id) {
- $urlsInserted[] = $url; //add
- if (isset($record['tags']) && trim($record['tags'])) {
-
- // @TODO: set tags
-
- }
- }
- }
- }
-
- $i = sizeof($urlsInserted);
- if ($i > 0) {
- $this->messages->add('s', _('Articles inserted: ') . $i . _('. Please note, that some may be marked as "read".'));
- }
-
- Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
- }
- else {
- $this->messages->add('s', _('Did you forget to select a file?'));
- }
- // file parsing finished here
- // now download article contents if any
- // check if we need to download any content
-
- $recordsDownloadRequired = $this->store->retrieveUnfetchedEntriesCount($this->user->getId());
-
- if ($recordsDownloadRequired == 0) {
-
- // nothing to download
-
- $this->messages->add('s', _('Import finished.'));
- Tools::logm('Import finished completely');
- Tools::redirect();
- }
- else {
-
- // if just inserted - don't download anything, download will start in next reload
-
- if (!isset($_FILES['file'])) {
-
- // download next batch
-
- Tools::logm('Fetching next batch of articles...');
- $items = $this->store->retrieveUnfetchedEntries($this->user->getId() , IMPORT_LIMIT);
- $purifier = $this->_getPurifier();
- foreach($items as $item) {
- $url = new Url(base64_encode($item['url']));
- Tools::logm('Fetching article ' . $item['id']);
- $content = Tools::getPageContent($url);
- $title = (($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'));
- $body = (($content['rss']['channel']['item']['description'] != '') ? $content['rss']['channel']['item']['description'] : _('Undefined'));
-
- // clean content to prevent xss attack
-
- $title = $purifier->purify($title);
- $body = $purifier->purify($body);
- $this->store->updateContentAndTitle($item['id'], $title, $body, $this->user->getId());
- Tools::logm('Article ' . $item['id'] . ' updated.');
- }
- }
- }
-
- return array(
- 'includeImport' => true,
- 'import' => array(
- 'recordsDownloadRequired' => $recordsDownloadRequired,
- 'recordsUnderDownload' => IMPORT_LIMIT,
- 'delay' => IMPORT_DELAY * 1000
- )
- );
- }
-
- /**
- * export poche entries in json
- * @return json all poche entries
- */
- public function export()
- {
- $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
- header('Content-Disposition: attachment; filename='.$filename);
-
- $entries = $this->store->retrieveAll($this->user->getId());
- echo $this->tpl->render('export.twig', array(
- 'export' => Tools::renderJson($entries),
- ));
- Tools::logm('export view');
- }
-
- /**
- * Checks online the latest version of poche and cache it
- * @param string $which 'prod' or 'dev'
- * @return string latest $which version
- */
- private function _getPocheVersion($which = 'prod') {
- $cache_file = CACHE . '/' . $which;
- $check_time = time();
-
- # checks if the cached version file exists
- if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
- $version = file_get_contents($cache_file);
- $check_time = filemtime($cache_file);
- } else {
- $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
- file_put_contents($cache_file, $version, LOCK_EX);
- }
- return array($version, $check_time);
- }
-
- /**
- * Update token for current user
- */
- public function updateToken()
- {
- $token = Tools::generateToken();
- $this->store->updateUserConfig($this->user->getId(), 'token', $token);
- $currentConfig = $_SESSION['poche_user']->config;
- $currentConfig['token'] = $token;
- $_SESSION['poche_user']->setConfig($currentConfig);
- Tools::redirect();
- }
-
- /**
- * Generate RSS feeds for current user
- *
- * @param $token
- * @param $user_id
- * @param $tag_id if $type is 'tag', the id of the tag to generate feed for
- * @param string $type the type of feed to generate
- * @param int $limit the maximum number of items (0 means all)
- */
- public function generateFeeds($token, $user_id, $tag_id, $type = 'home', $limit = 0)
- {
- $allowed_types = array('home', 'fav', 'archive', 'tag');
- $config = $this->store->getConfigUser($user_id);
-
- if ($config == null) {
- die(sprintf(_('User with this id (%d) does not exist.'), $user_id));
- }
-
- if (!in_array($type, $allowed_types) || !isset($config['token']) || $token != $config['token']) {
- die(_('Uh, there is a problem while generating feed. Wrong token used?'));
- }
-
- $feed = new FeedWriter(RSS2);
- $feed->setTitle('wallabag — ' . $type . ' feed');
- $feed->setLink(Tools::getPocheUrl());
- $feed->setChannelElement('pubDate', date(DATE_RSS , time()));
- $feed->setChannelElement('generator', 'wallabag');
- $feed->setDescription('wallabag ' . $type . ' elements');
-
- if ($type == 'tag') {
- $entries = $this->store->retrieveEntriesByTag($tag_id, $user_id);
- }
- else {
- $entries = $this->store->getEntriesByView($type, $user_id);
- }
-
- // if $limit is set to zero, use all entries
- if (0 == $limit) {
- $limit = count($entries);
- }
- if (count($entries) > 0) {
- for ($i = 0; $i < min(count($entries), $limit); $i++) {
- $entry = $entries[$i];
- $newItem = $feed->createNewItem();
- $newItem->setTitle($entry['title']);
- $newItem->setSource(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']);
- $newItem->setLink($entry['url']);
- $newItem->setDate(time());
- $newItem->setDescription($entry['content']);
- $feed->addItem($newItem);
- }
- }
-
- $feed->genarateFeed();
- exit;
- }
-
-
-
- /**
- * Returns new purifier object with actual config
- */
- private function _getPurifier()
- {
- $config = HTMLPurifier_Config::createDefault();
- $config->set('Cache.SerializerPath', CACHE);
- $config->set('HTML.SafeIframe', true);
-
- //allow YouTube, Vimeo and dailymotion videos
- $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%');
-
- return new HTMLPurifier($config);
- }
-
-
-}
diff --git a/web/index.php b/web/index.php
deleted file mode 100644
index ac361181f..000000000
--- a/web/index.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- * @copyright 2013
- * @license http://opensource.org/licenses/MIT see COPYING file
- */
-
-define ('WALLABAG', '2.0.0-alpha');
-
-use Wallabag\Wallabag\Wallabag;
-
-require_once '../app/check_essentials.php';
-require_once '../app/config/global.inc.php';
-
-// Check if /cache is writable
-if (! is_writable(CACHE)) {
- die('The directory ' . CACHE . ' must be writable by your web server user');
-}
-
-Session::$sessionName = 'wallabag';
-Session::init();
-
-// Let's rock !
-$wallabag = new Wallabag();
-$wallabag->run();
\ No newline at end of file