From 2def7d62837a5e6df022de3df51f314286f6075c Mon Sep 17 00:00:00 2001
From: Mez <git@praze.net>
Date: Sat, 30 Aug 2025 10:21:07 +0100
Subject: [PATCH] Link to decks on the site, open external links in new tabs

---
 colors.py | 66 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/colors.py b/colors.py
index 7f95b9f..97e40e0 100644
--- a/colors.py
+++ b/colors.py
@@ -986,7 +986,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
                         portstring += "□"
                     break
             portstring += " " + specialdeck
-        portstring += "</td>\n</tr>\n<tr>\n<td colspan=\"2\"><a href=\"" + theportfolio["url"] + "\">palette portfolio "
+        portstring += "</td>\n</tr>\n<tr>\n<td colspan=\"2\"><a href=\"" + theportfolio["url"] + "\" target=\"_blank\">palette portfolio "
         if portnumber < 10:
             portstring += "0" + str(portnumber)
         else:
@@ -1059,7 +1059,7 @@ def portfoliogen(theportfolio,thetype,portnumber):
                 else:
                     portstring += "□"
                 break
-        portstring += " " + thedecks[7] + "</td>\n</tr>\n<tr>\n<td colspan=\"2\"><a href=\"" + theportfolio["url"] + "\">monochrome portfolio "
+        portstring += " " + thedecks[7] + "</td>\n</tr>\n<tr>\n<td colspan=\"2\"><a href=\"" + theportfolio["url"] + "\" target=\"_blank\">monochrome portfolio "
         if portnumber < 10:
             portstring += "0" + str(portnumber)
         else:
@@ -1195,7 +1195,7 @@ def printdeck(deck,fold=True):
             deckstring += "  </tr>\n"
         test += 1
     if deck["mastered"]:
-        deckstring += "  <tr>\n    <td colspan=\"5\" align=\"center\"><img src=\""
+        deckstring += "  <tr>\n    <td colspan=\"5\" align=\"center\"><a href=\"https://colors-tcg.eu/viewcards.php?deck=" + deck["name"] + "\" target=\"_blank\"><img src=\""
         if len(variables.subfolder) > 0:
             deckstring += "/" + variables.subfolder
         deckstring += "/decks/" + deck["name"] + "/master.gif\" title=\"mastered " + deck["name"]
@@ -1204,7 +1204,7 @@ def printdeck(deck,fold=True):
                 deckstring += " (first)\" class=\"first"
         except:
             pass
-        deckstring += "\"><td>\n</tr>\n"
+        deckstring += "\"></a><td>\n</tr>\n"
     deckstring += "</tbody>\n</table>\n"
     if fold:
         deckstring += "</details>\n"
@@ -1380,7 +1380,7 @@ def indexgen():
     if variables.name == "Mez":
         content.write("under construction")
     else:
-        content.write("by <a href=\https://tcg.praze.net\">mez</a>")
+        content.write("by <a href=\https://tcg.praze.net\" target=\"_blank\">mez</a>")
     content.write("</li>\n")
     try:
         if len(variables.misclink["text"]) > 0:
@@ -1484,7 +1484,7 @@ def indexgen():
         masteredcount = 0
         for deck in mastereddecks:
             if masteredcount < variables.maxmastered:
-                content.write("<img src=\"")
+                content.write("<a href=\"https://colors-tcg.eu/viewcards.php?deck=" + deck["name"] + "\" target=\"_blank\"><img src=\"")
                 if len(variables.subfolder) > 0:
                     content.write("/" + variables.subfolder)
                 content.write("/decks/" + deck["name"] + "/master.gif\" title=\"mastered " + deck["name"])
@@ -1493,7 +1493,7 @@ def indexgen():
                         content.write(" (first)\" class=\"first")
                 except:
                     pass
-                content.write("\">")
+                content.write("\"></a>")
             masteredcount += 1
         if len(mastereddecks) > variables.maxmastered:
             content.write(" <a href=\"")
@@ -1557,24 +1557,28 @@ def indexgen():
         donations = sorted(donations, key=lambda d: d["name"])
         content.write("<h2>donations</h2>\n<p>")
         for donation in donations:
