Skip to content

fix: Rendering issues when map page includes pull down with several maps #234

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

Merged
TheWitness merged 3 commits into from
May 26, 2026
+51 −32
Merged

fix: Rendering issues when map page includes pull down with several maps #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b90844f
fix: Rendering issues when map page includes pull down with several maps
TheWitness May 26, 2026
3a3b55c
fix: Updating workflow version
TheWitness May 26, 2026
0aff317
fix: Revert version change, its GitHub again
TheWitness May 26, 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 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ IMPORTANT NOTE: This version only works on CACTI 1.x++!

## Changes

--- develop ---
* issue#233: Rendering issues when the page includes several maps with dropdown

--- 1.6 ---
* security#205: weathermap_group_move() uses raw SQL instead of parameterized queries
* security#216: Security: defense-in-depth audit findings
Expand Down
60 changes: 33 additions & 27 deletions locales/po/cacti.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cacti \n"
"Report-Msgid-Bugs-To: developers@cacti.net\n"
"POT-Creation-Date: 2026-05-20 10:35-0400\n"
"POT-Creation-Date: 2026-05-26 08:16-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Cacti Developers <developers@cacti.net>>\n"
"Language-Team: Cacti Developers <developers@cacti.net>\n"
Expand Down Expand Up @@ -253,8 +253,8 @@ msgstr ""
msgid "Weathermap"
msgstr ""

#: setup.php:214 weathermap-cacti-plugin.php:476
#: weathermap-cacti-plugin.php:571
#: setup.php:214 weathermap-cacti-plugin.php:486
#: weathermap-cacti-plugin.php:581
msgid "Network Weathermap"
msgstr ""

Expand Down Expand Up @@ -509,8 +509,9 @@ msgstr ""
msgid "Normal User"
msgstr ""

#: setup.php:689 setup.php:729 weathermap-cacti-plugin.php:386
#: weathermap-cacti-plugin.php:521 weathermap-cacti-plugin.php:644
#: setup.php:689 setup.php:729 weathermap-cacti-plugin.php:245
#: weathermap-cacti-plugin.php:396 weathermap-cacti-plugin.php:531
#: weathermap-cacti-plugin.php:654
#, php-format
msgid "Map for config file: %s"
msgstr ""
Expand Down Expand Up @@ -555,7 +556,7 @@ msgstr ""
msgid "View Configuration"
msgstr ""

#: setup.php:871 weathermap-cacti-plugin.php:396
#: setup.php:871 weathermap-cacti-plugin.php:406
msgid "Edit Map"
msgstr ""

Expand All @@ -568,7 +569,7 @@ msgid "Edit Permissions"
msgstr ""

#: setup.php:892 setup.php:899 weathermap-cacti-plugin-mgmt.php:715
#: weathermap-cacti-plugin.php:394
#: weathermap-cacti-plugin.php:404
msgid "Map Settings"
msgstr ""

Expand Down Expand Up @@ -644,7 +645,7 @@ msgstr ""
msgid "Group Admin Delete"
msgstr ""

#: setup.php:1251 weathermap-cacti-plugin.php:722
#: setup.php:1251 weathermap-cacti-plugin.php:732
msgid "Local Documentation"
msgstr ""

Expand Down Expand Up @@ -1347,7 +1348,7 @@ msgstr ""
msgid "Create Options"
msgstr ""

#: weathermap-cacti-plugin-mgmt.php:1232 weathermap-cacti-plugin.php:723
#: weathermap-cacti-plugin-mgmt.php:1232 weathermap-cacti-plugin.php:733
msgid "New Map"
msgstr ""

Expand Down Expand Up @@ -1737,79 +1738,84 @@ msgstr ""
msgid "You must include a Map File name to Create"
msgstr ""

#: weathermap-cacti-plugin.php:393 weathermap-cacti-plugin.php:400
#: weathermap-cacti-plugin.php:252
#, php-format
msgid "Network Weathermap named \"%s\""
msgstr ""

#: weathermap-cacti-plugin.php:403 weathermap-cacti-plugin.php:410
msgid "Return to Main Page"
msgstr ""

#: weathermap-cacti-plugin.php:395
#: weathermap-cacti-plugin.php:405
msgid "Map Permissions"
msgstr ""

