diff --git a/roles/ipsilon/files/templates-new/layout.html b/roles/ipsilon/files/templates-new/layout.html deleted file mode 100644 index 3ddfe99314..0000000000 --- a/roles/ipsilon/files/templates-new/layout.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - - {{ title }} - - - - - - - - - - - {%- if heads %} - {%- for group, value in heads.items() %} - {%- for head in value %} - {{ head | safe }} - {%- endfor %} - {%- endfor %} - {%- endif %} - - -
-
- logo -
-
-
-
-
-
-
-
- {% block toptext %}{% endblock %} -
-
-
-
-
-
- {% block maintitle %}{% endblock %} -
-
- {% block main %}{% endblock %} -
-
-
-
-
-
-
-
- -
-
-

- Fedora FAS Login uses OpenID powered by Ipsilon -

-
-
- - diff --git a/roles/ipsilon/files/templates-new/login/form.html b/roles/ipsilon/files/templates-new/login/form.html deleted file mode 100644 index cc2b87e237..0000000000 --- a/roles/ipsilon/files/templates-new/login/form.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "layout.html" %} -{% block title %}Login{% endblock %} -{% block toptext %} - -

- {{ login_target }} wants to use your Fedora Account System (FAS) credentials -

-{% 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 %}

{{error}}

{% endif %} -
- -
-
- -
-
-
-
- -
-
-
-
- - create a FAS account -
-
-
-{% endblock %} - diff --git a/roles/ipsilon/files/templates-new/openid/consent_form.html b/roles/ipsilon/files/templates-new/openid/consent_form.html deleted file mode 100644 index afa9011fef..0000000000 --- a/roles/ipsilon/files/templates-new/openid/consent_form.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "layout.html" %} -{% block toptext %} -

{{trustroot}} requests to use the following details from your FAS Account

-{% endblock %} -{% block cardwidths %}col-md-10 col-md-offset-1{% endblock %} -{% block maintitle %}Review the authorization details{% endblock %} -{% block main %} -
-
- - {% for entry in authz_details|dictsort %} -
-
{{ entry[0] }}
- {%- if entry[1] is iterable and not entry[1] is string -%} -
{{ entry[1] | join(', ') }}
- {%- else -%} -
{{ entry[1] }}
- {%- endif -%} -
- {% endfor %} - -
-
Remember approval
-
-
-
-

- - -

-
-
-{% endblock %} diff --git a/roles/ipsilon/files/templates-new/index.html b/roles/ipsilon/files/templates-old/index.html similarity index 100% rename from roles/ipsilon/files/templates-new/index.html rename to roles/ipsilon/files/templates-old/index.html diff --git a/roles/ipsilon/files/templates-new/internalerror.html b/roles/ipsilon/files/templates-old/internalerror.html similarity index 100% rename from roles/ipsilon/files/templates-new/internalerror.html rename to roles/ipsilon/files/templates-old/internalerror.html diff --git a/roles/ipsilon/files/templates-old/layout.html b/roles/ipsilon/files/templates-old/layout.html new file mode 100644 index 0000000000..e2498bb29a --- /dev/null +++ b/roles/ipsilon/files/templates-old/layout.html @@ -0,0 +1,36 @@ + + + + + {{ title }} + + + + + + + + {%- if heads %} + {%- for group, value in heads.items() %} + {%- for head in value %} + {{ head | safe }} + {%- endfor %} + {%- endfor %} + {%- endif %} + + +
+
+ +
+
+
We are going to introduce a new interface for this login screen on January 15th. Click here to see some screenshots.
+
+

{% block toptext %}{% endblock %}

+
+ {% block main %}{% endblock %} +
+
+ + diff --git a/roles/ipsilon/files/templates-old/login/form.html b/roles/ipsilon/files/templates-old/login/form.html new file mode 100644 index 0000000000..dd8b90ed30 --- /dev/null +++ b/roles/ipsilon/files/templates-old/login/form.html @@ -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 %}

{{error}}

{% endif %} +
+
+ +

+ +

+

+ +

+

+ +

