Skip to content
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.

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

Glossary: Fix #380 #415

Merged
merged 47 commits into from Jan 7, 2019
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b61d7e7
glossary
tdelmas Oct 13, 2018
fa858f1
Glossary
tdelmas Oct 13, 2018
911e3cf
Glossary
tdelmas Oct 17, 2018
174d36c
glossary
tdelmas Oct 28, 2018
96ea1ba
Glossary
tdelmas Nov 1, 2018
586d151
Glossary
tdelmas Nov 1, 2018
3468645
Glossary
tdelmas Nov 2, 2018
acf0a47
Glossary
tdelmas Nov 2, 2018
f73a407
Glossary
tdelmas Nov 2, 2018
a89aa77
Glossary
tdelmas Nov 3, 2018
e761162
Glossary
tdelmas Nov 3, 2018
44d1190
Glossary
tdelmas Nov 4, 2018
087bbfc
Glossary
tdelmas Nov 4, 2018
3bd05ad
Glossary
tdelmas Nov 10, 2018
5c3c991
Glossary
tdelmas Nov 10, 2018
031883c
Glossary
tdelmas Nov 10, 2018
320e150
Glossary
tdelmas Nov 10, 2018
3605339
Update content/en/docs/glossary.md
jmorahan Nov 11, 2018
0856290
Update content/fr/docs/glossary.md
jmorahan Nov 11, 2018
ec4145d
Update content/fr/docs/glossary.md
jmorahan Nov 11, 2018
59f8d09
Update content/en/docs/glossary.md
jmorahan Nov 11, 2018
0ec006e
Merge branch 'glossary' of https://github.com/tdelmas/website into gl…
tdelmas Nov 11, 2018
3c859b1
remove french glossary
tdelmas Nov 11, 2018
33d99df
Glossary - with OIDs details
tdelmas Dec 30, 2018
cba3bbd
Glossary: CP and CPS
tdelmas Dec 31, 2018
9413e9a
Glossary: Fix DNSSEC
tdelmas Dec 31, 2018
d22b607
Glossary: Added TLSA
tdelmas Dec 31, 2018
3a762f3
Glossary: Import Schoen patch + some modification
tdelmas Jan 1, 2019
f17cc0b
Glossary: typo
tdelmas Jan 1, 2019
d2a7422
Glossary: fix plurals and remove DSA definition
tdelmas Jan 1, 2019
efaede7
Revisions to Glossary.
jsha Jan 3, 2019
450fa81
Replace web client with user agent.
jsha Jan 3, 2019
c8993bc
Add root program and Web PKI.
jsha Jan 3, 2019
1c8684a
Remove OID numbers.
jsha Jan 3, 2019
730d40e
Consolidate "property" and "field" to "extension"
jsha Jan 3, 2019
48a6533
Glossary: Merge of the other definition of "CA"
tdelmas Jan 5, 2019
6808269
Glossary: Fix duplicate CA
tdelmas Jan 5, 2019
e8ae139
Glossary: missing "-" between links
tdelmas Jan 5, 2019
0191a51
Glossary: Certificate extension
tdelmas Jan 6, 2019
6021af6
Glossary: Critical extension
tdelmas Jan 6, 2019
3e83f4e
Glossary
tdelmas Jan 6, 2019
ff084e2
Fix missing link targets.
jsha Jan 7, 2019
5da7ce1
Glossary: fix links and remove end-user cert def.
tdelmas Jan 7, 2019
08d9624
Glossary: Various small fixes.
jsha Jan 7, 2019
043d864
Merge branch 'glossary' of github.com:tdelmas/website into tdelmas-gl…
jsha Jan 7, 2019
88eb9c2
Glossary: A few more small fixes.
jsha Jan 7, 2019
1630df0
Glossary: accronym->acronym.
jsha Jan 7, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions config.toml
Expand Up @@ -33,6 +33,8 @@ title = "Let's Encrypt - Free SSL/TLS Certificates"
contentDir = "content/en"
languageName ="English"
languageCode= "en-us"
#if colon ":" must be prefixed
beforeColon= ""
# Weight used for sorting.
weight = 1
description = """
Expand Down Expand Up @@ -65,6 +67,8 @@ title = "Let's Encrypt - Certificats SSL/TLS gratuits"
languageName = "Français"
contentDir = "content/fr"
languageCode= "fr-fr"
#if colon ":" must be prefixed
beforeColon= " "
# Weight used for sorting.
weight = 1
description = """
Expand Down
1 change: 1 addition & 0 deletions content/en/docs/_index.md
Expand Up @@ -12,6 +12,7 @@ menu:
* [Getting Started](/getting-started/)
* [How Let's Encrypt Works](/how-it-works/)
* [Frequently Asked Questions (FAQ)](/docs/faq/)
* [Glossary](/docs/glossary/)

# Subscriber Information

Expand Down
187 changes: 187 additions & 0 deletions content/en/docs/glossary.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions content/fr/docs/_index.md
Expand Up @@ -12,6 +12,7 @@ menu:
* [Commencer](/fr/getting-started/)
* [Comment ça marche](/fr/how-it-works/)
* [Frequently Asked Questions (FAQ)](/docs/faq/)
* [Glossaire](/docs/glossary/)

# Subscriber Information

Expand Down
52 changes: 52 additions & 0 deletions layouts/shortcodes/def.html
@@ -0,0 +1,52 @@
<!--
Usage (in english):
{% def
id="a unique id for anchor"
name="The term to define (optional if abbr is provided)"
abbr="an accronym (optional)" %}
the definition
{% /def %}

<p><dfn id="a unique id for anchor">The term to define</dfn>: the definition</p>
<p><dfn id="a unique id for anchor"><abbr>an accronym</abbr</dfn>: the definition</p>
<p><dfn id="a unique id for anchor">The term to define</dfn> (<abbr>an accronym</abbr>): the definition</p>

Usage (in other languages):
{% def
id="a unique id for anchor - the SAME than for english"
name="The term to define (optional if english or abbr is provided)"
abbr="an accronym (optional)"
english="the english term (optional - if present the abbr is in english too)" %}}
the definition
{% /def %}

