From 48e063904d70d658b73a1f73dee07df8afb8afe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 23 Feb 2014 09:50:11 +0100 Subject: [change] remove old logo #484 --- themes/baggy/img/logo-other_themes.png | Bin 0 -> 3922 bytes themes/default/_top.twig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 themes/baggy/img/logo-other_themes.png (limited to 'themes') diff --git a/themes/baggy/img/logo-other_themes.png b/themes/baggy/img/logo-other_themes.png new file mode 100755 index 00000000..32543a44 Binary files /dev/null and b/themes/baggy/img/logo-other_themes.png differ diff --git a/themes/default/_top.twig b/themes/default/_top.twig index 083be152..0711acdc 100644 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}logo poche{% endblock %} {% else %}{{ block('logo') }} {% endif %}

-- cgit v1.2.3 From dcc73856a900a98b2b1efd5292eea6f662924884 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 25 Feb 2014 15:45:39 +0200 Subject: "poche" word removed completely, all locales .po files updated, en, pl, ru and uk .mo files recompiled. --- themes/baggy/_top.twig | 2 +- themes/courgette/_top.twig | 2 +- themes/courgette/config.twig | 12 ++++++------ themes/default/_bookmarklet.twig | 2 +- themes/default/_top.twig | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'themes') diff --git a/themes/baggy/_top.twig b/themes/baggy/_top.twig index 4f476a37..d3e35aa3 100644 --- a/themes/baggy/_top.twig +++ b/themes/baggy/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% else %}{{ block('logo') }} {% endif %}

diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig index 792687c0..2a2de211 100755 --- a/themes/courgette/_top.twig +++ b/themes/courgette/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% elseif view == 'fav' %}{{ block('logo') }} Favoris {% elseif view == 'archive' %}{{ block('logo') }} Archive {% else %}{{ block('logo') }} diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig index 26da7289..5c0aa4b1 100755 --- a/themes/courgette/config.twig +++ b/themes/courgette/config.twig @@ -7,7 +7,7 @@ {% block content %}

{% trans "Poching a link" %}

-

{% trans "You can poche a link by several methods:" %} (?)

+

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

-

{% trans "Updating poche" %}

+

{% trans "Upgrading wallabag" %}

-

{% trans "Export your poche datas" %}

-

{% trans "Click here" %} {% trans "to export your poche datas." %}

+

{% trans "Export your wallabag data" %}

+

{% trans "Click here" %} {% trans "to export your wallabag data." %}

{% endblock %} \ No newline at end of file diff --git a/themes/default/_bookmarklet.twig b/themes/default/_bookmarklet.twig index 2e3071ad..61996353 100644 --- a/themes/default/_bookmarklet.twig +++ b/themes/default/_bookmarklet.twig @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/themes/default/_top.twig b/themes/default/_top.twig index 0711acdc..c6e41b2f 100644 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% else %}{{ block('logo') }} {% endif %}

