Improvements
This commit is contained in:
umbreon
parent
af70718d5c
commit
0ccf90ec56
|
|
@ -3,14 +3,17 @@
|
|||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
||||
|
||||
<head>
|
||||
<meta http-equiv="Content-type" content="application/xhtml+xml;charset=utf-8" />
|
||||
<title>Google Chrome — Spyware Watchdog</title>
|
||||
<link rel="stylesheet" href="../style.css" />
|
||||
<meta http-equiv="Content-type" content="application/xhtml+xml;charset=utf-8" />
|
||||
<title>Google Chrome — Spyware Watchdog</title>
|
||||
<link rel="stylesheet" href="../style.css" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="case">
|
||||
<div class="nav"><a href="index.html">← Catalog</a></div>
|
||||
<div class="nav">
|
||||
<a href="index.html">← Catalog</a>
|
||||
</div>
|
||||
|
||||
<div class="main">
|
||||
<img src="../images/chrome_logo.png" alt="Google Chrome's Logo" />
|
||||
<h1>Google Chrome</h1>
|
||||
|
|
@ -48,43 +51,32 @@
|
|||
|
||||
<div class="footer">
|
||||
<hr>
|
||||
<div class="futher">
|
||||
<h4>Further Reading:</h4>
|
||||
<ol>
|
||||
<ul>
|
||||
<li><a href="https://stallman.org/google.html">Reasons to not use google</a> <a href="https://web.archive.org/web/20180512214729/http://stallman.org/google.html">[web.archive.org]</a> <a href="http://archive.is/20170929072403/https://stallman.org/google.html">[archive.is]</a></li>
|
||||
<li><a href="https://8ch.net/tech/chrome.html">Welcome to the Botnet. Or, The Case Against Google Chrome</a> <a href="https://web.archive.org/web/20150501010435/https://8ch.net/tech/chrome.html">[web.archive.org]</a> <a href="http://archive.is/OR4dz">[archive.is]</a></li>
|
||||
</ul>
|
||||
</ol>
|
||||
</div><hr>
|
||||
<div class="sources">
|
||||
<h4>Sources:</h4>
|
||||
<ol><li id="source1">
|
||||
<p><a href="https://www.google.com/chrome/browser/privacy/index.html">Google Chrome Privacy Notice</a> <a href="http://web.archive.org/web/20180427041202/https://www.google.com/chrome/browser/privacy/index.html">[web.archive.org]</a> <a href="https://archive.is/GJIKw">[archive.is]</a></p>
|
||||
</li><li id="source2">
|
||||
<p><a href="https://payments.google.com/payments/apis-secure/get_legal_document?ldo=0&ldt=privacynotice">Google Payments Privacy Notice</a> <a href="https://web.archive.org/web/20180514095832/https://payments.google.com/payments/apis-secure/get_legal_document?ldo=0&ldt=privacynotice">[web.archive.org]</a></p>
|
||||
</li><li id="source3">
|
||||
<p><a href="http://www.favbrowser.com/google-chrome-spyware-confirmed/">Google Chrome – Spyware? Confirmed?</a> <a href="https://web.archive.org/web/20180410043922/http://www.favbrowser.com/google-chrome-spyware-confirmed/">[web.archive.org]</a> <a href="https://archive.li/jxCPf">[archive.li]</a></p>
|
||||
</li><li id="source4">
|
||||
<p><a href="https://jischinger.wordpress.com/2008/11/16/google-chrome-a-keylogger-privacy-concerns/">Google Chrome a Keylogger – Privacy Concerns</a> <a href="https://web.archive.org/web/20180410043922/https://jischinger.wordpress.com/2008/11/16/google-chrome-a-keylogger-privacy-concerns/">[web.archive.org]</a> <a href="https://archive.li/HclxK">[archive.li]</a></p>
|
||||
</li><li id="source5">
|
||||
<p><a href="https://families.google.com/familylink/privacy/child-policy/">Privacy Notice for Google Accounts Managed with Family Link (“Privacy Notice”)</a> <a href="https://web.archive.org/web/20180524142231/https://families.google.com/familylink/privacy/child-policy/">[web.archive.org]</a> <a href="https://archive.li/3ncnz">[archive.li]</a></p>
|
||||
</li></ol>
|
||||
</div><hr>
|
||||
<b>This article was created on 0000.00.00</b></br>
|
||||
<b>This article was last modified on 2018.12.12</b></br>
|
||||
<b>This article is made for version 1337 of the software</b>
|
||||
<div class="futher">
|
||||
<h4>Further Reading:</h4>
|
||||
<ul>
|
||||
<li><a href="https://stallman.org/google.html">Reasons to not use google</a> <a href="https://web.archive.org/web/20180512214729/http://stallman.org/google.html">[web.archive.org]</a> <a href="http://archive.is/20170929072403/https://stallman.org/google.html">[archive.is]</a></li>
|
||||
<li><a href="https://8ch.net/tech/chrome.html">Welcome to the Botnet. Or, The Case Against Google Chrome</a> <a href="https://web.archive.org/web/20150501010435/https://8ch.net/tech/chrome.html">[web.archive.org]</a> <a href="http://archive.is/OR4dz">[archive.is]</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<hr>
|
||||
<p>
|
||||
If you want to edit this article, or contribute your own article(s), visit us at the git repo on
|
||||
<a href="https://codeberg.org/shadow/SpywareWatchdog">Codeberg</a>.
|
||||
</p>
|
||||
<p>
|
||||
All contributions must be licensed under the CC0 license to be accepted.
|
||||
</p>
|
||||
<a href="../LICENSE.txt">
|
||||
<img class="icon" src="../images/cc0.png" alt="CC0 License" />
|
||||
</a>
|
||||
<div class="sources">
|
||||
<h4>Sources:</h4>
|
||||
<ol>
|
||||
<li id="source1"><p><a href="https://www.google.com/chrome/browser/privacy/index.html">Google Chrome Privacy Notice</a> <a href="http://web.archive.org/web/20180427041202/https://www.google.com/chrome/browser/privacy/index.html">[web.archive.org]</a> <a href="https://archive.is/GJIKw">[archive.is]</a></p></li>
|
||||
<li id="source2"><p><a href="https://payments.google.com/payments/apis-secure/get_legal_document?ldo=0&ldt=privacynotice">Google Payments Privacy Notice</a> <a href="https://web.archive.org/web/20180514095832/https://payments.google.com/payments/apis-secure/get_legal_document?ldo=0&ldt=privacynotice">[web.archive.org]</a></p></li>
|
||||
<li id="source3"><p><a href="http://www.favbrowser.com/google-chrome-spyware-confirmed/">Google Chrome – Spyware? Confirmed?</a> <a href="https://web.archive.org/web/20180410043922/http://www.favbrowser.com/google-chrome-spyware-confirmed/">[web.archive.org]</a> <a href="https://archive.li/jxCPf">[archive.li]</a></p></li>
|
||||
<li id="source4"><p><a href="https://jischinger.wordpress.com/2008/11/16/google-chrome-a-keylogger-privacy-concerns/">Google Chrome a Keylogger – Privacy Concerns</a> <a href="https://web.archive.org/web/20180410043922/https://jischinger.wordpress.com/2008/11/16/google-chrome-a-keylogger-privacy-concerns/">[web.archive.org]</a> <a href="https://archive.li/HclxK">[archive.li]</a></p></li>
|
||||
<li id="source5"><p><a href="https://families.google.com/familylink/privacy/child-policy/">Privacy Notice for Google Accounts Managed with Family Link (“Privacy Notice”)</a> <a href="https://web.archive.org/web/20180524142231/https://families.google.com/familylink/privacy/child-policy/">[web.archive.org]</a> <a href="https://archive.li/3ncnz">[archive.li]</a></p></li>
|
||||
</ol>
|
||||
</div>
|
||||
<hr>
|
||||
<b>This article was created on 0000.00.00</b></br>
|
||||
<b>This article was last modified on 2018.12.12</b></br>
|
||||
<b>This article is made for version 1337 of the software</b>
|
||||
<hr>
|
||||
<p>If you want to edit this article, or contribute your own article(s), visit us at the git repo on <a href="https://codeberg.org/shadow/SpywareWatchdog">Codeberg</a>.</p>
|
||||
<p>All contributions must be licensed under the CC0 license to be accepted.</p>
|
||||
<a href="../LICENSE.txt"><img class="icon" src="../images/cc0.png" alt="CC0 License" /></a>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,17 @@ MAIN_HTML = """
|
|||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
||||
|
||||
<head>
|
||||
<meta http-equiv="Content-type" content="application/xhtml+xml;charset=utf-8" />
|
||||
<title>{title} — Spyware Watchdog</title>
|
||||
<link rel="stylesheet" href="../style.css" />
|
||||
<meta http-equiv="Content-type" content="application/xhtml+xml;charset=utf-8" />
|
||||
<title>{title} — Spyware Watchdog</title>
|
||||
<link rel="stylesheet" href="../style.css" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="case">
|
||||
<div class="nav"><a href="index.html">← Catalog</a></div>
|
||||
<div class="nav">
|
||||
<a href="index.html">← Catalog</a>
|
||||
</div>
|
||||
|
||||
<div class="main">
|
||||
<img src="../images/{fileName}_logo.png" alt="{title}'s Logo" />
|
||||
<h1>{title}</h1>
|
||||
|
|
@ -26,16 +29,9 @@ MAIN_HTML = """
|
|||
<div class="footer">
|
||||
{footer}
|
||||
<hr>
|
||||
<p>
|
||||
If you want to edit this article, or contribute your own article(s), visit us at the git repo on
|
||||
<a href="https://codeberg.org/shadow/SpywareWatchdog">Codeberg</a>.
|
||||
</p>
|
||||
<p>
|
||||
All contributions must be licensed under the CC0 license to be accepted.
|
||||
</p>
|
||||
<a href="../LICENSE.txt">
|
||||
<img class="icon" src="../images/cc0.png" alt="CC0 License" />
|
||||
</a>
|
||||
<p>If you want to edit this article, or contribute your own article(s), visit us at the git repo on <a href="https://codeberg.org/shadow/SpywareWatchdog">Codeberg</a>.</p>
|
||||
<p>All contributions must be licensed under the CC0 license to be accepted.</p>
|
||||
<a href="../LICENSE.txt"><img class="icon" src="../images/cc0.png" alt="CC0 License" /></a>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
@ -63,43 +59,39 @@ def convertMarkdown(inputStr, fileName):
|
|||
footer = ""
|
||||
|
||||
# Futher reading
|
||||
furtherFooter = """<hr>
|
||||
footer += """<hr>
|
||||
<div class="futher">
|
||||
<h4>Further Reading:</h4>
|
||||
{content}
|
||||
</div>""".format(content = md.convert(further))
|
||||
|
||||
footer += furtherFooter
|
||||
<h4>Further Reading:</h4>
|
||||
{further}
|
||||
</div>
|
||||
""".format(further = md.convert(further).replace("\n","\n\t")).replace("\n", "\n\t\t\t")
|
||||
|
||||
# Sources
|
||||
sourceFooter = """<hr>
|
||||
<div class="sources">
|
||||
<h4>Sources:</h4>
|
||||
<ol>"""
|
||||
a = ""
|
||||
for i in sources.split("\n"):
|
||||
if i != "":
|
||||
result = re.match(r"(\d+)\. (.+)", i)
|
||||
sourceFooter += """<li id="source{number}">
|
||||
{content}
|
||||
</li>""".format(
|
||||
a += """\n<li id="source{number}">{content}</li>""".format(
|
||||
number = result.group(1),
|
||||
content = md.convert(result.group(2))
|
||||
)
|
||||
sourceFooter += """</ol>
|
||||
</div>"""
|
||||
footer += sourceFooter
|
||||
).replace("\n", "\n\t\t")
|
||||
|
||||
footer += f"""<hr>
|
||||
<div class="sources">
|
||||
<h4>Sources:</h4>
|
||||
<ol>{a}
|
||||
</ol>
|
||||
</div>
|
||||
""".replace("\n", "\n\t\t\t")
|
||||
|
||||
# dates
|
||||
footer += """<hr>
|
||||
footer += f"""<hr>
|
||||
<b>This article was created on {created}</b></br>
|
||||
<b>This article was last modified on {modified}</b></br>
|
||||
<b>This article is made for version {version} of the software</b>""".format(
|
||||
created = created,
|
||||
modified = modified,
|
||||
version = version
|
||||
)
|
||||
<b>This article is made for version {version} of the software</b>""".replace("\n", "\n\t\t\t")
|
||||
|
||||
# The .replace is used below to make sure indentation is consistent
|
||||
# This is not required but makes debugging a little easier.
|
||||
return MAIN_HTML.format(
|
||||
title = title,
|
||||
fileName = fileName,
|
||||
|
|
|
|||
Loading…
Reference in New Issue