'Unknown Color' Error with Transparent Background

relates to xibosignage/xibo#3341
xibosignage · Mar 5, 2024 · 7a66aba · 7a66aba
1 parent 7778cff
commit 7a66aba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/ui/src/core/forms.js b/ui/src/core/forms.js
@@ -1758,6 +1758,9 @@ window.forms = {
       $(el).colorpicker({
         container: $(el).find('.picker-container'),
         align: 'left',
+        format: ($(el).data('colorFormat') !== undefined) ?
+          $(el).data('colorFormat') :
+          false,
       });
 
       const $inputElement = $(el).find('input');

diff --git a/ui/src/templates/forms/inputs/color.hbs b/ui/src/templates/forms/inputs/color.hbs
@@ -3,6 +3,7 @@
     {{#if visibility}}data-visibility="{{visibility}}"{{/if}}
     {{#if dependsOn}}data-depends-on="{{dependsOn}}"{{/if}}
     {{#if isRequired}}data-is-required="{{isRequired}}"{{/if}}
+    {{#if colorFormat}}data-color-format="{{colorFormat}}"{{/if}}
 >
     {{#if title}}
         <label for="input_{{id}}" class="control-label"><strong>{{title}}</strong></label>

diff --git a/ui/src/templates/forms/layout.hbs b/ui/src/templates/forms/layout.hbs
@@ -6,7 +6,7 @@
         <form id="layoutFormEdit" class="XiboForm">
             <div class="tab-content">
                 <div class="tab-pane active" id="generalTab">
-                    {{> inputs/color value=layout.backgroundColor id="backgroundColor" title=trans.layout.backgroundColor helpText=trans.layout.backgroundColorHelpText }}
+                    {{> inputs/color value=layout.backgroundColor id="backgroundColor" colorFormat="rgb" title=trans.layout.backgroundColor helpText=trans.layout.backgroundColorHelpText }}
 
                     <div class="form-group">
                         <label class="control-label">