Narweb: Inconsistency between the name of the link (#1272)

to a reference and the name of this reference for an individual.

Fixes #12336
This commit is contained in:
Serge Noiraud 2021-07-16 09:12:29 +02:00 committed by GitHub
parent 675a8b00a4
commit 4472a38854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 230 additions and 27 deletions

View File

@ -827,8 +827,34 @@ a.family_map {
/* Subsection : Source References
----------------------------------------------------- */
#sourcerefs ol li ol {
list-style-type: lower-alpha;
#sourcerefs ol#srcr {
counter-reset: itema;
list-style-type: none;
display: block;
margin-top: .1em;
}
#sourcerefs ol#citr {
counter-reset: itemb;
list-style-type: none;
}
#sourcerefs ol#srcr > li::before {
content: counter(itema);
}
#sourcerefs ol#citr > li::before {
content: counter(itema)counter(itemb, lower-alpha);
}
#sourcerefs ol#srcr > li {
counter-increment: itema;
margin-top: .1em;
}
#sourcerefs ol#citr > li {
counter-increment: itemb;
margin-top: .1em;
}
#sourcerefs ol#citr ul {
list-style: none;
display: inline-block;
vertical-align: top;
}
/* Subsection : Pedigree

View File

@ -1540,18 +1540,34 @@ div#References {
/* Subsections : Source References
----------------------------------------------------- */
div#sourcerefs {
padding: 0;
margin: 0 auto;
#sourcerefs ol#srcr {
counter-reset: itema;
list-style-type: none;
display: block;
margin-top: .1em;
}
div#sourcerefs ol {
list-style-type: decimal;
#sourcerefs ol#citr {
counter-reset: itemb;
list-style-type: none;
}
div#sourcerefs ol li ol {
list-style-type: lower-alpha;
#sourcerefs ol#srcr > li::before {
content: counter(itema);
}
div#sourcerefs ol li a {
text-decoration: none;
#sourcerefs ol#citr > li::before {
content: counter(itema)counter(itemb, lower-alpha);
}
#sourcerefs ol#srcr > li {
counter-increment: itema;
margin-top: .1em;
}
#sourcerefs ol#citr > li {
counter-increment: itemb;
margin-top: .1em;
}
#sourcerefs ol#citr ul {
list-style: none;
display: inline-block;
vertical-align: top;
}
/* Subsections : Summary Area

View File

@ -881,8 +881,34 @@ a.family_map {
/* Subsection : Source References
----------------------------------------------------- */
#sourcerefs ol li ol {
list-style-type: lower-alpha;
#sourcerefs ol#srcr {
counter-reset: itema;
list-style-type: none;
display: block;
margin-top: .1em;
}
#sourcerefs ol#citr {
counter-reset: itemb;
list-style-type: none;
}
#sourcerefs ol#srcr > li::before {
content: counter(itema);
}
#sourcerefs ol#citr > li::before {
content: counter(itema)counter(itemb, lower-alpha);
}
#sourcerefs ol#srcr > li {
counter-increment: itema;
margin-top: .1em;
}
#sourcerefs ol#citr > li {
counter-increment: itemb;
margin-top: .1em;
}
#sourcerefs ol#citr ul {
list-style: none;
display: inline-block;
vertical-align: top;
}
/* Subsection : Pedigree

View File

@ -877,8 +877,34 @@ a.family_map {
/* Subsection : Source References
----------------------------------------------------- */
#sourcerefs ol li ol {
list-style-type: lower-alpha;
#sourcerefs ol#srcr {
counter-reset: itema;
list-style-type: none;
display: block;
margin-top: .1em;
}
#sourcerefs ol#citr {
counter-reset: itemb;
list-style-type: none;
}
#sourcerefs ol#srcr > li::before {
content: counter(itema);
}
#sourcerefs ol#citr > li::before {
content: counter(itema)counter(itemb, lower-alpha);
}
#sourcerefs ol#srcr > li {
counter-increment: itema;
margin-top: .1em;
}
#sourcerefs ol#citr > li {
counter-increment: itemb;
margin-top: .1em;
}
#sourcerefs ol#citr ul {
list-style: none;
display: inline-block;
vertical-align: top;
}
/* Subsection : Pedigree

View File

@ -878,8 +878,34 @@ a.family_map {
/* Subsection : Source References
----------------------------------------------------- */
#sourcerefs ol li ol {
list-style-type: lower-alpha;
#sourcerefs ol#srcr {
counter-reset: itema;
list-style-type: none;
display: block;
margin-top: .1em;
}
#sourcerefs ol#citr {
counter-reset: itemb;
list-style-type: none;
}
#sourcerefs ol#srcr > li::before {
content: counter(itema);
}
#sourcerefs ol#citr > li::before {
content: counter(itema)counter(itemb, lower-alpha);
}
#sourcerefs ol#srcr > li {
counter-increment: itema;
margin-top: .1em;
}
#sourcerefs ol#citr > li {
counter-increment: itemb;
margin-top: .1em;
}
#sourcerefs ol#citr ul {
list-style: none;
display: inline-block;
vertical-align: top;
}
/* Subsection : Pedigree

View File

@ -880,8 +880,34 @@ a.family_map {
/* Subsection : Source References
----------------------------------------------------- */
#sourcerefs ol li ol {
list-style-type: lower-alpha;
#sourcerefs ol#srcr {
counter-reset: itema;
list-style-type: none;
display: block;
margin-top: .1em;
}
#sourcerefs ol#citr {
counter-reset: itemb;
list-style-type: none;
}
#sourcerefs ol#srcr > li::before {
content: counter(itema);
}
#sourcerefs ol#citr > li::before {
content: counter(itema)counter(itemb, lower-alpha);
}
#sourcerefs ol#srcr > li {
counter-increment: itema;
margin-top: .1em;
}
#sourcerefs ol#citr > li {
counter-increment: itemb;
margin-top: .1em;
}
#sourcerefs ol#citr ul {
list-style: none;
display: inline-block;
vertical-align: top;
}
/* Subsection : Pedigree

View File

@ -817,9 +817,43 @@ div.grampsstylednote a:visited {
/* SubSection : Source References
-----------------------------------------------------------------*/
#sourcerefs ol li ol {
list-style-type: lower-alpha;
#sourcerefs ol#srcr {
counter-reset: itema;
list-style-type: none;
display: block;
margin-top: .1em;
}
#sourcerefs ol#citr {
counter-reset: itemb;
list-style-type: none;
}
#sourcerefs ol#srcr > li::before {
content: counter(itema);
}
#sourcerefs ol#citr > li::before {
content: counter(itema)counter(itemb, lower-alpha);
}
#sourcerefs ol#srcr > li {
counter-increment: itema;
margin-top: .1em;
}
#sourcerefs ol#citr > li {
counter-increment: itemb;
margin-top: .1em;
}
#sourcerefs ol#citr ul {
list-style: none;
display: inline-block;
vertical-align: top;
}
/*
#sourcerefs a {
color: #767D25;
}
#sourcerefs a:visited {
color: red;
}
*/
/* SubSection : Pedigree
-----------------------------------------------------------------*/

