Merge pull request #1197 from lokonli/v3.13-master

V3.13 master

css/creative.css

@@ -1332,6 +1332,7 @@ Only add this hover on NON touch devices
 .col-data {
   width: calc(100% - 45px);
   float: left;
+  text-shadow: 0px 0px 10px black;
 }
 
 .right2col {
@@ -3972,6 +3973,9 @@ canvas {
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
+}
+
+.dial .background {
   border-radius: 50%
 }
 /*needed? Remove for now ...
@@ -4469,4 +4473,38 @@ canvas {
 .publictransport .delay {
   background-color: red;
   color: white;
-}
+}
+
+.waqi {
+  background-color: unset;
+  padding: 0px !important;
+  border: 0px;
+}
+
+.waqi .dt_state {
+  margin: 0px;
+}
+
+.waqi.xxl {
+  padding-top: 5px!important;
+  padding-left: 10px!important;
+}
+.waqi.xxl iframe {
+  background-color: #f6f9f7;
+  border: 1px solid white;
+  min-width: 100px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.6);
+  -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.6);
+  box-shadow: 0 1px 3px rgba(0,0,0,0.6);
+  margin-top: 10px;
+  margin-bottom: 10px;
+  margin-right: 10px;
+}
+
+.publictransport .remarks
+{
+  font-style: italic;
+}

docs/blocks/domoticzblocks.rst

@@ -35,6 +35,8 @@ You can also use custom names for the block identfier. In that case you have to
    }
 
 
+.. _grouped_devices:
+
 Grouped devices
 ---------------
 To use grouped devices in a column you must make it known in your CONFIG.js as follows::
@@ -54,6 +56,11 @@ Now you can add all 3 light blocks to a column with the following code::
       'lights'
    ]
 
+All the blocks within such a group can be styled in custom.css all at once::
+
+  [data-id='lights'] .title {
+     color: yellow
+  }
 
 Scenes and Groups
 -----------------
@@ -233,6 +240,17 @@ Block parameters
   * - switchMode
     - | Click behavior RGBxx devices
       | 'color': Open the colorpicker popup window instead of device switch on/off
+  * - backgroundimage
+    - url or Domoticz text device id containing the url of the background image. See :ref:`blockbackground`
+  * - backgroundsize
+    - | Size of the background image. See :ref:`blockbackground`
+      | ``'80%'``: Scale the image to 80% of the block size
+      | ``'cover'``: Scale the image so that the image completely covers the block
+      | ``'contain'``: Scale the background image so that the image is contained within the block
+  * - backgroundopacity
+    - | Sets the opacity of the background image. See :ref:`blockbackground`
+      | ``1`` (=default): Opacity of 100%
+      | ``20%``: Opacity of 20%
 
 There are several additional parameters for Graphs. See :ref:`dom_graphs`
 
@@ -691,6 +709,35 @@ All parameter names are case sensitive.
 
 For more fancy computations you can create your custom getStatus function in custom.js   
 
+.. _blockbackground :
+
+Block background image
+----------------------
+
+.. image :: img/blockbackground.jpg
+
+Via the ``backgroundimage`` parameter the url of a background image can be defined.
+Instead of an url you can also fill in a Domoticz text device id.
+This Domoticz text device should then contain the url pointing to the image to be used as background for the block.
+
+The size can be adjusted via the ``backgroundsize`` parameter, and the opacity can be set via the ``backgroundopacity`` parameter.
+
+Example::
+
+  blocks['curtains'] = {
+      idx: 179,
+  //    backgroundimage: './img/curtains.png'
+      backgroundimage: 182,
+      backgroundsize: '50%',
+      backgroundopacity: 0.3,
+  }
+
+In the example above Domoticz device 182 is used to obtain the url of the background image.
+
+Example how to set the content of a Domoticz text device::
+
+  http://domoticz:8080/json.htm?type=command&param=udevice&idx=182&nvalue=0&svalue=https://www.schoolplaten.com/afbeelding-huis-dl28257.jpg
+
 
 .. _domoticzStyling:
 

docs/blocks/frames.rst

@@ -109,7 +109,7 @@ For instance, the buienradar widget has a frame width of 256 pixels, and an aspe
     width:12,
     scaletofit: 256,
     aspectratio: 1,
-}
+  }
 
 .. image :: img/framescale.jpg
 

docs/blocks/graphs.rst

@@ -419,7 +419,9 @@ A ``custom`` object start with the name of the button. The button should contain
 
 * ``range``. This is the name of the range as requested from Domoticz, and can be ``'day'``, ``'today'``, ``'month'`` or ``'year'``.  The range ``'today'`` filters the data to today, independent of the setting in Domoticz, and sets the graph x-axis to the full day.
 * ``filter`` (optional). This limits the amount of data to the period as defined by this parameter. Examples: ``'2 hours'``, ``'4 days'``, ``'3 months'``
+
 Special filters exist. Value ``'todaytomorrow'`` will filter the graph data of today and tomorrow. This can be used for instance for showing one day ahead dynamic energy prices.
+
 * ``data``. This is an object that defines the values to use for the graph.
 * ``buttonIcon`` (optional). The Fontawesome icon to use for the button. Example ``'fas fa-bus'``
 

docs/blocks/specials/publictransport.rst

@@ -9,6 +9,7 @@ Dashticz currently supports the following types of public transport info:
 
    * Train info Netherlands ('treinen')
    * Bus/tram/boat info Netherlands ('ovapi')
+   * openbaar vervoer Netherlands ('drgl')
    * irail (Belgium)
    * delijn (Belgium)
 
@@ -53,6 +54,7 @@ Parameters
     - | Public transport info provider to use. Choose from
       | ``'treinen'`` Netherlands: trains 
       | ``'ovapi'`` Netherlands: bus, tram, boat
+      | ``'drgl'`` Netherlands dienstregeling
       | ``'irailbe'`` Belgium: trains 
       | ``'delijnbe'`` Belgium: bus, tram, boat
   * - direction
@@ -203,6 +205,35 @@ De lijn
 
 The station code consists of 6 digits. Search for your station code in the search box on https://delijn.be 
 
+.. _drgl :
+
+drgl
+~~~~
+
+Find your station code via https://drgl.nl
+
+Search for a bus or train station name in the search box.
+
+The browser url will show the station code.
+
+Busstation codes are numeric. Train station codes are textual.
+
+Examples:
+
+* https://drgl.nl/stop/NL:S:asd, This is a trainstation with code ``'asd'`` which is Amsterdam CS
+* https://drgl.nl/stop/NL:S:57005010, This is a busstation with code ``'57005010'`` which is Amsterdam CS busstation
+
+Sometimes you first have to click on a specific line, and then on the busstop or train station you need, to get the right station code.
+
+Block example::
+
+  blocks['drgl'] = {
+    type: 'publictransport',
+    title: 'Utrecht bus centrumzijde',
+    provider: 'drgl',
+    station: '30009500'
+  }
+
 .. _predefpubtrans :
 
 Predefined public transport blocks

docs/blocks/specials/tvguide.rst

@@ -72,7 +72,7 @@ The parameter ``channels`` contains an array of the selected channel IDs.  Find
   "13", "NDR Fernsehen"
   "15", "RTBF La 1"
   "16", "RTBF La 2"
-  "17", "TV 5"
+  "17", "TV5MONDE"
   "18", "National Geographic"
   "19", "Eurosport 1"
   "21", "Cartoon Network"
@@ -82,23 +82,21 @@ The parameter ``channels`` contains an array of the selected channel IDs.  Find
   "28", "Sat 1"
   "29", "Discovery Channel"
   "31", "RTL 5"
-  "32", "TRT int."
+  "32", "TRT World"
   "34", "Veronica"
   "36", "SBS 6"
   "37", "NET 5"
   "38", "ARTE"
   "39", "Film1 Family"
-  "40", "AT 5"
+  "40", "AT5"
   "46", "RTL 7"
   "50", "3Sat"
   "58", "PRO 7"
-  "59", "2BE"
-  "60", "VT4"
-  "64", "NPO Zapp Xtra  NPO Best"
-  "65", "Animal Planet OUD"
-  "70", "NPO Cultura"
-  "83", "3voor12"
+  "60", "Play4"
+  "70", "NPO 2 extra"
+  "73", "Mezzo"
   "86", "BBC World"
+  "87", "TV E"
   "89", "Nickelodeon"
   "90", "BVN"
   "91", "Comedy Central"
@@ -109,8 +107,6 @@ The parameter ``channels`` contains an array of the selected channel IDs.  Find
   "102", "RTV Rijnmond"
   "103", "NH"
   "104", "BBC Entertainment"
-  "105", "Private Spice"
-  "107", "Film 1 Sundance"
   "108", "RTV Noord"
   "109", "Omrop Fryslân"
   "110", "RTV Drenthe"
@@ -122,30 +118,19 @@ The parameter ``channels`` contains an array of the selected channel IDs.  Find
   "116", "Omroep Zeeland"
   "148", "ESPN"
   "301", "BBC 4" 
-  "304", "AMC"
-  "305", "Discovery World"
   "306", "Discovery Science"
-  "308", "3voor12 Central"
-  "309", "3voor12 On Stage"
-  "310", "3voor12 Portal"
   "311", "Disney XD"
   "312", "Nick Jr."
-  "313", "Boomerang"
+  "313", "Cartoonito"
   "315", "CBS Reality"
-  "317", "Comedy Family"
-  "401", "Playboy TV"
-  "403", "Goed TV"
-  "404", "FOXlife"
   "406", "Ons"
-  "407", "OUTTV"
+  "407", "OUTtv"
   "408", "RTL Lounge"
   "409", "Rtl crime"
-  "410", "101 TV"
+  "410", "NPO 1 extra"
   "411", "Film1 Action"
-  "412", "Film1 Premiere +1"
   "413", "HISTORY"
-  "414", "Investigiation discovery"
-  "415", "Travel Channel"
+  "414", "Investigiation Discovery"
   "416", "Nat Geo Wild"
   "417", "Extreme Sports Channel"
   "419", "Ziggo Sport Golf"
@@ -154,29 +139,37 @@ The parameter ``channels`` contains an array of the selected channel IDs.  Find
   "423", "Al Jazeera Engels"
   "424", "Disney Channel"
   "427", "MTV Brand new"
-  "428", "Brava NL"
   "429", "Oranje TV"
   "430", "Film1 Drama"
   "434", "Dusk"
-  "435", "24 Kitchen"
+  "435", "24Kitchen"
   "436", "Eurosport 2"
-  "437", "Comedy Central Extra"
   "438", "TLC"
   "439", "Animal Planet"
-  "440", "Fox"
+  "440", "STAR Channel"
   "441", "VRT Ketnet"
   "460", "SBS 9"
   "461", "Pebble TV"
   "462", "Shorts TV"
   "464", "BBC First"
   "465", "RTL Z"
   "466", "Ziggo Sport"
-  "467", "Spike"
   "468", "ESPN 2"
   "469", "ESPN 3"
   "470", "ESPN 4"
-  "471", "KPN presenteert "
+  "471", "Beleef KPN "
   "472", "Crime + Investigation"
-  "473", "Viceland"
+  "474", "Ziggo Sport Voetbal "
+  "475", "INPLUS"
   "476", "TV 538"
+  "482", "Stingray Classica"
+  "483", "E! Entertainment"
+  "485", "RTL Telekids"
+  "486", "Love Nature"
+  "487", "CNBC"
+  "490", "Ziggo Sport Tennis"
+  "491", "Ziggo Sport Docu"
+  "494", "NPO Politiek"
   "495", "Filmbox.nl"
+  "496", "Paramount Network"
+  "497", "HGTV"