-
- Contents
+ {{ docs.text }}
Contents
+{{ docs.text }}
{% include doc-widget.html %}
@@ -13,7 +25,24 @@
+
{{ content }}
+
+
+ {% assign perm_last_part = page.url | split: '/' | last | lstrip %}
+ {% if perm_last_part == "bulletins" %}
+ {% include sec-bulletin.html %}
+ {% endif %}
+ {% if perm_last_part == "canaries" %}
+ {% include sec-canaries.html %}
+ {% endif %}
+ {% if perm_last_part == "xsa" %}
+ {% include xsa.html %}
+ {% endif %}
+ {% if perm_last_part == "style-guide" %}
+ {% include style-guide.html %}
+ {% endif %}
+
diff --git a/_includes/doc-external-warning.html b/_includes/doc-external-warning.html
index 86d7510d..1bf6a4fa 100644
--- a/_includes/doc-external-warning.html
+++ b/_includes/doc-external-warning.html
@@ -1,6 +1,16 @@
+{% if page.lang == nil or page.lang == "en" %}
+ {% assign msgs = site.data.includes %}
+{% else %}
+ {% assign msgs = site.data.translation[page.lang].includes %}
+ {% if msgs == nil or msgs.size == 0 %}
+ {% assign msgs = site.data.includes %}
+ {% endif %}
+{% endif %}
+
+{% assign external = msgs | where_exp: "item", "item.section == 'doc-external'" | first %}
+
+
- - Improve the Docs -
- - View Page Source -
- - Edit This Page -
- - Report a Security Issue -
- - Report a Bug -
- - Help & Support -
- - Make a Donation - +{% if page.lang == nil or page.lang == "en" %} + {% assign doc_content = site.data.includes %} +{% else %} + {% assign doc_content = site.data.translation[page.lang].includes %} + {% if doc_content == nil or doc_content.size == 0 %} + {% assign doc_content = site.data.includes %} + {% endif %} +{% endif %} + +{% assign docs = doc_content | where_exp: "item", "item.section == 'doc-widget'" | first %} + +{% if lang == "" %} + {% assign master_edit = site.project_repo_path | append: "/qubes-doc/edit/master" | append: page.relative_path | remove_first: '_doc' %} + {% assign master_blob = site.project_repo_path | append: "/qubes-doc/blob/master" | append: page.relative_path | remove_first: '_doc' %} +{% else %} + {% assign master_edit = site.project_repo_path | append: "/qubes-translated/edit/master" | append: page.relative_path | remove_first: '_qubes-translated' %} + {% assign master_blob = site.project_repo_path | append: "/qubes-translated/blob/master" | append: page.relative_path| remove_first: '_qubes-translated' %} +{% endif %} + +{% for item in docs.links %} + {% if item.icon == "fa-book" %} + {% assign a_class = "btn btn-primary btn-block" %} + {% else %} + {% assign a_class = "page-source-link btn btn-default btn-block" %} + {% endif %} + + {% if item.icon == "fa-code" %} + {% assign a_href = master_blob %} + {% elsif item.icon == "fa-code-fork" %} + {% assign a_href = master_edit %} + {% else %} + {% assign a_href = item.url %} + {% endif %} + + {{ item.text }} +
+{% endfor %} diff --git a/_includes/downloads.html b/_includes/downloads.html new file mode 100644 index 00000000..54fe78fd --- /dev/null +++ b/_includes/downloads.html @@ -0,0 +1,393 @@ +{% if page.lang == nil or page.lang == "en" %} + {% assign down = site.data.download %} + {% assign lang = "" %} +{% else %} + {% assign lang = "/" | append: page.lang %} + {% assign down = site.data.translation[page.lang].download %} + {% if down == nil or down.size == 0 %} + {% assign down = site.data.download %} + {% endif %} +{% endif %} + +{% assign hw = down | where_exp: "item", "item.htmlsection == 'hardware'" | first %} +{% assign sr = hw.links | where_exp: "item", "item.id == 1" | first %} +{% assign ch = hw.links | where_exp: "item", "item.id == 2" | first %} +{% assign hcl = hw.links | where_exp: "item", "item.id == 3" | first %} + +{% assign sec = down | where_exp: "item", "item.htmlsection == 'sec'" | first %} +{% assign ig = sec.links | where_exp: "item", "item.id == 1" | first %} +{% assign vs = sec.links | where_exp: "item", "item.id == 2" | first %} +{% assign isc = sec.links | where_exp: "item", "item.id == 3" | first %} + +{% assign help = down | where_exp: "item", "item.htmlsection == 'help'" | first %} +{% assign hs = help.links | where_exp: "item", "item.id == 1" | first %} +{% assign tg = help.links | where_exp: "item", "item.id == 2" | first %} +{% assign rb = help.links | where_exp: "item", "item.id == 3" | first %} + +
Contents
- This is unofficial, third-party documentation.
- The Qubes OS Project cannot guarantee the accuracy of this page.
- Please exercise caution.
+ {{ external.text }}
diff --git a/_includes/doc-heading.html b/_includes/doc-heading.html
index eb7e24f9..e8df06a3 100644
--- a/_includes/doc-heading.html
+++ b/_includes/doc-heading.html
@@ -1,25 +1,46 @@
-{% if page.permalink == "/doc/" %}
- - - Documentation - -
+{% assign doc_segments = page.relative_path | split: '/' %} +{% if page.lang == nil or page.lang == "en" %} + {% assign indexed = site.data.index %} + {% assign lang = "" %} {% else %} - {% assign doc_segments = page.relative_path | split: '/' %} - {% for section in site.data.doc %} - {% if doc_segments contains section.folder %} -- - - {{ section.category }} - -
- {% if section.category == "External Documentation" %} - {% include doc-external-warning.html %} - {% endif %} - {% if page.translated %} - {% include doc-translated-warning.html %} - {% endif %} + {% assign lang = "/" | append: page.lang %} + {% assign indexed = site.data.translation[page.lang].index %} + {% if indexed == nil or indexed.size == 0 %} + {% assign indexed = site.data.index %} + {% endif %} +{% endif %} + +{% assign doc_link = lang | append: "/doc/" %} +{% assign doc_ind = site.doc | concat: site.qubes-translated | where:'permalink', doc_link %} +{% if doc_ind.size == 0 %} + {% assign doc_link = "/doc/" %} + {% assign indexed = site.data.index %} +{% endif %} + +{% if page.permalink == doc_link %} + {% assign meta = indexed | where_exp: "item", "item.topic != nil" %} ++ + {{ meta[0].metatopic }} +
+{% else %} + +{% assign ind = indexed | where_exp: "item", "item.topic == nil" %} + +{% for section in ind %} + {% if doc_segments contains section.category %} + + {% assign s = section.title | slugify %} ++ + + {{ section.category | replace: "-", " "}} + +
+ {% if section.category == "external" %} + {% include doc-external-warning.html %} {% endif %} - {% endfor %} + {% endif %} +{% endfor %} + {% endif %} diff --git a/_includes/doc-translated-warning.html b/_includes/doc-translated-warning.html index ceabb641..c447be52 100644 --- a/_includes/doc-translated-warning.html +++ b/_includes/doc-translated-warning.html @@ -1,5 +1,15 @@ +{% if page.lang == nil or page.lang == "en" %} + {% assign msgs = site.data.includes %} +{% else %} + {% assign msgs = site.data.translation[page.lang].includes %} + {% if msgs == nil or msgs.size == 0 %} + {% assign msgs = site.data.includes %} + {% endif %} +{% endif %} + +{% assign translated = msgs | where_exp: "item", "item.section == 'doc-translated'" | first %} +
- This page is an unverified translation.
- The Qubes OS Project cannot evaluate the accuracy of translations into languages that our team cannot read.
+ {{ translated.text }}
diff --git a/_includes/doc-widget.html b/_includes/doc-widget.html
index d918823e..5cef8724 100644
--- a/_includes/doc-widget.html
+++ b/_includes/doc-widget.html
@@ -1,47 +1,39 @@
-
- Documentation
-- - Improve the Docs -
- - View Page Source -
- - Edit This Page -
- - Report a Security Issue -
- - Report a Bug -
- - Help & Support -
- - Make a Donation - +{% if page.lang == nil or page.lang == "en" %} + {% assign doc_content = site.data.includes %} +{% else %} + {% assign doc_content = site.data.translation[page.lang].includes %} + {% if doc_content == nil or doc_content.size == 0 %} + {% assign doc_content = site.data.includes %} + {% endif %} +{% endif %} + +{% assign docs = doc_content | where_exp: "item", "item.section == 'doc-widget'" | first %} + +{% if lang == "" %} + {% assign master_edit = site.project_repo_path | append: "/qubes-doc/edit/master" | append: page.relative_path | remove_first: '_doc' %} + {% assign master_blob = site.project_repo_path | append: "/qubes-doc/blob/master" | append: page.relative_path | remove_first: '_doc' %} +{% else %} + {% assign master_edit = site.project_repo_path | append: "/qubes-translated/edit/master" | append: page.relative_path | remove_first: '_qubes-translated' %} + {% assign master_blob = site.project_repo_path | append: "/qubes-translated/blob/master" | append: page.relative_path| remove_first: '_qubes-translated' %} +{% endif %} + +{% for item in docs.links %} + {% if item.icon == "fa-book" %} + {% assign a_class = "btn btn-primary btn-block" %} + {% else %} + {% assign a_class = "page-source-link btn btn-default btn-block" %} + {% endif %} + + {% if item.icon == "fa-code" %} + {% assign a_href = master_blob %} + {% elsif item.icon == "fa-code-fork" %} + {% assign a_href = master_edit %} + {% else %} + {% assign a_href = item.url %} + {% endif %} + + {{ item.text }} +
+{% endfor %} diff --git a/_includes/downloads.html b/_includes/downloads.html new file mode 100644 index 00000000..54fe78fd --- /dev/null +++ b/_includes/downloads.html @@ -0,0 +1,393 @@ +{% if page.lang == nil or page.lang == "en" %} + {% assign down = site.data.download %} + {% assign lang = "" %} +{% else %} + {% assign lang = "/" | append: page.lang %} + {% assign down = site.data.translation[page.lang].download %} + {% if down == nil or down.size == 0 %} + {% assign down = site.data.download %} + {% endif %} +{% endif %} + +{% assign hw = down | where_exp: "item", "item.htmlsection == 'hardware'" | first %} +{% assign sr = hw.links | where_exp: "item", "item.id == 1" | first %} +{% assign ch = hw.links | where_exp: "item", "item.id == 2" | first %} +{% assign hcl = hw.links | where_exp: "item", "item.id == 3" | first %} + +{% assign sec = down | where_exp: "item", "item.htmlsection == 'sec'" | first %} +{% assign ig = sec.links | where_exp: "item", "item.id == 1" | first %} +{% assign vs = sec.links | where_exp: "item", "item.id == 2" | first %} +{% assign isc = sec.links | where_exp: "item", "item.id == 3" | first %} + +{% assign help = down | where_exp: "item", "item.htmlsection == 'help'" | first %} +{% assign hs = help.links | where_exp: "item", "item.id == 1" | first %} +{% assign tg = help.links | where_exp: "item", "item.id == 2" | first %} +{% assign rb = help.links | where_exp: "item", "item.id == 3" | first %} + +
+
+
+{% for releasex in site.data.downloads.releases %} +
+{% endfor %} + +{% assign dm = down | where_exp: "item", "item.htmlsection == 'download-mirrors'" | first %} + +
+
diff --git a/_includes/experts.html b/_includes/experts.html
new file mode 100644
index 00000000..597a575e
--- /dev/null
+++ b/_includes/experts.html
@@ -0,0 +1,37 @@
+{% if page.lang == nil or page.lang == "en" %}
+ {% assign experts = site.data.experts %}
+{% else %}
+ {% assign experts = site.data.translation[page.lang].experts %}
+ {% if experts == nil or experts.size == 0 %}
+ {% assign experts = site.data.experts %}
+ {% endif %}
+{% endif %}
+{% assign experts = experts | where_exp: "item", "item.experts == nil" | first %}
+
+
+
+
+{% assign surv = down | where_exp: "item", "item.htmlsection == 'survey'" | first %}
+
+
+
+ {{ hw.title }}
+-
+
- + + {{ sr.text }} + + +
- + + {{ ch.text }} + + +
- + + {{ hcl.text }} + + +
+
+ {{ sec.title }}
+-
+
- + + {{ ig.text }} + + +
- + + {{ vs.text }} + + +
- + + {{ isc.text }} + + +
+
+ {{ help.title }}
+-
+
- + + {{ hs.text }} + + +
- + + {{ tg.text }} + + +
- + + {{ rb.text }} + + +
+
+
+
+
+
+{% assign ls = down | where_exp: "item", "item.htmlsection == 'loop-releases'" | first %}
+{% assign test = ls.releases | where_exp: "item", "item.r_version == 'testing'" | first %}
+{% assign stable = ls.releases | where_exp: "item", "item.r_version == 'stable'" | first %}
+{% assign old = ls.releases | where_exp: "item", "item.r_version == 'old'" | first %}
+{% assign depr = ls.releases | where_exp: "item", "item.r_version == 'deprecated'" | first %}
+
++{% for releasex in site.data.downloads.releases %} +
+
+
+
+{% assign code = down | where_exp: "item", "item.htmlsection == 'source-code'" | first %}
+{% assign scode = code.links | where_exp: "item", "item.id == 1" | first %}
+{% assign cg = code.links | where_exp: "item", "item.id == 2" | first %}
+{% assign sl = code.links | where_exp: "item", "item.id == 3" | first %}
+
+{% assign downcont = down | where_exp: "item", "item.htmlsection == 'download-content'" | first %}
+
+
+
+ {% assign release_name = releasex[0] %}
+ {% assign release = releasex[1] %}
+ {% assign testing = release.testing | default: false %}
+ {% assign latest = release.latest | default: false %}
+ {% assign aging = release.aging | default: false %}
+ {% assign deprecated = release.deprecated | default: false %}
+
+ {{ release_name }}
+ + {% if testing %} +
+
+ {% if testing != true %}
+ {{ testing }}
+ {% else %}
+ {% for s in test.snippets %}
+ {% if s.url != nil %}
+ {{ s.snippet }}
+ {% else %}
+ {{ s.snippet }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
+ {% if latest %}
+
+
+ {% if latest != true %}
+ {{ latest }}
+ {% else %}
+ {{ stable.snippets[0].snippet }}
+ {% endif %}
+
+ {% endif %}
+
+ {% if aging %}
+
+
+ {% if aging != true %}
+ {{ aging }}
+ {% else %}
+ {% for s in old.snippets %}
+ {% if s.url != nil %}
+ {{ s.snippet }}
+ {% else %}
+ {{ s.snippet }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
+
+ {% if deprecated %}
+
+
+ {% if deprecated != true %}
+ {{ deprecated }}
+ {% else %}
+ {% for s in depr.snippets %}
+ {% if s.url != nil %}
+ {{ s.snippet }}
+ {% else %}
+ {{ s.snippet }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
+
+ {% for source in release.sources %}
+ {% if source.display %}
+
+
+
+
+ {{ source.filename }}
+
+ {% for verifier in source.verifiers %}
+ {% if verifier[0] == "hash" %}
+
+ {{ downcont.links[0].text }}
+
+ {% elsif verifier[0] == "sig" %}
+
+ {{ downcont.links[1].text }}
+
+ {% elsif verifier[0] == "key" %}
+
+ {{ downcont.links[2].text }}
+
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
+ {% endfor %}
+
+
+-
+
- + + + {{ downcont.links[3].text }} + + + {% for docdata in release.docs %} + {% assign doc_name = docdata[0] %} + {% assign doc = docdata[1] %} + {% if doc_name == "Installation Guide" %} +
- + + {{ doc_name }} + + + {% endif %} + {% if doc_name == "Release Notes" %} +
- + + {{ doc_name }} + + + {% endif %} + {% if doc_name == "Release Schedule" %} +
- + + {{ doc_name }} + + + {% endif %} + {% endfor %} +
- + + {{ hs.text }} + + +
- + + + {{ downcont.links[4].text }} + + +
- + + {{ scode.text }} + + +
+{% endfor %} + +{% assign dm = down | where_exp: "item", "item.htmlsection == 'download-mirrors'" | first %} + +
+
+
+{% assign secinfo = down | where_exp: "item", "item.htmlsection == 'sec-info'" | first %}
+{% assign sc = secinfo.links | where_exp: "item", "item.id == 1" | first %}
+{% assign sp = secinfo.links | where_exp: "item", "item.id == 2" | first %}
+{% assign sg = secinfo.links | where_exp: "item", "item.id == 3" | first %}
+
+{% assign ver = down | where_exp: "item", "item.htmlsection == 'version-info'" | first %}
+{% assign sv = ver.links | where_exp: "item", "item.id == 1" | first %}
+{% assign t = ver.links | where_exp: "item", "item.id == 2" | first %}
+{% assign vs = ver.links | where_exp: "item", "item.id == 3" | first %}
+
+
+
+
+
+
+
+ {{ dm.links[0].text }}
+
+
+
+{{ dm.title }}
+| {{ dm.table[0].column }} | +{{ dm.table[1].column }} | +{{ dm.table[2].column }} | +
|---|---|---|
| {{ mirror.organization }} | ++ {{ mirror.location }} + | +
+ {% for url in mirror.urls %}
+ {{ url.url | truncate: 76 }} + {% endfor %} + |
+
+
+
+
+
+
+ {{ secinfo.title }}
+-
+
- + + {{ sc.text }} + + +
- + + {{ sp.text }} + + +
- + + {{ sg.text }} + + +
+
+ {{ ver.title }}
+-
+
- + + {{ sv.text }} + + +
- + + {{ t.text }} + + +
- + + {{ vs.text }} + + +
+
+{{ code.title }}
+-
+
- + + {{ scode.text }} + + +
- + + {{ cg.text }} + + +
- + + {{ sl.text }} + + +
+
diff --git a/_includes/footer.html b/_includes/footer.html
index e35391b7..26d2048e 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,63 +1,88 @@
+
+
+
+ {{ experts.title }}
+
+{% for item in experts.expert %}
+
+ {% include footer.html %}
+
+
+{% endfor %}
+
+
+ 
+
+
+
+