added support for retina displays on logo, added logo to homepage, changed logo inclusion in top bar, fixed organizational links

closes #552

openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/aboutContent.tag

@@ -1,5 +1,5 @@
 <h2>About</h2>
-<p>This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.</p>
+<p>This OpenID Connect service is built from the MITREid Connect Open Source project, from  <a href="http://www.mitre.org/">The MITRE Corporation</a> and the <a href="http://kit.mit.edu/">MIT Kerberos and Internet Trust Consortium</a>.</p>
 <p>
 More information about the project can be found at <a href="http://github.com/mitreid-connect/">MITREid Connect on GitHub</a>. There, you can submit bug reports, give feedback, or even contribute code patches for additional features you'd like to see.
 </p>

openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/footer.tag

@@ -21,6 +21,7 @@
 <script type="text/javascript" src="resources/js/lib/purl.js"></script>
 <script type="text/javascript" src="resources/js/lib/bootstrapx-clickover.js"></script>
 <script type="text/javascript" src="resources/js/lib/moment.js"></script>
+<script type="text/javascript" src="resources/js/lib/retina.js"></script>
 <c:if test="${js != null && js != ''}">
 	<script type="text/javascript" src="resources/js/client.js"></script>
 	<script type="text/javascript" src="resources/js/grant.js"></script>

openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/header.tag

@@ -24,17 +24,25 @@
         /* The html and body elements cannot have any padding or margin. */
       }
 
-        .sidebar-nav {
-            padding: 9px 0;
-        }
+      .sidebar-nav {
+          padding: 9px 0;
+      }
 
-        h1,label {
-            text-shadow: 1px 1px 1px #FFFFFF;
-        }
-
-        .brand {
-            padding-left: 35px !important;
-        }
+      h1,label {
+          text-shadow: 1px 1px 1px #FFFFFF;
+      }
+      
+      .navbar .brand {
+      	max-height: 20px;
+      }
+      
+      .navbar .brand img {
+      	max-height: 24px;
+      	width: auto;
+      	position: relative;
+      	top: -2px;
+      	left: -6px;
+      }
 
       /* Wrapper for page content to push down footer */
       #wrap {
@@ -66,9 +74,6 @@
 	  	border: 1px solid #b94a48 !important;
 	  }
 	
-	  a.brand {
-	  	background: url('${config.logoImageUrl}') no-repeat scroll 7px 7px transparent;
-	  }
     </style>
     <link href="resources/bootstrap2/css/bootstrap-responsive.css" rel="stylesheet">
 	<style type="text/css">

openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag

@@ -1,5 +1,5 @@
 <h2>About</h2>
 
-<p>This OpenID Connect service is built from the MITREid Connect Open Source project started by The MITRE Corporation.</p>
+<p>This OpenID Connect service is built from the MITREid Connect Open Source project, from  <a href="http://www.mitre.org/">The MITRE Corporation</a> and the <a href="http://kit.mit.edu/">MIT Kerberos and Internet Trust Consortium</a>.</p>
 
 <p><a class="btn" href="http://github.com/mitreid-connect/">More &raquo;</a></p>

openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag

@@ -1,5 +1,11 @@
-<h1>Welcome!</h1>
-
-<p>OpenID Connect is a next-generation protocol built on top of the OAuth2 authorization framework. OpenID Connect lets you log into a remote site using your identity without exposing your credentials, like a username and password.</p>
-
-<p><a class="btn btn-primary btn-large" href="http://openid.net/connect/">Learn more &raquo;</a></p>
+<div class="row-fluid">
+	<div class="span2 visible-desktop"><img src="resources/images/openid_connect_large.png"/></div>
+	
+	<div class="span10">
+		<h1>Welcome!</h1>
+	
+		<p>OpenID Connect is an internet-scale federated identity protocol built on top of the OAuth2 authorization framework. OpenID Connect lets you log into a remote site using your identity without exposing your credentials, like a username and password.</p>
+	
+		<p><a class="btn btn-primary btn-large" href="http://openid.net/connect/">Learn more &raquo;</a></p>
+	</div>
+</div>

openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag

@@ -33,7 +33,7 @@
 				<span class="icon-bar"></span> 
 				<span class="icon-bar"></span>
 			</button>
-			<a class="brand" href="">${config.topbarTitle}</a>
+			<a class="brand" href=""><img src="${ config.logoImageUrl }" style="margin-bottom: 4px;" /> ${config.topbarTitle}</a>
 			<c:if test="${ not empty pageName }">
 				<div class="nav-collapse collapse">
 					<ul class="nav">

