mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 19:11:07 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Nicolas Frandeboeuf 2013-08-22 00:57:11 +02:00
commit 57c91e427d
7 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -3,4 +3,4 @@ composer.phar
db/poche.sqlite
output
phpdoc*
inc/config/myconfig.inc.php
inc/poche/myconfig.inc.php

6
inc/poche/config.inc.php
View file

@ -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';

2
inc/poche/define.inc.php
View file

@ -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');

3
index.php
View file

@ -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();

4
tpl/css/style-light.css
View file

@ -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;
}

BIN
tpl/img/light/shaarli.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 729 B

2
tpl/view.twig
View file

@ -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>