-            if donation["type"] == "deck":
-                content.write("<img src=\"")
-                if len(variables.subfolder) > 0:
-                    content.write("/" + variables.subfolder)
-                content.write("/decks/" + donation["name"] + "/00.gif\" loading=\"lazy\">")
-            elif donation["type"] == "mastered":
-                content.write("<img src=\"")
-                if len(variables.subfolder) > 0:
-                    content.write("/" + variables.subfolder)
-                content.write("/decks/" + donation["name"] + "/master.gif\" title=\"mastered " + donation["name"])
-                try:
-                    if donation["name"] in variables.firstmasteries:
-                        content.write(" (first)\" class=\"first")
-                except:
-                    pass
-                content.write("\">")
-            elif donation["type"] == "single":
-                content.write(printcard(donation["name"]))
+            content.write("<a href=\"https://colors-tcg.eu/viewcards.php?deck=")
+            if donation["type"] == "single":
+                content.write(donation["name"][:-2] + "\" target=\"_blank\">" + printcard(donation["name"]))
+            else:
+                content.write(donation["name"] + "\" target=\"_blank\">")
+                if donation["type"] == "deck":
+                    content.write("<img src=\"")
+                    if len(variables.subfolder) > 0:
+                        content.write("/" + variables.subfolder)
+                    content.write("/decks/" + donation["name"] + "/00.gif\" loading=\"lazy\">")
+                elif donation["type"] == "mastered":
+                    content.write("<img src=\"")
+                    if len(variables.subfolder) > 0:
+                        content.write("/" + variables.subfolder)
+                    content.write("/decks/" + donation["name"] + "/master.gif\" title=\"mastered " + donation["name"])
+                    try:
+                        if donation["name"] in variables.firstmasteries:
+                            content.write(" (first)\" class=\"first")
+                    except:
+                        pass
+                content.write("\" loading=\"lazy\">")
+            content.write("</a>")
         content.write("</p>\n")
     content.close()
     footerwrite(thefile)
@@ -2287,7 +2291,7 @@ def massseriesgen(series,massindex):
     for deck in decklist:
         if deck["mastered"]:
             if series in deck["mass"] or series in deck["massmaster"]:
-                content.write("<img src=\"")
+                content.write("<a href=\"https://colors-tcg.eu/viewcards.php?deck=" + deck["name"] + "\" target=\"_blank\"><img src=\"")
                 if len(variables.subfolder) > 0:
                     content.write("/" + variables.subfolder)
                 content.write("/decks/" + deck["name"] + "/master.gif\" title=\"mastered " + deck["name"])
@@ -2296,10 +2300,10 @@ def massseriesgen(series,massindex):
                         content.write(" (first)\" class=\"first")
                 except:
                     pass
-                content.write("\">")
+                content.write("\"></a>")
             elif series == "colors universe":
                 if deck["colour"] == "limited":
-                    content.write("<img src=\"")
+                    content.write("<a href=\"https://colors-tcg.eu/viewcards.php?deck=" + deck["name"] + "\" target=\"_blank\"><img src=\"")
                     if len(variables.subfolder) > 0:
                         content.write("/" + variables.subfolder)
                     content.write("/decks/" + deck["name"] + "/master.gif\" title=\"mastered " + deck["name"])
@@ -2308,7 +2312,7 @@ def massseriesgen(series,massindex):
                             content.write(" (first)\" class=\"first")
                     except:
                         pass
-                    content.write("\">")
+                    content.write("\"></a>")
     content.write("</p><p>")
     for card in cardlist:
         if series in card["mass"]:
@@ -2392,7 +2396,7 @@ def tradegen(colour=False):
     content.write("<h1>available for trade</h1>\n" + filterwrite("trade",colour,True,True) + "<p class=\"tradeterms\">")
     if len(variables.tradestatement) > 0:
         content.write(variables.tradestatement + " ")
-    content.write("Trade cards <a href=\"" + variables.tradepost + "\">here</a></p>\n<p><textarea readonly>")
+    content.write("Trade cards <a href=\"" + variables.tradepost + "\" target=\"_blank\">here</a></p>\n<p><textarea readonly>")
     precomma = False
     for card in alltradelist:
         if colour:
@@ -2634,7 +2638,7 @@ def loggen(month=False):
         else:
             admit = True
         if admit == True:
-            content.write("<p><code>" + event["date"].strftime("%Y-%m-%d") + "</code> <a href=\"" + event["url"] + "\">[" + event["name"] + "]</a>: ")
+            content.write("<p><code>" + event["date"].strftime("%Y-%m-%d") + "</code> <a href=\"" + event["url"] + "\" target=\"_blank\">[" + event["name"] + "]</a>: ")
             try:
                 if event["received"]:
                     content.write("Received ")