Editor: Layout exchange cards open new tab when selected (#2459)

relates to xibosignage/xibo#3393
xibosignage · Apr 2, 2024 · 55adf27 · 55adf27
1 parent b9497f1
commit 55adf27
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/ui/src/style/toolbar.scss b/ui/src/style/toolbar.scss
@@ -493,20 +493,25 @@
                     }
 
                     .provider {
-                        background-color: $xibo-color-neutral-0;
                         position: absolute;
                         opacity: 0.6;
                         bottom: 0;
                         right: 0;
-                        width: 60%;
+                        width: 60px;
+                        height: 40px;
+                        display: flex;
+                        justify-content: flex-end;
+                        align-items: flex-end;
 
                         &:hover {
                             opacity: 0.8;
                         }
 
                         img {
-                            width: 100%;
+                            max-width: 100%;
+                            max-height: 100%;
                             padding: 2px 6px;
+                            background-color: $xibo-color-neutral-0;
                         }
                     }
 

diff --git a/ui/src/templates/toolbar-card-layout-template.hbs b/ui/src/templates/toolbar-card-layout-template.hbs
@@ -11,9 +11,15 @@
         <img class="thumb" src="{{thumbnail}}" alt="{{title}}">
 
         {{#if provider}}
-            <a class="provider" href="{{provider.link}}" target="_blank" rel="noopener noreferrer">
-                <img class="provider-image" src="{{provider.logoUrl}}" alt="{{provider.message}}"></img>
-            </a>
+            {{#neq provider.link "#"}}
+                <a class="provider" href="{{provider.link}}" target="_blank" rel="noopener noreferrer">
+                    <img src="{{provider.logoUrl}}"></img>
+                </a>
+            {{else}}
+                <div class="provider">
+                    <img src="{{provider.logoUrl}}"></img>
+                </div>
+            {{/neq}}
         {{/if}}
 
         {{#if duration}}

diff --git a/ui/src/templates/toolbar-card-media.hbs b/ui/src/templates/toolbar-card-media.hbs
@@ -32,9 +32,15 @@
         {{/eq}}
 
         {{#if provider}}
-            <a class="provider" href="{{provider.link}}" target="_blank" rel="noopener noreferrer">
-                <img src="{{provider.logoUrl}}"></img>
-            </a>
+            {{#neq provider.link "#"}}
+                <a class="provider" href="{{provider.link}}" target="_blank" rel="noopener noreferrer">
+                    <img src="{{provider.logoUrl}}"></img>
+                </a>
+            {{else}}
+                <div class="provider">
+                    <img src="{{provider.logoUrl}}"></img>
+                </div>
+            {{/neq}}
         {{/if}}
 
         {{#if mediaDuration}}