Merge pull request #17 from Martin-Gleiss/master

merge upstream changes

pages/docu/device/widget_device.smallshut.html

@@ -33,7 +33,7 @@ <h5>Example</h5>
 				<!-- block space till end of line, remove if uzsu wanted -->
 				<span class="ui-shut-btn" style="height: 44px;"> </span>
 				<div class="smallshut_wrapper">
-				{{ device.smallshut('SmS1', 'Bad', 'bath.blind.move', 'bath.blind.stop', 'bath.blind.pos', '') }}
+				{{ device.smallshut('SmS2', 'Bad', 'bath.blind.move', 'bath.blind.stop', 'bath.blind.pos', '') }}
 				{{ device.uzsuicon('uzsu1', 'uzsuitem') }}
 				</div>
 			</div>
@@ -48,7 +48,7 @@ <h5>Example</h5>
 				<!-- block space till end of line, remove if uzsu wanted -->
 				<span class="ui-shut-btn" style="height: 44px;"> </span>
 				<div class="smallshut_wrapper">
-				{{ device.smallshut('SmS1', 'Bad', 'bath.blind.move', 'bath.blind.stop', 'bath.blind.pos', '') }}
+				{{ device.smallshut('SmS2', 'Bad', 'bath.blind.move', 'bath.blind.stop', 'bath.blind.pos', '') }}
 				{{ device.uzsuicon('uzsu1', 'uzsuitem') }}
 				</div>
 			</div>
@@ -64,10 +64,10 @@ <h5>Example</h5>
 		<div class="block" style="width: 100%">
 			<div class="ui-bar-c ui-li-divider ui-corner-top">Shutter Table with type = midi</div>
 			<div class="ui-fixed ui-body-a ui-corner-bottom" style="text-align: left; padding-left: 5%;">
-				{{ device.smallshut('SmS2', 'Wohnzimmer', 'bath.blind.move', 'bath.blind.stop', 'bath.blind.pos', 'bath.blind.adjust', 'mini') }}
+				{{ device.smallshut('SmS3', 'Wohnzimmer', 'bath.blind.move', 'bath.blind.stop', 'bath.blind.pos', 'bath.blind.adjust', 'mini') }}
 				<span class="ui-shut-btn" style="height: 44px;"> </span>  <!-- block space till end of line, remove if uzsu wanted -->
-				{{ device.smallshut('SmS2', 'Bad', 'bath.blind.move', 'bath.blind.stop', 'bath.blind.pos', '', 'mini') }}
-				{{ device.uzsuicon('uzsu1', 'uzsuitem') }}
+				{{ device.smallshut('SmS4', 'Bad', 'bath.blind.move', 'bath.blind.stop', 'bath.blind.pos', '', 'mini') }}
+				{{ device.uzsuicon('uzsu2', 'uzsuitem') }}
 			</div>
 		</div>
 

pages/docu/quad/widget_quad.dimmer.html

@@ -21,7 +21,14 @@
   		 io.write('licht.automatik.lock', '0');
        io.write('bwm.sperren', '0');
        io.write('licht.zwangvalue', '0');
-  	});
+
+       $( "#widget_quad_dimmer-dimmer1dimmerpopup_slider, #widget_quad_dimmer-dimmer2_slider_inline, #widget_quad_dimmer-dimmer3dimmerpopup_slider" ).change(function(){
+          if (this.value > 0)
+            io.write('licht.SA', '1' );
+          else
+            io.write('licht.SA', '0' );
+       });
+  });
 </script>
 
 {% set stateengine = {} %}
@@ -71,12 +78,12 @@ <h5>Example</h5>
 ['uzsu', 'stateengine', 'plot', 'value_popup', 'switch', 'locks', ' '] stateengine with popup (have to long tap to open popup!)
 	<div class="twig">
 		<code class="prettyprint">{% filter trim|escape|nl2br %}{% raw %}
