design fix in WebUI
This commit is contained in:
		@@ -4,19 +4,19 @@
 | 
				
			|||||||
<head>
 | 
					<head>
 | 
				
			||||||
  <meta charset="utf-8" />
 | 
					  <meta charset="utf-8" />
 | 
				
			||||||
  <title>Dark Emergency Timer</title>
 | 
					  <title>Dark Emergency Timer</title>
 | 
				
			||||||
  <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" />
 | 
				
			||||||
  <link rel="stylesheet" href="static/css/tweaks.css">
 | 
					  <link rel="stylesheet" href="static/css/tweaks.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>
 | 
				
			||||||
  <script src="static/js/websocket.js"></script>
 | 
					  <script src="static/js/websocket.js"></script>
 | 
				
			||||||
  <script src="static/js/dtc_table.js"></script>
 | 
					  <script src="static/js/dtc_table.js"></script>
 | 
				
			||||||
  <script src="static/js/script.js"></script>
 | 
					  <script src="static/js/script.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>
 | 
				
			||||||
@@ -31,44 +31,47 @@
 | 
				
			|||||||
  <!-- Notification-Container -->
 | 
					  <!-- Notification-Container -->
 | 
				
			||||||
  <div id="notification-container" class="notification-container"></div>
 | 
					  <div id="notification-container" class="notification-container"></div>
 | 
				
			||||||
  <!-- Notification-Container -->
 | 
					  <!-- Notification-Container -->
 | 
				
			||||||
 | 
					 | 
				
			||||||
  <nav class="navbar fixed-top navbar-dark bg-primary" id="navbar1">
 | 
					  <nav class="navbar fixed-top navbar-dark bg-primary" id="navbar1">
 | 
				
			||||||
    <a class="navbar-brand" href="#">
 | 
					    <a class="navbar-brand" href="#">
 | 
				
			||||||
      <img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top mr-1" alt="">
 | 
					      <img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top mr-1" alt="" />
 | 
				
			||||||
      <span class="data-devicename">DE Airsoft Timer</span>
 | 
					      <span class="data-devicename">DE Airsoft Timer</span>
 | 
				
			||||||
    </a>
 | 
					    </a>
 | 
				
			||||||
    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsingNavbar"
 | 
					    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsingNavbar"
 | 
				
			||||||
      aria-controls="collapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
 | 
					      aria-controls="collapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
 | 
				
			||||||
      <span class="navbar-toggler-icon"></span>
 | 
					      <span class="navbar-toggler-icon"></span>
 | 
				
			||||||
    </button>
 | 
					    </button>
 | 
				
			||||||
 | 
					 | 
				
			||||||
    <div class="collapse navbar-collapse" id="collapsingNavbar">
 | 
					    <div class="collapse navbar-collapse" id="collapsingNavbar">
 | 
				
			||||||
      <ul class="navbar-nav nav mr-auto mt-2 mt-lg-0">
 | 
					      <ul class="navbar-nav nav mr-auto mt-2 mt-lg-0">
 | 
				
			||||||
 | 
					        <li class="nav-item">
 | 
				
			||||||
        <li class="nav-item"><a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a></li>
 | 
					          <a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a>
 | 
				
			||||||
        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a></li>
 | 
					        </li>
 | 
				
			||||||
        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Einstellungen</a></li>
 | 
					        <li class="nav-item">
 | 
				
			||||||
        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a></li>
 | 
					          <a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a>
 | 
				
			||||||
 | 
					        </li>
 | 
				
			||||||
 | 
					        <li class="nav-item">
 | 
				
			||||||
 | 
					          <a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Einstellungen</a>
 | 
				
			||||||
 | 
					        </li>
 | 
				
			||||||
 | 
					        <li class="nav-item">
 | 
				
			||||||
 | 
					          <a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a>
 | 
				
			||||||
 | 
					        </li>
 | 
				
			||||||
      </ul>
 | 
					      </ul>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
  </nav>
 | 
					  </nav>
 | 
				
			||||||
 | 
					 | 
				
			||||||
  <main class="container">
 | 
					  <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 show active" role="tabpanel">
 | 
					      <div id="tab_home" class="tab-pane fade show active" role="tabpanel">
 | 
				
			||||||
        <div class="col text-center">
 | 
					        <div class="col text-center">
 | 
				
			||||||
          <div class="jumbotron">
 | 
					          <div class="jumbotron">
 | 
				
			||||||
            <img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt="">
 | 
					            <img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt="" />
 | 
				
			||||||
            <h3 class="pt-3"><span class="data-devicename">DE Airsoft Timer</span></h3>
 | 
					            <h3 class="pt-3">
 | 
				
			||||||
 | 
					              <span class="data-devicename">DE Airsoft Timer</span>
 | 
				
			||||||
 | 
					            </h3>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <!-- Div Group Battery remain -->
 | 
					        <!-- Div Group Battery remain -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
        <p>
 | 
					 | 
				
			||||||
        <h4>Akkuladestand</h4>
 | 
					        <h4>Akkuladestand</h4>
 | 
				
			||||||
        <div class="progress">
 | 
					        <div class="progress">
 | 
				
			||||||
          <div id="batterylevel" class="data-batterylevel progress-bar text-light" role="progressbar" aria-valuenow="0"
 | 
					          <div id="batterylevel" class="data-batterylevel progress-bar text-light" role="progressbar" aria-valuenow="0"
 | 
				
			||||||