+
+
+{% endblock %} + diff --git a/roles/ipsilon/files/templates-new/login/index.html b/roles/ipsilon/files/templates-old/login/index.html similarity index 100% rename from roles/ipsilon/files/templates-new/login/index.html rename to roles/ipsilon/files/templates-old/login/index.html diff --git a/roles/ipsilon/files/templates-new/logout.html b/roles/ipsilon/files/templates-old/logout.html similarity index 100% rename from roles/ipsilon/files/templates-new/logout.html rename to roles/ipsilon/files/templates-old/logout.html diff --git a/roles/ipsilon/files/templates-new/notfound.html b/roles/ipsilon/files/templates-old/notfound.html similarity index 100% rename from roles/ipsilon/files/templates-new/notfound.html rename to roles/ipsilon/files/templates-old/notfound.html diff --git a/roles/ipsilon/files/templates-old/openid/consent_form.html b/roles/ipsilon/files/templates-old/openid/consent_form.html new file mode 100644 index 0000000000..b0b254c6c3 --- /dev/null +++ b/roles/ipsilon/files/templates-old/openid/consent_form.html @@ -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 +
+
+ +

+ + {% for entry in authz_details|dictsort %} + + + {%- if entry[1] is iterable and not entry[1] is string -%} + + {%- else -%} + + {%- endif -%} + + {% endfor %} + + + + + +
{{ entry[0] }}{{ entry[1] | join(', ') }}{{ entry[1] }}
Remember approval for +
+

+

+ + +

+
+
+{% endblock %} diff --git a/roles/ipsilon/files/templates-new/openid/userpage.html b/roles/ipsilon/files/templates-old/openid/userpage.html similarity index 100% rename from roles/ipsilon/files/templates-new/openid/userpage.html rename to roles/ipsilon/files/templates-old/openid/userpage.html diff --git a/roles/ipsilon/files/templates-new/openid/xrds.xml b/roles/ipsilon/files/templates-old/openid/xrds.xml similarity index 100% rename from roles/ipsilon/files/templates-new/openid/xrds.xml rename to roles/ipsilon/files/templates-old/openid/xrds.xml diff --git a/roles/ipsilon/files/templates-new/persona/provisioning.html b/roles/ipsilon/files/templates-old/persona/provisioning.html similarity index 100% rename from roles/ipsilon/files/templates-new/persona/provisioning.html rename to roles/ipsilon/files/templates-old/persona/provisioning.html diff --git a/roles/ipsilon/files/templates-new/persona/signin_result.html b/roles/ipsilon/files/templates-old/persona/signin_result.html similarity index 100% rename from roles/ipsilon/files/templates-new/persona/signin_result.html rename to roles/ipsilon/files/templates-old/persona/signin_result.html diff --git a/roles/ipsilon/files/templates-new/unauthorized.html b/roles/ipsilon/files/templates-old/unauthorized.html similarity index 92% rename from roles/ipsilon/files/templates-new/unauthorized.html rename to roles/ipsilon/files/templates-old/unauthorized.html index 97626914d2..49a4506668 100644 --- a/roles/ipsilon/files/templates-new/unauthorized.html +++ b/roles/ipsilon/files/templates-old/unauthorized.html @@ -1,5 +1,5 @@ {% extends "layout.html" %} -{% block maintitle %} +{% block toptext %} 401 - Unauthorized {% endblock %} {% block main %} diff --git a/roles/ipsilon/files/templates/layout.html b/roles/ipsilon/files/templates/layout.html index e2498bb29a..3ddfe99314 100644 --- a/roles/ipsilon/files/templates/layout.html +++ b/roles/ipsilon/files/templates/layout.html @@ -7,9 +7,14 @@ - - + + + + + {%- if heads %} {%- for group, value in heads.items() %} @@ -20,16 +25,42 @@ {%- endif %} -
-
- +
+
+ logo
-
We are going to introduce a new interface for this login screen on January 15th. Click here to see some screenshots.
-
-

{% block toptext %}{% endblock %}

-
- {% block main %}{% endblock %} +
+
+
+
+
+
+ {% block toptext %}{% endblock %} +
+
+
+
+
+
+ {% block maintitle %}{% endblock %} +
+
+ {% block main %}{% endblock %} +
+
+
+
+
+
+
+
+ +
+
+

+ Fedora FAS Login uses OpenID powered by Ipsilon +

diff --git a/roles/ipsilon/files/templates/login/form.html b/roles/ipsilon/files/templates/login/form.html index dd8b90ed30..cc2b87e237 100644 --- a/roles/ipsilon/files/templates/login/form.html +++ b/roles/ipsilon/files/templates/login/form.html @@ -1,24 +1,35 @@ {% extends "layout.html" %} {% block title %}Login{% endblock %} {% block toptext %} -{{ login_target }} is asking to authenticate using Ipsilon + +

