From df74919eba10a00eb083daf3c90c7ac75644af6b Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 14 Jul 2010 13:02:22 +0200 Subject: swamid config --- src/installer/resources/install.properties | 2 +- src/installer/resources/wayfconfig.xml | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties index 6de85c4..ae3bea0 100644 --- a/src/installer/resources/install.properties +++ b/src/installer/resources/install.properties @@ -1,2 +1,2 @@ -#Mon Jun 28 14:25:15 CEST 2010 +#Wed Jul 14 12:58:23 CEST 2010 ds.home=/opt/shibboleth-ds diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index a797b54..d511d92 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -72,10 +72,9 @@ --> - + - @@ -163,7 +163,7 @@ provideListOfList="false" default="false" jspFile="/javascript.jsp"> - + -- cgit v1.1 From 6977cbe00e4fe6f3bb8023c0c02d7e987c49997f Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 14 Jul 2010 17:32:53 +0200 Subject: fewer urls should work... --- src/installer/resources/install.properties | 2 +- src/installer/resources/wayfconfig.xml | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties index ae3bea0..c10e185 100644 --- a/src/installer/resources/install.properties +++ b/src/installer/resources/install.properties @@ -1,2 +1,2 @@ -#Wed Jul 14 12:58:23 CEST 2010 +#Wed Jul 14 17:28:34 CEST 2010 ds.home=/opt/shibboleth-ds diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index 26e2c75..e034303 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -167,19 +167,11 @@ - + - - - - - - - - - + -- cgit v1.1 From 7341a1db38ff9d72de2fe3fb186715ffb4004f1a Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 14 Jul 2010 17:34:10 +0200 Subject: ignore more --- .gitignore | 1 + src/installer/resources/install.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9e7d271 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +src/installer/resources/install.properties diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties index c10e185..278d686 100644 --- a/src/installer/resources/install.properties +++ b/src/installer/resources/install.properties @@ -1,2 +1,2 @@ -#Wed Jul 14 17:28:34 CEST 2010 +#Wed Jul 14 17:33:27 CEST 2010 ds.home=/opt/shibboleth-ds -- cgit v1.1 From e56c794705028420a06122a9da0f7895394ae66f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Jul 2010 17:35:23 +0200 Subject: remove generated file from repo --- src/installer/resources/install.properties | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 src/installer/resources/install.properties diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties deleted file mode 100644 index c10e185..0000000 --- a/src/installer/resources/install.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Wed Jul 14 17:28:34 CEST 2010 -ds.home=/opt/shibboleth-ds -- cgit v1.1 From f1ab5bb6e64afac460f77ea57c37ecb59f09957d Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 14 Jul 2010 18:01:44 +0200 Subject: java regexp matching implicitly matches whole string --- src/installer/resources/wayfconfig.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index e034303..1817b87 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -167,11 +167,11 @@ - + - + -- cgit v1.1 From 075171ef09818d78b12bfc3fa5b1a299b026f245 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Jul 2010 22:21:01 +0200 Subject: working skin --- src/installer/resources/wayfconfig.xml | 14 +- src/main/webapp/_lvs.txt | 1 + src/main/webapp/images/flagga_uk.gif | Bin 0 -> 98 bytes src/main/webapp/images/swami2.png | Bin 0 -> 4269 bytes src/main/webapp/images/swami2_old.png | Bin 0 -> 2432 bytes src/main/webapp/images/swedish-flag.png | Bin 0 -> 154 bytes src/main/webapp/wayf-sunet.css | 118 ++++++ src/main/webapp/wayf-sunet.jsp | 643 +++++++++++++++++++++++++++++++ src/main/webapp/wayf-swamid.css | 102 +++++ src/main/webapp/wayf-swamid.jsp | 651 ++++++++++++++++++++++++++++++++ src/main/webapp/wayferror-sunet.jsp | 38 ++ src/main/webapp/wayferror-swamid.jsp | 38 ++ 12 files changed, 1594 insertions(+), 11 deletions(-) create mode 100644 src/main/webapp/_lvs.txt create mode 100755 src/main/webapp/images/flagga_uk.gif create mode 100644 src/main/webapp/images/swami2.png create mode 100755 src/main/webapp/images/swami2_old.png create mode 100755 src/main/webapp/images/swedish-flag.png create mode 100644 src/main/webapp/wayf-sunet.css create mode 100644 src/main/webapp/wayf-sunet.jsp create mode 100644 src/main/webapp/wayf-swamid.css create mode 100644 src/main/webapp/wayf-swamid.jsp create mode 100644 src/main/webapp/wayferror-sunet.jsp create mode 100644 src/main/webapp/wayferror-swamid.jsp diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index 1817b87..d47a631 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -129,14 +129,6 @@ --> - - - - - @@ -149,7 +141,7 @@ explicit metadata sources. (The default is to use all metadata sources) - + @@ -167,11 +159,11 @@ - + - + diff --git a/src/main/webapp/_lvs.txt b/src/main/webapp/_lvs.txt new file mode 100644 index 0000000..7f88982 --- /dev/null +++ b/src/main/webapp/_lvs.txt @@ -0,0 +1 @@ +ds diff --git a/src/main/webapp/images/flagga_uk.gif b/src/main/webapp/images/flagga_uk.gif new file mode 100755 index 0000000..e000375 Binary files /dev/null and b/src/main/webapp/images/flagga_uk.gif differ diff --git a/src/main/webapp/images/swami2.png b/src/main/webapp/images/swami2.png new file mode 100644 index 0000000..98ac663 Binary files /dev/null and b/src/main/webapp/images/swami2.png differ diff --git a/src/main/webapp/images/swami2_old.png b/src/main/webapp/images/swami2_old.png new file mode 100755 index 0000000..ede4d64 Binary files /dev/null and b/src/main/webapp/images/swami2_old.png differ diff --git a/src/main/webapp/images/swedish-flag.png b/src/main/webapp/images/swedish-flag.png new file mode 100755 index 0000000..37cd0f9 Binary files /dev/null and b/src/main/webapp/images/swedish-flag.png differ diff --git a/src/main/webapp/wayf-sunet.css b/src/main/webapp/wayf-sunet.css new file mode 100644 index 0000000..5cefe8d --- /dev/null +++ b/src/main/webapp/wayf-sunet.css @@ -0,0 +1,118 @@ +body { + background-color: #CCCCCC; + text-align: center; + color: #000000; + text-align: left; + font: normal 68.75%/1.6em Verdana, Arial, Helvetica, sans-serif; +} + + +img { + border: 0; +} + +li { + font-size: 100%; + list-style-type: none; +} + +p { + color: #000; + margin-top: 0.5em; + padding-right: 1.5em; +} + +.text { + padding-right: 4em; +} + +.selector p { + margin: 1em 0 0 0; + padding: 0; +} + +h1, h2, h3 { + color: #000; + margin: 0; +} + + +form div { border-bottom: 1px solid #CCCCCC; padding-bottom: 10px;} +h2 { margin-top: 10px; } + +a.external-link {background: url(external.png) no-repeat 100% 42%; padding-right: 14px; } + +span.option { + font-size: 100%; + font-weight: bold; +} + +.error { + font-size: 100%; + color: #990000; +} + +#container { + width: 780px; + margin: 0 auto; + padding: 0; +} + +.head { + background-color: #00a67c; + padding: 1em; +} + +.content { + background-color: #FFFFFF; + padding: 2.5em 1.5em; +} + +.content-left { + float: left; + width: 50%; +} + +.content-right { +} + + +.selector { + padding: 1em 1em 2em 1em; + margin: 2.5em 0 1em 0; + border: 1px solid #00a67c; + background: #ccede5; +} + +.footer { + border-top: 1px solid #CCCCCC; + background-color: #FFFFFF; + padding: 1em 1.5em; +} + +span.warning { + font-size: 80%; +} + +.logo { + text-align: center; + margin-top: 1.5em; +} + +div.dropdown { + -moz-box-sizing: border-box; + box-sizing: border-box; + border: 1px solid black; + position: absolute; +} + +div.dropdown div { + background-color: white; + cursor: default; + padding: 0px 3px; +} + +div.dropdown div.current { + background-color: #3366cc; + color: white; +} diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp new file mode 100644 index 0000000..e42e618 --- /dev/null +++ b/src/main/webapp/wayf-sunet.jsp @@ -0,0 +1,643 @@ + + +<%@ 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? +

