From 422889c3a3e1f3c489822050356ba3b71ce7b018 Mon Sep 17 00:00:00 2001
From: Taylor Helsper <tehelsper@gmail.com>
Date: Fri, 12 Mar 2021 20:41:27 -0600
Subject: [PATCH] Improve electrum server page layout

---
 .../www/mynode/templates/electrum_server.html | 122 ++++++++++--------
 .../var/www/mynode/templates/lnd.html         |   4 +-
 2 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/rootfs/standard/var/www/mynode/templates/electrum_server.html b/rootfs/standard/var/www/mynode/templates/electrum_server.html
index 82c5f7b3..a3249a85 100644
--- a/rootfs/standard/var/www/mynode/templates/electrum_server.html
+++ b/rootfs/standard/var/www/mynode/templates/electrum_server.html
@@ -15,77 +15,85 @@
         {% include 'includes/message_display.html' %}
 
         <br/>
-        
+
         <div class="app_tile_row">
             <div class="info_tile">
                 <div class="info_tile_header">Status</div>
-                <div class="info_tile_contents">{{status}}</div>
-            </div>
-            <div class="info_tile">
-                <div class="info_tile_header">Current Block</div>
-                <div class="info_tile_contents">{{current_block}}</div>
-            </div>
-            <div class="info_tile">
-                <div class="info_tile_header">Restart</div>
                 <div class="info_tile_contents">
-                    <a class="ui-button ui-widget ui-corner-all mynode_button_small" style="width: 70%;" href="/restart-electrs">Restart</a>
+                    <table class="info_table">
+                        <tr>
+                            <th>Status</th>
+                            <td>{{status}}</td>
+                        </tr>
+                        <tr>
+                            <th>Current Block</th>
+                            <td>{{current_block}}</td>
+                        </tr>
+                        <tr>
+                            <th>Actions</th>
+                            <td><a class="ui-button ui-widget ui-corner-all mynode_button_small" style="width: 100px;" href="/restart-electrs">Restart</a></td>
+                        </tr>
+                        <!--
+                        <tr>
+                            <th>CLI Command</th>
+                            <td>{{electrs_command}}</td>
+                        </tr>
+                        -->
+                    </table>
+                </div>
+            </div>
+
+            <div class="info_tile">
+                <div class="info_tile_header">Info</div>
+                <div class="info_tile_contents">
+                    <table class="info_table">
+                        <tr>
+                            <th>Electrum Server IP</th>
+                            <td>{{server_ip}}</td>
+                        </tr>
+                        <tr>
+                            <th>Standard Port</th>
+                            <td>{{server_standard_port}}</td>
+                        </tr>
+                        <tr>
+                            <th>Secure Port</th>
+                            <td>{{server_secure_port}}</td>
+                        </tr>
+                    </table>
                 </div>
             </div>
         </div>
 
-        <div class="app_tile_row">
-            <div class="info_tile">
-                <div class="info_tile_header">Electrum Server IP</div>
-                <div class="info_tile_contents">{{server_ip}}</div>
-            </div>
-            <div class="info_tile">
-                <div class="info_tile_header">Standard Port</div>
-                <div class="info_tile_contents">{{server_standard_port}}</div>
-            </div>
-            <div class="info_tile">
-                <div class="info_tile_header">Secure Port</div>
-                <div class="info_tile_contents">{{server_secure_port}}</div>
-            </div>
-        </div>
-
-        <div class="app_tile_row">
-            <div class="info_tile">
-                <div class="info_tile_header">Electrum CLI Command</div>
-                <div class="info_tile_contents">{{electrs_command}}</div>
-            </div>
-        </div>
-
-        <div class="divider" style="width: 800px;"></div>
-
         <div class="app_tile_row">
             <div class="info_tile">
                 <div class="info_tile_header">Electrum Tor Service</div>
-                <div class="info_tile_contents">{% if not product_key_skipped %}Enabled{% else %}Premium Feature{% endif %}</div>
+                <div class="info_tile_contents">
+                    <table class="info_table">
+                        {% if product_key_skipped %}
+                        <tr>
+                            <th>Status</th>
+                            <td>Premium Feature</td>
+                        </tr>
+                        {% else %}
+                        <tr>
+                            <th>Hostname</th>
+                            <td style="font-size: 12px;">{{electrs_onion_hostname}}</td>
+                        </tr>
+                        <tr>
+                            <th>CLI Command</th>
+                            <td style="font-size: 12px;">{{electrs_onion_command}}</td>
+                        </tr>
+                        <tr>
+                            <th>Tor Help</th>
+                            <td><a href="http://docs.electrum.org/en/latest/tor.html" target="_blank">Link</a></td>
+                        </tr>
+                        {% endif %}
+                    </table>
+                </div>
             </div>
-{% if not product_key_skipped %}
-            <div class="info_tile">
-                <div class="info_tile_header">Electrum Tor Hostname</div>
-                <div class="info_tile_contents">{{electrs_onion_hostname}}</div>
-            </div>
-            <!--
-            <div class="info_tile">
-                <div class="info_tile_header">Electrum Tor Password</div>
-                <div class="info_tile_contents">{{electrs_onion_password}}</div>
-            </div>
-            -->
-        </div>
-        <div class="app_tile_row">
-            <div class="info_tile">
-                <div class="info_tile_header">Electrum Tor Command</div>
-                <div class="info_tile_contents">{{electrs_onion_command}}</div>
-            </div>
-            <div class="info_tile">
-                <div class="info_tile_header">Electrum Tor Help</div>
-                <div class="info_tile_contents"><a href="http://docs.electrum.org/en/latest/tor.html" target="_blank">Link</a></div>
-            </div>
-{% endif %}
         </div>
 
+
         <br/><br/>
         <div class="main_header">Using Electrum Wallets</div>
         <div class="main_header_sub_text">
diff --git a/rootfs/standard/var/www/mynode/templates/lnd.html b/rootfs/standard/var/www/mynode/templates/lnd.html
index 9ae17760..1f87c01b 100644
--- a/rootfs/standard/var/www/mynode/templates/lnd.html
+++ b/rootfs/standard/var/www/mynode/templates/lnd.html
@@ -240,7 +240,7 @@
 {% endif %}
 
 {% if wallet_exists and not wallet_logged_in %}
-        <!-- Statu Tile / Row (should be only shown short term) -->
+        <!-- Status Tile / Row (should be only shown short term) -->
         <div class="app_tile_row">
             <div class="info_tile">
                 <div class="info_tile_header">Status</div>
@@ -262,7 +262,7 @@
         <div id="new_address_text" style="display: none;">&nbsp;</div>
         <button id="gen_new_address_button">Generate Deposit Address</button>
     </div>
-    <div class="app_tile_row"></div>
+    <div class="app_tile_row">
         <table class="bitcoind_table">
             <thead class="bitcoind_table_header">
                 <td>On-chain Balance</td>