Skip to content

Commit 5d7bb41

Browse files
committed
Some pages missing colspan's for no rows found
Issue with message text wrapping when no rows found on some pages
1 parent 5a6f079 commit 5d7bb41

File tree

9 files changed

+10
-9
lines changed

9 files changed

+10
-9
lines changed

aggregate_graphs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,7 @@ function clearFilter() {
14831483
form_end_row();
14841484
}
14851485
} else {
1486-
print '<tr><td><em>' . __('No Aggregate Graphs Found') .'</em></td></tr>';
1486+
print '<tr><td colspan="' . (sizeof($display_text)+1) . '"><em>' . __('No Aggregate Graphs Found') .'</em></td></tr>';
14871487
}
14881488

14891489
html_end_box(false);

aggregate_templates.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ function aggregate_template() {
661661
form_end_row();
662662
}
663663
} else {
664-
print "<tr><td><em>" . __('No Aggregate Templates Found') . "</em></td></tr>\n";
664+
print "<tr><td colspan='" . (sizeof($display_text)+1) . "'><em>" . __('No Aggregate Templates Found') . "</em></td></tr>\n";
665665
}
666666

667667
html_end_box(false);

automation_graph_rules.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ function clearFilter() {
922922
form_end_row();
923923
}
924924
} else {
925-
print "<tr><td><em>" . __('No Graph Rules Found') . "</em></td></tr>\n";
925+
print "<tr><td colspan='" . (sizeof($display_text)+1) . "'><em>" . __('No Graph Rules Found') . "</em></td></tr>\n";
926926
}
927927

928928
html_end_box(false);

automation_snmp.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ function automation_snmp_edit() {
688688
$i++;
689689
}
690690
} else {
691-
print "<tr><td><em>" . __('No SNMP Items') . "</em></td></tr>\n";
691+
print "<tr><td colspan='" . (sizeof($display_text)+1) . "'><em>" . __('No SNMP Items') . "</em></td></tr>\n";
692692
}
693693

694694
html_end_box();
@@ -916,7 +916,7 @@ function clearFilter() {
916916
form_end_row();
917917
}
918918
} else {
919-
print "<tr><td><em>" . __('No SNMP Option Sets Found') . "</em></td></tr>\n";
919+
print "<tr><td colspan='" . (sizeof($display_text)+1) . "'><em>" . __('No SNMP Option Sets Found') . "</em></td></tr>\n";
920920
}
921921

922922
html_end_box(false);

color_templates.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ function aggregate_color_template() {
573573
form_end_row();
574574
}
575575
} else {
576-
print "<tr><td><em>" . __('No Color Templates Found') ."</em></td></tr>\n";
576+
print "<tr><td colspan='" . (sizeof($display_text)+1) . "'><em>" . __('No Color Templates Found') ."</em></td></tr>\n";
577577
}
578578

579579
html_end_box(false);

docs/CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Cacti CHANGELOG
3939
-issue: Install directory bypassed by site replication
4040
-issue: Disable collapsible method for snmp options in host.php
4141
-issue: Add the Default Device to the Default Tree at install time
42+
-issue: Issue with message text wrapping when no rows found on some pages
4243
-feature: Searching of SNMP Index in View Data Query Cache now works
4344
-feature: Updated Dutch translations
4445
-feature: Update JavaScript library c3.js (v0.4.21) / jstree.js (3.3.5)

user_admin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2317,7 +2317,7 @@ function clearFilter() {
23172317
form_end_row();
23182318
}
23192319
} else {
2320-
print '<tr><td><em>' . __('No Users Found') . '</em></td></tr>';
2320+
print '<tr><td colspan="' . (sizeof($display_text)+1) . '"><em>' . __('No Users Found') . '</em></td></tr>';
23212321
}
23222322

23232323
html_end_box(false);

user_domains.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ function clearFilter() {
731731
form_end_row();
732732
}
733733
} else {
734-
print '<tr><td><em>' . __('No User Domains Found') . '</em></td></tr>';
734+
print '<tr><td colspan="' . (sizeof($display_text)+1) . '"><em>' . __('No User Domains Found') . '</em></td></tr>';
735735
}
736736

737737
html_end_box(false);

user_group_admin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1929,7 +1929,7 @@ function clearFilter() {
19291929
form_end_row();
19301930
}
19311931
} else {
1932-
print '<tr><td><em>' . __('No User Groups Found') . '</em></td></tr>';
1932+
print '<tr><td colspan="' . (sizeof($display_text)+1) . '"><em>' . __('No User Groups Found') . '</em></td></tr>';
19331933
}
19341934

19351935
html_end_box(false);

0 commit comments

Comments
 (0)