Skip to content
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

Feature/G4E-5814 support default and user defined scheduled platform restart #46

Merged
merged 15 commits into from
Jun 11, 2024
Merged

Feature/G4E-5814 support default and user defined scheduled platform restart #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9207169
G4E-5814 - Update settings panel.
galin-iliev May 29, 2024
6ee25c3
G4E-5814 - Update settings panel with the new system section.
galin-iliev May 29, 2024
ceb58c8
Merge remote-tracking branch 'origin/G4E-7902-The-Enable-Notification…
galin-iliev May 31, 2024
7eff901
G4E-5814 - Merge former branch, update styles, settings need fixes. I…
galin-iliev May 31, 2024
f5d81ca
Merge remote-tracking branch 'origin/G4E-7129-Store-favorites-as-app-…
galin-iliev May 31, 2024
35ca847
G4E-5814 - Almost finished with the UI side.
galin-iliev Jun 4, 2024
d46d7a1
G4E-5814 - Code Refactoring.
galin-iliev Jun 4, 2024
d8293f3
G4E-5814 - Set Initial Schedule to UI finished. schedule-shutdown / s…
galin-iliev Jun 6, 2024
8885232
G4E-5814 - Code Refactoring.
galin-iliev Jun 6, 2024
f9819b1
G4E-5814 - Finished UI changes for toggles, inputs and dropdowns base…
galin-iliev Jun 6, 2024
eec083e
G4E-5814 - Finished parsing string and set schedule-restart / set sch…
galin-iliev Jun 6, 2024
ab883b0
G4E-5814 - Finished parsing string and set schedule-restart / set sch…
galin-iliev Jun 7, 2024
d6f274c
G4E-5814 - Update UI Dropdowns with correct behaviour. Feature tested…
galin-iliev Jun 7, 2024
f01fc2c
G4E-5814 - Finalized the feature.
galin-iliev Jun 10, 2024
d3907c3
Merge remote-tracking branch 'origin/main' into feature/G4E-5814-Supp…
galin-iliev Jun 11, 2024
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
8 changes: 8 additions & 0 deletions assets/flatpickr.js
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions assets/flatpickr.min.css
View file
Open in desktop

Large diffs are not rendered by default.

311 changes: 230 additions & 81 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
href="./assets/t42bootstrap.bundle.css"
/>
<link rel="stylesheet" type="text/css" href="scss/app.css" />
<link rel="stylesheet" href="./assets/flatpickr.min.css" />
<title>io.Connect Floating Toolbar</title>
</head>

Expand Down Expand Up @@ -257,44 +258,39 @@ <h5 class="draggable m-0">Save Layouts</h5>
<ul id="running-apps" class="nav nav-tabs flex-column"></ul>
</div>

<div class="toggle-content hide" id="settings-content" menu-id="settings">
<div class="settings-general p-2 border-bottom border-secondary">
<div class="d-flex justify-content-between mb-2">
<h5 class="draggable m-0">General Settings</h5>
<div
class="settings-content toggle-content hide"
id="settings-content"
menu-id="settings"
>
<div class="settings-header border-bottom border-secondary">
<div>
<h5 class="draggable">Settings</h5>
<span class="icon-arrow-up-down close-drawer m-0"></span>
</div>
<form>
<div class="form-check show-tutorial-check ml-2">
</div>
<div class="settings-general border-bottom border-secondary">
<div>
<h5>General Settings</h5>
</div>
<div class="show-tutorial-check">
<label class="switch" for="show-tutorial">
<input
class="form-check-input show-tutorial"
type="checkbox"
value="1"
id="show-tutorial"
setting="showTutorial"
class="show-tutorial"
data-setting="showTutorial"
/>
<label class="form-check-label" for="show-tutorial">
Show Tutorial on Startup
</label>
</div>
<div
class="form-check save-default-layout-check ml-2"
title="If this option is turned on, you won't be able to specify default layouts"
>
<input
class="form-check-input save-default-layout"
type="checkbox"
value="1"
id="save-default-layout"
setting="saveDefaultLayout"
/>
<label class="form-check-label" for="save-default-layout">
Save Layout on Exit
</label>
</div>
</form>
<span class="slider"></span>
<span>Show tutorial on startup</span>
</label>
</div>
</div>
<div class="settings-theme p-2 border-bottom border-secondary">
<h5 class="d-flex justify-content-between">Select Theme</h5>

<div class="settings-theme border-bottom border-secondary">
<div>
<h5>Theme</h5>
</div>
<form>
<ul class="select theme-select mb-1">
<li class="select_items">
Expand All @@ -314,85 +310,238 @@ <h5 class="d-flex justify-content-between">Select Theme</h5>
</ul>
</form>
</div>
<div class="settings-length p-2 pb-0 border-bottom border-secondary">
<h5 class="d-flex justify-content-between">Select Toolbar Length</h5>

<div class="settings-length border-bottom border-secondary">
<div>
<h5>Toolbar Length</h5>
</div>
<form>
<ul class="select length-select mb-2">
<li class="select_items">
<input
class="select_expand"
type="radio"
name="length"
id="length-opener"
id="settings-length-opener"
/>
<label class="select_closeLabel" for="closeLength"></label>
<ul class="select_options"></ul>
<label class="select_expandLabel" for="length-opener"></label>
<label
class="select_expandLabel"
for="settings-length-opener"
></label>
</li>
</ul>
<small class="d-block fst-italic mb-1">
* How many menu items will be shown at a time.
</small>
<small> * How many menu items will be shown at a time. </small>
</form>
</div>
<div class="settings-search p-2 border-bottom border-secondary">
<h5 class="d-flex justify-content-between">Search</h5>
<form>
<div class="form-check ml-2">

