Skip to content

#3187 Refactoring of system settings looks #3191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Patrykb0802 wants to merge 2 commits into
base: release/2.8.0
Choose a base branch
from
Open

#3187 Refactoring of system settings looks #3191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
276a5f9
#3187 Refactoring of system settings looks
Patrykb0802 Sep 19, 2025
de52984
#3187 Refactoring of system settings looks
Patrykb0802 Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,093 changes: 1,758 additions & 1,335 deletions WebContent/WEB-INF/jsp/systemSettings.jsp
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 18 additions & 2 deletions WebContent/assets/common_DARK.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,27 @@ html > body .dojoTreeNodeLabelTitle {
padding-top: 10px;
}

#sltsFooter {
text-align:center;
#sltsFooter{
text-align: center;
position: fixed;
left: var(--slts-sidebar-width, 0px);
right: 0;
bottom: 0;
z-index: 1000;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
padding: 0 8px;
background: var(--slts-color-background);
border-top: 1px solid var(--slts-color-secondary-lighter);
pointer-events: none;
}

@media screen and (max-width: 730px) {
#sltsFooter {
left: 0;
}
#subHeader {
flex-direction: column;

Expand Down
17 changes: 15 additions & 2 deletions WebContent/assets/common_DEFAULT.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,23 @@ html > body .dojoTreeNodeLabelTitle {

#sltsContent {
padding-top: 10px;
padding-bottom: 24px;
}

#sltsFooter {
text-align:center;
#sltsFooter{
text-align: center;
position: fixed;
left: 0;
right: 0;
bottom: 0;
z-index: 1000;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
padding: 0 8px;
background: #fff;
border-top: 1px solid #e5e5e5;
}

#viewContent button {
Expand Down
8 changes: 7 additions & 1 deletion webapp-resources/messages_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3454,4 +3454,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3457,4 +3457,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3497,4 +3497,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_fi.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3582,4 +3582,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3451,4 +3451,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_lu.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3470,4 +3470,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_nl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3572,4 +3572,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_pl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3594,4 +3594,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
Comment on lines +3598 to +3603
Copy link

@coderabbitai coderabbitai bot Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

# First, check the file size and read the relevant sections
wc -l webapp-resources/messages_pl.properties

Repository: SCADA-LTS/Scada-LTS

Length of output: 107

🏁 Script executed:

# Read lines around 3598-3603 to confirm the new sidebar keys
sed -n '3595,3610p' webapp-resources/messages_pl.properties

# Check the cited examples at lines 1289 and 1749
sed -n '1288,1290p' webapp-resources/messages_pl.properties
sed -n '1748,1750p' webapp-resources/messages_pl.properties

# Get a broader sense of translation patterns - check some other systemSettings entries
rg 'systemSettings\.' webapp-resources/messages_pl.properties | head -20

Repository: SCADA-LTS/Scada-LTS

Length of output: 1718

🏁 Script executed:

# Check the exact lines 3598-3603 with cat to see formatting issues
sed -n '3595,3605p' webapp-resources/messages_pl.properties | cat -A

# Search for other aria labels, placeholders, and button text in the Polish file
rg '(aria|Placeholder|Select|Clear|Reset)' webapp-resources/messages_pl.properties

# Check if similar UI strings elsewhere in Polish file are translated
rg '\.button\.|\.label\.|\.placeholder' webapp-resources/messages_pl.properties | head -10

Repository: SCADA-LTS/Scada-LTS

Length of output: 1707

🏁 Script executed:

# Get exact hex dump of the problematic area to see formatting clearly
sed -n '3603,3615p' webapp-resources/messages_pl.properties | od -c | head -50

# Also check if the entries are truly duplicated
rg -c 'systemSettings.sidebar.ariaLabel' webapp-resources/messages_pl.properties
rg -c 'systemSettings.sidebar.reset' webapp-resources/messages_pl.properties

# Get the complete context around line 3603
sed -n '3600,3620p' webapp-resources/messages_pl.properties

Repository: SCADA-LTS/Scada-LTS

Length of output: 295

🏁 Script executed:

# Get the exact six lines 3598-3603
sed -n '3598,3603p' webapp-resources/messages_pl.properties

# Check how many systemSettings entries total exist in Polish file
rg 'systemSettings\.' webapp-resources/messages_pl.properties | wc -l

