From bd010d83bc349b5acea056dcd3a376978d3e0d11 Mon Sep 17 00:00:00 2001 From: Rob Moffat Date: Fri, 29 Jul 2022 09:55:33 +0100 Subject: [PATCH] Fixing content insertion --- .../github/AbstractGithubEntityConverter.java | 8 ++++---- .../local/AbstractPublicEntityConverter.java | 4 ++-- .../server/web/HateoasADLHttpMessageWriter.java | 2 +- .../src/main/resources/page-template.html | 4 ++-- .../public/behaviours/updatable/adlResolver.js | 2 +- .../resources/static/public/examples/basic.adl | 2 +- .../resources/static/public/examples/formats.adl | 2 +- .../com/kite9/server/adl/PrivateGithubIT.java | 2 +- .../rendering/post/testESVGRender/diagram.svg | 2 +- .../rendering/post/testHTMLRender/diagram.html | 2 +- .../rendering/post/testSVGRender/diagram-2.svg | 2 +- .../rendering/post/testSVGRender/diagram.svg | 2 +- .../rendering/public/testExampleESVG/diagram.svg | 2 +- .../public/testExampleHTML/diagram.html | 2 +- .../rendering/public/testExampleSVG/diagram.svg | 2 +- .../public/templates/admin/index.adl.svg | 2 +- .../public/templates/basic/example.adl.svg | 2 +- .../public/templates/basic/palette.adl.svg | 2 +- .../public/templates/bpmn/example.adl.svg | 2 +- .../templates/bpmn/links/bpmn-links.adl.svg | 2 +- .../public/templates/bpmn/palette.adl.svg | 2 +- .../common/font-awesome/example.adl.svg | 2 +- .../containers/common-containers.adl.svg | 2 +- .../public/templates/designer/example.adl.svg | 2 +- .../public/templates/designer/palette.adl.svg | 2 +- .../public/templates/flowchart/example.adl.svg | 2 +- .../flowchart/palette-captioned.adl.svg | 2 +- .../templates/flowchart/palette-inline.adl.svg | 2 +- .../public/templates/grid/common-grid.adl.svg | 2 +- .../templates/labels/common-labels.adl.svg | 2 +- .../public/templates/links/common-ends.adl.svg | 2 +- .../public/templates/links/common-links.adl.svg | 2 +- .../risk-first/artifact-palette.adl.svg | 2 +- .../public/templates/risk-first/example.adl.svg | 2 +- .../risk-first/fixed-risk-palette.adl.svg | 2 +- .../public/templates/risk-first/list.adl.svg | 2 +- .../public/templates/risk-first/minimal.adl.svg | 2 +- .../templates/risk-first/risk-palette.adl.svg | 2 +- .../public/templates/risk-first/square.adl.svg | 2 +- .../public/templates/risk-first/votes.adl.svg | 2 +- .../public/templates/uml/example.adl.svg | 2 +- .../public/templates/uml/palette.adl.svg | 2 +- templates/admin/admin-template.xsl | 6 +++--- templates/admin/admin.js | 2 +- templates/basic/basic-template.xsl | 8 ++++---- templates/basic/basic.js | 8 ++++---- templates/containers/containers.js | 2 +- templates/designer/designer-template.xsl | 2 +- templates/designer/designer.js | 8 ++++---- templates/editor/editor.css | 6 +++--- templates/editor/editor.js | 2 +- templates/flowchart/flowchart-template.xsl | 2 +- templates/flowchart/flowchart.js | 8 ++++---- templates/font-awesome/font-awesome-template.xsl | 2 +- templates/grid/grid.js | 2 +- templates/labels/labels.js | 2 +- templates/links/links.js | 2 +- templates/risk-first/risk-first-template.xsl | 2 +- templates/risk-first/risk-first.js | 10 +++++----- templates/texture/texture-components.xsl | 14 ++++++-------- templates/tweet/tweet-template.xsl | 2 +- templates/tweet/tweet-textures.css | 16 ++++++++-------- templates/tweet/tweet.js | 8 ++++---- templates/uml/uml-template.xsl | 2 +- templates/uml/uml.js | 8 ++++---- templates/votes/votes.js | 2 +- .../display/test_58_1_SimpleGlyphPlusScript.svg | 2 +- 67 files changed, 110 insertions(+), 112 deletions(-) diff --git a/server/kite9-server-java/src/main/java/com/kite9/server/persistence/github/AbstractGithubEntityConverter.java b/server/kite9-server-java/src/main/java/com/kite9/server/persistence/github/AbstractGithubEntityConverter.java index 112f49a98..857d80398 100644 --- a/server/kite9-server-java/src/main/java/com/kite9/server/persistence/github/AbstractGithubEntityConverter.java +++ b/server/kite9-server-java/src/main/java/com/kite9/server/persistence/github/AbstractGithubEntityConverter.java @@ -51,7 +51,7 @@ public String getTitle() { @Override public String getIcon() { - return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.11"; + return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.12"; } @Override @@ -89,7 +89,7 @@ public String getTitle() { @Override public String getIcon() { - return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.11"; + return "/github/kite9-org/kite9/templates/admin/icons/github.png?v=v0.12"; } @Override @@ -281,9 +281,9 @@ private String getIconUrl(Link l, GHContent c) { if (fs.getFormatFor(c.getName()) instanceof DiagramFileFormat) { return l.getHref(); } else if (hasIcon(c.getName())) { - return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(c.getName())+".svg?v=v0.11"; + return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(c.getName())+".svg?v=v0.12"; } else { - return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.11"; + return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.12"; } } diff --git a/server/kite9-server-java/src/main/java/com/kite9/server/persistence/local/AbstractPublicEntityConverter.java b/server/kite9-server-java/src/main/java/com/kite9/server/persistence/local/AbstractPublicEntityConverter.java index 3e1308046..19e118aa6 100644 --- a/server/kite9-server-java/src/main/java/com/kite9/server/persistence/local/AbstractPublicEntityConverter.java +++ b/server/kite9-server-java/src/main/java/com/kite9/server/persistence/local/AbstractPublicEntityConverter.java @@ -121,9 +121,9 @@ private String getExtension(String name) { @Override public String getIcon() { if (hasIcon(d.getFilename())) { - return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(d.getFilename())+".svg?v=v0.11"; + return "/github/kite9-org/kite9/templates/admin/icons/"+getExtension(d.getFilename())+".svg?v=v0.12"; } else { - return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.11"; + return "/github/kite9-org/kite9/templates/admin/icons/unknown.svg?v=v0.12"; } } diff --git a/server/kite9-server-java/src/main/java/com/kite9/server/web/HateoasADLHttpMessageWriter.java b/server/kite9-server-java/src/main/java/com/kite9/server/web/HateoasADLHttpMessageWriter.java index 6338b9ddf..ee666a589 100644 --- a/server/kite9-server-java/src/main/java/com/kite9/server/web/HateoasADLHttpMessageWriter.java +++ b/server/kite9-server-java/src/main/java/com/kite9/server/web/HateoasADLHttpMessageWriter.java @@ -171,7 +171,7 @@ protected Document generateRestXML(RepresentationModel t) throws XMLStreamExc } private void handleTemplateNaming(Document out) { - out.getDocumentElement().setAttributeNS(Kite9Namespaces.XSL_TEMPLATE_NAMESPACE, "xslt:template", "/github/kite9-org/kite9/templates/admin/admin-template.xsl?v=v0.11"); + out.getDocumentElement().setAttributeNS(Kite9Namespaces.XSL_TEMPLATE_NAMESPACE, "xslt:template", "/github/kite9-org/kite9/templates/admin/admin-template.xsl?v=v0.12"); } /** diff --git a/server/kite9-server-java/src/main/resources/page-template.html b/server/kite9-server-java/src/main/resources/page-template.html index 0896b0c85..bbc5158d9 100644 --- a/server/kite9-server-java/src/main/resources/page-template.html +++ b/server/kite9-server-java/src/main/resources/page-template.html @@ -8,7 +8,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/server/kite9-server-java/src/main/resources/static/public/behaviours/updatable/adlResolver.js b/server/kite9-server-java/src/main/resources/static/public/behaviours/updatable/adlResolver.js index 8c391d9f0..511a2b7e2 100644 --- a/server/kite9-server-java/src/main/resources/static/public/behaviours/updatable/adlResolver.js +++ b/server/kite9-server-java/src/main/resources/static/public/behaviours/updatable/adlResolver.js @@ -6,7 +6,7 @@ export function createAdlToSVGResolver(transition, command, metadata) { const XSL_TEMPLATE_NAMESPACE = "http://www.kite9.org/schema/xslt"; const ADL_NAMESPACE = "http://www.kite9.org/schema/adl"; - const DEFAULT_TEMPLATE = "/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.11"; + const DEFAULT_TEMPLATE = "/github/kite9-org/kite9/templates/basic/basic-template.xsl?v=v0.12"; const META_NAMESPACE = "http://www.kite9.org/schema/metadata"; diff --git a/server/kite9-server-java/src/main/resources/static/public/examples/basic.adl b/server/kite9-server-java/src/main/resources/static/public/examples/basic.adl index a15a11d29..c3d91e79b 100644 --- a/server/kite9-server-java/src/main/resources/static/public/examples/basic.adl +++ b/server/kite9-server-java/src/main/resources/static/public/examples/basic.adl @@ -1,4 +1,4 @@ - diff --git a/server/kite9-server-java/src/main/resources/static/public/examples/formats.adl b/server/kite9-server-java/src/main/resources/static/public/examples/formats.adl index 9af430df8..f08de11eb 100644 --- a/server/kite9-server-java/src/main/resources/static/public/examples/formats.adl +++ b/server/kite9-server-java/src/main/resources/static/public/examples/formats.adl @@ -4,7 +4,7 @@ - @import url('/github/kite9-org/kite9/templates/formats/formats-textures.css?v=v0.11'); + @import url('/github/kite9-org/kite9/templates/formats/formats-textures.css?v=v0.12'); diff --git a/server/kite9-server-java/src/test/java/com/kite9/server/adl/PrivateGithubIT.java b/server/kite9-server-java/src/test/java/com/kite9/server/adl/PrivateGithubIT.java index ba68af2ef..595336ace 100644 --- a/server/kite9-server-java/src/test/java/com/kite9/server/adl/PrivateGithubIT.java +++ b/server/kite9-server-java/src/test/java/com/kite9/server/adl/PrivateGithubIT.java @@ -17,7 +17,7 @@ @ContextConfiguration public class PrivateGithubIT extends AbstractRestIT { - public static final String JS = "/github/kite9-org/examples/some.js?v=v0.11"; + public static final String JS = "/github/kite9-org/examples/some.js?v=v0.12"; public static final String DIR = "/github/kite9-org/examples"; diff --git a/server/kite9-server-java/src/test/resources/rendering/post/testESVGRender/diagram.svg b/server/kite9-server-java/src/test/resources/rendering/post/testESVGRender/diagram.svg index b99174850..a6b162b29 100644 --- a/server/kite9-server-java/src/test/resources/rendering/post/testESVGRender/diagram.svg +++ b/server/kite9-server-java/src/test/resources/rendering/post/testESVGRender/diagram.svg @@ -139,7 +139,7 @@ }; diff --git a/server/kite9-server-java/src/test/resources/rendering/post/testHTMLRender/diagram.html b/server/kite9-server-java/src/test/resources/rendering/post/testHTMLRender/diagram.html index dc1c2a194..2442d312b 100644 --- a/server/kite9-server-java/src/test/resources/rendering/post/testHTMLRender/diagram.html +++ b/server/kite9-server-java/src/test/resources/rendering/post/testHTMLRender/diagram.html @@ -168,7 +168,7 @@ }; diff --git a/server/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram-2.svg b/server/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram-2.svg index 1f2dea52c..a3ac31aab 100644 --- a/server/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram-2.svg +++ b/server/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram-2.svg @@ -2840,5 +2840,5 @@ stroke-width: 1pt; Software Methodology \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram.svg b/server/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram.svg index 2235df83a..6ab59bc70 100644 --- a/server/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram.svg +++ b/server/kite9-server-java/src/test/resources/rendering/post/testSVGRender/diagram.svg @@ -1385,7 +1385,7 @@ stroke-width: 1pt; diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleESVG/diagram.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleESVG/diagram.svg index b3f28398a..dcaba27ec 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleESVG/diagram.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleESVG/diagram.svg @@ -141,7 +141,7 @@ }; diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleHTML/diagram.html b/server/kite9-server-java/src/test/resources/rendering/public/testExampleHTML/diagram.html index 1970bf6ac..175dcd856 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleHTML/diagram.html +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleHTML/diagram.html @@ -170,7 +170,7 @@ }; diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/diagram.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/diagram.svg index 0c7a38257..dccc1b29b 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/diagram.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/diagram.svg @@ -1387,7 +1387,7 @@ stroke-width: 1pt; diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/admin/index.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/admin/index.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/admin/index.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/admin/index.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/basic/example.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/basic/example.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/basic/example.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/basic/example.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/basic/palette.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/basic/palette.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/basic/palette.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/basic/palette.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/example.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/example.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/example.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/example.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/links/bpmn-links.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/links/bpmn-links.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/links/bpmn-links.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/links/bpmn-links.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/palette.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/palette.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/palette.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/bpmn/palette.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/common/font-awesome/example.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/common/font-awesome/example.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/common/font-awesome/example.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/common/font-awesome/example.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/containers/common-containers.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/containers/common-containers.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/containers/common-containers.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/containers/common-containers.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/designer/example.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/designer/example.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/designer/example.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/designer/example.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/designer/palette.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/designer/palette.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/designer/palette.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/designer/palette.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/example.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/example.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/example.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/example.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/palette-captioned.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/palette-captioned.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/palette-captioned.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/palette-captioned.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/palette-inline.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/palette-inline.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/palette-inline.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/flowchart/palette-inline.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/grid/common-grid.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/grid/common-grid.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/grid/common-grid.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/grid/common-grid.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/labels/common-labels.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/labels/common-labels.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/labels/common-labels.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/labels/common-labels.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/links/common-ends.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/links/common-ends.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/links/common-ends.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/links/common-ends.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/links/common-links.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/links/common-links.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/links/common-links.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/links/common-links.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/artifact-palette.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/artifact-palette.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/artifact-palette.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/artifact-palette.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/example.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/example.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/example.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/example.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/fixed-risk-palette.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/fixed-risk-palette.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/fixed-risk-palette.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/fixed-risk-palette.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/list.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/list.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/list.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/list.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/minimal.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/minimal.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/minimal.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/minimal.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/risk-palette.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/risk-palette.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/risk-palette.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/risk-palette.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/square.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/square.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/square.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/square.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/votes.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/votes.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/votes.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/risk-first/votes.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/uml/example.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/uml/example.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/uml/example.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/uml/example.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/uml/palette.adl.svg b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/uml/palette.adl.svg index 877690667..64bea04c3 100644 --- a/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/uml/palette.adl.svg +++ b/server/kite9-server-java/src/test/resources/rendering/public/testExampleSVG/public/templates/uml/palette.adl.svg @@ -1539,5 +1539,5 @@ kite9-padding-left: 20pt; 'label-template-uri' : 'http://localhost:39000/public/templates/labels/common-labels.adl#label' } \ No newline at end of file diff --git a/templates/admin/admin-template.xsl b/templates/admin/admin-template.xsl index 695d80d1b..19758f038 100644 --- a/templates/admin/admin-template.xsl +++ b/templates/admin/admin-template.xsl @@ -15,19 +15,19 @@ - import '/github/kite9-org/kite9/templates/admin/admin.js?v=v0.11' + import '/github/kite9-org/kite9/templates/admin/admin.js?v=v0.12' - @import url('/github/kite9-org/kite9/templates/admin/admin-elements.css?v=v0.11'); + @import url('/github/kite9-org/kite9/templates/admin/admin-elements.css?v=v0.12'); - @import url('/github/kite9-org/kite9/templates/admin/admin-textures.css?v=v0.11'); + @import url('/github/kite9-org/kite9/templates/admin/admin-textures.css?v=v0.12'); diff --git a/templates/admin/admin.js b/templates/admin/admin.js index 796d3df07..dfdc21c8c 100644 --- a/templates/admin/admin.js +++ b/templates/admin/admin.js @@ -2,7 +2,7 @@ * This composes the basic edit behaviour of the application */ -import { metadata, transition, contextMenu } from '/github/kite9-org/kite9/templates/adl/adl.js?v=v0.11' +import { metadata, transition, contextMenu } from '/github/kite9-org/kite9/templates/adl/adl.js?v=v0.12' // navigation import { initFocusContextMenuCallback, initFocusMetadataCallback, initFocus } from '/public/behaviours/navigable/focus/focus.js' diff --git a/templates/basic/basic-template.xsl b/templates/basic/basic-template.xsl index 4bf8a8991..ff16950fc 100644 --- a/templates/basic/basic-template.xsl +++ b/templates/basic/basic-template.xsl @@ -8,15 +8,15 @@ - @import url('/github/kite9-org/kite9/templates/basic/basic-elements.css?v=v0.11'); + @import url('/github/kite9-org/kite9/templates/basic/basic-elements.css?v=v0.12'); - @import url('/github/kite9-org/kite9/templates/basic/basic-textures.css?v=v0.11'); + @import url('/github/kite9-org/kite9/templates/basic/basic-textures.css?v=v0.12'); - import '/github/kite9-org/kite9/templates/basic/basic.js?v=v0.11' + import '/github/kite9-org/kite9/templates/basic/basic.js?v=v0.12' @@ -28,7 +28,7 @@ - + diff --git a/templates/basic/basic.js b/templates/basic/basic.js index 7764afd04..f05bc9bcf 100644 --- a/templates/basic/basic.js +++ b/templates/basic/basic.js @@ -1,4 +1,4 @@ -import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.11' -import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.11' -import '/github/kite9-org/kite9/templates/links/links.js?v=v0.11' -import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.11' +import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.12' +import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.12' +import '/github/kite9-org/kite9/templates/links/links.js?v=v0.12' +import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.12' diff --git a/templates/containers/containers.js b/templates/containers/containers.js index a9d81aa6c..b049ff8f3 100644 --- a/templates/containers/containers.js +++ b/templates/containers/containers.js @@ -1,7 +1,7 @@ import { once } from '/public/bundles/ensure.js' -import { command, metadata, dragger, contextMenu, layout, containment, palette } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.11' +import { command, metadata, dragger, contextMenu, layout, containment, palette } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.12' //Containers import { initInsertPaletteCallback, initInsertContextMenuCallback, initInsertDragLocator } from '/public/behaviours/containers/insert/containers-insert.js' diff --git a/templates/designer/designer-template.xsl b/templates/designer/designer-template.xsl index 2f8c3e408..de984b207 100644 --- a/templates/designer/designer-template.xsl +++ b/templates/designer/designer-template.xsl @@ -14,7 +14,7 @@ - import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.11' + import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.12' diff --git a/templates/designer/designer.js b/templates/designer/designer.js index 7764afd04..f05bc9bcf 100644 --- a/templates/designer/designer.js +++ b/templates/designer/designer.js @@ -1,4 +1,4 @@ -import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.11' -import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.11' -import '/github/kite9-org/kite9/templates/links/links.js?v=v0.11' -import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.11' +import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.12' +import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.12' +import '/github/kite9-org/kite9/templates/links/links.js?v=v0.12' +import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.12' diff --git a/templates/editor/editor.css b/templates/editor/editor.css index 0d13ee5c5..d75612d60 100644 --- a/templates/editor/editor.css +++ b/templates/editor/editor.css @@ -1,6 +1,6 @@ -@import url('/github/kite9-org/kite9/templates/editor/dragable.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/highlight/highlight.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/editor/contradictions.css?v=v0.11'); +@import url('/github/kite9-org/kite9/templates/editor/dragable.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/highlight/highlight.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/editor/contradictions.css?v=v0.12'); /* * ensures enough space to drag in when using the editor diff --git a/templates/editor/editor.js b/templates/editor/editor.js index 7be92560d..1cf4e67c3 100644 --- a/templates/editor/editor.js +++ b/templates/editor/editor.js @@ -38,7 +38,7 @@ import { once } from '/public/bundles/ensure.js' * These are the global variables containing all of the classes used by the editor, and can be extended by other scripts using the * plugin/behaviour system. */ -import { command, metadata, transition, instrumentation, dragger, contextMenu, palette } from '/github/kite9-org/kite9/templates/adl/adl.js?v=v0.11' +import { command, metadata, transition, instrumentation, dragger, contextMenu, palette } from '/github/kite9-org/kite9/templates/adl/adl.js?v=v0.12' const containment = new Containment(), diff --git a/templates/flowchart/flowchart-template.xsl b/templates/flowchart/flowchart-template.xsl index c93da648a..0ab17afb9 100644 --- a/templates/flowchart/flowchart-template.xsl +++ b/templates/flowchart/flowchart-template.xsl @@ -7,7 +7,7 @@ - import '/github/kite9-org/kite9/templates/flowchart/flowchart.js?v=v0.11' + import '/github/kite9-org/kite9/templates/flowchart/flowchart.js?v=v0.12' diff --git a/templates/flowchart/flowchart.js b/templates/flowchart/flowchart.js index 7764afd04..f05bc9bcf 100644 --- a/templates/flowchart/flowchart.js +++ b/templates/flowchart/flowchart.js @@ -1,4 +1,4 @@ -import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.11' -import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.11' -import '/github/kite9-org/kite9/templates/links/links.js?v=v0.11' -import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.11' +import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.12' +import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.12' +import '/github/kite9-org/kite9/templates/links/links.js?v=v0.12' +import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.12' diff --git a/templates/font-awesome/font-awesome-template.xsl b/templates/font-awesome/font-awesome-template.xsl index 68f3c733f..c8660dd02 100644 --- a/templates/font-awesome/font-awesome-template.xsl +++ b/templates/font-awesome/font-awesome-template.xsl @@ -16,7 +16,7 @@ - import '/github/kite9-org/kite9/templates/basic/basic.js?v=v0.11' + import '/github/kite9-org/kite9/templates/basic/basic.js?v=v0.12' diff --git a/templates/grid/grid.js b/templates/grid/grid.js index 2de225e54..5775a04ce 100644 --- a/templates/grid/grid.js +++ b/templates/grid/grid.js @@ -12,7 +12,7 @@ import { initGridLayoutPropertyFormCallback, initGridLayoutPropertySetCallback } import { initCellCreator } from '/public/behaviours/grid/create/create.js' -import { command, metadata, dragger, contextMenu, layout, palette, containment } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.11' +import { command, metadata, dragger, contextMenu, layout, palette, containment } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.12' export function initGrid() { diff --git a/templates/labels/labels.js b/templates/labels/labels.js index c51194436..b7ffecad3 100644 --- a/templates/labels/labels.js +++ b/templates/labels/labels.js @@ -1,6 +1,6 @@ import { once } from '/public/bundles/ensure.js' import { initLabelContextMenuCallback } from '/public/behaviours/labels/label.js' -import { command, metadata, contextMenu } from '/github/kite9-org/kite9/templates/adl/adl.js?v=v0.11' +import { command, metadata, contextMenu } from '/github/kite9-org/kite9/templates/adl/adl.js?v=v0.12' function initLabels() { diff --git a/templates/links/links.js b/templates/links/links.js index f342703cd..c1fc0a400 100644 --- a/templates/links/links.js +++ b/templates/links/links.js @@ -5,7 +5,7 @@ import { once } from '/public/bundles/ensure.js' import { Linker } from '/public/classes/linker/linker.js' -import { command, metadata, instrumentation, dragger, contextMenu, containment, palette } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.11' +import { command, metadata, instrumentation, dragger, contextMenu, containment, palette } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.12' // Links import { initLinkable, updateLink, initLinkerDropCallback } from '/public/behaviours/links/linkable.js' diff --git a/templates/risk-first/risk-first-template.xsl b/templates/risk-first/risk-first-template.xsl index 1bb99324e..7695e5ab3 100644 --- a/templates/risk-first/risk-first-template.xsl +++ b/templates/risk-first/risk-first-template.xsl @@ -12,7 +12,7 @@ - import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.11' + import '/github/kite9-org/kite9/templates/risk-first/risk-first.js?v=v0.12' diff --git a/templates/risk-first/risk-first.js b/templates/risk-first/risk-first.js index 0be57a5c2..eba008110 100644 --- a/templates/risk-first/risk-first.js +++ b/templates/risk-first/risk-first.js @@ -1,5 +1,5 @@ -import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.11' -import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.11' -import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.11' -import '/github/kite9-org/kite9/templates/links/links.js?v=v0.11' -import '/github/kite9-org/kite9/templates/votes/votes.js?v=v0.11' +import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.12' +import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.12' +import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.12' +import '/github/kite9-org/kite9/templates/links/links.js?v=v0.12' +import '/github/kite9-org/kite9/templates/votes/votes.js?v=v0.12' diff --git a/templates/texture/texture-components.xsl b/templates/texture/texture-components.xsl index 3037ef452..dda736f60 100644 --- a/templates/texture/texture-components.xsl +++ b/templates/texture/texture-components.xsl @@ -86,16 +86,14 @@ - + - shape - - content + @@ -103,11 +101,10 @@ - + - content @@ -115,8 +112,9 @@ - decoration - + + + diff --git a/templates/tweet/tweet-template.xsl b/templates/tweet/tweet-template.xsl index 683d49168..487607b25 100644 --- a/templates/tweet/tweet-template.xsl +++ b/templates/tweet/tweet-template.xsl @@ -18,7 +18,7 @@ - import '/github/kite9-org/kite9/templates/tweet/tweet.js?v=v0.11' + import '/github/kite9-org/kite9/templates/tweet/tweet.js?v=v0.12' diff --git a/templates/tweet/tweet-textures.css b/templates/tweet/tweet-textures.css index 9da3f74e8..690ada185 100644 --- a/templates/tweet/tweet-textures.css +++ b/templates/tweet/tweet-textures.css @@ -1,11 +1,11 @@ -@import url('/github/kite9-org/kite9/templates/texture/texture-defaults.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/containers/containers-textures.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/links/links-textures.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/grid/grid-textures.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/labels/labels-textures.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/links/links-textures.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/highlight/highlight.css?v=v0.11'); -@import url('/github/kite9-org/kite9/templates/editor/editor.css?v=v0.11'); +@import url('/github/kite9-org/kite9/templates/texture/texture-defaults.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/containers/containers-textures.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/links/links-textures.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/grid/grid-textures.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/labels/labels-textures.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/links/links-textures.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/highlight/highlight.css?v=v0.12'); +@import url('/github/kite9-org/kite9/templates/editor/editor.css?v=v0.12'); @import url('/public/fonts/chirp/chirp-ttf.css'); @import url('/public/fonts/noto-sans/NotoSans.css'); @import url('/public/fonts/dancing-script/DancingScript.css'); diff --git a/templates/tweet/tweet.js b/templates/tweet/tweet.js index 7764afd04..f05bc9bcf 100644 --- a/templates/tweet/tweet.js +++ b/templates/tweet/tweet.js @@ -1,4 +1,4 @@ -import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.11' -import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.11' -import '/github/kite9-org/kite9/templates/links/links.js?v=v0.11' -import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.11' +import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.12' +import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.12' +import '/github/kite9-org/kite9/templates/links/links.js?v=v0.12' +import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.12' diff --git a/templates/uml/uml-template.xsl b/templates/uml/uml-template.xsl index 8363878ef..e619c5ac3 100644 --- a/templates/uml/uml-template.xsl +++ b/templates/uml/uml-template.xsl @@ -9,7 +9,7 @@ - import '/github/kite9-org/kite9/templates/uml/uml.js?v=v0.11' + import '/github/kite9-org/kite9/templates/uml/uml.js?v=v0.12' diff --git a/templates/uml/uml.js b/templates/uml/uml.js index cb75f09ab..72ffcf528 100644 --- a/templates/uml/uml.js +++ b/templates/uml/uml.js @@ -1,4 +1,4 @@ -import '/github/kite9-org/kite9/templates/links/links.js?v=v0.11' -import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.11' -import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.11' -import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.11' +import '/github/kite9-org/kite9/templates/links/links.js?v=v0.12' +import '/github/kite9-org/kite9/templates/labels/labels.js?v=v0.12' +import '/github/kite9-org/kite9/templates/grid/grid.js?v=v0.12' +import '/github/kite9-org/kite9/templates/containers/containers.js?v=v0.12' diff --git a/templates/votes/votes.js b/templates/votes/votes.js index bad823e7b..2d9d62313 100644 --- a/templates/votes/votes.js +++ b/templates/votes/votes.js @@ -1,4 +1,4 @@ -import { contextMenu, command, metadata } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.11' +import { contextMenu, command, metadata } from '/github/kite9-org/kite9/templates/editor/editor.js?v=v0.12' import { initVoteContextMenuCallback } from '/public/behaviours/voting/vote/vote.js' import { once } from '/public/bundles/ensure.js' diff --git a/visualization/kite9-visualization-java/src/test/resources/org/kite9/diagram/functional/display/test_58_1_SimpleGlyphPlusScript.svg b/visualization/kite9-visualization-java/src/test/resources/org/kite9/diagram/functional/display/test_58_1_SimpleGlyphPlusScript.svg index 5216c51a9..2798bd3d8 100644 --- a/visualization/kite9-visualization-java/src/test/resources/org/kite9/diagram/functional/display/test_58_1_SimpleGlyphPlusScript.svg +++ b/visualization/kite9-visualization-java/src/test/resources/org/kite9/diagram/functional/display/test_58_1_SimpleGlyphPlusScript.svg @@ -177,7 +177,7 @@