From 64f81bc31699ed239e4becec1cfa7ebc0bef2b5a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 31 Mar 2017 20:21:41 +0200 Subject: Adds Webpack support and removes the use for Grunt Signed-off-by: Thomas Citharel use scss Signed-off-by: Thomas Citharel fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes --- .../views/themes/material/Entry/entries.html.twig | 4 ++-- .../Resources/views/themes/material/Entry/entry.html.twig | 15 ++++++--------- .../Resources/views/themes/material/layout.html.twig | 10 ++++++---- 3 files changed, 14 insertions(+), 15 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 5fca53ae..b2d91c9c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -45,7 +45,7 @@ {% endif %} -
+
{% set currentRoute = app.request.attributes.get('_route') %} {% set currentTag = '' %} {% if tag is defined %} @@ -68,7 +68,7 @@ {% if form is not null %} -
+

{{ 'entry.filters.title'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 3c4ad024..227dad94 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -125,8 +125,7 @@ {% endif %} {% if craue_setting('share_shaarli') %}
  • - - + shaarli
    • @@ -141,31 +140,29 @@ {% endif %} {% if craue_setting('share_diaspora') %}
  • - - + diaspora*
    • {% endif %} {% if craue_setting('share_unmark') %}
  • - - + unmark.it
    • {% endif %} {% if craue_setting('carrot') %}
  • - - + Carrot
    • {% endif %} {% if craue_setting('share_mail') %}
  • - + mail {{ 'entry.view.left_menu.share_email_label'|trans }}
    • diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 3c169c04..2dab1c18 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -2,12 +2,14 @@ {% block css %} {{ parent() }} - + {% if not app.debug %} + + {% endif %} {% endblock %} {% block scripts %} {{ parent() }} - + {% endblock %} {% block header %} @@ -116,12 +118,12 @@
    -- cgit v1.2.3 From 17cc3aacb7c059c12eaadf35f53a97e5b8c19b93 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 29 Apr 2017 20:04:54 +0200 Subject: fix theme changes Signed-off-by: Thomas Citharel --- .../Resources/views/themes/material/Config/index.html.twig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material') 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 d6e414e9..de1fca24 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 @@ -25,9 +25,9 @@
    - {{ form_label(form.config.theme) }} {{ form_errors(form.config.theme) }} {{ form_widget(form.config.theme) }} + {{ form_label(form.config.theme) }}
    @@ -38,9 +38,9 @@
    - {{ form_label(form.config.items_per_page) }} {{ form_errors(form.config.items_per_page) }} {{ form_widget(form.config.items_per_page) }} + {{ form_label(form.config.items_per_page) }}
    @@ -51,9 +51,9 @@
    - {{ form_label(form.config.reading_speed) }} {{ form_errors(form.config.reading_speed) }} {{ form_widget(form.config.reading_speed) }} + {{ form_label(form.config.reading_speed) }}

    {{ 'config.form_settings.reading_speed.help_message'|trans }} myreadspeed @@ -68,17 +68,17 @@

    - {{ form_label(form.config.action_mark_as_read) }} {{ form_errors(form.config.action_mark_as_read) }} {{ form_widget(form.config.action_mark_as_read) }} + {{ form_label(form.config.action_mark_as_read) }}
    - {{ form_label(form.config.language) }} {{ form_errors(form.config.language) }} {{ form_widget(form.config.language) }} + {{ form_label(form.config.language) }}
    @@ -89,9 +89,9 @@
    - {{ form_label(form.config.pocket_consumer_key) }} {{ form_errors(form.config.pocket_consumer_key) }} {{ form_widget(form.config.pocket_consumer_key) }} + {{ form_label(form.config.pocket_consumer_key) }}

    » https://getpocket.com/developer/docs/authentication -- cgit v1.2.3 From 2003ffa97e98d35130c93d158c453ce9b926b838 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 4 May 2017 17:44:42 +0200 Subject: Fix according to review --- .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 227dad94..a796ed26 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -252,7 +252,7 @@

  • {% for tag in entry.tags %}
    - {{ tag.label }} delete + {{ tag.label }} delete
    {% endfor %}
    • -- cgit v1.2.3 From 34806fab1b26eb626862d45402cb4e265cc0af5b Mon Sep 17 00:00:00 2001 From: Aline Date: Sun, 7 May 2017 15:07:50 +0200 Subject: Fix reviews Signed-off-by: Aline --- .../Resources/views/themes/material/Config/index.html.twig | 8 ++++---- .../Resources/views/themes/material/Entry/_reading_time.html.twig | 4 ++-- .../Resources/views/themes/material/Entry/entry.html.twig | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material') 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 de1fca24..9b0816eb 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 @@ -132,8 +132,8 @@
    -
    - +
    +
    {{ 'config.form_rss.token_label'|trans }}
    {% if rss.token %} {{ rss.token }} @@ -151,8 +151,8 @@
    {% if rss.token %}
    -
    - +
    +
    {{ 'config.form_rss.rss_links'|trans }}
    • {{ 'config.form_rss.rss_link.unread'|trans }}
    • {{ 'config.form_rss.rss_link.starred'|trans }}
      • diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig index 1a932a9f..6ba18768 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig @@ -1,7 +1,7 @@ {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} timer {% if readingTime > 0 %} - {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} + {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} {% else %} - {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} + {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} {% endif %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index a796ed26..987329a5 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -132,8 +132,7 @@ {% endif %} {% if craue_setting('share_scuttle') %}
    • - - + scuttle
      • -- cgit v1.2.3 From 4c6ee89c9c70f24209f2bb86de2b3137ab2d801c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 7 May 2017 17:13:08 +0200 Subject: Fix review again Signed-off-by: Thomas Citharel --- .../views/themes/material/Entry/entry.html.twig | 74 +++++++++++----------- 1 file changed, 38 insertions(+), 36 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 987329a5..47e6e8c3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -216,46 +216,48 @@

      {{ entry.title|striptags|raw }} ✎