# Sample some systemSettings entries to understand the translation pattern
rg 'systemSettings\.[a-zA-Z]+=' webapp-resources/messages_pl.properties | head -30

Repository: SCADA-LTS/Scada-LTS

Length of output: 1831

🏁 Script executed:

# Read the raw file content directly without sed to verify Reset109
head -c 100000 webapp-resources/messages_pl.properties | tail -c 2000

# Also check git status and diff to see what was actually added in this PR
git diff HEAD -- webapp-resources/messages_pl.properties | tail -100

Repository: SCADA-LTS/Scada-LTS

Length of output: 2063

🏁 Script executed:

# Get the last 20 lines of the file
tail -20 webapp-resources/messages_pl.properties

# Check git diff for this specific file
git diff HEAD -- webapp-resources/messages_pl.properties | head -150

Repository: SCADA-LTS/Scada-LTS

Length of output: 1489

🏁 Script executed:

# Get the git diff - the -U context will show what was added/removed
git show HEAD:webapp-resources/messages_pl.properties | tail -20

Repository: SCADA-LTS/Scada-LTS

Length of output: 1489

🏁 Script executed:

# Check if messages_en.properties has these sidebar keys
grep 'systemSettings.sidebar' webapp-resources/messages_en.properties

# Check a Polish-adjacent file to understand the pattern
grep -l 'messages.*\.properties' <<< "$(git ls-files webapp-resources/messages_*.properties)" | head -5

# Check messages_de.properties to see if sidebar keys are in German
grep 'systemSettings.sidebar' webapp-resources/messages_de.properties

Repository: SCADA-LTS/Scada-LTS

Length of output: 663

Add Polish translations for the new sidebar localization keys.

The six new systemSettings.sidebar.* keys are added with English values in the Polish locale file (messages_pl.properties). Since SCADA-LTS actively maintains Polish translations, these user-facing UI strings should be translated to Polish rather than left as English fallbacks.

The Polish locale file contains mixed English and Polish entries. Some systemSettings keys are translated to Polish (e.g., line 1289: header.systemSettings=Ustawienia systemowe), while others remain in English. For consistency with actively-maintained Polish localization, the new sidebar keys should include Polish translations:

  • systemSettings.sidebar.ariaLabel
  • systemSettings.sidebar.searchPlaceholder
  • systemSettings.sidebar.searchAria
  • systemSettings.sidebar.selectAll
  • systemSettings.sidebar.clearAll
  • systemSettings.sidebar.reset
🤖 Prompt for AI Agents 
In @webapp-resources/messages_pl.properties around lines 3598 - 3603, The new
sidebar localization keys (systemSettings.sidebar.ariaLabel,
systemSettings.sidebar.searchPlaceholder, systemSettings.sidebar.searchAria,
systemSettings.sidebar.selectAll, systemSettings.sidebar.clearAll,
systemSettings.sidebar.reset) are left in English in messages_pl.properties;
replace their values with Polish translations for consistency (suggestions:
ariaLabel -> "Nawigacja ustawień systemowych", searchPlaceholder -> "Szukaj
ustawień", searchAria -> "Wyszukaj ustawienia", selectAll -> "Zaznacz wszystko",
clearAll -> "Wyczyść wszystko", reset -> "Resetuj") so the Polish locale no
longer falls back to English.

6 changes: 6 additions & 0 deletions webapp-resources/messages_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3610,3 +3610,9 @@ systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3605,4 +3605,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset
8 changes: 7 additions & 1 deletion webapp-resources/messages_zh.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3557,4 +3557,10 @@ systemSettings.amChart.limitFactor=Limit factor
systemSettings.amChartsSaved=AmCharts settings have been saved
systemSettings.scadaConfTitle=Scada-LTS environment settings
systemSettings.scadaConfCheck=Check configuration
validate.unsupportedDataType=Data type {0} is not supported
validate.unsupportedDataType=Data type {0} is not supported
systemSettings.sidebar.ariaLabel=System settings navigation
systemSettings.sidebar.searchPlaceholder=Search for settings
systemSettings.sidebar.searchAria=Search settings
systemSettings.sidebar.selectAll=Select all
systemSettings.sidebar.clearAll=Clear all
systemSettings.sidebar.reset=Reset