@@ -76,53 +79,77 @@
 | 
				
			|||||||
            0
 | 
					            0
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        </p>
 | 
					 | 
				
			||||||
        <!-- Div Group Battery remain -->
 | 
					        <!-- Div Group Battery remain -->
 | 
				
			||||||
        <!-- Div Group current Mode -->
 | 
					        <!-- Div Group current Mode -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
        <p>
 | 
					 | 
				
			||||||
        <h4>aktueller Modus</h4>
 | 
					        <h4>aktueller Modus</h4>
 | 
				
			||||||
        <input class="data-systemstatus form-control" type="text" id="sysstatus" readonly>
 | 
					        <input class="data-systemstatus form-control" type="text" id="sysstatus" readonly />
 | 
				
			||||||
        </p>
 | 
					 | 
				
			||||||
        <!-- Div Group current Mode -->
 | 
					        <!-- Div Group current Mode -->
 | 
				
			||||||
        <!-- Div Group Faction Points -->
 | 
					        <!-- Div Group Faction Points -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
        <p>
 | 
					 | 
				
			||||||
        <h4>aktueller Punktestand</h4>
 | 
					        <h4>aktueller Punktestand</h4>
 | 
				
			||||||
        <div class="container-fluid">
 | 
					        <div class="container-fluid">
 | 
				
			||||||
          <div class="row">
 | 
					          <div class="row">
 | 
				
			||||||
            <div id="header_faction1" class="col text-center data-name_faction1 text-white p-3">%NAME_FAC_1%</div>
 | 
					            <div id="header_faction1" class="col text-center data-name_faction1 text-white p-3">
 | 
				
			||||||
            <div id="header_faction2" class="col text-center data-name_faction2 text-white p-3">%NAME_FAC_2%</div>
 | 
					              %NAME_FAC_1%
 | 
				
			||||||
            <div id="header_faction3" class="col text-center data-name_faction3 text-white p-3">%NAME_FAC_3%</div>
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div id="header_faction2" class="col text-center data-name_faction2 text-white p-3">
 | 
				
			||||||
 | 
					              %NAME_FAC_2%
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div id="header_faction3" class="col text-center data-name_faction3 text-white p-3">
 | 
				
			||||||
 | 
					              %NAME_FAC_3%
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="row">
 | 
					          <div class="row">
 | 
				
			||||||
            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction1">
 | 
					            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction1">
 | 
				
			||||||
              <img src="static/img/logo_fac1.png" class="rounded mx-auto img-fluid d-block" alt="...">
 | 
					              <div class="glow-container">
 | 
				
			||||||
 | 
					                <img src="static/img/logo_fac1.png" class="rounded mx-auto img-fluid d-block" alt="..." />
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction2 glow-active-faction">
 | 
				
			||||||
 | 
					              <div class="glow-container">
 | 
				
			||||||
 | 
					                <img src="static/img/logo_fac2.png" class="rounded mx-auto img-fluid d-block" alt="..." />
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction2">
 | 
					 | 
				
			||||||
              <img src="static/img/logo_fac2.png" class="rounded mx-auto img-fluid d-block" alt="...">
 | 
					 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction3">
 | 
					            <div class="col bg-dark text-white p-3 data-activefaction faction-logo faction3">
 | 
				
			||||||
              <img src="static/img/logo_fac3.png" class="rounded mx-auto img-fluid d-block" alt="...">
 | 
					              <div class="glow-container">
 | 
				
			||||||
 | 
					                <img src="static/img/logo_fac3.png" class="rounded mx-auto img-fluid d-block" alt="..." />
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="row">
 | 
					          <div class="row">
 | 
				
			||||||
            <div id="time_faction1" class="data-time_faction1 col text-center bg-secondary text-white p-3 format-time">0</div>
 | 
					            <div id="time_faction1" class="data-time_faction1 col text-center bg-secondary text-white p-3 format-time">
 | 
				
			||||||
            <div id="time_faction2" class="data-time_faction2 col text-center bg-secondary text-white p-3 format-time">0</div>
 | 
					              0
 | 
				
			||||||
            <div id="time_faction3" class="data-time_faction3 col text-center bg-secondary text-white p-3 format-time">0</div>
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div id="time_faction2" class="data-time_faction2 col text-center bg-secondary text-white p-3 format-time">
 | 
				
			||||||
 | 
					              0
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div id="time_faction3" class="data-time_faction3 col text-center bg-secondary text-white p-3 format-time">
 | 
				
			||||||
 | 
					              0
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="row mt-3">
 | 
					          <div class="row mt-3">
 | 
				
			||||||
            <div class="col text-center"><button id="faction1" class="btn-wsevent btn btn-outline-primary">Aktivieren</button></div>
 | 
					            <div class="col text-center">
 | 
				
			||||||
            <div class="col text-center"><button id="faction2" class="btn-wsevent btn btn-outline-primary">Aktivieren</button></div>
 | 
					              <button id="faction1" class="btn-wsevent btn btn-outline-primary">
 | 
				
			||||||
            <div class="col text-center"><button id="faction3" class="btn-wsevent btn btn-outline-primary">Aktivieren</button></div>
 | 
					                Aktivieren
 | 
				
			||||||
 | 
					              </button>
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div class="col text-center">
 | 
				
			||||||
 | 
					              <button id="faction2" class="btn-wsevent btn btn-outline-primary">
 | 
				
			||||||
 | 
					                Aktivieren
 | 
				
			||||||
 | 
					              </button>
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					            <div class="col text-center">
 | 
				
			||||||
 | 
					              <button id="faction3" class="btn-wsevent btn btn-outline-primary">
 | 
				
			||||||
 | 
					                Aktivieren
 | 
				
			||||||
 | 
					              </button>
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        </p>
 | 
					 | 
				
			||||||
        <!-- Div GroupFaction Points -->
 | 
					        <!-- Div GroupFaction Points -->
 | 
				
			||||||
        <!-- Div Group DTC Table -->
 | 
					        <!-- Div Group DTC Table -->
 | 
				
			||||||
        <div id="dtc_container" hidden>
 | 
					        <div id="dtc_container" hidden>
 | 
				
			||||||
          <hr />
 | 
					          <hr />
 | 
				
			||||||
          <p>
 | 
					 | 
				
			||||||
          <h4>Fehlercodes</h4>
 | 
					          <h4>Fehlercodes</h4>
 | 
				
			||||||
          <table class="table" id="dtc_table">
 | 
					          <table class="table" id="dtc_table">
 | 
				
			||||||
            <tbody>
 | 
					            <tbody>
 | 
				
			||||||
