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

reactivated help button and fixed xquery parameters problems #470

Merged
merged 8 commits into from
Dec 2, 2024
6 changes: 5 additions & 1 deletion add/data/xql/getHelp.xql
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ declare option output:omit-xml-declaration "yes";

let $lang := request:get-parameter('lang', 'en')
let $idPrefix := request:get-parameter('idPrefix', '')
let $uri := request:get-parameter('uri', '')
krHERO marked this conversation as resolved.
Show resolved Hide resolved
let $contextPath := request:get-context-path()

let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '') (:TODO:)

Expand All @@ -35,14 +37,16 @@ let $doc :=
</parameters>
)

let $xsl := doc('../xslt/teiBody2HTML.xsl')
let $xsl := doc('../xslt/tei/profiles/edirom-body/teiBody2HTML.xsl')
let $doc :=
transform:transform($doc, $xsl,
<parameters>
<param name="base" value="{concat($base, '/../xslt/')}"/>
<param name="lang" value="{$lang}"/>
<param name="tocDepth" value="1"/>
<param name="graphicsPrefix" value="help/"/>
<param name="contextPath" value="{$contextPath}"/>
<param name="docUri" value="{$uri}"/>
roewenstrunk marked this conversation as resolved.
Show resolved Hide resolved
</parameters>
)

Expand Down
2 changes: 1 addition & 1 deletion app/view/desktop/Desktop.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ Ext.define('EdiromOnline.view.desktop.Desktop', {
});

if(help == null) {
help = Ext.create('EdiromOnline.view.window.HelpWindow', me.getSizeAndPosition(500, 400));
help = Ext.create('EdiromOnline.view.window.HelpWindow', me.getSizeAndPosition(750, 600));
me.addWindow(help);
help.show();

Expand Down
6 changes: 3 additions & 3 deletions app/view/desktop/TaskBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Ext.define('EdiromOnline.view.desktop.TaskBar', {
me.windowBar3,
me.windowBar4,
'-',
//me.helpPrefs,
me.helpPrefs,
me.tray
];

Expand Down Expand Up @@ -238,8 +238,8 @@ Ext.define('EdiromOnline.view.desktop.TaskBar', {
return {
width: 64,
items: [
me.helpButton,
me.langButton/*,
me.helpButton/*,
me.langButton,
me.prefButton*/
]
};
Expand Down