Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[835] CometVisu/trunk/visu
|
From: <ma...@us...> - 2012-05-20 20:11:27
|
Revision: 835
http://openautomation.svn.sourceforge.net/openautomation/?rev=835&view=rev
Author: mayerch
Date: 2012-05-20 20:11:21 +0000 (Sun, 20 May 2012)
Log Message:
-----------
* Bugfixes to widgets that were setting the wrong classes
* Update to the planet design
Modified Paths:
--------------
CometVisu/trunk/visu/designs/planet/basic.css
CometVisu/trunk/visu/designs/planet/design_setup.js
CometVisu/trunk/visu/structure/pure/infotrigger.js
CometVisu/trunk/visu/structure/pure/multitrigger.js
CometVisu/trunk/visu/structure/pure/trigger.js
Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css 2012-05-20 16:35:47 UTC (rev 834)
+++ CometVisu/trunk/visu/designs/planet/basic.css 2012-05-20 20:11:21 UTC (rev 835)
@@ -9,6 +9,8 @@
font-family:'Arial Narrow','Nimbus Sans L',Helvetica,sans-serif;
font-family:Impact, Charcoal, sans-serif;
font-family:'Lucida Sans Unicode','Lucida Grande','Lucida Sans','DejaVu Sans Condensed',sans-serif;
+ font-family:'Helvetica LT UltraCompressed','Swiss911 UCm BT',OpenDinSchriftenEngshrift;
+ font-family:'Ubuntu Condensed';
font-size: 5.5mm;
overflow: hidden;
margin: 0.1em;
@@ -116,7 +118,7 @@
border-style: solid;
border-color: #000;
padding: 0 0.25em 0 0.25em;
- line-height: 1.5em;
+ /*line-height: 1.5em;*/
height: 1.5em;
display: inline-block;
}
@@ -152,11 +154,7 @@
.colspan0 {
width: 8.33333%;
}
-.colspandefault {
- width: 1px;
-}
-
.widget {
/* border: 1px solid blue; */
background: #ffcc99;
@@ -171,21 +169,70 @@
width: 100%;
}
-.widget {
- min-height: 2.4em;
+.widget .label {
+ float: none;
+ position: absolute;
+ font-size: 0.75em;
+ margin-left: 1em;
}
+.widget .actor {
+ text-align: center;
+ padding: 0.1em;
+ /* background: #ffcc99; */
+ /* margin: 0.1em; */
+ min-height: 1em;
+}
+
+.switch {
+ border-top-right-radius: 1em;
+ border-bottom-right-radius: 1em;
+}
+
+.trigger, .multitrigger {
+ border-top-left-radius: 1em;
+ border-top-right-radius: 1em;
+ border-bottom-right-radius: 1em;
+ border-bottom-left-radius: 1em;
+}
+
+.infotrigger .label {
+ /* text-align: center; */
+}
+
+.infotrigger > div, .multitrigger > div {
+ width: 100%;
+}
+
+.infotrigger .actor {
+ width: 32%;
+}
+
+.infotrigger .uplabel {
+ border-top-right-radius: 1em;
+ border-bottom-right-radius: 1em;
+}
+
+.infotrigger .downlabel {
+ border-top-left-radius: 1em;
+ border-bottom-left-radius: 1em;
+}
+
+.text {
+ color: #999;
+}
+
.widget .label, .widget .info .actor, .text > div, .link > div, .link a,
.value, .popup >div.head {
- line-height: 2.4em;
+ /* line-height: 2.4em; */
}
.widget, .widget.group {
- margin: .2em .1em 0 .1em;
+ margin: .1em .0em 0 .1em;
}
.widget {
- padding: 0.3em;
+ /* padding: 0.3em; */
}
.widget.group {
@@ -193,5 +240,6 @@
}
body hr, body br, #pages hr {
+ margin: 0;
clear: both;
}
Modified: CometVisu/trunk/visu/designs/planet/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/planet/design_setup.js 2012-05-20 16:35:47 UTC (rev 834)
+++ CometVisu/trunk/visu/designs/planet/design_setup.js 2012-05-20 20:11:21 UTC (rev 835)
@@ -21,7 +21,7 @@
//
//////////////////////////////////////////////////////////////////////////////
-//$('head').data('colspanDefault', 6 ); // 6 is already the default
+//$('head').data('colspanDefault', 1 ); // 6 is already the default
$('#navbarLeft').data('columns', 1 );
$('#main').data('columns', 12 );
$('#navbarRight').data('columns', 1 );
Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-05-20 16:35:47 UTC (rev 834)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-05-20 20:11:21 UTC (rev 835)
@@ -20,7 +20,7 @@
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 ret_val = $('<div class="widget clearfix infotrigger" ' + style + '/>');
ret_val.setWidgetLayout($e);
ret_val.append( extractLabel( $e.find('label')[0] ) );
@@ -35,10 +35,10 @@
var buttons = $('<div style="float:left;"/>');
var buttonCount = 2;
- var actordown = '<div class="actor switchUnpressed '
+ var actordown = '<div class="actor switchUnpressed downlabel" '
if ( $e.attr( 'align' ) )
- actordown += $e.attr( 'align' );
- actordown += '">';
+ actorinfo += 'style="text-align: '+$e.attr( 'align' )+'" ';
+ actordown += '>';
actordown += '<div class="value">' + ($e.attr('downlabel') ? $e.attr('downlabel') : '-') + '</div>';
actordown += '</div>';
var $actordown = $(actordown).data( {
@@ -57,10 +57,10 @@
$(this).removeClass('switchPressed').addClass('switchUnpressed');
} );
- var actorup = '<div class="actor switchUnpressed '
+ var actorup = '<div class="actor switchUnpressed uplabel" '
if ( $e.attr( 'align' ) )
- actorup += $e.attr( 'align' );
- actorup += '">';
+ actorinfo += 'style="text-align: '+$e.attr( 'align' )+'" ';
+ actorup += '>';
actorup += '<div class="value">' + ($e.attr('uplabel') ? $e.attr('uplabel') : '+') + '</div>';
actorup += '</div>';
var $actorup = $(actorup).data( {
@@ -79,7 +79,7 @@
$(this).removeClass('switchPressed').addClass('switchUnpressed');
} );
- var actorinfo = '<div class="actor switchInvisible" ';
+ var actorinfo = '<div class="actor switchInvisible " ';
if ( $e.attr( 'align' ) )
actorinfo += 'style="text-align: '+$e.attr( 'align' )+'" ';
actorinfo += '" ><div class="value">-</div></div>';
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-05-20 16:35:47 UTC (rev 834)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-05-20 20:11:21 UTC (rev 835)
@@ -20,7 +20,7 @@
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 ret_val = $('<div class="widget clearfix multitrigger" ' + style + '/>');
ret_val.setWidgetLayout($e)
ret_val.append( 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-05-20 16:35:47 UTC (rev 834)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2012-05-20 20:11:21 UTC (rev 835)
@@ -21,7 +21,7 @@
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 switch" ' + style + ' />');
+ var ret_val = $('<div class="widget clearfix trigger" ' + style + ' />');
ret_val.setWidgetLayout($e);
var label = extractLabel( $e.find('label')[0] );
var address = makeAddressList($e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
