summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-11-25 23:26:43 +0100
committerLeif Johansson <leifj@sunet.se>2011-11-25 23:26:43 +0100
commitf5b9075cd8b7ce1ec18a5d7a4f7e1471cefc96d6 (patch)
treea14683b79b1973be12e6cb97e265423b24ebd76a
parent58bf0b1e33f3cfc18b1fe153a417e1edcf4b0c24 (diff)
tabbed layout
-rwxr-xr-xsrc/installer/resources/wayfconfig.xml2
-rw-r--r--src/main/webapp/wayf-ndn.jsp17
2 files changed, 9 insertions, 10 deletions
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index f751f44..4c2543c 100755
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -39,7 +39,7 @@
provideList="false"
warnOnBadBinding="false"
warnOnNoSAML2="false"
- provideListOfList="true"
+ provideListOfList="false"
showUnusableIdPs="true">
<!--
diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index a6a250b..bd56faa 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -28,8 +28,7 @@
$(function() {
$("input:submit, input:reset, input:button, a",".button").button();
$(".sitelist").menu();
- $("#sites").tabs();
- $(".origin").searchable();
+ $("#origin").searchable();
});
</script>
</head>
@@ -69,10 +68,10 @@
<h2>Recently Used</h2>
<ul class="sitelist" style="margin-bottom: 50px;">
<logic:iterate id="site" name="cookieList">
- <logic:present name="entityID" scope="request">
- <bean:define id="returnIDParam" name="returnIDParam"/>
- <bean:define id="ei" name="entityID" />
- <bean:define id="re" name="returnX"/>
+ <logic:present name="entityID" scope="request">
+ <bean:define id="returnIDParam" name="returnIDParam"/>
+ <bean:define id="ei" name="entityID" />
+ <bean:define id="re" name="returnX"/>
<li><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" />">
<jsp:getProperty name="site" property="displayName" />
@@ -111,7 +110,7 @@
<li style="vertical-align: top; width: 65%;">
<h2>Full list of identity providers</h2>
<logic:present name="sites" scope="request">
- <form style="margin-bottom: 10px;" method="GET" action="<bean:write name="requestURL" />">
+ <form style="margin-bottom: 10px;" method="get" action="<bean:write name="requestURL" />">
<div>
<logic:notPresent name="entityID" scope="request">
<input type="hidden" name="shire" value="<bean:write name="shire" />" />
@@ -127,7 +126,7 @@
<input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" />
</logic:present>
<input type="hidden" name="action" value="selection" />
- <select name="origin" class="origin" tabindex="40">
+ <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" />
@@ -139,7 +138,7 @@
<option value="session" selected="selected"> Remember for session</option>
<option value="perm"> Remember for a week</option>
</select>
- <input type="submit" class="button" id="originsubmit" value="Select" tabindex="50" />
+ <input type="submit" class="button" id="originsubmit" value="Select" tabindex="50" />
</div>
</form>
</logic:present>