@@ -134,64 +161,62 @@
 | 
				
			|||||||
              </tr>
 | 
					              </tr>
 | 
				
			||||||
            </tbody>
 | 
					            </tbody>
 | 
				
			||||||
          </table>
 | 
					          </table>
 | 
				
			||||||
          </p>
 | 
					 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <!-- Div Group DTC Table -->
 | 
					        <!-- Div Group DTC Table -->
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
      <!-- Div Tab Home-->
 | 
					      <!-- Div Tab Home-->
 | 
				
			||||||
 | 
					 | 
				
			||||||
      <!-- Div Tab Maintenance -->
 | 
					      <!-- Div Tab Maintenance -->
 | 
				
			||||||
      <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
 | 
					      <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
 | 
				
			||||||
        <h3>Wartung</h3>
 | 
					        <h3>Wartung</h3>
 | 
				
			||||||
        <!-- Div Group Reset Timers -->
 | 
					        <!-- Div Group Reset Timers -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
        <p>
 | 
					 | 
				
			||||||
        <h4>Punkte zurücksetzen</h4>
 | 
					        <h4>Punkte zurücksetzen</h4>
 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
          <div class="col text-center">
 | 
					          <div class="col text-center">
 | 
				
			||||||
            <button id="reset-timer" class="btn-wsevent btn btn-outline-primary ml-2">Timer zurücksetzen</button>
 | 
					            <button id="reset-timer" class="btn-wsevent btn btn-outline-primary ml-2">
 | 
				
			||||||
 | 
					              Timer zurücksetzen
 | 
				
			||||||
 | 
					            </button>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        </p>
 | 
					 | 
				
			||||||
        <!-- Div Group Reset Timers  -->
 | 
					        <!-- Div Group Reset Timers  -->
 | 
				
			||||||
        <!-- Div Group LiveDebug -->
 | 
					        <!-- Div Group LiveDebug -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
     <p>
 | 
					 | 
				
			||||||
        <h4>Live Debug</h4>
 | 
					        <h4>Live Debug</h4>
 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
      <input id="livedebug-in" type="text" class="set-wsevent data-livedebug-in form-control">
 | 
					          <input id="livedebug-in" type="text" class="set-wsevent data-livedebug-in form-control" />
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
          <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
 | 
					          <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
          <div class="col text-center">
 | 
					          <div class="col text-center">
 | 
				
			||||||
         <button id="debugstart" class="btn-wsevent btn btn-outline-primary ml-2">Start</button>
 | 
					            <button id="debugstart" class="btn-wsevent btn btn-outline-primary ml-2">
 | 
				
			||||||
         <button id="debugstop" class="btn-wsevent btn btn-outline-primary ml-2">Stop</button>
 | 
					              Start
 | 
				
			||||||
 | 
					            </button>
 | 
				
			||||||
 | 
					            <button id="debugstop" class="btn-wsevent btn btn-outline-primary ml-2">
 | 
				
			||||||
 | 
					              Stop
 | 
				
			||||||
 | 
					            </button>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
     </p>
 | 
					 | 
				
			||||||
        <!-- Div Group LiveDebug -->
 | 
					        <!-- Div Group LiveDebug -->
 | 
				
			||||||
        <!-- Div Group Device Reboot -->
 | 
					        <!-- Div Group Device Reboot -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
     <p>
 | 
					 | 
				
			||||||
        <h4>Gerät neustarten</h4>
 | 
					        <h4>Gerät neustarten</h4>
 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
          <div class="col text-center">
 | 
					          <div class="col text-center">
 | 
				
			||||||
           <button id="reboot" class="btn-wsevent confirm btn btn-outline-primary">Reboot</button>
 | 
					            <button id="reboot" class="btn-wsevent confirm btn btn-outline-primary">
 | 
				
			||||||
 | 
					              Reboot
 | 
				
			||||||
 | 
					            </button>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
     </p>
 | 
					 | 
				
			||||||
        <!-- Div Group Device Reboot -->
 | 
					        <!-- Div Group Device Reboot -->
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
      <!-- Div Tab Maintenance -->
 | 
					      <!-- Div Tab Maintenance -->
 | 
				
			||||||
 | 
					 | 
				
			||||||
      <!-- Div Tab Settings-->
 | 
					      <!-- Div Tab Settings-->
 | 
				
			||||||
      <div id="tab_source" class="tab-pane fade" role="tabpanel">
 | 
					      <div id="tab_source" class="tab-pane fade" role="tabpanel">
 | 
				
			||||||
        <h3>Einstellungen</h3>
 | 
					        <h3>Einstellungen</h3>
 | 
				
			||||||
        <!-- Div Group Battery Type -->
 | 
					        <!-- Div Group Battery Type -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
          <p>
 | 
					 | 
				
			||||||
        <h4>Akku</h4>
 | 
					        <h4>Akku</h4>
 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
          <label for="batterytype" class="control-label col-4">Akku-Variante</label>
 | 
					          <label for="batterytype" class="control-label col-4">Akku-Variante</label>
 | 
				
			||||||