-    {{ quad.dimmer('dimmer1', 'Dimmer Example 1', 'licht.SA', 'licht.dimmen', 0, 255, 1, icon.light('','','licht.dimmen'), icon.light('','','licht.dimmen'), 'icon1', 'icon0', '', '', '100', 'right', 'blink', '', 'licht.dimmen.zeitschalter', ['', '', 'bool'], '%', 'licht.dimmen', '', 'licht.automatik', (stateengine['item1']), ['', 'bwm.sperren', 'licht.zwangvalue'], '', '', ['uzsu', 'stateengine', 'plot', 'value_popup', 'switch', 'locks', ' ']) }}
+    {{ quad.dimmer('dimmer1', 'Dimmer Example 1', 'licht.SA', 'licht.dimmen', 0, 255, 1, icon.light('','','licht.dimmen','','','blue'), icon.light('','','licht.dimmen'), 'blue', 'icon0', '', '', '100', 'right', 'blink', '', 'licht.dimmen.zeitschalter', ['', '', 'bool'], '%', 'licht.dimmen', '', 'licht.automatik', (stateengine['item1']), ['', 'bwm.sperren', 'licht.zwangvalue'], '', '', ['uzsu', 'stateengine', 'plot', 'value_popup', 'switch', 'locks', ' ']) }}
 		{% endraw %}{% endfilter %}</code>
 	</div>
 	<div class="html">
 		<ul data-role="listview" data-dividertheme="c" class="quad_list">
-    {{ quad.dimmer('dimmer1', 'Dimmer Example 1', 'licht.SA', 'licht.dimmen', 0, 255, 1, icon.light('','','licht.dimmen'), icon.light('','','licht.dimmen'), 'icon1', 'icon0', '', '', '100', 'right', 'blink', '', 'licht.dimmen.zeitschalter', ['', '', 'bool'], '%', 'licht.dimmen', '', 'licht.automatik', (stateengine['item1']), ['', 'bwm.sperren', 'licht.zwangvalue'], '', '', ['uzsu', 'stateengine', 'plot', 'value_popup', 'switch', 'locks', ' ']) }}
+    {{ quad.dimmer('dimmer1', 'Dimmer Example 1', 'licht.SA', 'licht.dimmen', 0, 255, 1, icon.light('','','licht.dimmen','','','blue'), icon.light('','','licht.dimmen'), 'blue', 'icon0', '', '', '100', 'right', 'blink', '', 'licht.dimmen.zeitschalter', ['', '', 'bool'], '%', 'licht.dimmen', '', 'licht.automatik', (stateengine['item1']), ['', 'bwm.sperren', 'licht.zwangvalue'], '', '', ['uzsu', 'stateengine', 'plot', 'value_popup', 'switch', 'locks', ' ']) }}
 	</ul></div>
 
 ['switch', 'value_slider']

widgets/basic.html

@@ -302,8 +302,9 @@
 *
 * @param {id=} unique id for this widget (optional)
 * @param {item[?]} one or more item(s). Multiple items in array-form: [item1, item2]
-* @param {format(text,html,script,text2br)=} either a unit of the language file, an individual format string (PHP sprintf like) or a simple string as suffix.
+* @param {format=} either a unit of the language file, an individual format string (PHP sprintf like) or a simple string as suffix.
   Use 'text' to display result as unformatted string, 'html' to render it as unescaped html, 'text2br' to convert line endings like '\r', '\n' or '\r\n' to HTML breaks or 'script' to just execute as JavaScript w/o displaying anything.
+* @ add {format(text,html,script,text2br)=}
 * @param {formula=VAR} any valid JavaScript expression with following variables and aggregate functions (optional, default: VAR)
   - VAR1, VAR2, ... represent the corresponding item's value, VAR is an array of all item values
   - SUM(VAR), AVG(VAR), SUB(VAR), MIN(VAR) and MAX(VAR) aggregate the values