souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

more WebUI-Progress

Browse Source
This commit is contained in:
Marcel Peterkau
2022-02-17 09:17:16 +01:00
parent fa23e72fbc
commit 6ba4c40166
3 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Software/ChainLube/assets/Logo.svg
View File

@@ -14,9 +14,9 @@
viewBox="0 0 512 512" viewBox="0 0 512 512"
sodipodi:docname="Logo.svg" sodipodi:docname="Logo.svg"
inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)" inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"
inkscape:export-filename="E:\Rehoiler_SMD\Rehoiler SMD\Software\ChainLube\data\static\img\logo.png" inkscape:export-filename="C:\Users\Souko Hiabuto\Downloads\logo.png"
inkscape:export-xdpi="29.021828" inkscape:export-xdpi="96.000008"
inkscape:export-ydpi="29.021828"> inkscape:export-ydpi="96.000008">
<metadata <metadata
id="metadata839"> id="metadata839">
<rdf:RDF> <rdf:RDF>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

60
Software/ChainLube/data/index.htm
View File

@@ -6,33 +6,32 @@
<title>KTM CAN Chain Oiler</title> <title>KTM CAN Chain Oiler</title>
<meta http-equiv="content-type" content="text/html;charset=UTF-8"> <meta http-equiv="content-type" content="text/html;charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/static/css/bootstrap.min.css"> <link rel="stylesheet" href="static/css/bootstrap.min.css">
<link rel="stylesheet" href="/static/css/custom.css"> <link rel="stylesheet" href="static/css/custom.css">
<script src="/static/js/jquery.min.js"></script> <script src="static/js/jquery.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script> <script src="static/js/bootstrap.min.js"></script>
<link rel="apple-touch-icon" sizes="180x180" href="/static/img/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png">
<link rel="manifest" href="/static/img/site.webmanifest"> <link rel="manifest" href="static/img/site.webmanifest">
</head> </head>
<body> <body>
<div class="container">
<nav class="navbar navbar-default"> <nav class="navbar navbar-expand-md navbar-default fixed-top">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="#">
<img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top" alt="">
KTM CAN ChainLube
</a>
<button type="button" data-target="#navbarCollapse" data-toggle="collapse" class="navbar-toggle"> <button type="button" data-target="#navbarCollapse" data-toggle="collapse" class="navbar-toggle">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="#">
<img src="/static/img/logo.png" width="30" height="30" class="d-inline-block align-top" alt="">
KTM CAN ChainLube
</a>
</div> </div>
<!-- Collection of nav links, forms, and other content for toggling --> <!-- Collection of nav links, forms, and other content for toggling -->
<div id="navbarCollapse" class="collapse navbar-collapse"> <div id="navbarCollapse" class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
@@ -47,25 +46,37 @@
</div> </div>
</nav> </nav>
<main role="main" class="container">
<!-- Tabs Content --> <!-- Tabs Content -->
<div class="tab-content"> <div class="tab-content">
<!-- Div Tab Home--> <!-- Div Tab Home-->
<div id="tab_home" class="tab-pane fade in active"> <div id="tab_home" class="tab-pane fade in active">
<h3>HOME</h3> <div class="col text-center">
<div class="jumbotron">
<img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt="">
<h3>KTM CAN Chain Lube</h3>
</div>
</div>
<p> <p>
<h4>Tankinhalt</h4> <h4>Tankinhalt verbleibend</h4>
<div class="progress"> <div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0" <div class="progress-bar" role="progressbar" aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0"
aria-valuemax="100" style="width: %TANK_REMAIN_CAPACITY%&#37;"> aria-valuemax="100" style="width: %TANK_REMAIN_CAPACITY%&#37;">
%TANK_REMAIN_CAPACITY%&#37; %TANK_REMAIN_CAPACITY%&#37;
</div> </div>
</div> </div>
<h4>aktueller Modus</h4>
<input class="form-control" type="text" placeholder="%SYSTEM_STATUS%" readonly>
</p> </p>
</div> </div>
<!-- Div Tab Home--> <!-- Div Tab Home-->
<!-- Div Tab Source Settings--> <!-- Div Tab Source Settings-->
<div id="tab_source" class="tab-pane fade"> <div id="tab_source" class="tab-pane fade">
<h3>Quelle Wegstrecke</h3> <h3>Erfassung Wegstrecke</h3>
<hr>
<p> <p>
<form action="source-settings" method="POST" class="form-horizontal"> <form action="source-settings" method="POST" class="form-horizontal">
<div class="form-group"> <div class="form-group">
@@ -182,6 +193,7 @@
<!-- Div Tab Lube --> <!-- Div Tab Lube -->
<div id="tab_lube" class="tab-pane fade"> <div id="tab_lube" class="tab-pane fade">
<h3>Schmierung</h3> <h3>Schmierung</h3>
<hr>
<p> <p>
</p> </p>
@@ -190,6 +202,7 @@
<!-- Div Tab Maintenance --> <!-- Div Tab Maintenance -->
<div id="tab_maintenance" class="tab-pane fade"> <div id="tab_maintenance" class="tab-pane fade">
<h3>Wartung</h3> <h3>Wartung</h3>
<hr>
<p> <p>
<form class="form-horizontal"> <form class="form-horizontal">
<div class="form-group"> <div class="form-group">
@@ -213,6 +226,7 @@
<!-- Div Tank Settings--> <!-- Div Tank Settings-->
<div id="tab_tank" class="tab-pane fade"> <div id="tab_tank" class="tab-pane fade">
<h3>Öltank</h3> <h3>Öltank</h3>
<hr>
<p> <p>
<form class="form-horizontal"> <form class="form-horizontal">
<div class="form-group"> <div class="form-group">
@@ -253,7 +267,9 @@
<!-- Div Tank Settings--> <!-- Div Tank Settings-->
<!-- Div Tab SystemInfo --> <!-- Div Tab SystemInfo -->
<div id="tab_sysinfo" class="tab-pane fade"> <div id="tab_sysinfo" class="tab-pane fade">
<h3>Einstellungen</h3> <h3>Systeminfo</h3>
<hr>
<h4>Einstellungen</h4>
<p> <p>
<table class="table"> <table class="table">
<tbody> <tbody>
@@ -324,7 +340,7 @@
</tbody> </tbody>
</table> </table>
</p> </p>
<h3>Betriebsdaten</h3> <h4>Betriebsdaten</h4>
<p> <p>
<table class="table"> <table class="table">
<tbody> <tbody>
@@ -354,16 +370,18 @@
<!-- Div Tab SystemInfo --> <!-- Div Tab SystemInfo -->
</div> </div>
<!-- Tabs Content --> <!-- Tabs Content -->
</div> </main>
<!-- Footer --> <!-- Footer -->
<footer class="navbar-default navbar-fixed-bottom"> <footer class="navbar-default navbar-fixed-bottom">
<div class="container-fluid"> <div class="container-fluid">
<!-- Copyright --> <!-- Copyright -->
<div class="col text-center">
© 2022 Copyright: © 2022 Copyright:
<a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a> <a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a>
</div> </div>
<!-- Copyright --> <!-- Copyright -->
</div>
</footer> </footer>
<!-- Footer --> <!-- Footer -->

3
Software/ChainLube/src/webui.cpp
View File

@@ -104,6 +104,9 @@ String processor(const String &var)
return temp; return temp;
} }
if (var == "SYSTEM_STATUS")
return String(globals.systemStatustxt);
if (var == "PLACEHOLDER") if (var == "PLACEHOLDER")
return "placeholder"; return "placeholder";