From 5f66382e3f4fc7f78df06bfc40036c0c124ded52 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@nordu.net>
Date: Mon, 25 Jul 2011 20:25:32 +0200
Subject: backport original ndn ds chagnes

---
 src/main/webapp/images/NORDUnet2.jpg | Bin 0 -> 7115 bytes
 src/main/webapp/images/logo.jpg      | Bin 13660 -> 7115 bytes
 src/main/webapp/images/top_back.gif  | Bin 0 -> 1097 bytes
 src/main/webapp/wayf.css             |   2 +-
 src/main/webapp/wayf.jsp             |  12 ++++++------
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 src/main/webapp/images/NORDUnet2.jpg
 create mode 100644 src/main/webapp/images/top_back.gif

diff --git a/src/main/webapp/images/NORDUnet2.jpg b/src/main/webapp/images/NORDUnet2.jpg
new file mode 100644
index 0000000..ed5b9bf
Binary files /dev/null and b/src/main/webapp/images/NORDUnet2.jpg differ
diff --git a/src/main/webapp/images/logo.jpg b/src/main/webapp/images/logo.jpg
index c021e7f..ed5b9bf 100644
Binary files a/src/main/webapp/images/logo.jpg and b/src/main/webapp/images/logo.jpg differ
diff --git a/src/main/webapp/images/top_back.gif b/src/main/webapp/images/top_back.gif
new file mode 100644
index 0000000..40ae535
Binary files /dev/null and b/src/main/webapp/images/top_back.gif differ
diff --git a/src/main/webapp/wayf.css b/src/main/webapp/wayf.css
index 0eeb26c..b58c748 100644
--- a/src/main/webapp/wayf.css
+++ b/src/main/webapp/wayf.css
@@ -48,7 +48,7 @@ span.option {
 	border-bottom-width: 2px;
 	border-color: #000000;
 	border-style: solid;
-	background-color: #6688aa;
+        background-color: #00B2E4;
 	margin-top: 1em;
 	margin-bottom: 0;
 	margin-left: 1em;
diff --git a/src/main/webapp/wayf.jsp b/src/main/webapp/wayf.jsp
index e30fc38..4af36d0 100644
--- a/src/main/webapp/wayf.jsp
+++ b/src/main/webapp/wayf.jsp
@@ -237,14 +237,14 @@ Recently used organizations:
 
 <!-- PROGRAMMING NOTE
  
-   Add the "instant search" dialogue.
+   Add the "instant serach" dialogue.
 
 </logic:present>
 
     <div class="list">
        <logic:present name="sites" scope="request">
               <h2>
-              Enter institution name:
+              Enter insititution name:
               </h2>
               <form autocomplete="OFF" action="">
                 <div>
@@ -461,7 +461,7 @@ Search by keyword:
               </div>
             </form>
 
-<!-- The end of the old code.  Below is where search results go -->
+<!-- The end of the old code.  Below is where search results go 00>
 
 </logic:present>
             <logic:present name="searchResultsEmpty" scope="request">
@@ -519,9 +519,9 @@ Search results:
     <div class="footer">
         <p class="text">
 <!--CONFIG-->
-Need assistance? Send mail to <a tabindex="120" href="mailto:user@domain">administrator's name</a> with description.
+Need assistance? Send mail to <a tabindex="120" href="mailto:noc@nordu.net">NORDUnet NOC</a> with description.
         </p>
-        <div class="logo"><img src="images/internet2.gif" alt="Internet2" /></div>
+        <div class="logo"><img src="images/NORDUnet2.jpg" alt="NORDUNet" /></div>
     </div>
 
 <logic:present name="showComments" scope="Request">
@@ -643,4 +643,4 @@ var theElements = [
   
 </body>
 </html>
-  
\ No newline at end of file
+  
-- 
cgit v1.1