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.

Sign up for GitHub

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
Merged

reactivated help button and fixed xquery parameters problems #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b8201a
reactivated help button and fixed xquery parameters problems
daniel-jettka Nov 15, 2024
eb3f20a
Merge branch 'develop' into ftr/209-reactivate-help
daniel-jettka Nov 21, 2024
652467f
removed uri GET parameter
daniel-jettka Nov 21, 2024
55d64c4
added comment about empty docUri parameter
daniel-jettka Nov 27, 2024
b7f6fe5
Merge branch 'develop' into ftr/209-reactivate-help
roewenstrunk Nov 27, 2024
4a7e7d2
Merge branch 'develop' into ftr/209-reactivate-help
daniel-jettka Nov 28, 2024
fa56c94
Merge branch 'ftr/209-reactivate-help' of https://github.com/Edirom/E…
daniel-jettka Nov 28, 2024
2ba344a
Merge branch 'develop' into ftr/209-reactivate-help
roewenstrunk Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion add/data/xql/getHelp.xql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ declare option output:omit-xml-declaration "yes";

let $lang := request:get-parameter('lang', 'en')
let $idPrefix := request:get-parameter('idPrefix', '')
let $contextPath := request:get-context-path()

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

Expand All @@ -35,14 +36,17 @@ 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}"/>
(: == passing empty value for docUri (XSLT expects xs:anyURI, but ExtJS view does not provide value) -> github#480 == :)
<param name="docUri" value="''"/>
</parameters>
)

Expand Down
1 change: 0 additions & 1 deletion app/controller/window/HelpWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ Ext.define('EdiromOnline.controller.window.HelpWindow', {
window.doAJAXRequest('data/xql/getHelp.xql',
'GET',
{
uri: win.uri,
lang: window.getLanguage(),
idPrefix: win.id
},
Expand Down
2 changes: 1 addition & 1 deletion app/view/desktop/Desktop.js
View file
Open in desktop
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
View file
Open in desktop
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