diff --git a/webapp/web/css/startupStatus.css b/webapp/web/css/startupStatus.css index 9bd8afecf..d1b4faff5 100644 --- a/webapp/web/css/startupStatus.css +++ b/webapp/web/css/startupStatus.css @@ -2,27 +2,31 @@ /* Styles for Freemarker template startupStatus-display */ -table.item { - border: thin solid black; - font-family: monospace; +#startup-trace { width: 100%; } -table.item tr.top { - font-size: larger; +#startup-trace h4 { + padding: .5em; + margin-bottom: 0; + 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; - font-weight: bolder; +#startup-trace ul.item-spec li{ + 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; } diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl index 056f17d9e..8a424224a 100644 --- a/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl +++ b/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl @@ -18,49 +18,51 @@ <#else> <#assign color = "" > - - - - - - - - - - - - + +
  • +

    ${item.level}: ${item.shortSourceName}

    + +
  • - - +
  • ${item.cause}
  • -
    ${item.level}${item.shortSourceName}
    ${item.message}
    ${item.sourceName}
    ${item.cause}
    - + + ${stylesheets.add('')} <#if status.errorItems?has_content>

    Fatal error

    +

    VIVO detected a fatal error during startup.

    + + <#if status.warningItems?has_content>

    Warning

    +

    VIVO issued warnings during startup.

    - <#list status.warningItems as item> + +

    Startup trace

    +

    The full list of startup events and messages.

    - + +
    + diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl index 784753afd..73baf9240 100644 --- a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl +++ b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl @@ -23,88 +23,90 @@ <#else> <#assign color = "" > - - - - - - - - - - - - +
  • +

    ${item.level}: ${item.shortSourceName}

    + +
  • - - +
  • ${item.cause}
  • -
    ${item.level}${item.shortSourceName}
    ${item.message}
    ${item.sourceName}
    ${item.cause}
    - + + - + + + Startup Status - <#if status.errorItems?has_content> -

    Fatal error

    -

    ${contextPath} detected a fatal error during startup.

    - <#if showLink> -

    Continue

    - - <#list status.errorItems as item> + <#if status.errorItems?has_content> +

    Fatal error

    + +

    VIVO detected a fatal error during startup.

    + + + + + <#if status.warningItems?has_content> +

    Warning

    + +

    VIVO issued warnings during startup.

    + + + + +

    Startup trace

    + +

    The full list of startup events and messages.

    + +