@@ -203,17 +228,16 @@
 | 
				
			|||||||
            </select>
 | 
					            </select>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
          </p>
 | 
					 | 
				
			||||||
        <!-- Div Group Battery Type -->
 | 
					        <!-- Div Group Battery Type -->
 | 
				
			||||||
        <!-- Div Group Timer Settings -->
 | 
					        <!-- Div Group Timer Settings -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
          <p>
 | 
					 | 
				
			||||||
        <h4>Timer Einstellungen</h4>
 | 
					        <h4>Timer Einstellungen</h4>
 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
          <label for="active_faction_on_reboot" class="control-label col-4">Aktive Fraktion wiederherstellen</label>
 | 
					          <label for="active_faction_on_reboot" class="control-label col-4">Aktive Fraktion wiederherstellen</label>
 | 
				
			||||||
          <div class="col-8">
 | 
					          <div class="col-8">
 | 
				
			||||||
            <div class="form-check">
 | 
					            <div class="form-check">
 | 
				
			||||||
                  <input class="set-wsevent data-active_faction_on_reboot form-check-input" type="checkbox" id="active_faction_on_reboot">
 | 
					              <input class="set-wsevent data-active_faction_on_reboot form-check-input" type="checkbox"
 | 
				
			||||||
 | 
					                id="active_faction_on_reboot" />
 | 
				
			||||||
              <label class="form-check-label" for="active_faction_on_reboot">
 | 
					              <label class="form-check-label" for="active_faction_on_reboot">
 | 
				
			||||||
                aktivieren
 | 
					                aktivieren
 | 
				
			||||||
              </label>
 | 
					              </label>
 | 
				
			||||||
