Skip to content

Bootstrap 5 (4.2.0) #291

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TrystanLea merged 8 commits into from
Oct 3, 2026
Merged

Bootstrap 5 (4.2.0) #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b55c8e6
Bootstrap 5 on dashboard list, editor and view
TrystanLea Sep 24, 2026
c50ee1c
Form elements to form-control/form-select
TrystanLea Sep 25, 2026
2b27e10
page-header, h3 title
TrystanLea Sep 26, 2026
1c6c868
Remove [v-cloak] rule, now in the theme
TrystanLea Sep 27, 2026
82add97
Remove unused dropdown-menu-toolbox rule
TrystanLea Sep 27, 2026
4e846a0
update version
TrystanLea Sep 27, 2026
1aa5130
Resolve tag:name feeds after first poll, fixes feed 0 does not exist
TrystanLea Sep 30, 2026
991ff6c
Feed select matches feed id or tag:name, keeps stored value
TrystanLea Sep 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
110 changes: 57 additions & 53 deletions Views/dashboard_config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,59 +18,63 @@ function dashboard_config_attr($value)
}
?>

<div id="dashConfigModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="dashConfigModalLabel" aria-hidden="true" data-backdrop="static">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">脳</button>
<h3 id="dashConfigModalLabel"><?php echo ctx_tr('dashboard_messages', 'Dashboard Configuration'); ?></h3>
</div>
<div class="modal-body">
<label><?php echo ctx_tr('dashboard_messages', 'Dashboard name: '); ?></label>
<input type="text" name="name" value="<?php echo dashboard_config_attr($dashboard['name']); ?>" />
<label><?php echo ctx_tr('dashboard_messages', 'Alias name: '); ?></label>
<input type="text" name="alias" value="<?php echo dashboard_config_attr($dashboard['alias']); ?>" />
<label><?php echo ctx_tr('dashboard_messages', 'Background color: '); ?></label>
<input type="color" name="backgroundcolor" value="#<?php echo preg_replace('/[^0-9a-fA-F]/', '', (string) $dashboard['backgroundcolor']); ?>" />
<label><?php echo ctx_tr('dashboard_messages', 'Description: '); ?></label>
<textarea name="description"><?php echo dashboard_config_attr($dashboard['description']); ?></textarea>
<label><?php echo ctx_tr('dashboard_messages', 'Grid size: '); ?></label>
<input type="text" name="gridsize" value="<?php echo (int) $dashboard['gridsize']; ?>" />


<label><?php echo ctx_tr('dashboard_messages', 'Feed selection mode: '); ?></label>
<i style="font-size:12px"><?php echo ctx_tr('dashboard_messages', 'Note: Reset feeds in all widgets in dashboard if changing'); ?><br><?php echo ctx_tr('dashboard_messages', 'this part way through a dashboard build'); ?></i><br>
<select name="feedmode">
<option value="tagname" <?php echo $dashboard['feedmode'] == "tagname" ? 'selected' : ''; ?>><?php echo ctx_tr('dashboard_messages', 'By tag:name'); ?></option>
<option value="feedid" <?php echo $dashboard['feedmode'] == "feedid" ? 'selected' : ''; ?>><?php echo ctx_tr('dashboard_messages', 'By feedid'); ?></option>
</select>

