diff --git a/README.org b/README.org index d24d4e7..bff5875 100644 --- a/README.org +++ b/README.org @@ -54,6 +54,7 @@ Python scripts to generate a mobile-friendly static site for tracking tcg cards - =maxmastered=: maximum number of most recently mastered decks to show on the index page - =firstmasteries=: a list of decks you mastered first - =misclink=: under ="link"=, a link to any page you choose, and under ~"text"~, text to display as the link + - =newtab=: whether links to external sites should open in new tabs - =donations= : lists of donated decks and individual scrapbook cards - =masscollect=: list (python dict) of series/themes being mass collected, each containing at least one of ="series"= specifying a list of series from the online decklist, ="decks"= specifying a list of decks, or ="singles"= specifying a list of individual cards - =anniversary= : list of current anniversary decks diff --git a/colors.py b/colors.py index bba8cbb..f813a39 100644 --- a/colors.py +++ b/colors.py @@ -772,7 +772,43 @@ def headerwrite(thefile,pagename): if len(variables.subfolder) > 0: header.write("/" + variables.subfolder) header.write("/log\">log") - header.write("\n
  • trade post @ dw
  • \n
  • \n service links\n \n
    \n
  • \n \n \n
    \n") + header.write("\n
  • trade post @ dw
  • \n
  • \n service links\n \n
    \n
  • \n \n \n
    \n") if variables.hiatus: header.write("
    \n

    hiatus

    \n

    ") if type(variables.hiatus) == str: @@ -1021,7 +1057,10 @@ def portfoliogen(theportfolio,thetype,portnumber): portstring += "□" break portstring += " " + specialdeck - portstring += "\n\n\npalette portfolio " + portstring += "\n\n\n\n\n\nmonochrome portfolio " + portstring += " " + thedecks[7] + "\n\n\n 0: deckstring += "/" + variables.subfolder deckstring += "/decks/" + deck["name"] + "/master.gif\" title=\"mastered " + deck["name"] @@ -1283,7 +1328,10 @@ def indexgen(): content.write("/" + variables.subfolder) content.write("/decks/sigs/" + variables.name.lower() + ".gif\" loading=\"lazy\">") if variables.banner: - content.write(" 0: content.write("/" + variables.subfolder) content.write("/assets/banner.png\" loading=\"lazy\">") @@ -1411,11 +1459,17 @@ def indexgen(): if tradepend > 1: content.write("s") content.write(" held for trades\n") - content.write("

  • started " + firstdate.strftime("%Y-%m-%d") + "
  • \n
  • last updated " + datetime.datetime.now().strftime("%Y-%m-%d") + "
  • \n
  • code ") + content.write("
  • started " + firstdate.strftime("%Y-%m-%d") + "
  • \n
  • last updated " + datetime.datetime.now().strftime("%Y-%m-%d") + "
  • \n
  • code ") if variables.name == "Mez": content.write("under construction") else: - content.write("by mez") + content.write("by mez") content.write("
  • \n") try: if len(variables.misclink["text"]) > 0: @@ -1519,7 +1573,10 @@ def indexgen(): masteredcount = 0 for deck in mastereddecks: if masteredcount < variables.maxmastered: - content.write(" 0: content.write("/" + variables.subfolder) content.write("/decks/" + deck["name"] + "/master.gif\" title=\"mastered " + deck["name"]) @@ -1553,7 +1610,10 @@ def indexgen(): else: memberlink = False if memberlink: - content.write("") + content.write("") content.write(printcard(card)) if memberlink: content.write("") @@ -1568,7 +1628,10 @@ def indexgen(): content.write("

    coupons

    \n

    ") for coupon in coupons: if coupons[coupon]["count"] > 0: - content.write("") + content.write("") content.write(" 0: content.write("/" + variables.subfolder) @@ -1610,9 +1673,15 @@ def indexgen(): for donation in donations: content.write("" + printcard(donation["name"])) + content.write(donation["name"][:-2] + "\"") + if variables.newtab: + content.write(" target=\"_blank\"") + content.write(">" + printcard(donation["name"])) else: - content.write(donation["name"] + "\" target=\"_blank\">") + content.write(donation["name"] + "\"") + if variables.newtab: + content.write(" target=\"_blank\"") + content.write(">") if donation["type"] == "deck": content.write(" 0: @@ -2342,7 +2411,10 @@ def massseriesgen(series,massindex): for deck in decklist: if deck["mastered"]: if series in deck["mass"] or series in deck["massmaster"]: - content.write(" 0: content.write("/" + variables.subfolder) content.write("/decks/" + deck["name"] + "/master.gif\" title=\"mastered " + deck["name"]) @@ -2354,7 +2426,10 @@ def massseriesgen(series,massindex): content.write("\">") elif series == "colors universe": if deck["colour"] == "limited": - content.write(" 0: content.write("/" + variables.subfolder) content.write("/decks/" + deck["name"] + "/master.gif\" title=\"mastered " + deck["name"]) @@ -2447,7 +2522,10 @@ def tradegen(colour=False): content.write("

    available for trade

    \n" + filterwrite("trade",colour,True,True) + "

    ") if len(variables.tradestatement) > 0: content.write(variables.tradestatement + " ") - content.write("Trade cards here

    \n