Skip to content

Abstract out site-wide variables into a single include #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewdavidwong merged 7 commits into from
Jun 24, 2021
Merged

Abstract out site-wide variables into a single include #178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76082f2
Abstract out site-wide variables into a single include
andrewdavidwong Jun 23, 2021
613c3dd
Assign doc_link more efficiently
andrewdavidwong Jun 23, 2021
59a5d15
Assign team_link more efficiently
andrewdavidwong Jun 23, 2021
c7ebd2b
Merge branch 'master' of github.com:QubesOS/qubesos.github.io into va…
andrewdavidwong Jun 23, 2021
ba5dfcb
Rename variables.liquid to variables.html (#178)
andrewdavidwong Jun 23, 2021
a82cfb9
Fix doc_link
andrewdavidwong Jun 24, 2021
6af03d9
Fix team_link
andrewdavidwong Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions _includes/doc-alert-advanced.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{% 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 advanced = msgs | where_exp: "item", "item.section == 'doc-advanced'" | first %}
<!-- Variables -->
{% include variables.liquid %}
{% assign advanced = includes | where_exp: "item", "item.section == 'doc-advanced'" | first %}
<!-- Alert -->
<div class="alert alert-sticky alert-warning" role="alert">
<i class="fa fa-exclamation-circle"></i>
<strong>{{ advanced.prompt }}</strong> {{ advanced.text }}
Expand Down
13 changes: 4 additions & 9 deletions _includes/doc-alert-external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{% 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 %}
<!-- Variables -->
{% include variables.liquid %}
{% assign external = includes | where_exp: "item", "item.section == 'doc-external'" | first %}
<!-- Alert -->
<div class="alert alert-sticky alert-warning" role="alert">
<i class="fa fa-exclamation-circle"></i>
{{ external.text }}
Expand Down
13 changes: 4 additions & 9 deletions _includes/doc-alert-translated.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{% 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 %}
<!-- Variables -->
{% include variables.liquid %}
{% assign translated = includes | where_exp: "item", "item.section == 'doc-translated'" | first %}
<!-- Alert -->
<div class="alert alert-warning" role="alert">
<i class="fa fa-exclamation-circle"></i>
{{ translated.text }}
Expand Down
13 changes: 3 additions & 10 deletions _includes/doc-content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
<!-- Localization -->
{% 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-content'" | first %}
<!-- Variables -->
{% include variables.liquid %}
{% assign docs = includes | where_exp: "item", "item.section == 'doc-content'" | first %}
<!-- Opening HTML for doc content -->
{% include doc-sidebar-start.html %}
<!-- BEGIN CONTENT -->
Expand Down
24 changes: 4 additions & 20 deletions _includes/doc-heading.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
<!-- Localization -->
{% assign doc_segments = page.relative_path | split: '/' %}
{% if page.lang == nil or page.lang == "en" %}
{% assign indexed = site.data.doc-index %}
{% assign lang = "" %}
{% else %}
{% assign lang = "/" | append: page.lang %}
{% assign indexed = site.data.translation[page.lang].doc-index %}
{% if indexed == nil or indexed.size == 0 %}
{% assign indexed = site.data.doc-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.doc-index %}
{% endif %}
<!-- Variables -->
{% include variables.liquid %}
<!-- Create heading -->
{% if page.permalink == doc_link %}
{% assign meta = indexed | where_exp: "item", "item.topic != nil" %}
{% assign meta = doc-index | where_exp: "item", "item.topic != nil" %}
<h1 class="more-top add-left outer-heading">
<a href="{{ doc_link }}" class="heading-link">
<i class="fa fa-book"></i> {{ meta[0].metatopic }}</a>
</h1>
{% else %}
{% assign ind = indexed | where_exp: "item", "item.topic == nil" %}
{% assign ind = doc-index | where_exp: "item", "item.topic == nil" %}
{% for section in ind %}
<!-- Section heading -->
{% if doc_segments contains section.category %}
Expand Down
24 changes: 5 additions & 19 deletions _includes/doc-index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,13 @@
<!-- Localization -->
{% if page.lang == nil or page.lang == "en" %}
{% assign doc_content = site.data.includes %}
{% assign lang = "" %}
{% assign indexed = site.data.doc-index %}
{% else %}
{% assign lang = "/" | append: page.lang %}
{% 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 %}
{% assign indexed = site.data.translation[page.lang].doc-index %}
{% if indexed == nil or indexed.size == 0 %}
{% assign indexed = site.data.doc-index %}
{% endif %}
{% endif %}
{% assign docs = doc_content | where_exp: "item", "item.section == 'doc-content'" | first %}
<!-- Variables -->
{% include variables.liquid %}
{% assign docs = includes | where_exp: "item", "item.section == 'doc-content'" | first %}
<!-- Opening HTML for doc content -->
{% include doc-sidebar-start.html %}
<!-- BEGIN CONTENT-->
{% assign ind = indexed | where_exp: "item", "item.topic == nil" %}
{% assign ind = doc-index | where_exp: "item", "item.topic == nil" %}
<!-- This is needed to assure building the correct ID of the link when there is a translation -->
{% assign index_english = site.data.doc-index | where_exp: "item", "item.topic == nil" %}
{% assign topic = indexed | where_exp: "item", "item.topic != nil" | first %}
{% assign topic = doc-index | where_exp: "item", "item.topic != nil" | first %}
<h1 id="qubes-os-documentation">{{ topic.topic }}</h1>
<p> {{ topic.subtopic }}</p>
{% assign english_count = 0 %}
Expand Down
12 changes: 3 additions & 9 deletions _includes/doc-widget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<!-- Variables -->
{% include variables.liquid %}
{% assign docs = includes | where_exp: "item", "item.section == 'doc-widget'" | first %}
<!-- Localization -->
{% 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 page.lang == nil or page.lang == "en" %}
{% 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' %}
Expand Down
33 changes: 12 additions & 21 deletions _includes/downloads.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
<!-- Localization -->
{% if page.lang == nil or page.lang == "en" %}
{% assign down = site.data.downloads-page %}
{% assign lang = "" %}
{% else %}
{% assign lang = "/" | append: page.lang %}
{% assign down = site.data.translation[page.lang].downloads-page %}
{% if down == nil or down.size == 0 %}
{% assign down = site.data.downloads-page %}
{% endif %}
{% endif %}
{% assign hw = down | where_exp: "item", "item.htmlsection == 'hardware'" | first %}
<!-- Variables -->
{% include variables.liquid %}
{% assign hw = downloads-page | 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 sec = downloads-page | 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 help = downloads-page | 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 %}
Expand Down Expand Up @@ -85,7 +76,7 @@ <h3>{{ help.title }}</h3>
</div>
</div>
<!-- Showcase -->
{% assign surv = down | where_exp: "item", "item.htmlsection == 'survey'" | first %}
{% assign surv = downloads-page | where_exp: "item", "item.htmlsection == 'survey'" | first %}
<hr class="more-bottom">
<div class="row">
<div class="col-xs-12">
Expand All @@ -99,7 +90,7 @@ <h3>{{ surv.title }}</h3>
</div>
<hr class="more-bottom">
<!-- Localization -->
{% assign ls = down | where_exp: "item", "item.htmlsection == 'loop-releases'" | first %}
{% assign ls = downloads-page | 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 %}
Expand Down Expand Up @@ -179,11 +170,11 @@ <h3 id="{{ release_name | slugify }}">{{ release_name }}</h3>
</div>
</div>
<!-- Localization -->
{% assign code = down | where_exp: "item", "item.htmlsection == 'source-code'" | first %}
{% assign code = downloads-page | 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 downcont = downloads-page | where_exp: "item", "item.htmlsection == 'download-content'" | first %}
<!-- Verification downloads -->
<div class="row download-content">
{% for source in release.sources %}
Expand Down Expand Up @@ -265,7 +256,7 @@ <h3 id="{{ release_name | slugify }}">{{ release_name }}</h3>
<hr class="more-bottom">
{% endfor %}
<!-- Download mirrors -->
{% assign dm = down | where_exp: "item", "item.htmlsection == 'download-mirrors'" | first %}
{% assign dm = downloads-page | where_exp: "item", "item.htmlsection == 'download-mirrors'" | first %}
<div class="row">
<div class="col-xs-12">
<article>
Expand Down Expand Up @@ -298,11 +289,11 @@ <h3 id="mirrors">{{ dm.title }}</h3>
</div>
<hr class="more-bottom">
<!-- Localization -->
{% assign secinfo = down | where_exp: "item", "item.htmlsection == 'sec-info'" | first %}
{% assign secinfo = downloads-page | 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 ver = downloads-page | 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 %}
Expand Down
35 changes: 15 additions & 20 deletions _includes/experts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{% 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 %}
<!-- Variables -->
{% include variables.liquid %}
{% assign experts = experts | where_exp: "item", "item.experts == nil" | first %}
<!-- List of quotations from experts -->
<div class="container">
<div class="row more-top">
<div class="col-lg-12 col-md-12">
Expand All @@ -15,19 +10,19 @@ <h2 class="text-center"><i class="fa fa-quote-left"></i> {{ experts.title }}</h2
</div>
<div class="more-bottom">
{% for item in experts.expert %}
<div class="row featured-quotes">
<div class="col-lg-3 col-md-3 text-center">
<a class="avatar-large" href="{{ item.avatar}}"><img src="{{ item.img }}"></a>
<div class="row featured-quotes">
<div class="col-lg-3 col-md-3 text-center">
<a class="avatar-large" href="{{ item.avatar}}"><img src="{{ item.img }}"></a>
</div>
<div class="col-lg-9 col-md-9 more-top">
<a href="{{ item.tweet }}" >
<blockquote>"{{ item.quote }}"
<i class="fa fa-twitter fa-fw" aria-hidden="true"></i>
<footer>{{ item.name }}<cite>, {{ item.occupation }}</cite></footer>
</blockquote>
</a>
</div>
</div>
<div class="col-lg-9 col-md-9 more-top">
<a href="{{ item.tweet }}" >
<blockquote>"{{ item.quote }}"
<i class="fa fa-twitter fa-fw" aria-hidden="true"></i>
<footer>{{ item.name }}<cite>, {{ item.occupation }}</cite></footer>
</blockquote>
</a>
</div>
</div>
{% endfor %}
</div>
</div>
Loading