hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Graphic integration oauth (corrections)

Browse Source
This commit is contained in:
Ysolyne Gresille
2012-02-23 18:52:22 +01:00
parent 160f9ff986
commit ec52bf511e
3 changed files with 107 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
templates/web/api/auth/end_user_authorization.twig
View File

@@ -1,4 +1,4 @@
<!doctype html> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
@@ -23,10 +23,8 @@
<![endif]--> <![endif]-->
</head> </head>
<body>
<body> <div id="page" class="container">
<div id="page" class="container">
<div id="main" class="row"> <div id="main" class="row">
<div id="title-box" class="span6 offset3"> <div id="title-box" class="span6 offset3">
@@ -87,22 +85,21 @@
<input type="hidden" name="{{key}}" value="{{value}}"> <input type="hidden" name="{{key}}" value="{{value}}">
{% endfor %} {% endfor %}
<input type="hidden" name="action_accept" value="1"> <input type="hidden" name="action_accept" value="1">
<input id="button_access" class="btn btn-inverse btn-large span6" type="submit" value="{% trans 'Autoriser' %}" /> <input id="button_access" class="btn btn-inverse btn-large span3" type="submit" value="{% trans 'Autoriser' %}" />
</form> </form>
<form method="post" class="access-deny"> <form method="post" class="access-deny">
{% for key,value in auth.getParams %} {% for key,value in auth.getParams %}
<input type="hidden" name="{{key}}" value="{{value}}"> <input type="hidden" name="{{key}}" value="{{value}}">
{% endfor %} {% endfor %}
<input type="hidden" name="action_accept" value="0"> <input type="hidden" name="action_accept" value="0">
<input id="button_deny" class="btn btn-inverse btn-large span6" type="submit" value="{% trans 'Ne pas autoriser' %}" /> <input id="button_deny" class="btn btn-inverse btn-large span3" type="submit" value="{% trans 'Ne pas autoriser' %}" />
</form> </form>
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<!-- JavaScript at the bottom for fast page loading --> <!-- JavaScript at the bottom for fast page loading -->
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-alert.js"></script> <script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-alert.js"></script>
@@ -117,6 +114,6 @@
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-tab.js"></script> <script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-tab.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-transition.js"></script> <script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-transition.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-typeahead.js"></script> <script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-typeahead.js"></script>
</body> </body>
</html> </html>

125
templates/web/api/auth/native_app_access_token.twig
View File

@@ -1,28 +1,97 @@
<html> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<head> <html>
<title> <head>
{% if error is defined %} <meta charset="utf-8" />
{% trans 'Fail' %} <title>
{% else %} {% if error is defined %}
{% trans 'Success' %} {% trans 'Fail' %}
{% endif %} {% else %}
</title> {% trans 'Success' %}
</head> {% endif %}
<body> </title>
{% if error is defined %} <meta name="author" content="Alchemy" />
<p>
{% trans %} <!-- Mobile viewport optimized -->
Erreur : {{error}} <meta name="viewport" content="width=device-width, initial-scale=1.0" />
{% endtrans %}
</p> <!-- styles -->
{% else %} <link rel="stylesheet" type="text/css" href="/skins/html5/bootstrap/css/bootstrap.css" />
<input type="text" name="access_token" value="{{token.access_token}}" size="{{token.access_token|length}}"/> <link rel="stylesheet" type="text/css" href="/skins/html5/bootstrap/css/bootstrap-responsive.css" />
<p> <link rel="stylesheet" type="text/css" href="/skins/oauth/default.css" />
{% set expiration_date = token.expires_in() %}
{% trans %} <!-- All JavaScript at the bottom, except this Modernizr build.
Expire dans {{expiration_date}} Modernizr enables HTML5 elements & feature detects for optimal performance. -->
{% endtrans %} <script type="text/javascript" src="/skins/html5/Boilerplate/js/modernizr-2.5.2.min.js"></script>
</p>
{% endif %} <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
</body> <!--[if lt IE 9]>
</html> <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body>
<div id="page" class="container">
<div id="main" class="row">
<div id="title-box" class="span6 offset3">
<h1 id="namePhr">{{home_title}}</h1>
</div>
{% if user is not none %}
{% set username = '<b>' ~ user.get_display_name() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans %}
Hello {{username}}
{% endtrans %}
</p>
</div>
{% endif %}
<div id="text-box" class="span6 offset3">
{% if error is defined %}
<div id="top-text-box">
<h4>{% trans %}Erreur{% endtrans %}</h4>
</div>
<div id="main-text-box">
<p>
{% trans %}
{{error}}
{% endtrans %}
</p>
<input type="text" class="input-xlarge" name="access_token" value="{{token.access_token}}" size="{{token.access_token|length}}"/>
</div>
{% else %}
<div id="top-text-box">
<h4>{% trans %}Code d'acc&egrave;s{% endtrans %}</h4>
</div>
<div id="main-text-box">
<p>
{% trans %}
Copiez le code ci-dessous, retournez dans votre application et collez-le &agrave l'endroit requis :
{% endtrans %}
</p>
<input type="text" class="input-xlarge" name="access_token" value="{{token.access_token}}" size="{{token.access_token|length}}"/>
</div>
{% endif %}
</div>
</div>
</div>
<!-- JavaScript at the bottom for fast page loading -->
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-alert.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-button.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-carousel.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-collapse.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-dropdown.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-modal.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-tooltip.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-popover.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-scrollspy.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-tab.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-transition.js"></script>
<script type="text/javascript" src="/skins/html5/bootstrap/js/bootstrap-typeahead.js"></script>
</body>
</html>

5
www/skins/oauth/default.css
View File

@@ -101,6 +101,7 @@ p.login_hello {
} }
form.access-deny { form.access-deny {
margin-top: 18px; display: inline-block;
margin-bottom: 18px; margin-top: 10px;
margin-bottom: 10px;
} }