From a1091015ff6f5c55ed0a30188697907c8c00a772 Mon Sep 17 00:00:00 2001
From: Jamie Holdstock <jholdstock@decred.org>
Date: Fri, 28 May 2021 19:00:43 +0800
Subject: [PATCH] Split ticket info into ticket, fee and voting info

---
 webapi/templates/admin.html | 66 ++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/webapi/templates/admin.html b/webapi/templates/admin.html
index ef5a591..595c73c 100644
--- a/webapi/templates/admin.html
+++ b/webapi/templates/admin.html
@@ -138,6 +138,9 @@
             
                             {{ with .SearchResult }}
                                 {{ if .Found }}
+
+                                    <h1>Ticket</h1>
+
                                     <table id="ticket-table" class="mt-2 mb-4 w-100">
                                         <tr>
                                             <th>Hash</th>
@@ -158,14 +161,23 @@
                                                 <td>Not confirmed</td>
                                             {{ end }}
                                         </tr>
+                                        <tr>
+                                            <th>Ticket Outcome</th>
+                                            <td>{{ .Ticket.Outcome }}</td>
+                                        </tr>
                                         <tr>
                                             <th>Commitment Address</th>
                                             <td>{{ .Ticket.CommitmentAddress }}</td>
                                         </tr>
                                         <tr>
-                                            <th>Fee Address Index</th>
-                                            <td>{{ .Ticket.FeeAddressIndex }}</td>
+                                            <th>Voting WIF</th>
+                                            <td>{{ .Ticket.VotingWIF }}</td>
                                         </tr>
+                                    </table>
+
+                                    <h1>Fee</h1>
+
+                                    <table id="ticket-table" class="mt-2 mb-4 w-100">
                                         <tr>
                                             <th>Fee Address</th>
                                             <td>
@@ -174,6 +186,10 @@
                                                 </a>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <th>Fee Address Index</th>
+                                            <td>{{ .Ticket.FeeAddressIndex }}</td>
+                                        </tr>
                                         <tr>
                                             <th>Fee Amount</th>
                                             <td>{{ .Ticket.FeeAmount }} atoms</td>
@@ -182,6 +198,27 @@
                                             <th>Fee Expiration</th>
                                             <td>{{ .Ticket.FeeExpiration }} ({{ dateTime .Ticket.FeeExpiration }}) </td>
                                         </tr>
+                                        <tr>
+                                            <th>Fee Tx Hash</th>
+                                            <td>
+                                                <a href="{{ txURL .Ticket.FeeTxHash }}">
+                                                    {{ .Ticket.FeeTxHash }}
+                                                </a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <th>Fee Tx</th>
+                                            <td>{{ .Ticket.FeeTxHex }}</td>
+                                        </tr>
+                                        <tr>
+                                            <th>Fee Tx Status</th>
+                                            <td>{{ .Ticket.FeeTxStatus }}</td>
+                                        </tr>
+                                    </table>
+
+                                    <h1>Voting</h1>
+                                    
+                                    <table id="ticket-table" class="mt-2 mb-4 w-100">
                                         <tr>
                                             <th>Current Vote Choices</th>
                                             <td>
@@ -227,31 +264,8 @@
                                                 {{end}}
                                             </td>
                                         </tr>
-                                        <tr>
-                                            <th>Voting WIF</th>
-                                            <td>{{ .Ticket.VotingWIF }}</td>
-                                        </tr>
-                                        <tr>
-                                            <th>Fee Tx Hash</th>
-                                            <td>
-                                                <a href="{{ txURL .Ticket.FeeTxHash }}">
-                                                    {{ .Ticket.FeeTxHash }}
-                                                </a>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th>Fee Tx</th>
-                                            <td>{{ .Ticket.FeeTxHex }}</td>
-                                        </tr>
-                                        <tr>
-                                            <th>Fee Tx Status</th>
-                                            <td>{{ .Ticket.FeeTxStatus }}</td>
-                                        </tr>
-                                        <tr>
-                                            <th>Ticket Outcome</th>
-                                            <td>{{ .Ticket.Outcome }}</td>
-                                        </tr>
                                     </table>
+
                                 {{ else }}
                                     <p>No ticket found with hash <span class="code">{{ .Hash }}</span></p>
                                 {{ end }}