From c8b4ef7fed01c4d94ac9d2325bd2c6e97f831bad Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 19 Nov 2014 16:27:56 +0100 Subject: [PATCH] implementing carrot into wallabag --- inc/poche/Poche.class.php | 2 +- inc/poche/config.inc.default.php | 2 +- themes/baggy/css/main.css | 1 - themes/baggy/view.twig | 3 ++- themes/courgette/_view.twig | 1 + themes/courgette/css/style-default.css | 6 +++++- themes/courgette/img/default/carrot.png | Bin 0 -> 718 bytes themes/default/css/style-default.css | 4 ++++ themes/default/img/default/carrot.png | Bin 0 -> 718 bytes themes/default/view.twig | 2 +- 10 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 themes/courgette/img/default/carrot.png create mode 100644 themes/default/img/default/carrot.png diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 16235474b..27d6f4a65 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -812,4 +812,4 @@ class Poche } -} +} \ No newline at end of file diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index f666f468e..21cbaf715 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -49,6 +49,7 @@ @define ('NOT_FLATTRABLE', '0'); @define ('FLATTRABLE', '1'); @define ('FLATTRED', '2'); +@define ('CARROT', TRUE); // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); // display or not percent of read in article view. Affects only default theme. @@ -67,4 +68,3 @@ @define ('IMPORT_LIMIT', 5); //delay between downloads (in sec) @define ('IMPORT_DELAY', 5); - diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 028c8b4ee..76d92003e 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -1046,4 +1046,3 @@ pre code { width: 100%; } } - diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 53a9ee692..fdc544bc5 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -16,6 +16,7 @@ {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numflattrs }})
    • {% endif %}{% endif %} + {% if constant('CARROT') == 1 %}
  • Carrot
    • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %}
  • EPUB
  • {% trans "Does this article appear wrong?" %}
    • @@ -95,4 +96,4 @@ }); }); -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index c5c916c04..129a622fa 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig @@ -12,6 +12,7 @@ {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %} + {% if constant('CARROT') == 1 %}
  • {% trans "carrot" %}
    • {% endif %}
  • EPUB
  • {% trans "this article appears wrong?" %}
    • diff --git a/themes/courgette/css/style-default.css b/themes/courgette/css/style-default.css index 3377a75be..297f86aec 100755 --- a/themes/courgette/css/style-default.css +++ b/themes/courgette/css/style-default.css @@ -38,6 +38,10 @@ a.flattr span { background-image: url('../img/default/flattr.png'); } +a.carrot span { + background-image: url('../img/default/carrot.png') +} + a.email span { background-image: url('../img/default/envelop.png'); } @@ -56,4 +60,4 @@ a.bad-display span { a.reading-time span { background-image: url('../img/default/clock.png'); -} +} \ 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 0000000000000000000000000000000000000000..5fc1727348e5dd1981345f62150baa16e2789690 GIT binary patch literal 718 zcmV;<0x|uGP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2i^-4 z4h;}<8(q8r00K@)L_t(I%Z*aMOKNcx|D5~dfnJTe2%9qN82}Rz17Hb11ADz*3WY+FVHli9BoGRP002J~Aiv)aRaLREu|Zo~ zTQCd*vMhuCS^S2zwKXs^9v>f}X&PsuNR7I( z+uP7}9mQf%bh};g`uh5-)9GM19HQNB|J~1Cv$M18^ZEGT;DF!W-ni9jS!ZWw7BgE< zPfwGbogEGY0(Qk2{?X=W;m?hr@h*eQnk2bt{!hO_r9H7=UHxD0b_?V2}*M zu$s*#?e6XhkH;gQpPy4a9%s`urB&CSh6cr;A_Gcz;nbULle%S*}OaLCWk&nTD6 z5JK1qH0|XTMNxQve;*GI4^pXAA^>3K|4#ghKf+fVCC0i4)c^nh07*qoM6N<$f^nER AL;wH) literal 0 HcmV?d00001 diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index 889a9f5c2..d00647abc 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -38,6 +38,10 @@ a.flattr span { background-image: url('../img/default/flattr.png'); } +a.carrot span { + background-image: url('../img/default/carrot.png') +} + a.email span { background-image: url('../img/default/envelop.png'); } diff --git a/themes/default/img/default/carrot.png b/themes/default/img/default/carrot.png new file mode 100644 index 0000000000000000000000000000000000000000..5fc1727348e5dd1981345f62150baa16e2789690 GIT binary patch literal 718 zcmV;<0x|uGP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2i^-4 z4h;}<8(q8r00K@)L_t(I%Z*aMOKNcx|D5~dfnJTe2%9qN82}Rz17Hb11ADz*3WY+FVHli9BoGRP002J~Aiv)aRaLREu|Zo~ zTQCd*vMhuCS^S2zwKXs^9v>f}X&PsuNR7I( z+uP7}9mQf%bh};g`uh5-)9GM19HQNB|J~1Cv$M18^ZEGT;DF!W-ni9jS!ZWw7BgE< zPfwGbogEGY0(Qk2{?X=W;m?hr@h*eQnk2bt{!hO_r9H7=UHxD0b_?V2}*M zu$s*#?e6XhkH;gQpPy4a9%s`urB&CSh6cr;A_Gcz;nbULle%S*}OaLCWk&nTD6 z5JK1qH0|XTMNxQve;*GI4^pXAA^>3K|4#ghKf+fVCC0i4)c^nh07*qoM6N<$f^nER AL;wH) literal 0 HcmV?d00001 diff --git a/themes/default/view.twig b/themes/default/view.twig index dbbbde3c0..b3f6d50ed 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -15,6 +15,7 @@ {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %} + {% if constant('CARROT') == 1 %}
  • {% trans "carrot" %}
    • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %}
  • EPUB
  • {% trans "Does this article appear wrong?" %}
    • @@ -118,4 +119,3 @@ }); {% endblock %} -