<label class="checkbox">
<input type="checkbox" name="main" id="chk_main" value="1" <?php echo $dashboard['main'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Make this dashboard the first shown'); ?>"><?php echo ctx_tr('dashboard_messages', 'Main'); ?></abbr>
</label>

<label class="checkbox">
<input type="checkbox" name="published" id="chk_published" value="1" <?php echo $dashboard['published'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Activate this dashboard'); ?>"><?php echo ctx_tr('dashboard_messages', 'Published'); ?></abbr>
</label>

<label class="checkbox">
<input type="checkbox" name="public" id="chk_public" value="1" <?php echo $dashboard['public'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Anyone with the URL can see this dashboard'); ?>"><?php echo ctx_tr('dashboard_messages', 'Public'); ?></abbr>
</label>

<label class="checkbox">
<input type="checkbox" name="showdescription" id="chk_showdescription" value="1" <?php echo $dashboard['showdescription'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Shows dashboard description on mouse over dashboard name in menu project'); ?>"><?php echo ctx_tr('dashboard_messages', 'Show description'); ?></abbr>
</label>

<label class="checkbox">
<input type="checkbox" name="fullscreen" id="chk_fullscreen" value="1" <?php echo $dashboard['fullscreen'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Hide menus on dashboard. Make full screen.'); ?>"><?php echo ctx_tr('dashboard_messages', 'Hide Menus'); ?></abbr>
</label>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true"><?php echo ctx_tr('dashboard_messages', 'Close'); ?></button>
<button id="configure-save" class="btn btn-primary"><?php echo ctx_tr('dashboard_messages', 'Save changes'); ?></button>
<div id="dashConfigModal" class="modal" tabindex="-1" aria-labelledby="dashConfigModalLabel" aria-hidden="true" data-bs-backdrop="static">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3 id="dashConfigModalLabel" class="modal-title"><?php echo ctx_tr('dashboard_messages', 'Dashboard Configuration'); ?></h3>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<label class="form-label"><?php echo ctx_tr('dashboard_messages', 'Dashboard name: '); ?></label>
<input type="text" class="form-control input-220 mb-2" name="name" value="<?php echo dashboard_config_attr($dashboard['name']); ?>" />
<label class="form-label"><?php echo ctx_tr('dashboard_messages', 'Alias name: '); ?></label>
<input type="text" class="form-control input-220 mb-2" name="alias" value="<?php echo dashboard_config_attr($dashboard['alias']); ?>" />
<label class="form-label"><?php echo ctx_tr('dashboard_messages', 'Background color: '); ?></label>
<input type="color" class="form-control form-control-color input-220 mb-2" name="backgroundcolor" value="#<?php echo preg_replace('/[^0-9a-fA-F]/', '', (string) $dashboard['backgroundcolor']); ?>" />
<label class="form-label"><?php echo ctx_tr('dashboard_messages', 'Description: '); ?></label>
<textarea class="form-control input-220 mb-2" name="description"><?php echo dashboard_config_attr($dashboard['description']); ?></textarea>
<label class="form-label"><?php echo ctx_tr('dashboard_messages', 'Grid size: '); ?></label>
<input type="text" class="form-control input-220 mb-2" name="gridsize" value="<?php echo (int) $dashboard['gridsize']; ?>" />


<label class="form-label"><?php echo ctx_tr('dashboard_messages', 'Feed selection mode: '); ?></label>
<i style="font-size:12px"><?php echo ctx_tr('dashboard_messages', 'Note: Reset feeds in all widgets in dashboard if changing'); ?><br><?php echo ctx_tr('dashboard_messages', 'this part way through a dashboard build'); ?></i><br>
<select class="form-select input-220 mb-2" name="feedmode">
<option value="tagname" <?php echo $dashboard['feedmode'] == "tagname" ? 'selected' : ''; ?>><?php echo ctx_tr('dashboard_messages', 'By tag:name'); ?></option>
<option value="feedid" <?php echo $dashboard['feedmode'] == "feedid" ? 'selected' : ''; ?>><?php echo ctx_tr('dashboard_messages', 'By feedid'); ?></option>
</select>

<label class="d-block">
<input type="checkbox" name="main" id="chk_main" value="1" <?php echo $dashboard['main'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Make this dashboard the first shown'); ?>"><?php echo ctx_tr('dashboard_messages', 'Main'); ?></abbr>
</label>

<label class="d-block">
<input type="checkbox" name="published" id="chk_published" value="1" <?php echo $dashboard['published'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Activate this dashboard'); ?>"><?php echo ctx_tr('dashboard_messages', 'Published'); ?></abbr>
</label>

<label class="d-block">
<input type="checkbox" name="public" id="chk_public" value="1" <?php echo $dashboard['public'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Anyone with the URL can see this dashboard'); ?>"><?php echo ctx_tr('dashboard_messages', 'Public'); ?></abbr>
</label>

<label class="d-block">
<input type="checkbox" name="showdescription" id="chk_showdescription" value="1" <?php echo $dashboard['showdescription'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Shows dashboard description on mouse over dashboard name in menu project'); ?>"><?php echo ctx_tr('dashboard_messages', 'Show description'); ?></abbr>
</label>

<label class="d-block">
<input type="checkbox" name="fullscreen" id="chk_fullscreen" value="1" <?php echo $dashboard['fullscreen'] ? 'checked' : ''; ?> />
<abbr title="<?php echo ctx_tr('dashboard_messages', 'Hide menus on dashboard. Make full screen.'); ?>"><?php echo ctx_tr('dashboard_messages', 'Hide Menus'); ?></abbr>
</label>
</div>
<div class="modal-footer">
<button class="btn btn-default" data-bs-dismiss="modal" aria-hidden="true"><?php echo ctx_tr('dashboard_messages', 'Close'); ?></button>
<button id="configure-save" class="btn btn-primary"><?php echo ctx_tr('dashboard_messages', 'Save changes'); ?></button>
</div>
</div>
</div>
</div>

Expand Down
48 changes: 26 additions & 22 deletions Views/dashboard_edit_view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,40 +52,44 @@ function getTranslations() {
}
</script>
<div id="dashboardpage">
<div id="widget_options" class="modal hide keyboard" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">脳</button>
<h3 id="myModalLabel"><?php echo ctx_tr('dashboard_messages', 'Configure element'); ?></h3>
</div>
<div id="widget_options_body" class="modal-body"></div>
<div class="modal-footer">
<span id="options-problem" class="text-error" style="margin-right:10px"></span>
<button class="btn" data-dismiss="modal" aria-hidden="true"><?php echo ctx_tr('dashboard_messages', 'Cancel'); ?></button>
<button id="options-save" class="btn btn-primary"><?php echo ctx_tr('dashboard_messages', 'Save changes'); ?></button>
<div id="widget_options" class="modal keyboard" tabindex="-1" aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3 id="myModalLabel" class="modal-title"><?php echo ctx_tr('dashboard_messages', 'Configure element'); ?></h3>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div id="widget_options_body" class="modal-body"></div>
<div class="modal-footer">
<span id="options-problem" class="text-danger" style="margin-right:10px"></span>
<button class="btn btn-default" data-bs-dismiss="modal" aria-hidden="true"><?php echo ctx_tr('dashboard_messages', 'Cancel'); ?></button>
<button id="options-save" class="btn btn-primary"><?php echo ctx_tr('dashboard_messages', 'Save changes'); ?></button>
</div>
</div>
</div>
</div>
</div>

<div id="toolbox" style="cursor:move; text-align: center; background-color:#ddd; padding-left:5px; padding-right:5px; padding-bottom:15px; position:fixed;z-index:1; border-radius: 5px 5px 5px 5px; border-style:groove; width: 125px; height: auto; top: 5rem; right: 1rem;"><?php echo ctx_tr('dashboard_messages', 'Toolbox'); ?>
<div id="toolbox" style="box-sizing:content-box; cursor:move; text-align: center; background-color:#ddd; padding-left:5px; padding-right:5px; padding-bottom:15px; position:fixed;z-index:1; border-radius: 5px 5px 5px 5px; border-style:groove; width: 125px; height: auto; top: 5rem; right: 1rem;"><?php echo ctx_tr('dashboard_messages', 'Toolbox'); ?>
<div id="separator" style="height:1.5px; background:#717171"></div>
<div id="Buttons" style="position:relative; top:5px; cursor:pointer">
<span id="dashboard-config-buttons">
<button id="dashboard-config-button" style="padding:4px; float:left; width:31px" class="btn" href="#dashConfigModal" role="button" data-toggle="modal" title="<?php echo ctx_tr('dashboard_messages', 'Configure dashboard basic data'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-gear.png'); ?>"></span></button>
<button id="undo-button" class="btn" style="padding:4px; float:left; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Undo last step'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-undo.png'); ?>"></span></button>
<button id="redo-button" class="btn" style="padding:4px; float:left; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Redo last step'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-redo.png'); ?>"></span></button>
<button id="view-mode" class="btn" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Return to view mode'); ?>" onclick="window.location.href='view?id=<?php echo $dashid; ?>'"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-view.png'); ?>" ></span></button>
<button id="dashboard-config-button" style="padding:4px; float:left; width:31px" class="btn btn-default" href="#dashConfigModal" role="button" data-bs-toggle="modal" title="<?php echo ctx_tr('dashboard_messages', 'Configure dashboard basic data'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-gear.png'); ?>"></span></button>
<button id="undo-button" class="btn btn-default" style="padding:4px; float:left; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Undo last step'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-undo.png'); ?>"></span></button>
<button id="redo-button" class="btn btn-default" style="padding:4px; float:left; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Redo last step'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-redo.png'); ?>"></span></button>
<button id="view-mode" class="btn btn-default" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Return to view mode'); ?>" onclick="window.location.href='view?id=<?php echo $dashid; ?>'"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-view.png'); ?>" ></span></button>
</span>
<span id="when-selected">
<button id="options-button" class="btn" style="float:left; padding:4px; width:31px" data-toggle="modal" data-target="#widget_options" title="<?php echo ctx_tr('dashboard_messages', 'Configure selected item'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-tool.png'); ?>"></span></button>
<button id="move-forward-button" class="btn" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Move selected item in front of other items'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-front.png'); ?>"></span></button>
<button id="move-backward-button" class="btn" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Move selected item to back of other items'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-back.png'); ?>"></span></button>
<button id="options-button" class="btn btn-default" style="float:left; padding:4px; width:31px" data-bs-toggle="modal" data-bs-target="#widget_options" title="<?php echo ctx_tr('dashboard_messages', 'Configure selected item'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-tool.png'); ?>"></span></button>
<button id="move-forward-button" class="btn btn-default" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Move selected item in front of other items'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-front.png'); ?>"></span></button>
<button id="move-backward-button" class="btn btn-default" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Move selected item to back of other items'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-back.png'); ?>"></span></button>
<button id="delete-button" class="btn btn-danger" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Delete selected items'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-delete.png'); ?>"></span></button>
</span>
<span id="clipboard-buttons">
<button id="copy-button" class="btn" style="float:left; padding:4px; width:31px" disabled title="<?php echo ctx_tr('dashboard_messages', 'Copy selected items (Ctrl+C)'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-copy.png'); ?>"></span></button>
<button id="cut-button" class="btn" style="float:left; padding:4px; width:31px" disabled title="<?php echo ctx_tr('dashboard_messages', 'Cut selected items (Ctrl+X)'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-cut.png'); ?>"></span></button>
<button id="paste-button" class="btn" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Paste copied items (Ctrl+V)'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-paste.png'); ?>"></span></button>
<button class="btn" style="float:left; padding:4px; width:31px; visibility:hidden" disabled><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-paste.png'); ?>"></span></button>
<button id="copy-button" class="btn btn-default" style="float:left; padding:4px; width:31px" disabled title="<?php echo ctx_tr('dashboard_messages', 'Copy selected items (Ctrl+C)'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-copy.png'); ?>"></span></button>
<button id="cut-button" class="btn btn-default" style="float:left; padding:4px; width:31px" disabled title="<?php echo ctx_tr('dashboard_messages', 'Cut selected items (Ctrl+X)'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-cut.png'); ?>"></span></button>
<button id="paste-button" class="btn btn-default" style="float:left; padding:4px; width:31px" title="<?php echo ctx_tr('dashboard_messages', 'Paste copied items (Ctrl+V)'); ?>"><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-paste.png'); ?>"></span></button>
<button class="btn btn-default" style="float:left; padding:4px; width:31px; visibility:hidden" disabled><span><img src="<?php echo ($path . 'Modules/dashboard/Views/icons/emon-icon-paste.png'); ?>"></span></button>
</span>
<span id="widget-buttons" ></span>
<span><button id="save-dashboard" class="btn btn-success" style="float:left; padding:2px; width:125px" title="<?php echo ctx_tr('dashboard_messages', 'Nothing to save'); ?>" ><?php echo ctx_tr('dashboard_messages', 'Not modified'); ?></button></span>
Expand Down
Loading
Loading