From e8d1f1e5f08218819fd78b46895d63103fbbd1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 17 Aug 2013 21:25:53 +0200 Subject: [PATCH 1/4] gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 17af57c..0bd838d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ composer.phar db/poche.sqlite output phpdoc* -inc/config/myconfig.inc.php \ No newline at end of file +inc/config/myconfig.inc.php From 2fdcbd1ac3667199bf91c81b3d11c2161de49c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 17 Aug 2013 21:27:14 +0200 Subject: [PATCH 2/4] typo in gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0bd838d..d190a8b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ composer.phar db/poche.sqlite output phpdoc* -inc/config/myconfig.inc.php +inc/poche/myconfig.inc.php \ No newline at end of file From 38330bfd65181d63609b9350324aa13f1e967bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 20 Aug 2013 11:23:00 +0200 Subject: [PATCH 3/4] fix bug #112 link to shaarli --- tpl/css/style-light.css | 4 ++++ tpl/img/light/shaarli.png | Bin 0 -> 729 bytes tpl/view.twig | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 tpl/img/light/shaarli.png diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css index 9ea7955..e2788a1 100644 --- a/tpl/css/style-light.css +++ b/tpl/css/style-light.css @@ -44,6 +44,10 @@ a.twitter span { background: url('../img/light/twitter.png') no-repeat; } +a.shaarli span { + background: url('../img/light/shaarli.png') no-repeat; +} + a.email span { background: url('../img/light/envelop.png') no-repeat; } diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png new file mode 100644 index 0000000000000000000000000000000000000000..1eb30f60b99a02ba18054447ff4bc969c0ee7455 GIT binary patch literal 729 zcmV;~0w(>5P)5r00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGt^#A}F^#Lb9$`k+q02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0006=Nkl^^$ z4%o_Tr_*`sc?U>(g2ob-d5zDd!C)X#AP@k(UQhQ@sl?j&f${+*BNmGdM8>i_D5qdB z2!%ocn$0H6W-}srz208|4u=CwCKJeJvtYN|0jV40U2z!gb1s)7r`>J`^Z6Xc<1zI6 zeJ~o0pj0ZMTrNYkT7`DI4a?<{e527QtLQx|;$}1&kyY4u?dJ z#bVHEwLm75!KKY!uScyRd5iK4tDr$XM8d~VC`3*UhXZgQV6)lKyI!vYZX#u6@cDc! zL7T`7__r90x9xN~uwJi0qtVa?GO(#LupsGln(ou-l=_#;<>$@B00KOYgTa6tPNx%{ z>|0R};c%E1>w?8%L3*iFs$qNrw(*LsYo$`5z9W$c8{iR3k7IS$7K;UHwHoaL+fHoZ z-EUi|R;$IROrrBAe9rOy1_N9%8-Ak<6TCp%H {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
    • {% endif %} @@ -32,6 +33,7 @@
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
    • {% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    From 746f93c290881d97997b8179395de2875eb57c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 20 Aug 2013 11:23:32 +0200 Subject: [PATCH 4/4] fix bug #148 Use of undefined constant POCHE_VERSION --- inc/poche/config.inc.php | 6 +++--- inc/poche/define.inc.php | 2 ++ index.php | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php index 4122ff1..cb882cd 100755 --- a/inc/poche/config.inc.php +++ b/inc/poche/config.inc.php @@ -15,9 +15,9 @@ if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) { die('Twig does not seem installed. Have a look at the documentation.'); } -if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) { - require_once __DIR__ . '/../../inc/poche/myconfig.inc.php'; -} +// if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) { + // require_once __DIR__ . '/../../inc/poche/myconfig.inc.php'; +// } require_once __DIR__ . '/../../inc/poche/User.class.php'; require_once __DIR__ . '/../../inc/poche/Url.class.php'; require_once __DIR__ . '/../../inc/3rdparty/class.messages.php'; diff --git a/inc/poche/define.inc.php b/inc/poche/define.inc.php index c32ca09..80d1f29 100644 --- a/inc/poche/define.inc.php +++ b/inc/poche/define.inc.php @@ -22,6 +22,8 @@ define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE); define ('DOWNLOAD_PICTURES', FALSE); define ('SHARE_TWITTER', TRUE); define ('SHARE_MAIL', TRUE); +define ('SHARE_SHAARLI', TRUE); +define ('SHAARLI_URL', 'http://myshaarliurl.com'); define ('ABS_PATH', 'assets/'); define ('TPL', __DIR__ . '/../../tpl'); define ('LOCALE', __DIR__ . '/../../locale'); diff --git a/index.php b/index.php index 51a33d7..5f43b74 100644 --- a/index.php +++ b/index.php @@ -8,6 +8,9 @@ * @license http://www.wtfpl.net/ see COPYING file */ +if (file_exists(__DIR__ . '/inc/poche/myconfig.inc.php')) { + require_once __DIR__ . '/inc/poche/myconfig.inc.php'; +} require_once './inc/poche/Tools.class.php'; Tools::createMyConfig();