summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-07-26 04:35:16 +0200
committerLeif Johansson <leifj@sunet.se>2011-07-26 04:35:16 +0200
commita6eed048ad9e6f3529953cad01cb3f62d12a8208 (patch)
tree269591e199fe8229a903b4e559673c0a1a98496d /src/main
parent7915f5d0c428ed976437e360539e624f8d874105 (diff)
style polish
Diffstat (limited to 'src/main')
-rw-r--r--src/main/webapp/NORDUnet.css2
-rw-r--r--src/main/webapp/wayf-ndn.jsp51
2 files changed, 26 insertions, 27 deletions
diff --git a/src/main/webapp/NORDUnet.css b/src/main/webapp/NORDUnet.css
index c5af77e..73ae8ae 100644
--- a/src/main/webapp/NORDUnet.css
+++ b/src/main/webapp/NORDUnet.css
@@ -302,4 +302,4 @@ font-weight:bold;
}
ul.ilist { list-style: none inside; margin: 0; padding 0; padding-left: 0px}
-.ilist li { display: inline-block; margin: 0; padding 0; } \ No newline at end of file
+.ilist > li { display: inline-block; margin: 0; padding 0; } \ No newline at end of file
diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index 02a3620..410a4a1 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -149,6 +149,7 @@
$(function() {
$("input:submit, input:reset, input:button, a",".button").button();
$("#sites").tabs();
+ $(".sitelist").menu();
});
</script>
</head>
@@ -166,26 +167,22 @@ $(function() {
</div>
<div id="container">
<ul class="ilist">
- <li>
+ <li style="vertical-align: top;">
<div id="nav">
<ul class="site_tree">
- <li class="level1"><strong class="level1">About</strong>
+ <li class="level1"><strong class="level1">Resources</strong>
<ul>
<li class="level2"><a class="level2" href="http://www.nordu.net">NORDUnet Home</a></li>
<li class="level2"><a class="level2" href="http://www.nordu.net#aup">Acceptable Use Policy</a></li>
<li class="level2"><a class="level2" href="http://www.nordu.net#pii">Privacy Policy</a></li>
</ul>
</li>
- <li class="level1"><strong class="level1">Tools</strong>
- <ul>
- <li class="level2"><a class="level2" href="https://crowd.nordu.net/sso/pwman">Change Your Password</a></li>
- </ul>
- </li>
</ul>
<div id="nav_pic"><img src="http://www.nordu.net/resources/pipes.jpg" width="200px" height="395" alt="" /></div>
</div>
</li>
- <li>
+ <li style="vertical-align: top; margin-left: 50px;">
+ <h1>Select an identity provider</h1>
<p class="text">The service you are trying to use require that you identify yourself. Please select your identity provider below...</p>
<logic:present name="siteLists" scope="request">
@@ -225,24 +222,26 @@ $(function() {
</li>
</logic:iterate>
</ul>
- <form method="get" action="ClearCache.wayf" >
- <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 tabindex="20" type="submit" value="Clear List" />
- </div>
- </form>
+ <div style="border-top: 1px solid #CECECE; padding-top: 20px;">
+ <form method="get" action="ClearCache.wayf" >
+ <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 tabindex="20" type="submit" value="Clear List" />
+ </div>
+ </form>
+ </div>
</div>
</logic:present>
<logic:iterate id="siteset" name="siteLists">