diff --git a/quesma/quesma/ui/asset/head.html b/quesma/quesma/ui/asset/head.html index d83331f2c..f348757d1 100644 --- a/quesma/quesma/ui/asset/head.html +++ b/quesma/quesma/ui/asset/head.html @@ -65,13 +65,18 @@ } .topnav h3 { - margin: 0 20px 0 10px; + margin: 4px 0 0 0; } .topnav h3, .topnav a, .topnav label { font-size: 1.2em; } + .topnav img { + height: 1.8em; + padding: 0 10px; + } + .topnav ul { list-style-type: none; margin: 0; diff --git a/quesma/quesma/ui/asset/quesma-logo-white-full.svg b/quesma/quesma/ui/asset/quesma-logo-white-full.svg new file mode 100644 index 000000000..6f063ea84 --- /dev/null +++ b/quesma/quesma/ui/asset/quesma-logo-white-full.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/quesma/quesma/ui/html_pages.go b/quesma/quesma/ui/html_pages.go index f4c67d52c..ed6c357d8 100644 --- a/quesma/quesma/ui/html_pages.go +++ b/quesma/quesma/ui/html_pages.go @@ -15,11 +15,21 @@ import ( "strings" ) +func generateSimpleTop(title string) []byte { + var buffer HtmlBuffer + buffer.Html(`
` + "\n") + buffer.Html(`
` + "\n") + buffer.Html(`` + "\n") + buffer.Html(`

`).Text(title).Html(`

`) + buffer.Html("\n
\n
\n\n") + return buffer.Bytes() +} + func generateTopNavigation(target string) []byte { var buffer HtmlBuffer buffer.Html(`
` + "\n") buffer.Html(`
` + "\n") - buffer.Html("

Quesma

\n") + buffer.Html(`` + "\n") buffer.Html("
\n") buffer.Html(`
`) debugKeyValueSlice := []DebugKeyValue{} @@ -699,17 +707,15 @@ func (qmc *QuesmaManagementConsole) generateLogForRequestId(requestId string) [] logMessages, optAsyncId := generateLogMessages(request.logMessages) buffer := newBufferWithHead() - buffer.Html(`
`) if requestFound { - buffer.Html("\n

Quesma Log for request id ").Text(requestId) if optAsyncId != nil { - buffer.Text(" and async id '").Text(*optAsyncId).Html("'") + buffer.Write(generateSimpleTop("Log for request id " + requestId + " and async id " + *optAsyncId)) + } else { + buffer.Write(generateSimpleTop("Log for request id " + requestId)) } - buffer.Html("

") } else { - buffer.Html("\n

Quesma Log not found for ").Text(requestId).Html("

") + buffer.Write(generateSimpleTop("Log not found for request id " + requestId)) } - buffer.Html("\n
\n") buffer.Html(`
`) buffer.Html("\n\n") @@ -830,7 +836,7 @@ func (qmc *QuesmaManagementConsole) generateReportForRequestsWithStr(requestStr } qmc.mutex.Unlock() - title := fmt.Sprintf("Quesma Report for str '%s' with %d results", requestStr, len(debugKeyValueSlice)) + title := fmt.Sprintf("Report for str '%s' with %d results", requestStr, len(debugKeyValueSlice)) return qmc.generateReportForRequests(title, debugKeyValueSlice) } @@ -847,7 +853,7 @@ func (qmc *QuesmaManagementConsole) generateReportForRequestsWithError() []byte } qmc.mutex.Unlock() - return qmc.generateReportForRequests("Quesma Report for requests with errors", debugKeyValueSlice) + return qmc.generateReportForRequests("Report for requests with errors", debugKeyValueSlice) } func (qmc *QuesmaManagementConsole) generateReportForRequestsWithWarning() []byte { @@ -863,13 +869,12 @@ func (qmc *QuesmaManagementConsole) generateReportForRequestsWithWarning() []byt } qmc.mutex.Unlock() - return qmc.generateReportForRequests("Quesma Report for requests with warnings", debugKeyValueSlice) + return qmc.generateReportForRequests("Report for requests with warnings", debugKeyValueSlice) } func (qmc *QuesmaManagementConsole) generateReportForRequests(title string, requests []DebugKeyValue) []byte { buffer := newBufferWithHead() - buffer.Html(`
`) - buffer.Html("\n

").Text(title).Html("

") + buffer.Write(generateSimpleTop(title)) buffer.Html("\n
\n\n") @@ -893,10 +898,7 @@ func (qmc *QuesmaManagementConsole) generateReportForRequests(title string, requ func (qmc *QuesmaManagementConsole) generateErrorForReason(reason string) []byte { buffer := newBufferWithHead() - buffer.Html(`
`) - title := fmt.Sprintf("Quesma Errors with reason '%s'", reason) - buffer.Html("\n

").Text(title).Html("

") - buffer.Html("\n
\n\n") + buffer.Write(generateTopNavigation(fmt.Sprintf("Errors with reason '%s'", reason))) buffer.Html(`
`) errors := errorstats.GlobalErrorStatistics.ErrorReportsForReason(reason)