<p><dfn id="def-a unique id for anchor">The term to define</dfn>: the definition</p>
<p><dfn id="def-a unique id for anchor"><abbr>an accronym</abbr></dfn>: the definition</p>
<p><dfn id="def-a unique id for anchor">The term to define</dfn> (<abbr>an accronym</abbr>): the definition</p>
<p><dfn id="def-a unique id for anchor" lang="en">the english term</dfn> (<abbr>an accronym</abbr>): the definition</p>
<p><dfn id="def-a unique id for anchor">The term to define</dfn> (<i lang="en">the english term</i>): the definition</p>
<p><dfn id="def-a unique id for anchor">The term to define</dfn> (<abbr>an accronym</abbr> - <i lang="en">the english term</i>): the definition</p>

Notes:
<abbr> is used to spell out for screen readers
lang="en" is used for the accent for screen readers
-->

<p class="definition">
{{- if .Get "name" -}}
<dfn id="def-{{.Get "id" }}">{{.Get "name" }}</dfn>
{{- if or (.Get "abbr") (.Get "english") -}}
{{- if .Get "english" }} ({{ with .Get "abbr" }}<abbr lang="en">{{ . }}</abbr> - {{ end -}}<i lang="en">{{ .Get "english" }}</i>)
{{- else }} (<abbr>{{ .Get "abbr" }}</abbr>)
{{- end }}
{{- end }}
{{- else -}}
{{- if .Get "english" -}}
<dfn id="def-{{.Get "id" }}" lang="en">{{.Get "english" }}</dfn>
{{- if .Get "abbr" }} (<abbr lang="en">{{ .Get "abbr" }}</abbr>){{- end }}
{{- else -}}
<dfn id="def-{{.Get "id" }}"><abbr>{{.Get "abbr" }}</abbr></dfn>
{{- end -}}
{{- end -}}
{{ .Site.Params.beforeColon | safeHTML }}: {{ .Inner }}
</p>
13 changes: 13 additions & 0 deletions static/css/glossary.css
@@ -0,0 +1,13 @@
@keyframes fadeIt {
0% { background-color: #FFCE00; }
100% { /* back to normal */ }
}

dfn:target{
/* highlight for 3 seconds the selected definition target */
animation: fadeIt 3s ease-out;
}
dfn {
font-weight: bold;
padding-right: .25em; /* Prevent italics text from hitting the ":" */
}
26 changes: 26 additions & 0 deletions static/js/glossary.js
@@ -0,0 +1,26 @@
// search all links (into definitions) linking to elements in the current page (href starts with #)
// To set the title of the link to the definition it points to
document.querySelectorAll('[id^="def-"]').forEach(function(def){
const id = def.id;
let title = def.parentNode.textContent;
if ( title.match(/\.\s/) ) {
// We take everything until the last period. (Everything after are links such as "Wikipedia"
title = title.match(/^.*\.\s/)[0];
}
document.querySelectorAll('.definition>a[href^="#'+id+'"]').forEach(function(a){
a.title = title;
});
});

// search for invalid links
document.querySelectorAll('.definition>a[href^="#"]').forEach(function(a){
if ( a.title ) return;
let href = a.href;
let id = href.substring(href.indexOf('#')+1);
if ( ! id ) return;
let el = document.getElementById(id);
if ( ! el ) {
console.error("Invalid link to:"+id);
return;
}
});