Merge pull request #19 from datasci4health/development

Note Template Working
harena-lab · May 16, 2019 · 7778f0b · 7778f0b
2 parents fedb26c + c4c27b0
commit 7778f0b
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 6 deletions.
diff --git 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;
+      // <TODO> 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
@@ -145,6 +145,7 @@ class PlayerManager {
 
    async knotLoad(knotName) {
       this._currentKnot = knotName;
+      // <TODO> 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;
 
+      // <TODO> Local Environment - Future
+      /*
       if (DCCPlayerServer.localEnv)
          document.head.removeChild(this._knotScript);
+      */
 
       // <TODO> 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
@@ -1,2 +1,4 @@
-<img src="/themes/classic/images/icon-back.svg">
-<div class="tsty-pul-main">{knot}</div>
+<div class="sty-std-border styn-note">
+   <img src="/themes/classic/images/icon-back.svg">
+   <div class="tsty-pul-main">{knot}</div>
+</div>
diff --git 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;
+}
diff --git a/src/adonisjs/public/themes/minimal/images/icon-back.svg b/src/adonisjs/public/themes/minimal/images/icon-back.svg
diff --git a/src/adonisjs/public/themes/minimal/note.html b/src/adonisjs/public/themes/minimal/note.html
@@ -1,2 +1,7 @@
-<img src="/themes/minimal/images/icon-back.svg">
-<div class="tsty-pul-main">{knot}</div>
+<div class="sty-std-border styn-note">
+   <div class="styn-control-button">
+      <dcc-trigger action="knot/</navigate" label="Previous Knot" image="../themes/minimal/images/icon-back.svg"></dcc-trigger>
+   </div>
+
+   <div class="tsty-pul-main">{knot}</div>
+</div>