Change ratings terminology, better emoji support

1 year ago · d1003797f2
parent ca2c0e6909
commit d1003797f2
5 changed files with 11 additions and 11 deletions
--- a/build/archive.css
+++ b/build/archive.css
@ -9,7 +9,7 @@ body {
  background: rgb(185,106,106);
  background: radial-gradient(circle, rgba(185,106,106,1) 0%, rgba(236,197,197,1) 100%);
  background-attachment: fixed;
-  font-family: "Merriweather", serif;
+  font-family: "Merriweather", serif, "Noto Color Emoji";
 }

 body, a, a:visited {
--- a/feed.py
+++ b/feed.py
@ -108,9 +108,9 @@ def feedgen(local=False):
                        except:
                            pass
                    if origread.rating == "g":
-                        therating = "G"
+                        therating = "U"
                    elif origread.rating == "t":
-                        therating = "T"
+                        therating = "G+"
                    elif origread.rating == "m":
                        therating = "M"
                    elif origread.rating == "e":
@ -142,9 +142,9 @@ def feedgen(local=False):
                        except:
                            pass
                    if thefile.rating == "g":
-                        therating = "G"
+                        therating = "U"
                    elif thefile.rating == "t":
-                        therating = "T"
+                        therating = "G+"
                    elif thefile.rating == "m":
                        therating = "M"
                    elif thefile.rating == "e":
--- a/headerfooter.py
+++ b/headerfooter.py
@ -5,7 +5,7 @@ def headerwrite(output,title,headerone,desc,main=False,local=False):
        header.write("/home/mdd/Documents/drive/proj/fic-archive/build/")
    else:
        header.write("/fic/")
-    header.write("archive.css\">\n<link rel=\"preconnect\" href=\"https://fonts.googleapis.com\">\n<link rel=\"preconnect\" href=\"https://fonts.gstatic.com\" crossorigin>\n<link href=\"https://fonts.googleapis.com/css2?family=Hubballi&family=Lato:wght@400;700&family=Merriweather:wght@400;700&display=swap\" rel=\"stylesheet\">\n<link rel=\"me\" href=\"https://ple.praze.net/users/tre\">\n<title>" + title + "</title>\n<noscript>\n<style>.jsonly{display:none;}</style>\n</noscript>\n</head>\n<body>\n<div id=\"content\">\n<div id=\"inside\">\n<noscript>\n<div id=\"warning\">\n<p><b>Warning:</b> this part of my site is <b>18+</b>. Fics contain NSFW material and mature themes (death, suicide, mental illness, incest …). Browse at your own risk.</p>\n</div>\n</noscript>\n<h1>" + headerone + "</h1>\n" + desc + "\n")
+    header.write("archive.css\">\n<link rel=\"preconnect\" href=\"https://fonts.googleapis.com\">\n<link rel=\"preconnect\" href=\"https://fonts.gstatic.com\" crossorigin>\n<link href=\"https://fonts.googleapis.com/css2?family=Hubballi&family=Lato:wght@400;700&family=Merriweather:wght@400;700&family=Noto+Color+Emoji&display=swap\" rel=\"stylesheet\">\n<link rel=\"me\" href=\"https://ple.praze.net/users/tre\">\n<title>" + title + "</title>\n<noscript>\n<style>.jsonly{display:none;}</style>\n</noscript>\n</head>\n<body>\n<div id=\"content\">\n<div id=\"inside\">\n<noscript>\n<div id=\"warning\">\n<p><b>Warning:</b> this part of my site is <b>18+</b>. Fics contain NSFW material and mature themes (death, suicide, mental illness, incest …). Browse at your own risk.</p>\n</div>\n</noscript>\n<h1>" + headerone + "</h1>\n" + desc + "\n")
    if not main:
        header.write("<p>\n<a href=\"")
        if local:
--- a/makeheader.py
+++ b/makeheader.py
@ -356,9 +356,9 @@ def ficgen(ficno,unique=False,output="output.html",local=False):
        # write rating
        filewrite.write("</li>\n<li class=\"rating\"><i>Rating: </i><span class=\"" + fileread.rating + "\">")
        if fileread.rating == "g":
-            filewrite.write("general")
+            filewrite.write("universal")
        elif fileread.rating == "t":
-            filewrite.write("teen")
+            filewrite.write("general")
        elif fileread.rating == "m":
            filewrite.write("mature")
        elif fileread.rating == "e":
--- a/statsgen.py
+++ b/statsgen.py
@ -187,13 +187,13 @@ def ficsum(ficcount,year,month=0,showfandom=True,local=False):
            ficstring += language
        ficstring += "</a>"
        if rating == "g":
-            ficstring += "&nbsp;<span style=\"background-color:#8ab60b;color:white; font-family:serif\">&nbsp;G&nbsp;</span>"
+            ficstring += "&nbsp;<span style=\"background-color:#8ab60b;color:white; font-family:serif\">&nbsp;U&nbsp;</span>"
        elif rating == "t":
-            ficstring += "&nbsp;<span style=\"background-color:#e8d405;color:white; font-family:serif\">&nbsp;T&nbsp;</span>"
+            ficstring += "&nbsp;<span style=\"background-color:#e8d405;color:white; font-family:serif\">&nbsp;G&nbsp;</span>"
        elif rating == "m":
            ficstring += "&nbsp;<span style=\"background-color:#eb7d10;color:white; font-family:serif\">&nbsp;M&nbsp;</span>"
        elif rating == "e":
-            ficstring += "&nbsp;<span style=\"background-color:#9c0000;color:white; font-family:serif\">&nbsp;E&nbsp;</span>"
+            ficstring += "&nbsp;<span style=\"background-color:#9c0000;color:white; font-family:serif\">&nbsp;X&nbsp;</span>"
        for thegenre in genre:
            if thegenre == "gen":
                ficstring += "&nbsp;<span style=\"background-color:#8ab60b;color:white; font-family:serif\">&nbsp;☉&nbsp;</span>"