Merge branch 'dev'

main.py

@@ -1045,12 +1045,12 @@ def settings():
 
     info = gitinfo.get_git_info()
     branch = info['refs']
-    if branch == "main":
+    if branch != "main":
-        branch = ""
+        branch = f"({branch})"
     last_commit = info['author_date']
     # import to time from format "2024-02-13 11:24:03"
     last_commit = datetime.datetime.strptime(last_commit, "%Y-%m-%d %H:%M:%S")
-    version = f'{last_commit.strftime("%y-%m-%d")} ({branch})'
+    version = f'{last_commit.strftime("%y-%m-%d")} {branch}'
 
     return render_template("settings.html", account=account,sync=account_module.getNodeSync(),
                            error=error,success=success,version=version)

templates/auctions.html

@@ -146,12 +146,14 @@
     <table class="table">
         <thead>
             <tr>
-                <th><a href="/?direction={{sort_domain_next}}">Domain{{sort_domain}}</a></th>
+                <th><a href="/auctions?direction={{sort_domain_next}}">Domain{{sort_domain}}</a></th>
-                <th><a href="/?sort=expiry&direction={{sort_expiry_next}}">Expires{{sort_expiry}}</a></th>
+                <th><a href="/auctions?sort=state&direction={{sort_state_next}}">State{{sort_state}}</a></th>
+                <th><a href="/auctions?sort=price&direction={{sort_price_next}}">Bid{{sort_price}}</a></th>
+                <th></th>
             </tr>
         </thead>
         <tbody>
-            {{domainsMobile | safe}}
+            {{domains | safe}}
         </tbody>
     </table>
 </div></div>

templates/search.html

@@ -66,8 +66,9 @@
                 <div class="container-fluid">
                     <div class="card">
                         <div class="card-body">
-                            <h4 class="card-title">{{domain}}/<span class="stick-right">{{next}}</span></h4>
+                            <h4 class="d-none d-sm-none d-md-none d-lg-inline-block d-xl-inline-block card-title">{{domain}}/<span class="stick-right">{{next}}</span></h4>
-                            <h6 class="text-muted card-subtitle mb-2">{{state}}</h6>
+                            <h4 class="d-print-none d-sm-inline-block d-md-inline-block d-lg-none d-xl-none d-xxl-none card-title">{{domain}}/<br><br><span class="stick-right">{{next}}</span></h4>
+                            <h6 class="text-muted card-subtitle mb-2"><br>{{state}}</h6>
                             <h6 class="text-muted card-subtitle mb-2">Owner: {{owner}}</h6><a class="btn btn-primary" role="button" style="margin-right: 25px;" href="/manage/{{domain}}">Manage</a><a class="btn btn-primary" role="button" href="/auction/{{domain}}">Auction</a>
                         </div>
                     </div>