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.

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

HTML der DutyCycle Anzeige auf Startseite verbessern #674

Closed
ptweety opened this issue Jul 28, 2019 · 1 comment · Fixed by #675

Comments

@ptweety
Copy link
Contributor

commented Jul 28, 2019

Hi,

es wäre schön, wenn die neue Anzeige des DutyCycles auf der Startseite noch etwas verbessert werden könnte. Einerseits passen die verwendeten colspan nicht immer zu den tatsächlichen Spalten und dann wäre es noch schön, wenn die display Eigenschaft statt visibility verwendet werden würde:

--- webui.js.orig
+++ webui.js
@@ -28381,9 +28381,9 @@
             }
             trPartingLineElm.show();
             showPartingLine = true;
-            trDutyCycle.css("visibility", "visible");
+            trDutyCycle.css("display", "table-row");
           } else {
-            trDutyCycle.css("visibility", "hidden");
+            trDutyCycle.css("display", "none");
           }
 
           if (!showPartingLine) {
--- startpage.htm.orig
+++ startpage.htm
@@ -170,48 +170,48 @@
 
             <tr>
               <th style="width:40%"></th>
-              <th style="width:60%"></th>
+              <th colspan="2" style="width:60%"></th>
             </tr>
 
             <tr>
                 <!-- Uhrzeit -->
               <td>${time}:</td>
-              <td><span id="maintime"><% Write(system.Date("%H:%M")); %></span><!-- Uhr--></td>
+              <td colspan="2"><span id="maintime"><% Write(system.Date("%H:%M")); %></span><!-- Uhr--></td>
             </tr>
             <tr>
               <!--Datum -->
               <td>${date}:</td>
-              <td><span id="maindate"><% Write(system.Date("%d.%m.%Y")); %></span></td>
+              <td colspan="2"><span id="maindate"><% Write(system.Date("%d.%m.%Y")); %></span></td>
             </tr>
 
             <tr>
             <!-- Sonnenaufgang -->
               <td>${sunrise}:</td>
-              <td id="sunrise"><% Write(system.SunriseTime("%H:%M")); %><!-- Uhr --></td>
+              <td colspan="2" id="sunrise"><% Write(system.SunriseTime("%H:%M")); %><!-- Uhr --></td>
             </tr>
 
             <tr>
             <!-- Sonnenuntergang -->
               <td>${sunset}:</td>
-              <td id="sunset"><% Write(system.SunsetTime("%H:%M")); %><!-- Uhr--></td>
+              <td colspan="2" id="sunset"><% Write(system.SunsetTime("%H:%M")); %><!-- Uhr--></td>
             </tr>
 
             <tr>
               <td>${currentFirmwareVersion}</td>
-              <td id="currentFirmware">${lblCurrentFirmwareVersionNotKnown}</td>
+              <td colspan="2" id="currentFirmware">${lblCurrentFirmwareVersionNotKnown}</td>
             </tr>
 
             <tr id="updateRow" style="display:none;">
               <!-- CCU2-Update -->
               <td>${update}</td>
                <!-- Firmware ist verf&uuml;gbar -->
-              <td colspan="3" id="updateCol">${newFirmwareAvailable}</td>
+              <td colspan="2" id="updateCol">${newFirmwareAvailable}</td>
             </tr>
 
             <!-- Device-Firmware -->
             <tr id="devFwAvailable" class="hidden">
               <td>${deviceUpdate}</td>
-              <td class="firmwareAvailable">${lblNewDeviceFirmwareAvailable}&nbsp;<span id="devFwAvailableCounter"></span></td>
+              <td colspan="2" class="firmwareAvailable">${lblNewDeviceFirmwareAvailable}&nbsp;<span id="devFwAvailableCounter"></span></td>
             </tr>
 
             <%
@@ -222,7 +222,7 @@
 
                   Write("<td>${login}:</td>");
 
-                  Write("<td colspan='3' class='attention'>${noPasswd}</td>");
+                  Write("<td colspan='2' class='attention'>${noPasswd}</td>");
                 Write("</tr>");
               }
               
@@ -232,7 +232,7 @@
                   object oDP = dom.GetObject(tmp);
                   Write("<tr>");
                   Write("<td>"#oDP.Name()#":</td>");
-                  Write("<td colspan='3' id='SYSVAR_" # tmp # "' >");
+                  Write("<td colspan='2' id='SYSVAR_" # tmp # "' >");
                   string sSysVarVal = "";
                   object cObjTmp = oDP;
                   integer iVT = oDP.ValueType();
@@ -253,23 +253,23 @@
             <tr id="partingLine1" class="hidden"><td colspan="3" style="height: 50px"><hr></td></tr>
 
             <!-- DutyCycle -->
-            <tr name="trDutyCycle" style="visibility: hidden"></tr>
-            <tr name="trDutyCycle0" style="visibility: hidden">
+            <tr name="trDutyCycle" style="display: none"></tr>
+            <tr name="trDutyCycle0" style="display: none">
               <td id="dutyCycleAddr0" align="left"</td>
               <td><div id="dutyCycleProgress0" align="right"><div id="dutyCycleProgressBar0"></div></div></td>
               <td style="white-space: nowrap"><div id="dutyCycleVal0" style="width:75%; text-align:left"></div></td>
             </tr>
-            <tr name="trDutyCycle1" style="visibility: hidden">
+            <tr name="trDutyCycle1" style="display: none">
               <td id="dutyCycleAddr1" align="left"</td>
               <td><div id="dutyCycleProgress1" align="right"><div id="dutyCycleProgressBar1"></div></div></td>
               <td style="white-space: nowrap"><div id="dutyCycleVal1" style="width:75%; text-align:left"></div></td>
             </tr>
-            <tr name="trDutyCycle2" style="visibility: hidden">
+            <tr name="trDutyCycle2" style="display: none">
               <td id="dutyCycleAddr2" align="left"</td>
               <td><div id="dutyCycleProgress2" align="right"><div id="dutyCycleProgressBar2"></div></div></td>
               <td style="white-space: nowrap"><div id="dutyCycleVal2" style="width:75%; text-align:left"></div></td>
             </tr>
-            <tr name="trDutyCycle3" style="visibility: hidden">
+            <tr name="trDutyCycle3" style="display: none">
               <td id="dutyCycleAddr3" align="left"</td>
               <td><div id="dutyCycleProgress3" align="right"><div id="dutyCycleProgressBar3"></div></div></td>
               <td style="white-space: nowrap"><div id="dutyCycleVal3" style="width:75%; text-align:left"></div></td>```
@jens-maus

This comment has been minimized.

Copy link
Owner

commented Jul 28, 2019

Wäre es möglich das du das bitte in einen entsprechenden PullRequest verwandelst?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.