WINDUP-796 Source Report style should be consistent with other report…

…s - align the header style
windup · Oct 8, 2015 · 2c82627 · 2c82627
1 parent 041e8b1
commit 2c82627
Show file tree

Hide file tree

Showing 16 changed files with 266 additions and 227 deletions.
diff --git a/reporting/impl/src/main/resources/reports/templates/classloader.ftl b/reporting/impl/src/main/resources/reports/templates/classloader.ftl
@@ -12,32 +12,36 @@
 
     <div class="container-fluid" role="main">
         <div class="row">
-          <div class="page-header page-header-no-border">
-            <h1>Classloader Report <span class="slash">/</span><small style="margin-left: 20px; font-weight: 100;">${application.applicationName}</small></h1>
-             <div class="navbar navbar-default">
-            <div class="navbar-header">
-              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-              </button>
-            </div>
-            <div class="navbar-collapse collapse navbar-responsive-collapse">
-              <ul class="nav navbar-nav">
-                <li><a href="index.html">Application</a></li>
-                <li><a href="ejbs.html">EJBs</a></li>
-                <li><a href="hibernate.html">Hibernate</a></li>
-                <li><a href="spring.html">Spring</a></li>
-                <li><a href="server-resources.html">Server Resources</a></li>
-                <li><a href="classloader-blacklists.html">Blacklists</a></li>
-                <li><a href="classloader-duplicate.html">Duplicates</a></li>
-                <li><a href="classloader-notfound.html">Not Found</a></li>
-              </ul>
-            </div><!-- /.nav-collapse -->
+            <div class="page-header page-header-no-border">
+                <h1>
+                    <div class="main">Classloader Report</div>
+                    <div class="path">${application.applicationName?html}</div>
+                </h1>
+
+                <div class="navbar navbar-default">
+                <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                </div>
+                <div class="navbar-collapse collapse navbar-responsive-collapse">
+                    <ul class="nav navbar-nav">
+                        <li><a href="index.html">Application</a></li>
+                        <li><a href="ejbs.html">EJBs</a></li>
+                        <li><a href="hibernate.html">Hibernate</a></li>
+                        <li><a href="spring.html">Spring</a></li>
+                        <li><a href="server-resources.html">Server Resources</a></li>
+                        <li><a href="classloader-blacklists.html">Blacklists</a></li>
+                        <li><a href="classloader-duplicate.html">Duplicates</a></li>
+                        <li><a href="classloader-notfound.html">Not Found</a></li>
+                    </ul>
+                </div><!-- /.nav-collapse -->
+                </div>
             </div>
-          </div>
         </div>
-       
+
     </div>
 
 
@@ -63,7 +67,7 @@
 			  	<#if clz.references?has_content>
 			  	<table>
 					<#list clz.references as reference>
-						<tr>${reference.referenceType}<td></td><td>${reference.clzName}</td></tr>		
+						<tr>${reference.referenceType}<td></td><td>${reference.clzName}</td></tr>
 					</#list>
 				</table>
 				</#if>
@@ -74,7 +78,7 @@
 			</table>
 	</div>
 	</#if>
-        
+
     </div> <!-- /container -->
 
 

diff --git a/reporting/impl/src/main/resources/reports/templates/index.ftl b/reporting/impl/src/main/resources/reports/templates/index.ftl
@@ -17,10 +17,10 @@
 				<a href="reports/${applicationReport.reportFilename}">${applicationReport.projectModel.name}</a>
 			</td>
 			<td>
-				
+
 				<#list getTechnologyTagsForProject(applicationReport.projectModel) as tag>
 					<@tagRenderer tag>
-						<#if tag.version?has_content> ${tag.name} ${tag.version} 
+						<#if tag.version?has_content> ${tag.name} ${tag.version}
 						<#else>
 							${tag.name}
 						</#if>
@@ -42,10 +42,6 @@
 		<!-- Bootstrap -->
 		<link href="reports/resources/css/bootstrap.min.css" rel="stylesheet"/>
 		<link href="reports/resources/css/windup.css" rel="stylesheet" media="screen"/>
-
-		<style>
-
-		</style>
 	</head>
 	<body role="document">
 
@@ -62,7 +58,10 @@
 
         <div class="row">
             <div class="page-header">
-                <h1>Overview <span class="slash">/</span><small style="margin-left: 20px; font-weight: 100;">Profiled by Windup</small></h1>
+                <h1>
+                    <div class="main">Overview</div>
+                    <div class="path">Profiled by Windup</div>
+                </h1>
             </div>
         </div>
     </div>

diff --git a/reporting/impl/src/main/resources/reports/templates/ruleprovidersummary.ftl b/reporting/impl/src/main/resources/reports/templates/ruleprovidersummary.ftl
@@ -10,7 +10,7 @@
     <link href="resources/css/windup.java.css" rel="stylesheet" media="screen"/>
   </head>
   <body role="document">
