From 6065553c137ec63ec3ffddda0350f1d3d805b852 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Feb 2014 13:08:11 +0200 Subject: effect of block rebuilding on next page removed, issue #479 --- themes/baggy/home.twig | 80 +++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 5262c05b..a935b034 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -12,45 +12,45 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} - {% if tag %} -

{% trans "Tag" %}: {{ tag.value }}

- {% endif %} - {% if entries is empty %} -

{% trans "No articles found." %}

- {% else %} -
- {% include '_display-mode.twig' %} - {% include '_sorting.twig' %} -
- {% block pager %} - {% if nb_results > 1 %} -
-
{{ nb_results }} {% trans "results" %}
- {{ page_links | raw }} -
- {% endif %} - {% endblock %} -
- {% for entry in entries %} -
-

{{ entry.title|raw }}

- {% if entry.content| getReadingTime > 0 %} -
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
- {% else %} -
{% trans "estimated reading time :" %} < 1 min
- {% endif %} - -

{{ entry.content|striptags|slice(0, 300) }}...

-
+ {% if tag %} +

{% trans "Tag" %}: {{ tag.value }}

+ {% endif %} + {% if entries is empty %} +

{% trans "No articles found." %}

+ {% else %} +
+ {% include '_display-mode.twig' %} + {% include '_sorting.twig' %} +
+ {% block pager %} + {% if nb_results > 1 %} +
+
{{ nb_results }} {% trans "results" %}
+ {{ page_links | raw }} +
+ {% endif %} + {% endblock %} +
+ {% for entry in entries %} +
+

{{ entry.title|raw }}

+ {% if entry.content| getReadingTime > 0 %} +
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
+ {% else %} +
{% trans "estimated reading time :" %} < 1 min
+ {% endif %} + +

{{ entry.content|striptags|slice(0, 300) }}...

+
- {% endfor %} -
- {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} - {% endif %} - {{ block('pager') }} + {% endfor %} +
+ {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} + {% endif %} + {{ block('pager') }} {% endblock %} -- cgit v1.2.3 From fc52df0677cf0477d348a7b71627ea0c2232c2c3 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Feb 2014 13:13:30 +0200 Subject: effect of block rebuilding on next page removed, issue #479 --- themes/baggy/home.twig | 80 +++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index a935b034..7bc0472d 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -12,45 +12,45 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} - {% if tag %} -

{% trans "Tag" %}: {{ tag.value }}

- {% endif %} - {% if entries is empty %} -

{% trans "No articles found." %}

- {% else %} -
- {% include '_display-mode.twig' %} - {% include '_sorting.twig' %} -
- {% block pager %} - {% if nb_results > 1 %} -
-
{{ nb_results }} {% trans "results" %}
- {{ page_links | raw }} -
- {% endif %} - {% endblock %} -
- {% for entry in entries %} -
-

{{ entry.title|raw }}

- {% if entry.content| getReadingTime > 0 %} -
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
- {% else %} -
{% trans "estimated reading time :" %} < 1 min
- {% endif %} - -

{{ entry.content|striptags|slice(0, 300) }}...

-
+ {% if tag %} +

{% trans "Tag" %}: {{ tag.value }}

+ {% endif %} + {% if entries is empty %} +

{% trans "No articles found." %}

+ {% else %} +
+ {% include '_display-mode.twig' %} + {% include '_sorting.twig' %} +
+ {% block pager %} + {% if nb_results > 1 %} +
+
{{ nb_results }} {% trans "results" %}
+ {{ page_links | raw }} +
+ {% endif %} + {% endblock %} +
+ {% for entry in entries %} +
+

{{ entry.title|raw }}

+ {% if entry.content| getReadingTime > 0 %} +
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
+ {% else %} +
{% trans "estimated reading time :" %} < 1 min
+ {% endif %} + +

{{ entry.content|striptags|slice(0, 300) }}...

