diff --git a/.gitignore b/.gitignore index 17af57cf3..d190a8b93 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/poche/myconfig.inc.php \ No newline at end of file diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php index 4122ff102..cb882cd02 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 c32ca0981..80d1f29d3 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 51a33d713..5f43b7400 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(); diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css index 9ea7955a5..e2788a1ce 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 000000000..1eb30f60b Binary files /dev/null and b/tpl/img/light/shaarli.png differ diff --git a/tpl/view.twig b/tpl/view.twig index 2cbb9ca98..ba0aae303 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -11,6 +11,7 @@
  • {% 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" %}