From f19f9f62d13c62f18884e8bd0fa67403e8cad8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Sun, 11 Oct 2015 17:30:58 +0200 Subject: Add a form to create tagging rules --- .../views/themes/material/Config/index.html.twig | 31 +++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 8f121a2b..d27a8ca6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -15,8 +15,9 @@
  • {% trans %}RSS{% endtrans %}
  • {% trans %}User information{% endtrans %}
  • {% trans %}Password{% endtrans %}
    • +
  • {% trans %}Tags{% endtrans %}
    • {% if is_granted('ROLE_SUPER_ADMIN') %} -
  • {% trans %}Add a user{% endtrans %}
    • +
  • {% trans %}Add a user{% endtrans %}
    • {% endif %} @@ -183,6 +184,34 @@ +
    +
    + {{ form_errors(form.pwd) }} + +
    +
    + {{ form_label(form.new_tagging_rule.rule) }} + {{ form_errors(form.new_tagging_rule.rule) }} + {{ form_widget(form.new_tagging_rule.rule) }} +
    +
    + +
    +
    + {{ form_label(form.new_tagging_rule.tags) }} + {{ form_errors(form.new_tagging_rule.tags) }} + {{ form_widget(form.new_tagging_rule.tags) }} +
    +
    + + + + +
    +
    + {% if is_granted('ROLE_SUPER_ADMIN') %}
    {{ form_start(form.new_user) }} -- cgit v1.2.3 From 981cacf7b97192ee5086bb94478a81bbc4246928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Sun, 11 Oct 2015 17:37:19 +0200 Subject: Display the tagging rules in the config --- .../Resources/views/themes/material/Config/index.html.twig | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index d27a8ca6..1a8526f3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -185,6 +185,18 @@
    +
    +
    +
      + {% for tagging_rule in app.user.config.taggingRules %} +
    • + if « {{ tagging_rule.rule }} » then tag as « {{ tagging_rule.tags|join(', ') }} » +
      • + {% endfor %} +
    +
    +
    +
    {{ form_errors(form.pwd) }} -- cgit v1.2.3 From e9fbd2d12e94c96d540f6f98758f6bc92a65e7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Sun, 11 Oct 2015 17:46:53 +0200 Subject: Add a table explaining the available variables --- .../views/themes/material/Config/index.html.twig | 57 +++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 1a8526f3..885718f8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -220,8 +220,63 @@ - + +
    +
    +

    + {% trans %}The following variables can be used to create tagging rules:{% endtrans %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    VariableMeaning
    title{% trans %}Title of the entry{% endtrans %}
    url{% trans %}URL of the entry{% endtrans %}
    isArchived{% trans %}Whether the entry is archived or not{% endtrans %}
    isStared{% trans %}Whether the entry is starred or not{% endtrans %}
    content{% trans %}The entry's content{% endtrans %}
    language{% trans %}The entry's language{% endtrans %}
    mimetype{% trans %}The entry's mime-type{% endtrans %}
    readingTime{% trans %}The estimated entry's reading time, in minutes{% endtrans %}
    domainName{% trans %}The domain name of the entry{% endtrans %}
    +

    +
    +
    {% if is_granted('ROLE_SUPER_ADMIN') %} -- cgit v1.2.3 From 71ef0ed2542e3dff3b64910ef9e3543fa568ffdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Wed, 14 Oct 2015 20:24:02 +0200 Subject: =?UTF-8?q?Rename=20the=20=C2=AB=20Tags=20=C2=BB=20tab=20to=20?= =?UTF-8?q?=C2=AB=20Tagging=20rules=20=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 885718f8..993c5826 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -15,7 +15,7 @@
  • {% trans %}RSS{% endtrans %}
  • {% trans %}User information{% endtrans %}
  • {% trans %}Password{% endtrans %}
    • -
  • {% trans %}Tags{% endtrans %}
    • +
  • {% trans %}Tagging rules{% endtrans %}
    • {% if is_granted('ROLE_SUPER_ADMIN') %}
  • {% trans %}Add a user{% endtrans %}
    • {% endif %} -- cgit v1.2.3 From 52e423f30761561fa2ad82c708d9fa9186562b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Sun, 25 Oct 2015 10:45:15 +0100 Subject: Provide a way to delete tagging rules --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 993c5826..1457fe51 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -191,6 +191,9 @@ {% for tagging_rule in app.user.config.taggingRules %}
  • if « {{ tagging_rule.rule }} » then tag as « {{ tagging_rule.tags|join(', ') }} » + + +
    • {% endfor %} -- cgit v1.2.3 From 9b88658c047514a75bc9a9e3578cbeba32c5c5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Sun, 25 Oct 2015 14:34:43 +0100 Subject: Update baggy theme --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 1457fe51..810c02fa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -200,8 +200,8 @@ -
    - {{ form_errors(form.pwd) }} + + {{ form_errors(form.new_tagging_rule) }}
    -- cgit v1.2.3 From 5c514b0be320d683c22a3044d875a5e4b5fe6ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Wed, 11 Nov 2015 17:06:36 +0100 Subject: Improve the tagging rules documentation --- .../views/themes/material/Config/index.html.twig | 50 ++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 810c02fa..a6fd2f11 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -227,14 +227,40 @@
    +

    {% trans %}FAQ{% endtrans %}

    + +
    {% trans %}What does « tagging rules » mean?{% endtrans %}
    +

    + {% trans %} + They are rules used by Wallabag to automatically tag new entries.
    + Each time a new entry is added, all the tagging rules will be used to add + the tags you configured, thus saving you the trouble to manually classify + your entries. + {% endtrans %} +

    + +
    {% trans %}How do I use them?{% endtrans %}
    +

    + {% trans %} + Let assume you want to tag new entries as « short reading » when the reading time is inferior to 3 minutes.
    + In that case, you should put « readingTime <= 3 » in the Rule field and « short reading » in the Tags + field.
    + Several tags can added simultaneously by separating them by a comma: « short reading, must read »
    + Complex rules can be written by using predefined operators: if « readingTime >= 5 AND domainName = "github.com" » then tag as « long reading, github » + {% endtrans %} +

    + +
    {% trans %}Which variables and operators can I use to write rules?{% endtrans %}

    - {% trans %}The following variables can be used to create tagging rules:{% endtrans %} + {% trans %}The following variables and operators can be used to create tagging rules:{% endtrans %} - - + + + + @@ -242,38 +268,56 @@ + + + + + + + + + + + + + + + + + +
    VariableMeaning{% trans %}Variable{% endtrans %}{% trans %}Meaning{% endtrans %}{% trans %}Operator{% endtrans %}{% trans %}Meaning{% endtrans %}
    title {% trans %}Title of the entry{% endtrans %}<={% trans %}Less than…{% endtrans %}
    url {% trans %}URL of the entry{% endtrans %}<{% trans %}Strictly less than…{% endtrans %}
    isArchived {% trans %}Whether the entry is archived or not{% endtrans %}=>{% trans %}Greater than…{% endtrans %}
    isStared {% trans %}Whether the entry is starred or not{% endtrans %}>{% trans %}Strictly greater than…{% endtrans %}
    content {% trans %}The entry's content{% endtrans %}={% trans %}Equal to…{% endtrans %}
    language {% trans %}The entry's language{% endtrans %}!={% trans %}Not equal to…{% endtrans %}
    mimetype {% trans %}The entry's mime-type{% endtrans %}OR{% trans %}One rule or another{% endtrans %}
    readingTime {% trans %}The estimated entry's reading time, in minutes{% endtrans %}AND{% trans %}One rule and another{% endtrans %}
    domainName {% trans %}The domain name of the entry{% endtrans %}
    -- cgit v1.2.3 From aeff8aa765579259c1427dc469ff78ebdebfc72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Fri, 13 Nov 2015 20:57:46 +0100 Subject: Document the matches operator in the FAQ --- .../Resources/views/themes/material/Config/index.html.twig | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index a6fd2f11..e08393a2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -316,8 +316,13 @@ domainName {% trans %}The domain name of the entry{% endtrans %} - - + matches + + {% trans %} + Tests that a subject is matches a search (case-insensitive).
    + Example: title matches "football" + {% endtrans %} + -- cgit v1.2.3 From c13eda461f88ba16c88d7c398322a59b294e6c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Mon, 16 Nov 2015 14:01:43 +0100 Subject: Clean the tagging rule creation form --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index e08393a2..d060311d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -200,7 +200,7 @@

    - + {{ form_start(form.new_tagging_rule) }} {{ form_errors(form.new_tagging_rule) }}
    @@ -332,7 +332,7 @@
    {% if is_granted('ROLE_SUPER_ADMIN') %} -
    +
    {{ form_start(form.new_user) }} {{ form_errors(form.new_user) }} -- cgit v1.2.3