From 606dd2633bcf91b4e30a4eff544dce13f75e51ca Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mit.edu>
Date: Fri, 17 Feb 2017 15:11:45 -0500
Subject: [PATCH] collapsed home page tags

---
 .../webapp/WEB-INF/tags/landingPageAbout.tag  |  6 ---
 .../WEB-INF/tags/landingPageContact.tag       |  5 --
 .../webapp/WEB-INF/tags/landingPageStats.tag  | 27 ----------
 .../WEB-INF/tags/landingPageWelcome.tag       |  9 ----
 .../src/main/webapp/WEB-INF/views/home.jsp    | 51 +++++++++++++++++--
 5 files changed, 47 insertions(+), 51 deletions(-)
 delete mode 100644 openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
 delete mode 100644 openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
 delete mode 100644 openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
 delete mode 100644 openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
deleted file mode 100644
index 0d9a4e6ac..000000000
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageAbout.tag
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="home.about.title"/></h2>
-
-<p><spring:message code="home.about.body"/></p>
-
-<p><a class="btn" href="http://github.com/mitreid-connect/"><spring:message code="home.more"/> &raquo;</a></p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
deleted file mode 100644
index db9d3f51e..000000000
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageContact.tag
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="home.contact.title"/></h2>
-<p>
-<spring:message code="home.contact.body"/>
-</p>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
deleted file mode 100644
index 45e352780..000000000
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageStats.tag
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<h2><spring:message code="home.statistics.title"/></h2>
-
-<p id="statsloader" class="muted"><spring:message code="home.statistics.loading"/></p>
-
-<p id="stats">
-    <spring:message code="home.statistics.number_users" arguments="?"/>
-    <spring:message code="home.statistics.number_clients" arguments="?"/>
-    <spring:message code="home.statistics.number_approvals" arguments="?"/>
-</p>
-
-<script type="text/javascript">
-$(document).ready(function() {
-		$('#stats').hide();
-	    var base = $('base').attr('href');
-
-        $.getJSON(base + 'api/stats/summary', function(data) {
-        	var stats = data;
-        	$('#userCount').html(stats.userCount);
-        	$('#clientCount').html(stats.clientCount);
-        	$('#approvalCount').html(stats.approvalCount);
-        	$('#statsloader').hide();
-        	$('#stats').show();
-        	
-        });
-});
-</script>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
deleted file mode 100644
index 851ddbe0b..000000000
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/landingPageWelcome.tag
+++ /dev/null
@@ -1,9 +0,0 @@
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<div class="row-fluid">
-	<div class="span2 visible-desktop"><img src="resources/images/openid_connect_large.png"/></div>
-	
-	<div class="span10">
-		<h1><spring:message code="home.welcome.title"/></h1>
-		<p><spring:message code="home.welcome.body"/></p>
-	</div>
-</div>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
index cd2102719..fc83dabed 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/views/home.jsp
@@ -12,15 +12,29 @@
 		<o:sidebar />
 		<div class="span10">
 			<div class="hero-unit">
-				<o:landingPageWelcome />
+				<div class="row-fluid">
+					<div class="span2 visible-desktop"><img src="resources/images/openid_connect_large.png"/></div>
+					
+					<div class="span10">
+						<h1><spring:message code="home.welcome.title"/></h1>
+						<p><spring:message code="home.welcome.body"/></p>
+					</div>
+				</div>
 			</div>
 			<!-- Example row of columns -->
 			<div class="row-fluid">
 				<div class="span6">
-					<o:landingPageAbout />
+					<h2><spring:message code="home.about.title"/></h2>
+					
+					<p><spring:message code="home.about.body"/></p>
+					
+					<p><a class="btn" href="http://github.com/mitreid-connect/"><spring:message code="home.more"/> &raquo;</a></p>
 				</div>
 				<div class="span6">
-					<o:landingPageContact />
+					<h2><spring:message code="home.contact.title"/></h2>
+					<p>
+					<spring:message code="home.contact.body"/>
+					</p>
 				</div>
 
 			</div>
@@ -28,11 +42,40 @@
 			<!-- Example row of columns -->
 			<div class="row-fluid">
 				<div class="span12">
-					<o:landingPageStats />
+					<h2><spring:message code="home.statistics.title"/></h2>
+					
+					<p id="statsloader" class="muted"><spring:message code="home.statistics.loading"/></p>
+					
+					<p id="stats">
+					    <spring:message code="home.statistics.number_users" arguments="?"/>
+					    <spring:message code="home.statistics.number_clients" arguments="?"/>
+					    <spring:message code="home.statistics.number_approvals" arguments="?"/>
+					</p>
 				</div>
 			</div>
 
 		</div>
 	</div>
 </div>
+
+
+<script type="text/javascript">
+// load stats dynamically to make main page render faster
+
+$(document).ready(function() {
+		$('#stats').hide();
+	    var base = $('base').attr('href');
+
+        $.getJSON(base + 'api/stats/summary', function(data) {
+        	var stats = data;
+        	$('#userCount').html(stats.userCount);
+        	$('#clientCount').html(stats.clientCount);
+        	$('#approvalCount').html(stats.approvalCount);
+        	$('#statsloader').hide();
+        	$('#stats').show();
+        	
+        });
+});
+</script>
+
 <o:footer />