diff options
author | Leif Johansson <leifj@sunet.se> | 2010-07-19 14:22:34 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2010-07-19 14:22:34 +0200 |
commit | 6298cd715dedc7ea55cf2d5c5271abd333093cb5 (patch) | |
tree | c6f0d12dbd60e230e3c9ce66fdb52c847f83fb27 /src/main/webapp | |
parent | 76893e7fa364a4b3d388df57cad45d73a85841d6 (diff) |
cleanup ui based on first round of comments
Diffstat (limited to 'src/main/webapp')
-rw-r--r-- | src/main/webapp/wayf-sunet.jsp | 30 | ||||
-rw-r--r-- | src/main/webapp/wayf-swamid.css | 49 | ||||
-rw-r--r-- | 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 @@ <div class="content"> <div class="contL"> <h1>Authentication required</h1> - <p class="intro">Type the name of your home organization or select from the list below</p> + <p class="intro">Select your identity provider from the list</p> <logic:present name="sites" scope="request"><logic:notPresent name="siteLists" scope="request"> <form style="margin-bottom: 10px;" id="originform" method="get" action="<bean:write name="requestURL" />"> @@ -202,7 +202,7 @@ <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> </logic:present> <input type="hidden" name="action" value="selection" /> - <input type="text" id="originSearch" name="string" value="" tabindex="25" size="30"/> + <!-- input type="text" id="originSearch" name="string" value="" tabindex="25" size="30"/ --> <select name="origin" id="origin" tabindex="40"> <logic:iterate id="site" name="sites"> <option value="<jsp:getProperty name="site" property="name" />"> @@ -210,7 +210,7 @@ </option> </logic:iterate> </select> - <input type="submit" value="Select" tabindex="50" /> + <input type="submit" id="originsubmit" value="Select" tabindex="50" /> <select name="cache" tabindex="60"> <option value="false"> Do not remember</option> <option value="session" selected="selected"> Remember for session</option> @@ -375,20 +375,13 @@ function changedFed(X, Selected) { </logic:present> <logic:present name="sites" scope="request"> - -<logic:present name="showComments" scope="Request"> - <!-- Load the autosuggest code. - - PROGRAMMING NOTE - the "ie6Hack" is to do with an issue in ie6 in which the - psuedo drop down floats below the real dropdown. The hack is that we jsut disable - the real drop down when the pseudo one is about. This can seem weird for some - layouts and so if you are not deploying against ie6 you can just send an - empty array. - --> -</logic:present> - <script language="javascript" type="text/javascript"> -<!-- +$(function() { + $('#origin').focus(); +}); + </script> + + <!-- script language="javascript" type="text/javascript"> $(function() { var idps = [ <logic:iterate id="site" name="sites"> @@ -415,10 +408,7 @@ $(function() { //$('.button').button(); //$('select').selectmenu({style: 'dropdown'}); }); ---> - </script> + </script --> </logic:present> - - </body> </html> diff --git a/src/main/webapp/wayf-swamid.css b/src/main/webapp/wayf-swamid.css index a5f171b..4bef65c 100644 --- a/src/main/webapp/wayf-swamid.css +++ b/src/main/webapp/wayf-swamid.css @@ -11,11 +11,6 @@ img { border: 0; } -li { - font-size: 100%; - list-style-type: none; -} - p { color: #000; margin-top: 0.5em; @@ -26,20 +21,13 @@ p { padding-right: 4em; } -.selector p { - margin: 1em 0 0 0; - padding: 0; -} - -h1, h3 { +h1, h2, h3 { color: #000; margin: 0; + margin-bottom: 10px; } -form div { border-bottom: 1px solid #CCCCCC; padding-bottom: 10px;} -h2 { margin-top: 10px; margin-bottom: 10px; } - a.external-link {background: url(external.png) no-repeat 100% 42%; padding-right: 14px;} span.option { @@ -73,8 +61,7 @@ span.option { width: 50%; } -.content-right { -} +.content-right { } .selector { @@ -83,7 +70,17 @@ span.option { border: 1px solid #00a67c; background: #ccede5; } - + +.selector-left { + float: left; + width: 70%; +} + + +.selector-right { float: right; width: 30% } + +.selector-right ul, .selector-right li { margin-left: -5px; margin-top: 1px; list-style: disc;} + .footer { border-top: 1px solid #CCCCCC; background-color: #FFFFFF; @@ -98,21 +95,3 @@ 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 631ee53..300d630 100644 --- a/src/main/webapp/wayf-swamid.jsp +++ b/src/main/webapp/wayf-swamid.jsp @@ -31,20 +31,6 @@ <jsp:useBean id="requestURL" scope="request" class="java.lang.String"/> -<logic:present name="showComments" scope="Request"> - -<!-- PROGRAMMING NOTE - - shire, target, provider and time are all part of the Shibboleth - 1.3 discovery protocol and need to be specified as parameters to the WAYF - - entityID, return, returnIDParam are all part of the - SAML Discovery protocol. - - ---> -</logic:present> - <logic:notPresent name="entityID" scope="request"> <logic:notPresent name="shire" scope="request"> @@ -53,148 +39,72 @@ </logic:notPresent> -<logic:present name="showComments" scope="Request"> - -<!-- PROGRAMMING NOTE - In addition to the above. The WAYF may also supply the following to - the jsp. - - "cookieList" If this exists it represents the contents of the - _saml_idp cookie (possibly filtered to remove IdPs which - cannot serve the SP). It is a Collection of IdPSite objects, - which themselves have the following properties: - - "name" The uri for the IdP, which needs to be returned to the - WAYF in the "origin" parameter. - - "displayName" User friendly name (taken from its alias) - - "addressFor" The (ungarnished) URL for the IdP. This could be - used to create a direct hyperlink to the IdP - - "sites" If this exists it contains all the possible IdPs for for - the SP (possibly filtered). It is a Collection of IdPSite - Objects which are described above. This is only present if - provideList was defined true in the configuration. - - "siteLists" If this exists it contains all the possible metadata - files which can service for the SP (possibly filtered). It - is a collection of IdPSiteSetEntry Objects which have two - properties: - - "name" This is the displayName from the Metadata element in - the WAYF configuration file - - "sites" This represents the IdPs. Again it is a collection - of IdPSite Objects - - It is only present if provideListOfList was defined true in - the configuration. - - "singleSiteList" if this is present, then there is only one - IdPSiteSetEntry Object in "siteLists". - - "searchresultempty" If this is present then it means that a - search was performed, but no suitable IdPs were returned. - - "searchresults" If this is present it represents the list of IdPs - which matched a previous search. It is a Collection of - IdPSite Objects. --> - -<!-- PROGRAMMING NOTE - - The jsp communicates back to the WAYF via the parameters listed - above, and: - - "action" what the WAYF has to do. Possible contents are: - - "lookup" - refresh the screen. - "search" - perform a search on the contents parameter "string" - "selection" - redirect to the IdP with the uri "origin" - - "cache" preserve any selection in the _saml_idp cookie. A - value of "session" makes the cookie last for the browser - session, "perm" gives it the lifetime specified in the - configuration file. - - The tabindex is hard wired. Fortunately the standard allows us to - have duplicate numbers and says the order is the order things - get emitted. We use these numbers - - 10 - Recently used sites hyperlinks - 20 - <clear button for above> - 25 - AutoSuggestion - 30 Federation selection - 40 IdP within Selection - 50 Select button - 60 How long to remember selector - 70 Search entry - 80 Search Button - 90 List of search results - 100 Select search result - 110 How long to remember search results - 120 Hyperlink to admin user. - ---> - -</logic:present> - <head> <title>Identity Provider Selection</title> <link rel="stylesheet" title="normal" type="text/css" href="wayf-swamid.css"/> <link rel="stylesheet" title="normal" type="text/css" href="css/ui-lightness/jquery-ui-1.8.2.custom.css"/> - <link rel="stylesheet" title="normal" type="text/css" href="css/ui.selectmenu.css"/> <script language="javascript" type="text/javascript" src="js/jquery-1.4.2.min.js"></script> <script language="javascript" type="text/javascript" src="js/jquery-ui-1.8.2.custom.min.js"></script> - <!-- script language="javascript" type="text/javascript" src="js/ui.selectmenu.js"></script --> </head> <body> <div id="container"> <div class="head"> - <img src="images/swami2.png" alt="SWAMI logotype"> + <img src="images/swami2.png" alt="SWAMI logotype"/> </div> <div class="content"> - <div class="content-left"> - <img src="images/swedish-flag.png" alt="Swedish flag"> - <h2>Välj en identitetsutgivare</h2> - <p>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. </p> - <p><a title="Länken öppnas i ett nytt fönster" href="http://www.swamid.se/pub/jsp/polopoly.jsp?d=6940&a=25649" class="external-link" rel="external">Vad är en identitetsutgivare?</a><br/> - <a title="Länken öppnas i ett nytt fönster" href="http://www.swamid.se/pub/jsp/polopoly.jsp?d=6940" class="external-link" rel="external">Vad är SWAMID?</a></p> - </div> - <div class="content-right"> - <img src="images/flagga_uk.gif" alt="English flag"> - <h2>Choose an identity provider</h2> - <p>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. </p> - <p><a title="Link will open in a new window" href="http://www.swamid.se/pub/jsp/polopoly.jsp?d=6940&a=25650" target="wayf-info" class="external-link" rel="external">What is an identity provider?</a><br/> - <a title="Link will open in a new window" href="http://www.swamid.se/pub/jsp/polopoly.jsp?d=6940" class="external-link" target="wayf-info" rel="external">What is SWAMID?</a> - </p> - </div> - - <div class="selector"> - <logic:present name="cookieList" scope="request"> - - <h2>Recently used:</h2> - -<logic:present name="showComments" scope="Request"> - -<!-- PROGRAMMING NOTE - - Generate a hyperlink back to the WAYF. Note that we are - simulating the user having specified a permanent cookie --> - -</logic:present> + <h1>Authentication required</h1> + <div class="selector"> + <div class="selector-left"> + <h2>Select your identity provider from the list</h2> + <logic:present name="sites" scope="request"><logic:notPresent name="siteLists" scope="request"> + <form id="originform" method="get" action="<bean:write name="requestURL" />"> + <logic:notPresent name="entityID" scope="request"> + <input type="hidden" name="shire" value="<bean:write name="shire" />" /> + <input type="hidden" name="target" value="<bean:write name="target" />" /> + <input type="hidden" name="providerId" value="<bean:write name="providerId" />" /> + <logic:present name="time" scope="request"> + <input type="hidden" name="time" value="<bean:write name="time" />" /> + </logic:present> + </logic:notPresent> + <logic:present name="entityID" scope="request"> + <input type="hidden" name="entityID" value="<bean:write name="entityID" />" /> + <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> + <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> + </logic:present> + <input type="hidden" name="action" value="selection" /> + <!-- input type="text" id="originSearch" name="string" value="" tabindex="25" size="30"/ --> + <select name="origin" id="origin" tabindex="40"> + <logic:iterate id="site" name="sites"> + <option value="<jsp:getProperty name="site" property="name" />"> + <jsp:getProperty name="site" property="displayName" /> + </option> + </logic:iterate> + </select> + <input type="submit" value="Select" tabindex="50" /> + <select name="cache" tabindex="60"> + <option value="false"> Do not remember</option> + <option value="session" selected="selected"> Remember for session</option> + <option value="perm"> Remember for a week</option> + </select> + </form> + </logic:notPresent></logic:present> + </div> + <div class="selector-right"> + <logic:present name="cookieList" scope="request"> + <h2>Recently used</h2> + <ul> <logic:iterate id="site" name="cookieList"> - <p class="text"> + <li> <logic:present name="entityID" scope="request"> <bean:define id="returnIDParam" name="returnIDParam"/> <bean:define id="ei" name="entityID" /> <bean:define id="re" name="returnX"/> - <a tabindex="10" href="<bean:write name="requestURL" />?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=<jsp:getProperty name="site" property="name" />"> + <a href="<bean:write name="requestURL" />?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=<jsp:getProperty name="site" property="name" />"> <jsp:getProperty name="site" property="displayName" /> </a> </logic:present> @@ -202,24 +112,15 @@ <bean:define id="targ" name="target" /> <bean:define id="shire" name="shire" /> <bean:define id="pid" name="providerId" /> - <a tabindex="10" href="<bean:write name="requestURL" />?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=<bean:write name="time" />&cache=perm&action=selection&origin=<jsp:getProperty name="site" property="name" />"> + <a href="<bean:write name="requestURL" />?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=<bean:write name="time" />&cache=perm&action=selection&origin=<jsp:getProperty name="site" property="name" />"> <jsp:getProperty name="site" property="displayName" /> </a> </logic:notPresent> - </p> + </li> </logic:iterate> + </ul> -<logic:present name="showComments" scope="Request"> - -<!-- PROGRAMMING NOTE - - We defined the ClearCache.Wayf service in wayfconfig. So we know - it is here. This will empty the cookie and loop --> - -</logic:present> - - <form method="get" action="ClearCache.wayf" > - <div> + <form method="get" action="ClearCache.wayf"> <logic:notPresent name="entityID" scope="request"> <input type="hidden" name="shire" value="<bean:write name="shire" />" /> <input type="hidden" name="target" value="<bean:write name="target" />" /> @@ -233,267 +134,38 @@ <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> </logic:present> - <input tabindex="20" type="submit" class="ui-widget button" value="Clear" /> - </div> + <input tabindex="20" type="submit" value="Clear List" /> </form> - - </logic:present> <!-- Previous Selections --> - - <h2>Type part of the name or select from the list below:</h2> - - <logic:present name="sites" scope="request"> - <logic:notPresent name="siteLists" scope="request"> - - <form id="originform" method="get" action="<bean:write name="requestURL" />"> - <div> - <logic:notPresent name="entityID" scope="request"> - <input type="hidden" name="shire" value="<bean:write name="shire" />" /> - <input type="hidden" name="target" value="<bean:write name="target" />" /> - <input type="hidden" name="providerId" value="<bean:write name="providerId" />" /> - <logic:present name="time" scope="request"> - <input type="hidden" name="time" value="<bean:write name="time" />" /> - </logic:present> - </logic:notPresent> - <logic:present name="entityID" scope="request"> - <input type="hidden" name="entityID" value="<bean:write name="entityID" />" /> - <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> - <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> - </logic:present> - <input type="hidden" name="action" value="selection" /> - <input type="text" class="ui-widget" id="originSearch" name="string" value="" tabindex="25" size="30"/> - <select name="origin" id="origin" class="ui-widget" tabindex="40"> - <logic:iterate id="site" name="sites"> - <option value="<jsp:getProperty name="site" property="name" />"> - <jsp:getProperty name="site" property="displayName" /> - </option> - </logic:iterate> - </select> - <input type="submit" class="ui-widget button" value="Select" tabindex="50" /> - <select name="cache" tabindex="60" class="ui-widget"> - <option value="false"> Do not remember</option> - <option value="session" selected="selected"> Remember for session</option> - <option value="perm"> Remember for a week</option> - </select> - </div> - </form> - </logic:notPresent> </logic:present> - -<logic:present name="showComments" scope="Request"> - -<!-- PROGRAMMING NOTE - Build two tables side by side, one with the Federation names and 'ALL' (if apposite) - and the other will be dynamically populated with the members of that federation. - - This needs to work in the face of no javascript, so we initially populate the - Right hand list with all the IdPs. The first Selection in the Left hand Table will - shrink this list - - The 'lists of all IdPs' is derived from the one which java gives us (if it did) - otherwise it is derived by a double iteration through the List of Lists. This - makes for complicated looking code, but it's dead simple really. - - --> - -</logic:present> - - <logic:present name="siteLists" scope="request"> - <form method="get" action="<bean:write name="requestURL" />"> - <div> - <logic:notPresent name="entityID" scope="request"> - <input type="hidden" name="shire" value="<bean:write name="shire" />" /> - <input type="hidden" name="target" value="<bean:write name="target" />" /> - <input type="hidden" name="providerId" value="<bean:write name="providerId" />" /> - <logic:present name="time" scope="request"> - <input type="hidden" name="time" value="<bean:write name="time" />" /> - </logic:present> - </logic:notPresent> - <logic:present name="entityID" scope="request"> - <input type="hidden" name="entityID" value="<bean:write name="entityID" />" /> - <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> - <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> - </logic:present> - <table id="tab"> - <tr> - <th>Federation </th> - <th>organization</th> - </tr> - <tr><td> - <select name="FedSelector" size="10" id="FedSelect" tabindex="30" - onchange="changedFed(this.form.origin, - this.form.FedSelector[this.form.FedSelector.selectedIndex].value);"> - <logic:iterate id="siteset" name="siteLists"> - <logic:present name="singleSiteList" scope="request"> - - <!-- Only One site so select it --> - - <option value="<jsp:getProperty name="siteset" property="name"/>" selected="selected"> - <jsp:getProperty name="siteset" property="name"/> - </option> - </logic:present> - <logic:notPresent name="singleSiteList" scope="request"> - <option value="<jsp:getProperty name="siteset" property="name"/>"> - <jsp:getProperty name="siteset" property="name"/> - </option> - </logic:notPresent> - </logic:iterate> - <logic:notPresent name="singleSiteList" scope="request"> - - <!-- More than one site so select the 'All' --> - - <option value="ALL" selected="selected"> - All Sites - </option> - </logic:notPresent> - </select></td><td> - <input type="hidden" name="action" value="selection" /> - <select name="origin" size="10" id="originIdp" tabindex="40"> - <logic:present name="sites" scope="request"> - <logic:iterate id="site" name="sites"> - <option value="<jsp:getProperty name="site" property="name" />"> - <jsp:getProperty name="site" property="displayName" /> - </option> - </logic:iterate> - </logic:present> - - <logic:notPresent name="sites" scope="request"> - <logic:iterate id="siteset" name="siteLists"> - <logic:iterate id="site" name="siteset" property="sites"> - <option value="<jsp:getProperty name="site" property="name" />"> - <jsp:getProperty name="site" property="displayName" /> - </option> - </logic:iterate> - </logic:iterate> - </logic:notPresent> - </select> - </td></tr> - </table> - <p> - <input type="submit" class="ui-widget button" value="Select" tabindex="50" /> - <select name="cache" tabindex="60" > - <option value="false"> Do not remember</option> - <option value="session" selected="selected"> Remember for session</option> - <option value="perm"> Remember for a week</option> - </select> - </p> - </div> - </form> - </logic:present> - </div> - - - <div class="search"> - -<logic:present name="showComments" scope="Request"> - -<!-- This is here for completeness - it shows the "old fashioned way" to do search --> - - <span class="option">or</span> - - <h2>Sök på nyckelord:/Search by keyword:</h2> - - <form method="get" action="<bean:write name="requestURL" />"> - <div> - <p> - - <logic:notPresent name="entityID" scope="request"> - <input type="hidden" name="shire" value="<bean:write name="shire" />" /> - <input type="hidden" name="target" value="<bean:write name="target" />" /> - <input type="hidden" name="providerId" value="<bean:write name="providerId" />" /> - <logic:present name="time" scope="request"> - <input type="hidden" name="time" value="<bean:write name="time" />" /> - </logic:present> - </logic:notPresent> - <logic:present name="entityID" scope="request"> - <input type="hidden" name="entityID" value="<bean:write name="entityID" />" /> - <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> - <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> - </logic:present> - - <input type="hidden" name="action" value="search" /> - <input type="text" name="string" tabindex="70" /> - <input type="submit" class="ui-widget button" value="Search" tabindex="80" /> - </p> - </div> - </form> - -<!-- The end of the old code. Below is where search results go --> - -</logic:present> -<!-- - <logic:present name="searchResultsEmpty" scope="request"> - <p class="error"> - -No provider was found that matches your search criteria, please try again. - - </p> - </logic:present> - - <logic:present name="searchresults" scope="request"> - <h3>Search results:</h3> - <form method="get" action="<bean:write name="requestURL" />"> - <div> - <ul> - <logic:iterate id="currResult" name="searchresults"> - <li> - <input type="radio" name="origin" tabindex="90" value="<jsp:getProperty name="currResult" property="name" />" /> - <jsp:getProperty name="currResult" property="displayName" /> - </li> - </logic:iterate> - </ul> - <p> - <logic:notPresent name="entityID" scope="request"> - <input type="hidden" name="shire" value="<bean:write name="shire" />" /> - <input type="hidden" name="target" value="<bean:write name="target" />" /> - <input type="hidden" name="providerId" value="<bean:write name="providerId" />" /> - <logic:present name="time" scope="request"> - <input type="hidden" name="time" value="<bean:write name="time" />" /> - </logic:present> - </logic:notPresent> - <logic:present name="entityID" scope="request"> - <input type="hidden" name="entityID" value="<bean:write name="entityID" />" /> - <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> - <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> - </logic:present> - <input type="hidden" name="action" value="selection" /> - <input type="submit" class="ui-widget button" value="Select" tabindex="100" /> - <select name="cache" tabindex="100" > - <option value="false"> Do not remember</option> - <option value="session" selected="selected"> Remember for session</option> - <option value="perm"> Remember for a week</option> - </select> - </p> - </div> - </form> - </logic:present> ---> - </div> + </div> + <div style="clear: both;"></div> + </div> + + <div class="content-left"> + <img src="images/swedish-flag.png" alt="Swedish flag"/> + <h2>Välj en identitetsutgivare</h2> + <p>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. </p> + <p><a title="Länken öppnas i ett nytt fönster" href="http://www.swamid.se/pub/jsp/polopoly.jsp?d=6940&a=25649" class="external-link" rel="external">Vad är en identitetsutgivare?</a><br/> + <a title="Länken öppnas i ett nytt fönster" href="http://www.swamid.se/pub/jsp/polopoly.jsp?d=6940" class="external-link" rel="external">Vad är SWAMID?</a></p> + </div> + <div class="content-right"> + <img src="images/flagga_uk.gif" alt="English flag"/> + <h2>Choose an identity provider</h2> + <p>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. </p> + <p><a title="Link will open in a new window" href="http://www.swamid.se/pub/jsp/polopoly.jsp?d=6940&a=25650" target="wayf-info" class="external-link" rel="external">What is an identity provider?</a><br/> + <a title="Link will open in a new window" href="http://www.swamid.se/pub/jsp/polopoly.jsp?d=6940" class="external-link" target="wayf-info" rel="external">What is SWAMID?</a> + </p> + </div> </div> <div class="footer"> <p class="text"> -<!--CONFIG--> The <a href="http://www.swamid.se">SWAMID federation</a> is an activity of the <a href="http://www.swami.se">Swedish Alliance for Middleware Infrastructure</a>. <a href="http://www.swamid.se">SWAMID</a> is in part based on <a href="http://shibboleth.internet2.edu">Shibboleth</a> from <a href="http://www.internet2.edu">Internet2</a>. If you need assistance or require information send an e-mail to <a href="mailto:info@swamid.se?subject=WAYF+support+request">SWAMID support</a> with a description of the problem. </p> </div> - -<logic:present name="showComments" scope="Request"> - -<!--PROGRAMMING NOTE - - We need to program the on changed selector. Note that option.InnterText only - works on IE, options.remove doesn't work on Firefox, and that - options.add doesn't work on Safari. Hence the somewhat strange manipulations - to delete & populate the list of options. - - X is the select object for the right hand table - Selected is the name selected in the left hand table - ---> - -</logic:present> +</div> <logic:present name="siteLists" scope="request"> <script language="javascript" type="text/javascript"> @@ -560,9 +232,13 @@ function changedFed(X, Selected) { empty array. --> </logic:present> - + <script language="javascript" type="text/javascript"> -<!-- +$(function() { + $('#origin').focus(); +}); + </script> + <!-- script language="javascript" type="text/javascript"> $(function() { var idps = [ <logic:iterate id="site" name="sites"> @@ -589,8 +265,7 @@ $(function() { //$('.button').button(); //$('select').selectmenu({style: 'dropdown'}); }); ---> - </script> + </script --> </logic:present> |