ndn style

2 files changed, 398 insertions, 94 deletions

diff --git a/src/main/webapp/NORDUnet.css b/src/main/webapp/NORDUnet.css
new file mode 100644
index 0000000..f7c3ef2
--- /dev/null
+++ b/src/main/webapp/NORDUnet.css
@@ -0,0 +1,302 @@
+#wrapper {
+	width: 100%;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000; 
+	// background: #fff url('images/pipes_back.jpg') repeat-y top left;
+}
+
+#top {
+	display: block;
+	width: 100%;
+	background: #00B2E4 url('images/top_back.gif') repeat-x bottom left;
+	overflow: hidden;
+	
+}
+#top_table {
+	margin:0;
+	padding:0;
+	margin-top: 33px;
+	width: 900px;
+	border-collapse: collapse;
+	margin-bottom: -1px;
+
+	
+}
+
+#top_table td {
+	vertical-align:bottom;
+}
+
+#top_table td img {
+	margin-bottom: 20px;
+	display: block;
+	padding-right:10px;
+	
+}
+
+#main_nav {
+	margin:0;
+	padding:0;
+	list-style:none;
+	color: #fff;
+	height: 40px;
+	display: block;
+	
+}
+
+#main_nav li {
+	display: block;
+	float: left;
+	background: url('images/main_nav_left.gif') no-repeat bottom left; 
+	padding: 0 0 0 11px;
+	
+}
+#main_nav li#selectedPage {
+	background: url('images/main_nav_left_selected.gif') no-repeat bottom left; 
+} 
+#main_nav li a {
+	display: block;
+	float: left;
+	padding: 0 11px 0 0;
+	height: 40px;
+	color: #fff;
+	text-decoration: none;
+	outline: 0;
+	background: url('images/main_nav_back.gif') no-repeat bottom right; 
+}
+
+#main_nav li#selectedPage a {
+	background: url('images/main_nav_back_selected.jpg') no-repeat bottom right; 
+	color: #000;
+
+}
+#main_nav li a span {
+	 vertical-align: middle;
+     display: block;
+	 padding-top: 10px;
+	
+}
+
+#left {
+	clear: both;
+	background: #fff url('images/left_back.gif') repeat-y top left;
+	width: 200px;
+	float: left;
+}
+
+#search_form  {
+	padding-left: 8px;
+	width: 200px;
+	margin: 10px 0 20px 0;
+}
+
+#search_form .input_image {
+	
+	vertical-align: middle;
+}
+
+#nav {
+	
+    width: 200px;
+    font-size: 12px;
+	clear: both;
+}
+
+#nav #intro {
+	width: 179px;
+	background: #fff url('images/intro_top.jpg') no-repeat top left;
+    padding: 15px 10px 1px 10px;
+}
+
+#nav #intro_footer {
+	width: 199px;
+	height:27px;
+	background: #fff url('images/intro_bottom.jpg') no-repeat top left;
+}
+
+
+#nav ul.site_tree,
+#nav ul.site_tree ul,
+#nav ul.site_tree li {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+
+}
+#nav ul.site_tree {
+	background: transparent url(images/subnavback.gif) no-repeat bottom left;
+	padding-bottom:2px;
+}
+
+#nav ul.site_tree a {
+    color: #4F4E4E;
+    text-decoration: none;
+    display: block;
+}
+
+#nav ul.site_tree a:hover {
+    text-decoration: none;
+}
+
+#nav ul.site_tree strong.level1 {
+    color: #000;
+    display: block;
+	background-color: #59BAE7;
+}
+
+#nav ul.site_tree li.level2 {
+	background: transparent url(images/subnavback.gif) no-repeat top left;
+}
+
+
+#nav ul.site_tree a.level1, 
+#nav ul.site_tree strong.level1  {
+	padding:5px 0 5px 10px;
+    
+}
+
+#nav ul.site_tree li.level2 {
+	display:block;
+	padding: 5px 0 2px 15px;	
+}
+
+#nav ul.site_tree a.level2 {
+		
+}
+
+#nav #nav_pic {
+	display: block;
+	margin: 0;
+	padding: 0;
+}
+
+
+h1 {
+	font-size: 20px;
+	color: #004788;
+}
+
+h2 {
+	font-size: 18px;
+	color: #004788;
+}
+
+h3 {
+	font-size: 16px;
+	color: #004788;
+}
+
+h4 {
+	font-size: 14px;
+	color: #004788;
+}
+
+h5  {
+	font-size: 12px;
+	color: #004788;
+}
+
+p   {
+        font-size: 12px;
+        color: #004788;
+
+}
+
+ul  {
+        font-size: 12px;
+        color: #004788;
+
+}
+
+#content {
+	margin-left: 200px;
+	padding: 20px;
+	width: auto;
+	line-height: 1.5em;		
+}
+
+#content table {
+	border-collapse: collapse;
+}
+
+#content th {
+	background-color: #f0f0f0;
+	padding: 5px;
+	color: #036;
+}
+
+#content td {
+	vertical-align: middle;
+	padding: 5px;
+}
+
+*html #content table { width:99%; } 
+
+#footer {
+	clear: both;
+	width: 100%;
+	height: 35px;
+	background-color: #D8D8D8;
+	border-top: 1px solid #989898;
+	border-bottom: 1px solid #989898;
+}
+
+#footer p {
+	vertical-align: middle;
+	margin: 12px 10px 10px 200px;
+	font-size: 10px;
+	color: #848484;
+}
+
+#footer img {
+    float: left; 
+    margin: 0px 0px 0px 2px; 
+}
+
+hr {
+  border: 0;
+  color: #696969;
+  background-color:#696969;
+  height: 1px;
+}
+
+
+#intro  img{
+	padding-top: 5px;
+	border: none;
+}
+
+/* Open trouble tickets */
+#opentickets {
+	margin-left: 200px;
+	padding: 0 20px 20px 20px;
+	width: auto;
+}
+
+.blue {
+background:#004788 none repeat scroll 0 0;
+}
+
+.text {
+  font-size: 12px;
+  color: #004788;
+}
+
+.group_heading {
+color:#004788;
+font-size:12px;
+font-weight:bolder;
+}
+
+.list_info {
+background-color:#D9EFFA;
+color:#004788;
+padding:0.6em;
+}
+
+.whitebold {
+color:#FFFFFF;
+font-size:12px;
+font-weight:bold;
+}
diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index b6eb593..6f101a4 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -164,51 +164,99 @@ $(function() {
              </tr>
           </table>
        </div>
-       <div id="left">
-          <div id="nav">
-             <ul class="site_tree">
-                <li class="level1"><strong class="level1">About</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>
-       </div>
-       <div id="content">
-       	
-        <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">
-		  <div id="sites">
-			<ul>
+       <div id="container">
+	       <div id="left">
+	          <div id="nav">
+	             <ul class="site_tree">
+	                <li class="level1"><strong class="level1">About</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>
+	       </div>
+	       <div id="right">
+	       	
+	        <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">
+			  <div id="sites">
+				<ul>
+					<logic:present name="cookieList" scope="request">
+						<li><a href="#recently-visited">Recently Visited</a></li>
+					</logic:present>
+					<logic:iterate id="siteset" name="siteLists">
+						<li><a href="#<jsp:getProperty name="siteset" property="name"/>"><jsp:getProperty name="siteset" property="name"/></a></li>
+					</logic:iterate>
+				</ul>
 				<logic:present name="cookieList" scope="request">
-					<li><a href="#recently-visited">Recently Visited</a></li>
+					<div id="recently-visited">
+					<ul class="sitelist">
+				        <logic:iterate id="site" name="cookieList">
+				            <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" />">
+				                    <jsp:getProperty name="site" property="displayName" />
+				                </a>
+				              </logic:present>
+				              <logic:notPresent name="entityID" scope="request">
+				                <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" />">
+				                    <jsp:getProperty name="site"
+				                    property="displayName" />
+				                </a>
+				              </logic:notPresent>
+				            </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>
 				</logic:present>
 				<logic:iterate id="siteset" name="siteLists">
-					<li><a href="#<jsp:getProperty name="siteset" property="name"/>"><jsp:getProperty name="siteset" property="name"/></a></li>
-				</logic:iterate>
-			</ul>
-			<logic:present name="cookieList" scope="request">
-				<div id="recently-visited">
-				<ul class="sitelist">
-			        <logic:iterate id="site" name="cookieList">
-			            <li>
-			              <logic:present name="entityID" scope="request">
-			
+					<div id="<jsp:getProperty name="siteset" property="name"/>">
+	                   <ul class="sitelist">
+	                   <logic:iterate id="site" name="siteset" property="sites">
+	                     <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>
@@ -216,66 +264,20 @@ $(function() {
 			                <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>
-			            </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>
+			             </logic:notPresent>
+			             </li>
+	                   </logic:iterate>
+	                  </ul>
+					</div>
+				</logic:iterate>
+			  </div>
 			</logic:present>
-			<logic:iterate id="siteset" name="siteLists">
-				<div id="<jsp:getProperty name="siteset" property="name"/>">
-                   <ul class="sitelist">
-                   <logic:iterate id="site" name="siteset" property="sites">
-                     <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 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>
-		              <logic:notPresent name="entityID" scope="request">
-		                <bean:define id="targ" name="target" />
-		                <bean:define id="shire" name="shire" />
-		                <bean:define id="pid" name="providerId" />
-		                <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>
-		             </li>
-                   </logic:iterate>
-                  </ul>
-				</div>
-			</logic:iterate>
-		  </div>
-		</logic:present>
-      </div>
+	      </div>
+	  </div>
       <div id="footer">
         <p>NORDUnet A/S | Kastruplundgade 22 | DK-2770 Kastrup | DENMARK | Phone +45 32 46 25 00 | Fax +45 45 76 23 66 | info@nordu.net</p>
       </div>