Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +00:00
Code Issues Projects Releases Wiki Activity

Html: Add 'lang=page_lang' to html and div tag [#576]

Browse Source
This commit is contained in:
gnosygnu 2019-09-28 16:39:59 -04:00
parent e82641f341
commit 88e0398696
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
400_xowa/.classpath
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" exported="true" path="/baselib"/> <classpathentry exported="true" kind="src" path="/baselib"/>
<classpathentry kind="src" exported="true" path="/100_core"/> <classpathentry exported="true" kind="src" path="/100_core"/>
<classpathentry kind="src" exported="true" path="/140_dbs"/> <classpathentry exported="true" kind="src" path="/140_dbs"/>
<classpathentry kind="src" exported="true" path="/150_gfui"/> <classpathentry exported="true" kind="src" path="/150_gfui"/>
<classpathentry kind="src" exported="true" path="/luaj_xowa"/> <classpathentry exported="true" kind="lib" path="lib/jtidy_xowa.jar"/>
<classpathentry kind="src" exported="true" path="/gplx.gflucene"/> <classpathentry exported="true" kind="src" path="/gplx.gflucene"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry exported="true" kind="lib" path="lib/icu4j-57_1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/vnu.jar"/>
<classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.9.1-2.jar"/>
<classpathentry exported="true" kind="src" path="/luaj_xowa"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
<classpathentry kind="con" exported="true" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" exported="true" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" exported="true" path="lib/jtidy_xowa.jar"/>
<classpathentry kind="lib" exported="true" path="lib/icu4j-57_1.jar"/>
<classpathentry kind="lib" exported="true" path="lib/vnu.jar"/>
<classpathentry kind="lib" exported="true" path="lib/Saxon-HE-9.9.1-2.jar"/>
</classpath> </classpath>

1
400_xowa/src/gplx/xowa/htmls/Xoh_page_wtr_mgr.java
View File

@ -97,6 +97,7 @@ public class Xoh_page_wtr_mgr implements Gfo_invk {
, "portal_div_logo", "portal_div_home", "portal_div_xtn" , "portal_div_logo", "portal_div_home", "portal_div_xtn"
, "portal_div_admin", "portal_div_wikis", "portal_sidebar" , "portal_div_admin", "portal_div_wikis", "portal_sidebar"
, "edit_div_rename", "edit_div_preview", "js_edit_toolbar" , "edit_div_rename", "edit_div_preview", "js_edit_toolbar"
, "page_lang"
}; };
private static final String Cfg__scripting_enabled = "xowa.html.scripting.enabled"; private static final String Cfg__scripting_enabled = "xowa.html.scripting.enabled";
} }

1
400_xowa/src/gplx/xowa/htmls/Xoh_page_wtr_wkr.java
View File

@ -128,6 +128,7 @@ public class Xoh_page_wtr_wkr {
, portal_mgr.Div_wikis_bry(wiki.Utl__bfr_mkr()) , portal_mgr.Div_wikis_bry(wiki.Utl__bfr_mkr())
, portal_mgr.Sidebar_mgr().Html_bry() , portal_mgr.Sidebar_mgr().Html_bry()
, mgr.Edit_rename_div_bry(page_ttl), page.Html_data().Edit_preview_w_dbg(), js_edit_toolbar_bry , mgr.Edit_rename_div_bry(page_ttl), page.Html_data().Edit_preview_w_dbg(), js_edit_toolbar_bry
, page.Lang().Key_bry()
); );
Xoh_page_wtr_wkr_.Bld_head_end(bfr, tmp_bfr, page); // add after </head> Xoh_page_wtr_wkr_.Bld_head_end(bfr, tmp_bfr, page); // add after </head>
Xoh_page_wtr_wkr_.Bld_html_end(bfr, tmp_bfr, page); // add after </html> Xoh_page_wtr_wkr_.Bld_html_end(bfr, tmp_bfr, page); // add after </html>

12
res/bin/any/xowa/cfg/app/xowa.gfs
View File

