Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@psilo909
psilo909 committed Jan 2, 2024
2 parents c3103b8 + 7772a3c commit f81d767
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 25 deletions.
12 changes: 6 additions & 6 deletions enigma2/sv_widgets/widget_enigma2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

{% macro config_info(id, gad_model, gad_webif, gad_enigma, gad_image, gad_dhcp, gad_ip, gad_gw, gad_mask, gad_mac) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}
{% set uid = uid(page, id) %}

<div id="{{ uid }}">
Expand Down Expand Up @@ -54,7 +54,7 @@
*/

{% macro config_info2(id, gad_box) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}
{% set uid = uid(page, id) %}

<div id="{{ uid }}">
Expand Down Expand Up @@ -88,7 +88,7 @@
*/

{% macro status_info(id, gad_standby, gad_servicename, gad_eventtitle, gad_eventdesc, gad_vwidth, gad_vheight, gad_vpid, gad_apid) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}
{% set uid = uid(page, id) %}

<div id="{{ uid }}">
Expand Down Expand Up @@ -120,7 +120,7 @@
*/

{% macro status_info2(id, gad_box) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}
{% set uid = uid(page, id) %}

<div id="{{ uid }}">
Expand Down Expand Up @@ -152,7 +152,7 @@
*/

{% macro status_channel(id, gad_box) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}
{% set uid = uid(page, id) %}

<div id="{{ uid }}">
Expand All @@ -178,7 +178,7 @@
*/

{% macro remote2(id, gad_boxremote, gad_size, alternative) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}
{% set uid = uid(page, id) %}

{% if config_version == 2.9 %}
Expand Down
4 changes: 2 additions & 2 deletions hue/sv_widgets/widget_hue.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
*/
{% macro control(id,g_power,g_reach,g_r,g_g,g_b,g_alert,g_effect,g_bri,g_sat,g_hue) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}

<table height="90%" width="90%" align="center">
<tr>
Expand Down Expand Up @@ -76,7 +76,7 @@
*
*/
{% macro control_group(id,g_power,g_alert,g_effect,g_bri,g_sat,g_hue) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}

<table height="90%" width="90%" align="center">
<tr>
Expand Down
4 changes: 2 additions & 2 deletions hue2/sv_widgets/widget_hue2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*/
{% macro color_control(id, g_lamp, g_alert_effect) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}

