Merge branch 'dev' of https://github.com/nicofrand/poche into dev

diff --git a/.gitignore b/.gitignore
index 17af57cf3b97eba95231af4bf070714b8b783611..d190a8b937086f1d9a8e199a6a23c98d32be498f 100644 (file)
--- 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 4122ff102d0d5ab6ee780468d642080fa55053fb..cb882cd0246ffe9e8273e8e519d74bbdeffcd7ba 100755 (executable)
--- 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 <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>');
 }
 
-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 c32ca0981b37b3f73f4d0a156fafb670a4d14560..80d1f29d386f66d9fd0397b567baa24438a2b228 100644 (file)
--- 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 51a33d71380b33c298e4e1f60c3d51905ecb7fed..5f43b7400c007887e94fe364bb66aabb78635499 100644 (file)
--- 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 9ea7955a545e272772d71bd25a5fbd9e71a2e42d..e2788a1ce05ebcac9c1570652548383d010d2891 100644 (file)
--- 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 (file)
index 0000000..1eb30f6
Binary files /dev/null and b/tpl/img/light/shaarli.png differ

diff --git a/tpl/view.twig b/tpl/view.twig
index 2cbb9ca9814ad334b5c928034a859dfbb3e95f26..ba0aae3031b593e197b2035a9942df5fa5b5d4cd 100644 (file)
--- a/tpl/view.twig
+++ b/tpl/view.twig
@@ -11,6 +11,7 @@
                         <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li>
                         {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title}}%20{{ entry.url|e }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span></span></a></li>{% endif %}
                         {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|e }}&body={{ entry.url|e }} via @getpoche" class="tool email" title="{% trans "email" %}"><span></span></a></li>{% endif %}
+                        {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|e }}&title={{ entry.title|e }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span></span></a></li>{% endif %}
                     </li>
                 </ul>
             </div>
@@ -32,6 +33,7 @@
                         <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li>
                         {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title}}%20{{ entry.url|e }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span></span></a></li>{% endif %}
                         {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|e }}&body={{ entry.url|e }} via @getpoche" class="tool email" title="{% trans "email" %}"><span></span></a></li>{% endif %}
+                        {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|e }}&title={{ entry.title|e }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span></span></a></li>{% endif %}
                     </li>
                 </ul>
                 <p>{% trans "this article appears wrong?" %} <a href="https://github.com/inthepoche/poche/issues/new">{% trans "create an issue" %}</a> {% trans "or" %} <a href="mailto:support@inthepoche.com?subject=Wrong display in poche&body={{ entry.url|e }}">{% trans "contact us by mail" %}</a></p>