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/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 +++---- 33 files changed, 1138 insertions(+), 593 deletions(-) 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 (limited to 'src') 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
- - - -
-

- - -

-
-
-
- - - - + - + @@ -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 + + + + + + +
@@ -189,7 +194,7 @@ - ?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="> + ?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="> @@ -198,8 +203,7 @@ ?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="> - +

@@ -221,71 +225,26 @@ " /> " /> - " /> - + " /> + " /> " /> " /> - +
- - - + @@ -602,37 +560,35 @@ function changedFed(X, Selected) { empty array. --> - + @@ -640,4 +596,3 @@ var theElements = [ - -- cgit v1.1