2.1.0.3 Standalone and Analysis Report

zspitzer · Mar 30, 2021 · 783a1ab · 783a1ab
1 parent e74771a
commit 783a1ab
Show file tree

Hide file tree

Showing 23 changed files with 171 additions and 321 deletions.
diff --git a/box.json b/box.json
@@ -1,7 +1,7 @@
 {
     "name":"Lucee Performance Analyzer",
     "author":"Zac Spitzer",
-    "version":"2.0.0.3",
+    "version":"2.1.0.3",
     "bugs":"https://github.com/zspitzer/lucee-performance-analyzer/issues",
     "thumbnail": "https://raw.githubusercontent.com/zspitzer/lucee-performance-analyzer/master/build/images/logo.png",
     "changelog":"",

diff --git a/build.number b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Mar 25 03:33:05 CET 2021
-build.number=4
+#Tue Mar 30 21:31:50 CEST 2021
+build.number=5
diff --git a/build.properties b/build.properties
@@ -1,5 +1,5 @@
 bundlename: PerformanceAnalyzer.extension
-bundleversion: 2.0.0.
+bundleversion: 2.1.0.
 codename: PerformanceAnalyzer
 camelname: performanceAnalyzer
 category: admin plugin logs performance

diff --git a/dist/modern/extension-PerformanceAnalyzer-2.0.0.3.lex b/dist/modern/extension-PerformanceAnalyzer-2.0.0.3.lex
diff --git a/dist/modern/extension-PerformanceAnalyzer-2.1.0.4.lex b/dist/modern/extension-PerformanceAnalyzer-2.1.0.4.lex
diff --git a/index.cfm b/index.cfm
@@ -5,7 +5,7 @@
 	request.version = DeserializeJson(FileRead("box.json")).version;
 	request.subtitle = "";
 	request.title = "Lucee Performance Analyzer - #request.version#";
-	param name="url.pluginAction" default="logs";
+	param name="url.pluginAction" default="analysis";
 	param name="url.xhr" default="false";
 	variables.plugin = new source.cfml.plugins.Action(lang={},app={});
 
@@ -28,7 +28,7 @@
 		}
 	}
 </cfscript>
-
+<cfcontent reset="yes">
 <html>
 	<head>
 		<cfoutput>
@@ -47,7 +47,7 @@
 		</cfif>
 	</div>
 	<div class="content">
-	#body#
+	#variables.plugin.getRenderUtils().cleanHtml(body)#
 </div>
 </cfoutput>
 </body>

diff --git a/login.cfm b/login.cfm
@@ -21,18 +21,24 @@
 			variables.login_error = cfcatch.message;
 		}
 	}
-	variables.plugin.getRenderUtils().includeCSS("style");
+	variables.style=FileRead("source\cfml\plugins\css\style.css"); // assets require a login
 </cfscript>
-<form action="?action=login" method="POST" class="login">
-	<fieldset style="border: 1px solid black; padding: 20px; max-width: 400px;">
-		<legend>Login</legend>
-		<cfif len(variables.login_error)>
-			<cfoutput>
+	<cfoutput>
+	<style>
+		#style#
+	</style>
+	<form action="?action=login" method="POST" class="login">
+		<fieldset style="border: 1px solid black; padding: 20px; max-width: 400px;">
+			<legend>Login</legend>
+			<cfif len(variables.login_error)>
 				<div style="color:red;padding-bottom:20px;">#variables.login_error#</div>
-			</cfoutput>
-		</cfif>
-		Login using Lucee Server Password<br>
-		<input name="password" type="password" size="15">
-		<input type="submit" value="Login">
-	</fieldset>
-</form>
+			</cfif>
+			Login using Lucee Server Admin Password<br>
+			<input name="password" type="password" size="15" id="password">
+			<input type="submit" value="Login">
+		</fieldset>
+	</form>
+	<script>
+		document.getElementById("password").focus();
+	</script>
+</cfoutput>
diff --git a/source/cfml/plugins/Action.cfc b/source/cfml/plugins/Action.cfc
@@ -30,6 +30,10 @@ component extends="lucee.admin.plugin.Plugin" {
 		setting showdebugoutput="true";
 	}
 
+	public function getRenderUtils(){
+		return variables.renderUtils;
+	}
+
 	public void function _display(required string template, required struct lang, required struct app, required struct req) {
 		param name="url.xhr" default="false";
 		request._missing_lang = {};
@@ -40,18 +44,18 @@ component extends="lucee.admin.plugin.Plugin" {
 		variables.perf = new Perf();
 		cfinclude(template="toolbar.cfm");
 
-		super._display(argumentcollection=arguments);
-		cfinclude(template="related.cfm");
+		cfinclude(template=arguments.template);
+
 		cfinclude(template="footer.cfm");
-		variables.renderUtils.warnMissingLang(request._missing_lang);
+		//variables.renderUtils.warnMissingLang(request._missing_lang);
 	}
 
 	public function asset(struct lang, struct app, struct req) output=false {
-		param name="req.asset";
+		param name="arguments.req.asset";
 		// dunno why, sometimes this doesn't exist and throws an error
 		if (not structKeyExists(variables, "renderUtils") )
 			variables.renderUtils = new RenderUtils(arguments.lang, action("asset"), this.action );
-		renderUtils.returnAsset(url.asset);
+		variables.renderUtils.returnAsset(url.asset);
 	}
 
 	public function getLang(struct lang, struct app, struct req) output=false {

diff --git a/source/cfml/plugins/aborts.cfm b/source/cfml/plugins/aborts.cfm
@@ -9,7 +9,7 @@
 <cfsavecontent variable="local.body">
 	<tbody>
 	<cfoutput query="local.q" maxrows=#arguments.req.maxrows#>
-		<tr>
+		<tr class="#altRow( local.q.currentRow )#">
 			#renderTemplateLink( arguments.req, local.q.template )#
 			<td>#local.q.line#</td>
 			<td align="right">#NumberFormat( local.q.executions )#</td>

diff --git a/source/cfml/plugins/analysis.cfm b/source/cfml/plugins/analysis.cfm
@@ -0,0 +1,4 @@
+
+<cfscript>
+	cfinclude(template="related.cfm");
+</cfscript>
diff --git a/source/cfml/plugins/css/style.css b/source/cfml/plugins/css/style.css
@@ -1,3 +1,28 @@
+
+.maintbl td, .maintbl th {
+	font-weight: normal;
+	empty-cells: show;
+	border: 1px solid #fff;
+}
+
+body, td, th {
+	font-family:Arial, Helvetica, sans-serif;
+	font-size : 12px;
+	color:#333;
+}
+
+table {empty-cells:show; border-collapse: collapse;}
+td, th {
+	padding: 4 4 4 4;
+	vertical-align:top;
+}
+th {/* like .tblHead */
+	background-color:#39c; /* ABC */
+	color:#efede5;
+	font-weight:normal;
+	text-align:left;
+}
+
 th a {
 	color: inherit;
 	text-decoration: underline;
@@ -13,6 +38,14 @@ th a {
 	text-decoration: none;
 }
 
+.toolbar-file-filter H3, .toolbar-file-filter H1 {
+	margin: 2 0;
+}
+
+hr {
+	margin: 2;
+}
+
 .log-totals TD {
 	font-weight: bolder;
 }
@@ -46,4 +79,13 @@ a {
 
 .alt-row {
 	background-color: #DFDFDF;
-}
+}
+
+.header H1 {
+	margin-bottom:2px;
+	font-size: 1.5em;
+}
+
+.header {
+	padding-bottom:12px;
+}