Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[1082] CometVisu/trunk/visu
|
From: <pe...@us...> - 2012-10-30 18:59:42
|
Revision: 1082
http://openautomation.svn.sourceforge.net/openautomation/?rev=1082&view=rev
Author: peuter
Date: 2012-10-30 18:59:29 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
* added align attribute to pagejump, switch, toggle, trigger and info. Real alignment has to be done via css, example rules added to metal design
Modified Paths:
--------------
CometVisu/trunk/visu/designs/metal/basic.css
CometVisu/trunk/visu/structure/pure/info.js
CometVisu/trunk/visu/structure/pure/pagejump.js
CometVisu/trunk/visu/structure/pure/switch.js
CometVisu/trunk/visu/structure/pure/toggle.js
CometVisu/trunk/visu/structure/pure/trigger.js
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css 2012-10-28 21:30:25 UTC (rev 1081)
+++ CometVisu/trunk/visu/designs/metal/basic.css 2012-10-30 18:59:29 UTC (rev 1082)
@@ -728,4 +728,32 @@
.rowspan { overflow:none; }
.jqclock .clockdate { float: left; }
.jqclock .clocktime { min-width: 4em; display: block; float: left; margin: 0 0 0 0.4em; }
-.strftime { font-family: Helvetica, Arial, sans-serif; font-size: 5mm; }
\ No newline at end of file
+.strftime { font-family: Helvetica, Arial, sans-serif; font-size: 5mm; }
+
+/* START: alignment of widgets */
+.widget.center:not(.switch):not(.toggle):not(.trigger) > div,
+.widget.right:not(.switch):not(.toggle):not(.trigger) > div {
+ width: 50%;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+}
+.widget.center:not(.switch):not(.toggle):not(.trigger) > div { text-align: center; }
+.widget.right:not(.switch):not(.toggle):not(.trigger) > div { text-align: right; }
+
+.widget:not(.switch):not(.toggle):not(.trigger) > .actor:first-child,
+.widget:not(.switch):not(.toggle):not(.trigger) > .actor:first-child > div {
+ float: none; width: auto;
+}
+.widget_container { position: relative; }
+.widget.center.toggle > .actor:first-child,
+.widget.center.switch > .actor:first-child,
+.widget.center.trigger > .actor:first-child {
+ position: absolute; left: 50%; margin-left: -2em;
+}
+.widget.center > .actor > div, .widget.right > .actor > div { float: none; }
+
+#navbarTop .pagejump.center > div, #navbarBottom .pagejump.center > div { width: 100%; }
+#navbarTop .pagejump.right .label, #navbarBottom .pagejump.right .label { text-align: center !important; float: right; }
+/* END: alignment of widgets */
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/info.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/info.js 2012-10-28 21:30:25 UTC (rev 1081)
+++ CometVisu/trunk/visu/structure/pure/info.js 2012-10-30 18:59:29 UTC (rev 1082)
@@ -20,7 +20,11 @@
var $e = $(element);
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
- var ret_val = $('<div class="widget clearfix info" ' + style + ' />');
+ var classes = 'widget clearfix info';
+ if( $e.attr('align') ) {
+ classes+=" "+$e.attr('align');
+ }
+ var ret_val = $('<div class="'+classes+'" ' + style + ' />');
//type == '3d' && ret_val.data( extractLayout3d( layout ) ).bind( 'update3d', this.update3d );
type == '3d' && $(document).bind( 'update3d', {element: ret_val, layout: extractLayout3d( layout )}, this.update3d );
@@ -34,6 +38,7 @@
'mapping' : $e.attr('mapping'),
'styling' : $e.attr('styling')
});
+
for( var addr in address ) $actor.bind( addr, this.update );
ret_val.append( $actor );
return ret_val;
Modified: CometVisu/trunk/visu/structure/pure/pagejump.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/pagejump.js 2012-10-28 21:30:25 UTC (rev 1081)
+++ CometVisu/trunk/visu/structure/pure/pagejump.js 2012-10-30 18:59:29 UTC (rev 1082)
@@ -21,7 +21,11 @@
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
var target = $e.attr('target') ? $e.attr('target') : '0';
- var ret_val = $('<div class="widget clearfix pagejump" ' + style + ' />');
+ var classes = 'widget clearfix pagejump';
+ if( $e.attr('align') ) {
+ classes+=" "+$e.attr('align');
+ }
+ var ret_val = $('<div class="'+classes+'" ' + style + '/>');
ret_val.setWidgetLayout($e);
var label = extractLabel( $e.find('label')[0] );
var address = makeAddressList($e);
Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js 2012-10-28 21:30:25 UTC (rev 1081)
+++ CometVisu/trunk/visu/structure/pure/switch.js 2012-10-30 18:59:29 UTC (rev 1082)
@@ -20,10 +20,15 @@
var $e = $(element);
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
- var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
+ var classes = 'widget clearfix switch';
+ if( $e.attr('align') ) {
+ classes+=" "+$e.attr('align');
+ }
+ var ret_val = $('<div class="'+classes+'" ' + style + '/>');
ret_val.setWidgetLayout($e)
var label = extractLabel( $e.find('label')[0] );
var address = makeAddressList($e);
+
var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
var $actor = $(actor).data( {
'address' : address,
Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js 2012-10-28 21:30:25 UTC (rev 1081)
+++ CometVisu/trunk/visu/structure/pure/toggle.js 2012-10-30 18:59:29 UTC (rev 1082)
@@ -20,7 +20,11 @@
var $e = $(element);
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
- var ret_val = $('<div class="widget clearfix toggle" ' + style + '/>');
+ var classes = 'widget clearfix toggle';
+ if( $e.attr('align') ) {
+ classes+=" "+$e.attr('align');
+ }
+ var ret_val = $('<div class="'+classes+'" ' + style + '/>');
ret_val.setWidgetLayout($e);
var label = extractLabel( $e.find('label')[0] );
var address = makeAddressList($e);
Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js 2012-10-28 21:30:25 UTC (rev 1081)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2012-10-30 18:59:29 UTC (rev 1082)
@@ -21,7 +21,11 @@
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
var value = $e.attr('value') ? $e.attr('value') : 0;
- var ret_val = $('<div class="widget clearfix trigger" ' + style + ' />');
+ var classes = 'widget clearfix trigger';
+ if( $e.attr('align') ) {
+ classes+=" "+$e.attr('align');
+ }
+ var ret_val = $('<div class="'+classes+'" ' + style + '/>');
ret_val.setWidgetLayout($e);
var label = extractLabel( $e.find('label')[0] );
var address = makeAddressList($e);
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2012-10-28 21:30:25 UTC (rev 1081)
+++ CometVisu/trunk/visu/visu_config.xsd 2012-10-30 18:59:29 UTC (rev 1082)
@@ -487,6 +487,7 @@
<xsd:attribute ref="value" use="required" />
<xsd:attribute ref="mapping" use="optional" />
<xsd:attribute ref="styling" use="optional" />
+ <xsd:attribute ref="align" use="optional" />
</xsd:complexType>
<xsd:complexType name="infotrigger">
@@ -551,6 +552,7 @@
<xsd:attribute ref="format" use="optional" />
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="mapping" use="optional" />
+ <xsd:attribute ref="align" use="optional" />
</xsd:complexType>
<xsd:complexType name="image">
@@ -611,6 +613,7 @@
</xsd:choice>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="target" type="xsd:string" />
+ <xsd:attribute ref="align" use="optional" />
</xsd:complexType>
<xsd:complexType name="colorchooser">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