@@ -224,7 +248,8 @@
 | 
				
			|||||||
          <label for="name_faction1" class="control-label col-4">Faktion 1</label>
 | 
					          <label for="name_faction1" class="control-label col-4">Faktion 1</label>
 | 
				
			||||||
          <div class="col-8">
 | 
					          <div class="col-8">
 | 
				
			||||||
            <div class="input-group">
 | 
					            <div class="input-group">
 | 
				
			||||||
                  <input id="name_faction1" type="text" class="set-wsevent data-name_faction1 form-control" required="required">
 | 
					              <input id="name_faction1" type="text" class="set-wsevent data-name_faction1 form-control"
 | 
				
			||||||
 | 
					                required="required" />
 | 
				
			||||||
              <div class="input-group-append">
 | 
					              <div class="input-group-append">
 | 
				
			||||||
                <span class="input-group-text">max. 32 Zeichen</span>
 | 
					                <span class="input-group-text">max. 32 Zeichen</span>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
@@ -235,7 +260,8 @@
 | 
				
			|||||||
          <label for="name_faction2" class="control-label col-4">Faktion 2</label>
 | 
					          <label for="name_faction2" class="control-label col-4">Faktion 2</label>
 | 
				
			||||||
          <div class="col-8">
 | 
					          <div class="col-8">
 | 
				
			||||||
            <div class="input-group">
 | 
					            <div class="input-group">
 | 
				
			||||||
                  <input id="name_faction2" type="text" class="set-wsevent data-name_faction2 form-control" required="required">
 | 
					              <input id="name_faction2" type="text" class="set-wsevent data-name_faction2 form-control"
 | 
				
			||||||
 | 
					                required="required" />
 | 
				
			||||||
              <div class="input-group-append">
 | 
					              <div class="input-group-append">
 | 
				
			||||||
                <span class="input-group-text">max. 32 Zeichen</span>
 | 
					                <span class="input-group-text">max. 32 Zeichen</span>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
@@ -246,7 +272,8 @@
 | 
				
			|||||||
          <label for="name_faction3" class="control-label col-4">Faktion 3</label>
 | 
					          <label for="name_faction3" class="control-label col-4">Faktion 3</label>
 | 
				
			||||||
          <div class="col-8">
 | 
					          <div class="col-8">
 | 
				
			||||||
            <div class="input-group">
 | 
					            <div class="input-group">
 | 
				
			||||||
                  <input id="name_faction3" type="text" class="set-wsevent data-name_faction3 form-control" required="required">
 | 
					              <input id="name_faction3" type="text" class="set-wsevent data-name_faction3 form-control"
 | 
				
			||||||
 | 
					                required="required" />
 | 
				
			||||||
              <div class="input-group-append">
 | 
					              <div class="input-group-append">
 | 
				
			||||||
                <span class="input-group-text">max. 32 Zeichen</span>
 | 
					                <span class="input-group-text">max. 32 Zeichen</span>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
