chg: [UI] Cleanup code for widgets

pull/8688/head
Jakub Onderka 2022-10-20 13:35:58 +02:00
parent 8fd5016cde
commit 63f9fde67a
3 changed files with 12 additions and 13 deletions

View File

@ -6,11 +6,11 @@
<?= $scopedHtml['bundle']; ?>
</div>
<?php if ($config['autoRefreshDelay']): ?>
<script type="text/javascript">
<script>
$(function() {
setTimeout(function() {
updateDashboardWidget("#widget_<?= h($widget_id) ?>")},
<?= $config['autoRefreshDelay'] ? $config['autoRefreshDelay'] : 1 ?> * 1000
<?= $config['autoRefreshDelay'] ?: 1 ?> * 1000
);
});
</script>

View File

@ -1,5 +1,6 @@
<?php
$headersHtml = '';
$selectAllCheckbox = false;
echo '<thead>';
foreach ($fields as $k => $header) {
if (!isset($header['requirement']) || $header['requirement']) {
$header_data = '';
@ -11,6 +12,7 @@
}
} else {
if (!empty($header['element']) && $header['element'] === 'selector') {
$selectAllCheckbox = true;
$header_data = sprintf(
'<input id="select_all" class="%s" type="checkbox" %s>',
empty($header['select_all_class']) ? 'select_all' : $header['select_all_class'],
@ -29,7 +31,7 @@
$header_data = "<div><span>$header_data</span></div>";
}
$headersHtml .= sprintf(
echo sprintf(
'<th%s%s>%s</th>',
!empty($classes) ? ' class="' . implode(' ', $classes) .'"' : '',
!empty($header['header_title']) ? ' title="' . h($header['header_title']) . '"' : '',
@ -38,18 +40,16 @@
}
}
if ($actions) {
$headersHtml .= sprintf(
echo sprintf(
'<th class="actions">%s</th>',
__('Actions')
);
}
$thead = '<thead>';
$thead .= $headersHtml;
$thead .= '</thead>';
echo $thead;
echo '</thead>';
?>
<script type="text/javascript">
$(document).ready(function() {
<?php if ($selectAllCheckbox): ?>
<script>
$(function() {
$('.select_attribute').add('#select_all').on('change', function() {
if ($('.select_attribute:checked').length > 0) {
$('.mass-select').show();
@ -59,3 +59,4 @@
});
});
</script>
<?php endif; ?>

View File

@ -28,7 +28,6 @@ App::uses('AppHelper', 'View/Helper');
return sprintf("<style>%s%s%s</style>", PHP_EOL, $cssScopedLines, PHP_EOL);
}
/**
* Replace a declared CSS scoped style and prepend a random CSS data filter to any CSS selector discovered.
* Usage: Add the following style tag `<style widget-scoped>` to use the scoped feature. Nearly every selector path will have their rule modified to adhere to the scope
@ -61,7 +60,6 @@ App::uses('AppHelper', 'View/Helper');
*/
public function createScopedCSS($html)
{
$css = "";
$seed = "";
$originalHtml = $html;
$bundle = $originalHtml;