diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-11-21 22:15:17 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-11-21 22:15:17 +0100 |
commit | 7b8bb75228fff2a629388313a3d12cd63c846ad6 (patch) | |
tree | 8d8565fad43ab6bc5618a2372956ab792de521ec /themes/courgette | |
parent | 25f9c668348ae8d15e557bafc0e4aff2e2477e87 (diff) | |
parent | fe16457efc4365b8fa7b5879b1f8f8dc4e4a07bc (diff) | |
download | wallabag-7b8bb75228fff2a629388313a3d12cd63c846ad6.tar.gz wallabag-7b8bb75228fff2a629388313a3d12cd63c846ad6.tar.zst wallabag-7b8bb75228fff2a629388313a3d12cd63c846ad6.zip |
Merge pull request #942 from wallabag/carrot
implementing carrot into wallabag
Diffstat (limited to 'themes/courgette')
-rwxr-xr-x | themes/courgette/_view.twig | 1 | ||||
-rwxr-xr-x | themes/courgette/css/style-default.css | 6 | ||||
-rw-r--r-- | themes/courgette/img/default/carrot.png | bin | 0 -> 718 bytes |
3 files changed, 6 insertions, 1 deletions
diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index bae278f3..5234f766 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig | |||
@@ -12,6 +12,7 @@ | |||
12 | {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %} | 12 | {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %} |
13 | {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} | 13 | {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %} |
14 | {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li class="flattrli"><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numFlattrs }}</a></li>{% endif %}{% endif %} | 14 | {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li class="flattrli"><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numFlattrs }}</a></li>{% endif %}{% endif %} |
15 | {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon" target="_blank" title="{% trans "carrot" %}"><span>{% trans "carrot" %}</span></a></li>{% endif %} | ||
15 | <li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate epub file">EPUB</a></li> | 16 | <li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate epub file">EPUB</a></li> |
16 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{% trans "this article appears wrong?" %}" class="tool bad-display"><span>{% trans "this article appears wrong?" %}</span></a></li> | 17 | <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&body={{ entry.url|url_encode }}" title="{% trans "this article appears wrong?" %}" class="tool bad-display"><span>{% trans "this article appears wrong?" %}</span></a></li> |
17 | </ul> | 18 | </ul> |
diff --git a/themes/courgette/css/style-default.css b/themes/courgette/css/style-default.css index 3377a75b..297f86ae 100755 --- a/themes/courgette/css/style-default.css +++ b/themes/courgette/css/style-default.css | |||
@@ -38,6 +38,10 @@ a.flattr span { | |||
38 | background-image: url('../img/default/flattr.png'); | 38 | background-image: url('../img/default/flattr.png'); |
39 | } | 39 | } |
40 | 40 | ||
41 | a.carrot span { | ||
42 | background-image: url('../img/default/carrot.png') | ||
43 | } | ||
44 | |||
41 | a.email span { | 45 | a.email span { |
42 | background-image: url('../img/default/envelop.png'); | 46 | background-image: url('../img/default/envelop.png'); |
43 | } | 47 | } |
@@ -56,4 +60,4 @@ a.bad-display span { | |||
56 | 60 | ||
57 | a.reading-time span { | 61 | a.reading-time span { |
58 | background-image: url('../img/default/clock.png'); | 62 | background-image: url('../img/default/clock.png'); |
59 | } | 63 | } \ No newline at end of file |
diff --git a/themes/courgette/img/default/carrot.png b/themes/courgette/img/default/carrot.png new file mode 100644 index 00000000..5fc17273 --- /dev/null +++ b/themes/courgette/img/default/carrot.png | |||
Binary files differ | |||