Skip to content

V12 #88

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

Open
TrystanLea wants to merge 7 commits into
base: master
Choose a base branch
from
+226 −176
Open

V12 #88

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
a6f9237
vue js conversion part 1
trystanlea-maker Apr 15, 2026
fd5e504
dark theme
trystanlea-maker Apr 15, 2026
aa10883
more styling
trystanlea-maker Apr 15, 2026
db80240
move css to core
trystanlea-maker Apr 15, 2026
a988bf2
basic changes to get modal to appear
trystanlea-maker May 3, 2026
4b3b72c
vue3 migration
trystanlea-maker May 3, 2026
3fdc476
card css
trystanlea-maker May 7, 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
16 changes: 8 additions & 8 deletions Views/device_dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
.table-inputs td:nth-of-type(6) { text-align: left; }


#device-config-modal.modal {
#device-config-modal.ec-modal {
margin: 0;
border-radius: 0;
border: none;
Expand All @@ -181,7 +181,7 @@
#device-config-body {
padding: 0
}
#device-config-modal.modal .accordion-toggle {
#device-config-modal.ec-modal .accordion-toggle {
white-space: nowrap;
overflow: hidden;
}
Expand Down Expand Up @@ -210,19 +210,19 @@
font-size: 12px !important;
font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
}
#device-config-modal.modal .modal-content {
#device-config-modal.ec-modal .modal-content {
margin-top: 0
}
#device-config-modal.modal .modal-sidebar {
#device-config-modal.ec-modal .modal-sidebar {
margin: 0
}

/* add horizontal padding to devices larger than iphone5 (320px)*/
@media (min-width: 340px) {
#device-config-modal.modal {
#device-config-modal.ec-modal {
margin: 0 auto
}
#device-config-modal.modal .modal-sidebar {
#device-config-modal.ec-modal .modal-sidebar {
margin: 0 -1rem
}
#device-content {
Expand All @@ -241,14 +241,14 @@
#device-content {
left: 270px;
}
#device-config-modal.modal {
#device-config-modal.ec-modal {
margin: 0;
border-radius: 6px;
border: 1px solid rgba(0,0,0,0.3);
width: 94%;
left: 3%;
}
#device-config-modal.modal .modal-sidebar {
#device-config-modal.ec-modal .modal-sidebar {
margin: 0 -1rem
}

Expand Down
16 changes: 8 additions & 8 deletions Views/device_dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var device_dialog =
},

'drawConfig':function() {
$("#device-config-modal").modal('show');
emoncmsModal.open('device-config-modal');
this.adjustConfigModal();
this.clearConfigModal();

Expand Down Expand Up @@ -280,7 +280,7 @@ var device_dialog =
}
}
update();
$('#device-config-modal').modal('hide');
emoncmsModal.close('device-config-modal');
if (init) device_dialog.loadInit();
}
else {
Expand All @@ -290,17 +290,17 @@ var device_dialog =
});

$("#device-delete").off('click').on('click', function () {
$('#device-config-modal').modal('hide');
emoncmsModal.close('device-config-modal');
device_dialog.loadDelete(device_dialog.device, null);
});

$("#device-init").off('click').on('click', function () {
$('#device-config-modal').modal('hide');
emoncmsModal.close('device-config-modal');
device_dialog.loadInit();
});

$("#prepare-custom-template").off('click').on('click', function () {
$('#device-config-modal').modal('hide');
emoncmsModal.close('device-config-modal');
device_dialog.loadInitCustom();
});

Expand Down Expand Up @@ -392,7 +392,7 @@ var device_dialog =


'drawInit': function (result) {
$('#device-init-modal').modal('show');
emoncmsModal.open('device-init-modal');
device_dialog.adjustInitModal();

$('#device-init-modal-label').html('Initialize Device: <b>'+device_dialog.device.name+'</b>');
Expand Down Expand Up @@ -577,7 +577,7 @@ var device_dialog =
'loadDelete': function(device, tablerow) {
this.device = device;

$('#device-delete-modal').modal('show');
emoncmsModal.open('device-delete-modal');
$('#device-delete-modal-label').html('Delete Device: <b>'+device.name+'</b>');

// Initialize callbacks
Expand Down Expand Up @@ -605,7 +605,7 @@ var device_dialog =
update();
});
}
$('#device-delete-modal').modal('hide');
emoncmsModal.close('device-delete-modal');
$('#wrap').trigger("device-delete");
});
}
Expand Down
32 changes: 16 additions & 16 deletions Views/device_dialog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php
defined('EMONCMS_EXEC') or die('Restricted access');
global $path;
?>

