From 01cd443441c401a82ae021e08dedd6709100be2c Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Sun, 16 Feb 2014 21:00:30 +0200 Subject: "save a link" added to top menu (default theme) to toggle "save link" form message, issue #461. "Mark all the entries as read" link added in default theme. --- themes/default/_menu.twig | 5 ++++- themes/default/_pocheit-form.twig | 22 ++++++++++++++++++++++ themes/default/css/style.css | 13 +++++++++++++ themes/default/home.twig | 1 + 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100755 themes/default/_pocheit-form.twig (limited to 'themes/default') diff --git a/themes/default/_menu.twig b/themes/default/_menu.twig index 02bec1dc..55583b3d 100644 --- a/themes/default/_menu.twig +++ b/themes/default/_menu.twig @@ -3,6 +3,9 @@
  • {% trans "favorites" %}
  • {% trans "archive" %}
  • {% trans "tags" %}
    • +
  • {% trans "save a link" %}
  • {% trans "config" %}
  • {% trans "logout" %}
    • - \ No newline at end of file + + {% include '_pocheit-form.twig' %} + diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig new file mode 100755 index 00000000..13096159 --- /dev/null +++ b/themes/default/_pocheit-form.twig @@ -0,0 +1,22 @@ +
    +
    +
    + + +
    +
    +
    + diff --git a/themes/default/css/style.css b/themes/default/css/style.css index 2088ee2e..28675907 100644 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -334,3 +334,16 @@ a.bad-display span, a.reading-time span { background-repeat: no-repeat; } + +.arrow-down { + width: 0px; + height: 0px; + border-style: solid; + border-width: 10px 10px 0 10px; + border-color: #000 transparent transparent transparent; + + position: absolute; + margin-top: 1.5em; + margin-left: -30px; +} + diff --git a/themes/default/home.twig b/themes/default/home.twig index cbe8c62f..21013ec8 100644 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -46,4 +46,5 @@ {% endfor %} {% endif %} {{ block('pager') }} + {% if view == 'home' %}{% if nb_results > 1 %}{% trans "mark all the entries as read" %}{% endif %}{% endif %} {% endblock %} -- cgit v1.2.3 From 032e0ca13ab8ebf99b5169f6f733db4184cdde6c Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 20 Feb 2014 19:28:39 +0200 Subject: a lot of refactoring: tag action is now handled by home view and uses sorting and pagination. Some small view enhacenments. Fix of #476, #461 for baggy and other themes --- themes/default/edit-tags.twig | 15 ++++++++++++--- themes/default/home.twig | 8 ++++++-- themes/default/tag.twig | 33 --------------------------------- themes/default/view.twig | 11 +++++++---- 4 files changed, 25 insertions(+), 42 deletions(-) delete mode 100644 themes/default/tag.twig (limited to 'themes/default') diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index 53852d39..83f04aa0 100644 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -4,6 +4,13 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} + +
    +
    +

    {{ entry.title|raw }}

    +
    +
    + {% if tags is empty %} no tags {% endif %} @@ -11,10 +18,12 @@ no tags {% for tag in tags %}
  • {{ tag.value }} ✘
    • {% endfor %}
    - -

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

    + + +

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

    +
    -{% trans "return to article" %} +« {% trans "return to article" %} {% endblock %} diff --git a/themes/default/home.twig b/themes/default/home.twig index 21013ec8..165fecc6 100644 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -14,12 +14,16 @@ {% block precontent %} {% if entries|length > 1 %} {% endif %} {% endblock %} {% block content %} + {% if tag %} +

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

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

    {% trans "No articles found." %}

    {% else %} diff --git a/themes/default/tag.twig b/themes/default/tag.twig deleted file mode 100644 index 364c7cd4..00000000 --- a/themes/default/tag.twig +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}tag {% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -

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

    - {% if entries is empty %} -

    {% trans "No link available here!" %}

    - {% else %} - {% block pager %} - {% if nb_results > 1 %} -
    -
    {{ nb_results }} {% trans "results" %}
    - {{ page_links | raw }} -
    - {% endif %} - {% endblock %} - {% for entry in entries %} -
    -

    {{ entry.title|raw }}

    - -

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

    -
    - {% endfor %} - {% endif %} -{% endblock %} \ No newline at end of file diff --git a/themes/default/view.twig b/themes/default/view.twig index 9858996f..916abe0d 100644 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -20,12 +20,15 @@

    {{ entry.title|raw }}

    - + {% block tags %} + + {% endblock %}
    {{ content | raw }}
    + {{ block('tags') }} + {% endblock %} -- cgit v1.2.3 From 3628b24d12f14dfa2513e2a1beebf017c5a69c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 21 Feb 2014 14:53:43 +0100 Subject: [change] remove some poche terms in old default theme #471 --- themes/default/config.twig | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'themes/default') diff --git a/themes/default/config.twig b/themes/default/config.twig index df62520a..c513f239 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -5,8 +5,8 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} -

    {% trans "Poching links" %}

    -

    {% trans "There are several ways to poche a link:" %} (?)

    +

    {% trans "Saving articles" %}

    +

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

    -

    {% trans "Updating poche" %}

    +

    {% trans "Upgrading wallabag" %}

    {% trans "Feeds" %}

    @@ -104,16 +104,19 @@

    {% trans "Import" %}

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

    -

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

    +

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

    -

    {% trans "Export your poche data" %}

    +

    {% trans "Export your wallabag data" %}

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

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

    {% endif %} -

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

    +

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

    + +

    {% trans "Cache" %}

    +

    {% trans "Click here" %} {% trans "to delete cache." %}

    {% endblock %} -- cgit v1.2.3 From e5382002b47f3278bd46d5b76a34ad694096f010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 21 Feb 2014 14:58:07 +0100 Subject: [change] login button into sign in --- themes/default/login.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/default') diff --git a/themes/default/login.twig b/themes/default/login.twig index bf685240..b9f8b497 100644 --- a/themes/default/login.twig +++ b/themes/default/login.twig @@ -24,7 +24,7 @@
    - +
    -- cgit v1.2.3 From c9bd17a1007bb78e5de0775efca01df0fb515031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 21 Feb 2014 15:24:33 +0100 Subject: [add] languages well displayed on config page #480 --- themes/default/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/default') diff --git a/themes/default/config.twig b/themes/default/config.twig index c513f239..cd4d074d 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -69,7 +69,7 @@ -- cgit v1.2.3