#: weathermap-cacti-plugin.php:414 weathermap-cacti-plugin.php:667
#: weathermap-cacti-plugin.php:424 weathermap-cacti-plugin.php:677
msgid "This map hasn't been created yet."
msgstr ""

#: weathermap-cacti-plugin.php:446
#: weathermap-cacti-plugin.php:456
msgid "Manage Maps"
msgstr ""

#: weathermap-cacti-plugin.php:480
#: weathermap-cacti-plugin.php:490
#, php-format
msgid "Network Weathermaps [ %sAutomatically Cycle%s ]"
msgstr ""

#: weathermap-cacti-plugin.php:529
#: weathermap-cacti-plugin.php:539
msgid "(thumbnail for map not created yet)"
msgstr ""

#: weathermap-cacti-plugin.php:533
#: weathermap-cacti-plugin.php:543
msgid "(Live View)"
msgstr ""

#: weathermap-cacti-plugin.php:542 weathermap-cacti-plugin.php:697
#: weathermap-cacti-plugin.php:552 weathermap-cacti-plugin.php:707
msgid "You Have No Maps"
msgstr ""

#: weathermap-cacti-plugin.php:545
#: weathermap-cacti-plugin.php:555
#, php-format
msgid "To add a map to the schedule, go to the %s Manage...Weathermaps page %s and add one."
msgstr ""

#: weathermap-cacti-plugin.php:573
#: weathermap-cacti-plugin.php:583
msgid "Network Weathermaps"
msgstr ""

#: weathermap-cacti-plugin.php:594
#: weathermap-cacti-plugin.php:604
#, php-format
msgid "Showing %s %s of %s %s. Cycling all available maps in this group."
msgstr ""

#: weathermap-cacti-plugin.php:596
#: weathermap-cacti-plugin.php:606
#, php-format
msgid "Showing %s %s of %s %s. Cycling all available maps."
msgstr ""

#: weathermap-cacti-plugin.php:718
#: weathermap-cacti-plugin.php:728
#, php-format
msgid "Powered by %s PHP Weathermap Version %s %s"
msgstr ""

#: weathermap-cacti-plugin.php:721
#: weathermap-cacti-plugin.php:731
msgid "Go to the Map Management page"
msgstr ""

#: weathermap-cacti-plugin.php:721
#: weathermap-cacti-plugin.php:731
msgid "Weathermap Management"
msgstr ""

#: weathermap-cacti-plugin.php:788
#: weathermap-cacti-plugin.php:798
msgid "Weathermap Filter"
msgstr ""

#: weathermap-cacti-plugin.php:797
#: weathermap-cacti-plugin.php:807
msgid "Map to View"
msgstr ""

#: weathermap-cacti-plugin.php:904
#: weathermap-cacti-plugin.php:914
msgid "All Maps"
msgstr ""
20 changes: 15 additions & 5 deletions weathermap-cacti-plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,22 @@
$guid = $map['filehash'];

if ($maptitle == '') {
$maptitle = 'Map for config file: ' . $map['configfile'];
$maptitle = __esc('Map for config file: %s', $map['configfile']);
}

printf('<item><title>%s</title><description>Network Weathermap named "%s"</description><link>%s</link><media:thumbnail url="%s"/><media:content url="%s"/><guid isPermaLink="false">%s%s</guid></item>',
$maptitle, $maptitle, $linkurl, $thumburl, $bigurl, $config['url_path'], $guid);
print "\n";
print '<item>';

printf('<title>%s</title>', $maptitle);

printf('<description>' . __('Network Weathermap named "%s"', $maptitle) . '</description>
<link>%s</link>
<media:thumbnail url="%s"/>
<media:content url="%s"/>
<guid isPermaLink="false">%s%s</guid>
</item>',
$linkurl, $thumburl, $bigurl, $config['url_path'], $guid);

print PHP_EOL;
}
}

Expand Down Expand Up @@ -402,7 +412,7 @@ function weathermap_singleview($mapid) {
}

print '<div class="cactiTable">';
print '<div class="cactiTableTitleRow">' . html_escape($maptitle) . '</div>';
print '<div class="cactiTableTitleRow">' . $maptitle . '</div>';
print '</div>';

print '<table class="cactiTable">';
Expand Down
Loading