<div class="settings-layouts border-bottom border-secondary">
<div>
<h5>Layouts</h5>
</div>
<div>
<label class="switch" for="save-default-layout">
<input
class="form-check-input search-clients"
type="checkbox"
value="1"
id="search-clients"
setting="searchClients"
id="save-default-layout"
class="save-default-layout"
data-setting="saveDefaultLayout"
/>
<label class="form-check-label" for="search-clients">
Search Clients
</label>
</div>
<div class="form-check ml-2">
<span class="slider"></span>
<span>Save current on exit</span>
</label>
</div>
</div>

<div class="settings-notifications border-bottom border-secondary">
<div>
<h5>Notifications</h5>
</div>
<div>
<label class="switch" for="enable-notifications">
<input
class="form-check-input search-instruments"
type="checkbox"
value="1"
id="search-instruments"
setting="searchInstruments"
id="enable-notifications"
class="enable-notifications"
data-setting="enableNotifications"
/>
<label class="form-check-label" for="search-instruments">
Search Instruments
</label>
</div>
</form>
<span class="slider"></span>
<span>Allow notifications</span>
</label>
</div>
<div>
<label class="switch" for="enable-toasts">
<input
type="checkbox"
id="enable-toasts"
class="enable-toasts"
data-setting="enableToasts"
/>
<span class="slider"></span>
<span>Allow notification toasts</span>
</label>
</div>
</div>
<div class="settings-notifications p-2">
<h5 class="d-flex justify-content-between">Notifications</h5>
<form>
<div class="form-check ml-2">

<div class="settings-system border-bottom border-secondary">
<div>
<h5>System</h5>
</div>
<div>
<label class="switch" for="schedule-restart">
<input
class="form-check-input enable-notifications"
type="checkbox"
value="1"
id="enable-notifications"
setting="enableNotifications"
id="schedule-restart"
class="schedule-restart"
data-setting="scheduleRestart"
/>
<label class="form-check-label" for="enable-notifications">
Enable Notifications
</label>
<span class="slider"></span>
<span>Schedule restart</span>
</label>
</div>
<div class="settings-system-schedule-restart">
<div class="settings-system-schedule-restart-time">
<input
type="text"
id="schedule-restart-time"
class="form-control input-control"
name="restart-time"
/>
</div>
<div class="settings-system-schedule-restart-period">
<form>
<ul class="select restart-period-select">
<li class="select_items">
<input
class="select_expand"
type="radio"
name="restart-period"
id="settings-restart-period-opener"
/>
<label class="select_closeLabel" for="closeLength"></label>
<ul class="select_options"></ul>
<label
class="select_expandLabel"
for="settings-restart-period-opener"
></label>
</li>
</ul>
</form>
</div>
<div class="settings-system-schedule-restart-interval">
<form>
<ul class="select restart-interval-select">
<li class="select_items">
<input
class="select_expand"
type="radio"
name="restart-interval"
id="settings-restart-interval-opener"
/>
<label class="select_closeLabel" for="closeLength"></label>
<ul class="select_options"></ul>
<label
class="select_expandLabel"
for="settings-restart-interval-opener"
></label>
</li>
</ul>
</form>
</div>
<div class="form-check ml-2">
</div>
<div>
<label class="switch" for="schedule-shutdown">
<input
class="form-check-input enable-toasts"
type="checkbox"
value="1"
id="enable-toasts"
setting="enableToasts"
id="schedule-shutdown"
class="schedule-shutdown"
data-setting="scheduleShutdown"
/>
<span class="slider"></span>
<span>Schedule shutdown</span>
</label>
</div>
<div class="settings-system-schedule-shutdown">
<div class="settings-system-schedule-shutdown-time">
<input
type="text"
id="schedule-shutdown-time"
class="form-control input-control"
name="shutdown-time"
/>
<label class="form-check-label" for="enable-toasts">
Enable Toasts
</label>
<br />
</div>
</form>
<div class="settings-system-schedule-shutdown-period">
<form>
<ul class="select shutdown-period-select">
<li class="select_items">
<input
class="select_expand"
type="radio"
name="shutdown-period"
id="settings-shutdown-period-opener"
/>
<label class="select_closeLabel" for="closeLength"></label>
<ul class="select_options"></ul>
<label
class="select_expandLabel"
for="settings-shutdown-period-opener"
></label>
</li>
</ul>
</form>
</div>
<div class="settings-system-schedule-shutdown-interval">
<form>
<ul class="select shutdown-interval-select">
<li class="select_items">
<input
class="select_expand"
type="radio"
name="shutdown-interval"
id="settings-shutdown-interval-opener"
/>
<label class="select_closeLabel" for="closeLength"></label>
<ul class="select_options"></ul>
<label
class="select_expandLabel"
for="settings-shutdown-interval-opener"
></label>
</li>
</ul>
</form>
</div>
</div>
</div>

<div class="settings-search">
<div>
<h5>Search</h5>
</div>
<div>
<label class="switch" for="search-clients">
<input
type="checkbox"
id="search-clients"
class="search-clients"
data-setting="searchClients"
/>
<span class="slider"></span>
<span>Search clients</span>
</label>
</div>
<div>
<label class="switch" for="search-instruments">
<input
type="checkbox"
id="search-instruments"
class="search-instruments"
data-setting="searchInstruments"
/>
<span class="slider"></span>
<span>Search instruments</span>
</label>
</div>
</div>
</div>

Expand Down
Loading
Loading