View File

@ -1347,11 +1347,34 @@ div.grampsstylednote a:visited {
/* Subsections : Source References
----------------------------------------------------- */
div#sourcerefs ol {
list-style-type:decimal;
#sourcerefs ol#srcr {
counter-reset: itema;
list-style-type: none;
display: block;
margin-top: .1em;
}
div#sourcerefs ol li ol {
list-style-type:lower-alpha;
#sourcerefs ol#citr {
counter-reset: itemb;
list-style-type: none;
}
#sourcerefs ol#srcr > li::before {
content: counter(itema);
}
#sourcerefs ol#citr > li::before {
content: counter(itema)counter(itemb, lower-alpha);
}
#sourcerefs ol#srcr > li {
counter-increment: itema;
margin-top: .1em;
}
#sourcerefs ol#citr > li {
counter-increment: itemb;
margin-top: .1em;
}
#sourcerefs ol#citr ul {
list-style: none;
display: inline-block;
vertical-align: top;
}
/* Subsections : Summary Area

View File

@ -2549,7 +2549,7 @@ class BasePage:
with Html("div", class_="subsection", id="sourcerefs") as section:
section += Html("h4", self._("Source References"), inline=True)
ordered = Html("ol")
ordered = Html("ol", id="srcr")
cindex = 0
citationlist = bibli.get_citation_list()
@ -2572,7 +2572,7 @@ class BasePage:
else:
list_html = Html("li", "None")
ordered1 = Html("ol")
ordered1 = Html("ol", id="citr")
citation_ref_list = citation.get_ref_list()
for key, sref in citation_ref_list:
cit_ref_li = Html("li", id="sref%d%s" % (cindex, key))