aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rwxr-xr-xinc/poche/config.inc.php6
-rw-r--r--inc/poche/define.inc.php2
-rw-r--r--index.php3
-rw-r--r--tpl/css/style-light.css4
-rw-r--r--tpl/img/light/shaarli.pngbin0 -> 729 bytes
-rw-r--r--tpl/view.twig2
7 files changed, 15 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 17af57cf..d190a8b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ composer.phar
3db/poche.sqlite 3db/poche.sqlite
4output 4output
5phpdoc* 5phpdoc*
6inc/config/myconfig.inc.php \ No newline at end of file 6inc/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 4122ff10..cb882cd0 100755
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -15,9 +15,9 @@ if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) {
15 die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>'); 15 die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>');
16} 16}
17 17
18if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) { 18// if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) {
19 require_once __DIR__ . '/../../inc/poche/myconfig.inc.php'; 19 // require_once __DIR__ . '/../../inc/poche/myconfig.inc.php';
20} 20// }
21require_once __DIR__ . '/../../inc/poche/User.class.php'; 21require_once __DIR__ . '/../../inc/poche/User.class.php';
22require_once __DIR__ . '/../../inc/poche/Url.class.php'; 22require_once __DIR__ . '/../../inc/poche/Url.class.php';
23require_once __DIR__ . '/../../inc/3rdparty/class.messages.php'; 23require_once __DIR__ . '/../../inc/3rdparty/class.messages.php';
diff --git a/inc/poche/define.inc.php b/inc/poche/define.inc.php
index c32ca098..80d1f29d 100644
--- a/inc/poche/define.inc.php
+++ b/inc/poche/define.inc.php
@@ -22,6 +22,8 @@ define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
22define ('DOWNLOAD_PICTURES', FALSE); 22define ('DOWNLOAD_PICTURES', FALSE);
23define ('SHARE_TWITTER', TRUE); 23define ('SHARE_TWITTER', TRUE);
24define ('SHARE_MAIL', TRUE); 24define ('SHARE_MAIL', TRUE);
25define ('SHARE_SHAARLI', TRUE);
26define ('SHAARLI_URL', 'http://myshaarliurl.com');
25define ('ABS_PATH', 'assets/'); 27define ('ABS_PATH', 'assets/');
26define ('TPL', __DIR__ . '/../../tpl'); 28define ('TPL', __DIR__ . '/../../tpl');
27define ('LOCALE', __DIR__ . '/../../locale'); 29define ('LOCALE', __DIR__ . '/../../locale');
diff --git a/index.php b/index.php
index 51a33d71..5f43b740 100644
--- a/index.php
+++ b/index.php
@@ -8,6 +8,9 @@
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
10 10
11if (file_exists(__DIR__ . '/inc/poche/myconfig.inc.php')) {
12 require_once __DIR__ . '/inc/poche/myconfig.inc.php';
13}
11require_once './inc/poche/Tools.class.php'; 14require_once './inc/poche/Tools.class.php';
12Tools::createMyConfig(); 15Tools::createMyConfig();
13 16
diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css
index 9ea7955a..e2788a1c 100644
--- a/tpl/css/style-light.css
+++ b/tpl/css/style-light.css
@@ -44,6 +44,10 @@ a.twitter span {
44 background: url('../img/light/twitter.png') no-repeat; 44 background: url('../img/light/twitter.png') no-repeat;
45} 45}
46 46
47a.shaarli span {
48 background: url('../img/light/shaarli.png') no-repeat;
49}
50
47a.email span { 51a.email span {
48 background: url('../img/light/envelop.png') no-repeat; 52 background: url('../img/light/envelop.png') no-repeat;
49} 53}
diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png
new file mode 100644
index 00000000..1eb30f60
--- /dev/null
+++ b/tpl/img/light/shaarli.png
Binary files differ
diff --git a/tpl/view.twig b/tpl/view.twig
index 2cbb9ca9..ba0aae30 100644
--- a/tpl/view.twig
+++ b/tpl/view.twig
@@ -11,6 +11,7 @@
11 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li> 11 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li>
12 {% 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 %} 12 {% 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 %}
13 {% 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 %} 13 {% 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 %}
14 {% 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 %}
14 </li> 15 </li>
15 </ul> 16 </ul>
16 </div> 17 </div>
@@ -32,6 +33,7 @@
32 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li> 33 <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&id={{ entry.id|e }}"><span></span></a></li>
33 {% 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 %} 34 {% 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 %}
34 {% 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 %} 35 {% 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 %}
36 {% 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 %}
35 </li> 37 </li>
36 </ul> 38 </ul>
37 <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> 39 <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>