[2] Merge remote-tracking branch 'Arial-Z/New-Network' into nightly

defaults/overlays/network.yml

@@ -11,18 +11,11 @@ external_templates:
     run_definition:
       - <<use_<<key>>>>
       - <<use_<<alt>>>>
-      - <<allowed_libraries>>
     default:
       key: <<overlay_name>>
-      standard_value: 305
       horizontal_align: left
       vertical_align: bottom
     conditionals:
-      back_height:
-        default: 105
-        conditions:
-          - style: standard
-            value: <<standard_value>>
       vertical_offset:
         default: 15
         conditions:
@@ -54,9 +47,10 @@ external_templates:
             value: network/<<key>>
     allowed_libraries: show
     group: networks
-    vertical_offset: 15
     back_color: "#00000099"
+    back_radius: 30
     back_width: 305
+    back_height: 105
 
 templates:
   networks:
@@ -122,6 +116,10 @@ overlays:
     variables: { weight: 10}
     template: [name: standard, {name: networks, search: [AMC, AMC.com]}]
 
+  AMC+:
+    variables: { weight: 10}
+    template: [name: standard, name: networks]
+
   Animal Planet:
     variables: { weight: 10}
     template: [name: standard, {name: networks, search: [Animal Planet, Animal Planet Brasil, Animal Planet Deutschland]}]
@@ -506,6 +504,22 @@ overlays:
     variables: { weight: 10}
     template: [name: standard, name: networks]
 
+  ITV2:
+    variables: { weight: 10}
+    template: [name: standard, name: networks]
+
+  ITV3:
+    variables: { weight: 10}
+    template: [name: standard, name: networks]
+
+  ITV4:
+    variables: { weight: 10}
+    template: [name: standard, name: networks]
+
+  ITVBe:
+    variables: { weight: 10}
+    template: [name: standard, name: networks]
+
   ITVX:
     variables: { weight: 10}
     template: [name: standard, name: networks]

defaults/show/network.yml

@@ -50,6 +50,7 @@ dynamic_collections:
     - ALTBalaji
     - Amazon Kids+
     - AMC
+    - AMC+
     - Animal Planet
     - Antena 3
     - Apple TV+
@@ -148,6 +149,10 @@ dynamic_collections:
     - ITV
     - ITV Encore
     - ITV1
+    - ITV2
+    - ITV3
+    - ITV4
+    - ITVBe
     - ITVX
     - joyn
     - Kan 11

docs/defaults/show/network.md

@@ -90,6 +90,7 @@ These are lists provided for reference to show what values will be in use if you
     - ALTBalaji
     - Amazon Kids+
     - AMC
+    - AMC+
     - Animal Planet
     - Antena 3
     - Apple TV+
@@ -188,6 +189,10 @@ These are lists provided for reference to show what values will be in use if you
     - ITV
     - ITV Encore
     - ITV1
+    - ITV2
+    - ITV3
+    - ITV4
+    - ITVBe
     - ITVX
     - joyn
     - Kan 11