-- cgit v1.2.3 From fa37042b32a706709d3862f0aaf257ab315cfec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 27 Feb 2014 13:21:54 +0100 Subject: [fix] Baggy theme navigation bug #485 --- themes/baggy/css/main.css | 1 + 1 file changed, 1 insertion(+) (limited to 'themes') diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 3e128b08..6316fcc0 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -442,6 +442,7 @@ footer a { .pagination { text-align: right; + margin-bottom:50px; } .nb-results { -- cgit v1.2.3 From a8464c97197c1ea9c4b3c35d7cec6a5398b7a522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 27 Feb 2014 13:36:06 +0100 Subject: [fix] hover problem with logout link #489 --- themes/baggy/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 6316fcc0..9a65dbee 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -227,7 +227,7 @@ h2:after { #links li:last-child { position: fixed; bottom: 1em; - width: 10%; + width: 9em; } #links li:last-child a:before { -- cgit v1.2.3 From 36a733af8dee1de5a0f81f1efe70e96a435b6a17 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 27 Feb 2014 16:11:37 +0200 Subject: some baggy theme fixes and enhancement: issue #479 --- themes/baggy/_display-mode.twig | 5 ++ themes/baggy/_head.twig | 1 + themes/baggy/css/main.css | 69 ++++++++++++++++++++++- themes/baggy/home.twig | 4 ++ themes/baggy/img/baggy/blank.png | Bin 0 -> 141 bytes themes/baggy/img/baggy/down.png | Bin 0 -> 216 bytes themes/baggy/img/baggy/list.png | Bin 0 -> 201 bytes themes/baggy/img/baggy/table.png | Bin 0 -> 229 bytes themes/baggy/img/baggy/top.png | Bin 0 -> 212 bytes themes/baggy/js/init.js | 44 +++++++++++---- themes/baggy/js/jquery.cookie.js | 117 +++++++++++++++++++++++++++++++++++++++ themes/default/_sorting.twig | 6 ++ themes/default/home.twig | 7 +-- 13 files changed, 234 insertions(+), 19 deletions(-) create mode 100755 themes/baggy/_display-mode.twig mode change 100644 => 100755 themes/baggy/_head.twig mode change 100644 => 100755 themes/baggy/home.twig create mode 100755 themes/baggy/img/baggy/blank.png create mode 100644 themes/baggy/img/baggy/down.png create mode 100755 themes/baggy/img/baggy/list.png create mode 100755 themes/baggy/img/baggy/table.png create mode 100644 themes/baggy/img/baggy/top.png create mode 100755 themes/baggy/js/jquery.cookie.js create mode 100755 themes/default/_sorting.twig mode change 100644 => 100755 themes/default/home.twig (limited to 'themes') diff --git a/themes/baggy/_display-mode.twig b/themes/baggy/_display-mode.twig new file mode 100755 index 00000000..31f76581 --- /dev/null +++ b/themes/baggy/_display-mode.twig @@ -0,0 +1,5 @@ + diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig old mode 100644 new mode 100755 index 206d5aae..1ea59abf --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig @@ -8,5 +8,6 @@ + diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 3e128b08..0a8d2c7b 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -177,7 +177,7 @@ h2:after { left: 0; text-align: right; background: #333; - padding-top: 9em; + padding-top: 9.5em; height: 100%; box-shadow:inset -4px 0 20px rgba(0,0,0,0.6); z-index: 10; @@ -188,6 +188,7 @@ h2:after { position: relative; z-index: 10; padding-right: 5%; + padding-bottom: 1em; } #links a { @@ -227,7 +228,7 @@ h2:after { #links li:last-child { position: fixed; bottom: 1em; - width: 10%; + width: 9em; } #links li:last-child a:before { @@ -237,6 +238,61 @@ h2:after { } +#sort { + padding: 0; + list-style-type: none; + opacity: 0.5; + display: inline-block; +} + +#sort li { + display: inline; + font-size: 0.9em; +} + +#sort li + li { + margin-left: 10px; +} + +#sort a { + padding: 2px 2px 0; + vertical-align: middle; +} + +#sort img { + vertical-align: baseline; +} +#sort img:hover { + cursor: pointer; +} + +#display-mode { + float: right; + vertical-align: middle; + margin-top: 10px; + margin-bottom: 10px; + opacity: 0.5; +} +#listmode { + width: 16px; + display: inline-block; + text-decoration: none; +} +#listmode a:hover { + opacity: 1; +} +.tablemode { + background-image: url("../img/baggy/table.png"); + background-repeat: no-repeat; + background-position: bottom; +} +.listmode { + background-image: url("../img/baggy/list.png"); + background-repeat: no-repeat; + background-position: bottom; +} + + /* ========================================================================== 2 = Layout ========================================================================== */ @@ -248,7 +304,7 @@ h2:after { footer { text-align: right; - position: fixed; + position: relative; bottom: 0; right: 5em; color: #999; @@ -731,6 +787,9 @@ blockquote { width: 100%; margin-left: 0; } + #display-mode { + display: none; + } } @media screen and (max-width: 500px) { @@ -820,4 +879,8 @@ blockquote { #article_toolbar a { padding: 0.3em 0.4em 0.2em; } + + #display-mode { + display: none; + } } diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig old mode 100644 new mode 100755 index 4f9db063..5262c05b --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -18,6 +18,10 @@ {% if entries is empty %}

{% trans "No articles found." %}