+
+ +
+ + +

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. +

+
+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/wayf-swamid.css b/src/main/webapp/wayf-swamid.css new file mode 100644 index 0000000..d89008a --- /dev/null +++ b/src/main/webapp/wayf-swamid.css @@ -0,0 +1,102 @@ +body { + margin: 0; + padding: 0; +} + +body { + background-color: #CCCCCC; + text-align: center; + color: #000000; + text-align: left; + font: normal 68.75%/1.6em Verdana, Arial, Helvetica, sans-serif; +} + + +img { + border: 0; +} + +li { + font-size: 100%; + list-style-type: none; +} + +p { + color: #000; + margin-top: 0.5em; + padding-right: 1.5em; +} + +.text { + padding-right: 4em; +} + + +.selector p { + margin: 1em 0 0 0; + padding: 0; +} + +h1, h2, h3 { + color: #000; + margin: 0; +} + +a.external-link { background: url(external.png) no-repeat 100% 42%; padding-right: 14px; } + +span.option { + font-size: 100%; + font-weight: bold; +} + +.error { + font-size: 100%; + color: #990000; +} + +#container { + width: 780px; + margin: 0 auto; + padding: 0; +} + +.head { + background-color: #00a67c; + padding: 1em; +} + +.content { + background-color: #FFFFFF; + padding: 2.5em 1.5em; +} + +.content-left { + float: left; + width: 50%; +} + +.content-right { +} + + +.selector { + width: 42% ; + padding: 1em 1em 2em 1em; + margin: 2.5em 0 1em 0; + border: 1px solid #00a67c; background: #ccede5; +} + +.footer { + border-top: 1px solid #CCCCCC; + background-color: #FFFFFF; + padding: 1em 1.5em; +} + +span.warning { + font-size: 80%; +} + +.logo { + text-align: center; + margin-top: 1.5em; +} 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. +

+
+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/wayferror-sunet.jsp b/src/main/webapp/wayferror-sunet.jsp new file mode 100644 index 0000000..1c04f72 --- /dev/null +++ b/src/main/webapp/wayferror-sunet.jsp @@ -0,0 +1,38 @@ + + + <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> + <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> + + + + + + + + Access System Failure + + + +
+Logo +

Inter-institutional Access System Failure

+
+ +

The inter-institutional access system experienced a technical failure.

+ +

Please email administrator's name and include the following error message:

+ + +

WAYF failure at ()

+ +

+ + +

The DiscoveryService should not be called directly

+ + + + + diff --git a/src/main/webapp/wayferror-swamid.jsp b/src/main/webapp/wayferror-swamid.jsp new file mode 100644 index 0000000..a0cb29d --- /dev/null +++ b/src/main/webapp/wayferror-swamid.jsp @@ -0,0 +1,38 @@ + + + <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> + <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> + + + + + + + + Access System Failure + + + +
+Logo +

Inter-institutional Access System Failure

+
+ +

The inter-institutional access system experienced a technical failure.

+ +

Please email administrator's name and include the following error message:

+ + +

WAYF failure at ()

+ +

+ + +

The DiscoveryService should not be called directly

+ + + + + \ No newline at end of file -- cgit v1.1 From 04d464c7d27d850e51b3f082d92862f1a3c03d9e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Jul 2010 22:32:52 +0200 Subject: alias for wayf.swamid.se to ds.sunet.se --- src/installer/resources/wayfconfig.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index d47a631..f6c468b 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -167,4 +167,8 @@ + + + + -- 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.css | 34 +++++++++++++++++++++++++--------- src/main/webapp/wayf-swamid.jsp | 16 ++++------------ 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/main/webapp/wayf-swamid.css b/src/main/webapp/wayf-swamid.css index d89008a..5cefe8d 100644 --- a/src/main/webapp/wayf-swamid.css +++ b/src/main/webapp/wayf-swamid.css @@ -1,9 +1,4 @@ body { - margin: 0; - padding: 0; -} - -body { background-color: #CCCCCC; text-align: center; color: #000000; @@ -31,7 +26,6 @@ p { padding-right: 4em; } - .selector p { margin: 1em 0 0 0; padding: 0; @@ -42,7 +36,11 @@ h1, h2, h3 { margin: 0; } -a.external-link { background: url(external.png) no-repeat 100% 42%; padding-right: 14px; } + +form div { border-bottom: 1px solid #CCCCCC; padding-bottom: 10px;} +h2 { margin-top: 10px; } + +a.external-link {background: url(external.png) no-repeat 100% 42%; padding-right: 14px; } span.option { font-size: 100%; @@ -80,10 +78,10 @@ span.option { .selector { - width: 42% ; padding: 1em 1em 2em 1em; margin: 2.5em 0 1em 0; - border: 1px solid #00a67c; background: #ccede5; + border: 1px solid #00a67c; + background: #ccede5; } .footer { @@ -100,3 +98,21 @@ span.warning { text-align: center; margin-top: 1.5em; } + +div.dropdown { + -moz-box-sizing: border-box; + box-sizing: border-box; + border: 1px solid black; + position: absolute; +} + +div.dropdown div { + background-color: white; + cursor: default; + padding: 0px 3px; +} + +div.dropdown div.current { + background-color: #3366cc; + color: white; +} 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 --- lib/bcprov-ext-jdk15-1.40.jar | Bin 1603682 -> 0 bytes lib/jargs-1.0.jar | Bin 11406 -> 0 bytes lib/jcl-over-slf4j-1.5.5.jar | Bin 16746 -> 0 bytes lib/joda-time-1.5.2.jar | Bin 531326 -> 0 bytes lib/log4j-over-slf4j-1.5.5.jar | Bin 9665 -> 0 bytes lib/logback-classic-0.9.13.jar | Bin 146846 -> 0 bytes lib/logback-core-0.9.13.jar | Bin 219456 -> 0 bytes lib/opensaml-2.2.3.jar | Bin 1249375 -> 0 bytes lib/openws-1.2.2.jar | Bin 119232 -> 0 bytes lib/shibboleth-discovery-service-1.1.0.jar | Bin 56599 -> 0 bytes lib/slf4j-api-1.5.6.jar | Bin 22338 -> 0 bytes lib/xmlsec-1.4.2.jar | Bin 444503 -> 0 bytes lib/xmltooling-1.2.0.jar | Bin 577978 -> 0 bytes src/installer/resources/wayfconfig.xml | 22 +- src/main/webapp/css/reset.css | 49 ++ src/main/webapp/css/sunet.css | 275 ++++++++++++ .../ui-lightness/images/ui-anim_basic_16x16.gif | Bin 0 -> 1553 bytes .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 0 -> 260 bytes .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 0 -> 251 bytes .../images/ui-bg_flat_10_000000_40x100.png | Bin 0 -> 178 bytes .../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 0 -> 104 bytes .../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 0 -> 125 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../images/ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 0 -> 3762 bytes .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 0 -> 90 bytes .../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 0 -> 129 bytes .../images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_228ef1_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_ef8c08_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_ffd27a_256x240.png | Bin 0 -> 5355 bytes .../images/ui-icons_ffffff_256x240.png | Bin 0 -> 4369 bytes .../css/ui-lightness/jquery-ui-1.8.2.custom.css | 359 +++++++++++++++ src/main/webapp/images/RSS_mini.png | Bin 0 -> 634 bytes src/main/webapp/images/act_bg.png | Bin 0 -> 2915 bytes src/main/webapp/images/date_bg.jpg | Bin 0 -> 12339 bytes src/main/webapp/images/glob.jpg | Bin 0 -> 25039 bytes src/main/webapp/images/globe.jpg | Bin 0 -> 9637 bytes src/main/webapp/images/header.jpg | Bin 0 -> 63437 bytes src/main/webapp/images/logo.jpg | Bin 13660 -> 19292 bytes src/main/webapp/images/sv_search.jpg | Bin 0 -> 14148 bytes src/main/webapp/js/jquery-1.4.2.min.js | 154 +++++++ src/main/webapp/js/jquery-ui-1.8.2.custom.min.js | 99 +++++ src/main/webapp/wayf-sunet.css | 119 +---- src/main/webapp/wayf-sunet.jsp | 495 ++++++--------------- src/main/webapp/wayf-swamid.css | 6 +- src/main/webapp/wayf-swamid.jsp | 153 +++---- 46 files changed, 1138 insertions(+), 593 deletions(-) delete mode 100644 lib/bcprov-ext-jdk15-1.40.jar delete mode 100644 lib/jargs-1.0.jar delete mode 100644 lib/jcl-over-slf4j-1.5.5.jar delete mode 100644 lib/joda-time-1.5.2.jar delete mode 100644 lib/log4j-over-slf4j-1.5.5.jar delete mode 100644 lib/logback-classic-0.9.13.jar delete mode 100644 lib/logback-core-0.9.13.jar delete mode 100644 lib/opensaml-2.2.3.jar delete mode 100644 lib/openws-1.2.2.jar delete mode 100644 lib/shibboleth-discovery-service-1.1.0.jar delete mode 100644 lib/slf4j-api-1.5.6.jar delete mode 100644 lib/xmlsec-1.4.2.jar delete mode 100644 lib/xmltooling-1.2.0.jar create mode 100644 src/main/webapp/css/reset.css create mode 100644 src/main/webapp/css/sunet.css create mode 100644 src/main/webapp/css/ui-lightness/images/ui-anim_basic_16x16.gif create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-icons_222222_256x240.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-icons_228ef1_256x240.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-icons_ef8c08_256x240.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-icons_ffd27a_256x240.png create mode 100644 src/main/webapp/css/ui-lightness/images/ui-icons_ffffff_256x240.png create mode 100644 src/main/webapp/css/ui-lightness/jquery-ui-1.8.2.custom.css create mode 100644 src/main/webapp/images/RSS_mini.png create mode 100644 src/main/webapp/images/act_bg.png create mode 100644 src/main/webapp/images/date_bg.jpg create mode 100644 src/main/webapp/images/glob.jpg create mode 100644 src/main/webapp/images/globe.jpg create mode 100644 src/main/webapp/images/header.jpg create mode 100644 src/main/webapp/images/sv_search.jpg create mode 100644 src/main/webapp/js/jquery-1.4.2.min.js create mode 100644 src/main/webapp/js/jquery-ui-1.8.2.custom.min.js diff --git a/lib/bcprov-ext-jdk15-1.40.jar b/lib/bcprov-ext-jdk15-1.40.jar deleted file mode 100644 index 5fb6c1d..0000000 Binary files a/lib/bcprov-ext-jdk15-1.40.jar and /dev/null differ diff --git a/lib/jargs-1.0.jar b/lib/jargs-1.0.jar deleted file mode 100644 index cdbc80b..0000000 Binary files a/lib/jargs-1.0.jar and /dev/null differ diff --git a/lib/jcl-over-slf4j-1.5.5.jar b/lib/jcl-over-slf4j-1.5.5.jar deleted file mode 100644 index f97cf3d..0000000 Binary files a/lib/jcl-over-slf4j-1.5.5.jar and /dev/null differ diff --git a/lib/joda-time-1.5.2.jar b/lib/joda-time-1.5.2.jar deleted file mode 100644 index 247898f..0000000 Binary files a/lib/joda-time-1.5.2.jar and /dev/null differ diff --git a/lib/log4j-over-slf4j-1.5.5.jar b/lib/log4j-over-slf4j-1.5.5.jar deleted file mode 100644 index d329877..0000000 Binary files a/lib/log4j-over-slf4j-1.5.5.jar and /dev/null differ diff --git a/lib/logback-classic-0.9.13.jar b/lib/logback-classic-0.9.13.jar deleted file mode 100644 index e2c1bf8..0000000 Binary files a/lib/logback-classic-0.9.13.jar and /dev/null differ diff --git a/lib/logback-core-0.9.13.jar b/lib/logback-core-0.9.13.jar deleted file mode 100644 index cce9a6d..0000000 Binary files a/lib/logback-core-0.9.13.jar and /dev/null differ diff --git a/lib/opensaml-2.2.3.jar b/lib/opensaml-2.2.3.jar deleted file mode 100644 index 2712f80..0000000 Binary files a/lib/opensaml-2.2.3.jar and /dev/null differ diff --git a/lib/openws-1.2.2.jar b/lib/openws-1.2.2.jar deleted file mode 100644 index b66347c..0000000 Binary files a/lib/openws-1.2.2.jar and /dev/null differ diff --git a/lib/shibboleth-discovery-service-1.1.0.jar b/lib/shibboleth-discovery-service-1.1.0.jar deleted file mode 100644 index a2083c7..0000000 Binary files a/lib/shibboleth-discovery-service-1.1.0.jar and /dev/null differ diff --git a/lib/slf4j-api-1.5.6.jar b/lib/slf4j-api-1.5.6.jar deleted file mode 100644 index d794252..0000000 Binary files a/lib/slf4j-api-1.5.6.jar and /dev/null differ diff --git a/lib/xmlsec-1.4.2.jar b/lib/xmlsec-1.4.2.jar deleted file mode 100644 index 6753cec..0000000 Binary files a/lib/xmlsec-1.4.2.jar and /dev/null differ diff --git a/lib/xmltooling-1.2.0.jar b/lib/xmltooling-1.2.0.jar deleted file mode 100644 index 3837ea9..0000000 Binary files a/lib/xmltooling-1.2.0.jar and /dev/null differ diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index f6c468b..9ebdd12 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -131,11 +131,13 @@ - + + - - - + English flag +

Recently used identity providers

+
@@ -221,306 +246,41 @@ " /> " /> - " /> - + " /> + " /> " /> " /> - +
+
- + +
+
+ +
- - - - - - - -
"> -
- - " /> - " /> - " /> - - " /> - - - - " /> - " /> - " /> - - - - - - - -
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. -

-
- +
- + @@ -640,4 +398,3 @@ var theElements = [ - diff --git a/src/main/webapp/wayf-swamid.css b/src/main/webapp/wayf-swamid.css index 5cefe8d..a5f171b 100644 --- a/src/main/webapp/wayf-swamid.css +++ b/src/main/webapp/wayf-swamid.css @@ -31,16 +31,16 @@ p { padding: 0; } -h1, h2, h3 { +h1, h3 { color: #000; margin: 0; } form div { border-bottom: 1px solid #CCCCCC; padding-bottom: 10px;} -h2 { margin-top: 10px; } +h2 { margin-top: 10px; margin-bottom: 10px; } -a.external-link {background: url(external.png) no-repeat 100% 42%; padding-right: 14px; } +a.external-link {background: url(external.png) no-repeat 100% 42%; padding-right: 14px;} span.option { font-size: 100%; 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 76893e7fa364a4b3d388df57cad45d73a85841d6 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sun, 18 Jul 2010 23:09:31 +0200 Subject: gs feedback tab --- src/main/webapp/wayf-sunet.jsp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index 3e54c70..a900037 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -147,6 +147,30 @@ +
-- 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-sunet.jsp | 30 +-- src/main/webapp/wayf-swamid.css | 49 ++--- src/main/webapp/wayf-swamid.jsp | 477 +++++++--------------------------------- 3 files changed, 100 insertions(+), 456 deletions(-) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index a900037..a7f7299 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -183,7 +183,7 @@

Authentication required

-

Type the name of your home organization or select from the list below

+

Select your identity provider from the list

"> @@ -202,7 +202,7 @@ " /> - + - + " /> + " /> + " /> + + " /> + + + + " /> + " /> + " /> + + + + + + +
+ +
+
+ +

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-sunet.jsp | 108 ---------------------------------------- src/main/webapp/wayf-swamid.jsp | 106 --------------------------------------- 2 files changed, 214 deletions(-) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index a7f7299..7858cdd 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -143,9 +143,6 @@ Identity Provider Selection - - - - - - - - - - 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 90e2afe34d1dbf142e3a2dc47531cefefcafb6ed Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 23:02:58 +0200 Subject: footer text --- src/main/webapp/wayf-sunet.jsp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index 7858cdd..cd57278 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -299,6 +299,9 @@
+ 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 5773deebafa7414cefc17d6512e068f2eab1766e Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 23:04:29 +0200 Subject: footer text --- src/main/webapp/wayf-sunet.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index cd57278..3eedea9 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -301,7 +301,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 or require information send an e-mail to SWAMID support with a description of the problem. +If you need assistance or require information contact your primary identity provider or use the feedback tab.
-- 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-sunet.jsp | 122 +--------------------------------------- src/main/webapp/wayf-swamid.jsp | 45 ++++++++------- 2 files changed, 26 insertions(+), 141 deletions(-) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index 3eedea9..b28de5f 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -10,40 +10,7 @@ <%request.setCharacterEncoding("UTF-8");%> <%response.setCharacterEncoding("UTF-8");%> - - - - - - - - - - - - - - + @@ -52,93 +19,6 @@ - - - - - - - - - Identity Provider Selection 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-sunet.jsp | 3 ++- src/main/webapp/wayf-swamid.jsp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index b28de5f..85e5082 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -181,7 +181,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 contact your primary identity provider or use the feedback tab. +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.
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-sunet.jsp | 2 +- src/main/webapp/wayf-swamid.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index 85e5082..fb02e4a 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -181,7 +181,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.
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-sunet.jsp | 8 ++++---- src/main/webapp/wayf-swamid.jsp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/wayf-sunet.jsp b/src/main/webapp/wayf-sunet.jsp index fb02e4a..f172a81 100644 --- a/src/main/webapp/wayf-sunet.jsp +++ b/src/main/webapp/wayf-sunet.jsp @@ -179,10 +179,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.
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 From ba996feb06597a4ff151ef7617d1008a0aa36271 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 23:18:37 +0200 Subject: better footer text --- src/main/webapp/css/sunet.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/css/sunet.css b/src/main/webapp/css/sunet.css index 9907f69..5c34baa 100644 --- a/src/main/webapp/css/sunet.css +++ b/src/main/webapp/css/sunet.css @@ -142,9 +142,9 @@ html, body { border-bottom: 2px solid #EBEBEB; } #footerText { - padding: 20px 0 0; + padding: 10px 0 0; color: #999999; - font-size: 12px; + font-size: 10px; } .blockCont { border-top: 6px solid #c0c0c0; -- cgit v1.1 From b5b4e8d1ebf824defc52d3340acf439c69a059d1 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 19 Jul 2010 23:20:16 +0200 Subject: better footer text --- src/main/webapp/wayf-swamid.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/wayf-swamid.css b/src/main/webapp/wayf-swamid.css index 4bef65c..68bf894 100644 --- a/src/main/webapp/wayf-swamid.css +++ b/src/main/webapp/wayf-swamid.css @@ -85,6 +85,7 @@ span.option { border-top: 1px solid #CCCCCC; background-color: #FFFFFF; padding: 1em 1.5em; + font-size: 10px; } span.warning { -- cgit v1.1