From b8c67f80688c8ba45e3207c6a212f97cac0537ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Fri, 20 Sep 2013 13:48:29 +0200
Subject: remove define.inc.php
---
inc/poche/define.inc.php | 39 ---------------------------------------
1 file changed, 39 deletions(-)
delete mode 100644 inc/poche/define.inc.php
diff --git a/inc/poche/define.inc.php b/inc/poche/define.inc.php
deleted file mode 100644
index 40f77b5c..00000000
--- a/inc/poche/define.inc.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
- * @copyright 2013
- * @license http://www.wtfpl.net/ see COPYING file
- */
-
-define ('STORAGE','sqlite'); # postgres, mysql, sqlite
-define ('STORAGE_SERVER', 'localhost'); # leave blank for sqlite
-define ('STORAGE_DB', 'poche'); # only for postgres & mysql
-define ('STORAGE_SQLITE', __DIR__ . '/../../db/poche.sqlite');
-define ('STORAGE_USER', 'postgres'); # leave blank for sqlite
-define ('STORAGE_PASSWORD', 'postgres'); # leave blank for sqlite
-
-define ('MODE_DEMO', FALSE);
-define ('DEBUG_POCHE', FALSE);
-define ('DOWNLOAD_PICTURES', FALSE);
-define ('SHARE_TWITTER', TRUE);
-define ('SHARE_MAIL', TRUE);
-define ('SHARE_SHAARLI', FALSE);
-define ('SHAARLI_URL', 'http://myshaarliurl.com');
-define ('FLATTR', TRUE);
-define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url=');
-define ('NOT_FLATTRABLE', '0');
-define ('FLATTRABLE', '1');
-define ('FLATTRED', '2');
-define ('ABS_PATH', 'assets/');
-define ('TPL', __DIR__ . '/../../tpl');
-define ('LOCALE', __DIR__ . '/../../locale');
-define ('CACHE', __DIR__ . '/../../cache');
-define ('PAGINATION', '10');
-define ('THEME', 'light');
-
-define ('IMPORT_POCKET_FILE', './ril_export.html');
-define ('IMPORT_READABILITY_FILE', './readability');
-define ('IMPORT_INSTAPAPER_FILE', './instapaper-export.html');
\ No newline at end of file
--
cgit v1.2.3
From 3408ed48ba66db8d93207507777be42759f7eb0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Fri, 20 Sep 2013 14:09:26 +0200
Subject: fix bug #225: blank page on article page
---
inc/poche/Poche.class.php | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 18860ddc..561de808 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -381,17 +381,17 @@ class Poche
$tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8');
$tidy->cleanRepair();
$content = $tidy->value;
+ }
- # flattr checking
- $flattr = new FlattrItem();
- $flattr->checkItem($entry['url']);
+ # flattr checking
+ $flattr = new FlattrItem();
+ $flattr->checkItem($entry['url']);
- $tpl_vars = array(
- 'entry' => $entry,
- 'content' => $content,
- 'flattr' => $flattr
- );
- }
+ $tpl_vars = array(
+ 'entry' => $entry,
+ 'content' => $content,
+ 'flattr' => $flattr
+ );
}
else {
Tools::logm('error in view call : entry is null');
--
cgit v1.2.3
From 88e1108f117581de492106db371185d9f8064e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Fri, 20 Sep 2013 14:30:07 +0200
Subject: upgrading themes
---
themes | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes b/themes
index 689dcedf..c6406013 160000
--- a/themes
+++ b/themes
@@ -1 +1 @@
-Subproject commit 689dcedf8d6c7cf5e8424654fef4fd9687288dc1
+Subproject commit c6406013d58dc3808b2544356b28a4816ae9747a
--
cgit v1.2.3
From 37527034ab3d1e925b8e1806f17215979170c200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Sat, 21 Sep 2013 14:18:28 +0200
Subject: unactivate debug
---
inc/poche/config.inc.php.new | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 48cc5783..7c407158 100755
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -26,7 +26,7 @@ define ('STORAGE_PASSWORD', 'poche');
#################################################################################
define ('MODE_DEMO', FALSE);
-define ('DEBUG_POCHE', true);
+define ('DEBUG_POCHE', FALSE);
define ('DOWNLOAD_PICTURES', FALSE);
define ('CONVERT_LINKS_FOOTNOTES', FALSE);
define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
--
cgit v1.2.3
From 58ace4941ef3ec92ab71ae84df816343e2deb625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Sat, 21 Sep 2013 14:37:53 +0200
Subject: bug fix #229: theme not stored on updated poches
---
inc/poche/Database.class.php | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 4d664992..0662581b 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -113,9 +113,17 @@ class Database {
}
public function updateUserConfig($userId, $key, $value) {
- $sql_update = "UPDATE users_config SET `value`=? WHERE `user_id`=? AND `name`=?";
- $params_update = array($value, $userId, $key);
- $query = $this->executeQuery($sql_update, $params_update);
+ $config = $this->getConfigUser($userId);
+
+ if (!isset ($user_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) {
--
cgit v1.2.3
From 92cd6e9af8c49be7b06beb583ee1c3026fbe356d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Sat, 21 Sep 2013 21:44:49 +0200
Subject: change import files constants
---
inc/poche/config.inc.php.new | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 7c407158..38d61e02 100755
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -51,6 +51,10 @@ define ('PAGINATION', '10');
define ('POCHE_VERSION', '1.0-beta5');
-define ('IMPORT_POCKET_FILE', ROOT . '/ril_export.html');
-define ('IMPORT_READABILITY_FILE', ROOT . '/readability');
-define ('IMPORT_INSTAPAPER_FILE', ROOT . '/instapaper-export.html');
\ No newline at end of file
+define ('POCKET_FILE', '/ril_export.html');
+define ('READABILITY_FILE', '/readability');
+define ('INSTAPAPER_FILE', '/instapaper-export.html');
+
+define ('IMPORT_POCKET_FILE', ROOT . POCKET_FILE);
+define ('IMPORT_READABILITY_FILE', ROOT . READABILITY_FILE);
+define ('IMPORT_INSTAPAPER_FILE', ROOT . INSTAPAPER_FILE);
\ No newline at end of file
--
cgit v1.2.3
From be2b9055b9019fccc9d2e4678494d0ffcd5f5f12 Mon Sep 17 00:00:00 2001
From: Thomas Citharel
Date: Thu, 26 Sep 2013 22:00:44 +0200
Subject: Changed url's encryption from base64 to md5
Fixes Issue #243.
md5 hashes are only coded on 32 hexadecimal characters, so it won't make
too long file names.
---
inc/3rdparty/FlattrItem.class.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php
index c940fcd6..ab5ed81d 100644
--- a/inc/3rdparty/FlattrItem.class.php
+++ b/inc/3rdparty/FlattrItem.class.php
@@ -11,7 +11,7 @@ class FlattrItem {
public function checkItem($urltoflattr) {
$this->cacheflattrfile($urltoflattr);
- $flattrResponse = file_get_contents(CACHE . "/flattr/".base64_encode($urltoflattr).".cache");
+ $flattrResponse = file_get_contents(CACHE . "/flattr/".md5($urltoflattr).".cache");
if($flattrResponse != FALSE) {
$result = json_decode($flattrResponse);
if (isset($result->message)){
@@ -39,9 +39,9 @@ class FlattrItem {
}
// if a cache flattr file for this url already exists and it's been less than one day than it have been updated, see in /cache
- if ((!file_exists(CACHE . "/flattr/".base64_encode($urltoflattr).".cache")) || (time() - filemtime(CACHE . "/flattr/".base64_encode($urltoflattr).".cache") > 86400)) {
+ if ((!file_exists(CACHE . "/flattr/".md5($urltoflattr).".cache")) || (time() - filemtime(CACHE . "/flattr/".md5($urltoflattr).".cache") > 86400)) {
$askForFlattr = Tools::getFile(FLATTR_API . $urltoflattr);
- $flattrCacheFile = fopen(CACHE . "/flattr/".base64_encode($urltoflattr).".cache", 'w+');
+ $flattrCacheFile = fopen(CACHE . "/flattr/".md5($urltoflattr).".cache", 'w+');
fwrite($flattrCacheFile, $askForFlattr);
fclose($flattrCacheFile);
}
--
cgit v1.2.3
From 3cc22aab829f339ac6e1ce1af63d646efe4a227c Mon Sep 17 00:00:00 2001
From: NumEricR
Date: Thu, 26 Sep 2013 23:37:07 +0200
Subject: Avoid ".git" option in themes list of config page
---
inc/poche/Poche.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 561de808..1bae2751 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -255,7 +255,7 @@ class Poche
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('..', '.'))) {
+ if (! is_dir(THEME . '/' . $theme) || in_array($theme, array('..', '.', '.git'))) {
continue;
}
--
cgit v1.2.3
From 4e5b04113d923b54206436c74ce1fa8649854046 Mon Sep 17 00:00:00 2001
From: Thomas Citharel
Date: Fri, 27 Sep 2013 11:11:45 +0200
Subject: Changed Flattr Caching System
From md5(url) to the ID of an article. Easier and faster.
---
inc/3rdparty/FlattrItem.class.php | 13 +++++++------
inc/poche/Poche.class.php | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php
index ab5ed81d..2b7ea3fa 100644
--- a/inc/3rdparty/FlattrItem.class.php
+++ b/inc/3rdparty/FlattrItem.class.php
@@ -9,9 +9,10 @@ class FlattrItem {
public $flattrItemURL;
public $numflattrs;
- public function checkItem($urltoflattr) {
- $this->cacheflattrfile($urltoflattr);
- $flattrResponse = file_get_contents(CACHE . "/flattr/".md5($urltoflattr).".cache");
+ public function checkItem($urltoflattr,$id) {
+ $this->cacheflattrfile($urltoflattr, $id);
+ $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache");
+ print_r($flattrResponse);
if($flattrResponse != FALSE) {
$result = json_decode($flattrResponse);
if (isset($result->message)){
@@ -33,15 +34,15 @@ class FlattrItem {
}
}
- private function cacheflattrfile($urltoflattr) {
+ private function cacheflattrfile($urltoflattr, $id) {
if (!is_dir(CACHE . '/flattr')) {
mkdir(CACHE . '/flattr', 0777);
}
// if a cache flattr file for this url already exists and it's been less than one day than it have been updated, see in /cache
- if ((!file_exists(CACHE . "/flattr/".md5($urltoflattr).".cache")) || (time() - filemtime(CACHE . "/flattr/".md5($urltoflattr).".cache") > 86400)) {
+ if ((!file_exists(CACHE . "/flattr/".$id.".cache")) || (time() - filemtime(CACHE . "/flattr/".$id.".cache") > 86400)) {
$askForFlattr = Tools::getFile(FLATTR_API . $urltoflattr);
- $flattrCacheFile = fopen(CACHE . "/flattr/".md5($urltoflattr).".cache", 'w+');
+ $flattrCacheFile = fopen(CACHE . "/flattr/".$id.".cache", 'w+');
fwrite($flattrCacheFile, $askForFlattr);
fclose($flattrCacheFile);
}
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 561de808..6907e649 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -385,7 +385,7 @@ class Poche
# flattr checking
$flattr = new FlattrItem();
- $flattr->checkItem($entry['url']);
+ $flattr->checkItem($entry['url'],$entry['id']);
$tpl_vars = array(
'entry' => $entry,
--
cgit v1.2.3
From 4ee705a79c455ab01b4c8dd3ad9372d855bd2a88 Mon Sep 17 00:00:00 2001
From: NumEricR
Date: Thu, 26 Sep 2013 23:25:01 +0200
Subject: Add .htaccess file to force download of poche export
---
.htaccess | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 .htaccess
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 00000000..37b7701c
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,8 @@
+Options +FollowSymlinks
+RewriteEngine On
+RewriteRule ^dl/export_poche.json$ ?export [L]
+
+# Force download
+RewriteCond %{QUERY_STRING} =export
+RewriteRule ([^/]*)$ - [L,E=dl:$1]
+Header onsuccess set Content-disposition "attachment; filename=%{dl}e" env=dl
\ No newline at end of file
--
cgit v1.2.3
From 969a91a1e3cff023139ae7fd065b81c921b713ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 13:48:58 +0200
Subject: site_config is now embedded with poche
---
inc/3rdparty/site_config/README.md | 6 ++
inc/3rdparty/site_config/custom/bfmtv.com.txt | 6 ++
inc/3rdparty/site_config/custom/inthepoche.com.txt | 7 ++
inc/3rdparty/site_config/custom/palkeo.com.txt | 0
inc/3rdparty/site_config/custom/tldp.org.txt | 6 ++
inc/3rdparty/site_config/index.php | 3 +
.../site_config/standard/.wikipedia.org.txt | 19 ++++++
inc/3rdparty/site_config/standard/index.php | 3 +
inc/3rdparty/site_config/standard/version.php | 2 +
install/update.php | 77 ----------------------
10 files changed, 52 insertions(+), 77 deletions(-)
create mode 100644 inc/3rdparty/site_config/README.md
create mode 100644 inc/3rdparty/site_config/custom/bfmtv.com.txt
create mode 100644 inc/3rdparty/site_config/custom/inthepoche.com.txt
create mode 100644 inc/3rdparty/site_config/custom/palkeo.com.txt
create mode 100644 inc/3rdparty/site_config/custom/tldp.org.txt
create mode 100644 inc/3rdparty/site_config/index.php
create mode 100644 inc/3rdparty/site_config/standard/.wikipedia.org.txt
create mode 100644 inc/3rdparty/site_config/standard/index.php
create mode 100644 inc/3rdparty/site_config/standard/version.php
delete mode 100644 install/update.php
diff --git a/inc/3rdparty/site_config/README.md b/inc/3rdparty/site_config/README.md
new file mode 100644
index 00000000..0aff456b
--- /dev/null
+++ b/inc/3rdparty/site_config/README.md
@@ -0,0 +1,6 @@
+Full-Text RSS Site Patterns
+---------------------------
+
+Site patterns allow you to specify what should be extracted from specific sites.
+
+Please see http://help.fivefilters.org/customer/portal/articles/223153-site-patterns for more information.
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/custom/bfmtv.com.txt b/inc/3rdparty/site_config/custom/bfmtv.com.txt
new file mode 100644
index 00000000..0ff28d56
--- /dev/null
+++ b/inc/3rdparty/site_config/custom/bfmtv.com.txt
@@ -0,0 +1,6 @@
+title: //title
+body: //h2 | //span[@class='masque'] | //article[@class='corps_article_right']
+prune: no
+tidy: no
+
+test_url: http://www.bfmtv.com/societe/cigarette-electronique-dangers-588622.html
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/custom/inthepoche.com.txt b/inc/3rdparty/site_config/custom/inthepoche.com.txt
new file mode 100644
index 00000000..ede74b97
--- /dev/null
+++ b/inc/3rdparty/site_config/custom/inthepoche.com.txt
@@ -0,0 +1,7 @@
+title: //title
+body: //div[@class='post-content']
+
+prune: no
+tidy: no
+
+test_url: http://www.inthepoche.com/?post/poche-hosting
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/custom/palkeo.com.txt b/inc/3rdparty/site_config/custom/palkeo.com.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/inc/3rdparty/site_config/custom/tldp.org.txt b/inc/3rdparty/site_config/custom/tldp.org.txt
new file mode 100644
index 00000000..7dd5cdb5
--- /dev/null
+++ b/inc/3rdparty/site_config/custom/tldp.org.txt
@@ -0,0 +1,6 @@
+title: //title
+body: //h2 | //p | //ul
+prune: no
+tidy: no
+
+test_url: http://www.tldp.org/HOWTO/Plug-and-Play-HOWTO-7.html
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/index.php b/inc/3rdparty/site_config/index.php
new file mode 100644
index 00000000..a3d5f739
--- /dev/null
+++ b/inc/3rdparty/site_config/index.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/.wikipedia.org.txt b/inc/3rdparty/site_config/standard/.wikipedia.org.txt
new file mode 100644
index 00000000..8b98ae4b
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/.wikipedia.org.txt
@@ -0,0 +1,19 @@
+title: //h1[@id='firstHeading']
+body: //div[@id = 'bodyContent']
+strip_id_or_class: editsection
+#strip_id_or_class: toc
+strip_id_or_class: vertical-navbox
+strip: //table[@id='toc']
+strip: //div[@id='catlinks']
+strip: //div[@id='jump-to-nav']
+strip: //div[@class='thumbcaption']//div[@class='magnify']
+strip: //table[@class='navbox']
+strip: //table[contains(@class, 'infobox')]
+strip: //div[@class='dablink']
+strip: //div[@id='contentSub']
+strip: //table[contains(@class, 'metadata')]
+strip: //*[contains(@class, 'noprint')]
+strip: //span[@title='pronunciation:']
+prune: no
+tidy: no
+test_url: http://en.wikipedia.org/wiki/Christopher_Lloyd
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/index.php b/inc/3rdparty/site_config/standard/index.php
new file mode 100644
index 00000000..a3d5f739
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/index.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/inc/3rdparty/site_config/standard/version.php b/inc/3rdparty/site_config/standard/version.php
new file mode 100644
index 00000000..e61807ed
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/version.php
@@ -0,0 +1,2 @@
+
-
-
-
-
-
-
-
-
- updating poche
-
-
- update poche to 1.0-beta4
-
- Changelog
-
- enhancement: updating and installing poche are more easier
- enhancement: poche now uses Full Text RSS to fetch content
- enhancement: css and twig files are more clean, thanks to NumEricR and nicofrand
- enhancement: updated german translation, thanks to HLFH
- enhancement: add db/, cache/ and assets/ directories in versioning
- enhancement: display messages when error with import, thanks to EliasZ
- enhancement: poche compatibility test file
- enhancement: #112 : link with shaarli
- enhancement: #162 : links to firefox / chrome / android apps in config screen
- bug: encode url to share with twitter / email / shaarli
- bug: Add IPv4 url support (and others beginning by a digit)
- bug: title page in article view was wrong
- bug: #148 : use of undefined constant POCHE_VERSION
- bug: #149 : can't poche theguardian.com
- bug: #150 : default title for untitled articles
- bug: #151 : HTML entities in titles are encoded twice
- bug: #169 : entries height with short description
- bug: #175 : IP addresses do not appear in "view original"
-
- To update your poche, please fill the following fields.
-
-
-
-login($_POST['login'], sha1($_POST['password'] . $_POST['login'] . SALT));
- if ($user != array()) {
- $myconfig_file = '../inc/poche/myconfig.inc.php';
- # just change version number in config file
-
- if (!is_writable('../inc/poche/myconfig.inc.php')) {
- die('You don\'t have write access to open ./inc/poche/myconfig.inc.php.');
- }
-
- if (file_exists($myconfig_file))
- {
- $content = str_replace('1.0-beta3', '1.0-beta4', file_get_contents($myconfig_file));
- file_put_contents($myconfig_file, $content);
- }
-?>
- your poche is up to date!
- don't forget to delete ./install/ folder after the update.
- go back to your poche
-
-
-
\ No newline at end of file
--
cgit v1.2.3
From 34bf601a56385f55b486b8d1fbd81026c1d471e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 13:59:52 +0200
Subject: change submodule & gitignore
---
.gitignore | 2 --
.gitmodules | 6 ------
2 files changed, 8 deletions(-)
delete mode 100644 .gitmodules
diff --git a/.gitignore b/.gitignore
index b73c4b40..2abed7ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,4 @@ cache/*
vendor
composer.phar
db/poche.sqlite
-output
-phpdoc*
inc/poche/config.inc.php
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index bbdd8495..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "inc/3rdparty/site_config"]
- path = inc/3rdparty/site_config
- url = git@github.com:inthepoche/site_config.git
-[submodule "themes"]
- path = themes
- url = git://github.com/inthepoche/poche-themes.git
--
cgit v1.2.3
From dfbbc14b335925072f71fdd7ec630e0244fc3ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:05:50 +0200
Subject: remove themes
---
themes | 1 -
1 file changed, 1 deletion(-)
delete mode 160000 themes
diff --git a/themes b/themes
deleted file mode 160000
index c6406013..00000000
--- a/themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6406013d58dc3808b2544356b28a4816ae9747a
--
cgit v1.2.3
From eb44ca42139c6d68698a6c87eddaa818e5079853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:06:20 +0200
Subject: embed themes with poche
---
themes | 1 +
1 file changed, 1 insertion(+)
create mode 160000 themes
diff --git a/themes b/themes
new file mode 160000
index 00000000..e8f5283a
--- /dev/null
+++ b/themes
@@ -0,0 +1 @@
+Subproject commit e8f5283a723b09164f24aa494baa965566328cc0
--
cgit v1.2.3
From 66e074b43dd4efc9f63c8fee784b99bcce51ab93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:09:58 +0200
Subject: remove themes
---
themes | 1 -
1 file changed, 1 deletion(-)
delete mode 160000 themes
diff --git a/themes b/themes
deleted file mode 160000
index e8f5283a..00000000
--- a/themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e8f5283a723b09164f24aa494baa965566328cc0
--
cgit v1.2.3
From 4cc3c2ac1735196e4e6a18d1a1124cd0d9a0ed5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:10:44 +0200
Subject: embed themes
---
themes/README.md | 31 ++
themes/dark/README.md | 3 +
themes/dark/css/style-dark.css | 78 +++++
themes/dark/img/dark/backtotop.png | Bin 0 -> 326 bytes
themes/dark/img/dark/bad-display.png | Bin 0 -> 343 bytes
themes/dark/img/dark/checkmark-off.png | Bin 0 -> 277 bytes
themes/dark/img/dark/checkmark-on.png | Bin 0 -> 235 bytes
themes/dark/img/dark/clock.png | Bin 0 -> 332 bytes
themes/dark/img/dark/down.png | Bin 0 -> 216 bytes
themes/dark/img/dark/envelop.png | Bin 0 -> 285 bytes
themes/dark/img/dark/flattr.png | Bin 0 -> 270 bytes
themes/dark/img/dark/left.png | Bin 0 -> 196 bytes
themes/dark/img/dark/link.png | Bin 0 -> 341 bytes
themes/dark/img/dark/remove.png | Bin 0 -> 252 bytes
themes/dark/img/dark/shaarli.png | Bin 0 -> 729 bytes
themes/dark/img/dark/star-off.png | Bin 0 -> 314 bytes
themes/dark/img/dark/star-on.png | Bin 0 -> 281 bytes
themes/dark/img/dark/top.png | Bin 0 -> 212 bytes
themes/dark/img/dark/twitter.png | Bin 0 -> 297 bytes
themes/dark/screenshot.jpg | Bin 0 -> 664859 bytes
themes/default/_bookmarklet.twig | 3 +
themes/default/_footer.twig | 4 +
themes/default/_head.twig | 11 +
themes/default/_menu.twig | 7 +
themes/default/_messages.twig | 1 +
themes/default/_top.twig | 7 +
themes/default/config.twig | 80 +++++
themes/default/css/knacss.css | 1 +
themes/default/css/messages.css | 75 +++++
themes/default/css/print.css | 48 +++
themes/default/css/style-default.css | 59 ++++
themes/default/css/style.css | 321 +++++++++++++++++++++
themes/default/error.twig | 6 +
themes/default/export.twig | 1 +
themes/default/home.twig | 49 ++++
.../img/apple-touch-icon-144x144-precomposed.png | Bin 0 -> 7349 bytes
.../img/apple-touch-icon-72x72-precomposed.png | Bin 0 -> 6168 bytes
themes/default/img/apple-touch-icon.png | Bin 0 -> 5803 bytes
themes/default/img/default/backtotop.png | Bin 0 -> 326 bytes
themes/default/img/default/bad-display.png | Bin 0 -> 343 bytes
themes/default/img/default/checkmark-off.png | Bin 0 -> 277 bytes
themes/default/img/default/checkmark-on.png | Bin 0 -> 235 bytes
themes/default/img/default/clock.png | Bin 0 -> 332 bytes
themes/default/img/default/down.png | Bin 0 -> 216 bytes
themes/default/img/default/envelop.png | Bin 0 -> 285 bytes
themes/default/img/default/flattr.png | Bin 0 -> 270 bytes
themes/default/img/default/left.png | Bin 0 -> 196 bytes
themes/default/img/default/link.png | Bin 0 -> 341 bytes
themes/default/img/default/remove.png | Bin 0 -> 252 bytes
themes/default/img/default/shaarli.png | Bin 0 -> 729 bytes
themes/default/img/default/star-off.png | Bin 0 -> 314 bytes
themes/default/img/default/star-on.png | Bin 0 -> 281 bytes
themes/default/img/default/top.png | Bin 0 -> 212 bytes
themes/default/img/default/twitter.png | Bin 0 -> 297 bytes
themes/default/img/favicon.ico | Bin 0 -> 346 bytes
themes/default/img/logo.png | Bin 0 -> 1350 bytes
themes/default/img/messages/close.png | Bin 0 -> 662 bytes
themes/default/img/messages/cross.png | Bin 0 -> 655 bytes
themes/default/img/messages/help.png | Bin 0 -> 786 bytes
themes/default/img/messages/tick.png | Bin 0 -> 537 bytes
themes/default/img/messages/warning.png | Bin 0 -> 666 bytes
themes/default/install.twig | 28 ++
themes/default/js/restoreScroll.js | 25 ++
themes/default/layout.twig | 31 ++
themes/default/login.twig | 32 ++
themes/default/view.twig | 51 ++++
themes/dmagenta/README.md | 3 +
themes/dmagenta/css/style-dmagenta.css | 82 ++++++
themes/dmagenta/img/dmagenta/backtotop.png | Bin 0 -> 326 bytes
themes/dmagenta/img/dmagenta/bad-display.png | Bin 0 -> 343 bytes
themes/dmagenta/img/dmagenta/checkmark-off.png | Bin 0 -> 277 bytes
themes/dmagenta/img/dmagenta/checkmark-on.png | Bin 0 -> 235 bytes
themes/dmagenta/img/dmagenta/clock.png | Bin 0 -> 332 bytes
themes/dmagenta/img/dmagenta/down.png | Bin 0 -> 216 bytes
themes/dmagenta/img/dmagenta/envelop.png | Bin 0 -> 285 bytes
themes/dmagenta/img/dmagenta/flattr.png | Bin 0 -> 270 bytes
themes/dmagenta/img/dmagenta/left.png | Bin 0 -> 196 bytes
themes/dmagenta/img/dmagenta/link.png | Bin 0 -> 341 bytes
themes/dmagenta/img/dmagenta/remove.png | Bin 0 -> 252 bytes
themes/dmagenta/img/dmagenta/shaarli.png | Bin 0 -> 729 bytes
themes/dmagenta/img/dmagenta/star-off.png | Bin 0 -> 314 bytes
themes/dmagenta/img/dmagenta/star-on.png | Bin 0 -> 281 bytes
themes/dmagenta/img/dmagenta/top.png | Bin 0 -> 212 bytes
themes/dmagenta/img/dmagenta/twitter.png | Bin 0 -> 297 bytes
themes/dmagenta/screenshot.jpg | Bin 0 -> 731866 bytes
themes/solarized-dark/README.md | 6 +
themes/solarized-dark/Solarized-LICENSE.txt | 19 ++
themes/solarized-dark/css/style-solarized-dark.css | 223 ++++++++++++++
.../img/solarized-dark/backtotop.png | Bin 0 -> 242 bytes
.../img/solarized-dark/bad-display.png | Bin 0 -> 419 bytes
.../img/solarized-dark/checkmark-off.png | Bin 0 -> 464 bytes
.../img/solarized-dark/checkmark-on.png | Bin 0 -> 164 bytes
themes/solarized-dark/img/solarized-dark/clock.png | Bin 0 -> 338 bytes
themes/solarized-dark/img/solarized-dark/down.png | Bin 0 -> 186 bytes
.../solarized-dark/img/solarized-dark/envelop.png | Bin 0 -> 335 bytes
.../solarized-dark/img/solarized-dark/flattr.png | Bin 0 -> 314 bytes
themes/solarized-dark/img/solarized-dark/left.png | Bin 0 -> 148 bytes
themes/solarized-dark/img/solarized-dark/link.png | Bin 0 -> 424 bytes
.../solarized-dark/img/solarized-dark/remove.png | Bin 0 -> 329 bytes
.../solarized-dark/img/solarized-dark/shaarli.png | Bin 0 -> 729 bytes
.../solarized-dark/img/solarized-dark/star-off.png | Bin 0 -> 441 bytes
.../solarized-dark/img/solarized-dark/star-on.png | Bin 0 -> 327 bytes
themes/solarized-dark/img/solarized-dark/top.png | Bin 0 -> 173 bytes
.../solarized-dark/img/solarized-dark/twitter.png | Bin 0 -> 388 bytes
themes/solarized-dark/screenshot.jpg | Bin 0 -> 230456 bytes
themes/solarized/README.md | 6 +
themes/solarized/Solarized-LICENSE.txt | 19 ++
themes/solarized/css/style-solarized.css | 223 ++++++++++++++
themes/solarized/img/solarized/backtotop.png | Bin 0 -> 249 bytes
themes/solarized/img/solarized/bad-display.png | Bin 0 -> 434 bytes
themes/solarized/img/solarized/checkmark-off.png | Bin 0 -> 475 bytes
themes/solarized/img/solarized/checkmark-on.png | Bin 0 -> 163 bytes
themes/solarized/img/solarized/clock.png | Bin 0 -> 346 bytes
themes/solarized/img/solarized/down.png | Bin 0 -> 189 bytes
themes/solarized/img/solarized/envelop.png | Bin 0 -> 340 bytes
themes/solarized/img/solarized/flattr.png | Bin 0 -> 315 bytes
themes/solarized/img/solarized/left.png | Bin 0 -> 139 bytes
themes/solarized/img/solarized/link.png | Bin 0 -> 425 bytes
themes/solarized/img/solarized/remove.png | Bin 0 -> 332 bytes
themes/solarized/img/solarized/shaarli.png | Bin 0 -> 729 bytes
themes/solarized/img/solarized/star-off.png | Bin 0 -> 455 bytes
themes/solarized/img/solarized/star-on.png | Bin 0 -> 332 bytes
themes/solarized/img/solarized/top.png | Bin 0 -> 172 bytes
themes/solarized/img/solarized/twitter.png | Bin 0 -> 407 bytes
themes/solarized/screenshot.jpg | Bin 0 -> 245928 bytes
125 files changed, 1533 insertions(+)
create mode 100644 themes/README.md
create mode 100644 themes/dark/README.md
create mode 100644 themes/dark/css/style-dark.css
create mode 100755 themes/dark/img/dark/backtotop.png
create mode 100755 themes/dark/img/dark/bad-display.png
create mode 100644 themes/dark/img/dark/checkmark-off.png
create mode 100644 themes/dark/img/dark/checkmark-on.png
create mode 100755 themes/dark/img/dark/clock.png
create mode 100644 themes/dark/img/dark/down.png
create mode 100644 themes/dark/img/dark/envelop.png
create mode 100755 themes/dark/img/dark/flattr.png
create mode 100644 themes/dark/img/dark/left.png
create mode 100755 themes/dark/img/dark/link.png
create mode 100644 themes/dark/img/dark/remove.png
create mode 100644 themes/dark/img/dark/shaarli.png
create mode 100644 themes/dark/img/dark/star-off.png
create mode 100644 themes/dark/img/dark/star-on.png
create mode 100644 themes/dark/img/dark/top.png
create mode 100644 themes/dark/img/dark/twitter.png
create mode 100644 themes/dark/screenshot.jpg
create mode 100644 themes/default/_bookmarklet.twig
create mode 100644 themes/default/_footer.twig
create mode 100644 themes/default/_head.twig
create mode 100644 themes/default/_menu.twig
create mode 100644 themes/default/_messages.twig
create mode 100644 themes/default/_top.twig
create mode 100644 themes/default/config.twig
create mode 100644 themes/default/css/knacss.css
create mode 100644 themes/default/css/messages.css
create mode 100644 themes/default/css/print.css
create mode 100644 themes/default/css/style-default.css
create mode 100644 themes/default/css/style.css
create mode 100644 themes/default/error.twig
create mode 100644 themes/default/export.twig
create mode 100644 themes/default/home.twig
create mode 100644 themes/default/img/apple-touch-icon-144x144-precomposed.png
create mode 100644 themes/default/img/apple-touch-icon-72x72-precomposed.png
create mode 100644 themes/default/img/apple-touch-icon.png
create mode 100644 themes/default/img/default/backtotop.png
create mode 100755 themes/default/img/default/bad-display.png
create mode 100644 themes/default/img/default/checkmark-off.png
create mode 100644 themes/default/img/default/checkmark-on.png
create mode 100755 themes/default/img/default/clock.png
create mode 100644 themes/default/img/default/down.png
create mode 100644 themes/default/img/default/envelop.png
create mode 100755 themes/default/img/default/flattr.png
create mode 100644 themes/default/img/default/left.png
create mode 100755 themes/default/img/default/link.png
create mode 100644 themes/default/img/default/remove.png
create mode 100644 themes/default/img/default/shaarli.png
create mode 100644 themes/default/img/default/star-off.png
create mode 100644 themes/default/img/default/star-on.png
create mode 100644 themes/default/img/default/top.png
create mode 100644 themes/default/img/default/twitter.png
create mode 100644 themes/default/img/favicon.ico
create mode 100644 themes/default/img/logo.png
create mode 100644 themes/default/img/messages/close.png
create mode 100644 themes/default/img/messages/cross.png
create mode 100644 themes/default/img/messages/help.png
create mode 100644 themes/default/img/messages/tick.png
create mode 100644 themes/default/img/messages/warning.png
create mode 100644 themes/default/install.twig
create mode 100644 themes/default/js/restoreScroll.js
create mode 100644 themes/default/layout.twig
create mode 100644 themes/default/login.twig
create mode 100644 themes/default/view.twig
create mode 100644 themes/dmagenta/README.md
create mode 100644 themes/dmagenta/css/style-dmagenta.css
create mode 100755 themes/dmagenta/img/dmagenta/backtotop.png
create mode 100755 themes/dmagenta/img/dmagenta/bad-display.png
create mode 100644 themes/dmagenta/img/dmagenta/checkmark-off.png
create mode 100644 themes/dmagenta/img/dmagenta/checkmark-on.png
create mode 100755 themes/dmagenta/img/dmagenta/clock.png
create mode 100644 themes/dmagenta/img/dmagenta/down.png
create mode 100644 themes/dmagenta/img/dmagenta/envelop.png
create mode 100755 themes/dmagenta/img/dmagenta/flattr.png
create mode 100644 themes/dmagenta/img/dmagenta/left.png
create mode 100755 themes/dmagenta/img/dmagenta/link.png
create mode 100644 themes/dmagenta/img/dmagenta/remove.png
create mode 100644 themes/dmagenta/img/dmagenta/shaarli.png
create mode 100644 themes/dmagenta/img/dmagenta/star-off.png
create mode 100644 themes/dmagenta/img/dmagenta/star-on.png
create mode 100644 themes/dmagenta/img/dmagenta/top.png
create mode 100644 themes/dmagenta/img/dmagenta/twitter.png
create mode 100644 themes/dmagenta/screenshot.jpg
create mode 100644 themes/solarized-dark/README.md
create mode 100644 themes/solarized-dark/Solarized-LICENSE.txt
create mode 100644 themes/solarized-dark/css/style-solarized-dark.css
create mode 100644 themes/solarized-dark/img/solarized-dark/backtotop.png
create mode 100644 themes/solarized-dark/img/solarized-dark/bad-display.png
create mode 100644 themes/solarized-dark/img/solarized-dark/checkmark-off.png
create mode 100644 themes/solarized-dark/img/solarized-dark/checkmark-on.png
create mode 100644 themes/solarized-dark/img/solarized-dark/clock.png
create mode 100644 themes/solarized-dark/img/solarized-dark/down.png
create mode 100644 themes/solarized-dark/img/solarized-dark/envelop.png
create mode 100644 themes/solarized-dark/img/solarized-dark/flattr.png
create mode 100644 themes/solarized-dark/img/solarized-dark/left.png
create mode 100644 themes/solarized-dark/img/solarized-dark/link.png
create mode 100644 themes/solarized-dark/img/solarized-dark/remove.png
create mode 100644 themes/solarized-dark/img/solarized-dark/shaarli.png
create mode 100644 themes/solarized-dark/img/solarized-dark/star-off.png
create mode 100644 themes/solarized-dark/img/solarized-dark/star-on.png
create mode 100644 themes/solarized-dark/img/solarized-dark/top.png
create mode 100644 themes/solarized-dark/img/solarized-dark/twitter.png
create mode 100644 themes/solarized-dark/screenshot.jpg
create mode 100644 themes/solarized/README.md
create mode 100644 themes/solarized/Solarized-LICENSE.txt
create mode 100644 themes/solarized/css/style-solarized.css
create mode 100644 themes/solarized/img/solarized/backtotop.png
create mode 100644 themes/solarized/img/solarized/bad-display.png
create mode 100644 themes/solarized/img/solarized/checkmark-off.png
create mode 100644 themes/solarized/img/solarized/checkmark-on.png
create mode 100644 themes/solarized/img/solarized/clock.png
create mode 100644 themes/solarized/img/solarized/down.png
create mode 100644 themes/solarized/img/solarized/envelop.png
create mode 100644 themes/solarized/img/solarized/flattr.png
create mode 100644 themes/solarized/img/solarized/left.png
create mode 100644 themes/solarized/img/solarized/link.png
create mode 100644 themes/solarized/img/solarized/remove.png
create mode 100644 themes/solarized/img/solarized/shaarli.png
create mode 100644 themes/solarized/img/solarized/star-off.png
create mode 100644 themes/solarized/img/solarized/star-on.png
create mode 100644 themes/solarized/img/solarized/top.png
create mode 100644 themes/solarized/img/solarized/twitter.png
create mode 100644 themes/solarized/screenshot.jpg
diff --git a/themes/README.md b/themes/README.md
new file mode 100644
index 00000000..76ac8ab0
--- /dev/null
+++ b/themes/README.md
@@ -0,0 +1,31 @@
+# poche-themes
+
+themes created by poche users
+
+## list of themes
+
+* dark ([preview](https://raw.github.com/inthepoche/poche-themes/master/dark/screenshot.jpg))
+* dmagenta ([preview](https://raw.github.com/inthepoche/poche-themes/master/dmagenta/screenshot.jpg))
+* solarized ([preview](https://raw.github.com/inthepoche/poche-themes/master/solarized/screenshot.jpg))
+* solarized-dark ([preview](https://raw.github.com/inthepoche/poche-themes/master/solarized-dark/screenshot.jpg))
+
+## installation
+
+In your poche folder:
+
+```
+git submodule init
+git submodule update
+```
+
+Then, in your config screen, select your favorite theme.
+
+That's all !
+
+## create a theme
+
+Just have a look to this short documentation : http://inthepoche.com/doc/doku.php?id=designers:creating_theme
+
+## send a theme
+
+Send your theme by email at support@inthepoche.com.
diff --git a/themes/dark/README.md b/themes/dark/README.md
new file mode 100644
index 00000000..92077994
--- /dev/null
+++ b/themes/dark/README.md
@@ -0,0 +1,3 @@
+# dark theme
+
+theme created by Nicolas Lœuillet aka nico_somb
\ No newline at end of file
diff --git a/themes/dark/css/style-dark.css b/themes/dark/css/style-dark.css
new file mode 100644
index 00000000..6d507516
--- /dev/null
+++ b/themes/dark/css/style-dark.css
@@ -0,0 +1,78 @@
+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');
+}
+
+a.reading-time span {
+ background-image: url('../img/dark/clock.png');
+}
+
+.pagination a {
+ color: #aaa;
+}
+
+#article_toolbar {
+ background: #262627;
+}
\ No newline at end of file
diff --git a/themes/dark/img/dark/backtotop.png b/themes/dark/img/dark/backtotop.png
new file mode 100755
index 00000000..051238ef
Binary files /dev/null and b/themes/dark/img/dark/backtotop.png differ
diff --git a/themes/dark/img/dark/bad-display.png b/themes/dark/img/dark/bad-display.png
new file mode 100755
index 00000000..6866799f
Binary files /dev/null and b/themes/dark/img/dark/bad-display.png differ
diff --git a/themes/dark/img/dark/checkmark-off.png b/themes/dark/img/dark/checkmark-off.png
new file mode 100644
index 00000000..3db5a06d
Binary files /dev/null and b/themes/dark/img/dark/checkmark-off.png differ
diff --git a/themes/dark/img/dark/checkmark-on.png b/themes/dark/img/dark/checkmark-on.png
new file mode 100644
index 00000000..cd3abb2c
Binary files /dev/null and b/themes/dark/img/dark/checkmark-on.png differ
diff --git a/themes/dark/img/dark/clock.png b/themes/dark/img/dark/clock.png
new file mode 100755
index 00000000..6164e92b
Binary files /dev/null and b/themes/dark/img/dark/clock.png differ
diff --git a/themes/dark/img/dark/down.png b/themes/dark/img/dark/down.png
new file mode 100644
index 00000000..b9d536a7
Binary files /dev/null and b/themes/dark/img/dark/down.png differ
diff --git a/themes/dark/img/dark/envelop.png b/themes/dark/img/dark/envelop.png
new file mode 100644
index 00000000..6be1c886
Binary files /dev/null and b/themes/dark/img/dark/envelop.png differ
diff --git a/themes/dark/img/dark/flattr.png b/themes/dark/img/dark/flattr.png
new file mode 100755
index 00000000..0404aaea
Binary files /dev/null and b/themes/dark/img/dark/flattr.png differ
diff --git a/themes/dark/img/dark/left.png b/themes/dark/img/dark/left.png
new file mode 100644
index 00000000..a0a53631
Binary files /dev/null and b/themes/dark/img/dark/left.png differ
diff --git a/themes/dark/img/dark/link.png b/themes/dark/img/dark/link.png
new file mode 100755
index 00000000..db62819d
Binary files /dev/null and b/themes/dark/img/dark/link.png differ
diff --git a/themes/dark/img/dark/remove.png b/themes/dark/img/dark/remove.png
new file mode 100644
index 00000000..f8ad56a3
Binary files /dev/null and b/themes/dark/img/dark/remove.png differ
diff --git a/themes/dark/img/dark/shaarli.png b/themes/dark/img/dark/shaarli.png
new file mode 100644
index 00000000..1eb30f60
Binary files /dev/null and b/themes/dark/img/dark/shaarli.png differ
diff --git a/themes/dark/img/dark/star-off.png b/themes/dark/img/dark/star-off.png
new file mode 100644
index 00000000..6a0133a7
Binary files /dev/null and b/themes/dark/img/dark/star-off.png differ
diff --git a/themes/dark/img/dark/star-on.png b/themes/dark/img/dark/star-on.png
new file mode 100644
index 00000000..a9f96eaa
Binary files /dev/null and b/themes/dark/img/dark/star-on.png differ
diff --git a/themes/dark/img/dark/top.png b/themes/dark/img/dark/top.png
new file mode 100644
index 00000000..954a8c0a
Binary files /dev/null and b/themes/dark/img/dark/top.png differ
diff --git a/themes/dark/img/dark/twitter.png b/themes/dark/img/dark/twitter.png
new file mode 100644
index 00000000..cfcfe419
Binary files /dev/null and b/themes/dark/img/dark/twitter.png differ
diff --git a/themes/dark/screenshot.jpg b/themes/dark/screenshot.jpg
new file mode 100644
index 00000000..daaad6c9
Binary files /dev/null and b/themes/dark/screenshot.jpg differ
diff --git a/themes/default/_bookmarklet.twig b/themes/default/_bookmarklet.twig
new file mode 100644
index 00000000..2f3b2d16
--- /dev/null
+++ b/themes/default/_bookmarklet.twig
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig
new file mode 100644
index 00000000..2b895854
--- /dev/null
+++ b/themes/default/_footer.twig
@@ -0,0 +1,4 @@
+
+ {% trans "powered by" %} poche
+ {% if constant('DEBUG_POCHE') == 1 %}{% trans "debug mode is on so cache is off." %} {% trans "your poche version:" %}{{constant('POCHE_VERSION')}}. {% trans "storage:" %} {{constant('STORAGE')}}
{% endif %}
+
\ No newline at end of file
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
new file mode 100644
index 00000000..2b9e4582
--- /dev/null
+++ b/themes/default/_head.twig
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig
new file mode 100644
index 00000000..699d6a0c
--- /dev/null
+++ b/themes/default/_menu.twig
@@ -0,0 +1,7 @@
+
\ No newline at end of file
diff --git a/themes/default/_messages.twig b/themes/default/_messages.twig
new file mode 100644
index 00000000..679aa098
--- /dev/null
+++ b/themes/default/_messages.twig
@@ -0,0 +1 @@
+ {{ messages | raw }}
\ No newline at end of file
diff --git a/themes/default/_top.twig b/themes/default/_top.twig
new file mode 100644
index 00000000..4100f7c4
--- /dev/null
+++ b/themes/default/_top.twig
@@ -0,0 +1,7 @@
+
+
+ {% if view == 'home' %}{% block logo %} {% endblock %}
+ {% else %}{{ block('logo') }}
+ {% endif %}
+
+
\ No newline at end of file
diff --git a/themes/default/config.twig b/themes/default/config.twig
new file mode 100644
index 00000000..e849d03b
--- /dev/null
+++ b/themes/default/config.twig
@@ -0,0 +1,80 @@
+{% extends "layout.twig" %}
+
+{% block title %}{% trans "config" %}{% endblock %}
+{% block menu %}
+{% include '_menu.twig' %}
+{% endblock %}
+{% block content %}
+ {% trans "Poching a link" %}
+ {% trans "You can poche a link by several methods:" %} (? )
+
+
+ {% trans "Updating poche" %}
+
+
+ {% trans "Change your theme" %}
+
+
+ {% trans "Change your password" %}
+
+
+ {% trans "Import" %}
+ {% trans "Please execute the import script locally, it can take a very long time." %}
+ {% trans "More infos in the official doc:" %} inthepoche.com
+
+
+ {% trans "Export your poche datas" %}
+ {% trans "Click here" %} {% trans "to export your poche datas." %}
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/css/knacss.css b/themes/default/css/knacss.css
new file mode 100644
index 00000000..ca0696b7
--- /dev/null
+++ b/themes/default/css/knacss.css
@@ -0,0 +1 @@
+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/themes/default/css/messages.css b/themes/default/css/messages.css
new file mode 100644
index 00000000..daed6d72
--- /dev/null
+++ b/themes/default/css/messages.css
@@ -0,0 +1,75 @@
+.messages {
+ display: block;
+ clear: both;
+ width: 400px auto;
+ 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/themes/default/css/print.css b/themes/default/css/print.css
new file mode 100644
index 00000000..9aefa779
--- /dev/null
+++ b/themes/default/css/print.css
@@ -0,0 +1,48 @@
+/* ### 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 {
+ 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;
+}
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
new file mode 100644
index 00000000..3377a75b
--- /dev/null
+++ b/themes/default/css/style-default.css
@@ -0,0 +1,59 @@
+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.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.reading-time span {
+ background-image: url('../img/default/clock.png');
+}
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
new file mode 100644
index 00000000..eb04f0c4
--- /dev/null
+++ b/themes/default/css/style.css
@@ -0,0 +1,321 @@
+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;
+}
+
+.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%;
+ 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 {
+ background-repeat: no-repeat;
+}
\ No newline at end of file
diff --git a/themes/default/error.twig b/themes/default/error.twig
new file mode 100644
index 00000000..c829d12b
--- /dev/null
+++ b/themes/default/error.twig
@@ -0,0 +1,6 @@
+{% extends "layout.twig" %}
+{% block title %}{% trans "plop" %}{% endblock %}
+{% block content %}
+ {{ msg|raw }}
+ Don't forget the documentation .
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/export.twig b/themes/default/export.twig
new file mode 100644
index 00000000..4adb9540
--- /dev/null
+++ b/themes/default/export.twig
@@ -0,0 +1 @@
+{{ export }}
\ No newline at end of file
diff --git a/themes/default/home.twig b/themes/default/home.twig
new file mode 100644
index 00000000..1367ebe8
--- /dev/null
+++ b/themes/default/home.twig
@@ -0,0 +1,49 @@
+{% 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 %}
+ {% if entries|length > 1 %}
+
+ {% trans "by date" %}
+ {% trans "by title" %}
+
+ {% endif %}
+{% endblock %}
+{% block content %}
+ {% if entries is empty %}
+ {% trans "No link available here!" %}
+ {% else %}
+ {% block pager %}
+ {% if nb_results > 1 %}
+
+
{{ nb_results }} {% trans "results" %}
+ {{ page_links | raw }}
+
+ {% endif %}
+ {% endblock %}
+ {% for entry in entries %}
+
+
+
+
{{ entry.content|striptags|slice(0, 300) }}...
+
+ {% endfor %}
+ {% endif %}
+ {{ block('pager') }}
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/img/apple-touch-icon-144x144-precomposed.png b/themes/default/img/apple-touch-icon-144x144-precomposed.png
new file mode 100644
index 00000000..557b479c
Binary files /dev/null and b/themes/default/img/apple-touch-icon-144x144-precomposed.png differ
diff --git a/themes/default/img/apple-touch-icon-72x72-precomposed.png b/themes/default/img/apple-touch-icon-72x72-precomposed.png
new file mode 100644
index 00000000..e167d3a4
Binary files /dev/null and b/themes/default/img/apple-touch-icon-72x72-precomposed.png differ
diff --git a/themes/default/img/apple-touch-icon.png b/themes/default/img/apple-touch-icon.png
new file mode 100644
index 00000000..4d222fba
Binary files /dev/null and b/themes/default/img/apple-touch-icon.png differ
diff --git a/themes/default/img/default/backtotop.png b/themes/default/img/default/backtotop.png
new file mode 100644
index 00000000..051238ef
Binary files /dev/null and b/themes/default/img/default/backtotop.png differ
diff --git a/themes/default/img/default/bad-display.png b/themes/default/img/default/bad-display.png
new file mode 100755
index 00000000..6866799f
Binary files /dev/null and b/themes/default/img/default/bad-display.png differ
diff --git a/themes/default/img/default/checkmark-off.png b/themes/default/img/default/checkmark-off.png
new file mode 100644
index 00000000..3db5a06d
Binary files /dev/null and b/themes/default/img/default/checkmark-off.png differ
diff --git a/themes/default/img/default/checkmark-on.png b/themes/default/img/default/checkmark-on.png
new file mode 100644
index 00000000..cd3abb2c
Binary files /dev/null and b/themes/default/img/default/checkmark-on.png differ
diff --git a/themes/default/img/default/clock.png b/themes/default/img/default/clock.png
new file mode 100755
index 00000000..6164e92b
Binary files /dev/null and b/themes/default/img/default/clock.png differ
diff --git a/themes/default/img/default/down.png b/themes/default/img/default/down.png
new file mode 100644
index 00000000..b9d536a7
Binary files /dev/null and b/themes/default/img/default/down.png differ
diff --git a/themes/default/img/default/envelop.png b/themes/default/img/default/envelop.png
new file mode 100644
index 00000000..6be1c886
Binary files /dev/null and b/themes/default/img/default/envelop.png differ
diff --git a/themes/default/img/default/flattr.png b/themes/default/img/default/flattr.png
new file mode 100755
index 00000000..0404aaea
Binary files /dev/null and b/themes/default/img/default/flattr.png differ
diff --git a/themes/default/img/default/left.png b/themes/default/img/default/left.png
new file mode 100644
index 00000000..a0a53631
Binary files /dev/null and b/themes/default/img/default/left.png differ
diff --git a/themes/default/img/default/link.png b/themes/default/img/default/link.png
new file mode 100755
index 00000000..db62819d
Binary files /dev/null and b/themes/default/img/default/link.png differ
diff --git a/themes/default/img/default/remove.png b/themes/default/img/default/remove.png
new file mode 100644
index 00000000..f8ad56a3
Binary files /dev/null and b/themes/default/img/default/remove.png differ
diff --git a/themes/default/img/default/shaarli.png b/themes/default/img/default/shaarli.png
new file mode 100644
index 00000000..1eb30f60
Binary files /dev/null and b/themes/default/img/default/shaarli.png differ
diff --git a/themes/default/img/default/star-off.png b/themes/default/img/default/star-off.png
new file mode 100644
index 00000000..6a0133a7
Binary files /dev/null and b/themes/default/img/default/star-off.png differ
diff --git a/themes/default/img/default/star-on.png b/themes/default/img/default/star-on.png
new file mode 100644
index 00000000..a9f96eaa
Binary files /dev/null and b/themes/default/img/default/star-on.png differ
diff --git a/themes/default/img/default/top.png b/themes/default/img/default/top.png
new file mode 100644
index 00000000..954a8c0a
Binary files /dev/null and b/themes/default/img/default/top.png differ
diff --git a/themes/default/img/default/twitter.png b/themes/default/img/default/twitter.png
new file mode 100644
index 00000000..cfcfe419
Binary files /dev/null and b/themes/default/img/default/twitter.png differ
diff --git a/themes/default/img/favicon.ico b/themes/default/img/favicon.ico
new file mode 100644
index 00000000..0e9ff779
Binary files /dev/null and b/themes/default/img/favicon.ico differ
diff --git a/themes/default/img/logo.png b/themes/default/img/logo.png
new file mode 100644
index 00000000..5305c77d
Binary files /dev/null and b/themes/default/img/logo.png differ
diff --git a/themes/default/img/messages/close.png b/themes/default/img/messages/close.png
new file mode 100644
index 00000000..731aa018
Binary files /dev/null and b/themes/default/img/messages/close.png differ
diff --git a/themes/default/img/messages/cross.png b/themes/default/img/messages/cross.png
new file mode 100644
index 00000000..1514d51a
Binary files /dev/null and b/themes/default/img/messages/cross.png differ
diff --git a/themes/default/img/messages/help.png b/themes/default/img/messages/help.png
new file mode 100644
index 00000000..5c870176
Binary files /dev/null and b/themes/default/img/messages/help.png differ
diff --git a/themes/default/img/messages/tick.png b/themes/default/img/messages/tick.png
new file mode 100644
index 00000000..a9925a06
Binary files /dev/null and b/themes/default/img/messages/tick.png differ
diff --git a/themes/default/img/messages/warning.png b/themes/default/img/messages/warning.png
new file mode 100644
index 00000000..628cf2da
Binary files /dev/null and b/themes/default/img/messages/warning.png differ
diff --git a/themes/default/install.twig b/themes/default/install.twig
new file mode 100644
index 00000000..6e85e5cb
--- /dev/null
+++ b/themes/default/install.twig
@@ -0,0 +1,28 @@
+{% extends "layout.twig" %}
+{% block title %}{% trans "installation" %}{% endblock %}
+{% block content %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/js/restoreScroll.js b/themes/default/js/restoreScroll.js
new file mode 100644
index 00000000..331c9e19
--- /dev/null
+++ b/themes/default/js/restoreScroll.js
@@ -0,0 +1,25 @@
+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/themes/default/layout.twig b/themes/default/layout.twig
new file mode 100644
index 00000000..fec7054a
--- /dev/null
+++ b/themes/default/layout.twig
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+ {% block title %}{% endblock %} - poche
+{% 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/themes/default/login.twig b/themes/default/login.twig
new file mode 100644
index 00000000..0ae130bc
--- /dev/null
+++ b/themes/default/login.twig
@@ -0,0 +1,32 @@
+{% extends "layout.twig" %}
+
+{% block title %}{% trans "login to your poche" %}{% endblock %}
+{% block content %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
new file mode 100644
index 00000000..1e54ae38
--- /dev/null
+++ b/themes/default/view.twig
@@ -0,0 +1,51 @@
+{% extends "layout.twig" %}
+{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
+{% block content %}
+
+
+
+ {{ entry.title|raw }}
+
+
+ {{ content | raw }}
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/themes/dmagenta/README.md b/themes/dmagenta/README.md
new file mode 100644
index 00000000..6abc37e3
--- /dev/null
+++ b/themes/dmagenta/README.md
@@ -0,0 +1,3 @@
+# dmagenta (dark magenta) theme
+
+theme created by Nicolas Lœuillet aka nico_somb
\ No newline at end of file
diff --git a/themes/dmagenta/css/style-dmagenta.css b/themes/dmagenta/css/style-dmagenta.css
new file mode 100644
index 00000000..486add18
--- /dev/null
+++ b/themes/dmagenta/css/style-dmagenta.css
@@ -0,0 +1,82 @@
+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');
+}
+
+a.reading-time span {
+ background-image: url('../img/dmagenta/clock.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/themes/dmagenta/img/dmagenta/backtotop.png b/themes/dmagenta/img/dmagenta/backtotop.png
new file mode 100755
index 00000000..051238ef
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/backtotop.png differ
diff --git a/themes/dmagenta/img/dmagenta/bad-display.png b/themes/dmagenta/img/dmagenta/bad-display.png
new file mode 100755
index 00000000..6866799f
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/bad-display.png differ
diff --git a/themes/dmagenta/img/dmagenta/checkmark-off.png b/themes/dmagenta/img/dmagenta/checkmark-off.png
new file mode 100644
index 00000000..3db5a06d
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/checkmark-off.png differ
diff --git a/themes/dmagenta/img/dmagenta/checkmark-on.png b/themes/dmagenta/img/dmagenta/checkmark-on.png
new file mode 100644
index 00000000..cd3abb2c
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/checkmark-on.png differ
diff --git a/themes/dmagenta/img/dmagenta/clock.png b/themes/dmagenta/img/dmagenta/clock.png
new file mode 100755
index 00000000..6164e92b
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/clock.png differ
diff --git a/themes/dmagenta/img/dmagenta/down.png b/themes/dmagenta/img/dmagenta/down.png
new file mode 100644
index 00000000..b9d536a7
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/down.png differ
diff --git a/themes/dmagenta/img/dmagenta/envelop.png b/themes/dmagenta/img/dmagenta/envelop.png
new file mode 100644
index 00000000..6be1c886
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/envelop.png differ
diff --git a/themes/dmagenta/img/dmagenta/flattr.png b/themes/dmagenta/img/dmagenta/flattr.png
new file mode 100755
index 00000000..0404aaea
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/flattr.png differ
diff --git a/themes/dmagenta/img/dmagenta/left.png b/themes/dmagenta/img/dmagenta/left.png
new file mode 100644
index 00000000..a0a53631
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/left.png differ
diff --git a/themes/dmagenta/img/dmagenta/link.png b/themes/dmagenta/img/dmagenta/link.png
new file mode 100755
index 00000000..db62819d
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/link.png differ
diff --git a/themes/dmagenta/img/dmagenta/remove.png b/themes/dmagenta/img/dmagenta/remove.png
new file mode 100644
index 00000000..f8ad56a3
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/remove.png differ
diff --git a/themes/dmagenta/img/dmagenta/shaarli.png b/themes/dmagenta/img/dmagenta/shaarli.png
new file mode 100644
index 00000000..1eb30f60
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/shaarli.png differ
diff --git a/themes/dmagenta/img/dmagenta/star-off.png b/themes/dmagenta/img/dmagenta/star-off.png
new file mode 100644
index 00000000..6a0133a7
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/star-off.png differ
diff --git a/themes/dmagenta/img/dmagenta/star-on.png b/themes/dmagenta/img/dmagenta/star-on.png
new file mode 100644
index 00000000..a9f96eaa
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/star-on.png differ
diff --git a/themes/dmagenta/img/dmagenta/top.png b/themes/dmagenta/img/dmagenta/top.png
new file mode 100644
index 00000000..954a8c0a
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/top.png differ
diff --git a/themes/dmagenta/img/dmagenta/twitter.png b/themes/dmagenta/img/dmagenta/twitter.png
new file mode 100644
index 00000000..cfcfe419
Binary files /dev/null and b/themes/dmagenta/img/dmagenta/twitter.png differ
diff --git a/themes/dmagenta/screenshot.jpg b/themes/dmagenta/screenshot.jpg
new file mode 100644
index 00000000..ab8f1ec2
Binary files /dev/null and b/themes/dmagenta/screenshot.jpg differ
diff --git a/themes/solarized-dark/README.md b/themes/solarized-dark/README.md
new file mode 100644
index 00000000..81be1f8c
--- /dev/null
+++ b/themes/solarized-dark/README.md
@@ -0,0 +1,6 @@
+# solarized-dark (Solarized Dark) theme
+
+
+Theme created by NumEricR
+
+http://github.com/NumEricR/poche-themes
diff --git a/themes/solarized-dark/Solarized-LICENSE.txt b/themes/solarized-dark/Solarized-LICENSE.txt
new file mode 100644
index 00000000..a842f663
--- /dev/null
+++ b/themes/solarized-dark/Solarized-LICENSE.txt
@@ -0,0 +1,19 @@
+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/themes/solarized-dark/css/style-solarized-dark.css b/themes/solarized-dark/css/style-solarized-dark.css
new file mode 100644
index 00000000..5c8daa7a
--- /dev/null
+++ b/themes/solarized-dark/css/style-solarized-dark.css
@@ -0,0 +1,223 @@
+/*
+ * 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 {
+ 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');
+}
+
+a.reading-time span {
+ background-image: url('../img/solarized-dark/clock.png');
+}
diff --git a/themes/solarized-dark/img/solarized-dark/backtotop.png b/themes/solarized-dark/img/solarized-dark/backtotop.png
new file mode 100644
index 00000000..1501c2a5
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/backtotop.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/bad-display.png b/themes/solarized-dark/img/solarized-dark/bad-display.png
new file mode 100644
index 00000000..b2c3ca17
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/bad-display.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/checkmark-off.png b/themes/solarized-dark/img/solarized-dark/checkmark-off.png
new file mode 100644
index 00000000..fd7d92fa
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/checkmark-off.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/checkmark-on.png b/themes/solarized-dark/img/solarized-dark/checkmark-on.png
new file mode 100644
index 00000000..592965dd
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/checkmark-on.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/clock.png b/themes/solarized-dark/img/solarized-dark/clock.png
new file mode 100644
index 00000000..e6abbbb3
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/clock.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/down.png b/themes/solarized-dark/img/solarized-dark/down.png
new file mode 100644
index 00000000..5de30315
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/down.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/envelop.png b/themes/solarized-dark/img/solarized-dark/envelop.png
new file mode 100644
index 00000000..d3468885
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/envelop.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/flattr.png b/themes/solarized-dark/img/solarized-dark/flattr.png
new file mode 100644
index 00000000..73e3f421
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/flattr.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/left.png b/themes/solarized-dark/img/solarized-dark/left.png
new file mode 100644
index 00000000..a953d831
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/left.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/link.png b/themes/solarized-dark/img/solarized-dark/link.png
new file mode 100644
index 00000000..5e859a0e
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/link.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/remove.png b/themes/solarized-dark/img/solarized-dark/remove.png
new file mode 100644
index 00000000..66a5c1ab
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/remove.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/shaarli.png b/themes/solarized-dark/img/solarized-dark/shaarli.png
new file mode 100644
index 00000000..1eb30f60
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/shaarli.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/star-off.png b/themes/solarized-dark/img/solarized-dark/star-off.png
new file mode 100644
index 00000000..1c603ecc
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/star-off.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/star-on.png b/themes/solarized-dark/img/solarized-dark/star-on.png
new file mode 100644
index 00000000..bc37772a
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/star-on.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/top.png b/themes/solarized-dark/img/solarized-dark/top.png
new file mode 100644
index 00000000..b3f44f31
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/top.png differ
diff --git a/themes/solarized-dark/img/solarized-dark/twitter.png b/themes/solarized-dark/img/solarized-dark/twitter.png
new file mode 100644
index 00000000..c4a25334
Binary files /dev/null and b/themes/solarized-dark/img/solarized-dark/twitter.png differ
diff --git a/themes/solarized-dark/screenshot.jpg b/themes/solarized-dark/screenshot.jpg
new file mode 100644
index 00000000..2ad87943
Binary files /dev/null and b/themes/solarized-dark/screenshot.jpg differ
diff --git a/themes/solarized/README.md b/themes/solarized/README.md
new file mode 100644
index 00000000..255e3cdd
--- /dev/null
+++ b/themes/solarized/README.md
@@ -0,0 +1,6 @@
+# solarized (Solarized) theme
+
+
+Theme created by NumEricR
+
+http://github.com/NumEricR/poche-themes
diff --git a/themes/solarized/Solarized-LICENSE.txt b/themes/solarized/Solarized-LICENSE.txt
new file mode 100644
index 00000000..a842f663
--- /dev/null
+++ b/themes/solarized/Solarized-LICENSE.txt
@@ -0,0 +1,19 @@
+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/themes/solarized/css/style-solarized.css b/themes/solarized/css/style-solarized.css
new file mode 100644
index 00000000..6e736630
--- /dev/null
+++ b/themes/solarized/css/style-solarized.css
@@ -0,0 +1,223 @@
+/*
+ * 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 {
+ 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');
+}
+
+a.reading-time span {
+ background-image: url('../img/solarized/clock.png');
+}
diff --git a/themes/solarized/img/solarized/backtotop.png b/themes/solarized/img/solarized/backtotop.png
new file mode 100644
index 00000000..a3e52318
Binary files /dev/null and b/themes/solarized/img/solarized/backtotop.png differ
diff --git a/themes/solarized/img/solarized/bad-display.png b/themes/solarized/img/solarized/bad-display.png
new file mode 100644
index 00000000..ae99ab37
Binary files /dev/null and b/themes/solarized/img/solarized/bad-display.png differ
diff --git a/themes/solarized/img/solarized/checkmark-off.png b/themes/solarized/img/solarized/checkmark-off.png
new file mode 100644
index 00000000..20cd26b3
Binary files /dev/null and b/themes/solarized/img/solarized/checkmark-off.png differ
diff --git a/themes/solarized/img/solarized/checkmark-on.png b/themes/solarized/img/solarized/checkmark-on.png
new file mode 100644
index 00000000..87a2b799
Binary files /dev/null and b/themes/solarized/img/solarized/checkmark-on.png differ
diff --git a/themes/solarized/img/solarized/clock.png b/themes/solarized/img/solarized/clock.png
new file mode 100644
index 00000000..f7dabfcf
Binary files /dev/null and b/themes/solarized/img/solarized/clock.png differ
diff --git a/themes/solarized/img/solarized/down.png b/themes/solarized/img/solarized/down.png
new file mode 100644
index 00000000..622ff87b
Binary files /dev/null and b/themes/solarized/img/solarized/down.png differ
diff --git a/themes/solarized/img/solarized/envelop.png b/themes/solarized/img/solarized/envelop.png
new file mode 100644
index 00000000..1caf7d43
Binary files /dev/null and b/themes/solarized/img/solarized/envelop.png differ
diff --git a/themes/solarized/img/solarized/flattr.png b/themes/solarized/img/solarized/flattr.png
new file mode 100644
index 00000000..18e00f86
Binary files /dev/null and b/themes/solarized/img/solarized/flattr.png differ
diff --git a/themes/solarized/img/solarized/left.png b/themes/solarized/img/solarized/left.png
new file mode 100644
index 00000000..9780faee
Binary files /dev/null and b/themes/solarized/img/solarized/left.png differ
diff --git a/themes/solarized/img/solarized/link.png b/themes/solarized/img/solarized/link.png
new file mode 100644
index 00000000..d0e12862
Binary files /dev/null and b/themes/solarized/img/solarized/link.png differ
diff --git a/themes/solarized/img/solarized/remove.png b/themes/solarized/img/solarized/remove.png
new file mode 100644
index 00000000..d5113d17
Binary files /dev/null and b/themes/solarized/img/solarized/remove.png differ
diff --git a/themes/solarized/img/solarized/shaarli.png b/themes/solarized/img/solarized/shaarli.png
new file mode 100644
index 00000000..1eb30f60
Binary files /dev/null and b/themes/solarized/img/solarized/shaarli.png differ
diff --git a/themes/solarized/img/solarized/star-off.png b/themes/solarized/img/solarized/star-off.png
new file mode 100644
index 00000000..afd7d80c
Binary files /dev/null and b/themes/solarized/img/solarized/star-off.png differ
diff --git a/themes/solarized/img/solarized/star-on.png b/themes/solarized/img/solarized/star-on.png
new file mode 100644
index 00000000..3a772512
Binary files /dev/null and b/themes/solarized/img/solarized/star-on.png differ
diff --git a/themes/solarized/img/solarized/top.png b/themes/solarized/img/solarized/top.png
new file mode 100644
index 00000000..d20001a4
Binary files /dev/null and b/themes/solarized/img/solarized/top.png differ
diff --git a/themes/solarized/img/solarized/twitter.png b/themes/solarized/img/solarized/twitter.png
new file mode 100644
index 00000000..109d7151
Binary files /dev/null and b/themes/solarized/img/solarized/twitter.png differ
diff --git a/themes/solarized/screenshot.jpg b/themes/solarized/screenshot.jpg
new file mode 100644
index 00000000..07d402e3
Binary files /dev/null and b/themes/solarized/screenshot.jpg differ
--
cgit v1.2.3
From 07ae20eeedc75b5b121647cc4833a36956fc6356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:17:45 +0200
Subject: change reading time displaying
---
themes/dark/css/style-dark.css | 4 ----
themes/dark/img/dark/clock.png | Bin 332 -> 0 bytes
themes/default/css/messages.css | 2 +-
themes/default/css/style-default.css | 6 +-----
themes/default/home.twig | 2 +-
themes/default/img/default/clock.png | Bin 332 -> 0 bytes
themes/dmagenta/css/style-dmagenta.css | 4 ----
themes/dmagenta/img/dmagenta/clock.png | Bin 332 -> 0 bytes
themes/solarized-dark/css/style-solarized-dark.css | 6 +-----
themes/solarized-dark/img/solarized-dark/clock.png | Bin 338 -> 0 bytes
themes/solarized/css/style-solarized.css | 6 +-----
themes/solarized/img/solarized/clock.png | Bin 346 -> 0 bytes
12 files changed, 5 insertions(+), 25 deletions(-)
delete mode 100755 themes/dark/img/dark/clock.png
delete mode 100755 themes/default/img/default/clock.png
delete mode 100755 themes/dmagenta/img/dmagenta/clock.png
delete mode 100644 themes/solarized-dark/img/solarized-dark/clock.png
delete mode 100644 themes/solarized/img/solarized/clock.png
diff --git a/themes/dark/css/style-dark.css b/themes/dark/css/style-dark.css
index 6d507516..41782c48 100644
--- a/themes/dark/css/style-dark.css
+++ b/themes/dark/css/style-dark.css
@@ -65,10 +65,6 @@ a.bad-display span {
background-image: url('../img/dark/bad-display.png');
}
-a.reading-time span {
- background-image: url('../img/dark/clock.png');
-}
-
.pagination a {
color: #aaa;
}
diff --git a/themes/dark/img/dark/clock.png b/themes/dark/img/dark/clock.png
deleted file mode 100755
index 6164e92b..00000000
Binary files a/themes/dark/img/dark/clock.png and /dev/null differ
diff --git a/themes/default/css/messages.css b/themes/default/css/messages.css
index daed6d72..46b54795 100644
--- a/themes/default/css/messages.css
+++ b/themes/default/css/messages.css
@@ -1,7 +1,7 @@
.messages {
display: block;
clear: both;
- width: 400px auto;
+ width: 400px;
margin: 10px auto 10px;
padding: 10px 0;
-moz-border-radius: 4px;
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 3377a75b..9dc7c0b0 100644
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -52,8 +52,4 @@ a.link span {
a.bad-display span {
background-image: url('../img/default/bad-display.png');
-}
-
-a.reading-time span {
- background-image: url('../img/default/clock.png');
-}
+}
\ No newline at end of file
diff --git a/themes/default/home.twig b/themes/default/home.twig
index 1367ebe8..c1b29ec3 100644
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -39,7 +39,7 @@
{% trans "toggle favorite" %}
{% trans "delete" %}
{{ entry.url | e | getDomain }}
- {{ entry.content| getReadingTime }} min
+ {{ entry.content| getReadingTime }} min
{{ entry.content|striptags|slice(0, 300) }}...
diff --git a/themes/default/img/default/clock.png b/themes/default/img/default/clock.png
deleted file mode 100755
index 6164e92b..00000000
Binary files a/themes/default/img/default/clock.png and /dev/null differ
diff --git a/themes/dmagenta/css/style-dmagenta.css b/themes/dmagenta/css/style-dmagenta.css
index 486add18..4dc592d2 100644
--- a/themes/dmagenta/css/style-dmagenta.css
+++ b/themes/dmagenta/css/style-dmagenta.css
@@ -65,10 +65,6 @@ a.bad-display span {
background-image: url('../img/dmagenta/bad-display.png');
}
-a.reading-time span {
- background-image: url('../img/dmagenta/clock.png');
-}
-
.pagination a {
color: #aaa;
}
diff --git a/themes/dmagenta/img/dmagenta/clock.png b/themes/dmagenta/img/dmagenta/clock.png
deleted file mode 100755
index 6164e92b..00000000
Binary files a/themes/dmagenta/img/dmagenta/clock.png and /dev/null differ
diff --git a/themes/solarized-dark/css/style-solarized-dark.css b/themes/solarized-dark/css/style-solarized-dark.css
index 5c8daa7a..7ce8a563 100644
--- a/themes/solarized-dark/css/style-solarized-dark.css
+++ b/themes/solarized-dark/css/style-solarized-dark.css
@@ -216,8 +216,4 @@ a.link span {
a.bad-display span {
background-image: url('../img/solarized-dark/bad-display.png');
-}
-
-a.reading-time span {
- background-image: url('../img/solarized-dark/clock.png');
-}
+}
\ No newline at end of file
diff --git a/themes/solarized-dark/img/solarized-dark/clock.png b/themes/solarized-dark/img/solarized-dark/clock.png
deleted file mode 100644
index e6abbbb3..00000000
Binary files a/themes/solarized-dark/img/solarized-dark/clock.png and /dev/null differ
diff --git a/themes/solarized/css/style-solarized.css b/themes/solarized/css/style-solarized.css
index 6e736630..9286c750 100644
--- a/themes/solarized/css/style-solarized.css
+++ b/themes/solarized/css/style-solarized.css
@@ -216,8 +216,4 @@ a.link span {
a.bad-display span {
background-image: url('../img/solarized/bad-display.png');
-}
-
-a.reading-time span {
- background-image: url('../img/solarized/clock.png');
-}
+}
\ No newline at end of file
diff --git a/themes/solarized/img/solarized/clock.png b/themes/solarized/img/solarized/clock.png
deleted file mode 100644
index f7dabfcf..00000000
Binary files a/themes/solarized/img/solarized/clock.png and /dev/null differ
--
cgit v1.2.3
From 7f17a38d358bdec609a98827991108032e9257ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:23:03 +0200
Subject: change instructions messages
---
inc/poche/Poche.class.php | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 1bae2751..d6dbd19a 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -109,6 +109,14 @@ class Poche
return false;
}
+
+ if (! is_writable(CACHE)) {
+ $this->notInstalledMessage = 'error You don\'t have write access on cache directory.
';
+
+ self::$canRenderTemplates = false;
+
+ return false;
+ }
# Check if the selected theme and its requirements are present
if (! is_dir(THEME . '/' . $this->getTheme())) {
@@ -145,16 +153,11 @@ class Poche
if (empty($configSalt)) {
$msg = 'error You have not yet filled in the SALT value in the config.inc.php file.
';
- } else if (! is_writable(CACHE)) {
- Tools::logm('you don\'t have write access on cache directory');
- $msg = 'error You don\'t have write access on cache directory.
';
} else if (STORAGE == 'sqlite' && ! file_exists(STORAGE_SQLITE)) {
Tools::logm('sqlite file doesn\'t exist');
$msg = 'error sqlite file doesn\'t exist, you can find it in install folder. Copy it in /db folder.
';
- } else if (file_exists(ROOT . '/install/update.php') && ! DEBUG_POCHE) {
- $msg = 'setup It\'s your first time here? Please copy /install/poche.sqlite in db folder. Then, delete install folder.If you have already installed poche , an update is needed by clicking here .
';
} else if (is_dir(ROOT . '/install') && ! DEBUG_POCHE) {
- $msg = 'setup If you want to update your poche , you just have to delete /install folder. To install your poche with sqlite , copy /install/poche.sqlite in /db and delete the folder /install. you have to delete the /install folder before using poche.
';
+ $msg = 'install folder you have to delete the /install folder before using poche.
';
} else if (STORAGE == 'sqlite' && ! is_writable(STORAGE_SQLITE)) {
Tools::logm('you don\'t have write access on sqlite file');
$msg = 'error You don\'t have write access on sqlite file.
';
--
cgit v1.2.3
From 34d67c835e250c853fc8ff4230abd24ba521b878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:46:46 +0200
Subject: bug fix #219: when archive last poched links from a page, redirect to
an other page
---
inc/poche/Poche.class.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index d6dbd19a..ffef1c3e 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -407,6 +407,12 @@ class Poche
'page_links' => '',
'nb_results' => '',
);
+
+ # want to display a page too far?
+ if ((count($entries) % PAGINATION) + 1 < $_GET['p']) {
+ Tools::redirect('');
+ }
+
if (count($entries) > 0) {
$this->pagination->set_total(count($entries));
$page_links = $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . '&');
--
cgit v1.2.3
From 6cd8af85dac4a30784ff3cbeaaca91b8af8a44af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:48:53 +0200
Subject: bug fix #227: Deleting element in archive redirect to home
---
inc/poche/Poche.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index ffef1c3e..8567cd8f 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -333,7 +333,7 @@ class Poche
$msg = 'error : can\'t delete link #' . $id;
}
Tools::logm($msg);
- Tools::redirect('?');
+ Tools::redirect();
break;
case 'toggle_fav' :
$this->store->favoriteById($id, $this->user->getId());
--
cgit v1.2.3
From 8f91e10faa97df1a50cbbd5fb64eab5190361727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:51:04 +0200
Subject: preparing to 1.0.0
---
inc/poche/config.inc.php.new | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 38d61e02..255b97e6 100755
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -49,7 +49,7 @@ define ('CACHE', ROOT . '/cache');
define ('PAGINATION', '10');
-define ('POCHE_VERSION', '1.0-beta5');
+define ('POCHE_VERSION', '1.0.0');
define ('POCKET_FILE', '/ril_export.html');
define ('READABILITY_FILE', '/readability');
--
cgit v1.2.3
From f0f7b943622a18ac7c883b077e59d1d84ef90327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 14:53:08 +0200
Subject: remove print_r
---
inc/3rdparty/FlattrItem.class.php | 1 -
1 file changed, 1 deletion(-)
diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php
index 2b7ea3fa..0d3e69d0 100644
--- a/inc/3rdparty/FlattrItem.class.php
+++ b/inc/3rdparty/FlattrItem.class.php
@@ -12,7 +12,6 @@ class FlattrItem {
public function checkItem($urltoflattr,$id) {
$this->cacheflattrfile($urltoflattr, $id);
$flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache");
- print_r($flattrResponse);
if($flattrResponse != FALSE) {
$result = json_decode($flattrResponse);
if (isset($result->message)){
--
cgit v1.2.3
From 47baa1077e2923b8a87e458a6e826c2823ed3614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 15:43:24 +0200
Subject: reopen #219 when archive last poched links from a page, redirect to
an other page
---
inc/poche/Poche.class.php | 5 -----
1 file changed, 5 deletions(-)
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 8f54267d..8fe7a4f5 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -407,11 +407,6 @@ class Poche
'page_links' => '',
'nb_results' => '',
);
-
- # want to display a page too far?
- if ((count($entries) % PAGINATION) + 1 < $_GET['p']) {
- Tools::redirect('');
- }
if (count($entries) > 0) {
$this->pagination->set_total(count($entries));
--
cgit v1.2.3
From 27a74816daa944aefd6353b75b94dea7036145aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 18:33:20 +0200
Subject: change export link
---
.htaccess | 8 --------
themes/default/config.twig | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 100644 .htaccess
diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index 37b7701c..00000000
--- a/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-Options +FollowSymlinks
-RewriteEngine On
-RewriteRule ^dl/export_poche.json$ ?export [L]
-
-# Force download
-RewriteCond %{QUERY_STRING} =export
-RewriteRule ([^/]*)$ - [L,E=dl:$1]
-Header onsuccess set Content-disposition "attachment; filename=%{dl}e" env=dl
\ No newline at end of file
diff --git a/themes/default/config.twig b/themes/default/config.twig
index e849d03b..0f1aea80 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -76,5 +76,5 @@
{% trans "Export your poche datas" %}
- {% trans "Click here" %} {% trans "to export your poche datas." %}
+ {% trans "Click here" %} {% trans "to export your poche datas." %}
{% endblock %}
\ No newline at end of file
--
cgit v1.2.3
From d47d2533accb30a69fbbb964f63793b821300974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Thu, 3 Oct 2013 19:03:52 +0200
Subject: change doc link
---
inc/poche/Poche.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 8fe7a4f5..1ba8e7c1 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -105,7 +105,7 @@ class Poche
public function themeIsInstalled() {
# Twig is an absolute requirement for Poche to function. Abort immediately if the Composer installer hasn't been run yet
if (! self::$canRenderTemplates) {
- $this->notInstalledMessage = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. Have a look at the documentation. ';
+ $this->notInstalledMessage = 'Twig does not seem to be installed. Please initialize the Composer installation to automatically fetch dependencies. Have a look at the documentation. ';
return false;
}
--
cgit v1.2.3