|
From: <j-...@us...> - 2011-05-29 16:01:07
|
Revision: 349
http://openautomation.svn.sourceforge.net/openautomation/?rev=349&view=rev
Author: j-n-k
Date: 2011-05-29 16:01:00 +0000 (Sun, 29 May 2011)
Log Message:
-----------
changed infotrigger "info"-position, updated css
Modified Paths:
--------------
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-05-28 23:19:24 UTC (rev 348)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-05-29 16:01:00 UTC (rev 349)
@@ -216,26 +216,16 @@
.switchInvisible
{
- border-style: solid;
- border-width: 1px;
- border-color: #000 #000 #000 #000;
- -moz-border-radius: 7px;
- -webkit-border-radius: 7px;
- border-radius: 7px;
- padding: 1px;
+ border: none;
+ padding: 1px;
}
.switchInvisible div
{
- border-style: solid;
- border-width: 1px;
- border-color: #000 #000 #000 #000;
+ border: none;
padding: 5px;
width: 5em;
float: left;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
}
.ui-slider { position: relative; text-align: left; }
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-28 23:19:24 UTC (rev 348)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-29 16:01:00 UTC (rev 349)
@@ -652,13 +652,13 @@
var buttons = $('<div style="float:left;"/>');
var buttonCount = 2;
- var actor = '<div class="actor switchUnpressed '
+ var actordown = '<div class="actor switchUnpressed '
if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
- actor += '">';
- actor += '<div class="value">' + ($p.attr('downlabel') ? $p.attr('downlabel') : '-') + '</div>';
- actor += '</div>';
- var $actor = $(actor).data( {
+ actordown += $p.attr( 'align' );
+ actordown += '">';
+ actordown += '<div class="value">' + ($p.attr('downlabel') ? $p.attr('downlabel') : '-') + '</div>';
+ actordown += '</div>';
+ var $actordown = $(actordown).data( {
'address' : address,
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
@@ -666,15 +666,14 @@
'align' : $p.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
- buttons.append( $actor );
-
- var actor = '<div class="actor switchUnpressed '
+
+ var actorup = '<div class="actor switchUnpressed '
if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
- actor += '">';
- actor += '<div class="value">' + ($p.attr('uplabel') ? $p.attr('uplabel') : '+') + '</div>';
- actor += '</div>';
- var $actor = $(actor).data( {
+ actorup += $p.attr( 'align' );
+ actorup += '">';
+ actorup += '<div class="value">' + ($p.attr('uplabel') ? $p.attr('uplabel') : '+') + '</div>';
+ actorup += '</div>';
+ var $actorup = $(actorup).data( {
'address' : address,
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
@@ -682,18 +681,31 @@
'align' : $p.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
- buttons.append( $actor );
- var actor = '<div class="actor switchInvisible "><div class="value">-</div></div>';
- var $actor = $(actor).data({
+ var actorinfo = '<div class="actor switchInvisible"><div class="value">-</div></div>';
+ var $actorinfo = $(actorinfo).data({
'address' : addrread,
'format' : $p.attr('format'),
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
+ 'align' : $p.attr('align'),
});
- for( var addr in addrread ) $actor.bind( addr, this.update );
- buttons.append( $actor );
+ for( var addr in addrread ) $actorinfo.bind( addr, this.update );
+ if ( $p.attr('infoposition' )==1 ) {
+ buttons.append( $actordown );
+ buttons.append( $actorinfo );
+ buttons.append( $actorup );
+ } else if ( $p.attr('infoposition' )==2 ) {
+ buttons.append( $actordown );
+ buttons.append( $actorup );
+ buttons.append( $actorinfo );
+ } else {
+ buttons.append( $actorinfo );
+ buttons.append( $actordown );
+ buttons.append( $actorup );
+ }
+
ret_val.append( buttons );
return ret_val;
},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|