From 4b8201ad1f60d01d6eaaef8fc03203ecb5ed3cc2 Mon Sep 17 00:00:00 2001 From: Daniel Jettka Date: Fri, 15 Nov 2024 13:58:26 +0100 Subject: [PATCH] reactivated help button and fixed xquery parameters problems --- add/data/xql/getHelp.xql | 6 +++++- app/view/desktop/Desktop.js | 2 +- app/view/desktop/TaskBar.js | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql index d73b863a7..cdba6cb7e 100644 --- a/add/data/xql/getHelp.xql +++ b/add/data/xql/getHelp.xql @@ -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', '') +let $contextPath := request:get-context-path() let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '') (:TODO:) @@ -35,7 +37,7 @@ let $doc := ) -let $xsl := doc('../xslt/teiBody2HTML.xsl') +let $xsl := doc('../xslt/tei/profiles/edirom-body/teiBody2HTML.xsl') let $doc := transform:transform($doc, $xsl, @@ -43,6 +45,8 @@ let $doc := + + ) diff --git a/app/view/desktop/Desktop.js b/app/view/desktop/Desktop.js index 6dea2561f..f5fbb6579 100644 --- a/app/view/desktop/Desktop.js +++ b/app/view/desktop/Desktop.js @@ -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(); diff --git a/app/view/desktop/TaskBar.js b/app/view/desktop/TaskBar.js index c34be95a5..8e56a88d2 100644 --- a/app/view/desktop/TaskBar.js +++ b/app/view/desktop/TaskBar.js @@ -73,7 +73,7 @@ Ext.define('EdiromOnline.view.desktop.TaskBar', { me.windowBar3, me.windowBar4, '-', - //me.helpPrefs, + me.helpPrefs, me.tray ]; @@ -238,8 +238,8 @@ Ext.define('EdiromOnline.view.desktop.TaskBar', { return { width: 64, items: [ - me.helpButton, - me.langButton/*, + me.helpButton/*, + me.langButton, me.prefButton*/ ] };