Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[307] CometVisu/trunk/visu
|
From: <ma...@us...> - 2011-02-27 17:17:07
|
Revision: 307
http://openautomation.svn.sourceforge.net/openautomation/?rev=307&view=rev
Author: mayerch
Date: 2011-02-27 17:17:00 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
New Feature: flavours for pages
Modified Paths:
--------------
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-02-27 15:58:17 UTC (rev 306)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-02-27 17:17:00 UTC (rev 307)
@@ -320,4 +320,74 @@
padding: 2px;
background-color: #fee;
opacity: 0.80;
-}
\ No newline at end of file
+}
+
+/*****************************************************************************/
+/* The definition of the flavours - overwrite the generic settings */
+/*****************************************************************************/
+
+.flavour_black hr
+{
+ background-color: #000000;
+}
+
+.flavour_black .link a
+{
+ color: #000000;
+}
+
+.flavour_white hr
+{
+ background-color: #ffffff;
+}
+.flavour_white .link a
+{
+ color: #ffffff;
+}
+
+.flavour_antimony hr
+{
+ background-color: #00ddff;
+}
+
+.flavour_antimony .link a
+{
+ color: #00ddff;
+}
+
+.flavour_boron hr
+{
+ background-color: #00ff11;
+}
+.flavour_boron .link a
+{
+ color: #00ff11;
+}
+
+.flavour_lithium hr
+{
+ background-color: #ff0000;
+}
+.flavour_lithium .link a
+{
+ color: #ff0000;
+}
+
+.flavour_potassium hr
+{
+ background-color: #d00055;
+}
+.flavour_potassium .link a
+{
+ color: #d00055;
+}
+
+.flavour_sodium hr
+{
+ background-color: #ff8000;
+}
+.flavour_sodium .link a
+{
+ color: #ff8000;
+}
+
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-02-27 15:58:17 UTC (rev 306)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-02-27 17:17:00 UTC (rev 307)
@@ -51,13 +51,13 @@
* XML config file tags
*/
this.addCreator('page', {
- create: function( page, path ) {
+ create: function( page, path, flavour ) {
var $p = $(page);
var ret_val = $('<div class="widget" />');
var pstyle = ( '0' != path ) ? 'display:none;' : ''; // subPage style
var name = $p.attr('name');
var type = $p.attr('type'); //text, 2d or 3d
- var flavour = $p.attr('flavour'); // sub design choice
+ if( $p.attr('flavour') ) flavour = $p.attr('flavour');// sub design choice
var wstyle = ''; // widget style
if( $p.attr('align') ) wstyle += 'text-align:' + $p.attr('align') + ';';
if( wstyle != '' ) wstyle = 'style="' + wstyle + '"';
@@ -67,9 +67,12 @@
var container = $( '<div class="clearfix"/>' );
container.append( '<h1>' + name + '</h1>' );
$( childs ).each( function(i){
- container.append( create_pages(childs[i], path + '_' + i ) );
+ container.append( create_pages( childs[i], path + '_' + i, flavour ) );
} );
- $('#pages').prepend( $( '<div class="page" id="' + path + '" style="'+pstyle+';"/>' ).append(container) );
+ var subpage = $( '<div class="page" id="' + path + '" style="'+pstyle+';"/>' );
+ subpage.append(container);
+ if( flavour ) subpage.addClass( 'flavour_' + flavour );
+ $('#pages').prepend( subpage );
return ret_val;
},
attributes: {
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2011-02-27 15:58:17 UTC (rev 306)
+++ CometVisu/trunk/visu/lib/templateengine.js 2011-02-27 17:17:00 UTC (rev 307)
@@ -252,10 +252,10 @@
$("#pages").triggerHandler("done");
}
-function create_pages( page, path ) {
+function create_pages( page, path, flavour ) {
var creator = design.getCreator(page.nodeName);
- var retval = creator.create(page, path);
+ var retval = creator.create(page, path, flavour);
node = $(page).get(0);
var attributes = {};
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-02-27 15:58:17 UTC (rev 306)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-02-27 17:17:00 UTC (rev 307)
@@ -19,6 +19,13 @@
<entry value="0">Null</entry>
<entry range_min="0" range_max="1e99">Positiv</entry>
</mapping>
+ <mapping name="KonnexHVAC">
+ <entry value="auto">Auto</entry>
+ <entry value="comfort">Komfort</entry>
+ <entry value="standby">Stand By</entry>
+ <entry value="economy">Economy</entry>
+ <entry value="building_protection">Haus-Schutz</entry>
+ </mapping>
</mappings>
<stylings>
<styling name="RedGreen">
@@ -86,6 +93,10 @@
<label>KONNEX Betriebsart</label>
<address transform="DPT:20.102" readonly="false" type="">3/1/50</address>
</multitrigger>
+ <info mapping="KonnexHVAC">
+ <label>Betriebsart</label>
+ <address transform="DPT:20.102" type="">3/1/50</address>
+ </info>
<line/>
<image src="icon/comet_128_ff8000.png" width="500px" height="46px"/>
<image src="http://www.e-zeeinternet.com/count.php?page=546016&style=default&nbdigits=9&reloads=1" refresh="10">
@@ -95,12 +106,76 @@
<page name="iframe Test" align="center" >
<iframe src="http://www.cometvisu.org" width="500px" height="500px"/>
</page>
+ <page name="Flavour Test" align="center" >
+ <text>The flavours define a page specific look for a choosen design.
+ The CometVisu's pure design was inspired by the colors that a comet out of
+ that material would shine in.
+ </text>
+ <page name="Flavour: Antimony" align="center" flavour="antimony">
+ <text align="center">CometVisu Antimony flavour</text>
+ <line/>
+ <page name="Subpage">
+ <text>An empty page</text>
+ <line/>
+ </page>
+ </page>
+ <page name="Flavour: Boron" align="center" flavour="boron">
+ <text align="center">CometVisu Boron flavour</text>
+ <line/>
+ <page name="Subpage">
+ <text>An empty page</text>
+ <line/>
+ </page>
+ </page>
+ <page name="Flavour: Lithium" align="center" flavour="lithium">
+ <text align="center">CometVisu Lithium flavour</text>
+ <line/>
+ <page name="Subpage">
+ <text>An empty page</text>
+ <line/>
+ </page>
+ </page>
+ <page name="Flavour: Potassium" align="center" flavour="potassium">
+ <text align="center">CometVisu Potassium flavour</text>
+ <line/>
+ <page name="Subpage">
+ <text>An empty page</text>
+ <line/>
+ </page>
+ </page>
+ <page name="Flavour: Sodium" align="center" flavour="sodium">
+ <text align="center">CometVisu Sodium flavour</text>
+ <line/>
+ <page name="Subpage">
+ <text>An empty page</text>
+ <line/>
+ </page>
+ </page>
+ <line />
+ <page name="Flavour: black" align="center" flavour="black">
+ <text align="center">CometVisu black flavour</text>
+ <line/>
+ <page name="Subpage">
+ <text>An empty page</text>
+ <line/>
+ </page>
+ </page>
+ <page name="Flavour: white" align="center" flavour="white">
+ <text align="center">CometVisu white flavour</text>
+ <line/>
+ <page name="Subpage">
+ <text>An empty page</text>
+ <line/>
+ </page>
+ </page>
+ </page>
<colorchooser>
A colorChooser
1/2/59
1/2/60
1/2/61
</colorchooser>
+ <break/>
<info format="%.2f">
<label>R</label>
<address transform="DPT:5.001" type="">1/2/59</address>
@@ -127,6 +202,5 @@
</slide>
<diagram_popup rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
<diagram_inline rrd="200_DALI_Linie_1_Strom" width="600" height="400"/>
- <designtoggle/>
</page>
</pages>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
