From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 8 Mar 2016 17:02:34 +0100 Subject: manage assets through npm first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version --- .../views/themes/baggy/Config/index.html.twig | 84 ++++++++++++++++++ .../views/themes/baggy/Entry/entries.html.twig | 27 +++++- .../views/themes/baggy/Entry/entry.html.twig | 99 +++------------------- .../views/themes/baggy/Entry/pager.html.twig | 3 +- .../views/themes/baggy/Static/about.html.twig | 1 - .../Resources/views/themes/baggy/layout.html.twig | 16 +--- 6 files changed, 129 insertions(+), 101 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index c51f90d2..f1ed63c0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -204,6 +204,90 @@ {{ form_rest(form.new_tagging_rule) }} +
+
+

{{ 'config.form_rules.faq.title'|trans }}

+ +
{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}
+

{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}

+ +
{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}
+

{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}

+ +
{{ 'config.form_rules.faq.variables_available_title'|trans }}
+

+ {{ 'config.form_rules.faq.variables_available_description'|trans }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'config.form_rules.faq.variable_description.label'|trans }}{{ 'config.form_rules.faq.meaning'|trans }}{{ 'config.form_rules.faq.operator_description.label'|trans }}{{ 'config.form_rules.faq.meaning'|trans }}
title{{ 'config.form_rules.faq.variable_description.title'|trans }}<={{ 'config.form_rules.faq.operator_description.less_than'|trans }}
url{{ 'config.form_rules.faq.variable_description.url'|trans }}<{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}
isArchived{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}=>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}
isStarred{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}
content{{ 'config.form_rules.faq.variable_description.content'|trans }}={{ 'config.form_rules.faq.operator_description.equal_to'|trans }}
language{{ 'config.form_rules.faq.variable_description.language'|trans }}!={{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}
mimetype{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}OR{{ 'config.form_rules.faq.operator_description.or'|trans }}
readingTime{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}AND{{ 'config.form_rules.faq.operator_description.and'|trans }}
domainName{{ 'config.form_rules.faq.variable_description.domainName'|trans }}matches{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}
+

+
+
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index a2caaebf..8636e3be 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -34,7 +34,27 @@
{% endfor %} -
+
+ {{ form_widget(form.isUnread) }} + {{ form_label(form.isUnread) }} +
+
{{ form_widget(form.previewPicture) }} {{ form_label(form.previewPicture) }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 5a800332..8c06cf11 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -5,7 +5,7 @@ {% block content %}
-

{{ entry.title|raw }} ✎

+

{{ entry.title|raw }} ✎

@@ -30,10 +30,10 @@
{% set nbAnnotations = entry.annotations | length %} - {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} + comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} + -
+ {% endif %} {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} {% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig index 524a1d23..739e1486 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig @@ -9,7 +9,7 @@ {% endblock %} -- cgit v1.2.3 From 97e7ad4dc7bfc26cea334bc880a39e388d6848f3 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 23 Aug 2016 07:36:43 +0200 Subject: Remove duplicate pager on baggy --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index a07285bd..9380e67a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -19,18 +19,6 @@ {% block content %} {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} - {% block pager %} -
-
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
- -
- {% endblock %} - {% for entry in entries %}

{{ entry.title|raw }}

@@ -173,6 +161,4 @@ {% endif %} - - {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} {% endblock %} -- cgit v1.2.3 From d0545b6bd6edc38bf06604900b1e20a60e7c8583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 10 Apr 2016 21:48:11 +0200 Subject: Add migration --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index ce47a677..61b871f0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -17,6 +17,9 @@
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • + {% if craue_setting('share_public') %} +
  • public
    • + {% endif %} {% if craue_setting('share_twitter') %}
    • {% endif %} {% if craue_setting('share_mail') %}
    • {% endif %} {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} -- cgit v1.2.3 From 222e09f140099f3b1b8f6db1846d35e6810d43a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 13 Apr 2016 22:26:02 +0200 Subject: Add Cache on Share Action --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 61b871f0..aa3d6cdc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -17,9 +17,7 @@
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • - {% if craue_setting('share_public') %} -
  • public
    • - {% endif %} + {% if craue_setting('share_public') %}
  • public
    • {% endif %} {% if craue_setting('share_twitter') %}
    • {% endif %} {% if craue_setting('share_mail') %}
    • {% endif %} {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} -- cgit v1.2.3 From 3377c938f8e5bd6af2cd4430494f39a517a7e910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 27 Apr 2016 21:31:12 +0200 Subject: Add translations --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index aa3d6cdc..725295c3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -17,7 +17,7 @@
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • - {% if craue_setting('share_public') %}
  • public
    • {% endif %} + {% if craue_setting('share_public') %}
  • {{ 'entry.view.left_menu.public_link'|trans }}
    • {% endif %} {% if craue_setting('share_twitter') %}
    • {% endif %} {% if craue_setting('share_mail') %}
    • {% endif %} {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} -- cgit v1.2.3 From 3e860ff1ce19d045b4d5af4e30bd3d56300a683c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 23 Aug 2016 16:55:49 +0200 Subject: Change links on baggy theme --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 725295c3..6c46f91f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -17,7 +17,7 @@
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • - {% if craue_setting('share_public') %}
  • {{ 'entry.view.left_menu.public_link'|trans }}
    • {% endif %} + {% if craue_setting('share_public') %}
  • {{ 'entry.view.left_menu.public_link'|trans }}
  • {{ 'entry.view.left_menu.delete_public_link'|trans }}
    • {% endif %} {% if craue_setting('share_twitter') %}
    • {% endif %} {% if craue_setting('share_mail') %}
    • {% endif %} {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} -- cgit v1.2.3 From add0e14cffa6d36affc5fe2e815d069a1ecfc258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 26 Aug 2016 21:20:02 +0200 Subject: Fixed print view for baggy theme --- .../views/themes/baggy/Entry/entry.html.twig | 43 ++++++++++++---------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 6c46f91f..675168bb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -30,29 +30,32 @@
  • {{ 'entry.view.left_menu.problem.label'|trans }}
    • -
    - {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} -
    -
    - {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} - {% if readingTime > 0 %} - {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }} - {% else %} - {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} - {% endif %} -
    +
    +
    + {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} +
    - {% set nbAnnotations = entry.annotations | length %} - comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} - + + {% set nbAnnotations = entry.annotations | length %} + comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} + +
    {% if entry.previewPicture is not null %}
    {{ entry.title|raw }}
    {% endif %} -- cgit v1.2.3 From 74d68fbf25e313ef5cc8af17812387a8ae813df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 26 Aug 2016 21:26:21 +0200 Subject: Changed where page title is displayed --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 9380e67a..1554cce4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -1,19 +1,7 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% set currentRoute = app.request.attributes.get('_route') %} - - {% if currentRoute == 'starred' %} - {{ 'entry.page_titles.starred'|trans }} - {% elseif currentRoute == 'archive' %} - {{ 'entry.page_titles.archived'|trans }} - {% elseif currentRoute == 'all' %} - {{ 'entry.page_titles.filtered'|trans }} - {% elseif currentRoute == 'tag_entries' %} - {{ 'entry.page_titles.filtered_tags'|trans }} - {% else %} - {{ 'entry.page_titles.unread'|trans }} - {% endif %} + {% include "@WallabagCore/themes/_title.html.twig" %} {% endblock %} {% block content %} -- cgit v1.2.3 From b6520f0b15ac35215e2d94d16a31ea971874dce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 26 Aug 2016 16:55:41 +0200 Subject: Add untagged entries Fix #1631 --- .../CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig index 739e1486..50043907 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig @@ -12,4 +12,8 @@
  • {{tag.label}} ({{ tag.entries.getValues | length }})
    • {% endfor %} + + {% endblock %} -- cgit v1.2.3 From 209ec7cedd8bcf050223b869a54940c9f2d03899 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 1 Sep 2016 12:07:35 +0200 Subject: Add Readability to Quickstart page --- .../CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig index b3d3d5a0..ea1c1cbe 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig @@ -39,6 +39,7 @@
  • {{ 'quickstart.migrate.pocket'|trans }}
  • {{ 'quickstart.migrate.wallabag_v1'|trans }}
  • {{ 'quickstart.migrate.wallabag_v2'|trans }}
    • +
  • {{ 'quickstart.migrate.readability'|trans }}

    • {{ 'quickstart.developer.title'|trans }}

    -- cgit v1.2.3 From 458beef0a95d5c56ac1d8d753078222d471d9af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 15 Sep 2016 15:32:01 +0200 Subject: Fixed label for mark as read link in entry view Fix #2286 --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 675168bb..bec4b70f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -13,7 +13,13 @@
  • {{ 'entry.view.left_menu.set_as_read'|trans }}
  • {{ entry.domainName|removeWww }}
  • {{ 'entry.view.left_menu.re_fetch_content'|trans }}
    • -
  • {% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}
    • + + {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %} + {% if entry.isArchived == 0 %} + {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %} + {% endif %} + +
  • {{ markAsReadLabel|trans }}
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • -- cgit v1.2.3 From ebe0787e093f4f2934430033015d6ebad1c64dca Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 16 Sep 2016 22:22:25 +0200 Subject: Moved Pocket token to user config --- .../Resources/views/themes/baggy/Config/index.html.twig | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index f89265d4..6446cf2c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -44,6 +44,18 @@
    +
    +
    + {{ form_label(form.config.pocket_consumer_key) }} + {{ form_errors(form.config.pocket_consumer_key) }} + {{ form_widget(form.config.pocket_consumer_key) }} +

    + » + https://getpocket.com/developer/docs/authentication +

    +
    +
    + {{ form_rest(form.config) }} -- cgit v1.2.3 From 389d55f86b962a448d7a5052a5c0cf438d161c41 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 21 Sep 2016 19:51:19 +0200 Subject: fix feeds not syncing on android app --- .../Resources/views/themes/baggy/Entry/entries.xml.twig | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig index 6cabcf44..288bb54f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig @@ -16,15 +16,7 @@ {{ entry.url }} {{ entry.createdAt|date('D, d M Y H:i:s') }} - 0 -%} - {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} - {%- else -%} - {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} - {%- endif %} - - {{ entry.content|raw -}} - ]]> + 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]> -- cgit v1.2.3 From c146f6940a176142084b4fc3c610d13aca60d90e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 28 Sep 2016 10:30:18 +0200 Subject: Assets work * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231 --- .../views/themes/baggy/Entry/entries.html.twig | 4 ++-- .../Resources/views/themes/baggy/Entry/entry.html.twig | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 1554cce4..8d841b4c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -67,7 +67,7 @@ {% if form is not null %} - + {% endif %} {% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index bec4b70f..be1e3647 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -82,22 +82,4 @@ "entryId": "{{ entry.id }}" } - - {% endblock %} -- cgit v1.2.3 From 2ff9991a1dfac0d3463662b96f529aac70c66f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 30 Sep 2016 09:38:08 +0200 Subject: Removed duplicated templates files --- .../views/themes/baggy/Developer/client.html.twig | 37 ----- .../baggy/Developer/client_parameters.html.twig | 23 --- .../themes/baggy/Developer/howto_app.html.twig | 63 -------- .../views/themes/baggy/Developer/index.html.twig | 69 --------- .../views/themes/baggy/Entry/entries.html.twig | 2 +- .../views/themes/baggy/Entry/entries.xml.twig | 26 ---- .../views/themes/baggy/Static/about.html.twig | 169 --------------------- .../views/themes/baggy/Static/howto.html.twig | 28 ---- .../views/themes/baggy/Static/quickstart.html.twig | 67 -------- 9 files changed, 1 insertion(+), 483 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig deleted file mode 100644 index 8a5da71a..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %} - -{% block content %} -
    -
    -
    - -
    -

    {{ 'developer.client.page_description'|trans }}

    - {{ form_start(form) }} - {{ form_errors(form) }} - -
    - {{ form_label(form.name) }} - {{ form_errors(form.name) }} - {{ form_widget(form.name) }} -
    - -
    - {{ form_label(form.redirect_uris) }} - {{ form_errors(form.redirect_uris) }} - {{ form_widget(form.redirect_uris) }} -
    - - {{ 'developer.client.action_back'|trans }} - {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - - {{ form_rest(form) }} -
    - -
    -
    -
    - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig deleted file mode 100644 index b498cceb..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client_parameters.html.twig +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %} - -{% block content %} -
    -
    -
    -
    -

    {{ 'developer.client_parameter.page_description'|trans }}

    -
      -
    • {{ 'developer.client_parameter.field_name'|trans }}: 
      {{ client_name }}
      • -
    • {{ 'developer.client_parameter.field_id'|trans }}: 
      {{ client_id }}
      • -
    • {{ 'developer.client_parameter.field_secret'|trans }}: 
      {{ client_secret }}
      • -
    - - {{ 'developer.client_parameter.back'|trans }} - {{ 'developer.client_parameter.read_howto'|trans }} -
    -
    -
    -
    -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig deleted file mode 100644 index acbc2c88..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/howto_app.html.twig +++ /dev/null @@ -1,63 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %} - -{% block css %} - {{ parent() }} - -{% endblock %} - -{% block content %} -
    -
    -
    - -
    -

    {{ 'developer.howto.description.paragraph_1'|trans|raw }}

    -

    {{ 'developer.howto.description.paragraph_2'|trans }}

    -

    {{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}

    -

    {{ 'developer.howto.description.paragraph_4'|trans }}

    -

    - 

    http POST http://v2.wallabag.org/oauth/v2/token \
-    grant_type=password \
-    client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
-    client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
-    username=yourUsername \
-    password=yourPassw0rd
    -

    -

    {{ 'developer.howto.description.paragraph_5'|trans }}

    -

    - 

    HTTP/1.1 200 OK
-Cache-Control: no-store, private
-Connection: close
-Content-Type: application/json
-Date: Tue, 06 Oct 2015 18:24:03 GMT
-Host: localhost:8000
-Pragma: no-cache
-X-Debug-Token: be00a1
-X-Debug-Token-Link: /profiler/be00a1
-X-Powered-By: PHP/5.5.9-1ubuntu4.13
-{
-    "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw",
-    "expires_in": 3600,
-    "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg",
-    "scope": null,
-    "token_type": "bearer"
-}
    -

    -

    {{ 'developer.howto.description.paragraph_6'|trans }}

    -

    - 

    http GET http://v2.wallabag.org/api/entries.json \
-    "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"
    -

    -

    {{ 'developer.howto.description.paragraph_7'|trans }}

    -

    {{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}

    -

    {{ 'developer.howto.back'|trans }}

    -
    - -
    -
    -
    - - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig deleted file mode 100644 index 3430c0d4..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig +++ /dev/null @@ -1,69 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'developer.page_title'|trans }}{% endblock %} - -{% block content %} -
    -
    -
    - -
    -

    {{ 'developer.welcome_message'|trans }}

    - -

    {{ 'developer.documentation'|trans }}

    - - - -

    {{ 'developer.clients.title'|trans }}

    - - -

    {{ 'developer.existing_clients.title'|trans }}

    - {% if clients %} -
      - {% for client in clients %} -
    • -
      {{ client.name }} - #{{ client.id }}
      -
      - - - - - - - - - - - - - - - - - -
      {{ 'developer.existing_clients.field_id'|trans }}{{ client.id }}_{{ client.randomId }}
      {{ 'developer.existing_clients.field_secret'|trans }}{{ client.secret }}
      {{ 'developer.existing_clients.field_uris'|trans }}{{ client.redirectUris|json_encode() }}
      {{ 'developer.existing_clients.field_grant_types'|trans }}{{ client.allowedGrantTypes|json_encode() }}
      -

      - {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}
      - {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}
      - {{ 'developer.remove.action'|trans({'%name%': client.name }) }} -

      -
      -
      • - {% endfor %} -
    - {% else %} - {{ 'developer.existing_clients.no_client'|trans }} - {% endif %} -
    - -
    -
    -
    - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 1554cce4..ffc5bec6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -1,7 +1,7 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% include "@WallabagCore/themes/_title.html.twig" %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} {% endblock %} {% block content %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig deleted file mode 100644 index 288bb54f..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - - wallabag — {{type}} feed - {{ url('unread') }} - {{ "now"|date('D, d M Y H:i:s') }} - wallabag - wallabag {{type}} elements - - {% for entry in entries %} - - - <![CDATA[{{ entry.title }}]]> - wallabag - {{ entry.url }} - {{ entry.url }} - {{ entry.createdAt|date('D, d M Y H:i:s') }} - - 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]> - - - - {% endfor %} - - - diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig deleted file mode 100644 index 918249dc..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ /dev/null @@ -1,169 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'about.page_title'|trans }}{% endblock %} - -{% block content %} -

    {{ 'about.top_menu.who_behind_wallabag'|trans }}

    - -
    -
    {{ 'about.who_behind_wallabag.developped_by'|trans }}
    -
    Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
    -
    Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
    -
    Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
    - -
    {{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}
    - -
    {{ 'about.who_behind_wallabag.project_website'|trans }}
    -
    https://www.wallabag.org
    - -
    {{ 'about.who_behind_wallabag.license'|trans }}: MIT
    - -
    {{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}
    -
    - -

    {{ 'about.top_menu.getting_help'|trans }}

    - -
    -
    {{ 'about.getting_help.documentation'|trans }}
    -
    english
    -
    français
    - -
    {{ 'about.getting_help.bug_reports'|trans }}
    -
    {{ 'about.getting_help.support'|trans|raw }}
    -
    - -

    {{ 'about.top_menu.helping'|trans }}

    - -

    {{ 'about.helping.description'|trans }}

    - -
    -
    {{ 'about.helping.by_contributing_2'|trans }} {{ 'about.helping.by_contributing'|trans }}
    -
    {{ 'about.helping.by_paypal'|trans }}
    -
    - -

    {{ 'about.top_menu.contributors'|trans }}

    -

    {{ 'about.contributors.description'|trans }}

    - -

    {{ 'about.top_menu.third_party'|trans }}

    -

    {{ 'about.third_party.description'|trans }}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ 'about.third_party.package'|trans }}{{ 'about.third_party.license'|trans }}
    behat/transliteratorArtistic 1.0
    CraueConfigBundleMIT
    doctrine/annotationsMIT
    doctrine/cacheMIT
    doctrine/collectionsMIT
    doctrine/commonMIT
    doctrine/dbalMIT
    doctrine/doctrine-bundleMIT
    doctrine/doctrine-cache-bundleMIT
    doctrine/doctrine-migrations-bundleMIT
    doctrine/inflectorMIT
    doctrine/instantiatorMIT
    doctrine/lexerMIT
    doctrine/migrationsLGPL-2.1
    doctrine/ormMIT
    friendsofsymfony/oauth-server-bundleMIT
    friendsofsymfony/oauth2-phpMIT
    friendsofsymfony/rest-bundleMIT
    friendsofsymfony/user-bundleMIT
    gedmo/doctrine-extensionsMIT
    grandt/binstringLGPL-2.1
    grandt/phpepubLGPL-2.1
    grandt/phpresizegifLGPL-2.1
    grandt/phpzipmergeLGPL-2.1
    grandt/relativepathLGPL-2.1
    guzzlehttp/guzzleMIT
    guzzlehttp/ringphpMIT
    guzzlehttp/streamsMIT
    hoa/compilerBSD-3-Clause
    hoa/consistencyBSD-3-Clause
    hoa/eventBSD-3-Clause
    hoa/exceptionBSD-3-Clause
    hoa/fileBSD-3-Clause
    hoa/iteratorBSD-3-Clause
    hoa/mathBSD-3-Clause
    hoa/protocolBSD-3-Clause
    hoa/regexBSD-3-Clause
    hoa/rulerBSD-3-Clausev -
    hoa/streamBSD-3-Clause
    hoa/ustringBSD-3-Clause
    hoa/visitorBSD-3-Clause
    hoa/zformatBSD-3-Clause
    htmlawed/htmlawedGPL-2.0+ or LGPL-3.0
    incenteev/composer-parameter-handlerMIT
    j0k3r/grabyAGPL-3.0
    j0k3r/graby-site-configAGPL-3.0
    j0k3r/php-readabilityApache-2.0
    j0k3r/safecurlMIT
    jdorn/sql-formatterMIT
    jms/metadataApache
    jms/parser-libApache2
    jms/serializerApache2
    jms/serializer-bundleApache2
    kphoen/rulerzMIT
    kphoen/rulerz-bundleMIT
    kriswallsmith/asseticMIT
    lexik/form-filter-bundleMIT
    liip/theme-bundleMIT
    mgargano/simplehtmldomMIT
    michelf/php-markdownBSD-3-Clause
    monolog/monologMIT
    neitanod/forceutf8BSD-3-Clause
    nelmio/api-doc-bundleMIT
    nelmio/cors-bundleMIT
    ocramius/proxy-managerMIT
    pagerfanta/pagerfantaMIT
    paragonie/random_compatMIT
    phpcollection/phpcollectionApache2
    phpoption/phpoptionApache2
    phpzip/phpzipLGPL-2.1
    psr/logMIT
    react/promiseMIT
    scheb/two-factor-bundleMIT
    sensio/distribution-bundleMIT
    sensio/framework-extra-bundleMIT
    sensiolabs/security-checkerMIT
    simplepie/simplepieBSD-3-Clause
    smalot/pdfparserGPL-3.0
    sonata-project/google-authenticatorMIT
    stof/doctrine-extensions-bundleMIT
    swiftmailer/swiftmailerMIT
    symfony/assetic-bundleMIT
    symfony/monolog-bundleMIT
    All of SymfonyMIT-licenced
    tecnickcom/tcpdfLGPLv3
    twig/extensionsMIT
    twig/twigBSD-3-Clause
    wallabag/php-mobiApache-2.0
    willdurand/hateoasMIT
    willdurand/hateoas-bundleMIT
    willdurand/jsonp-callback-validatorMIT
    willdurand/negotiationMIT
    zendframework/zend-codeBSD-3-Clause
    zendframework/zend-eventmanagerBSD-3-Clause
    doctrine/data-fixturesMIT
    doctrine/doctrine-fixtures-bundleMIT
    phpdocumentor/reflection-docblockMIT
    phpspec/prophecyMIT
    phpunit/php-code-coverageBSD-3-Clause
    phpunit/php-file-iteratorBSD-3-Clause
    phpunit/php-text-templateBSD-3-Clause
    phpunit/php-timerBSD-3-Clause
    phpunit/php-token-streamBSD-3-Clause
    phpunit/phpunitBSD-3-Clause
    phpunit/phpunit-mock-objectsBSD-3-Clause
    sebastian/comparatorBSD-3-Clause
    sebastian/diffBSD-3-Clause
    sebastian/environmentBSD-3-Clause
    sebastian/exporterBSD-3-Clause
    sebastian/global-stateBSD-3-Clause
    sebastian/recursion-contextBSD-3-Clause
    sebastian/versionBSD-3-Clause
    sensio/generator-bundleMIT
    symfony/phpunit-bridgeMIT
    -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig deleted file mode 100644 index b529a0ac..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'howto.page_title'|trans }}{% endblock %} - -{% block content %} -

    {{ 'howto.page_title'|trans }}

    - -

    {{ 'howto.page_description'|trans }}

    - -

    {{ 'howto.top_menu.browser_addons'|trans }}

    - -

    {{ 'howto.top_menu.mobile_apps'|trans }}

    - -

    {{ 'howto.top_menu.bookmarklet'|trans }}

    -

    - {{ 'howto.bookmarklet.description'|trans }} - {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} - -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig deleted file mode 100644 index ea1c1cbe..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %} - -{% block content %} - -

    {{ 'quickstart.intro.title'|trans }}

    -

    {{ 'quickstart.intro.paragraph_1'|trans }}

    -

    {{ 'quickstart.intro.paragraph_2'|trans }}

    - -

    {{ 'quickstart.configure.title'|trans }}

    - - - {% if is_granted('ROLE_SUPER_ADMIN') %} -

    {{ 'quickstart.admin.title'|trans }}

    -

    {{ 'quickstart.admin.description'|trans }}

    - - {% endif %} - -

    {{ 'quickstart.first_steps.title'|trans }}

    - - -

    {{ 'quickstart.migrate.title'|trans }}

    -

    {{ 'quickstart.migrate.description'|trans }}

    - - -

    {{ 'quickstart.developer.title'|trans }}

    - - -

    {{ 'quickstart.docs.title'|trans }}

    - - -

    {{ 'quickstart.support.title'|trans }}

    -

    {{ 'quickstart.support.description'|trans }}

    - - -{% endblock %} -- cgit v1.2.3 From 40e219622a2c416ab36cb39b26a5e1354e4438cc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 1 Oct 2016 14:51:54 +0200 Subject: Customize errors templates All error goes to the same template which only display the error message and the status code. --- .../views/themes/baggy/Exception/error.html.twig | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig new file mode 100644 index 00000000..b52634fd --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Exception/error.html.twig @@ -0,0 +1,24 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'error.page_title'|trans }}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} +{% block header %}{% endblock %} + +{% block content %} +
    +
    +
    +
    wallabag logo
    +

    {{ status_code }}: {{ status_text }}

    +

    {{ exception.message }}

    +
    +
    +
    +{% endblock %} + +{% block footer %} +{% endblock %} -- cgit v1.2.3 From bf3dc999e7b25888460faff2251f75e4a79491c4 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 1 Oct 2016 16:47:48 +0200 Subject: Add ability to edit a tagging rule --- .../CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 6446cf2c..dd4f7b00 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -191,6 +191,7 @@ « {{ tagging_rule.rule }} » {{ 'config.form_rules.then_tag_as_label'|trans }} « {{ tagging_rule.tags|join(', ') }} » + ✎ {% endfor %} -- cgit v1.2.3 From 152fcccd4489378a8ed9391e3e191df4aeba6435 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 30 Sep 2016 20:09:06 +0200 Subject: Add users management UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) --- .../views/themes/baggy/Config/index.html.twig | 42 ---------------------- 1 file changed, 42 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index dd4f7b00..ff7ef73a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -302,46 +302,4 @@ - - {% if is_granted('ROLE_SUPER_ADMIN') %} -

    {{ 'config.tab_menu.new_user'|trans }}

    - - {{ form_start(form.new_user) }} - {{ form_errors(form.new_user) }} - -
    -
    - {{ form_label(form.new_user.username) }} - {{ form_errors(form.new_user.username) }} - {{ form_widget(form.new_user.username) }} -
    -
    - -
    -
    - {{ form_label(form.new_user.plainPassword.first) }} - {{ form_errors(form.new_user.plainPassword.first) }} - {{ form_widget(form.new_user.plainPassword.first) }} -
    -
    - -
    -
    - {{ form_label(form.new_user.plainPassword.second) }} - {{ form_errors(form.new_user.plainPassword.second) }} - {{ form_widget(form.new_user.plainPassword.second) }} -
    -
    - -
    -
    - {{ form_label(form.new_user.email) }} - {{ form_errors(form.new_user.email) }} - {{ form_widget(form.new_user.email) }} -
    -
    - - {{ form_rest(form.new_user) }} - {% endif %} - {% endblock %} -- cgit v1.2.3 From 03141f9b9548bca117136ba5bdcf811d9e59b155 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 1 Oct 2016 17:46:44 +0200 Subject: Cleanup & add link on baggy menu --- src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 4fd4d317..30fd0d85 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -42,6 +42,7 @@ -->
  • {{ 'menu.left.config'|trans }}
    • {% if is_granted('ROLE_SUPER_ADMIN') %} +
  • {{ 'menu.left.users_management'|trans }}
  • {{ 'menu.left.internal_settings'|trans }}
    • {% endif %}
  • {{ 'menu.left.import'|trans }}
    • -- cgit v1.2.3 From a494c33ef7e574e68ab5bb83d0bdbd67348af0ef Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 3 Oct 2016 23:08:26 +0200 Subject: Basically, fix everything * Remove install.sh * Assets are now provided * Icons font issues are fixed --- .../views/themes/baggy/Entry/entry.html.twig | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index be1e3647..bead6809 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -21,12 +21,15 @@
  • {{ markAsReadLabel|trans }}
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
    • -
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
    • +
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • - {% if craue_setting('share_public') %}
  • {{ 'entry.view.left_menu.public_link'|trans }}
  • {{ 'entry.view.left_menu.delete_public_link'|trans }}
    • {% endif %} + {% if craue_setting('share_public') %} +
  • {{ 'entry.view.left_menu.public_link'|trans }}
    • +
  • {{ 'entry.view.left_menu.delete_public_link'|trans }}
    • + {% endif %} {% if craue_setting('share_twitter') %}
    • {% endif %} {% if craue_setting('share_mail') %}
    • {% endif %} - {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} + {% if craue_setting('share_shaarli') %}
  • shaarli
    • {% endif %} {% if craue_setting('share_diaspora') %}
  • diaspora
    • {% endif %} {% if craue_setting('carrot') %}
  • Carrot
    • {% endif %} {% if craue_setting('show_printlink') %}
  • {{ 'entry.view.left_menu.print'|trans }}
    • {% endif %} @@ -38,18 +41,17 @@
    -
    - {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }} -
    + {{ entry.createdAt|date('Y-m-d') }} + -
    + {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} {% if readingTime > 0 %} - {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }} + {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} {% else %} - {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} + {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} {% endif %} -
    + {% set nbAnnotations = entry.annotations | length %} comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }} -- cgit v1.2.3 From 3e85e91159c506586970e00e3614679879342de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 4 Oct 2016 15:00:47 +0200 Subject: Fixed calendar icon position with baggy theme --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index bead6809..9a5c8fe0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -41,7 +41,8 @@
    - {{ entry.createdAt|date('Y-m-d') }} + + {{ entry.createdAt|date('Y-m-d') }} -- cgit v1.2.3 From 645c0d5bce85be0dfcb7b58c31ce96a47ceb99e3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 20:11:10 +0200 Subject: better tags on baggy --- .../CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 6 +++--- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 1c0430e8..3af88b23 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -29,16 +29,16 @@
  • {{ entry.domainName|removeWww }}
    • {% if entry.previewPicture is null %} -

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

      {% for tag in entry.tags %} -
    • {{ tag.label }}
      • +
    • {{ tag.label }}
      • {% endfor %}
    +

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

    {% else %}
      {% for tag in entry.tags | slice(0, 3) %} -
    • {{ tag.label }}
      • +
    • {{ tag.label }}
      • {% endfor %}
    {{ entry.title|raw }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 9a5c8fe0..b1aabf9b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -57,9 +57,11 @@ {% set nbAnnotations = entry.annotations | length %} comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}