+
- {% endfor %} -
- {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} - {% endif %} - {{ block('pager') }} + {% endfor %} +
+ {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} + {% endif %} + {{ block('pager') }} {% endblock %} -- cgit v1.2.3 From d4293058364f6f13a7ce55373924b0a563918db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 14:27:10 +0100 Subject: [fix] #490 flattr icon in baggy theme --- themes/baggy/view.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/baggy') diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 4751c4cb..c925e91c 100644 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -14,7 +14,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% 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('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numflattrs }})
    • {% endif %}{% endif %}
  • {% trans "Does this article appear wrong?" %}
    • -- cgit v1.2.3 From 31a10069a52c2fd2aca3a835a7bdc1accae197f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 20:36:32 +0100 Subject: [add] upload form for import --- themes/baggy/config.twig | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index b37ac115..4026bf28 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -103,13 +103,26 @@ {% endif %}

    {% trans "Import" %}

    -

    {% trans "Please execute the import script locally as it can take a very long time." %}

    -

    {% trans "More info in the official documentation:" %} wallabag.org

    +

    1. {% trans "Select a file on your computer and upload it." %}

    +
    +
    +
    + + +
    +
    + +
    +
    + + +
    +

    2. {% trans "Then, click on the right link below." %}

    {% trans "Export your wallabag data" %}

    -- cgit v1.2.3 From 53e3158dfe697ea59da1fa0e401e8da75ae13030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 21:49:38 +0100 Subject: [add] cron to fetch content on imported entries --- themes/baggy/config.twig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'themes/baggy') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 4026bf28..8f35d797 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -125,6 +125,14 @@
  • {% trans "Import from wallabag" %} {{ '(after uploaded %s file)'|trans|format(constant('POCHE_FILE')) }}
    • + {% if token == '' %} +

    {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

    + {% else %} +

    3. {% trans "You can fetch content for imported items." %} Click here to fetch content for 10 articles.

    +

    {% trans "You can also create a cron task:" %}

    + 
    0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
    + {% endif %} +

    {% trans "Export your wallabag data" %}

    {% if constant('STORAGE') == 'sqlite' %}

    {% trans "Click here" %} {% trans "to download your database." %}

    {% endif %} -- cgit v1.2.3 From 11c680f97aa07b48f33e264effb2975d6ca31a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 1 Mar 2014 19:10:17 +0100 Subject: [add] display last check of wallabag release --- themes/baggy/config.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index b37ac115..33de701e 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -25,9 +25,10 @@

    {% trans "Upgrading wallabag" %}

    +

    {% trans "You can clear cache to check the latest release." %}

    {% trans "Feeds" %}

    {% if token == '' %} -- cgit v1.2.3 From 4ca17924a186b0a0571a1129c37fe48b47ce1331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 6 Mar 2014 18:45:15 +0100 Subject: [fix] links for firefox / android / ios apps --- themes/baggy/config.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 33de701e..d83b69ab 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -8,9 +8,10 @@

    {% trans "Saving articles" %}

    {% trans "There are several ways to save an article:" %} (?)

      -
    • Firefox: {% trans "download the extension" %}
      • +
    • Firefox: {% trans "download the extension" %}
    • Chrome: {% trans "download the extension" %}
      • -
    • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
      • +
    • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
      • +
    • iOS: {% trans "download the application" %}
    • Windows Phone: {% trans "download the application" %}
    • -- cgit v1.2.3 From 25114854b3e6b42c7be5e21a62539d8f23d3a10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 6 Mar 2014 18:57:04 +0100 Subject: [fix] remember scroll position for baggy theme #519 --- themes/baggy/view.twig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'themes/baggy') diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index c925e91c..092be04e 100644 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -29,4 +29,23 @@ {{ content | raw }} + + {% endblock %} -- cgit v1.2.3 From 7c6aa8d826067ad2949952001ecf7197d8e4c011 Mon Sep 17 00:00:00 2001 From: Bob Maerten Date: Fri, 7 Mar 2014 16:44:05 +0100 Subject: Changed text to clarify import process. --- themes/baggy/config.twig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 95db92fe..20ff9a00 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -44,7 +44,7 @@

      {% trans "Your user id:" %} {{user_id}}

      {% trans "You can regenerate your token: generate!." %}

      {% endif %} - +

      {% trans "Change your theme" %}

      @@ -105,7 +105,8 @@ {% endif %}

      {% trans "Import" %}

      -

      1. {% trans "Select a file on your computer and upload it." %}

      +

      {% trans "Importing from other services can be quite long, and webservers default configuration often prevents long scripts execution time, so it must be done in multiple parts." %}

      +

      1. {% trans "First, select the export file on your computer and upload it." %}

      @@ -130,8 +131,8 @@ {% if token == '' %}

      {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

      {% else %} -

      3. {% trans "You can fetch content for imported items." %} Click here to fetch content for 10 articles.

      -

      {% trans "You can also create a cron task:" %}

      +

      3. {% trans "Finaly, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

      +

      {% trans "If you have console access to your server, you can also create a cron task:" %}

      0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
      {% endif %} -- cgit v1.2.3 From 4744cb0e1df8ee7c1cd10c9fbd67caec73051024 Mon Sep 17 00:00:00 2001 From: Thomas LEBEAU Date: Sat, 8 Mar 2014 13:47:15 +0100 Subject: bagit link + overlay save link + listmode --- themes/baggy/_menu.twig | 2 +- themes/baggy/_pocheit-form.twig | 8 +++++ themes/baggy/css/main.css | 48 ++++++++++++++++++++++++---- themes/baggy/home.twig | 2 +- themes/baggy/js/init.js | 71 +++++++++++++++++++++++++++++++---------- 5 files changed, 107 insertions(+), 24 deletions(-) create mode 100755 themes/baggy/_pocheit-form.twig (limited to 'themes/baggy') diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig index e9cd9d4a..7dd799f9 100644 --- a/themes/baggy/_menu.twig +++ b/themes/baggy/_menu.twig @@ -4,7 +4,7 @@
    • {% trans "favorites" %}
    • {% trans "archive" %}
    • {% trans "tags" %}
      • -
    • {% trans "save a link" %}
      • +
    • {% trans "save a link" %}
    • {% trans "config" %}
    • {% trans "logout" %}
    diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig new file mode 100755 index 00000000..3c4a4d6e --- /dev/null +++ b/themes/baggy/_pocheit-form.twig @@ -0,0 +1,8 @@ +
    + + +

    {% trans "Save a link" %}

    + + + +
    diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index fe77a967..586501b0 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -173,7 +173,7 @@ h2:after { #links { position: fixed; top: 0; - width: 9em; + width: 10em; left: 0; text-align: right; background: #333; @@ -184,7 +184,7 @@ h2:after { } #main { - margin-left: 12em; + margin-left: 13em; position: relative; z-index: 10; padding-right: 5%; @@ -228,7 +228,7 @@ h2:after { #links li:last-child { position: fixed; bottom: 1em; - width: 9em; + width: 10em; } #links li:last-child a:before { @@ -322,6 +322,15 @@ footer a { letter-spacing:-5px; } +.listmode .entrie { + width: 100%!important; + margin-left: 0!important; +} + +.listmode .entrie p { + display: none; +} + .list-entries + .results { margin-bottom: 2em; } @@ -343,10 +352,10 @@ footer a { letter-spacing:normal; box-shadow: 0 3px 7px rgba(0,0,0,0.3); display: inline-block; - width: 32%; + width: 32%!important; margin-bottom: 1.5em; vertical-align: top; - margin-left: 1.5%; + margin-left: 1.5%!important; position: relative; overflow: hidden; padding: 1.5em 1.5em 3em 1.5em; @@ -481,7 +490,7 @@ footer a { } .entrie:nth-child(3n+1) { - margin-left: 0; + margin-left: 0!important; } .results { @@ -525,6 +534,33 @@ footer a { display: none; } +#bagit-form { + background: rgba(0,0,0,0.8); + position: fixed; + top: 0; + left: 10em; + z-index: 20; + height: 100%; + width: 100%; + margin: 0; + padding: 2em; + display: none; +} + +#bagit-form form { + background: #FFF; + position: absolute; + top: 50%; + left: 50%; + z-index: 20; + border: 10px solid #000; + width: 600px; + height: 300px; + margin: -150px 0 0 -300px; + padding: 2em; +} + + /* ========================================================================== 3 = Pictos ========================================================================== */ diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 7bc0472d..e34897fa 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -30,7 +30,7 @@ {% endif %} {% endblock %} -
    +
    {% for entry in entries %}

    {{ entry.title|raw }}

    diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js index 4a843548..99bffd09 100755 --- a/themes/baggy/js/init.js +++ b/themes/baggy/js/init.js @@ -1,36 +1,75 @@ -$(document).ready(function() { +$.fn.ready(function() { + + var $listmode = $('#listmode'), + $listentries = $("#list-entries"), + $bagit = $('#bagit'), + $bagitForm = $('#bagit-form'); + + /* ========================================================================== + Menu + ========================================================================== */ $("#menu").click(function(){ $("#links").toggle(); }); + /* ========================================================================== + List mode or Table Mode + ========================================================================== */ - $("#listmode").click(function(){ + $listmode.click(function(){ if ( $.cookie("listmode") == 1 ) { - $(".entrie").css("width", ""); - $(".entrie").css("margin-left", ""); - + // Cookie $.removeCookie("listmode"); - $("#listmode").removeClass("tablemode"); - $("#listmode").addClass("listmode"); + + $listentries.removeClass("listmode"); + $listmode.removeClass("tablemode"); + $listmode.addClass("listmode"); } else { + // Cookie $.cookie("listmode", 1, {expires: 365}); - $(".entrie").css("width", "100%"); - $(".entrie").css("margin-left", "0"); - $("#listmode").removeClass("listmode"); - $("#listmode").addClass("tablemode"); + $listentries.addClass("listmode"); + $listmode.removeClass("listmode"); + $listmode.addClass("tablemode"); } }); + /* ========================================================================== + Cookie listmode + ========================================================================== */ + if ( $.cookie("listmode") == 1 ) { - $(".entrie").css("width", "100%"); - $(".entrie").css("margin-left", "0"); - $("#listmode").removeClass("listmode"); - $("#listmode").addClass("tablemode"); + $listentries.addClass("listmode"); + $listmode.removeClass("listmode"); + $listmode.addClass("tablemode"); } + /* ========================================================================== + bag it link + ========================================================================== */ + + $bagit.click(function(){ + $bagitForm.toggle(); + }); + + /* ========================================================================== + Keyboard gestion + ========================================================================== */ + + $(window).keydown(function(e){ + switch (e.keyCode) { + // s letter + case 83: + $bagitForm.toggle(); + break; + case 27: + $bagitForm.hide(); + break; + } + }) + -}); +}); \ No newline at end of file -- cgit v1.2.3 From fb26cc9375ce9ef8df748eb473eb6e58884421c6 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 10 Mar 2014 16:28:47 +0200 Subject: a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542 --- themes/baggy/edit-tags.twig | 8 +++++++- themes/baggy/tags.twig | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) mode change 100644 => 100755 themes/baggy/edit-tags.twig mode change 100644 => 100755 themes/baggy/tags.twig (limited to 'themes/baggy') diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig old mode 100644 new mode 100755 index 9e9012ee..65ac996a --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig @@ -4,6 +4,11 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} + + + + +

    {{ entry.title|raw }}

    @@ -17,7 +22,8 @@ -

    {% trans "You can enter multiple tags, separated by commas." %}

    +

    {% trans "Start typing for auto complete." %}
    + {% trans "You can enter multiple tags, separated by commas." %}

    {% trans "return to article" %} {% endblock %} diff --git a/themes/baggy/tags.twig b/themes/baggy/tags.twig old mode 100644 new mode 100755 index 9df44bb7..9bb93a45 --- a/themes/baggy/tags.twig +++ b/themes/baggy/tags.twig @@ -6,7 +6,7 @@ {% block content %}

    {% trans "Tags" %}

      -{% for tag in tags %}
    • {% if token != '' %}rss{% endif %} {{ tag.value }} +{% for tag in tags %}
    • {% if token != '' %}rss{% endif %} {{ tag.value }} ({{ tag.entriescount }})
      • {% endfor %}
    -- cgit v1.2.3 From 7339b0b08dc5cd97c478981a431829bf587256f2 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Wed, 12 Mar 2014 13:00:37 +0200 Subject: fix of conflict of s shortcat and entering s in input fields --- themes/baggy/js/init.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js index 99bffd09..4e85beaa 100755 --- a/themes/baggy/js/init.js +++ b/themes/baggy/js/init.js @@ -60,16 +60,19 @@ $.fn.ready(function() { ========================================================================== */ $(window).keydown(function(e){ - switch (e.keyCode) { - // s letter - case 83: - $bagitForm.toggle(); - break; - case 27: - $bagitForm.hide(); - break; + if ( e.target.tagName.toLowerCase() !== 'input' ) { + switch (e.keyCode) { + // s letter + case 83: + $bagitForm.toggle(); + return false; + break; + case 27: + $bagitForm.hide(); + break; + } } }) -}); \ No newline at end of file +}); -- cgit v1.2.3 From 6775da70a845a7fa8364dd3bc1a8e7702e9789bf Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Wed, 12 Mar 2014 17:36:04 +0200 Subject: feature #505 - it is now possible to add link from bagged article (TODO: redev it to ajax action). Some enhancements to "save a link" popup div --- themes/baggy/_head.twig | 1 + themes/baggy/_menu.twig | 5 ++-- themes/baggy/_pocheit-form.twig | 7 +++-- themes/baggy/css/main.css | 64 ++++++++++++++++++++++++++++++++++++----- themes/baggy/js/init.js | 61 ++++++++++++++++++++++++++++----------- 5 files changed, 109 insertions(+), 29 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig index 1ea59abf..144bcaa6 100755 --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig @@ -8,6 +8,7 @@ + diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig index 7dd799f9..5226728b 100644 --- a/themes/baggy/_menu.twig +++ b/themes/baggy/_menu.twig @@ -4,9 +4,10 @@
  • {% trans "favorites" %}
  • {% trans "archive" %}
  • {% trans "tags" %}
    • -
  • {% trans "save a link" %}
    • +
  • {% trans "save a link" %} + {% include '_pocheit-form.twig' %} +
  • {% trans "config" %}
  • {% trans "logout" %}
    • - {% include '_pocheit-form.twig' %} diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index 3c4a4d6e..ff911515 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -1,7 +1,8 @@
    - -
    -

    {% trans "Save a link" %}

    + +

    X + {% trans "Save a link" %}

    +
    diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 586501b0..ba4b7c7f 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -534,32 +534,78 @@ footer a { display: none; } +/* ========================================================================== + 2.1 = "save a link" popup div related styles + ========================================================================== */ + #bagit-form { - background: rgba(0,0,0,0.8); - position: fixed; + background: rgba(0,0,0,0.5); + position: absolute; top: 0; left: 10em; z-index: 20; height: 100%; width: 100%; margin: 0; + margin-top: -30%; padding: 2em; display: none; + border-left: 1px #EEE solid; } #bagit-form form { background: #FFF; position: absolute; - top: 50%; - left: 50%; + top: 0; + left: 0; z-index: 20; border: 10px solid #000; - width: 600px; - height: 300px; - margin: -150px 0 0 -300px; + width: 400px; + height: 200px; + /* margin: -150px 0 0 -300px; */ padding: 2em; } +a#bagit-form-close { + background: #000; + color: #FFF; + padding: 0.2em 0.5em; + text-decoration: none; + display: inline-block; + float: right; + font-size: 0.6em; +} +a#bagit-form-close:hover { + background: #999; + color: #000; +} + +.active-current { + background-color: #999; +} + +.active-current:after { + content: ""; + width: 0; + height: 0; + position: absolute; + border-style: solid; + border-width: 10px; + border-color: transparent #EEE transparent transparent; + right: 0; + top: 50%; + margin-top: -10px; +} + +.opacity03 { + opacity: 0.3; +} + +.add-to-wallabag-link-after { + background-color: #000; + color: #fff; + padding: 0 3px 2px 3px; +} /* ========================================================================== 3 = Pictos @@ -920,4 +966,8 @@ blockquote { #display-mode { display: none; } + + #bagit-form { + left: 0; + } } diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js index 4e85beaa..4830bd25 100755 --- a/themes/baggy/js/init.js +++ b/themes/baggy/js/init.js @@ -48,31 +48,58 @@ $.fn.ready(function() { } /* ========================================================================== - bag it link - ========================================================================== */ + bag it link and close button + ========================================================================== */ - $bagit.click(function(){ + function toggleSaveLinkForm(url) { + $bagit.toggleClass("active-current"); $bagitForm.toggle(); + $('#content').toggleClass("opacity03"); + if (url !== 'undefined' && url) { + $('#plainurl').val(url); + } + $('#plainurl').focus(); + } + + $bagit.click(function(){ + toggleSaveLinkForm(); + }); + + $("#bagit-form-close").click(function(){ + toggleSaveLinkForm(); + }); + + $('#bagit-form form').submit(function(){ + toggleSaveLinkForm(); + return true; }); /* ========================================================================== - Keyboard gestion - ========================================================================== */ + Keyboard gestion + ========================================================================== */ $(window).keydown(function(e){ - if ( e.target.tagName.toLowerCase() !== 'input' ) { - switch (e.keyCode) { - // s letter - case 83: - $bagitForm.toggle(); - return false; - break; - case 27: - $bagitForm.hide(); - break; - } + if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || e.keyCode == 27 ) { + toggleSaveLinkForm(); + return false; } - }) + }); + + /* ========================================================================== + Process all links inside an article + ========================================================================== */ + + $("article a[href^='http']").after(function() { + return " w "; + }); + + $(".add-to-wallabag-link-after").click(function(event){ + event.preventDefault(); + toggleSaveLinkForm($(this).attr('href')); + return false; + }); + + }); -- cgit v1.2.3 From 3ee27ee6ba8d44182ddeac7b54d75cc54affeec7 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 13 Mar 2014 18:37:08 +0200 Subject: saving link form now sends ajax request, article view is now justified --- themes/baggy/_pocheit-form.twig | 3 ++- themes/baggy/css/main.css | 6 ++++++ themes/baggy/js/init.js | 31 ++++++++++++++++++++++++++----- 3 files changed, 34 insertions(+), 6 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index ff911515..505ec368 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -1,9 +1,10 @@
    -
    +

    X {% trans "Save a link" %}

    +
    diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index ba4b7c7f..61e0b47e 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -607,6 +607,11 @@ a#bagit-form-close:hover { padding: 0 3px 2px 3px; } +#add-link-result { + font-weight: bold; + margin-top: 10px; +} + /* ========================================================================== 3 = Pictos ========================================================================== */ @@ -741,6 +746,7 @@ a#bagit-form-close:hover { #article { width: 70%; margin-bottom: 3em; + text-align: justify; } #article .tags { diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js index 4830bd25..da644fbe 100755 --- a/themes/baggy/js/init.js +++ b/themes/baggy/js/init.js @@ -4,6 +4,7 @@ $.fn.ready(function() { $listentries = $("#list-entries"), $bagit = $('#bagit'), $bagitForm = $('#bagit-form'); + $bagitFormForm = $('#bagit-form-form'); /* ========================================================================== Menu @@ -69,9 +70,30 @@ $.fn.ready(function() { toggleSaveLinkForm(); }); - $('#bagit-form form').submit(function(){ - toggleSaveLinkForm(); - return true; + + //send "bag it link" form request via ajax + $bagitFormForm.submit( function(event) { + $bagitFormForm.css("cursor", "wait"); + $("#add-link-result").empty(); + + $.ajax({ + type: $bagitFormForm.attr('method'), + url: $bagitFormForm.attr('action'), + data: $bagitFormForm.serialize(), + success: function(data) { + $('#add-link-result').html("Done!"); + $('#plainurl').val(''); + $('#plainurl').blur(''); + $bagitFormForm.css("cursor", "auto"); + //setTimeout( function() { toggleSaveLinkForm(); }, 1000); //close form after 1000 delay + }, + error: function(data) { + $('#add-link-result').html("Failed!"); + $bagitFormForm.css("cursor", "auto"); + } + }); + + event.preventDefault(); }); /* ========================================================================== @@ -94,9 +116,8 @@ $.fn.ready(function() { }); $(".add-to-wallabag-link-after").click(function(event){ - event.preventDefault(); toggleSaveLinkForm($(this).attr('href')); - return false; + event.preventDefault(); }); -- cgit v1.2.3 From c0586a906c2bee5f5be445e614696a7078a7c906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 14 Mar 2014 08:37:40 +0100 Subject: [fix] new import section in old themes #559 --- themes/baggy/config.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 20ff9a00..a13af0c8 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -12,7 +12,7 @@
  • Chrome: {% trans "download the extension" %}
  • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
  • iOS: {% trans "download the application" %}
    • -
  • Windows Phone: {% trans "download the application" %}
    • +
  • Windows Phone: {% trans "download the application" %}
  • @@ -131,7 +131,7 @@ {% if token == '' %}

    {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

    {% else %} -

    3. {% trans "Finaly, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

    +

    3. {% trans "Finally, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

    {% trans "If you have console access to your server, you can also create a cron task:" %}

    0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
    {% endif %} -- cgit v1.2.3