{% else %} +
+ {% include '_display-mode.twig' %} + {% include '_sorting.twig' %} +
{% block pager %} {% if nb_results > 1 %}
diff --git a/themes/baggy/img/baggy/blank.png b/themes/baggy/img/baggy/blank.png new file mode 100755 index 00000000..63e09844 Binary files /dev/null and b/themes/baggy/img/baggy/blank.png differ diff --git a/themes/baggy/img/baggy/down.png b/themes/baggy/img/baggy/down.png new file mode 100644 index 00000000..b9d536a7 Binary files /dev/null and b/themes/baggy/img/baggy/down.png differ diff --git a/themes/baggy/img/baggy/list.png b/themes/baggy/img/baggy/list.png new file mode 100755 index 00000000..bd5aff5a Binary files /dev/null and b/themes/baggy/img/baggy/list.png differ diff --git a/themes/baggy/img/baggy/table.png b/themes/baggy/img/baggy/table.png new file mode 100755 index 00000000..859c4cd8 Binary files /dev/null and b/themes/baggy/img/baggy/table.png differ diff --git a/themes/baggy/img/baggy/top.png b/themes/baggy/img/baggy/top.png new file mode 100644 index 00000000..954a8c0a Binary files /dev/null and b/themes/baggy/img/baggy/top.png differ diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js index c1d3c0ec..4a843548 100755 --- a/themes/baggy/js/init.js +++ b/themes/baggy/js/init.js @@ -1,12 +1,36 @@ -document.addEventListener('DOMContentLoaded', function() { - var menu = document.getElementById('menu'); - - menu.addEventListener('click', function(){ - if(this.nextElementSibling.style.display === "block") { - this.nextElementSibling.style.display = "none"; - }else { - this.nextElementSibling.style.display = "block"; +$(document).ready(function() { + + $("#menu").click(function(){ + $("#links").toggle(); + }); + + + $("#listmode").click(function(){ + if ( $.cookie("listmode") == 1 ) { + $(".entrie").css("width", ""); + $(".entrie").css("margin-left", ""); + + $.removeCookie("listmode"); + $("#listmode").removeClass("tablemode"); + $("#listmode").addClass("listmode"); } - + else { + $.cookie("listmode", 1, {expires: 365}); + + $(".entrie").css("width", "100%"); + $(".entrie").css("margin-left", "0"); + $("#listmode").removeClass("listmode"); + $("#listmode").addClass("tablemode"); + } + }); -}); \ No newline at end of file + + if ( $.cookie("listmode") == 1 ) { + $(".entrie").css("width", "100%"); + $(".entrie").css("margin-left", "0"); + $("#listmode").removeClass("listmode"); + $("#listmode").addClass("tablemode"); + } + + +}); diff --git a/themes/baggy/js/jquery.cookie.js b/themes/baggy/js/jquery.cookie.js new file mode 100755 index 00000000..92719000 --- /dev/null +++ b/themes/baggy/js/jquery.cookie.js @@ -0,0 +1,117 @@ +/*! + * jQuery Cookie Plugin v1.4.0 + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2013 Klaus Hartl + * Released under the MIT license + */ +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as anonymous module. + define(['jquery'], factory); + } else { + // Browser globals. + factory(jQuery); + } +}(function ($) { + + var pluses = /\+/g; + + function encode(s) { + return config.raw ? s : encodeURIComponent(s); + } + + function decode(s) { + return config.raw ? s : decodeURIComponent(s); + } + + function stringifyCookieValue(value) { + return encode(config.json ? JSON.stringify(value) : String(value)); + } + + function parseCookieValue(s) { + if (s.indexOf('"') === 0) { + // This is a quoted cookie as according to RFC2068, unescape... + s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); + } + + try { + // Replace server-side written pluses with spaces. + // If we can't decode the cookie, ignore it, it's unusable. + s = decodeURIComponent(s.replace(pluses, ' ')); + } catch(e) { + return; + } + + try { + // If we can't parse the cookie, ignore it, it's unusable. + return config.json ? JSON.parse(s) : s; + } catch(e) {} + } + + function read(s, converter) { + var value = config.raw ? s : parseCookieValue(s); + return $.isFunction(converter) ? converter(value) : value; + } + + var config = $.cookie = function (key, value, options) { + + // Write + if (value !== undefined && !$.isFunction(value)) { + options = $.extend({}, config.defaults, options); + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); + } + + return (document.cookie = [ + encode(key), '=', stringifyCookieValue(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // Read + + var result = key ? undefined : {}; + + // To prevent the for loop in the first place assign an empty array + // in case there are no cookies at all. Also prevents odd result when + // calling $.cookie(). + var cookies = document.cookie ? document.cookie.split('; ') : []; + + for (var i = 0, l = cookies.length; i < l; i++) { + var parts = cookies[i].split('='); + var name = decode(parts.shift()); + var cookie = parts.join('='); + + if (key && key === name) { + // If second argument (value) is a function it's a converter... + result = read(cookie, value); + break; + } + + // Prevent storing a cookie that we couldn't decode. + if (!key && (cookie = read(cookie)) !== undefined) { + result[name] = cookie; + } + } + + return result; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key) !== undefined) { + // Must not alter options, thus extending a fresh object... + $.cookie(key, '', $.extend({}, options, { expires: -1 })); + return true; + } + return false; + }; + +})); diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig new file mode 100755 index 00000000..4f2fceb0 --- /dev/null +++ b/themes/default/_sorting.twig @@ -0,0 +1,6 @@ +{% if entries|length > 1 %} +
    +
  • {% trans {% trans "by date" %} {% trans
    • +
  • {% trans {% trans "by title" %} {% trans
    • +
+{% endif %} diff --git a/themes/default/home.twig b/themes/default/home.twig old mode 100644 new mode 100755 index 165fecc6..bd5fc2d6 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -12,12 +12,7 @@ {% include '_menu.twig' %} {% endblock %} {% block precontent %} - {% if entries|length > 1 %} -
    -
  • {% trans {% trans "by date" %} {% trans
    • -
  • {% trans {% trans "by title" %} {% trans
    • -
- {% endif %} + {% include '_sorting.twig' %} {% endblock %} {% block content %} {% if tag %} -- cgit v1.2.3 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') 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') 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') 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') 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') 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') 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 +++-- themes/default/config.twig | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'themes') 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:" %} (?)