+ {{ login_target }} wants to use your Fedora Account System (FAS) credentials +

+{% 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 %}

{{error}}

{% endif %} -
-
- -

- -

-

- -

-

- -

-
-
+ {% if error %}

{{error}}

{% endif %} +
+ +
+
+ +
+
+
+
+ +
+
+
+
+ + create a FAS account +
+
+
{% endblock %} diff --git a/roles/ipsilon/files/templates/openid/consent_form.html b/roles/ipsilon/files/templates/openid/consent_form.html index b0b254c6c3..afa9011fef 100644 --- a/roles/ipsilon/files/templates/openid/consent_form.html +++ b/roles/ipsilon/files/templates/openid/consent_form.html @@ -1,39 +1,36 @@ {% extends "layout.html" %} {% block toptext %} -{{trustroot}} is asking to authenticate via OpenID using Ipsilon +

{{trustroot}} requests to use the following details from your FAS Account

{% endblock %} +{% block cardwidths %}col-md-10 col-md-offset-1{% endblock %} +{% block maintitle %}Review the authorization details{% endblock %} {% block main %} - Review the authorization details -
+
-

- {% for entry in authz_details|dictsort %} - - +
+
{{ entry[0] }}
{%- if entry[1] is iterable and not entry[1] is string -%} -
+
{{ entry[1] | join(', ') }}
{%- else -%} - +
{{ entry[1] }}
{%- endif -%} - + {% endfor %} - - - - -
{{ entry[0] }}{{ entry[1] | join(', ') }}{{ entry[1] }}
Remember approval for -
-

+
+

- - + +

diff --git a/roles/ipsilon/files/templates/unauthorized.html b/roles/ipsilon/files/templates/unauthorized.html index 49a4506668..97626914d2 100644 --- a/roles/ipsilon/files/templates/unauthorized.html +++ b/roles/ipsilon/files/templates/unauthorized.html @@ -1,5 +1,5 @@ {% extends "layout.html" %} -{% block toptext %} +{% block maintitle %} 401 - Unauthorized {% endblock %} {% block main %} diff --git a/roles/ipsilon/files/ui-fedora-new/fedora-authn-logo-white.png b/roles/ipsilon/files/ui-fedora-new/fedora-authn-logo-white.png deleted file mode 100644 index 555fe590f0..0000000000 Binary files a/roles/ipsilon/files/ui-fedora-new/fedora-authn-logo-white.png and /dev/null differ diff --git a/roles/ipsilon/files/ui-fedora-old/fedora-authn-logo-white.png b/roles/ipsilon/files/ui-fedora-old/fedora-authn-logo-white.png new file mode 100644 index 0000000000..e36baf7ab5 Binary files /dev/null and b/roles/ipsilon/files/ui-fedora-old/fedora-authn-logo-white.png differ diff --git a/roles/ipsilon/files/ui-fedora-new/fedora.css b/roles/ipsilon/files/ui-fedora-old/fedora.css similarity index 100% rename from roles/ipsilon/files/ui-fedora-new/fedora.css rename to roles/ipsilon/files/ui-fedora-old/fedora.css diff --git a/roles/ipsilon/files/ui-fedora-new/logo.svg b/roles/ipsilon/files/ui-fedora-old/logo.svg similarity index 100% rename from roles/ipsilon/files/ui-fedora-new/logo.svg rename to roles/ipsilon/files/ui-fedora-old/logo.svg diff --git a/roles/ipsilon/files/ui-fedora-new/repeater.png b/roles/ipsilon/files/ui-fedora-old/repeater.png similarity index 100% rename from roles/ipsilon/files/ui-fedora-new/repeater.png rename to roles/ipsilon/files/ui-fedora-old/repeater.png diff --git a/roles/ipsilon/files/ui-fedora/fedora-authn-logo-white.png b/roles/ipsilon/files/ui-fedora/fedora-authn-logo-white.png index e36baf7ab5..555fe590f0 100644 Binary files a/roles/ipsilon/files/ui-fedora/fedora-authn-logo-white.png and b/roles/ipsilon/files/ui-fedora/fedora-authn-logo-white.png differ diff --git a/roles/ipsilon/tasks/main.yml b/roles/ipsilon/tasks/main.yml index 0abaf99852..e0f9a0e173 100644 --- a/roles/ipsilon/tasks/main.yml +++ b/roles/ipsilon/tasks/main.yml @@ -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