<table height="90%" width="90%" align="center">
<tr>
Expand Down Expand Up @@ -69,7 +69,7 @@
*
*/
{% macro attributes(id, g_lamp) %}
{% import "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}

Name: {{ basic.print(id~'.lightname', g_lamp~'.lightname') }} <br>
Type: {{ basic.print(id~'.lighttype', g_lamp~'.lighttype') }} <br>
Expand Down
4 changes: 2 additions & 2 deletions indego4shng/sv_widgets/indego2_widget.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*
*/
{% macro status(id, item) %}
{% import "basic.html" as basic %}
{% import "indego_widget.html" as indego %}
{% import config_version_full >= "3.2.c" ? "@widgets/basic.html" : "basic.html" as basic %}
{% import config_version_full >= "3.2.c" ? "@widgets/indego_widget.html" : "indego_widget.html" as indego %}


/** # Get general Informations if files are existing ----------------------- */
Expand Down
7 changes: 0 additions & 7 deletions indego4shng/sv_widgets/indego_widget.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

{% macro spinner(id, item,_backend ) %}

{% import "basic.html" as basic %}
<div{% if not id is empty %} id="{{ uid(page, id) }}"{% endif %} data-widget="indego.spinner" data-item="{{ item }}" data-designType="{{ _backend }}">

<html>
Expand All @@ -33,7 +32,6 @@

{% macro alerts(id, item,_backend ) %}

{% import "basic.html" as basic %}
<div{% if not id is empty %} id="{{ uid(page, id) }}"{% endif %} data-widget="indego.alerts" data-item="{{ item }}" data-designType="{{ _backend }}"></div>
{% endmacro %}

Expand Down Expand Up @@ -76,7 +74,6 @@
*/

{% macro symbol(id, items, pic, val, mode,text, ignore_text) %}
{% import "basic.html" as basic %}
<div id="{{ uid(page, id) }}" data-widget="indego.symbol" data-item="{{ implode(items) }}" data-val="{{ val|default('1') }}"
data-mode="{{ mode|default('or') }}" class="symbol hide">
{% if not text is empty %}<font style="font-size:200%" color="red"><strong>{{ text }}</strong></font><br><br>{% endif %}
Expand All @@ -93,7 +90,6 @@
*********************************************/
{% macro smartmow_calendar(id, item,_backend ) %}

{% import "basic.html" as basic %}
<div{% if not id is empty %} id="{{ uid(page, id) }}"{% endif %} data-widget="indego.smartmow_calendar" data-item="{{ item }}" data-designType="{{ _backend }}"></div>
{% endmacro %}

Expand All @@ -105,7 +101,6 @@
*********************************************/
{% macro mow_calendar(id, item,_backend ) %}

{% import "basic.html" as basic %}
<div{% if not id is empty %} id="{{ uid(page, id) }}"{% endif %} data-widget="indego.calendar" data-item="{{ item }}" data-designType="{{ _backend }}"></div>
{% endmacro %}

Expand All @@ -120,7 +115,6 @@

{% macro predictive_calendar(id, item,_backend ) %}

{% import "basic.html" as basic %}
<div{% if not id is empty %} id="{{ uid(page, id) }}"{% endif %} data-widget="indego.calendar_predictive_list" data-item="{{ item }}" data-designType="{{ _backend }}"></div>
{% endmacro %}

Expand Down Expand Up @@ -158,6 +152,5 @@
*********************************************/
{% macro mode(id, item,_backend ) %}

{% import "basic.html" as basic %}
<div{% if not id is empty %} id="{{ uid(page, id) }}"{% endif %} data-widget="indego.mode" data-item="{{ item }}" data-designType="{{ _backend }}"></div>
{% endmacro %}
3 changes: 0 additions & 3 deletions openweathermap/readme_en.rst.off
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ An example usage of those virtual matchstrings is the rain_overview-widget for S

.. code:: html

{% import "widgets_openweathermap.html" as owm %}
{{ owm.rain_overview('visual_id', 'weather.rain_past_12h', 'weather.rain_next_12h', 'weather.as_of') }}


Expand Down Expand Up @@ -902,7 +901,6 @@ This can be used from SmartVisu with a widget that is provided along with this p

.. code:: html

{% import "widgets_openweathermap.html" as owm %}
{{ owm.irrigation('valve_1', 'The greenhouse', 'garden.irrigation_valve1') }}


Expand Down Expand Up @@ -1066,7 +1064,6 @@ This can be used from SmartVisu with a widget that is provided along with this p

.. code:: html

{% import "widgets_openweathermap.html" as owm %}
{{ owm.irrigation_weekly('valve_2', 'Lawn in the backyard', 'garden.irrigation_valve2') }}


Expand Down
3 changes: 0 additions & 3 deletions openweathermap/user_doc.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ Hier ein Beispiel für die Verwendung der virtuellen Matchstrings mit dem smartV
.. code:: html

{% import "widgets_openweathermap.html" as owm %}
{{ owm.rain_overview('visual_id', 'weather.rain_past_12h', 'weather.rain_next_12h', 'weather.as_of') }}


Expand Down Expand Up @@ -865,7 +864,6 @@ Das Beispiel, passend zur YAML von oben:

.. code:: html

{% import "widgets_openweathermap.html" as owm %}
{{ owm.irrigation('valve_1', 'The greenhouse', 'garden.irrigation_valve1') }}


Expand Down Expand Up @@ -1035,7 +1033,6 @@ Das Beispiel, passend zur YAML von oben:

.. code:: html

{% import "widgets_openweathermap.html" as owm %}
{{ owm.irrigation_weekly('valve_2', 'Lawn in the backyard', 'garden.irrigation_valve2') }}


Expand Down

0 comments on commit f81d767

Please sign in to comment.