@ -241,7 +241,7 @@ app.wikis.get('~{wiki_key}').html.article {
page_read = page_read =
<:[" <:["
<!DOCTYPE html> <!DOCTYPE html>
<html dir="~{page_lang_ltr}" class="client-js"> <html dir="~{page_lang_ltr}" class="client-js" lang="~{page_lang}">
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<title>~{page_name} - XOWA</title> <title>~{page_name} - XOWA</title>
@ -269,7 +269,7 @@ app.wikis.get('~{wiki_key}').html.article {
<div id="bodyContent" class="mw-body-content"> <div id="bodyContent" class="mw-body-content">
<div id="siteSub">From XOWA: the free, open-source, offline wiki application</div> <div id="siteSub">From XOWA: the free, open-source, offline wiki application</div>
<div id="contentSub" class="visible">~{page_content_sub}</div>~{page_jumpto} <div id="contentSub" class="visible">~{page_content_sub}</div>~{page_jumpto}
<div id="mw-content-text" lang="en" dir="~{page_lang_ltr}" class="mw-content-~{page_lang_ltr} mw-parser-output">~{page_data} <div id="mw-content-text" lang="~{page_lang}" dir="~{page_lang_ltr}" class="mw-content-~{page_lang_ltr} mw-parser-output">~{page_data}
<div class="visualClear"> <div class="visualClear">
~{page_langs} ~{page_langs}
</div> </div>
@ -308,7 +308,7 @@ app.wikis.get('~{wiki_key}').html.article {
page_edit = page_edit =
<:[" <:["
<!DOCTYPE html> <!DOCTYPE html>
<html dir="~{page_lang_ltr}" class="client-js"> <html dir="~{page_lang_ltr}" class="client-js" lang="~{page_lang}">
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<title>~{page_name} - XOWA</title> <title>~{page_name} - XOWA</title>
@ -348,7 +348,7 @@ app.wikis.get('~{wiki_key}').html.article {
<div id="bodyContent" class="mw-body-content"> <div id="bodyContent" class="mw-body-content">
<div id="siteSub">From XOWA: the free, open-source, offline wiki application</div> <div id="siteSub">From XOWA: the free, open-source, offline wiki application</div>
<div id="contentSub" class="visible">~{page_content_sub}</div> <div id="contentSub" class="visible">~{page_content_sub}</div>
<div id="mw-content-text" lang="en" dir="~{page_lang_ltr}" class="mw-content-~{page_lang_ltr} mw-parser-output"> <div id="mw-content-text" lang="~{page_lang}" dir="~{page_lang_ltr}" class="mw-content-~{page_lang_ltr} mw-parser-output">
<div id="xowa_page_edit_preview_id">~{edit_div_preview}</div> <div id="xowa_page_edit_preview_id">~{edit_div_preview}</div>
<form id="editform" name="editform"> <form id="editform" name="editform">
<textarea id='xowa_edit_data_box' cols="80" rows="25">~{page_data}</textarea> <!-- NOTE: do not place on different line (EX: \n~{page_text}\n); textarea will interpret new line literally and page saves will include new whitespace --> <textarea id='xowa_edit_data_box' cols="80" rows="25">~{page_data}</textarea> <!-- NOTE: do not place on different line (EX: \n~{page_text}\n); textarea will interpret new line literally and page saves will include new whitespace -->
@ -395,7 +395,7 @@ app.wikis.get('~{wiki_key}').html.article {
page_html = page_html =
<:[" <:["
<!DOCTYPE html> <!DOCTYPE html>
<html dir="~{page_lang_ltr}"> <html dir="~{page_lang_ltr}" lang="~{page_lang}">
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<title>~{page_name} - XOWA</title> <title>~{page_name} - XOWA</title>
@ -426,7 +426,7 @@ app.wikis.get('~{wiki_key}').html.article {
<div id="bodyContent" class="mw-body-content"> <div id="bodyContent" class="mw-body-content">
<div id="siteSub">From XOWA: the free, open-source, offline wiki application</div> <div id="siteSub">From XOWA: the free, open-source, offline wiki application</div>
<div id="contentSub">&nbsp;</div> <div id="contentSub">&nbsp;</div>
<div id="mw-content-text" lang="en" dir="~{page_lang_ltr}" class="mw-content-~{page_lang_ltr} mw-parser-output"> <div id="mw-content-text" lang="~{page_lang}" dir="~{page_lang_ltr}" class="mw-content-~{page_lang_ltr} mw-parser-output">
<textarea id='xowa_edit_data_box' cols="80" rows="25">~{page_data}</textarea> <!-- NOTE: do not place on different line (EX: \n~{page_text}\n); textarea will interpret new line literally and page saves will include new whitespace --> <textarea id='xowa_edit_data_box' cols="80" rows="25">~{page_data}</textarea> <!-- NOTE: do not place on different line (EX: \n~{page_text}\n); textarea will interpret new line literally and page saves will include new whitespace -->
</div> </div>
</div> </div>