@@ -256,28 +283,26 @@
 | 
				
			|||||||
        <!-- Div Group Timer Settings -->
 | 
					        <!-- Div Group Timer Settings -->
 | 
				
			||||||
        <!-- Div Group Save Button-->
 | 
					        <!-- Div Group Save Button-->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
        <p>
 | 
					 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
          <div class="col text-center">
 | 
					          <div class="col text-center">
 | 
				
			||||||
              <button id="settingssave" class="btn-wsevent btn btn-outline-primary">Speichern</button>
 | 
					            <button id="settingssave" class="btn-wsevent btn btn-outline-primary">
 | 
				
			||||||
 | 
					              Speichern
 | 
				
			||||||
 | 
					            </button>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        </p>
 | 
					 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
      <!-- Div Tab Settings -->
 | 
					      <!-- Div Tab Settings -->
 | 
				
			||||||
 | 
					 | 
				
			||||||
      <!-- Div Tab Firmware Update-->
 | 
					      <!-- Div Tab Firmware Update-->
 | 
				
			||||||
      <div id="tab_fwupdate" class="tab-pane fade" role="tabpanel">
 | 
					      <div id="tab_fwupdate" class="tab-pane fade" role="tabpanel">
 | 
				
			||||||
        <h3>Firmware</h3>
 | 
					        <h3>Firmware</h3>
 | 
				
			||||||
        <!-- Div Group VersionInfo -->
 | 
					        <!-- Div Group VersionInfo -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
      <p>
 | 
					 | 
				
			||||||
        <h4>Version-Info</h4>
 | 
					        <h4>Version-Info</h4>
 | 
				
			||||||
        <table class="table">
 | 
					        <table class="table">
 | 
				
			||||||
          <tbody>
 | 
					          <tbody>
 | 
				
			||||||
            <tr>
 | 
					            <tr>
 | 
				
			||||||
            <th class="col-7" scope="col">Parameter</td>
 | 
					              <th class="col-7" scope="col">Parameter</th>
 | 
				
			||||||
            <th class="col-5" scope="col">Value</td>
 | 
					              <th class="col-5" scope="col">Value</th>
 | 
				
			||||||
            </tr>
 | 
					            </tr>
 | 
				
			||||||
            <tr>
 | 
					            <tr>
 | 
				
			||||||
              <td>Firmware Version</td>
 | 
					              <td>Firmware Version</td>
 | 
				
			||||||
@@ -291,25 +316,22 @@
 | 
				
			|||||||
              <td>Git Revision</td>
 | 
					              <td>Git Revision</td>
 | 
				
			||||||
              <td><span class="data-git-revision"></span></td>
 | 
					              <td><span class="data-git-revision"></span></td>
 | 
				
			||||||
            </tr>
 | 
					            </tr>
 | 
				
			||||||
 | 
					          </tbody>
 | 
				
			||||||
        </table>
 | 
					        </table>
 | 
				
			||||||
      </p>
 | 
					 | 
				
			||||||
        <!-- Div Group VersionInfo -->
 | 
					        <!-- Div Group VersionInfo -->
 | 
				
			||||||
        <!-- Div Group EEPROM Backup -->
 | 
					        <!-- Div Group EEPROM Backup -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
      <p>
 | 
					 | 
				
			||||||
        <h4>EEPROM-Backup</h4>
 | 
					        <h4>EEPROM-Backup</h4>
 | 
				
			||||||
        <div class="form-group row">
 | 
					        <div class="form-group row">
 | 
				
			||||||
          <div class="col text-center">
 | 
					          <div class="col text-center">
 | 
				
			||||||
            <a class="btn btn-outline-primary" href="eejson" role="button" id="ee-backup-download">Download</a>
 | 
					            <a class="btn btn-outline-primary" href="eejson" role="button" id="ee-backup-download">Download</a>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
      </p>
 | 
					 | 
				
			||||||
        <!-- Div Group EEPROM Backup -->
 | 
					        <!-- Div Group EEPROM Backup -->
 | 
				
			||||||
        <!-- Div Group EEPROM Restore -->
 | 
					        <!-- Div Group EEPROM Restore -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
      <p>
 | 
					 | 
				
			||||||
        <h4>EEPROM-Restore</h4>
 | 
					        <h4>EEPROM-Restore</h4>
 | 
				
			||||||
      <form method='POST' action='eeRestore' enctype='multipart/form-data'>
 | 
					        <form method="POST" action="eeRestore" enctype="multipart/form-data">
 | 
				
			||||||
          <div class="form-group row">
 | 
					          <div class="form-group row">
 | 
				
			||||||
            <div class="custom-file">
 | 
					            <div class="custom-file">
 | 
				
			||||||
              <input type="file" name="ee-restore-file" class="custom-file-input" id="ee-restore-file" accept=".ee.json"
 | 
					              <input type="file" name="ee-restore-file" class="custom-file-input" id="ee-restore-file" accept=".ee.json"
 | 
				
			||||||
