mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2025-12-30 00:53:50 +00:00
Dashboard: Minor bug fixes (#7597)
* Dashboard: Minor bug fixes * Update dashboard_edit.php * Update index.php * Update device_keys.php * Update domain_limits.php
This commit is contained in:
@@ -428,7 +428,7 @@
|
||||
//show the content
|
||||
echo "<div class='hud_box'>";
|
||||
|
||||
echo "<div class='hud_content' style='display: block;'>\n";
|
||||
echo "<div class='hud_content' style='display: block; overflow-x: auto;'>\n";
|
||||
echo " <div class='action_bar sub'>\n";
|
||||
echo " <div class='heading' style='padding-left: 5px;'><b>".escape($widget_label)."</b></div>\n";
|
||||
echo " <div class='actions' style='padding-top: 2px;'>\n";
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
unset($hud_stat);
|
||||
|
||||
//domain limits
|
||||
if (!empty($_SESSION['limit']) && sizeof($_SESSION['limit']) > 0) {
|
||||
// if (!empty($_SESSION['limit']) && sizeof($_SESSION['limit']) > 0) {
|
||||
|
||||
//set the row style
|
||||
$c = 0;
|
||||
@@ -240,6 +240,6 @@
|
||||
echo "<span class='hud_expander' onclick=\"$('#hud_domain_limits_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>";
|
||||
}
|
||||
echo "</div>\n";
|
||||
}
|
||||
// }
|
||||
|
||||
?>
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
$domain_uuid = '';
|
||||
$dashboard_uuid = '';
|
||||
$dashboard_name = '';
|
||||
$dashboard_enabled = 'true';
|
||||
$dashboard_description = '';
|
||||
|
||||
//action add or update
|
||||
@@ -153,6 +152,9 @@
|
||||
unset($sql, $parameters, $row);
|
||||
}
|
||||
|
||||
//set the defaults
|
||||
$dashboard_enabled = $dashboard_enabled ?? true;
|
||||
|
||||
//create token
|
||||
$object = new token;
|
||||
$token = $object->create($_SERVER['PHP_SELF']);
|
||||
|
||||
@@ -654,6 +654,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($widget_details_state) || $widget_details_state == 'none') {
|
||||
$items_to_remove[] = 'widget_details_state';
|
||||
}
|
||||
|
||||
$widget_settings = array_diff($widget_settings, $items_to_remove);
|
||||
|
||||
?>
|
||||
@@ -756,9 +760,14 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
}
|
||||
|
||||
function toggle_label_settings() {
|
||||
let widget_settings = Object.values(<?php echo json_encode($widget_settings); ?>);
|
||||
let label_settings = document.querySelectorAll("[id^='tr_widget_label_']:not([id='tr_widget_label_enabled'])");
|
||||
|
||||
label_settings.forEach(function(setting) {
|
||||
let setting_name = setting.id.replace("tr_", "");
|
||||
if (widget_settings.includes(setting_name)) {
|
||||
setting.style.display = (setting.style.display == 'none' ? '' : 'none');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -766,7 +775,6 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
document.getElementById('widget_url').addEventListener('change', adjust_form_url);
|
||||
document.getElementById('widget_target').addEventListener('change', adjust_form_url);
|
||||
document.getElementById('widget_label_enabled').addEventListener('change', toggle_label_settings);
|
||||
document.querySelectorAll('.switch:has(#widget_label_enabled)').addEventListener('click', toggle_label_settings);
|
||||
});
|
||||
|
||||
</script>
|
||||
@@ -1333,7 +1341,7 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
echo " ".$text['label-widget_details_state']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable' style='position: relative;' align='left'>\n";
|
||||
echo " <select name='widget_details_state' class='formfld'>\n";
|
||||
echo " <select name='widget_details_state' class='formfld' ".(!in_array('widget_details_state', $widget_settings) ? "disabled" : null).">\n";
|
||||
echo " <option value='expanded'>".$text['option-expanded']."</option>\n";
|
||||
echo " <option value='contracted' ".($widget_details_state == "contracted" ? "selected='selected'" : null).">".$text['option-contracted']."</option>\n";
|
||||
echo " <option value='hidden' ".($widget_details_state == "hidden" ? "selected='selected'" : null).">".$text['option-hidden']."</option>\n";
|
||||
|
||||
@@ -434,6 +434,7 @@ foreach ($widgets as $row) {
|
||||
}
|
||||
$row_span = $row['widget_row_span'] * 4;
|
||||
$expanded_row_span = $row_span + 13;
|
||||
//has detail expand button
|
||||
if ($row['widget_details_state'] === "expanded" || $row['widget_details_state'] === "contracted") {
|
||||
$row_span += 1;
|
||||
$expanded_row_span += 1;
|
||||
@@ -671,7 +672,7 @@ window.addEventListener('resize', update_parent_height);
|
||||
$widget_label_text_color = $row['widget_label_text_color'] ?? $settings->get('theme', 'dashboard_label_text_color', '');
|
||||
$widget_number_text_color = $row['widget_number_text_color'] ?? $settings->get('theme', 'dashboard_number_text_color', '');
|
||||
$widget_number_background_color = $row['widget_number_background_color'] ?? $settings->get('theme', 'dashboard_number_background_color', '');
|
||||
$widget_details_state = $row['widget_details_state'] ?? 'hidden';
|
||||
$widget_details_state = $row['widget_details_state'] ?? 'disabled';
|
||||
$widget_row_span = $row['widget_row_span'] ?? '';
|
||||
|
||||
//define the regex patterns
|
||||
|
||||
Reference in New Issue
Block a user