<link href="<?php echo $path; ?>Modules/device/Views/device_dialog.css?v=5" rel="stylesheet">
<script type="text/javascript" src="<?php echo $path; ?>Modules/device/Views/device_dialog.js?v=5"></script>
load_css("Modules/device/Views/device_dialog.css");
load_js("Modules/device/Views/device_dialog.js");
?>

<div id="device-config-modal" class="modal hide keyboard modal-adjust" tabindex="-1" role="dialog" aria-labelledby="device-config-modal-label" aria-hidden="true" data-backdrop="static">
<dialog id="device-config-modal" class="ec-modal modal-adjust" aria-labelledby="device-config-modal-label" data-backdrop="static" style="--modal-width: 94vw;">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<button type="button" class="modal-close-btn" data-modal-close aria-label="Close">&times;</button>
<h3 id="device-config-modal-label"><?php echo tr('Configure Device'); ?></h3>
</div>
<div id="device-config-body" class="modal-body">
Expand Down Expand Up @@ -69,17 +69,17 @@
</div>
</div>
<div class="modal-footer">
<button class="btn hidden-xs" data-dismiss="modal" aria-hidden="true"><?php echo tr('Cancel'); ?></button>
<button class="btn visible-xs pull-left" title="<?php echo tr('Cancel'); ?>" style="margin-left:0;font-weight:bold" data-dismiss="modal" aria-hidden="true" type="button">×</button>
<button class="btn hidden-xs" data-modal-close><?php echo tr('Cancel'); ?></button>
<button class="btn visible-xs pull-left" title="<?php echo tr('Cancel'); ?>" style="margin-left:0;font-weight:bold" data-modal-close type="button">&times;</button>
<button id="device-delete" class="btn btn-danger" style="cursor:pointer"><i class="icon-trash icon-white hidden-xs"></i> <?php echo tr('Delete'); ?></button>
<button id="device-init" class="btn btn-primary"><i class="icon-refresh icon-white hidden-xs"></i> <?php echo tr('Initialize'); ?></button>
<button id="device-save" class="btn btn-primary"><?php echo tr('Save'); ?></button>
</div>
</div>
</dialog>

<div id="device-init-modal" class="modal hide modal-adjust" tabindex="-1" role="dialog" aria-labelledby="device-init-modal-label" aria-hidden="true" data-backdrop="static">
<dialog id="device-init-modal" class="ec-modal modal-adjust" aria-labelledby="device-init-modal-label" data-backdrop="static" style="--modal-width: 94vw;">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<button type="button" class="modal-close-btn" data-modal-close aria-label="Close">&times;</button>
<h3 id="device-init-modal-label"><?php echo tr('Initialize device'); ?></h3>
</div>
<div id="device-init-body" class="modal-body">
Expand Down Expand Up @@ -119,14 +119,14 @@
</div>
</div>
<div class="modal-footer">
<button id="device-init-cancel" class="btn" data-dismiss="modal" aria-hidden="true"><?php echo tr('Cancel'); ?></button>
<button id="device-init-cancel" class="btn" data-modal-close><?php echo tr('Cancel'); ?></button>
<button id="device-init-confirm" class="btn btn-primary"><?php echo tr('Initialize'); ?></button>
</div>
</div>
</dialog>

<div id="device-delete-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="device-delete-modal-label" aria-hidden="true" data-backdrop="static">
<dialog id="device-delete-modal" class="ec-modal" aria-labelledby="device-delete-modal-label" data-backdrop="static" style="--modal-width: 620px;">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<button type="button" class="modal-close-btn" data-modal-close aria-label="Close">&times;</button>
<h3 id="device-delete-modal-label"><?php echo tr('Delete device'); ?></h3>
</div>
<div class="modal-body">
Expand All @@ -140,10 +140,10 @@
</p>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true"><?php echo tr('Cancel'); ?></button>
<button class="btn" data-modal-close><?php echo tr('Cancel'); ?></button>
<button id="device-delete-confirm" class="btn btn-primary"><?php echo tr('Delete permanently'); ?></button>
</div>
</div>
</dialog>

<script>
$(window).resize(function() {
Expand Down
Loading