removed NaN message in stats. improved styling

Author: FreakyBytes

src/main/webapp/WEB-INF/Index.jsp

@@ -156,23 +156,23 @@
 				</div>
 				{{# } }}
 
-				{{# if( stats.averageArchiveCount != undefined ) { }}
+				{{# if( stats.averageArchiveCount != undefined && !isNaN(stats.averageArchiveCount) ) { }}
 				<div class="stats-line stat-averageArchiveCount">
 					<div class="attribute-name">average archives per workspace:</div>
 					<div class="attribute-detail">{{# print( Math.round(stats.averageArchiveCount*100)/100 ); }}</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.averageArchiveCountQuota != undefined ) { }}
+				{{# if( stats.averageArchiveCountQuota != undefined && !isNaN(stats.averageArchiveCountQuota) ) { }}
 				<div class="stats-line stat-averageArchiveCountQuota">
 					<div class="attribute-name">average usage of 'archives per workspace' quota:</div>
 					<div class="attribute-detail">{{# print( Math.round(stats.averageArchiveCountQuota*10000)/100 ); }}%</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.averageWorkspaceAge != undefined ) { }}
+				{{# if( stats.averageWorkspaceAge != undefined && !isNaN(stats.averageWorkspaceAge) ) { }}
 					{{# var avgAge = stats.averageWorkspaceAge/3600; }}
 				<div class="stats-line stat-averageWorkspaceAge">
 					<div class="attribute-name">average age of workspace:</div>
@@ -181,63 +181,63 @@
 				</div>
 				{{# } }}
 
-				{{# if( stats.averageWorkspaceSize != undefined ) { }}
+				{{# if( stats.averageWorkspaceSize != undefined && !isNaN(stats.averageWorkspaceSize) ) { }}
 				<div class="stats-line stat-averageWorkspaceSize">
 					<div class="attribute-name">average size per workspace:</div>
 					<div class="attribute-detail">{{# print( bytesToSize(Math.round(stats.averageWorkspaceSize*100)/100) ); }}</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.averageWorkspaceSizeQuota != undefined ) { }}
+				{{# if( stats.averageWorkspaceSizeQuota != undefined && !isNaN(stats.averageWorkspaceSizeQuota) ) { }}
 				<div class="stats-line stat-averageWorkspaceSizeQuota">
 					<div class="attribute-name">average usage of 'size per workspace' quota:</div>
 					<div class="attribute-detail">{{# print( Math.round(stats.averageWorkspaceSizeQuota*10000)/100 ); }}%</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.totalArchiveCount != undefined ) { }}
+				{{# if( stats.totalArchiveCount != undefined && !isNaN(stats.totalArchiveCount) ) { }}
 				<div class="stats-line stat-totalArchiveCount">
 					<div class="attribute-name">total number of hosted archives:</div>
 					<div class="attribute-detail">{{# print(stats.totalArchiveCount); }}</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.totalSize != undefined ) { }}
+				{{# if( stats.totalSize != undefined && !isNaN(stats.totalSize) ) { }}
 				<div class="stats-line stat-totalSize">
 					<div class="attribute-name">total size of all hosted archives:</div>
 					<div class="attribute-detail">{{# print( bytesToSize(stats.totalSize) ); }}</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.totalSizeQuota != undefined ) { }}
+				{{# if( stats.totalSizeQuota != undefined && !isNaN(stats.totalSizeQuota) ) { }}
 				<div class="stats-line stat-totalSizeQuota">
 					<div class="attribute-name">usage of 'total size' quota:</div>
 					<div class="attribute-detail">{{# print( Math.round(stats.totalSizeQuota*10000)/100 ); }}%</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.totalWorkspaceCount != undefined ) { }}
+				{{# if( stats.totalWorkspaceCount != undefined && !isNaN(stats.totalWorkspaceCount) ) { }}
 				<div class="stats-line stat-totalWorkspaceCount">
 					<div class="attribute-name">total number of hosted workspaces:</div>
 					<div class="attribute-detail">{{# print(stats.totalWorkspaceCount); }}</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.userArchiveCountQuota != undefined ) { }}
+				{{# if( stats.userArchiveCountQuota != undefined && !isNaN(stats.userArchiveCountQuota) ) { }}
 				<div class="stats-line stat-userArchiveCountQuota">
 					<div class="attribute-name">usage of 'archives per workspace' quota:</div>
 					<div class="attribute-detail">{{# print( Math.round(stats.userArchiveCountQuota*10000)/100 ); }}%</div>
 					<div class="clearer"></div>
 				</div>
 				{{# } }}
 
-				{{# if( stats.userWorkspaceSizeQuota != undefined ) { }}
+				{{# if( stats.userWorkspaceSizeQuota != undefined && !isNaN(stats.userWorkspaceSizeQuota) ) { }}
 				<div class="stats-line stat-userWorkspaceSizeQuota">
 					<div class="attribute-name">usage of 'workspace size' quota:</div>
 					<div class="attribute-detail">{{# print( Math.round(stats.userWorkspaceSizeQuota*10000)/100 ); }}%</div>

src/main/webapp/res/css/css.css

@@ -313,11 +313,20 @@ ul.start-history-list > li.current-workspace {
 }
 
 /* -------- Stats View -------- */
+.stats-line {
+/* 	line-height: 1em; */
+	padding: 0.3em 1em;
+}
+.stats-line:nth-of-type(2n) {
+	background-color: #fafafa;
+}
 .stats-line .attribute-name {
 	width: calc(65% - 5px);
+	margin: 0;
 }
 .stats-line .attribute-detail {
 	width: calc(35% - 5px);
+	margin: 0;
 }
 .stats-par {
 	margin-bottom: 1.1em;

src/main/webapp/res/js/js.js

@@ -23,11 +23,22 @@ function bytesToSize(bytes) {
 	return (bytes / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i];
 }
 
+//Underscore template interpolate character to {{# ... }}
+_.templateSettings =  {
+		evaluate: /\{\{#(.+?)\}\}/g,
+		interpolate: /\{\{([^#].*?)\}\}/g
+};
 var __escape = {
 		lt: new RegExp("<", "g"),
 		gt: new RegExp(">", "g"),
 		br: new RegExp("\n", "g")
 };
+var __deescape = {
+		amp: new RegExp("&amp;", "g"),
+		lt: new RegExp("&lt;", "g"),
+		gt: new RegExp("&gt;", "g")
+};
+
 function escape(string, brline) {
 	if( string == null || string == undefined )
 		return string;
@@ -55,8 +66,11 @@ $(document).ready(function () {
 		var id = $el.attr("id");
 		var html = $el.html();
 
-		if( id != undefined && html != undefined && html.length > 1)
+		if( id != undefined && html != undefined && html.length > 1) {
+			console.log(html);
+			html = html.replace(__deescape.amp, "&").replace(__deescape.lt, "<").replace(__deescape.gt, ">");
 			templateCache[ id ] = _.template(html);
+		}
 		$el.remove();
 	});
 

src/main/webapp/res/js/models.js

@@ -1,11 +1,5 @@
 // see http://backbonejs.org/
 
-//Underscore template interpolate character to {{# ... }}
-_.templateSettings =  {
-		evaluate: /\{\{#(.+?)\}\}/g,
-		interpolate: /\{\{([^#].*?)\}\}/g
-};
-
 var ArchiveEntryModel = Backbone.Model.extend({
 	urlRoot: RestRoot + "archives/0/entries",
 	defaults: {