fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9b533fd
)
ptrad
master
author
Radek Czajka
<rczajka@rczajka.pl>
Wed, 27 Nov 2024 09:25:52 +0000
(10:25 +0100)
committer
Radek Czajka
<rczajka@rczajka.pl>
Wed, 27 Nov 2024 09:25:52 +0000
(10:25 +0100)
src/documents/xml_tools.py
patch
|
blob
|
history
src/redakcja/static/js/wiki/view_editor_wysiwyg.js
patch
|
blob
|
history
src/redakcja/static/js/wiki/wikiapi.js
patch
|
blob
|
history
src/wiki/templates/wiki/tabs/annotations_view.html
patch
|
blob
|
history
diff --git
a/src/documents/xml_tools.py
b/src/documents/xml_tools.py
index
ac145db
..
d7e3fcf
100644
(file)
--- a/
src/documents/xml_tools.py
+++ b/
src/documents/xml_tools.py
@@
-107,7
+107,7
@@
def split_xml(text):
# find the chapter's title
name_elem = deepcopy(element)
# find the chapter's title
name_elem = deepcopy(element)
- for tag in 'extra', 'motyw', 'pa', 'pe', 'pr', 'pt', 'uwaga':
+ for tag in 'extra', 'motyw', 'pa', 'pe', 'pr', 'pt', '
ptrad', '
uwaga':
for a in name_elem.findall('.//' + tag):
a.text=''
del a[:]
for a in name_elem.findall('.//' + tag):
a.text=''
del a[:]
diff --git
a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
index
e43905c
..
726c243
100644
(file)
--- a/
src/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/
src/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@
-56,7
+56,7
@@
}
/* Convert HTML fragment to plaintext */
}
/* Convert HTML fragment to plaintext */
- var ANNOT_FORBIDDEN = ['pt', 'pa', 'pr', 'pe', 'begin', 'end', 'motyw'];
+ var ANNOT_FORBIDDEN = ['pt', 'pa', 'pr', 'pe', '
ptrad', '
begin', 'end', 'motyw'];
function html2plainText(fragment){
var text = "";
function html2plainText(fragment){
var text = "";
diff --git
a/src/redakcja/static/js/wiki/wikiapi.js
b/src/redakcja/static/js/wiki/wikiapi.js
index
73642ac
..
5675913
100644
(file)
--- a/
src/redakcja/static/js/wiki/wikiapi.js
+++ b/
src/redakcja/static/js/wiki/wikiapi.js
@@
-537,7
+537,7
@@
$.xmlns["rdf"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
$('rdf|RDF', doc).remove();
if (params.noFootnotes) {
$.xmlns["rdf"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
$('rdf|RDF', doc).remove();
if (params.noFootnotes) {
- $('pa, pe, pr, pt', doc).remove();
+ $('pa, pe, pr, pt
, ptrad
', doc).remove();
}
if (params.noThemes) {
$('motyw', doc).remove();
}
if (params.noThemes) {
$('motyw', doc).remove();
diff --git
a/src/wiki/templates/wiki/tabs/annotations_view.html
b/src/wiki/templates/wiki/tabs/annotations_view.html
index
6cfef19
..
1c6bcc0
100644
(file)
--- a/
src/wiki/templates/wiki/tabs/annotations_view.html
+++ b/
src/wiki/templates/wiki/tabs/annotations_view.html
@@
-15,7
+15,10
@@
<a href='#' class="nav-link refresh" title="Przypisy tłumacza" data-tag="pt">pt</a>
</li>
<li class="nav-item">
<a href='#' class="nav-link refresh" title="Przypisy tłumacza" data-tag="pt">pt</a>
</li>
<li class="nav-item">
- <a href='#' class="nav-link refresh" title="Wszystkie przypisy" data-tag="pa,pe,pr,pt">{% trans "all" %}</a>
+ <a href='#' class="nav-link refresh" title="Przypisy tradycyjne" data-tag="ptrad">ptrad</a>
+ </li>
+ <li class="nav-item">
+ <a href='#' class="nav-link refresh" title="Wszystkie przypisy" data-tag="pa,pe,pr,pt,ptrad">{% trans "all" %}</a>
</li>
</ul>
<div id="annotations-container">
</li>
</ul>
<div id="annotations-container">