`;
const initMenu = () => {
@@ -94,18 +186,18 @@
const start = () => {
const header = document.querySelector('[data-interimm-header]');
const footer = document.querySelector('[data-interimm-footer]');
- if (!header && !footer) { initMenu(); return; }
+ if (!header && !footer) { initMenu(); startSignal(); return; }
const host = header || footer;
const lang = host.dataset.lang || (document.documentElement.lang.toLowerCase().startsWith('zh') ? 'cn' : 'en');
fetch(new URL(`nav.${lang}.json`, base))
.then((r) => { if (!r.ok) throw new Error(r.status); return r.json(); })
.then((nav) => {
- if (header) header.innerHTML = renderHeader(nav, header.dataset.current);
+ if (header) header.innerHTML = renderHeader(header, nav, header.dataset.current);
if (footer) footer.innerHTML = renderFooter(nav);
})
.catch(() => { /* keep the page's own fallback markup */ })
- .finally(initMenu);
+ .finally(() => { initMenu(); startSignal(); });
};
if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', start);
diff --git a/content/cn/cities/mars/isidis-procyon.md b/content/cn/cities/mars/isidis-procyon.md
index 6b2ea6b..221ade8 100644
--- a/content/cn/cities/mars/isidis-procyon.md
+++ b/content/cn/cities/mars/isidis-procyon.md
@@ -1,32 +1,38 @@
---
title: 南河城
description: 南河城是位于火星伊希地的一座重要城市
+images:
+ - /images/cities/isidis-procyon-3d.jpg
+# City id in the 3D explorer (cities.interimm.org) and city name in Mars Open Facilities
+explorer: isidis-procyon
+facility_city: Procyon City
tags:
- 2123
- 服务业
map:
- image: https://raw.githubusercontent.com/InterImm/martian-cities/master/city-plan/isidis-procyon/isidis-city-procyon.jpg
- width: 943
- height: 761
+ # Drawn from the 3D model with scripts/city-plan.js
+ image: /images/cities/isidis-procyon-plan.png
+ width: 2400
+ height: 1828
alt: 南河城平面图
# position is [y, x] in image pixels, measured from the bottom-left corner
markers:
- name: InterImm Building
description: Interplanetary Immigration Center
link: https://interimm.org
- position: [381, 439]
+ position: [915, 1120]
- name: 星移农业技术有限公司 - InterImm Agriculture
description: 星移农业最初是星际移民中心下属的一个非盈利科研机构,由美国NASA和中国航空三院联合建立,依托于中国科学院成都生物所。随后该机构相继将多项关键技术工程化,并成功在火星一期基地建设期间建成火星农业实验室和火星第一农业基地。该机构随后成立公司,并在成都和火星设立双总部。
link: https://interimm.org/hub/companies/company-1518927000293/
- position: [718, 456]
+ position: [1683, 1162]
- name: 黄昏星-The evening star
description: 时属杨家的私人家族企业,其创始人为距今100年前的海斯帕小姐。该企曾成功打击多个太空走私集团头目并向世人揭露出太空走私者联盟内部交易的黑幕,同时致力于太空大盗的追捕行动。与打击太空犯罪局为长期友好合作关系。
link: https://interimm.org/hub/companies/company-vgwsng7isbcuh2kzbrao1vgwsng74w79/
- position: [431, 21]
+ position: [1029, 98]
- name: 俊哲宇宙文化传媒公司-火星工作室
description: 本工作室直属于俊哲宇宙文化传媒公司地球总部,是探索外太空文化娱乐传媒范式的先锋组织,也是进行星际文化交流的排头兵。
link: https://interimm.org/hub/companies/company-ypfbogrqi22962fbooypfbe0yhohcabn/
- position: [423.5, 334]
+ position: [1012, 864]
---
{{< imagemap >}}
@@ -37,6 +43,4 @@ map:
目前建设情况可以参考下面的3D模型。可以在我们的 GitHub 创建新的 [Issues](https://github.com/InterImm/martian-cities/issues/2) 来提出你的建筑或者地标设想,并且命名。
-{{< rawhtml >}}
-
-{{< /rawhtml >}}
+{{< city3d >}}
diff --git a/content/cn/project.md b/content/cn/project.md
new file mode 100644
index 0000000..5d2756c
--- /dev/null
+++ b/content/cn/project.md
@@ -0,0 +1,18 @@
+---
+title: 关于这个项目
+description: InterImm 是一个开源的硬科幻与科普项目。星际移民中心是它虚构的机构,背后的科学是真实的。
+---
+
+InterImm 构想了星际移民中心:一个帮助人类在火星上建设生活的机构,并用真实的科学构建这个世界,包括火星时间、行星之间的通信延时、转移轨道和城市规划。本站其他页面都以星际移民中心的口吻讲述,只有这一页代表项目本身。
+
+这里的一切都是开放的。故事、档案、计算工具和这个网站,都是 [GitHub 上 InterImm 组织](https://github.com/InterImm)中的公开仓库。任何人都可以为火星城市设计一座建筑、修正一项计算,或者为[星际移民之书](https://book.interimm.org/)撰写一章。
+
+## 项目的起源
+
+项目源于星际圆桌:2014 年至 2018 年间举办的 20 期关于星际文明的在线讨论。讨论记录仍保存在 [GitHub](https://github.com/InterImm/roundTable/issues/4) 上。
+
+## 参与方式
+
+- 在任意 [InterImm 仓库](https://github.com/InterImm)中提交 Issue 或 Pull Request。
+- 为[南河城](/cities/mars/isidis-procyon/)提议一座地标建筑。
+- 写信至 [admin@interimm.org](mailto:admin@interimm.org)。
diff --git a/content/en/cities/mars/isidis-procyon.md b/content/en/cities/mars/isidis-procyon.md
index 2e7292d..5ea28df 100644
--- a/content/en/cities/mars/isidis-procyon.md
+++ b/content/en/cities/mars/isidis-procyon.md
@@ -1,32 +1,38 @@
---
title: 南河城
description: 南河城是位于火星依希地的一座重要城市
+images:
+ - /images/cities/isidis-procyon-3d.jpg
+# City id in the 3D explorer (cities.interimm.org) and city name in Mars Open Facilities
+explorer: isidis-procyon
+facility_city: Procyon City
tags:
- 2123
- 服务业
map:
- image: https://raw.githubusercontent.com/InterImm/martian-cities/master/city-plan/isidis-procyon/isidis-city-procyon.jpg
- width: 943
- height: 761
+ # Drawn from the 3D model with scripts/city-plan.js
+ image: /images/cities/isidis-procyon-plan.png
+ width: 2400
+ height: 1828
alt: 南河城平面图
# position is [y, x] in image pixels, measured from the bottom-left corner
markers:
- name: InterImm Building
description: Interplanetary Immigration Center
link: https://interimm.org
- position: [381, 439]
+ position: [915, 1120]
- name: 星移农业技术有限公司 - InterImm Agriculture
description: 星移农业最初是星际移民中心下属的一个非盈利科研机构,由美国NASA和中国航空三院联合建立,依托于中国科学院成都生物所。随后该机构相继将多项关键技术工程化,并成功在火星一期基地建设期间建成火星农业实验室和火星第一农业基地。该机构随后成立公司,并在成都和火星设立双总部。
link: https://interimm.org/hub/companies/company-1518927000293/
- position: [718, 456]
+ position: [1683, 1162]
- name: 黄昏星-The evening star
description: 时属杨家的私人家族企业,其创始人为距今100年前的海斯帕小姐。该企曾成功打击多个太空走私集团头目并向世人揭露出太空走私者联盟内部交易的黑幕,同时致力于太空大盗的追捕行动。与打击太空犯罪局为长期友好合作关系。
link: https://interimm.org/hub/companies/company-vgwsng7isbcuh2kzbrao1vgwsng74w79/
- position: [431, 21]
+ position: [1029, 98]
- name: 俊哲宇宙文化传媒公司-火星工作室
description: 本工作室直属于俊哲宇宙文化传媒公司地球总部,是探索外太空文化娱乐传媒范式的先锋组织,也是进行星际文化交流的排头兵。
link: https://interimm.org/hub/companies/company-ypfbogrqi22962fbooypfbe0yhohcabn/
- position: [423.5, 334]
+ position: [1012, 864]
---
{{< imagemap >}}
@@ -37,6 +43,4 @@ map:
目前建设情况可以参考下面的3D模型。可以在我们的 GitHub 创建新的 [Issues](https://github.com/InterImm/martian-cities/issues/2) 来提出你的建筑或者地标设想,并且命名。
-{{< rawhtml >}}
-
-{{< /rawhtml >}}
+{{< city3d >}}
diff --git a/content/en/project.md b/content/en/project.md
new file mode 100644
index 0000000..a02c8ce
--- /dev/null
+++ b/content/en/project.md
@@ -0,0 +1,18 @@
+---
+title: About the project
+description: InterImm is an open-source science and science-fiction project. The Interplanetary Immigration Center is its fictional institution; the science behind it is real.
+---
+
+InterImm imagines the Interplanetary Immigration Center, an institution that helps people build a life on Mars, and builds its world with real science: Mars time, signal delay between the planets, transfer orbits and city plans. Everywhere else on this site speaks as the Center. This page speaks for the project.
+
+Everything here is open. The stories, the archive, the calculators and this website are public repositories in the [InterImm organization on GitHub](https://github.com/InterImm). Anyone can propose a building in a Martian city, correct a calculation or write a chapter of [the book](https://book.interimm.org/).
+
+## How it started
+
+The project grew out of the InterImm Round Table, twenty online discussions about interplanetary civilization held between 2014 and 2018. Their notes are still on [GitHub](https://github.com/InterImm/roundTable/issues/4).
+
+## Taking part
+
+- Open an issue or a pull request on any [InterImm repository](https://github.com/InterImm).
+- Suggest a landmark for [Nanhe City](/en/cities/mars/isidis-procyon/).
+- Write to [admin@interimm.org](mailto:admin@interimm.org).
diff --git a/hugo.yaml b/hugo.yaml
index 7dcaf73..0eb6f57 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -32,6 +32,14 @@ params:
# Default social-sharing image (pages can override with `images:` in front matter).
images:
- /images/about/interimm_banner_black.png
+ # Sister sites that city pages link to and read from.
+ explorer: https://cities.interimm.org/
+ facilities:
+ dashboard: https://interimm.org/mars-open-facilities/
+ # Read at build time, and again in the browser for live values (first that answers wins).
+ data:
+ - https://interimm.org/mars-open-facilities/data/index.json
+ - https://raw.githubusercontent.com/InterImm/mars-open-facilities/data/index.json
languages:
cn:
@@ -184,3 +192,8 @@ languages:
parent: more
url: https://interimm.org/interplanetary-logistics/
weight: 4
+
+# City pages read live facility data at build time; don't reuse a stale copy.
+caches:
+ getresource:
+ maxAge: 10m
diff --git a/i18n/cn.yaml b/i18n/cn.yaml
index ca81168..bb70c8c 100644
--- a/i18n/cn.yaml
+++ b/i18n/cn.yaml
@@ -44,3 +44,79 @@
translation: 实时计算,基于 NASA Mars24 算法
- id: back_to_top
translation: 回到顶部
+- id: org_name
+ translation: "星际移民中心"
+- id: org_sub
+ translation: "Interplanetary Immigration Center"
+- id: signal_distance
+ translation: "地球至火星"
+- id: signal_delay
+ translation: "单程信号"
+- id: signal_mars
+ translation: "伊希地"
+- id: signal_sol
+ translation: "火星日"
+- id: unit_min
+ translation: "分"
+- id: unit_s
+ translation: "秒"
+- id: about_project
+ translation: "关于这个项目"
+- id: hero_title
+ translation: "让火星上的生活更加美好。"
+- id: hero_lede
+ translation: "星际移民中心是星际移民局的核心机构,致力于太阳系开发的研究和服务。总部坐落在火星伊希地城市圈,并在地球各大洲设有地球事务部。"
+- id: distance_title
+ translation: "地球与火星的距离"
+- id: distance_note
+ translation: "百万公里,随两颗行星的运行不断变化。"
+- id: delay_title
+ translation: "单程信号延时"
+- id: arrive_before
+ translation: "此刻从地球发出的这个页面,将于 UTC"
+- id: arrive_mid
+ translation: "抵达伊希地,当地时间"
+- id: arrive_after
+ translation: "。"
+- id: instrument_note
+ translation: "各办事处之间的每一条消息都要跨越这段距离。数据由你的浏览器根据行星轨道和 NASA Mars24 算法实时计算。"
+- id: orbit_title
+ translation: "今日地球与火星绕太阳运行的位置,俯视图"
+- id: orbit_caption
+ translation: "黄道北极视角 · 今日"
+- id: earth
+ translation: "地球"
+- id: mars
+ translation: "火星"
+- id: from_center
+ translation: "中心动态"
+- id: log_columns
+ translation: "地球日期 · 火星日"
+- id: sol
+ translation: "火星日"
+- id: outside_story
+ translation: "故事之外"
+- id: outside_text
+ translation: "星际移民中心是虚构的,科学是真实的。InterImm 是一个开源的硬科幻与科普项目,自 2014 年起公开创作。"
+- id: in_city
+ translation: "城中机构"
+- id: open_3d
+ translation: "在 3D 中打开"
+- id: model_caption
+ translation: "3D 模型。走进城市的街道,看看维持这座城市需要什么。"
+- id: facilities
+ translation: "城市设施"
+- id: facilities_lede
+ translation: "在火星开放设施模拟中实时运行,数据每 10 分钟更新一次。"
+- id: open_dashboard
+ translation: "仪表盘"
+- id: status_operating
+ translation: "运行中"
+- id: status_maintenance
+ translation: "检修中"
+- id: status_reduced
+ translation: "减产"
+- id: status_offline
+ translation: "停机"
+- id: design_value
+ translation: "设计值"
diff --git a/i18n/en.yaml b/i18n/en.yaml
index 72c0ab7..77a1c3f 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -44,3 +44,79 @@
translation: Live, computed with the NASA Mars24 algorithm
- id: back_to_top
translation: Back to top
+- id: org_name
+ translation: "Interplanetary Immigration Center"
+- id: org_sub
+ translation: "Interplanetary Immigration Agency"
+- id: signal_distance
+ translation: "Earth to Mars"
+- id: signal_delay
+ translation: "One-way signal"
+- id: signal_mars
+ translation: "Isidis"
+- id: signal_sol
+ translation: "Sol"
+- id: unit_min
+ translation: "min"
+- id: unit_s
+ translation: "s"
+- id: about_project
+ translation: "About the project"
+- id: hero_title
+ translation: "Helping people build a better life on Mars."
+- id: hero_lede
+ translation: "The Interplanetary Immigration Center is the key member of the Interplanetary Immigration Agency. We research and develop the products a society on Mars needs, from our headquarters in Isidis and our offices on Earth."
+- id: distance_title
+ translation: "Distance, Earth to Mars"
+- id: distance_note
+ translation: "million kilometres, changing as both planets move."
+- id: delay_title
+ translation: "Signal delay, one way"
+- id: arrive_before
+ translation: "Sent now from Earth, this page reaches Isidis at"
+- id: arrive_mid
+ translation: "UTC,"
+- id: arrive_after
+ translation: "local Mars time."
+- id: instrument_note
+ translation: "Every message between our offices crosses this gap. Calculated in your browser from the planets’ orbits and the NASA Mars24 clock."
+- id: orbit_title
+ translation: "Earth and Mars around the Sun today, seen from above"
+- id: orbit_caption
+ translation: "Seen from ecliptic north · today"
+- id: earth
+ translation: "Earth"
+- id: mars
+ translation: "Mars"
+- id: from_center
+ translation: "From the Center"
+- id: log_columns
+ translation: "Earth date · Sol"
+- id: sol
+ translation: "Sol"
+- id: outside_story
+ translation: "A note from outside the story"
+- id: outside_text
+ translation: "The Center is fictional. The science is real. InterImm is an open-source science and science-fiction project, written in the open since 2014."
+- id: in_city
+ translation: "Places in the city"
+- id: open_3d
+ translation: "Open in 3D"
+- id: model_caption
+ translation: "3D model. Walk its streets and see what it takes to keep the city alive."
+- id: facilities
+ translation: "Facilities"
+- id: facilities_lede
+ translation: "Running live in the Mars Open Facilities simulation. Values update every 10 minutes."
+- id: open_dashboard
+ translation: "Dashboard"
+- id: status_operating
+ translation: "Operating"
+- id: status_maintenance
+ translation: "Maintenance"
+- id: status_reduced
+ translation: "Reduced output"
+- id: status_offline
+ translation: "Offline"
+- id: design_value
+ translation: "design"
diff --git a/kit/README.md b/kit/README.md
index fa92e4d..7698357 100644
--- a/kit/README.md
+++ b/kit/README.md
@@ -1,6 +1,9 @@
# InterImm kit
-The shared look of every InterImm site: colours, fonts, header, footer, buttons, cards and page headers.
+The shared look of every InterImm site: colours, fonts, header, signal line, footer, buttons, cards and page headers.
+Every page reads as a public document of the Interplanetary Immigration Center: paper and ink, serif headings,
+thin rules, one Mars-rust accent, and a live signal line under the header with the Earth to Mars distance,
+the one-way signal delay, Isidis time (MTC) and the sol.
interimm.org owns it and publishes it; every other site links it instead of copying it, so a change here
reaches all of them on their next page load and they can't drift apart again.
@@ -9,7 +12,7 @@ reaches all of them on their next page load and they can't drift apart again.
| `https://interimm.org/kit/interimm.css` | Stylesheet, including the fonts below | `assets/kit/interimm.css` |
| `https://interimm.org/kit/interimm.js` | Header menu behaviour, and fills in the shared header and footer | `assets/kit/interimm.js` |
| `https://interimm.org/kit/nav.cn.json`, `nav.en.json` | The current menu and footer for each language | generated from `hugo.yaml` and `data/footer.yml` by `layouts/partials/kit.html` |
-| `https://interimm.org/kit/fonts/` | Space Grotesk and JetBrains Mono (SIL OFL) | `static/kit/fonts/` |
+| `https://interimm.org/kit/fonts/` | Source Serif 4, IBM Plex Sans and IBM Plex Mono (SIL OFL) | `static/kit/fonts/` |
| `https://interimm.org/kit/` | Live style guide showing every component | `static/kit/index.html` |
All of it is static files on GitHub Pages, so it costs nothing. GitHub Pages sends
@@ -34,7 +37,7 @@ All of it is static files on GitHub Pages, so it costs nothing. GitHub Pages sen
-
+
InterImm
Page title
@@ -49,10 +52,27 @@ All of it is static files on GitHub Pages, so it costs nothing. GitHub Pages sen