Skip to content

Commit

Permalink
Fix app generation for annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfgangmm committed Jan 26, 2024
1 parent d589e50 commit 8e1ab51
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions modules/config.xqm
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ declare variable $config:taxonomy := $config:data-root || "/taxonomy.xml";
:)
declare variable $config:data-exclude := (
doc($config:taxonomy)//tei:text,
collection($config:register-root)//tei:text,
collection($config:data-root || "/doc")//tei:text
);

Expand Down
2 changes: 2 additions & 0 deletions modules/lib/api/generate.xql
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,9 @@ declare function deploy:create-app($collection as xs:string, $json as map(*)) {
deploy:copy-resource($collection || "/templates", $base || "/templates", "api.html", ($json?owner, "tei"), "rw-r--r--"),
deploy:mkcol($collection || "/data", ($json?owner, "tei"), "rw-r--r--"),
deploy:copy-resource($collection || "/data", $base || "/data", "taxonomy.xml", ($json?owner, "tei"), "rw-r--r--"),
deploy:copy-collection($collection || "/data/registers", $base || "/data/registers", ($json?owner, "tei"), "rw-r--r--"),
deploy:copy-resource($collection || "/resources/css", $base || "/resources/css", "theme.css", ($json?owner, "tei"), "rw-r--r--"),
deploy:copy-resource($collection || "/resources/css", $base || "/resources/css", "annotate.css", ($json?owner, "tei"), "rw-r--r--"),
deploy:copy-resource($collection || "/resources/i18n", $base || "/resources/i18n", "languages.json", ($json?owner, "tei"), "rw-r--r--"),
deploy:copy-resource($collection, $base, "icon.png", ($json?owner, "tei"), "rw-r--r--"),
xmldb:store($collection, "package.json", deploy:package-json($json), "application/json"),
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion templates/basic/modules/config.xqm
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ declare variable $config:data-default := $config:data-root;
: documents displayed in the browsing view.
:)
declare variable $config:data-exclude :=
doc($config:data-root || "/taxonomy.xml")//tei:text
doc($config:data-root || "/taxonomy.xml")//tei:text,
collection($config:register-root)//tei:text
;

(:~
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/annotate.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<paper-input name="facs" data-i18n="[label]annotations.facs"></paper-input>
</div>
<div class="annotation-form note">
<jinn-xml-editor name="content" placeholder="[Inline text/markup or sequence of paragraphs]" schema="resources/scripts/tei.json" schema-root="note" namespace="http://www.tei-c.org/ns/1.0">
<jinn-xml-editor name="content" placeholder="[Inline text/markup or sequence of paragraphs]" schema="resources/scripts/annotations/tei.json" schema-root="note" namespace="http://www.tei-c.org/ns/1.0">
<div slot="toolbar">
<button data-command="selectElement" title="Select element around current cursor position">&lt;|&gt;</button>
<button data-command="encloseWith" title="Enclose selection in new element">&lt;...&gt;</button>
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/annotation/organization-editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h2>Organization ID:
<fx-group id="note" ref="instance()" class="col-2">
<h2>Note</h2>
<fx-control ref="note" as="node" update-event="blur">
<jinn-xml-editor unwrap="unwrap" class="widget" placeholder="[Inline text/markup or sequence of paragraphs]" schema="resources/scripts/tei.json" schema-root="note" namespace="http://www.tei-c.org/ns/1.0">
<jinn-xml-editor unwrap="unwrap" class="widget" placeholder="[Inline text/markup or sequence of paragraphs]" schema="resources/scripts/annotations/tei.json" schema-root="note" namespace="http://www.tei-c.org/ns/1.0">
<div slot="toolbar">
<button data-command="selectElement" title="Select element around current cursor position">&lt;|&gt;</button>
<button data-command="encloseWith" title="Enclose selection in new element">&lt;...&gt;</button>
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/annotation/person-editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h2>Person ID:
<fx-group id="note" ref="instance()" class="col-2">
<h2>Note</h2>
<fx-control ref="note[@type='bio']" as="node" update-event="blur">
<jinn-xml-editor unwrap="unwrap" class="widget" placeholder="[Inline text/markup or sequence of paragraphs]" schema="resources/scripts/tei.json" schema-root="note" namespace="http://www.tei-c.org/ns/1.0">
<jinn-xml-editor unwrap="unwrap" class="widget" placeholder="[Inline text/markup or sequence of paragraphs]" schema="resources/scripts/annotations/tei.json" schema-root="note" namespace="http://www.tei-c.org/ns/1.0">
<div slot="toolbar">
<button data-command="selectElement" title="Select element around current cursor position">&lt;|&gt;</button>
<button data-command="encloseWith" title="Enclose selection in new element">&lt;...&gt;</button>
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/annotation/place-editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ <h2>Place ID:
<fx-group id="note" ref="instance()" class="col-2">
<h2>Note</h2>
<fx-control ref="note" as="node" update-event="blur">
<jinn-xml-editor unwrap="unwrap" class="widget" placeholder="[Inline text/markup or sequence of paragraphs]" schema="resources/scripts/tei.json" schema-root="note" namespace="http://www.tei-c.org/ns/1.0">
<jinn-xml-editor unwrap="unwrap" class="widget" placeholder="[Inline text/markup or sequence of paragraphs]" schema="resources/scripts/annotations/tei.json" schema-root="note" namespace="http://www.tei-c.org/ns/1.0">
<div slot="toolbar">
<button data-command="selectElement" title="Select element around current cursor position">&lt;|&gt;</button>
<button data-command="encloseWith" title="Enclose selection in new element">&lt;...&gt;</button>
Expand Down

0 comments on commit 8e1ab51

Please sign in to comment.