-	    
+
 	<div class="navbar navbar-default navbar-fixed-top">
 		<div class="navbar-header">
 			<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
@@ -28,11 +28,13 @@
 			<ul class="nav navbar-nav"></ul>
 		</div><!-- /.nav-collapse -->
 	</div>
-	
+
 	<div class="container-fluid" role="main">
 		<div class="row">
 			<div class="page-header page-header-no-border">
-				<h1>Rule Provider Executions</h1>         
+                <h1>
+                    <div class="main">Rule Provider Executions</div>
+                </h1>
 			</div>
 		</div>
 
@@ -52,8 +54,8 @@
 						</div>
 						<table class="table table-striped table-bordered">
 						  	<tr>
-					    		<th>Rule-ID</th>			    		
-					    		<th>Rule</th>			    		
+					    		<th>Rule-ID</th>
+					    		<th>Rule</th>
 					    		<th>Statistics</th>
 					    		<th>Status?</th>
 					    		<th>Result?</th>
@@ -74,7 +76,7 @@
 										<div>Edges Created: ${ruleExecutionInfo.edgeIDsAdded}</div>
 										<div>Vertices Removed: ${ruleExecutionInfo.vertexIDsRemoved}</div>
 										<div>Edges Removed: ${ruleExecutionInfo.edgeIDsRemoved}</div>
-									</td>					
+									</td>
 									<td>
 										${ruleExecutionInfo.executed?string("Condition met.", "Condition not met.")}
 									</td>
@@ -106,10 +108,10 @@
 	</div> <!-- /container main -->
 
     <script src="resources/js/jquery-1.10.1.min.js"></script>
-    
+
     <script src="resources/libraries/flot/jquery.flot.min.js"></script>
     <script src="resources/libraries/flot/jquery.flot.pie.min.js"></script>
-    
+
     <script src="resources/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/reporting/impl/src/main/resources/reports/templates/server-resources.ftl b/reporting/impl/src/main/resources/reports/templates/server-resources.ftl
@@ -11,32 +11,35 @@
 
     <div class="container-fluid" role="main">
         <div class="row">
-          <div class="page-header page-header-no-border">
-            <h1>Server Resource Report <span class="slash">/</span><small style="margin-left: 20px; font-weight: 100;">${application.applicationName}</small></h1>
-             <div class="navbar navbar-default">
-            <div class="navbar-header">
-              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-              </button>
+            <div class="page-header page-header-no-border">
+                <h1>
+                    <div class="main">Server Resource Report</div>
+                    <div class="path">${application.applicationName?html}</div>
+                </h1>
+                <div class="navbar navbar-default">
+                    <div class="navbar-header">
+                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                        </button>
+                    </div>
+                    <div class="navbar-collapse collapse navbar-responsive-collapse">
+                        <ul class="nav navbar-nav">
+                            <li><a href="index.html">Application</a></li>
+                            <li><a href="ejbs.html">EJBs</a></li>
+                            <li><a href="hibernate.html">Hibernate</a></li>
+                            <li><a href="spring.html">Spring</a></li>
+                            <li><a href="server-resources.html">Server Resources</a></li>
+                            <li><a href="classloader-blacklists.html">Blacklists</a></li>
+                            <li><a href="classloader-duplicate.html">Duplicates</a></li>
+                            <li><a href="classloader-notfound.html">Not Found</a></li>
+                        </ul>
+                    </div><!-- /.nav-collapse -->
+                </div>
             </div>
-            <div class="navbar-collapse collapse navbar-responsive-collapse">
-              <ul class="nav navbar-nav">
-                <li><a href="index.html">Application</a></li>
-                <li><a href="ejbs.html">EJBs</a></li>
-                <li><a href="hibernate.html">Hibernate</a></li>
-                <li><a href="spring.html">Spring</a></li>
-                <li><a href="server-resources.html">Server Resources</a></li>
-                <li><a href="classloader-blacklists.html">Blacklists</a></li>
-                <li><a href="classloader-duplicate.html">Duplicates</a></li>
-                <li><a href="classloader-notfound.html">Not Found</a></li>
-              </ul>
-            </div><!-- /.nav-collapse -->
-            </div>
-          </div>
         </div>
-       
+
     </div>
 
 
@@ -72,7 +75,7 @@
         </div>
       </div>
 	</#if>
-	
+
 	<#if server.queues?has_content>
     <div class="panel panel-primary">
         <div class="panel-heading">
@@ -100,7 +103,7 @@
         </div>
     </div>
     </#if>
-    
+
     <#if server.jmxBeans?has_content>
     <div class="panel panel-primary">
         <div class="panel-heading">
@@ -129,7 +132,7 @@
       </div>
     </#if>
 
