Merge pull request #226 from datasci4health/development

Development

src/adonisjs/public/author/js/author.js

@@ -287,7 +287,9 @@ class AuthorManager {
 
     this._knots = this._compiledCase.knots
 
-    Basic.service.currentThemeFamily = this._compiledCase.theme
+    // Basic.service.currentThemeFamily = this._compiledCase.theme
+    console.log('=== setting theme family')
+    Basic.service.composedThemeFamily(this._compiledCase.theme)
     if (this._compiledCase.title) { this._currentCaseTitle = this._compiledCase.title }
 
     console.log('***** COMPILED CASE *****')

src/adonisjs/public/dccs/components/dcc-block.js

@@ -171,7 +171,10 @@ class DCCBlock extends DCCMultiVisual {
       } else if (this.xstyle == 'theme') {
         html = "<style>@import '" +
                       Basic.service.themeStyleResolver(this.elementTag() + '.css') +
-                   "' </style>" + html
+               "' </style>\n" +
+               "<style>@import '" +
+                      Basic.service.themeCustomStyleResolver(this.elementTag() + '.css') +
+               "' </style>" + html
       }
 
       const template = document.createElement('template')

src/adonisjs/public/infra/basic.js

@@ -10,6 +10,7 @@ class Basic {
     // initial values of shared states
     this._currentThemeFamily = Basic.standardThemeFamily
     this._currentThemeCSS = null
+    this._currentCustomCSS = null
     this.currentCaseId = null
 
     /*
@@ -48,13 +49,40 @@ class Basic {
   }
 
   set currentThemeFamily (newValue) {
-    // Translator.instance.currentThemeFamily = newValue;
     this._currentThemeFamily = newValue
 
     this._currentThemeCSS =
          this.replaceStyle(document, this._currentThemeCSS, newValue)
   }
 
+  get currentCustomTheme () {
+    return this._currentCustomTheme
+  }
+
+  set currentCustomTheme (newValue) {
+    this._currentCustomTheme = newValue
+
+    this._currentCustomCSS =
+         this.replaceStyle(document, this._currentCustomCSS, this.currentThemeFamily,
+           newValue + '/theme.css')
+  }
+
+  composedThemeFamily (themeFamily) {
+    const dtf = this.decomposeThemeFamily(themeFamily);
+    this.currentThemeFamily = dtf.family
+    this.currentCustomTheme = dtf.custom
+  }
+
+  decomposeThemeFamily (themeFamily) {
+    let family = themeFamily;
+    let custom = "default";
+    if (family.includes("(")) {
+      custom = family.substring(family.indexOf('(') + 1, family.length - 1)
+      family = family.substring(0, family.indexOf('('))
+    }
+    return {family: family, custom: custom}
+  }
+
   /*
    requestCurrentThemeFamily(topic, message) {
       MessageBus.ext.publish(MessageBus.buildResponseTopic(topic, message),
@@ -244,6 +272,11 @@ class Basic {
              '/css/' + cssFile
   }
 
+  themeCustomStyleResolver (cssFile) {
+    return this._rootPath + 'themes/' + this.currentThemeFamily +
+             '/css/' + this.currentCustomTheme + "/" + cssFile
+  }
+
   systemStyleResolver (cssFile) {
     return this._rootPath + 'themes/' + Basic.systemThemeFamily +
              '/css/' + cssFile

src/adonisjs/public/infra/css/common-author.css

@@ -83,6 +83,7 @@ nav.navbar {
   font-size: 18px;
   font-weight: bold;
   color: #808080;
+  line-height: 1.2;
   margin-right: 3%;
   margin-left: 3%;
 }

src/adonisjs/public/player/js/player.js

@@ -274,7 +274,8 @@ class PlayerManager {
     console.log('***** COMPILED CASE *****')
     console.log(this._compiledCase)
     this._knots = this._compiledCase.knots
-    Basic.service.currentThemeFamily = this._compiledCase.theme
+    // Basic.service.currentThemeFamily = this._compiledCase.theme
+    Basic.service.composedThemeFamily(this._compiledCase.theme)
   }
 
   _caseFlow () {

src/adonisjs/public/templates/simple/case/eletro_challenge.md

@@ -31,7 +31,7 @@ ___ Flow ___
 
 ___ Data ___
 
-* theme: simple
+* theme: simple(yellow)
 * namespaces:
   * evidence: http://purl.org/versum/evidence/
 * templates:

src/adonisjs/public/templates/simple/case/quiz_sequence.md

@@ -47,7 +47,7 @@ ___ Flow ___
 
 ___ Data ___
 
-* theme: simple
+* theme: simple(purple)
 * namespaces:
   * evidence: http://purl.org/versum/evidence/
 * templates:

src/adonisjs/public/templates/simple/case/quiz_short.md

@@ -35,7 +35,7 @@ ___ Flow ___
 
 ___ Data ___
 
-* theme: simple
+* theme: simple(red)
 * namespaces:
   * evidence: http://purl.org/versum/evidence/
 * templates:

src/adonisjs/public/templates/simple/case/radio_challenge.md

@@ -31,7 +31,7 @@ ___ Flow ___
 
 ___ Data ___
 
-* theme: simple
+* theme: simple(green)
 * namespaces:
   * evidence: http://purl.org/versum/evidence/
 * templates:

src/adonisjs/public/templates/simple/case/virtual_visit.md

@@ -58,7 +58,7 @@ ___ Flow ___
 
 ___ Data ___
 
-* theme: simple
+* theme: simple(blue)
 * namespaces:
   * evidence: http://purl.org/versum/evidence/
 * templates:

src/adonisjs/public/themes/simple/css/blue/dcc-trigger.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.dcc-trigger-theme {
+   background-color: #234a98;
+}

src/adonisjs/public/themes/simple/css/blue/theme.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.styt-button, .styt-button-option {
+   background-color: #234a98;
+}

src/adonisjs/public/themes/simple/css/dcc-trigger.css

@@ -14,7 +14,6 @@
    margin-right: auto;
    text-align: center;
 
-   background-color: #ba2027;
    color: white;
    /* padding: 12px 0px 0px 0px; */
    border-radius: 10px;

src/adonisjs/public/themes/simple/css/default/dcc-trigger.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.dcc-trigger-theme {
+   background-color: gray;
+}

src/adonisjs/public/themes/simple/css/default/theme.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.styt-button, .styt-button-option {
+   background-color: gray;
+}

src/adonisjs/public/themes/simple/css/green/dcc-trigger.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.dcc-trigger-theme {
+   background-color: #00903a;
+}

src/adonisjs/public/themes/simple/css/green/theme.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.styt-button, .styt-button-option {
+   background-color: #00903a;
+}

src/adonisjs/public/themes/simple/css/purple/dcc-trigger.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.dcc-trigger-theme {
+   background-color: #650061;
+}

src/adonisjs/public/themes/simple/css/purple/theme.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.styt-button, .styt-button-option {
+   background-color: #650061;
+}

src/adonisjs/public/themes/simple/css/red/dcc-trigger.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.dcc-trigger-theme {
+   background-color: #ba2027;
+}

src/adonisjs/public/themes/simple/css/red/theme.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.styt-button, .styt-button-option {
+   background-color: #ba2027;
+}

src/adonisjs/public/themes/simple/css/theme.css

@@ -72,7 +72,6 @@
    margin-right: auto;
    text-align: center;
 
-   background-color: #ba2027;
    color: white;
    /* padding: 12px 0px 0px 0px; */
    border-radius: 10px;

src/adonisjs/public/themes/simple/css/yellow/dcc-trigger.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.dcc-trigger-theme {
+   background-color: #839b27;
+}

src/adonisjs/public/themes/simple/css/yellow/theme.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.styt-button, .styt-button-option {
+   background-color: #839b27;
+}

src/adonisjs/public/translator/translator.js

@@ -57,7 +57,8 @@ class Translator {
     if (this._themeSettings) { delete this._themeSettings }
     if (compiledCase.theme) {
       const themeSt = await MessageBus.int.request(
-        'data/theme_family/' + compiledCase.theme + '/settings')
+        'data/theme_family/' + Basic.service.decomposeThemeFamily(compiledCase.theme).family +
+        '/settings')
       if (themeSt != null) { this._themeSettings = themeSt.message }
     }