externalized application CSS, closes #221

added favicon, cleaned up header and footer code

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

@@ -1,4 +1,4 @@
-<%@attribute name="js" required="false"%>
+<%@ attribute name="js" required="false"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
@@ -12,7 +12,7 @@
 		</p>
 	</div>
 </div>
-<!-- Le javascript
+<!-- javascript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script type="text/javascript" src="resources/bootstrap2/js/bootstrap.js"></script>

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

@@ -14,100 +14,20 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <!-- Le styles -->
+    <!-- stylesheets -->
-    <link href="resources/bootstrap2/css/bootstrap.min.css" rel="stylesheet">
+    <link href="resources/bootstrap2/css/bootstrap.css" rel="stylesheet">
     <link href="resources/css/bootstrap-sheet.css" rel="stylesheet">
-    
+    <link href="resources/css/mitreid-connect.css" rel="stylesheet">
-    <style type="text/css">
-
-      html,
-      body {
-        height: 100%;
-        /* The html and body elements cannot have any padding or margin. */
-      }
-
-      .sidebar-nav {
-          padding: 9px 0;
-      }
-
-      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 {
-        min-height: 100%;
-        height: auto !important;
-        height: 100%;
-        /* Negative indent footer by it's height */
-        margin: 0 auto -60px;
-      }
-
-      /* Set the fixed height of the footer here */
-      #push,
-      #footer {
-        min-height: 60px;
-      }
-      #footer {
-        background-color: #f5f5f5;
-      }
-
-      .main {
-        padding-top: 60px;
-      }
-
-      .credit {
-        margin: 20px 0;
-      }
-	
-	  .inputError {
-	  	border: 1px solid #b94a48 !important;
-	  }
-	
-    </style>
     <link href="resources/bootstrap2/css/bootstrap-responsive.css" rel="stylesheet">
-	<style type="text/css">
+    <link href="resources/css/mitreid-connect-responsive.css" rel="stylesheet">
-		@media (min-width: 768px) and (max-width: 979px) {
-	        .main {
-	        	padding-top: 0px;
-	        }
-	
-	    }
-	    
-	    @media (max-width: 767px) {
-	        #footer {
-	          margin-left: -20px;
-	          margin-right: -20px;
-	          padding-left: 20px;
-	          padding-right: 20px;
-	        }
-	    }
-	
-	
-	</style>
 
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
-    <!-- Le fav and touch icons -->
+    <!-- favico -->
-    <link rel="shortcut icon" href="../bootstrap2/ico/favicon.ico">
+    <link rel="shortcut icon" href="resources/images/mitreid-connect.ico">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../bootstrap2/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../bootstrap2/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../bootstrap2/ico/apple-touch-icon-57-precomposed.png">
 
     <!-- Load jQuery up here so that we can use in-page functions -->
     <script type="text/javascript" src="resources/js/lib/jquery.js"></script>
@@ -128,6 +48,7 @@
 		}
 		
 		// is the current user an admin?
+		// NOTE: this is just for  
 		function isAdmin() {
 			var auth = getUserAuthorities();
 			if (auth && _.contains(auth, "ROLE_ADMIN")) {

openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect-responsive.css

@@ -0,0 +1,16 @@
+/* size-responsive CSS to be loaded after bootstrap-responsive */
+
+@media ( min-width : 768px) and (max-width: 979px) {
+	.main {
+		padding-top: 0px;
+	}
+}
+
+@media ( max-width : 767px) {
+	#footer {
+		margin-left: -20px;
+		margin-right: -20px;
+		padding-left: 20px;
+		padding-right: 20px;
+	}
+}

openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css

@@ -0,0 +1,56 @@
+/* Stylesheet for the MITREid Connect server web application */
+
+html,body {
+	height: 100%;
+	/* The html and body elements cannot have any padding or margin. */
+}
+
+.sidebar-nav {
+	padding: 9px 0;
+}
+
+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 {
+	min-height: 100%;
+	height: auto !important;
+	height: 100%;
+	/* Negative indent footer by it's height */
+	margin: 0 auto -60px;
+}
+
+/* Set the fixed height of the footer here */
+#push,#footer {
+	min-height: 60px;
+}
+
+#footer {
+	background-color: #f5f5f5;
+}
+
+.main {
+	padding-top: 60px;
+}
+
+.credit {
+	margin: 20px 0;
+}
+
+.inputError {
+	border: 1px solid #b94a48 !important;
+}