From 311baf86befde0557faea614ca4d13bb2bd2cc66 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 7 Dec 2014 23:36:35 +0100 Subject: implemented random button --- themes/baggy/css/main.css | 3 +++ themes/baggy/home.twig | 2 +- themes/default/css/style.css | 10 ++++++++++ themes/default/home.twig | 3 ++- themes/default/img/default/dice.png | Bin 0 -> 243 bytes 5 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 themes/default/img/default/dice.png (limited to 'themes') diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 1df82910..78d56612 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -736,6 +736,9 @@ a.add-to-wallabag-link-after:after { .icon-print:before { content: "\e80d"; } +.icon-random:before { + // RANDOM ICON TO ADD +} /* .icon-image class, for image-based icons diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index dec848f2..eb554b11 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -25,7 +25,7 @@ {% block pager %} {% if nb_results > 1 %}
-
{{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %}
+
{{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %} {% trans "random" %}
{{ page_links | raw }}
{% elseif nb_results == 1 %} diff --git a/themes/default/css/style.css b/themes/default/css/style.css index b25373d6..a122dc54 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -151,6 +151,16 @@ a:visited { text-indent: -9999px; } +.random { + display: inline-block; + width: 16px; + height: 16px; + overflow: hidden; + text-align: left; + text-indent: -9999px; + background-image: url('../img/default/dice.png'); +} + /*** ***/ /*** ARTICLE PAGE ***/ diff --git a/themes/default/home.twig b/themes/default/home.twig index 6bc549e6..aa332600 100755 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -31,7 +31,8 @@ {% block pager %} {% if nb_results > 1 %}
-
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
+
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %} + {% trans "random" %}
{{ page_links | raw }}
{% elseif nb_results == 1 %} diff --git a/themes/default/img/default/dice.png b/themes/default/img/default/dice.png new file mode 100644 index 00000000..70af6d0b Binary files /dev/null and b/themes/default/img/default/dice.png differ -- cgit v1.2.3 From 44b95cb81deae35f58e0058910afde2f2ffb9a60 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 13 Dec 2014 22:56:30 +0100 Subject: added reload function --- themes/baggy/css/main.css | 3 +++ themes/baggy/view.twig | 1 + themes/default/css/style-default.css | 3 +++ themes/default/img/default/reload.png | Bin 0 -> 343 bytes themes/default/view.twig | 1 + 5 files changed, 8 insertions(+) create mode 100644 themes/default/img/default/reload.png (limited to 'themes') diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 1df82910..96b681bf 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -736,6 +736,9 @@ a.add-to-wallabag-link-after:after { .icon-print:before { content: "\e80d"; } +.icon-reload:before { +/* TODO */ +} /* .icon-image class, for image-based icons diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 9225d11b..41766bf2 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -20,6 +20,7 @@ {% if constant('CARROT') == 1 %}
  • Carrot
    • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %}
  • EPUB
    • + {% if constant('RELOAD_ARTICLE') == 1 %}
  • {% trans "Reload article" %}
    • {% endif %}
  • {% trans "Does this article appear wrong?" %}
    • diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index 4406d48f..666c4a28 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -67,3 +67,6 @@ a.bad-display span { a.print span { background-image: url('../img/default/print.png'); } +a.reload span { + background-image: url('../img/default/reload.png'); +} diff --git a/themes/default/img/default/reload.png b/themes/default/img/default/reload.png new file mode 100644 index 00000000..4c0528e7 Binary files /dev/null and b/themes/default/img/default/reload.png differ diff --git a/themes/default/view.twig b/themes/default/view.twig index 181e1284..e14a165c 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -19,6 +19,7 @@ {% if constant('CARROT') == 1 %}
  • {% trans "carrot" %}
    • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %}
  • EPUB
    • + {% if constant('RELOAD_ARTICLE') == 1 %}
  • {% trans "Reload article" %}
    • {% endif %}}
  • {% trans "Does this article appear wrong?" %}
    • {% if constant('SHOW_READPERCENT') == 1 %}
  • 0%
    • {% endif %} -- cgit v1.2.3 From e51487f93265521cf04d8752b0554bb1f05dd189 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 22 Dec 2014 16:19:29 +0100 Subject: implemented ?random url --- themes/baggy/home.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 5068f755..27eea422 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -25,7 +25,7 @@ {% block pager %} {% if nb_results > 1 %}
    -
    {{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %} {% trans "random" %}
    +
    {{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %} {% trans "random" %}
    {{ page_links | raw }}
    {% elseif nb_results == 1 %} -- cgit v1.2.3 From 14d98f0611d195774eb4da011a56fe1ffac76ea4 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 21 Jan 2015 23:04:35 +0100 Subject: can add tags from the saving link popup --- themes/_global/js/saveLink.js | 7 +++++++ themes/baggy/_pocheit-form.twig | 2 ++ 2 files changed, 9 insertions(+) (limited to 'themes') diff --git a/themes/_global/js/saveLink.js b/themes/_global/js/saveLink.js index a7acd84c..9f66b73f 100755 --- a/themes/_global/js/saveLink.js +++ b/themes/_global/js/saveLink.js @@ -4,6 +4,8 @@ $.fn.ready(function() { $bagitForm = $('#bagit-form'), $bagitFormForm = $('#bagit-form-form'); +$("#tags2add").hide(); + /* ========================================================================== bag it link and close button ========================================================================== */ @@ -78,6 +80,11 @@ $.fn.ready(function() { event.preventDefault(); }); +$('#showtaginput').click(function(){ + $('#tags2add').toggle(); +}); + + /* ========================================================================== Keyboard gestion ========================================================================== */ diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index bf2ae903..bc439134 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -4,6 +4,8 @@ × + Add tags + -- cgit v1.2.3 From 308fca6b78a30729bd0a2cf34bc7a67bd7b81362 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 21 Jan 2015 23:08:04 +0100 Subject: forgotted default theme --- themes/default/_pocheit-form.twig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'themes') diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig index 8c982db0..f4518fce 100755 --- a/themes/default/_pocheit-form.twig +++ b/themes/default/_pocheit-form.twig @@ -2,6 +2,8 @@  
    + Add tags +
    -- cgit v1.2.3 From 522841c77e8ace6045cb10f9387d514179d05aeb Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 1 Feb 2015 12:01:04 +0100 Subject: added some icomoon fonts (lots \!) and integrated random button for now --- themes/baggy/css/main.css | 2 +- themes/baggy/fonts/icomoon.eot | Bin 3896 -> 6040 bytes themes/baggy/fonts/icomoon.svg | 69 +++++++++++++++++++--------------------- themes/baggy/fonts/icomoon.ttf | Bin 3732 -> 5876 bytes themes/baggy/fonts/icomoon.woff | Bin 3664 -> 5952 bytes themes/baggy/home.twig | 2 +- 6 files changed, 35 insertions(+), 38 deletions(-) (limited to 'themes') diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 78d56612..9356deda 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -737,7 +737,7 @@ a.add-to-wallabag-link-after:after { content: "\e80d"; } .icon-random:before { - // RANDOM ICON TO ADD + content: "\e915"; } diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/fonts/icomoon.eot index 56323516..784ac198 100644 Binary files a/themes/baggy/fonts/icomoon.eot and b/themes/baggy/fonts/icomoon.eot differ diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/fonts/icomoon.svg index b4586136..2e2f16f7 100644 --- a/themes/baggy/fonts/icomoon.svg +++ b/themes/baggy/fonts/icomoon.svg @@ -1,41 +1,38 @@ - - -{ - "fontFamily": "icomoon", - "majorVersion": 1, - "minorVersion": 0, - "version": "Version 1.0", - "fontId": "icomoon", - "psName": "icomoon", - "subFamily": "Regular", - "fullName": "icomoon", - "description": "Generated by IcoMoon" -} - - +Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf index bb1f21f8..b4fb95bc 100644 Binary files a/themes/baggy/fonts/icomoon.ttf and b/themes/baggy/fonts/icomoon.ttf differ diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/fonts/icomoon.woff index bab13779..158108f1 100644 Binary files a/themes/baggy/fonts/icomoon.woff and b/themes/baggy/fonts/icomoon.woff differ diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index d84c3f35..93d2815b 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -25,7 +25,7 @@ {% block pager %} {% if nb_results > 1 %}
    -
    {{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %} {% trans "random" %}
    +
    {{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %} {% trans "random" %}
    {{ page_links | raw }}
    {% elseif nb_results == 1 %} -- cgit v1.2.3 From 89637c2a1dcc114b17a8f7eef493b51315e1a6ac Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 1 Feb 2015 12:22:14 +0100 Subject: added reload icon and fixed a bug where random could redirect to deleted articles --- themes/baggy/css/main.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 9356deda..90d546fc 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -737,7 +737,10 @@ a.add-to-wallabag-link-after:after { content: "\e80d"; } .icon-random:before { - content: "\e915"; + content: "\e915"; +} +.icon-reload:before { + content: "\ea2e"; } -- cgit v1.2.3 From 23423f8d69722ae7135d3a78dfe97569dfc1776a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 1 Feb 2015 12:27:34 +0100 Subject: fixed random on default theme --- themes/default/home.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/default/home.twig b/themes/default/home.twig index abc96af8..8fe56397 100755 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -32,7 +32,7 @@ {% if nb_results > 1 %}
    {{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %} - {% trans "random" %}
    + {% trans "random" %}
    {{ page_links | raw }} {% elseif nb_results == 1 %} -- cgit v1.2.3 From 1c91178932cd5b48d793261c6631697186853a93 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 4 Feb 2015 23:37:37 +0100 Subject: fix autoclose (#984) and bookmarklet mode --- themes/baggy/config.twig | 2 +- themes/default/config.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index a5a61559..95e09734 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -27,7 +27,7 @@

    {% trans "Bookmarklet" %}

    - {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %} + {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %}

    {% trans "Feeds" %}

    diff --git a/themes/default/config.twig b/themes/default/config.twig index bac563cf..87f964c9 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -27,7 +27,7 @@

    {% trans "Bookmarklet" %}

    - {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %} + {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %}

    {% trans "Feeds" %}

    -- cgit v1.2.3 From 571b99e8045ab45bfa04bbc2a90dc566dba59452 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 4 Feb 2015 23:50:33 +0100 Subject: added evernote support --- themes/baggy/view.twig | 1 + themes/default/view.twig | 1 + 2 files changed, 2 insertions(+) (limited to 'themes') diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 0a8380de..473e3695 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -15,6 +15,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} + {% if constant('SHARE_EVERNOTE') == 1 %}
  • {% trans "evernote" %}
    • {% endif %} {% if constant('SHARE_DIASPORA') == 1 %}
  • {% trans "diaspora" %}
    • {% 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 %} diff --git a/themes/default/view.twig b/themes/default/view.twig index be8bf99e..87371d13 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -14,6 +14,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} + {% if constant('SHARE_EVERNOTE') == 1 %}
  • {% trans "evernote" %}
    • {% endif %} {% if constant('SHARE_DIASPORA') == 1 %}
  • {% trans "diaspora" %}
    • {% 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 %} -- cgit v1.2.3 From d0ea3544cad2ce4f1d0193d6d7bbda80eabadf91 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 5 Feb 2015 17:04:14 +0100 Subject: add evernote icon --- themes/_global/img/icons/evernote-icon--black.svg | 8 ++++++++ themes/baggy/css/main.css | 3 +++ themes/baggy/fonts/icomoon.eot | Bin 6040 -> 6304 bytes themes/baggy/fonts/icomoon.svg | 1 + themes/baggy/fonts/icomoon.ttf | Bin 5876 -> 6140 bytes themes/baggy/fonts/icomoon.woff | Bin 5952 -> 6216 bytes themes/baggy/view.twig | 2 +- themes/default/css/style-default.css | 5 +++++ 8 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 themes/_global/img/icons/evernote-icon--black.svg (limited to 'themes') diff --git a/themes/_global/img/icons/evernote-icon--black.svg b/themes/_global/img/icons/evernote-icon--black.svg new file mode 100644 index 00000000..1336648c --- /dev/null +++ b/themes/_global/img/icons/evernote-icon--black.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 90d546fc..54622cfc 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -742,6 +742,9 @@ a.add-to-wallabag-link-after:after { .icon-reload:before { content: "\ea2e"; } +.icon-evernote:before { + content: "\e603"; +} /* .icon-image class, for image-based icons diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/fonts/icomoon.eot index 784ac198..3d4d14ae 100644 Binary files a/themes/baggy/fonts/icomoon.eot and b/themes/baggy/fonts/icomoon.eot differ diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/fonts/icomoon.svg index 2e2f16f7..19fcfa1f 100644 --- a/themes/baggy/fonts/icomoon.svg +++ b/themes/baggy/fonts/icomoon.svg @@ -10,6 +10,7 @@ + diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf index b4fb95bc..923f56d8 100644 Binary files a/themes/baggy/fonts/icomoon.ttf and b/themes/baggy/fonts/icomoon.ttf differ diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/fonts/icomoon.woff index 158108f1..a2e86d36 100644 Binary files a/themes/baggy/fonts/icomoon.woff and b/themes/baggy/fonts/icomoon.woff differ diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 473e3695..0d0a4438 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -15,7 +15,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} - {% if constant('SHARE_EVERNOTE') == 1 %}
  • {% trans "evernote" %}
    • {% endif %} + {% if constant('SHARE_EVERNOTE') == 1 %}
  • {% trans "evernote" %}
    • {% endif %} {% if constant('SHARE_DIASPORA') == 1 %}
  • {% trans "diaspora" %}
    • {% 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 %} diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index 666c4a28..39a4df90 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -43,6 +43,11 @@ a.carrot span { background-size: 16px 16px; } +a.evernote span { + background-image: url('../../_global/img/icons/evernote-icon--black.svg'); + background-size: 16px 16px; +} + a.diaspora span { background-image: url('../../_global/img/icons/diaspora-icon--black.png'); background-size: 16px 16px; -- cgit v1.2.3 From cefdc12380c5acee927e3f8e1cb85213f4b1475d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 10 Feb 2015 01:16:50 +0100 Subject: changed description text place in about screen --- themes/baggy/about.twig | 4 ++-- themes/default/about.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'themes') diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig index 110196a6..93c96df2 100755 --- a/themes/baggy/about.twig +++ b/themes/baggy/about.twig @@ -7,6 +7,8 @@ {% block content %}

    {% trans "About wallabag" %}

    +

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    +
    {% trans "Project website" %}
    https://www.wallabag.org
    @@ -27,8 +29,6 @@
    {{ constant('POCHE') }}
    -

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    -

    {% trans "Getting help" %}

    diff --git a/themes/default/about.twig b/themes/default/about.twig index 5ca3217c..bab9b5eb 100755 --- a/themes/default/about.twig +++ b/themes/default/about.twig @@ -7,6 +7,8 @@ {% block content %}

    {% trans "About wallabag" %}

    +

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    +
    {% trans "Project website" %}
    http://www.wallabag.org
    @@ -27,8 +29,6 @@
    {{ constant('POCHE') }}
    -

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    -

    {% trans "Helping wallabag" %}

    {% trans "wallabag is free and opensource. You can help us:" %}

    -- cgit v1.2.3 From 1394c0bd64ad99e8f9fc094bb535ae5b3f5e24f1 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 10 Feb 2015 02:28:53 +0100 Subject: great improvements to tagging when saving a link system <3 --- themes/_global/js/saveLink.js | 3 +++ themes/baggy/_pocheit-form.twig | 4 +++- themes/baggy/css/main.css | 3 +++ themes/default/_pocheit-form.twig | 4 +++- themes/default/css/style-default.css | 10 ++++++++++ themes/default/img/default/tags.png | Bin 0 -> 332 bytes 6 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 themes/default/img/default/tags.png (limited to 'themes') diff --git a/themes/_global/js/saveLink.js b/themes/_global/js/saveLink.js index 9f66b73f..b7dd7a34 100755 --- a/themes/_global/js/saveLink.js +++ b/themes/_global/js/saveLink.js @@ -82,6 +82,9 @@ $("#tags2add").hide(); $('#showtaginput').click(function(){ $('#tags2add').toggle(); + $('#plainurl').toggle(); + $('#showtaginput').toggleClass('icon-tags'); + $('#showtaginput').toggleClass('icon-check'); }); diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index bc439134..85d33873 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -4,7 +4,9 @@ × - Add tags +
    + Add tags +
    diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 54622cfc..b93a78b8 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -745,6 +745,9 @@ a.add-to-wallabag-link-after:after { .icon-evernote:before { content: "\e603"; } +.icon-tags:before { + content: "\e936"; +} /* .icon-image class, for image-based icons diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig index f4518fce..71991341 100755 --- a/themes/default/_pocheit-form.twig +++ b/themes/default/_pocheit-form.twig @@ -2,7 +2,9 @@  
    - Add tags +
    + Add tags +
    diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index 39a4df90..da8703f2 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -75,3 +75,13 @@ a.print span { a.reload span { background-image: url('../img/default/reload.png'); } +.edit-tags span { + background-image: url('../img/default/tags.png'); + display: inline-block; + width: 16px; + height: 16px; + /* Hide textual content */ + overflow: hidden; + text-align: left; + text-indent: -9999px; +} diff --git a/themes/default/img/default/tags.png b/themes/default/img/default/tags.png new file mode 100644 index 00000000..3714203e Binary files /dev/null and b/themes/default/img/default/tags.png differ -- cgit v1.2.3