Skip to content

Fix UI HTML code and error name #275

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 7 commits into from
Jan 30, 2026
Merged

Fix UI HTML code and error name #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aaeeefa
Update mactrack_view_macs.php
xxconn Jan 30, 2026
0776e70
Update mactrack_macauth.php
xxconn Jan 30, 2026
3d11773
Merge branch 'Cacti:develop' into develop
xxconn Jan 30, 2026
f1f6508
Update mactrack_view_devices.php
xxconn Jan 30, 2026
a6208e6
Update mactrack_view_macs.php
xxconn Jan 30, 2026
7cfdd5e
Update mactrack_macauth.php
xxconn Jan 30, 2026
f779306
Update mactrack_snmp.php
xxconn Jan 30, 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
2 changes: 1 addition & 1 deletion mactrack_macauth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function form_actions() {
<input type='hidden' name='action' value='actions'>
<input type='hidden' name='selected_items' value='" . (isset($maca_array) ? serialize($maca_array) : '') . "'>
<input type='hidden' name='drp_action' value='" . get_request_var('drp_action') . "'>" . ($save_html != '' ? "
<button type='button' class='ui-button ui-corner-all ui-widget' onClick='cactiReturnTo()'>" . __esc('Cancel', 'mactrack') . "'></button>
<button type='button' class='ui-button ui-corner-all ui-widget' onClick='cactiReturnTo()'>" . __esc('Cancel', 'mactrack') . "</button>
$save_html" : "<button type='button' class='ui-button ui-corner-all ui-widget' onClick='cactiReturnTo()'>" . __esc('Return', 'mactrack') . "</button>") . "
</td>
</tr>";
Expand Down
4 changes: 2 additions & 2 deletions mactrack_snmp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ function goTo(strURL) {
print "<tr><td class='even'><span class='textError'>" . __('You must select at least one SNMP Option.', 'mactrack') . "</span></td></tr>\n";
$save_html = "";
} else {
$save_html = "<button type='submit' name='save' class='ui-button ui-corner-all ui-widget ui-state-active'>" . __esc('Continue', 'mactrack') . "'></button>";
$save_html = "<button type='submit' name='save' class='ui-button ui-corner-all ui-widget ui-state-active'>" . __esc('Continue', 'mactrack') . "</button>";

if (get_nfilter_request_var("drp_action") == '1') { /* delete */
print "<tr>
Expand All @@ -271,7 +271,7 @@ function goTo(strURL) {
<td align='right' class='saveRow'>
<input type='hidden' name='action' value='actions'>
<input type='hidden' name='selected_items' value='" . (isset($mactrack_array) ? serialize($mactrack_array) : '') . "'>
<input type='hidden' name='drp_action' class='ui-button ui-corner-all ui-widget'>" . get_nfilter_request_var("drp_action") . "'>
<input type='hidden' name='drp_action' class='ui-button ui-corner-all ui-widget' value='" . get_nfilter_request_var("drp_action") . "'>
<button type='button' class='ui-button ui-corner-all ui-widget' onClick='goTo(\"" . "mactrack_snmp.php" . "\")'>" . ($save_html == '' ? __esc('Return', 'mactrack'):__esc('Cancel', 'mactrack')) . "</button>
$save_html
</td>
Expand Down
2 changes: 1 addition & 1 deletion mactrack_view_devices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
include('./include/auth.php');
include_once('./plugins/mactrack/lib/mactrack_functions.php');

$title = __('Mactrack - Device Report View', 'macktrack');
$title = __('Mactrack - Device Report View', 'mactrack');

if (isset_request_var('export')) {
mactrack_view_export_devices();
Expand Down
2 changes: 1 addition & 1 deletion mactrack_view_macs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ function form_aggregated_actions() {
<input type='hidden' name='action' value='actions'>
<input type='hidden' name='selected_items' value='" . (isset($row_array) ? serialize($row_array) : '') . "'>
<input type='hidden' name='drp_action' value='" . get_request_var('drp_action') . "'>" . ($save_html != '' ? "
<button type='button' onClick='cactiReturnTo()' class='ui-button ui-corner-all ui-widget'>" . __esc('Cancel', 'macktrack') . "</button>
<button type='button' onClick='cactiReturnTo()' class='ui-button ui-corner-all ui-widget'>" . __esc('Cancel', 'mactrack') . "</button>
$save_html" : "<button type='button' onClick='cactiReturnTo()' class='ui-button ui-corner-all ui-widget'>" . __esc('Return', 'mactrack') . '</button>') . "
</td>
</tr>";
Expand Down