@@ -319,17 +341,17 @@
 | 
				
			|||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="form-group row">
 | 
					          <div class="form-group row">
 | 
				
			||||||
            <div class="col text-center">
 | 
					            <div class="col text-center">
 | 
				
			||||||
            <button name="submit" type="submit" class="btn btn-outline-primary">Restore starten</button>
 | 
					              <button name="submit" type="submit" class="btn btn-outline-primary">
 | 
				
			||||||
 | 
					                Restore starten
 | 
				
			||||||
 | 
					              </button>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </form>
 | 
					        </form>
 | 
				
			||||||
      </p>
 | 
					 | 
				
			||||||
        <!-- Div Group EEPROM Restore -->
 | 
					        <!-- Div Group EEPROM Restore -->
 | 
				
			||||||
        <!-- Div Group Firmware Update -->
 | 
					        <!-- Div Group Firmware Update -->
 | 
				
			||||||
        <hr />
 | 
					        <hr />
 | 
				
			||||||
      <p>
 | 
					 | 
				
			||||||
        <h4>Firmware-Update</h4>
 | 
					        <h4>Firmware-Update</h4>
 | 
				
			||||||
      <form method='POST' action='doUpdate' enctype='multipart/form-data'>
 | 
					        <form method="POST" action="doUpdate" enctype="multipart/form-data">
 | 
				
			||||||
          <div class="form-group row">
 | 
					          <div class="form-group row">
 | 
				
			||||||
            <div class="custom-file">
 | 
					            <div class="custom-file">
 | 
				
			||||||
              <input type="file" name="fw-update-file" class="custom-file-input" id="fw-update-file"
 | 
					              <input type="file" name="fw-update-file" class="custom-file-input" id="fw-update-file"
 | 
				
			||||||
@@ -339,34 +361,30 @@
 | 
				
			|||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
          <div class="form-group row">
 | 
					          <div class="form-group row">
 | 
				
			||||||
            <div class="col text-center">
 | 
					            <div class="col text-center">
 | 
				
			||||||
            <button name="submit" type="submit" class="btn btn-outline-primary">Update starten</button>
 | 
					              <button name="submit" type="submit" class="btn btn-outline-primary">
 | 
				
			||||||
 | 
					                Update starten
 | 
				
			||||||
 | 
					              </button>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
        </form>
 | 
					        </form>
 | 
				
			||||||
      </p>
 | 
					 | 
				
			||||||
        <!-- Div Group Firmware Update -->
 | 
					        <!-- Div Group Firmware Update -->
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
      <!-- Div Tab Firmware Update-->
 | 
					      <!-- Div Tab Firmware Update-->
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <!-- Tabs Content -->
 | 
					    <!-- Tabs Content -->
 | 
				
			||||||
</main>
 | 
					  </main>
 | 
				
			||||||
 | 
					  <!-- Footer -->
 | 
				
			||||||
<!-- Footer -->
 | 
					  <footer class="page-footer navbar-dark bg-primary font-small fixed-bottom">
 | 
				
			||||||
 | 
					 | 
				
			||||||
<footer class="page-footer navbar-dark bg-primary font-small fixed-bottom">
 | 
					 | 
				
			||||||
    <div class="container-fluid text-center">
 | 
					    <div class="container-fluid text-center">
 | 
				
			||||||
      <div class="footer-copyright text-center py-3">
 | 
					      <div class="footer-copyright text-center py-3">
 | 
				
			||||||
        <span class="text-muted">© 2023 -
 | 
					        <span class="text-muted">© 2023 -
 | 
				
			||||||
          <a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span>
 | 
					          <a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
