Bring new OpenID templates LIVE
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk
parent
32f1e2bf83
commit
44230bfa16
27 changed files with 187 additions and 201 deletions
|
|
@ -1,67 +0,0 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>{{ title }}</title>
|
||||
|
||||
<link rel="shortcut icon" type="image/vnd.microsoft.icon"
|
||||
href="//fedoraproject.org/static/images/favicon.ico"/>
|
||||
|
||||
<!--<link rel="stylesheet" href="{{ basepath }}/ui/fedora/fedora.css">-->
|
||||
<link href="https://apps.fedoraproject.org/global/fedora-bootstrap-1.0/fedora-bootstrap.min.css" rel="stylesheet">
|
||||
<!-- <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,700,400italic,700italic,300italic' rel='stylesheet' type='text/css'>-->
|
||||
<meta name="generator" content="Ipsilon">
|
||||
<style>
|
||||
.bodycontent { min-height: 85vh; }
|
||||
</style>
|
||||
|
||||
|
||||
{%- if heads %}
|
||||
{%- for group, value in heads.items() %}
|
||||
{%- for head in value %}
|
||||
{{ head | safe }}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
||||
{%- endif %}
|
||||
</head>
|
||||
<body>
|
||||
<div class="masthead">
|
||||
<div class="container text-center">
|
||||
<img alt="logo" src="{{ basepath }}/ui/fedora/fedora-authn-logo-white.png" height=40px />
|
||||
</div>
|
||||
</div>
|
||||
<div class="bodycontent p-t-lg">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-sm-10 col-sm-offset-1">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 text-center">
|
||||
{% block toptext %}{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row p-b-lg">
|
||||
<div class="{% block cardwidths %}{% endblock %}">
|
||||
<div class="card">
|
||||
<div class="card-header small">
|
||||
{% block maintitle %}{% endblock %}
|
||||
</div>
|
||||
<div class="card-block">
|
||||
{% block main %}{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer p-t p-b text-center">
|
||||
<div class="container">
|
||||
<p class="text-muted credit">
|
||||
Fedora FAS Login uses OpenID powered by Ipsilon
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
{% extends "layout.html" %}
|
||||
{% block title %}Login{% endblock %}
|
||||
{% block toptext %}
|
||||
|
||||
<p>
|
||||
<small><strong>{{ login_target }}</strong> wants to use your Fedora Account System (FAS) credentials</small>
|
||||
</p>
|
||||
{% endblock %}
|
||||
{% block cardwidths %}col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2{% endblock %}
|
||||
{% block maintitle %}
|
||||
login with FAS
|
||||
{% endblock %}
|
||||
{% block main %}
|
||||
{% if error %}<p>{{error}}</p>{% endif %}
|
||||
<form method="post" action="{{ action }}" enctype="application/x-www-form-urlencoded">
|
||||
<input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id}}"/>
|
||||
<div class="form-group row">
|
||||
<div class="col-xs-12">
|
||||
<input class="form-control" id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="col-xs-12">
|
||||
<input class="form-control" id="password" name="login_password" type="password" placeholder="Password" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row m-b-0">
|
||||
<div class="col-xs-12">
|
||||
<input class="btn btn-primary" type="submit" id="loginbutton" value="Allow" />
|
||||
<span class="btn btn-link small"><small><a target="_blank" href="https://admin.fedoraproject.org/accounts/user/new">create a FAS account</a></small></span>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
{% extends "layout.html" %}
|
||||
{% block toptext %}
|
||||
<p><small><strong>{{trustroot}}</strong> requests to use the following details from your FAS Account</small></p>
|
||||
{% endblock %}
|
||||
{% block cardwidths %}col-md-10 col-md-offset-1{% endblock %}
|
||||
{% block maintitle %}Review the authorization details{% endblock %}
|
||||
{% block main %}
|
||||
<div class="small">
|
||||
<form method="post" action="{{action}}" enctype="application/x-www-form-urlencoded">
|
||||
<input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id }}" />
|
||||
{% for entry in authz_details|dictsort %}
|
||||
<div class="row m-b">
|
||||
<div class="col-sm-5"><strong>{{ entry[0] }}</strong></div>
|
||||
{%- if entry[1] is iterable and not entry[1] is string -%}
|
||||
<div class="col-sm-7">{{ entry[1] | join(', ') }}</div>
|
||||
{%- else -%}
|
||||
<div class="col-sm-7">{{ entry[1] }}</div>
|
||||
{%- endif -%}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<div class="row m-b">
|
||||
<div class="col-sm-5"><strong>Remember approval</strong></div>
|
||||
<div class="col-sm-7"><select name="remember_for_days" class="c-select-sm c-select">
|
||||
<option value="0">never</option>
|
||||
<option value="3">3 days</option>
|
||||
<option value="7">7 days</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<p class="form_item">
|
||||
<input class="btn btn-primary" name="decided_allow" type="submit" value="Approve" />
|
||||
<input class="btn btn-link" name="decided_deny" type="submit" value="Reject" />
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
36
roles/ipsilon/files/templates-old/layout.html
Normal file
36
roles/ipsilon/files/templates-old/layout.html
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>{{ title }}</title>
|
||||
|
||||
<link rel="shortcut icon" type="image/vnd.microsoft.icon"
|
||||
href="//fedoraproject.org/static/images/favicon.ico"/>
|
||||
|
||||
<link rel="stylesheet" href="{{ basepath }}/ui/fedora/fedora.css">
|
||||
|
||||
<meta name="generator" content="Ipsilon">
|
||||
|
||||
{%- if heads %}
|
||||
{%- for group, value in heads.items() %}
|
||||
{%- for head in value %}
|
||||
{{ head | safe }}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
||||
{%- endif %}
|
||||
</head>
|
||||
<body>
|
||||
<div class="header_bg">
|
||||
<div class="body header">
|
||||
<img id="logo" alt="logo" src="{{ basepath }}/ui/fedora/fedora-authn-logo-white.png"/>
|
||||
</div>
|
||||
</div>
|
||||
<div style="font-size:14px;width:800px;margin-left:auto;margin-right:auto;padding:10px;margin-top:15px;margin-bottom:50px; border-radius:5px; text-align:center;color: #31708F;background-color: #D9EDF7;border-color: #BCDFF1;">We are going to introduce a new interface for this login screen on January 15th. <a style="color: rgb(70, 154, 197);text-decoration:none;" target="_blank" href="https://fedoramagazine.org/fedora-openid-login-new-improved/">Click here to see some screenshots.</a></div>
|
||||
<div class="body main">
|
||||
<p id="toptext">{% block toptext %}{% endblock %}</p>
|
||||
<div class="middlebox">
|
||||
{% block main %}{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
24
roles/ipsilon/files/templates-old/login/form.html
Normal file
24
roles/ipsilon/files/templates-old/login/form.html
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{% extends "layout.html" %}
|
||||
{% block title %}Login{% endblock %}
|
||||
{% block toptext %}
|
||||
{{ login_target }} is asking to authenticate using Ipsilon
|
||||
{% endblock %}
|
||||
{% block main %}
|
||||
Login with your credentials
|
||||
{% if error %}<p>{{error}}</p>{% endif %}
|
||||
<div>
|
||||
<form method="post" action="{{ action }}" enctype="application/x-www-form-urlencoded">
|
||||
<input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id}}"/>
|
||||
<p class="form_item">
|
||||
<input id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
|
||||
</p>
|
||||
<p class="form_item">
|
||||
<input id="password" name="login_password" type="password" placeholder="Password" />
|
||||
</p>
|
||||
<p class="form_item">
|
||||
<input type="submit" id="loginbutton" value="Login">
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
40
roles/ipsilon/files/templates-old/openid/consent_form.html
Normal file
40
roles/ipsilon/files/templates-old/openid/consent_form.html
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{% extends "layout.html" %}
|
||||
{% block toptext %}
|
||||
{{trustroot}} is asking to authenticate via OpenID using Ipsilon
|
||||
{% endblock %}
|
||||
{% block main %}
|
||||
Review the authorization details
|
||||
<div>
|
||||
<form method="post" action="{{action}}" enctype="application/x-www-form-urlencoded">
|
||||
<input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id }}" />
|
||||
<p class="form_item">
|
||||
<table class="details">
|
||||
{% for entry in authz_details|dictsort %}
|
||||
<tr>
|
||||
<td>{{ entry[0] }}</td>
|
||||
{%- if entry[1] is iterable and not entry[1] is string -%}
|
||||
<td>{{ entry[1] | join(', ') }}</td>
|
||||
{%- else -%}
|
||||
<td>{{ entry[1] }}</td>
|
||||
{%- endif -%}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
<tr>
|
||||
<td>Remember approval for</td>
|
||||
<td><select name="remember_for_days">
|
||||
<option value="0">never</option>
|
||||
<option value="3">3 days</option>
|
||||
<option value="7">7 days</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</p>
|
||||
<p class="form_item">
|
||||
<input type="submit" name="decided_deny" value="Reject">
|
||||
<input type="submit" name="decided_allow" value="Allow">
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{% extends "layout.html" %}
|
||||
{% block maintitle %}
|
||||
{% block toptext %}
|
||||
401 - Unauthorized
|
||||
{% endblock %}
|
||||
{% block main %}
|
||||
|
|
@ -7,9 +7,14 @@
|
|||
<link rel="shortcut icon" type="image/vnd.microsoft.icon"
|
||||
href="//fedoraproject.org/static/images/favicon.ico"/>
|
||||
|
||||
<link rel="stylesheet" href="{{ basepath }}/ui/fedora/fedora.css">
|
||||
|
||||
<!--<link rel="stylesheet" href="{{ basepath }}/ui/fedora/fedora.css">-->
|
||||
<link href="https://apps.fedoraproject.org/global/fedora-bootstrap-1.0/fedora-bootstrap.min.css" rel="stylesheet">
|
||||
<!-- <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,700,400italic,700italic,300italic' rel='stylesheet' type='text/css'>-->
|
||||
<meta name="generator" content="Ipsilon">
|
||||
<style>
|
||||
.bodycontent { min-height: 85vh; }
|
||||
</style>
|
||||
|
||||
|
||||
{%- if heads %}
|
||||
{%- for group, value in heads.items() %}
|
||||
|
|
@ -20,16 +25,42 @@
|
|||
{%- endif %}
|
||||
</head>
|
||||
<body>
|
||||
<div class="header_bg">
|
||||
<div class="body header">
|
||||
<img id="logo" alt="logo" src="{{ basepath }}/ui/fedora/fedora-authn-logo-white.png"/>
|
||||
<div class="masthead">
|
||||
<div class="container text-center">
|
||||
<img alt="logo" src="{{ basepath }}/ui/fedora/fedora-authn-logo-white.png" height=40px />
|
||||
</div>
|
||||
</div>
|
||||
<div style="font-size:14px;width:800px;margin-left:auto;margin-right:auto;padding:10px;margin-top:15px;margin-bottom:50px; border-radius:5px; text-align:center;color: #31708F;background-color: #D9EDF7;border-color: #BCDFF1;">We are going to introduce a new interface for this login screen on January 15th. <a style="color: rgb(70, 154, 197);text-decoration:none;" target="_blank" href="https://fedoramagazine.org/fedora-openid-login-new-improved/">Click here to see some screenshots.</a></div>
|
||||
<div class="body main">
|
||||
<p id="toptext">{% block toptext %}{% endblock %}</p>
|
||||
<div class="middlebox">
|
||||
{% block main %}{% endblock %}
|
||||
<div class="bodycontent p-t-lg">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-sm-10 col-sm-offset-1">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 text-center">
|
||||
{% block toptext %}{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row p-b-lg">
|
||||
<div class="{% block cardwidths %}{% endblock %}">
|
||||
<div class="card">
|
||||
<div class="card-header small">
|
||||
{% block maintitle %}{% endblock %}
|
||||
</div>
|
||||
<div class="card-block">
|
||||
{% block main %}{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="footer p-t p-b text-center">
|
||||
<div class="container">
|
||||
<p class="text-muted credit">
|
||||
Fedora FAS Login uses OpenID powered by Ipsilon
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -1,24 +1,35 @@
|
|||
{% extends "layout.html" %}
|
||||
{% block title %}Login{% endblock %}
|
||||
{% block toptext %}
|
||||
{{ login_target }} is asking to authenticate using Ipsilon
|
||||
|
||||
<p>
|
||||
<small><strong>{{ login_target }}</strong> wants to use your Fedora Account System (FAS) credentials</small>
|
||||
</p>
|
||||
{% endblock %}
|
||||
{% block cardwidths %}col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2{% endblock %}
|
||||
{% block maintitle %}
|
||||
login with FAS
|
||||
{% endblock %}
|
||||
{% block main %}
|
||||
Login with your credentials
|
||||
{% if error %}<p>{{error}}</p>{% endif %}
|
||||
<div>
|
||||
<form method="post" action="{{ action }}" enctype="application/x-www-form-urlencoded">
|
||||
<input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id}}"/>
|
||||
<p class="form_item">
|
||||
<input id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
|
||||
</p>
|
||||
<p class="form_item">
|
||||
<input id="password" name="login_password" type="password" placeholder="Password" />
|
||||
</p>
|
||||
<p class="form_item">
|
||||
<input type="submit" id="loginbutton" value="Login">
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
{% if error %}<p>{{error}}</p>{% endif %}
|
||||
<form method="post" action="{{ action }}" enctype="application/x-www-form-urlencoded">
|
||||
<input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id}}"/>
|
||||
<div class="form-group row">
|
||||
<div class="col-xs-12">
|
||||
<input class="form-control" id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="col-xs-12">
|
||||
<input class="form-control" id="password" name="login_password" type="password" placeholder="Password" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row m-b-0">
|
||||
<div class="col-xs-12">
|
||||
<input class="btn btn-primary" type="submit" id="loginbutton" value="Allow" />
|
||||
<span class="btn btn-link small"><small><a target="_blank" href="https://admin.fedoraproject.org/accounts/user/new">create a FAS account</a></small></span>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +1,36 @@
|
|||
{% extends "layout.html" %}
|
||||
{% block toptext %}
|
||||
{{trustroot}} is asking to authenticate via OpenID using Ipsilon
|
||||
<p><small><strong>{{trustroot}}</strong> requests to use the following details from your FAS Account</small></p>
|
||||
{% endblock %}
|
||||
{% block cardwidths %}col-md-10 col-md-offset-1{% endblock %}
|
||||
{% block maintitle %}Review the authorization details{% endblock %}
|
||||
{% block main %}
|
||||
Review the authorization details
|
||||
<div>
|
||||
<div class="small">
|
||||
<form method="post" action="{{action}}" enctype="application/x-www-form-urlencoded">
|
||||
<input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id }}" />
|
||||
<p class="form_item">
|
||||
<table class="details">
|
||||
{% for entry in authz_details|dictsort %}
|
||||
<tr>
|
||||
<td>{{ entry[0] }}</td>
|
||||
<div class="row m-b">
|
||||
<div class="col-sm-5"><strong>{{ entry[0] }}</strong></div>
|
||||
{%- if entry[1] is iterable and not entry[1] is string -%}
|
||||
<td>{{ entry[1] | join(', ') }}</td>
|
||||
<div class="col-sm-7">{{ entry[1] | join(', ') }}</div>
|
||||
{%- else -%}
|
||||
<td>{{ entry[1] }}</td>
|
||||
<div class="col-sm-7">{{ entry[1] }}</div>
|
||||
{%- endif -%}
|
||||
</tr>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<tr>
|
||||
<td>Remember approval for</td>
|
||||
<td><select name="remember_for_days">
|
||||
<div class="row m-b">
|
||||
<div class="col-sm-5"><strong>Remember approval</strong></div>
|
||||
<div class="col-sm-7"><select name="remember_for_days" class="c-select-sm c-select">
|
||||
<option value="0">never</option>
|
||||
<option value="3">3 days</option>
|
||||
<option value="7">7 days</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<p class="form_item">
|
||||
<input type="submit" name="decided_deny" value="Reject">
|
||||
<input type="submit" name="decided_allow" value="Allow">
|
||||
<input class="btn btn-primary" name="decided_allow" type="submit" value="Approve" />
|
||||
<input class="btn btn-link" name="decided_deny" type="submit" value="Reject" />
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{% extends "layout.html" %}
|
||||
{% block toptext %}
|
||||
{% block maintitle %}
|
||||
401 - Unauthorized
|
||||
{% endblock %}
|
||||
{% block main %}
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 9 KiB |
BIN
roles/ipsilon/files/ui-fedora-old/fedora-authn-logo-white.png
Normal file
BIN
roles/ipsilon/files/ui-fedora-old/fedora-authn-logo-white.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 190 B After Width: | Height: | Size: 190 B |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 9 KiB |
|
|
@ -34,25 +34,11 @@
|
|||
copy: src=templates/
|
||||
dest=/usr/share/ipsilon/templates-fedora
|
||||
owner=ipsilon group=ipsilon mode=0666
|
||||
when: env != "staging"
|
||||
|
||||
- name: copy ipsilon ui assets
|
||||
copy: src=ui-fedora/
|
||||
dest=/usr/share/ipsilon/ui/fedora
|
||||
owner=ipsilon group=ipsilon mode=0666
|
||||
when: env != "staging"
|
||||
|
||||
- name: copy STAGING ipsilon templates
|
||||
copy: src=templates-new/
|
||||
dest=/usr/share/ipsilon/templates-fedora
|
||||
owner=ipsilon group=ipsilon mode=0666
|
||||
when: env == "staging"
|
||||
|
||||
- name: copy STAGING ipsilon ui assets
|
||||
copy: src=ui-fedora-new/
|
||||
dest=/usr/share/ipsilon/ui/fedora
|
||||
owner=ipsilon group=ipsilon mode=0666
|
||||
when: env == "staging"
|
||||
|
||||
- name: copy ipsilon configuration
|
||||
template: src={{ item }}.conf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue