litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3313: Refactored markup and styles for Startup Status page

Browse source
This commit is contained in:
manolobevia 2011-11-14 21:29:00 +00:00
parent d3fc45f2c6
commit 1982c96756
3 changed files with 113 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

36
webapp/web/css/startupStatus.css
View file

@ -2,27 +2,31 @@
/* Styles for Freemarker template startupStatus-display */ /* Styles for Freemarker template startupStatus-display */
table.item { #startup-trace {
border: thin solid black;
font-family: monospace;
width: 100%; width: 100%;
} }
table.item tr.top { #startup-trace h4 {
font-size: larger; padding: .5em;
margin-bottom: 0;
padding-bottom: .5em;
padding-top: 1em;
} }
table.item td { #startup-trace ul.item-spec {
border: thin solid black; margin-bottom: 1em;
} }
.error td { #startup-trace ul.item-spec li{
background: #FFDDDD; padding-left: .5em;
font-weight: bolder; padding-bottom: .4em;
} }
.warning td { #startup-trace li.error {
background: #FFFFDD; background-color: #FFDDDD;
} }
.info td { #startup-trace li.warning{
background: #DDFFDD; background-color: #FFFFDD;
} }
.not_executed td { #startup-trace li.info {
color: #444444; background-color: #DDFFDD;
}
#startup-trace li.not_executed {
background-color: #F3F3F0;
} }

42
webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl
View file

@ -18,49 +18,51 @@
<#else> <#else>
<#assign color = "" > <#assign color = "" >
</#if> </#if>
<tr><td>
<table cellspacing="0" class="item ${color}"> <li class="item ${color}" role="listitem">
<tr class="top"> <h4>${item.level}: ${item.shortSourceName}</h4>
<td width="20%">${item.level}</td>
<td>${item.shortSourceName}</td> <ul class="item-spec" role="navigation">
</tr> <li role="listitem">${item.message}</li>
<tr> <li role="listitem">${item.sourceName}</li>
<td colspan="2">${item.message}</td>
</tr>
<tr>
<td colspan="2">${item.sourceName}</td>
</tr>
<#if item.cause??> <#if item.cause??>
<tr> <li role="listitem"><pre>${item.cause}</pre></li>
<td colspan="2"><pre>${item.cause}</pre></td>
</tr>
</#if> </#if>
</table> </ul>
</td></tr> </li>
</#macro> </#macro>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.css" />')}
<#if status.errorItems?has_content> <#if status.errorItems?has_content>
<h2>Fatal error</h2> <h2>Fatal error</h2>
<p>VIVO detected a fatal error during startup.</p> <p>VIVO detected a fatal error during startup.</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.errorItems as item> <#list status.errorItems as item>
<@statusItem item=item /> <@statusItem item=item />
</#list> </#list>
</ul>
</#if> </#if>
<#if status.warningItems?has_content> <#if status.warningItems?has_content>
<h2>Warning</h2> <h2>Warning</h2>
<p>VIVO issued warnings during startup.</p> <p>VIVO issued warnings during startup.</p>
<#list status.warningItems as item>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
<@statusItem item=item /> <@statusItem item=item />
</#list> </#list>
</ul>
</#if> </#if>
<h2>Startup trace</h2> <h2>Startup trace</h2>
<p>The full list of startup events and messages.</p> <p>The full list of startup events and messages.</p>
<table cellspacing="0" class="trace">
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.statusItems as item> <#list status.statusItems as item>
<@statusItem item=item /> <@statusItem item=item />
</#list> </#list>
</table> </ul>

140
webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
View file

@ -23,88 +23,90 @@
<#else> <#else>
<#assign color = "" > <#assign color = "" >
</#if> </#if>
<tr><td> <li class="item ${color}" role="listitem">
<table cellspacing="0" class="item ${color}"> <h4>${item.level}: ${item.shortSourceName}</h4>
<tr class="top">
<td width="20%">${item.level}</td> <ul class="item-spec" role="navigation">
<td>${item.shortSourceName}</td> <li role="listitem">${item.message}</li>
</tr> <li role="listitem">${item.sourceName}</li>
<tr>
<td colspan="2">${item.message}</td>
</tr>
<tr>
<td colspan="2">${item.sourceName}</td>
</tr>
<#if item.cause??> <#if item.cause??>
<tr> <li role="listitem"><pre>${item.cause}</pre></li>
<td colspan="2"><pre>${item.cause}</pre></td>
</tr>
</#if> </#if>
</table> </ul>
</td></tr> </li>
</#macro> </#macro>
<html> <!DOCTYPE html>
<html lang="en">
<head> <head>
<title>Startup Status</title> <title>Startup Status</title>
<style TYPE="text/css"> <style TYPE="text/css">
table.item { #startup-trace {
border: thin solid black; width: 100%;
font-family: monospace; }
width: 100%; #startup-trace h4 {
} padding: .5em;
table.item tr.top { margin-bottom: 0;
font-size: larger; padding-bottom: .5em;
} padding-top: 1em;
table.item td { }
border: thin solid black; #startup-trace ul.item-spec {
} margin-bottom: 1em;
.error td { }
background: #FFDDDD; #startup-trace ul.item-spec li{
font-weight: bolder; padding-left: .5em;
} padding-bottom: .4em;
.warning td { }
background: #FFFFDD; #startup-trace li.error {
} background-color: #FFDDDD;
.info td { }
background: #DDFFDD; #startup-trace li.warning{
} background-color: #FFFFDD;
.not_executed td { }
color: #444444; #startup-trace li.info {
} background-color: #DDFFDD;
}
#startup-trace li.not_executed {
background-color: #F3F3F0;
}
</style> </style>
</head> </head>
<body> <body>
<#if status.errorItems?has_content> <#if status.errorItems?has_content>
<h2>Fatal error</h2> <h2>Fatal error</h2>
<p>${contextPath} detected a fatal error during startup.</p>
<#if showLink> <p>VIVO detected a fatal error during startup.</p>
<p><a href=".">Continue</a></p>
</#if> <ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.errorItems as item> <#list status.errorItems as item>
<@statusItem item=item /> <@statusItem item=item />
</#list>
</#if>
<#if status.warningItems?has_content>
<h2>Warning</h2>
<p>${contextPath} found problems during startup.</p>
<#if showLink>
<p><a href=".">Continue</a></p>
</#if>
<#list status.warningItems as item>
<@statusItem item=item />
</#list>
</#if>
<h2>Startup trace</h2>
<p>The full list of startup events and messages.</p>
<table cellspacing="0" class="trace">
<#list status.statusItems as item>
<@statusItem item=item />
</#list> </#list>
</table> </ul>
</#if>
<#if status.warningItems?has_content>
<h2>Warning</h2>
<p>VIVO issued warnings during startup.</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
<@statusItem item=item />
</#list>
</ul>
</#if>
<h2>Startup trace</h2>
<p>The full list of startup events and messages.</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.statusItems as item>
<@statusItem item=item />
</#list>
</ul>
</body> </body>
</html> </html>