From 4eaa6cb8657b85bc567021f0aa02496fcddc978f Mon Sep 17 00:00:00 2001 From: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Date: Fri, 3 Jan 2025 18:49:00 +0100 Subject: [PATCH] [Evaluation tool] Optimize "Error and warning messages" layout --- CHANGELOG.rst | 2 ++ site/css/main.css | 7 ++++--- site/js/helpers.js | 24 +++++++++++++++--------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e4beee39..99e388f2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -187,6 +187,8 @@ Changed * Hungarian +* [Evaluation tool] Optimize "Error and warning messages" layout + Fixed ~~~~~ diff --git a/site/css/main.css b/site/css/main.css index 127c7fc4..0f8fd1e0 100644 --- a/site/css/main.css +++ b/site/css/main.css @@ -12,9 +12,10 @@ p.value_explanation { padding: 6px 10px; border-radius: 5px; } -/* See http://clrs.cc/ */ -.error { background: #ff851b } /* Orange */ -.warning { background: #ffdc00 } /* Yellow */ +/* See https://clrs.cc/ */ +.error { background: #ff851b; padding: 3px; } /* Orange */ +.warning { background: #ffdc00; padding: 3px; } /* Yellow */ +div.warning_error_message { margin: 5px 0 0 0; padding: 5px; background-color : white; opacity: 0.8; font-family: monospace;} span.year { background: #ff851b } /* Orange */ span.week { background: #ffdc00 } /* Yellow */ span.month { background: #88ff88 } diff --git a/site/js/helpers.js b/site/js/helpers.js index 03accfe9..76521918 100644 --- a/site/js/helpers.js +++ b/site/js/helpers.js @@ -1,3 +1,5 @@ +/* global $, , default_lat, default_lon, i18next, jQuery, mapCountryToLanguage, opening_hours, OpeningHoursTable, specification_url, YoHoursChecker */ + /* Constants {{{ */ var nominatim_api_url = 'https://nominatim.openstreetmap.org/reverse'; // var nominatim_api_url = 'https://open.mapquestapi.com/nominatim/v1/reverse.php'; @@ -189,9 +191,10 @@ function Evaluate (offset, reset) { var it = oh.getIterator(date); } catch (err) { crashed = err; - show_warnings_or_errors.innerHTML = '

' + i18next.t('texts.filter.error') + ':
' - + '

'; + show_warnings_or_errors.innerHTML = ` +
${i18next.t('texts.filter.error')} +
${crashed}
+
`; show_time_table.innerHTML = ''; show_results.innerHTML = ''; } @@ -331,15 +334,18 @@ function Evaluate (offset, reset) { var warnings = oh.getWarnings(); if (warnings.length > 0) { - show_warnings_or_errors.innerHTML += '

' + i18next.t('texts.filter.error') + ':
' - + '

'; + show_warnings_or_errors.innerHTML += ` +
${i18next.t('texts.filter.error')} +
${warnings.join('\n')}
+
`; } if (prettified.length > 255) { - show_warnings_or_errors.innerHTML += '

' + i18next.t('texts.value to long for osm', - { pretLength: prettified.length, valLength: value.length, maxLength: 255 }) + '

'; + show_warnings_or_errors.innerHTML += ` +
${i18next.t('texts.filter.error')} +
${i18next.t('texts.value to long for osm', + { pretLength: prettified.length, valLength: value.length, maxLength: 255 })}
+
`; } show_time_table.innerHTML += OpeningHoursTable.drawTableAndComments(oh, it);