From 6fbce9694f6cbdb66d91c1c22ff2e13a54916ea6 Mon Sep 17 00:00:00 2001 From: Kayn Ty Date: Mon, 30 Apr 2018 15:55:47 +0200 Subject: [PATCH] add login via google --- .../HWIOAuthBundle/views/Connect/login.html.twig | 4 ++++ app/Resources/views/base.html.twig | 7 +++++-- app/Resources/views/default/login-choices.html.twig | 11 ++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig index 0819b88d..9c8fb831 100755 --- a/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig +++ b/app/Resources/HWIOAuthBundle/views/Connect/login.html.twig @@ -9,6 +9,10 @@ {{ "twitter" | trans({}, 'HWIOAuthBundle') }} + + + {{ "google" | trans({}, 'HWIOAuthBundle') }} + {#{% for owner in hwi_oauth_resource_owners() %}#} {##} diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 34e4bff7..2d3bf423 100755 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -15,8 +15,11 @@ {% endblock %}
{% include 'default/header.html.twig' %} - {% block body %} - {% endblock %} +
+ + {% block body %} + {% endblock %} +
{% include 'default/footer.html.twig' %}
{% block javascripts %} diff --git a/app/Resources/views/default/login-choices.html.twig b/app/Resources/views/default/login-choices.html.twig index a719ec21..68a1937c 100755 --- a/app/Resources/views/default/login-choices.html.twig +++ b/app/Resources/views/default/login-choices.html.twig @@ -112,15 +112,16 @@ {% else %} - {#
#} - {##} - {#Via {{ 'disqus' | trans({}, 'HWIOAuthBundle') }}#} - {##} +

+ + + Login via {{ "google" | trans({}, 'HWIOAuthBundle') }} + - {{ "twitter" | trans({}, 'HWIOAuthBundle') }} + Login via {{ "twitter" | trans({}, 'HWIOAuthBundle') }}