Merge branch 'markqvist:main' into main

This commit is contained in:
Swissbandit 2022-11-14 22:43:27 +01:00 committed by GitHub
commit d4415aafc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 127 additions and 31 deletions

View File

@ -10,8 +10,8 @@ website:
python ./build.py
cp assets/css/* build/css/
cp assets/gfx/* build/gfx/
cp -rv ../../Reticulum/docs/manual/* build/manual/
cp -rv ../../Reticulum/docs/Reticulum\ Manual.pdf build/manual/
cp -r ../../Reticulum/docs/manual/* build/manual/
cp -r ../../Reticulum/docs/Reticulum\ Manual.pdf build/manual/
upload:
. ./build.env; \

View File

@ -28,6 +28,14 @@
--select-arrow: url("data:image/svg+xml;charset=utf-8,%3C?xml version='1.0' encoding='utf-8'?%3E %3Csvg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' height='62.5' width='116.9' fill='%23161f27'%3E %3Cpath d='M115.3,1.6 C113.7,0 111.1,0 109.5,1.6 L58.5,52.7 L7.4,1.6 C5.8,0 3.2,0 1.6,1.6 C0,3.2 0,5.8 1.6,7.4 L55.5,61.3 C56.3,62.1 57.3,62.5 58.4,62.5 C59.4,62.5 60.5,62.1 61.3,61.3 L115.2,7.4 C116.9,5.8 116.9,3.2 115.3,1.6Z'/%3E %3C/svg%3E");
}
div.top_menu {
font-size: 1.1em;
}
div.lang_menu {
margin-bottom: 0.35em;
}
@media (prefers-color-scheme: dark) {
:root {
--background-body: #202b38;

View File

@ -10,7 +10,7 @@ document_start = """
<!doctype html>
<html>
<head>
<link rel="stylesheet" href="css/water.css?v=1">
<link rel="stylesheet" href="css/water.css?v=3">
<meta charset="utf-8"/>
<title>Reticulum Network</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -23,9 +23,79 @@ document_end = """
</html>
"""
menu_md = """
<center>[Reticulum](index.html) | [Start](start.html) | [Hardware](hardware.html) | [Testnet](connect.html) | [Manual](docs.html) | [Crypto](crypto.html) | [Credits](credits.html) | [Source](https://github.com/markqvist/reticulum) | [Donate](donate.html)</center>
"""
langs_md = """<div class="top_menu lang_menu">{LANGS}</div>"""
menu_md = """<div class="top_menu">[{RETICULUM}](index{LANG_EXT}.html) | [{START}](start{LANG_EXT}.html) | [{HARDWARE}](hardware{LANG_EXT}.html) | [{TESTNET}](connect{LANG_EXT}.html) | [{MANUAL}](docs{LANG_EXT}.html) | [{CRYPTO}](crypto{LANG_EXT}.html) | [{CREDITS}](credits{LANG_EXT}.html) | [{SOURCE}](https://github.com/markqvist/reticulum) | [{DONATE}](donate{LANG_EXT}.html)</div>"""
primary_lang = "en"
langs = [
{"name": "English", "ext": "en"},
{"name": "Português", "ext": "pt-br"},
]
menu_translations = {
"en": {
"RETICULUM": "Reticulum",
"START": "Start",
"HARDWARE": "Hardware",
"TESTNET": "Testnet",
"MANUAL": "Manual",
"CRYPTO": "Crypto",
"CREDITS": "Credits",
"SOURCE": "Source",
"DONATE": "Donate",
},
"pt-br": {
"RETICULUM": "Reticulum",
"START": "Começar",
"HARDWARE": "Hardware",
"TESTNET": "Rede de Teste",
"MANUAL": "Manual",
"CRYPTO": "Cripto",
"CREDITS": "Créditos",
"SOURCE": "Código",
"DONATE": "Ajude",
}
}
def get_page_lang(page):
page_lang = primary_lang
for lang in langs:
base_name = mdf.replace(".md", "")
if lang["ext"] != primary_lang:
if base_name.endswith(lang["ext"]):
page_lang = lang["ext"]
return page_lang
def get_languages_md(page):
page = page.replace(SOURCES_PATH, ".")
current_page_lang = get_page_lang(page)
if current_page_lang != primary_lang:
page_base_name = page.replace("_"+current_page_lang+".md", "")
else:
page_base_name = page.replace(".md", "")
lang_list = ""
for lang_entry in langs:
lang = lang_entry["name"]
lang_ext = lang_entry["ext"]
if lang_ext != primary_lang:
lang_ext_str = "_"+lang_ext
else:
lang_ext_str = ""
link_target = page_base_name+lang_ext_str+".html"
link_md = "["+lang+"]("+link_target+") | "
lang_list += link_md
return langs_md.replace("{LANGS}", lang_list[:-3])
def get_menu_md(lang):
local_menu_md = menu_md
for entry in menu_translations[lang]:
local_menu_md = local_menu_md.replace("{"+entry+"}", menu_translations[lang][entry])
return local_menu_md
def scan_pages(base_path):
files = [file for file in os.listdir(base_path) if os.path.isfile(os.path.join(base_path, file)) and file[:1] != "."]
@ -46,8 +116,16 @@ source_files = scan_pages(SOURCES_PATH)
for mdf in source_files:
with open(mdf, "rb") as f:
page_lang = get_page_lang(mdf)
if page_lang != primary_lang:
page_lang_ext = "_"+page_lang
else:
page_lang_ext = ""
md = f.read().decode(INPUT_ENCODING)
html = markdown.markdown(menu_md + md, extensions=["markdown.extensions.fenced_code"])
page_md = "<center>"+get_languages_md(mdf)+""+get_menu_md(page_lang).replace("{LANG_EXT}", page_lang_ext) + "</center>\n\n" + md
html = markdown.markdown(page_md, extensions=["markdown.extensions.fenced_code"])
html = document_start + html + document_end
of = BUILD_PATH+mdf.replace(SOURCES_PATH, "").replace(".md", ".html")

View File

@ -1,15 +1,20 @@
## Support Reticulum
You can help support the continued development of open, free and private communications systems by donating via one of the following channels:
**Monero**
```
84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
```
**Ethereum**
```
0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
```
**Bitcoin**
```
3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
```
- Monero<br/>
```
84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
```
<br/><br/>
- Ethereum<br/>
```
0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
```
<br/><br/>
- Bitcoin<br/>
```
3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
```
<br/><br/>
- Ko-Fi<br/>
<a href="https://ko-fi.com/markqvist">`https://ko-fi.com/markqvist`</a>

View File

@ -1,15 +1,20 @@
## Ajude o Reticulum
Você pode ajudar na continuação do desenvolvimento de sistemas de comunicação abertos, livres e privados, doando através de um dos seguintes canais:
**Monero**
```
84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
```
**Ethereum**
```
0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
```
**Bitcoin**
```
3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
```
- Monero<br/>
```
84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
```
<br/><br/>
- Ethereum<br/>
```
0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
```
<br/><br/>
- Bitcoin<br/>
```
3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
```
<br/><br/>
- Ko-Fi<br/>
<a href="https://ko-fi.com/markqvist">`https://ko-fi.com/markqvist`</a>