Commit 760095c9 authored by Jörg Richter's avatar Jörg Richter

Add background colors to assoc types (#214)

parent c858f907
Pipeline #6603 passed with stages
in 3 minutes and 51 seconds
......@@ -11,7 +11,8 @@
{
"typeUri": "dmx.webclient.view_config",
"childs": {
"dmx.webclient.color": "hsl(40, 70%, 53%)"
"dmx.webclient.color": "hsl(40, 70%, 53%)",
"dmx.webclient.color#dmx.webclient.background_color": "hsl(40, 80%, 96%)"
}
}
]
......
......@@ -11,7 +11,8 @@
{
"typeUri": "dmx.webclient.view_config",
"childs": {
"dmx.webclient.color": "hsl(255, 40%, 53%)"
"dmx.webclient.color": "hsl(255, 40%, 53%)",
"dmx.webclient.color#dmx.webclient.background_color": "hsl(255, 80%, 96%)"
}
}
]
......
......@@ -34,7 +34,8 @@
{
"typeUri": "dmx.webclient.view_config",
"childs": {
"dmx.webclient.color": "hsl(70, 60%, 53%)"
"dmx.webclient.color": "hsl(70, 60%, 53%)",
"dmx.webclient.color#dmx.webclient.background_color": "hsl(70, 80%, 96%)"
}
}
]
......
......@@ -25,7 +25,6 @@ public abstract class Migration {
// ----------------------------------------------------------------------------------------------- Protected Methods
// Note: exceptionally here the Core has some knowledge about the Webclient.
// ### TODO: move these methods to the Webclient service.
/**
* Convenience method for plugin authors to set a Webclient view config value for a certain topic type.
......
......@@ -89,7 +89,8 @@
{
"typeUri": "dmx.webclient.view_config",
"childs": {
"dmx.webclient.color": "hsl(300, 43%, 53%)"
"dmx.webclient.color": "hsl(300, 43%, 53%)",
"dmx.webclient.color#dmx.webclient.background_color": "hsl(300, 80%, 96%)"
}
}
]
......
......@@ -29,6 +29,11 @@ public class Migration2 extends Migration {
addColorToAssociationType("dmx.core.composition_def", "hsl(210, 50%, 53%)");
addColorToAssociationType("dmx.core.instantiation", "hsl(180, 50%, 53%)");
addColorToAssociationType("dmx.core.sequence", "hsl(60, 80%, 53%)");
addBackgroundColorToAssociationType("dmx.core.association", "hsl(0, 0%, 97%)");
addBackgroundColorToAssociationType("dmx.core.composition", "hsl(5, 80%, 96%)");
addBackgroundColorToAssociationType("dmx.core.composition_def", "hsl(210, 80%, 96%)");
addBackgroundColorToAssociationType("dmx.core.instantiation", "hsl(180, 80%, 96%)");
addBackgroundColorToAssociationType("dmx.core.sequence", "hsl(60, 80%, 96%)");
//
AssociationType compDef = dmx.getAssociationType("dmx.core.composition_def");
compDef.getAssocDef("dmx.core.cardinality")
......@@ -49,4 +54,8 @@ public class Migration2 extends Migration {
private void addColorToAssociationType(String assocTypeUri, String color) {
setAssocTypeViewConfigValue(assocTypeUri, "color", color);
}
private void addBackgroundColorToAssociationType(String assocTypeUri, String color) {
setAssocTypeViewConfigValue(assocTypeUri, "color#dmx.webclient.background_color", color);
}
}
......@@ -9,7 +9,7 @@ import 'font-awesome/css/font-awesome.css'
import './element-ui'
import './websocket'
console.log('[DMX] 2019/05/25')
console.log('[DMX] 2019/05/26')
// 1) Init dm5 library
// The dm5 library must be inited *before* the dm5-webclient component is instantiated.
......
......@@ -13,7 +13,8 @@
{
"typeUri": "dmx.webclient.view_config",
"childs": {
"dmx.webclient.color": "hsl(255, 40%, 53%)"
"dmx.webclient.color": "hsl(255, 40%, 53%)",
"dmx.webclient.color#dmx.webclient.background_color": "hsl(255, 80%, 96%)"
}
}
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment