From 39f27d6370c5d280375b2e1f93de464ecf5f4f96 Mon Sep 17 00:00:00 2001 From: Simounet Date: Mon, 6 Jun 2016 20:59:20 +0200 Subject: Handling socials links into a config file --- .../views/themes/material/Static/howto.html.twig | 10 +++--- .../views/themes/material/footer.html.twig | 41 +++++++++++++++++++++ .../views/themes/material/layout.html.twig | 42 +--------------------- 3 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 4354a6b7..6a177d6b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig @@ -18,17 +18,17 @@
{{ 'howto.top_menu.browser_addons'|trans }}
{{ 'howto.top_menu.mobile_apps'|trans }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig new file mode 100644 index 00000000..7cb19966 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig @@ -0,0 +1,41 @@ + 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 33d9e08f..a5c16792 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -122,45 +122,5 @@ {% endblock %} {% block footer %} - + {{ render(controller("WallabagCoreBundle:Footer:index")) }} {% endblock %} -- cgit v1.2.3 From 8f5e220327138581446c6dfabb1f47a8042b4e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 18 May 2016 15:02:00 +0200 Subject: Fix form user display when 2FA is disabled --- .../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') 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 5a90f227..afd5b499 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 @@ -158,7 +158,7 @@ {% endif %} {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(form.user) }} + {{ form_widget(form.user._token) }} -- cgit v1.2.3 From 519ba0b5e71cd9b5abd620f682fd2296e6180af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 18 Aug 2016 11:58:35 +0200 Subject: Replaced favorite word/icon with star one Fix #2041 --- .../Resources/views/themes/material/Entry/entries.html.twig | 2 +- .../Resources/views/themes/material/Entry/entry.html.twig | 10 +++++----- 2 files changed, 6 insertions(+), 6 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 920fa933..c8e4a533 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 @@ -77,7 +77,7 @@
  • - +
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 e89aea3a..fca112dc 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 @@ -24,8 +24,8 @@
  • - - + +
  • @@ -70,9 +70,9 @@
  • - - - {{ 'entry.view.left_menu.set_as_favorite'|trans }} + + + {{ 'entry.view.left_menu.set_as_starred'|trans }}
    • -- cgit v1.2.3 From 4e1be104ab59201e3d482e4fd31b69b76697fb9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 18 Aug 2016 15:23:19 +0200 Subject: Added creation date and reading time on article view Fix #2034 --- .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 5 +++++ 1 file changed, 5 insertions(+) (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 e89aea3a..e76407b0 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 @@ -193,6 +193,11 @@

    {{ entry.title|raw }} ✎