-        
+
     </div> <!-- /container -->
 
 

diff --git a/reporting/impl/src/main/resources/reports/templates/windupfreemarkerfunctions.ftl b/reporting/impl/src/main/resources/reports/templates/windupfreemarkerfunctions.ftl
@@ -28,22 +28,24 @@
 			<ul class="nav navbar-nav"></ul>
 		</div><!-- /.nav-collapse -->
 	</div>
-	
+
 	<div class="container-fluid" role="main">
 		<div class="row">
 			<div class="page-header page-header-no-border">
-				<h1>Windup FreeMarker Functions and Directives</h1>
+                <h1>
+                    <div class="main">Windup FreeMarker Functions and Directives</div>
+                </h1>
 			</div>
 		</div>
-	
+
 	    <div class="row container-fluid">
 			<div class="panel panel-primary">
 				<div class="panel-heading">
 				    Functions
 				</div>
 				<table class="table table-striped table-bordered">
 				  	<tr>
-			    		<th>Function Name</th>			    		
+			    		<th>Function Name</th>
 			    		<th>Description</th>
 		  			</tr>
 		  			<#list getAllFreeMarkerMethods() as freeMarkerMethod>
@@ -54,14 +56,14 @@
 					</#list>
 		  		</table>
 			</div>
-	
+
 			<div class="panel panel-primary">
 				<div class="panel-heading">
 				    Directives
 				</div>
 				<table class="table table-striped table-bordered">
 				  	<tr>
-			    		<th>Directive Name</th>			    		
+			    		<th>Directive Name</th>
 			    		<th>Description</th>
 		  			</tr>
 					<#list getAllFreeMarkerDirectives() as freeMarkerDirective>
@@ -78,10 +80,10 @@
 	</div> <!-- /container main -->
 
     <script src="resources/js/jquery-1.10.1.min.js"></script>
-    
+
     <script src="resources/libraries/flot/jquery.flot.min.js"></script>
     <script src="resources/libraries/flot/jquery.flot.pie.min.js"></script>
-    
+
     <script src="resources/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/rules-java-ee/addon/src/main/resources/reports/templates/ejb.ftl b/rules-java-ee/addon/src/main/resources/reports/templates/ejb.ftl
@@ -79,7 +79,10 @@
 	<div class="container-fluid" role="main">
 		<div class="row">
 			<div class="page-header page-header-no-border">
-				<h1>EJB Report <span class="slash">/</span><small style="margin-left: 20px; font-weight: 100;">${reportModel.projectModel.name}</small></h1>
+                <h1>
+                    <div class="main">EJB Report</div>
+                    <div class="path">${reportModel.projectModel.name?html}</div>
+                </h1>
 			</div>
 		</div>
 

diff --git a/rules-java-ee/addon/src/main/resources/reports/templates/hibernate.ftl b/rules-java-ee/addon/src/main/resources/reports/templates/hibernate.ftl
@@ -11,7 +11,7 @@
     <link href="resources/css/windup.css" rel="stylesheet" media="screen">
   </head>
   <body role="document">
-	
+
 	<!-- Navbar -->
 	<div class="navbar navbar-default navbar-fixed-top">
 		<div class="navbar-header">
@@ -26,28 +26,31 @@
 		</div><!-- /.nav-collapse -->
 	</div>
 	<!-- / Navbar -->
-	
+
 	<div class="container-fluid" role="main">
 		<div class="row">
 			<div class="page-header page-header-no-border">
-				<h1>Hibernate Report <span class="slash">/</span><small style="margin-left: 20px; font-weight: 100;">${reportModel.projectModel.name}</small></h1>
+                <h1>
+                    <div class="main">Hibernate Report</div>
+                    <div class="path">${reportModel.projectModel.name?html}</div>
+                </h1>
 			</div>
 		</div>
-	
+
 		<div class="row">
 			<!-- Breadcrumbs -->
 			<div class="container-fluid">
 				<ol class="breadcrumb top-menu">
 					<li><a href="../index.html">All Applications</a></li>
 					<#include "include/breadcrumbs.ftl">
-				</ol> 
+				</ol>
 			</div>
 			<!-- / Breadcrumbs -->
 		</div>
 
 		<div class="row">
     		<div class="container-fluid theme-showcase" role="main">
-		
+
 		    <#list reportModel.relatedResources.hibernateConfiguration.list.iterator() as hibernateConfiguration>
 		    	<#list hibernateConfiguration.hibernateSessionFactories.iterator() as sessionFactory>
 			    	<#if iterableHasContent(sessionFactory.sessionFactoryProperties?keys)>
@@ -93,7 +96,7 @@
 		    </#if>
 	    </div> <!-- /container -->
 	</div><!--/row-->
-	
+
 	</div><!-- /container main-->
 
     <script src="resources/js/jquery-1.10.1.min.js"></script>