From ec52bf511e0ce15ab1f63f19087aa50d3b1eb8bf Mon Sep 17 00:00:00 2001 From: Ysolyne Gresille Date: Thu, 23 Feb 2012 18:52:22 +0100 Subject: [PATCH] Graphic integration oauth (corrections) --- .../web/api/auth/end_user_authorization.twig | 17 +-- .../web/api/auth/native_app_access_token.twig | 125 ++++++++++++++---- www/skins/oauth/default.css | 5 +- 3 files changed, 107 insertions(+), 40 deletions(-) diff --git a/templates/web/api/auth/end_user_authorization.twig b/templates/web/api/auth/end_user_authorization.twig index 18223d107d..0c527aac45 100644 --- a/templates/web/api/auth/end_user_authorization.twig +++ b/templates/web/api/auth/end_user_authorization.twig @@ -1,4 +1,4 @@ - + @@ -23,10 +23,8 @@ - - -
- + +
@@ -87,22 +85,21 @@ {% endfor %} - +
{% for key,value in auth.getParams %} {% endfor %} - +
{% endif %}
-
- + @@ -117,6 +114,6 @@ - + \ No newline at end of file diff --git a/templates/web/api/auth/native_app_access_token.twig b/templates/web/api/auth/native_app_access_token.twig index 6d31deaf8c..4c04264c81 100644 --- a/templates/web/api/auth/native_app_access_token.twig +++ b/templates/web/api/auth/native_app_access_token.twig @@ -1,28 +1,97 @@ - - - - {% if error is defined %} - {% trans 'Fail' %} - {% else %} - {% trans 'Success' %} - {% endif %} - - - - {% if error is defined %} -

- {% trans %} - Erreur : {{error}} - {% endtrans %} -

- {% else %} - -

- {% set expiration_date = token.expires_in() %} - {% trans %} - Expire dans {{expiration_date}} - {% endtrans %} -

- {% endif %} - - + + + + + + {% if error is defined %} + {% trans 'Fail' %} + {% else %} + {% trans 'Success' %} + {% endif %} + + + + + + + + + + + + + + + + + + + +
+
+ +
+

{{home_title}}

+
+ + {% if user is not none %} + {% set username = '' ~ user.get_display_name() ~ '' %} +
+ +
+ {% endif %} +
+ {% if error is defined %} +
+

{% trans %}Erreur{% endtrans %}

+
+
+

+ {% trans %} + {{error}} + {% endtrans %} +

+ +
+ {% else %} +
+

{% trans %}Code d'accès{% endtrans %}

+
+
+

+ {% trans %} + Copiez le code ci-dessous, retournez dans votre application et collez-le à l'endroit requis : + {% endtrans %} +

+ +
+ {% endif %} +
+ +
+
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/skins/oauth/default.css b/www/skins/oauth/default.css index ba67d81d2a..cb39a6a878 100644 --- a/www/skins/oauth/default.css +++ b/www/skins/oauth/default.css @@ -101,6 +101,7 @@ p.login_hello { } form.access-deny { - margin-top: 18px; - margin-bottom: 18px; + display: inline-block; + margin-top: 10px; + margin-bottom: 10px; }