</footer>
 | 
					  </footer>
 | 
				
			||||||
 | 
					  <!-- Footer -->
 | 
				
			||||||
<!-- Footer -->
 | 
					  <!-- Modal Dialog -->
 | 
				
			||||||
 | 
					  <div class="modal fade" id="dtcModal" tabindex="-1" role="dialog" aria-labelledby="dtcModalLabel" aria-hidden="true">
 | 
				
			||||||
<!-- Modal Dialog -->
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<div class="modal fade" id="dtcModal" tabindex="-1" role="dialog" aria-labelledby="dtcModalLabel" aria-hidden="true">
 | 
					 | 
				
			||||||
    <div class="modal-dialog modal-dialog-centered" role="document">
 | 
					    <div class="modal-dialog modal-dialog-centered" role="document">
 | 
				
			||||||
      <div class="modal-content">
 | 
					      <div class="modal-content">
 | 
				
			||||||
        <div class="modal-header">
 | 
					        <div class="modal-header">
 | 
				
			||||||
@@ -380,16 +398,14 @@
 | 
				
			|||||||
          <p class="dtc-debugval">DTC DebugVal</p>
 | 
					          <p class="dtc-debugval">DTC DebugVal</p>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        <div class="modal-footer">
 | 
					        <div class="modal-footer">
 | 
				
			||||||
        <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
 | 
					          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
 | 
				
			||||||
 | 
					            Close
 | 
				
			||||||
 | 
					          </button>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
</div>
 | 
					  </div>
 | 
				
			||||||
 | 
					  <!-- Modal Dialog -->
 | 
				
			||||||
<!-- Modal Dialog -->
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</body>
 | 
					</body>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</html>
 | 
					</html>
 | 
				
			||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -33,7 +33,7 @@ $(document).ready(function () {
 | 
				
			|||||||
      event.preventDefault(); // Verhindert, dass die Enter-Taste die Standardaktion ausführt (z.B. Absenden eines Formulars)
 | 
					      event.preventDefault(); // Verhindert, dass die Enter-Taste die Standardaktion ausführt (z.B. Absenden eines Formulars)
 | 
				
			||||||
      
 | 
					      
 | 
				
			||||||
      const command = $('#livedebug-in').val(); // Den Befehl aus dem Eingabefeld holen
 | 
					      const command = $('#livedebug-in').val(); // Den Befehl aus dem Eingabefeld holen
 | 
				
			||||||
      executeCommand(command); // Den Befehl an die Funktion übergeben
 | 
					      websocket_sendDebugCommand(command); // Den Befehl an die Funktion übergeben
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      $('#livedebug-in').val(''); // Leert das Eingabefeld
 | 
					      $('#livedebug-in').val(''); // Leert das Eingabefeld
 | 
				
			||||||
      $('#livedebug-in').focus(); // Setzt den Fokus zurück auf das Eingabefeld
 | 
					      $('#livedebug-in').focus(); // Setzt den Fokus zurück auf das Eingabefeld
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -474,15 +474,15 @@ void Websocket_HandleButtons(uint8_t *data)
 | 
				
			|||||||
  {
 | 
					  {
 | 
				
			||||||
    globals.systemStatus = sysStat_Shutdown;
 | 
					    globals.systemStatus = sysStat_Shutdown;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  else if (strcmp(identifier, "set-faction1") == 0)
 | 
					  else if (strcmp(identifier, "faction1") == 0)
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    PersistenceData.activeFaction = FACTION_1;
 | 
					    PersistenceData.activeFaction = FACTION_1;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  else if (strcmp(identifier, "set-faction2") == 0)
 | 
					  else if (strcmp(identifier, "faction2") == 0)
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    PersistenceData.activeFaction = FACTION_2;
 | 
					    PersistenceData.activeFaction = FACTION_2;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  else if (strcmp(identifier, "set-faction3") == 0)
 | 
					  else if (strcmp(identifier, "faction3") == 0)
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    PersistenceData.activeFaction = FACTION_3;
 | 
					    PersistenceData.activeFaction = FACTION_3;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user