From 075171ef09818d78b12bfc3fa5b1a299b026f245 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Jul 2010 22:21:01 +0200 Subject: working skin --- src/main/webapp/wayf-swamid.jsp | 651 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 651 insertions(+) create mode 100644 src/main/webapp/wayf-swamid.jsp (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp new file mode 100644 index 0000000..705c0a3 --- /dev/null +++ b/src/main/webapp/wayf-swamid.jsp @@ -0,0 +1,651 @@ + + +<%@ page contentType="text/html;charset=UTF-8" %> + + +<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> +<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> + +<%request.setCharacterEncoding("UTF-8");%> +<%response.setCharacterEncoding("UTF-8");%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Identity Provider Selection + + + +
+
+ SWAMI logotype +
+ +
+
+ Swedish flag +

Välj en identitetsutgivare

+

Tjänsten du försöker nå kräver att du väljer en identitetsutgivare (tex ditt universitet/högskola) från nedanstående lista innan du kan logga in.

+

Vad är en identitetsutgivare?
+ Vad är SWAMID?

+
+
+ English flag +

Choose an identity provider

+

The Service you are trying to access requires you to choose an identityprovider (e.g. your university/college) from the list below before you can log in.

+

What is an identity provider?
+ What is SWAMID? +

+
+ +
+

+ + + +The Service you are trying to reach requires that you +authenticate with your home organization, enter the name below. + +

+ + +

Nyligen använda/Recently used:

+ + + + + + + + +

+ + + + + + + ?entityID=<%= java.net.URLEncoder.encode(ei.toString(), "utf-8") %>&return=<%= java.net.URLEncoder.encode(re.toString(), "utf-8") %>&returnIDxParam=<%= java.net.URLEncoder.encode( returnIDParam.toString(), "utf-8" ) %>&cache=perm&action=selection&origin="> + + + + + + + + ?target=<%= java.net.URLEncoder.encode(targ.toString(),"utf-8") %>&shire=<%= java.net.URLEncoder.encode(shire.toString(),"utf-8") %>&providerId=<%= java.net.URLEncoder.encode(pid.toString(),"utf-8") %>&time=&cache=perm&action=selection&origin="> + + + +

+ + + + + + + + +
+
+ + " /> + " /> + " /> + + " /> + + + + " /> + " /> + " /> + + +
+
+ + + + + + + + + + +
"> +
+ + " /> + " /> + " /> + + " /> + + + + " /> + " /> + " /> + + + + + + + +
Federation organization
+ + + +
+

+ + +

+
+
+ +
+ + +
+ + + + + + or + +

Sök på nyckelord:/Search by keyword:

+ +
"> +
+

+ + + " /> + " /> + " /> + + " /> + + + + " /> + " /> + " /> + + + + + +

+
+
+ + +The SWAMID federation is an activity of the Swedish Alliance for Middleware Infrastructure. +SWAMID is in part based on Shibboleth from Internet2. +If you need assistance or require information send an e-mail to SWAMID support with a description of the problem. +

+
+ + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1 From 422bdd121379076c4f3593d016b04b2a9574b43e Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 15 Jul 2010 16:53:03 +0200 Subject: update swamid skin --- src/main/webapp/wayf-swamid.jsp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp index 705c0a3..e42e618 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -141,7 +141,7 @@ Identity Provider Selection + href="wayf-sunet.css" /> Identity Provider Selection @@ -168,17 +168,9 @@
-

- - - -The Service you are trying to reach requires that you -authenticate with your home organization, enter the name below. - -

-

Nyligen använda/Recently used:

+

Recently used:

@@ -253,7 +245,7 @@ authenticate with your home organization, enter the name below.
-

Skriv namn på organisationen/Enter institution name:

+

Enter institution name:

@@ -286,7 +278,7 @@ Provide a static drop down or a dynamically republished one. - you may wish to r -Eller välj från listan:/Or choose from a list: +Or choose from a list: -- cgit v1.1 From 97825dc24f555d7f735b05d49216c174f9f13cb7 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sun, 18 Jul 2010 23:01:42 +0200 Subject: major update for the sunet ds --- src/main/webapp/wayf-swamid.jsp | 153 ++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 99 deletions(-) (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp index e42e618..631ee53 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -48,7 +48,7 @@ - + @@ -140,9 +140,14 @@ - Identity Provider Selection - + Identity Provider Selection + + + + + + + - - - +
@@ -602,37 +560,35 @@ function changedFed(X, Selected) { empty array. --> - + @@ -640,4 +596,3 @@ var theElements = [ - -- cgit v1.1 From 6298cd715dedc7ea55cf2d5c5271abd333093cb5 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 14:22:34 +0200 Subject: cleanup ui based on first round of comments --- src/main/webapp/wayf-swamid.jsp | 477 +++++++--------------------------------- 1 file changed, 76 insertions(+), 401 deletions(-) (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp index 631ee53..300d630 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -31,20 +31,6 @@ - - - - - @@ -53,148 +39,72 @@ - - - - - - - - Identity Provider Selection - -
- SWAMI logotype + SWAMI logotype
-
- Swedish flag -

Välj en identitetsutgivare

-

Tjänsten du försöker nå kräver att du väljer en identitetsutgivare (tex ditt universitet/högskola) från nedanstående lista innan du kan logga in.

-

Vad är en identitetsutgivare?
- Vad är SWAMID?

-
-
- English flag -

Choose an identity provider

-

The Service you are trying to access requires you to choose an identityprovider (e.g. your university/college) from the list below before you can log in.

-

What is an identity provider?
- What is SWAMID? -

-
- -
- - -

Recently used:

- - - - - - +

Authentication required

+
+
+

Select your identity provider from the list

+ +
"> + + " /> + " /> + " /> + + " /> + + + + " /> + " /> + " /> + + + + + + +
+ +
+
+ +

Recently used

+ - - - - - - -
-
+ " /> " /> @@ -233,267 +134,38 @@ " /> " /> - -
+
- - - -

Type part of the name or select from the list below:

- - - - -
"> -
- - " /> - " /> - " /> - - " /> - - - - " /> - " /> - " /> - - - - - - -
-
- - - - - - - - - -
"> -
- - " /> - " /> - " /> - - " /> - - - - " /> - " /> - " /> - - - - - - - -
Federation organization
- - - -
-

- - -

-
-
- -
- - -
- - - - - - or - -

Sök på nyckelord:/Search by keyword:

- -
"> -
-

- - - " /> - " /> - " /> - - " /> - - - - " /> - " /> - " /> - - - - - -

-
-
- - - - - -
+
+
+
+ +
+ Swedish flag +

Välj en identitetsutgivare

+

Tjänsten du försöker nå kräver att du väljer en identitetsutgivare (tex ditt universitet/högskola) från ovanstående lista innan du kan logga in.

+

Vad är en identitetsutgivare?
+ Vad är SWAMID?

+
+
+ English flag +

Choose an identity provider

+

The Service you are trying to access requires you to choose an identityprovider (e.g. your university/college) from the list above before you can log in.

+

What is an identity provider?
+ What is SWAMID? +

+

- The SWAMID federation is an activity of the Swedish Alliance for Middleware Infrastructure. SWAMID is in part based on Shibboleth from Internet2. If you need assistance or require information send an e-mail to SWAMID support with a description of the problem.

- - - - - - +
+ - + -- cgit v1.1 From a6e4369dcc095f7827040df2753d4e193d3b5fdf Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 18:59:06 +0200 Subject: remove focus --- src/main/webapp/wayf-swamid.jsp | 106 ---------------------------------------- 1 file changed, 106 deletions(-) (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp index 300d630..9a7b989 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -42,9 +42,6 @@ Identity Provider Selection - - - @@ -166,108 +163,5 @@ If you need assistance or require information send an e-mail to - - - - - - - - - - - - - - -- cgit v1.1 From 7ada8a54d60b462efedd1a9be8001b4387826baa Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 23:07:49 +0200 Subject: cleanup and a gs tab for the default wayf --- src/main/webapp/wayf-swamid.jsp | 45 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp index 9a7b989..a1d5abe 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -10,26 +10,7 @@ <%request.setCharacterEncoding("UTF-8");%> <%response.setCharacterEncoding("UTF-8");%> - - - - - - - - - + @@ -42,6 +23,30 @@ Identity Provider Selection + -- cgit v1.1 From dd972ffbf8d030658b20023b210814ccadd0e829 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 23:11:16 +0200 Subject: better footer text --- src/main/webapp/wayf-swamid.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp index a1d5abe..5695d87 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -164,7 +164,8 @@

The SWAMID federation is an activity of the Swedish Alliance for Middleware Infrastructure. SWAMID is in part based on Shibboleth from Internet2. -If you need assistance or require information send an e-mail to SWAMID support with a description of the problem. +If you need assistance with your identity contact your primary identity provider. If you need assistance with the service you are trying to use contact the owner of that service. +To get in touch with the SWAMID operations team use the feedback tab on this page.

-- cgit v1.1 From e111b3744f6a5bd9bb759187947caca221580cfc Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 23:12:24 +0200 Subject: better footer text --- src/main/webapp/wayf-swamid.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp index 5695d87..6b9e9b0 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -164,7 +164,7 @@

The SWAMID federation is an activity of the Swedish Alliance for Middleware Infrastructure. SWAMID is in part based on Shibboleth from Internet2. -If you need assistance with your identity contact your primary identity provider. If you need assistance with the service you are trying to use contact the owner of that service. +If you need assistance with your identity, contact your primary identity provider. If you need assistance with the service you are trying to use, contact the owner of that service. To get in touch with the SWAMID operations team use the feedback tab on this page.

-- cgit v1.1 From b2a725444eee1856028cbe16ff813dd81bbf0df0 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 23:15:08 +0200 Subject: better footer text --- src/main/webapp/wayf-swamid.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/webapp/wayf-swamid.jsp') diff --git a/src/main/webapp/wayf-swamid.jsp b/src/main/webapp/wayf-swamid.jsp index 6b9e9b0..8ed6e45 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -162,10 +162,10 @@

-The SWAMID federation is an activity of the Swedish Alliance for Middleware Infrastructure. -SWAMID is in part based on Shibboleth from Internet2. -If you need assistance with your identity, contact your primary identity provider. If you need assistance with the service you are trying to use, contact the owner of that service. -To get in touch with the SWAMID operations team use the feedback tab on this page. +The SWAMID federation is a SUNET service, developed by +the Swedish Alliance for Middleware Infrastructure. If you need assistance with your identity, contact your +primary identity provider. If you need assistance with the service you are trying to use, contact the owner of that service. To get in touch +with the SWAMID operations team use the feedback tab on this page.

-- cgit v1.1