openid-connect-server-webapp/src/main/webapp/resources/js/lib/retina.js

@@ -0,0 +1,147 @@
+(function() {
+  var root = (typeof exports == 'undefined' ? window : exports);
+
+  var config = {
+    // Ensure Content-Type is an image before trying to load @2x image
+    // https://github.com/imulus/retinajs/pull/45)
+    check_mime_type: true,
+
+    // Resize high-resolution images to original image's pixel dimensions
+    // https://github.com/imulus/retinajs/issues/8
+    force_original_dimensions: true
+ };
+
+  root.Retina = Retina;
+
+  function Retina() {}
+
+  Retina.configure = function(options) {
+    if (options == null) options = {};
+    for (var prop in options) config[prop] = options[prop];
+  };
+
+  Retina.init = function(context) {
+    if (context == null) context = root;
+
+    var existing_onload = context.onload || new Function;
+
+    context.onload = function() {
+      var images = document.getElementsByTagName("img"), retinaImages = [], i, image;
+      for (i = 0; i < images.length; i++) {
+        image = images[i];
+        retinaImages.push(new RetinaImage(image));
+      }
+      existing_onload();
+    }
+  };
+
+  Retina.isRetina = function(){
+    var mediaQuery = "(-webkit-min-device-pixel-ratio: 1.5),\
+                      (min--moz-device-pixel-ratio: 1.5),\
+                      (-o-min-device-pixel-ratio: 3/2),\
+                      (min-resolution: 1.5dppx)";
+
+    if (root.devicePixelRatio > 1)
+      return true;
+
+    if (root.matchMedia && root.matchMedia(mediaQuery).matches)
+      return true;
+
+    return false;
+  };
+
+
+  root.RetinaImagePath = RetinaImagePath;
+
+  function RetinaImagePath(path, at_2x_path) {
+    this.path = path;
+    if (typeof at_2x_path !== "undefined" && at_2x_path !== null) {
+      this.at_2x_path = at_2x_path;
+      this.perform_check = false;
+    } else {
+      this.at_2x_path = path.replace(/\.\w+$/, function(match) { return "@2x" + match; });
+      this.perform_check = true;
+    }
+  }
+
+  RetinaImagePath.confirmed_paths = [];
+
+  RetinaImagePath.prototype.is_external = function() {
+    return !!(this.path.match(/^https?\:/i) && !this.path.match('//' + document.domain) )
+  }
+
+  RetinaImagePath.prototype.check_2x_variant = function(callback) {
+    var http, that = this;
+    if (this.is_external()) {
+      return callback(false);
+    } else if (!this.perform_check && typeof this.at_2x_path !== "undefined" && this.at_2x_path !== null) {
+      return callback(true);
+    } else if (this.at_2x_path in RetinaImagePath.confirmed_paths) {
+      return callback(true);
+    } else {
+      http = new XMLHttpRequest;
+      http.open('HEAD', this.at_2x_path);
+      http.onreadystatechange = function() {
+        if (http.readyState != 4) {
+          return callback(false);
+        }
+
+        if (http.status >= 200 && http.status <= 399) {
+          if (config.check_mime_type) {
+            var type = http.getResponseHeader('Content-Type');
+            if (type == null || !type.match(/^image/i)) {
+              return callback(false);
+            }
+          }
+
+          RetinaImagePath.confirmed_paths.push(that.at_2x_path);
+          return callback(true);
+        } else {
+          return callback(false);
+        }
+      }
+      http.send();
+    }
+  }
+
+
+
+  function RetinaImage(el) {
+    this.el = el;
+    this.path = new RetinaImagePath(this.el.getAttribute('src'), this.el.getAttribute('data-at2x'));
+    var that = this;
+    this.path.check_2x_variant(function(hasVariant) {
+      if (hasVariant) that.swap();
+    });
+  }
+
+  root.RetinaImage = RetinaImage;
+
+  RetinaImage.prototype.swap = function(path) {
+    if (typeof path == 'undefined') path = this.path.at_2x_path;
+
+    var that = this;
+    function load() {
+      if (! that.el.complete) {
+        setTimeout(load, 5);
+      } else {
+        if (config.force_original_dimensions) {
+          that.el.setAttribute('width', that.el.offsetWidth);
+          that.el.setAttribute('height', that.el.offsetHeight);
+        }
+
+        that.el.setAttribute('src', path);
+      }
+    }
+    load();
+  }
+
+
+
+
+  if (Retina.isRetina()) {
+    Retina.init(root);
+  }
+
+})();
+