diff --git a/src/adonisjs/public/infra/basic.js b/src/adonisjs/public/infra/basic.js index f3c445de9..31a31ad9a 100644 --- a/src/adonisjs/public/infra/basic.js +++ b/src/adonisjs/public/infra/basic.js @@ -62,8 +62,9 @@ class Basic { imageResolver(path) { let result = path; + // improve if (!(path.startsWith("http://") || path.startsWith("https://") || - path.startsWith("/"))) + path.startsWith("/") || path.startsWith("../"))) result = DCCCommonServer.managerAddress + "artifacts/" + path; return result; } diff --git a/src/adonisjs/public/player/js/player.js b/src/adonisjs/public/player/js/player.js index 9ceefbcdb..0d7b54adb 100644 --- a/src/adonisjs/public/player/js/player.js +++ b/src/adonisjs/public/player/js/player.js @@ -145,6 +145,7 @@ class PlayerManager { async knotLoad(knotName) { this._currentKnot = knotName; + // Local Environment - Future /* this._knotScript = document.createElement("script"); this._knotScript.src = "knots/" + knotName + ".js"; @@ -155,7 +156,11 @@ class PlayerManager { console.log(this._knots); const knot = await this._translator.generateHTML( this._knots[knotName]); - this.presentKnot(knot); + if (this._knots[knotName].categories && + this._knots[knotName].categories.indexOf("note") > -1) + this.presentNote(knot); + else + this.presentKnot(knot); } MessageBus.ext.publish("knot/" + knotName + "/start"); } @@ -165,8 +170,11 @@ class PlayerManager { this._mainPanel.innerHTML = knot; + // Local Environment - Future + /* if (DCCPlayerServer.localEnv) document.head.removeChild(this._knotScript); + */ // Improve the strategy if (this._currentKnot == "entry") diff --git a/src/adonisjs/public/themes/classic/note.html b/src/adonisjs/public/themes/classic/note.html index 0f60d57a1..c66ba1f2b 100644 --- a/src/adonisjs/public/themes/classic/note.html +++ b/src/adonisjs/public/themes/classic/note.html @@ -1,2 +1,4 @@ - -
{knot}
\ No newline at end of file +
+ +
{knot}
+
\ No newline at end of file diff --git a/src/adonisjs/public/themes/minimal/css/theme.css b/src/adonisjs/public/themes/minimal/css/theme.css index 3e11b595f..5315067f9 100644 --- a/src/adonisjs/public/themes/minimal/css/theme.css +++ b/src/adonisjs/public/themes/minimal/css/theme.css @@ -1,5 +1,16 @@ @charset "UTF-8"; +body { + font-family: "Trebuchet MS", Helvetica, sans-serif; + font-size: 14pt; +} + +.sty-std-border { + border: 1px solid gray; + border-radius: 5px; + margin: 5px; +} + /* picture-up-left *****************/ @@ -17,3 +28,16 @@ margin-right: 10px; margin-bottom: 10px; } + +/* note + ******/ + +.styn-note { + background-color: White; + margin: 10px; +} + +.styn-control-button { + width: 48px; + height: 48px; +} \ No newline at end of file diff --git a/src/adonisjs/public/themes/minimal/images/icon-back.svg b/src/adonisjs/public/themes/minimal/images/icon-back.svg new file mode 100644 index 000000000..63a7be8ba --- /dev/null +++ b/src/adonisjs/public/themes/minimal/images/icon-back.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/adonisjs/public/themes/minimal/note.html b/src/adonisjs/public/themes/minimal/note.html index 4c98ac563..4c4ff0b1e 100644 --- a/src/adonisjs/public/themes/minimal/note.html +++ b/src/adonisjs/public/themes/minimal/note.html @@ -1,2 +1,7 @@ - -
{knot}
\ No newline at end of file +
+
+ +
+ +
{knot}
+
\ No newline at end of file