Menu
▾
▴
openautomation-svn
|
From: <ma...@us...> - 2012-02-12 14:37:01
|
Revision: 700
http://openautomation.svn.sourceforge.net/openautomation/?rev=700&view=rev
Author: mayerch
Date: 2012-02-12 14:36:55 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Added encoding for Time at the transform for KNX.
Also added a little helper function that preprends zeros to a string till a given length.
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/clock/structure_plugin.js
CometVisu/trunk/visu/transforms/transform_default.js
CometVisu/trunk/visu/transforms/transform_knx.js
Modified: CometVisu/trunk/visu/plugins/clock/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/clock/structure_plugin.js 2012-02-12 14:07:04 UTC (rev 699)
+++ CometVisu/trunk/visu/plugins/clock/structure_plugin.js 2012-02-12 14:36:55 UTC (rev 700)
@@ -44,6 +44,7 @@
var datatype = $(page).attr('datatype');
var $actor = $(actor)
.data({
+ 'value' : new Date(),
'address' : address,
'type' : 'clock'
});
@@ -82,7 +83,6 @@
var y = 50 - (event.originalEvent.pageY - $svg.offset().top);
var angle = (Math.atan2( x, y ) * 180 / Math.PI + 360) % 360;
var time = $container.data('value');
- var told = time.toString();
if( event.data.type == 'hour' )
{
var oldHours = time.getHours();
Modified: CometVisu/trunk/visu/transforms/transform_default.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_default.js 2012-02-12 14:07:04 UTC (rev 699)
+++ CometVisu/trunk/visu/transforms/transform_default.js 2012-02-12 14:36:55 UTC (rev 700)
@@ -66,4 +66,14 @@
Transform[ prefix + ':' + trans ] = transforms[ trans ];
}
}
+}
+
+/**
+ * Prepend zeros to the string s till the result has the length l.
+ */
+function zeroFillString( s, l )
+{
+ if( s.length >= l ) return s;
+
+ return new Array(1 + l - s.length).join('0') + s;
}
\ No newline at end of file
Modified: CometVisu/trunk/visu/transforms/transform_knx.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_knx.js 2012-02-12 14:07:04 UTC (rev 699)
+++ CometVisu/trunk/visu/transforms/transform_knx.js 2012-02-12 14:36:55 UTC (rev 700)
@@ -216,7 +216,10 @@
'10.001' : {
name : 'DPT_TimeOfDay',
encode: function( phy ){
- // FIXME
+ var val = zeroFillString( ((phy.getDay() << 5) + phy.getHours()).toString(16), 2);
+ val += zeroFillString( phy.getMinutes().toString(16), 2 );
+ val += zeroFillString( phy.getSeconds().toString(16), 2 );
+ return '80' + val;
},
decode: function( hex ){
var date = new Date(); // assume today
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2012-02-18 15:33:10
|
Revision: 708
http://openautomation.svn.sourceforge.net/openautomation/?rev=708&view=rev
Author: j-n-k
Date: 2012-02-18 15:33:02 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
Fix spaces/tab in templateengine.js
Groups: Added "nowidget"-attribute. If nowidget="true" widget-stylings
are not applied to the group (necessary for grouping without border,
padding, margin, backgroudn etc.)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2012-02-16 20:13:02 UTC (rev 707)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2012-02-18 15:33:02 UTC (rev 708)
@@ -233,6 +233,9 @@
if( $p.attr('align') ) hstyle += 'text-align:' + $p.attr('align') + ';';
if( hstyle != '' ) hstyle = 'style="' + hstyle + '"';
ret_val.setWidgetLayout($p);
+ if ($p.attr('nowidget')=='true') {
+ ret_val.removeClass('widget');
+ }
var childs = $p.children();
var container = $( '<div class="clearfix"/>' );
if( $p.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $p.attr('name') + '</h2>' );
@@ -244,11 +247,12 @@
return ret_val;
},
attributes: {
- align: { type: 'string', required: false },
- flavour:{ type: 'string', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false },
- name: { type: 'string', required: true }
+ align: { type: 'string', required: false },
+ flavour: { type: 'string', required: false },
+ colspan: { type: 'numeric', required: false },
+ rowspan: { type: 'numeric', required: false },
+ nowidget: {type: 'string', required: false },
+ name: { type: 'string', required: true }
},
elements: {
},
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-02-16 20:13:02 UTC (rev 707)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-02-18 15:33:02 UTC (rev 708)
@@ -25,11 +25,9 @@
var main_scroll;
var old_scroll = '';
-visu = new CometVisu('/cgi-bin/');//{};
-visu.update = function( json ) // overload the handler
-{
- for( key in json )
- {
+visu = new CometVisu('/cgi-bin/');
+visu.update = function( json ) { // overload the handler
+ for( key in json ) {
$.event.trigger( '_' + key, json[key] );
}
}
@@ -45,6 +43,7 @@
if (typeof forceReload == "undefined") {
var forceReload = false;
}
+
if( $.getUrlVar('forceReload') ) {
forceReload = $.getUrlVar('forceReload') != 'false'; // true unless set to false
}
@@ -89,25 +88,21 @@
(basetrans in Transform ? Transform[ basetrans ].encode( value ) : value);
}
-function transformDecode( transformation, value )
-{
+function transformDecode( transformation, value ) {
var basetrans = transformation.split('.')[0];
return transformation in Transform ?
Transform[ transformation ].decode( value ) :
(basetrans in Transform ? Transform[ basetrans ].decode( value ) : value);
}
-function map( value, element )
-{
+function map( value, element ) {
var map = element.data('mapping');
- if( map && mappings[map] && (mappings[map][value] || mappings[map]['range']) )
- {
+ if( map && mappings[map] && (mappings[map][value] || mappings[map]['range']) ) {
if( mappings[map]['range'] ) value = parseFloat( value );
if( mappings[map][value] ) return mappings[map][value];
var range = mappings[map]['range'];
- for( var min in range )
- {
+ for( var min in range ) {
if( min > value ) continue;
if( range[min][0] < value ) continue; // check max
return range[min][1];
@@ -120,20 +115,19 @@
* Make sure everything looks right when the window gets resized.
* This is necessary as the scroll effect requires a fixed element size
*/
-function handleResize()
-{
+function handleResize() {
var uagent = navigator.userAgent.toLowerCase();
if (/(android|blackberry|iphone|ipod|series60|symbian|windows ce|palm)/i.test(uagent)) {
- var width = $( window ).width();
- $( '#main' ).css( 'width', width );
- $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;}</style>' );
- // do nothing
+ var width = $( window ).width();
+ $( '#main' ).css( 'width', width );
+ $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;}</style>' );
+ // do nothing
} else {
- var width = $( window ).width();
- var height = $( window ).height() - $( '#top' ).outerHeight(true) - $( '#bottom' ).outerHeight(true) - 2;
- $( '#main' ).css( 'width', width ).css( 'height', height );
- $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;height:' + height + 'px;}</style>' );
+ var width = $( window ).width();
+ var height = $( window ).height() - $( '#top' ).outerHeight(true) - $( '#bottom' ).outerHeight(true) - 2;
+ $( '#main' ).css( 'width', width ).css( 'height', height );
+ $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;height:' + height + 'px;}</style>' );
}
main_scroll != undefined && main_scroll.seekTo( main_scroll.getIndex(), 0 ); // fix scroll
}
@@ -197,15 +191,15 @@
// design by url
if ($.getUrlVar("design")) {
- clientDesign = $.getUrlVar("design");
+ clientDesign = $.getUrlVar("design");
}
// design by config file
else if (predefinedDesign){
- clientDesign = predefinedDesign;
+ clientDesign = predefinedDesign;
}
// selection dialog
else {
- selectDesign();
+ selectDesign();
}
$( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/designglobals.css" />' );
@@ -227,19 +221,19 @@
html_doc.appendChild(js);
js.onreadystatechange = function () {
- if (js.readyState == 'complete') {
- pluginsToLoad -= 1;
- if (pluginsToLoad <= 0) {
- setup_page(xml);
- }
+ if (js.readyState == 'complete') {
+ pluginsToLoad -= 1;
+ if (pluginsToLoad <= 0) {
+ setup_page(xml);
}
+ }
}
js.onload = function () {
- pluginsToLoad -= 1;
- if (pluginsToLoad <= 0) {
- setup_page(xml);
- }
+ pluginsToLoad -= 1;
+ if (pluginsToLoad <= 0) {
+ setup_page(xml);
+ }
}
} );
@@ -308,11 +302,10 @@
// adapt width for pages to show
handleResize();
- if (pluginsToLoad <= 0) {
- setup_page(xml);
- }
+ if (pluginsToLoad <= 0) {
+ setup_page(xml);
+ }
-
}
function setup_page( xml )
@@ -339,15 +332,13 @@
// reaction on browser back button
window.onpopstate = function(e) {
-
- // where do we come frome?
- lastpage = $('body').data("lastpage")
- if (lastpage) {
- // browser back button takes us one level higher
- scrollToPage(lastpage);
- }
+ // where do we come frome?
+ lastpage = $('body').data("lastpage")
+ if (lastpage) {
+ // browser back button takes us one level higher
+ scrollToPage(lastpage);
+ }
}
-
visu.subscribe( ga_list );
$("#pages").triggerHandler("done");
@@ -355,90 +346,87 @@
function create_pages( page, path, flavour ) {
- var creator = design.getCreator(page.nodeName);
- var retval = creator.create(page, path, flavour);
+ var creator = design.getCreator(page.nodeName);
+ var retval = creator.create(page, path, flavour);
- node = $(page).get(0);
- var attributes = {};
- if (typeof node.attributes != "undefined") {
- for(var i=0; i<node.attributes.length; i++) {
- if(node.attributes.item(i).specified) {
- attributes[node.attributes.item(i).nodeName]=node.attributes.item(i).nodeValue
- }
- }
- } else {
- $.extend(attributes, node);
+ node = $(page).get(0);
+ var attributes = {};
+ if (typeof node.attributes != "undefined") {
+ for(var i=0; i<node.attributes.length; i++) {
+ if(node.attributes.item(i).specified) {
+ attributes[node.attributes.item(i).nodeName]=node.attributes.item(i).nodeValue
+ }
}
+ } else {
+ $.extend(attributes, node);
+ }
- var configData = {attributes: {}, elements: {}}
- if (typeof creator.attributes != "undefined") {
- $.each(creator.attributes, function (index, e) {
- if ($(page).attr(index)) {
- configData.attributes[index] = $(page).attr(index);
- }
- });
- }
+ var configData = {attributes: {}, elements: {}}
+ if (typeof creator.attributes != "undefined") {
+ $.each(creator.attributes, function (index, e) {
+ if ($(page).attr(index)) {
+ configData.attributes[index] = $(page).attr(index);
+ }
+ });
+ }
- if (typeof creator.elements != "undefined") {
- $.each(creator.elements, function (index, e) {
- var elements = $(page).find(index);
- configData.elements[index] = elements;
- });
- }
+ if (typeof creator.elements != "undefined") {
+ $.each(creator.elements, function (index, e) {
+ var elements = $(page).find(index);
+ configData.elements[index] = elements;
+ });
+ }
- retval.data("configData", configData)
- .data("path", path)
- .data("nodeName", page.nodeName)
- .data("textContent", page.textContent);
+ retval.data("configData", configData)
+ .data("path", path)
+ .data("nodeName", page.nodeName)
+ .data("textContent", page.textContent);
- if (jQuery(retval).is(".widget")) {
- retval = jQuery("<div class='widget_container "+(retval.data("colspanClass") ? retval.data("colspanClass") : '')+" "+(retval.data("rowspanClass") ? retval.data("rowspanClass") : '')+"' />").append(retval);
- }
+ if (jQuery(retval).is(".widget") || (jQuery(retval).is(".group")) ) {
+ retval = jQuery("<div class='widget_container " +
+ (retval.data("colspanClass") ? retval.data("colspanClass") : '') + " " +
+ (retval.data("rowspanClass") ? retval.data("rowspanClass") : '')+"' />")
+ .append(retval);
+ }
- return retval;
+ return retval;
}
-function scrollToPage( page_id, speed )
-{
+function scrollToPage( page_id, speed ) {
$('#'+page_id).css( 'display', '' ); // show new page
// which is the parent of target page_id?
// => set this id as lastpage in url for window.onpopstate handling
var path = page_id.split( '_' );
- if (path.length > 1){
- // above top level
- // everything besides the last number is the parent id
- path.pop();
- // store lastpage in body.data
- $('body').data("lastpage", path.join("_"));
+ if (path.length > 1) {
+ // above top level
+ // everything besides the last number is the parent id
+ path.pop();
+ // store lastpage in body.data
+ $('body').data("lastpage", path.join("_"));
}
else {
- // top level
- $('body').data("lastpage", page_id);
+ // top level
+ $('body').data("lastpage", page_id);
}
// push new state to history
window.history.pushState(page_id, page_id, window.location.href);
-
-
+
main_scroll.seekTo( $('.page').index( $('#'+page_id)[0] ), speed ); // scroll to it
var pagedivs=$('div', '#'+page_id);
- for( var i = 0; i<pagedivs.length; i++) //check for inline diagrams & refresh
- {
- if( pagedivs[i].className == 'diagram_inline')
- {
+ for( var i = 0; i<pagedivs.length; i++) { //check for inline diagrams & refresh
+ if( pagedivs[i].className == 'diagram_inline') {
refreshDiagram(pagedivs[i]);
}
}
}
-function updateTopNavigation()
-{
+function updateTopNavigation() {
var path = $('.page').eq( this.getIndex() ).attr('id').split( '_' );
var id = ''; //path[0];
var nav = '';
- for( var i = 0; i < path.length; i++ )
- {
+ for( var i = 0; i < path.length; i++ ) {
id += path[i];
nav += (0==i ? '' : ' ► ')
+ '<a href="javascript:scrollToPage(\'' +id+ '\')">'
@@ -450,8 +438,7 @@
var old_array = old_scroll;
old_scroll = path;
path = path.join('_');
- for( var i = new_array.length; i < old_array.length; i++ )
- {
+ for( var i = new_array.length; i < old_array.length; i++ ) {
path += '_' + old_array[i]; // reuse of path...
$('#'+path).css('display','none');
}
@@ -463,8 +450,7 @@
* This function returnes a jQuery object that points to the whole popup,
* so it's content can be easily extended
*/
-function showPopup( type, attributes )
-{
+function showPopup( type, attributes ) {
//var retval = design.popups[ type ].create( attributes ); //page, path );
//return retval;
if( !design.popups[ type ] ) type = 'unknown';
@@ -476,8 +462,7 @@
* Remove the popup.
* The parameter is the jQuery object returned by the showPopup function
*/
-function removePopup( jQuery_object )
-{
+function removePopup( jQuery_object ) {
jQuery_object.remove();
}
@@ -485,15 +470,12 @@
/* FIXME - Question: should this belong to the VisuDesign object so that it */
/* is possible to overload?!? */
/****************************************************************************/
-function refreshAction( target, src )
-{
+function refreshAction( target, src ) {
target.src = src + '&' + new Date().getTime();
}
-function setupRefreshAction()
-{
+function setupRefreshAction() {
var refresh = $(this).data('refresh');
- if( refresh && refresh > 0 )
- {
+ if( refresh && refresh > 0 ) {
var target = $('img', $(this) )[0] || $('iframe', $(this) )[0];
var src = target.src;
if( src.indexOf('?') < 0 ) src += '?';
@@ -503,58 +485,57 @@
function selectDesign() {
+ $body = $("body");
- $body = $("body");
-
- $("body > *").hide();
- $body.css({backgroundColor: "black"});
+ $("body > *").hide();
+ $body.css({backgroundColor: "black"});
- $div = $("<div id=\"designSelector\" />");
- $div.css({background: "#808080", width: "400px", color: "white", margin: "auto", padding: "0.5em"});
- $div.html("Loading ...");
+ $div = $("<div id=\"designSelector\" />");
+ $div.css({background: "#808080", width: "400px", color: "white", margin: "auto", padding: "0.5em"});
+ $div.html("Loading ...");
- $body.append($div);
+ $body.append($div);
- $.getJSON("edit/get_designs.php", function(data) {
- $div.empty();
+ $.getJSON("edit/get_designs.php", function(data) {
+ $div.empty();
- $div.append("<h1>Please select design</h1>");
- $div.append("<p>The Location/URL will change after you have chosen your design. Please bookmark the new URL if you do not want to select the design every time.</p>");
+ $div.append("<h1>Please select design</h1>");
+ $div.append("<p>The Location/URL will change after you have chosen your design. Please bookmark the new URL if you do not want to select the design every time.</p>");
- $.each(data, function(i, element) {
- var $myDiv = $("<div />");
+ $.each(data, function(i, element) {
+ var $myDiv = $("<div />");
- $myDiv.css({cursor: "pointer", padding: "0.5em 1em", borderBottom: "1px solid black", margin: "auto", width: "262px", position: "relative"});
+ $myDiv.css({cursor: "pointer", padding: "0.5em 1em", borderBottom: "1px solid black", margin: "auto", width: "262px", position: "relative"});
- $myDiv.append("<div style=\"font-weight: bold; margin: 1em 0 .5em;\">Design: " + element + "</div>");
- $myDiv.append("<iframe src=\"designs/design_preview.html?design=" + element + "\" width=\"160\" height=\"90\" border=\"0\" scrolling=\"auto\" frameborder=\"0\" style=\"z-index: 1;\"></iframe>");
- $myDiv.append("<img width=\"60\" height=\"30\" src=\"media/arrow.png\" alt=\"select\" border=\"0\" style=\"margin: 60px 10px 10px 30px;\"/>");
+ $myDiv.append("<div style=\"font-weight: bold; margin: 1em 0 .5em;\">Design: " + element + "</div>");
+ $myDiv.append("<iframe src=\"designs/design_preview.html?design=" + element + "\" width=\"160\" height=\"90\" border=\"0\" scrolling=\"auto\" frameborder=\"0\" style=\"z-index: 1;\"></iframe>");
+ $myDiv.append("<img width=\"60\" height=\"30\" src=\"media/arrow.png\" alt=\"select\" border=\"0\" style=\"margin: 60px 10px 10px 30px;\"/>");
- $div.append($myDiv);
+ $div.append($myDiv);
- var $tDiv = $("<div />");
- $tDiv.css({background: "transparent", position: "absolute", height: "90px", width: "160px", zIndex: 2})
- var pos = $myDiv.find("iframe").position();
- $tDiv.css({left: pos.left + "px", top: pos.top + "px"});
- $myDiv.append($tDiv);
+ var $tDiv = $("<div />");
+ $tDiv.css({background: "transparent", position: "absolute", height: "90px", width: "160px", zIndex: 2})
+ var pos = $myDiv.find("iframe").position();
+ $tDiv.css({left: pos.left + "px", top: pos.top + "px"});
+ $myDiv.append($tDiv);
- $myDiv.hover(function() {
- // over
- $myDiv.css({background: "#bbbbbb"});
- },
- function() {
- // out
- $myDiv.css({background: "transparent"});
- });
+ $myDiv.hover(function() {
+ // over
+ $myDiv.css({background: "#bbbbbb"});
+ },
+ function() {
+ // out
+ $myDiv.css({background: "transparent"});
+ });
- $myDiv.click(function() {
- if (document.location.search == "") {
- document.location.href = document.location.href + "?design=" + element;
- } else {
- document.location.href = document.location.href + "&design=" + element;
- }
- })
+ $myDiv.click(function() {
+ if (document.location.search == "") {
+ document.location.href = document.location.href + "?design=" + element;
+ } else {
+ document.location.href = document.location.href + "&design=" + element;
+ }
+ })
- })
})
+ })
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2012-02-21 20:45:41
|
Revision: 712
http://openautomation.svn.sourceforge.net/openautomation/?rev=712&view=rev
Author: j-n-k
Date: 2012-02-21 20:45:34 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
Complete rework of colspan/rowspan-code, again
removed ".innerrowspanX", replaced with global ".innerrowspan"
removed ".widget_container .widget_container" (not needed anymore)
removed calculation of "colspanX", instead dynamic style-attributes
are added to all widgets
colspan/rowspan should now work correctly within groups
default-colspan is now given by a ".colspandefault" in basic.css,
the "width: X px;" makes a default widget-witdh of X/12th of screen-width
PLEASE: Test extensively, WFM in FF 10, Chrome 17, Safari 5.1.2 and on iOS 5.1
Modified Paths:
--------------
CometVisu/trunk/visu/designs/alaska/basic.css
CometVisu/trunk/visu/designs/alaska_slim/basic.css
CometVisu/trunk/visu/designs/designglobals.css
CometVisu/trunk/visu/designs/discreet/basic.css
CometVisu/trunk/visu/designs/discreet_sand/basic.css
CometVisu/trunk/visu/designs/discreet_slim/basic.css
CometVisu/trunk/visu/designs/pitchblack/basic.css
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/alaska/basic.css 2012-02-21 20:45:34 UTC (rev 712)
@@ -87,18 +87,14 @@
text-decoration: none;
}
-.colspan0 { /* multiple of 8.33333% ! */
- width: 49.9998%;
+.colspandefault { /* in units of 1/12 screen width */
+ width: 6px;
}
.widget_container {
float: left;
}
-.widget_container .widget_container {
- width: 100%;
-}
-
.widget
{
margin: 0.2em;
Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css 2012-02-21 20:45:34 UTC (rev 712)
@@ -82,18 +82,14 @@
text-decoration: none;
}
-.colspan0 { /* multiple of 8.33333% ! */
- width: 33.33332%;
+.colspandefault { /* in units of 1/12 screen width */
+ width: 4px;
}
.widget_container {
float: left;
}
-.widget_container .widget_container {
- width: 100%;
-}
-
.widget
{
margin: 0.2em;
Modified: CometVisu/trunk/visu/designs/designglobals.css
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/designglobals.css 2012-02-21 20:45:34 UTC (rev 712)
@@ -7,54 +7,14 @@
* class, this class is the default widget size
*/
-.colspan1 {
- width: 8.33333%;
+.innerrowspan {
+ position:absolute;
+ top:0;
+ bottom:0;
+ left:0;
+ right:0;
}
-.colspan2 {
- width: 16.66666%;
-}
-
-.colspan3 {
- width: 24.99999%;
-}
-
-.colspan4 {
- width: 33.33332%;
-}
-
-.colspan5 {
- width: 41.66665%;
-}
-
-.colspan6 {
- width: 49.99998%;
-}
-
-.colspan7 {
- width: 58.33331%;
-}
-
-.colspan8 {
- width: 66.66664%;
-}
-
-.colspan9 {
- width: 74.99997%;
-}
-
-.colspan10 {
- width: 83.33330%;
-}
-
-.colspan11 {
- width: 91.66663%;
-}
-
-.colspan12 {
- width: 99.99996%;
-}
-
/*
* global color declarations for stylings in all designs
* may be overloaded by designs
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2012-02-21 20:45:34 UTC (rev 712)
@@ -81,18 +81,14 @@
vertical-align: middle;
}
-.colspan0 { /* multiple of 8.33333% ! */
- width: 49.9998%;
+.colspandefault { /* in units of 1/12 screen width */
+ width: 6px;
}
.widget_container {
float: left;
}
-.widget_container .widget_container {
- width: 100%;
-}
-
.widget
{
margin: .2em;
Modified: CometVisu/trunk/visu/designs/discreet_sand/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/basic.css 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/discreet_sand/basic.css 2012-02-21 20:45:34 UTC (rev 712)
@@ -74,18 +74,14 @@
vertical-align: middle;
}
-.colspan0 { /* multiple of 8.33333% ! */
- width: 49.9998%;
+.colspandefault { /* in units of 1/12 screen width */
+ width: 6px;
}
.widget_container {
float: left;
}
-.widget_container .widget_container {
- width: 100%;
-}
-
.widget
{
margin: .2em;
Modified: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css 2012-02-21 20:45:34 UTC (rev 712)
@@ -74,18 +74,14 @@
vertical-align: middle;
}
-.colspan0 { /* multiple of 8.33333% ! */
- width: 33.33332%;
+.colspandefault { /* in units of 1/12 screen width */
+ width: 4px;
}
.widget_container {
float: left;
}
-.widget_container .widget_container {
- width: 100%;
-}
-
.widget
{
margin: .1em;
Modified: CometVisu/trunk/visu/designs/pitchblack/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pitchblack/basic.css 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/pitchblack/basic.css 2012-02-21 20:45:34 UTC (rev 712)
@@ -39,7 +39,7 @@
div#top , .widget, .popup_background {
border-color: /* border */ #202020;
border-style: solid;
- border-width: 0 0.05em 0.05em 0.05em;
+ border-width: 0 1px 1px 1px;
}
#pages hr, body hr {
@@ -64,10 +64,17 @@
margin: 0;
}
-div#top, .widget {
+div#top, .widget, .widget.group {
margin: .2em .1em 0 .1em;
}
+.widget.group .widget {
+ background: #0D0D0D;
+ border: none;
+ margin: 0;
+ padding:0;
+}
+
.nav_path , .widget .actor, .diagram_inline {
margin-left: .2em;
}
@@ -107,10 +114,18 @@
padding: 0.3em;
}
+.widget.group {
+ padding: 0.3em 0 0.3em 0;
+}
+
.text >div, .rsslog .label, .popup >div.head {
padding-left: 0.3em;
}
+.group .text>div, .group .rsslog .label {
+ padding-left: 0.6em;
+}
+
#diagramTooltip {
padding: 2px;
}
@@ -133,8 +148,8 @@
font-size:80%;
}
-.lighton > div, .lightoff > div, .jalup > div, .jaldown > div, /* image-buttons */
- .jalstop > div, .singlewindowopen > div, .singlewindowclosed > div, .doublewindowleftopen > div,
+.lighton > div, .lightoff > div, .jalup, .jaldown, /* image-buttons */
+ .jalstop, .singlewindowopen > div, .singlewindowclosed > div, .doublewindowleftopen > div,
.doublewindowrightopen >div, .doublewindowbothclosed >div, .doublewindowbothopen >div {
font-size:0%;
}
@@ -241,15 +256,15 @@
vertical-align: middle;
}
-.colspan0 { /* multiple of 8.33333% ! */
- width: 8.33333%;
+.widget_container {
}
-.widget_container {
+.colspan0 {
+ width: 8.33333%;
}
-.widget_container .widget_container, .link > div, .link a , .switchPressed,
- .switchUnpressed, * html>body .clearfix, .info > div, .actor .value , .text>div{
+.link > div, .link a , .switchPressed, .switchUnpressed, * html>body .clearfix,
+ .info > div, .actor .value , .text>div {
width: 100%;
}
@@ -291,21 +306,20 @@
position: relative;
}
- .ui-slider { position: relative; text-align: left; }
+.ui-slider { position: relative; text-align: left; }
.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: .4em; height: 1.2em; cursor: default; }
.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
- .ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal { height: .8em; }
.ui-slider-horizontal .ui-slider-handle { top: -.40em; margin-left: -0.4em;}
.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
.ui-slider-horizontal .ui-slider-range-min { left: 0; }
.ui-slider-horizontal .ui-slider-range-max { right: 0; }
- .ui-widget-content { border: 1px solid #707070; background: #000000 ; color: #000000; }
- .ui-widget-content a { color: #333333; }
- .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
- .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-
+.ui-widget-content { border: 1px solid #707070; background: #000000 ; color: #000000; }
+.ui-widget-content a { color: #333333; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
.widget .ui-slider
{
@@ -408,3 +422,6 @@
background-color: #1d1d1d;
}
+.colspandefault {
+ width: 1px;
+}
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2012-02-21 20:45:34 UTC (rev 712)
@@ -67,12 +67,8 @@
float: left;
}
-/*.widget_container .widget_container {
- width: 100%;
-}*/
-
-.colspan0 { /* multiple of 8.33333% ! */
- width: 49.9998%;
+.colspandefault { /* in units of 1/12 screen width */
+ width: 6px;
}
.widget
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2012-02-21 20:45:34 UTC (rev 712)
@@ -55,10 +55,10 @@
*/
$.fn.setWidgetLayout = function(page) {
- this.data('colspanClass', 'colspan'+(page.attr('colspan') || '0'));
+ this.data('colspan', page.attr('colspan') || $('head').data('colspanDefault'));
if (page.attr('rowspan')) {
this.data('rowspanClass', rowspanClass(page.attr('rowspan') || 1));
- this.addClass(innerRowspanClass(page.attr('rowspan') || 1));
+ this.addClass('innerrowspan');
}
return this;
}
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-02-20 21:43:31 UTC (rev 711)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-02-21 20:45:34 UTC (rev 712)
@@ -133,10 +133,11 @@
}
$( window ).bind( 'resize', handleResize );
+
function rowspanClass(rowspan) {
var className = 'rowspan'+ rowspan;
- if ( !$('head').data(className) ) {
+ if ( !$('#'+className+'Style').get(0) ) {
var dummyDiv = $('<div class="clearfix" id="calcrowspan"><div id="containerDiv" class="widget_container"><div class="widget clearfix text" id="innerDiv" /></div></div>')
.appendTo(document.body).show();
@@ -146,36 +147,12 @@
// append css style
- $('head').append('<style>.rowspan' + rowspan + ' { height: ' + rowspan*Math.round(singleHeight) + 'px; overflow:hidden;} </style>').data(className, 1);
+ $('head').append('<style id="'+className+'Style">.rowspan' + rowspan + ' { height: ' + rowspan*Math.round(singleHeight) + 'px; overflow:hidden; position:relative;} </style>').data(className, 1);
}
return className;
}
-function innerRowspanClass(rowspan) {
- var className = 'innerrowspan'+ rowspan;
-
- if ( !$('head').data(className)) {
- var dummyDiv = $('<div class="clearfix" id="calcinnerrowspan"><div id="containerDiv" class="widget_container"><div class="widget clearfix text" id="innerDiv" /></div></div>')
- .appendTo(document.body).show();
- $('#containerDiv').addClass(rowspanClass(rowspan));
-
- var outerHeight = parseFloat($('#containerDiv').css('height'));
- var innerDiv=$('#innerDiv');
- var margin=Math.round(parseFloat(innerDiv.css('marginTop')))+Math.round(parseFloat(innerDiv.css('marginBottom')));
- var padding=Math.round(parseFloat(innerDiv.css('paddingTop')))+Math.round(parseFloat(innerDiv.css('paddingBottom')));
- var border=Math.round(parseFloat(innerDiv.css('borderTopWidth')))+Math.round(parseFloat(innerDiv.css('borderBottomWidth')));
- var innerHeight=outerHeight-margin-padding-border;
- $('#calcinnerrowspan').remove();
-
- // append css style
- $('head').append('<style>.innerrowspan' + rowspan + ' { height: ' + innerHeight + 'px;} </style>').data(className, 1);
-
- }
-
- return className;
-}
-
function parseXML(xml) {
// erst mal den Cache für AJAX-Requests wieder aktivieren
$.ajaxSetup({cache: true});
@@ -313,8 +290,32 @@
// and now setup the pages
var page = $( 'pages > page', xml )[0]; // only one page element allowed...
+ $('head').append(($('<div class="colspandefault" id="colspandefault">')));
+ setTimeout(function() {
+ $('head').data('colspanDefault', parseInt($('#colspandefault').css('width')));
+ $('#colspandefault').remove();
+
create_pages(page, '0');
+ // all containers
+ if (!/(android|blackberry|iphone|ipod|series60|symbian|windows ce|palm)/i.test(navigator.userAgent.toLowerCase())) {
+ var allContainer = $('.widget_container');
+ allContainer.each(function(i, e) {
+ var ourColspan = $(e).children('*:first-child').data('colspan');
+ var ourWidth = ourColspan/12*100;
+ $(e).css('width', ourWidth+'%');
+ });
+
+ // and elements inside groups
+ var adjustableElements = $('.group .widget_container');
+ adjustableElements.each(function(i, e) {
+ var groupColspan = $(e).parentsUntil('.widget_container', '.group').data('colspan');
+ var ourColspan = $(e).children('.widget').data('colspan');
+ var ourWidth = ourColspan/groupColspan*100; // in percent
+ $(e).css('width', ourWidth+'%');
+ });
+ };
+
// setup the scrollable
main_scroll = $('#main').scrollable({keyboard: false, touch: false}).data('scrollable');
main_scroll.onSeek( updateTopNavigation );
@@ -342,6 +343,7 @@
visu.subscribe( ga_list );
$("#pages").triggerHandler("done");
+ }, 1);
}
function create_pages( page, path, flavour ) {
@@ -384,7 +386,6 @@
if (jQuery(retval).is(".widget") || (jQuery(retval).is(".group")) ) {
retval = jQuery("<div class='widget_container " +
- (retval.data("colspanClass") ? retval.data("colspanClass") : '') + " " +
(retval.data("rowspanClass") ? retval.data("rowspanClass") : '')+"' />")
.append(retval);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2012-02-25 18:43:41
|
Revision: 715
http://openautomation.svn.sourceforge.net/openautomation/?rev=715&view=rev
Author: j-n-k
Date: 2012-02-25 18:43:35 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Changed diagram_popup behaviour to old style (height is approx. one row)
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
Added Paths:
-----------
CometVisu/trunk/visu/designs/pitchblack/mobile.css
Added: CometVisu/trunk/visu/designs/pitchblack/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/pitchblack/mobile.css (rev 0)
+++ CometVisu/trunk/visu/designs/pitchblack/mobile.css 2012-02-25 18:43:35 UTC (rev 715)
@@ -0,0 +1,11 @@
+.widget_container {
+ width: 98%;
+}
+
+#bottom {
+ display: none;
+}
+
+.page {
+ overflow: visible;
+}
Property changes on: CometVisu/trunk/visu/designs/pitchblack/mobile.css
___________________________________________________________________
Added: svn:executable
+ *
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2012-02-23 18:09:58 UTC (rev 714)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2012-02-25 18:43:35 UTC (rev 715)
@@ -71,6 +71,10 @@
if ($p.attr("width")) {
diagram.css("width", $p.attr("width"));
+ } else {
+ if (oldType=="popup") {
+ diagram.removeClass("diagram_inline").addClass("diagram_preview");
+ }
}
if ($p.attr("height")) {
diagram.css("height", $p.attr("height"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-04-02 21:49:59
|
Revision: 739
http://openautomation.svn.sourceforge.net/openautomation/?rev=739&view=rev
Author: mayerch
Date: 2012-04-02 21:49:52 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Preparation for cleaner file structure and automated build script:
* initial support for automatic documentation generation (using YUIdoc)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_custom.js
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/lib/cometvisu-client.js
CometVisu/trunk/visu/lib/compatibility.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/structure_custom.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_custom.js 2012-04-02 17:42:08 UTC (rev 738)
+++ CometVisu/trunk/visu/designs/structure_custom.js 2012-04-02 21:49:52 UTC (rev 739)
@@ -13,15 +13,21 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+/**
+ * This module defines the custom widget additions to the CometVisu visualisation.
+ * @module Structure custom
*/
/**
* This class defines all the custom changes to the visu
+ * @class VisuDesign_Custom
*/
function VisuDesign_Custom() {}; // do NOT change here
VisuDesign_Custom.prototype = new VisuDesign(); // do NOT change here
-/**
+/*
* Custom changes could go here and look e.g. like
****************************************
VisuDesign_Custom.prototype.addCreator("line", {
@@ -35,7 +41,7 @@
****************************************
*/
-/**
+/*
* This is a custom function that extends the available widgets.
* It's purpose is to change the design of the visu during runtime
* to demonstrate all available
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2012-04-02 17:42:08 UTC (rev 738)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2012-04-02 21:49:52 UTC (rev 739)
@@ -13,6 +13,12 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+/**
+ * This module defines the widgets for the CometVisu visualisation.
+ * @module Structure Pure
+ * @title CometVisu Structure "pure"
*/
// Define ENUM of maturity levels for features, so that e.g. the editor can
@@ -22,12 +28,11 @@
development : 1
};
-/**
+/*
* this function implements widget stylings
*
* implemented in: default_update, trigger-widget
*/
-
$.fn.setWidgetStyling = function(value) {
var styling = stylings[this.data('styling')];
if (styling) {
@@ -48,7 +53,7 @@
return this;
}
-/**
+/*
* this function implements all widget layouts that are identical (JNK)
*
* implemented: rowspan, colspan
@@ -63,7 +68,7 @@
return this;
}
- /**
+/*
* this function implements the widget label (JNK)
*/
@@ -75,9 +80,9 @@
return this;
}
-/**
- * this function extracts all addresses with attributes (JNK)
- */
+/*
+ * this function extracts all addresses with attributes (JNK)
+ */
function makeAddressList(page) {
var address = {};
@@ -94,6 +99,7 @@
/**
* This class defines all the building blocks for a Visu in the "Pure" design
+ * @class VisuDesign
*/
function VisuDesign() {
@@ -124,7 +130,7 @@
return this.popups[name];
}
- /**
+ /*
* The creators object contians all widgets creators and their mapping to the
* XML config file tags
*/
@@ -457,7 +463,7 @@
element.data( 'valueInternal', true );
}
},
- /**
+ /*
* Start a thread that regularily sends the silder position to the bus
*/
slideStart:function(event,ui)
@@ -478,7 +484,7 @@
data.value = actor.slider('value');
}, 250 ) ); // update KNX every 250 ms
},
- /**
+ /*
* Delete the update thread and send the final value of the slider to the bus
*/
slideChange:function(event,ui)
@@ -1297,7 +1303,7 @@
}
};
-/**
+/*
* Figure out best placement of popup.
* A preference can optionally be passed. The position is that of the numbers
* on the numeric keypad. I.e. a value of "6" means centered above the anchor.
Modified: CometVisu/trunk/visu/lib/cometvisu-client.js
===================================================================
--- CometVisu/trunk/visu/lib/cometvisu-client.js 2012-04-02 17:42:08 UTC (rev 738)
+++ CometVisu/trunk/visu/lib/cometvisu-client.js 2012-04-02 21:49:52 UTC (rev 739)
@@ -13,14 +13,19 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
+ */
+
+/**
+ * The JavaScript library that implements the CometVisu protocol.
* @module CometVisu Client
* @title CometVisu Client
+ * @reqires jQuery
*/
/**
* Class that handles the communicaton of the client
* @class CometVisu
+ * @constructor foo
* @param {String} urlPrefix The address of the service
*/
function CometVisu( urlPrefix )
@@ -43,6 +48,7 @@
/**
* This function gets called once the communication is established and session information is available
+ * @method handleSession
*/
this.handleSession = function( json )
{
@@ -59,6 +65,7 @@
/**
* This function gets called once the communication is established and session information is available
+ * @method handleRead
*/
this.handleRead = function( json )
{
@@ -89,6 +96,7 @@
/**
* This function gets called on an error
* FIXME: this should be a prototype, so that the application developer can override it
+ * @method handleError
*/
this.handleError=function(xhr,str,excptObj)
{
@@ -113,6 +121,7 @@
/**
* Build the URL part that contains the addresses and filters
+ * @method buildRequest
*/
this.buildRequest = function()
{
@@ -124,6 +133,7 @@
/**
* Subscribe to the addresses in the parameter
* The second parameter (filter) is optional
+ * @method subscribe
*/
this.subscribe = function( addresses, filters )
{
@@ -137,7 +147,8 @@
/**
* This function starts the communication by a login and then runs the
- * ongoing communication task
+ * ongoing communication task
+ * @method login
*/
this.login = function()
{
@@ -150,6 +161,7 @@
/**
* This function stops an ongoing connection
+ * @method stop
*/
this.stop = function()
{
@@ -160,6 +172,7 @@
/**
* This function sends a value
+ * @method write
*/
this.write = function( address, value )
{
@@ -174,6 +187,7 @@
/**
* Restart the read request, e.g. when the watchdog kicks in
+ * @method restart
*/
this.restart = function()
{
@@ -185,6 +199,7 @@
/**
* The watchdog to recreate a read request when it stopped somehow
+ * @method watchdog
*/
var watchdog = (function(){
var last = new Date();
Modified: CometVisu/trunk/visu/lib/compatibility.js
===================================================================
--- CometVisu/trunk/visu/lib/compatibility.js 2012-04-02 17:42:08 UTC (rev 738)
+++ CometVisu/trunk/visu/lib/compatibility.js 2012-04-02 21:49:52 UTC (rev 739)
@@ -136,7 +136,7 @@
sprintf = sprintfWrapper.init;
-/**
+/*
* be able to access GET-Params
*/
$.extend({
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-04-02 17:42:08 UTC (rev 738)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-04-02 21:49:52 UTC (rev 739)
@@ -13,6 +13,9 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * @module Templateengine
+ * @title CometVisu templateengine
*/
var design = new VisuDesign_Custom();
@@ -111,7 +114,7 @@
return value;
}
-/**
+/*
* Make sure everything looks right when the window gets resized.
* This is necessary as the scroll effect requires a fixed element size
*/
@@ -440,7 +443,7 @@
}
}
-/**
+/*
* Show a popup of type "type".
* The attributes is an type dependend object
* This function returnes a jQuery object that points to the whole popup,
@@ -454,7 +457,7 @@
return design.popups[ type ].create( attributes );
}
-/**
+/*
* Remove the popup.
* The parameter is the jQuery object returned by the showPopup function
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-04-03 15:41:01
|
Revision: 740
http://openautomation.svn.sourceforge.net/openautomation/?rev=740&view=rev
Author: mayerch
Date: 2012-04-03 15:40:48 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Preparation for cleaner file structure and automated build script:
* switch from big structure_pure.js to one file per widget
Modified Paths:
--------------
CometVisu/trunk/visu/index.html
Added Paths:
-----------
CometVisu/trunk/visu/structure/
CometVisu/trunk/visu/structure/pure/
CometVisu/trunk/visu/structure/pure/_common.js
CometVisu/trunk/visu/structure/pure/break.js
CometVisu/trunk/visu/structure/pure/group.js
CometVisu/trunk/visu/structure/pure/iframe.js
CometVisu/trunk/visu/structure/pure/image.js
CometVisu/trunk/visu/structure/pure/imagetrigger.js
CometVisu/trunk/visu/structure/pure/include.js
CometVisu/trunk/visu/structure/pure/info.js
CometVisu/trunk/visu/structure/pure/infotrigger.js
CometVisu/trunk/visu/structure/pure/line.js
CometVisu/trunk/visu/structure/pure/multitrigger.js
CometVisu/trunk/visu/structure/pure/page.js
CometVisu/trunk/visu/structure/pure/slide.js
CometVisu/trunk/visu/structure/pure/switch.js
CometVisu/trunk/visu/structure/pure/text.js
CometVisu/trunk/visu/structure/pure/toggle.js
CometVisu/trunk/visu/structure/pure/trigger.js
CometVisu/trunk/visu/structure/pure/unknown.js
CometVisu/trunk/visu/structure/pure/video.js
Removed Paths:
-------------
CometVisu/trunk/visu/designs/structure_pure.js
Deleted: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2012-04-02 21:49:52 UTC (rev 739)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2012-04-03 15:40:48 UTC (rev 740)
@@ -1,1450 +0,0 @@
-/* visudesign_pure.js (c) 2010 by Christian Mayer [CometVisu at ChristianMayer dot de]
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-/**
- * This module defines the widgets for the CometVisu visualisation.
- * @module Structure Pure
- * @title CometVisu Structure "pure"
-*/
-
-// Define ENUM of maturity levels for features, so that e.g. the editor can
-// ignore some widgets when they are not supported yet
-var Maturity = {
- release : 0,
- development : 1
-};
-
-/*
- * this function implements widget stylings
- *
- * implemented in: default_update, trigger-widget
- */
-$.fn.setWidgetStyling = function(value) {
- var styling = stylings[this.data('styling')];
- if (styling) {
- this.removeClass(styling['classnames']); // remove only styling classes
- if (styling[value]) { // fixed value
- this.addClass(styling[value]);
- } else { //
- value = parseFloat(value);
- var range = styling['range'];
- for( var min in range ) {
- if( min > value ) continue;
- if( range[min][0] < value ) continue; // check max
- this.addClass( range[min][1] );
- break;
- }
- }
- }
- return this;
-}
-
-/*
- * this function implements all widget layouts that are identical (JNK)
- *
- * implemented: rowspan, colspan
- */
-
-$.fn.setWidgetLayout = function(page) {
- this.data('colspan', page.attr('colspan') || $('head').data('colspanDefault'));
- if (page.attr('rowspan')) {
- this.data('rowspanClass', rowspanClass(page.attr('rowspan') || 1));
- this.addClass('innerrowspan');
- }
- return this;
- }
-
-/*
- * this function implements the widget label (JNK)
- */
-
-$.fn.makeWidgetLabel = function(page) {
- var labelElement = page.find('label')[0]; // get first label element
- if (labelElement) { // if exists, add it
- this.append($('<div class="label">' + labelElement.textContent + '</div>'));
- }
- return this;
-}
-
-/*
- * this function extracts all addresses with attributes (JNK)
- */
-
-function makeAddressList(page) {
- var address = {};
- page.find('address').each( function(){
- var src = this.textContent;
- var transform = this.getAttribute('transform');
- var readonly = this.getAttribute('readonly');
- var writeonly = this.getAttribute('writeonly');
- ga_list.push( src )
- address[ '_' + src ] = [ transform, readonly=='true', writeonly=='true' ];
- });
- return address;
-}
-
-/**
- * This class defines all the building blocks for a Visu in the "Pure" design
- * @class VisuDesign
- */
-
-function VisuDesign() {
- this.creators = {};
-
- this.addCreator = function (name, object) {
- this.creators[name] = object;
- }
-
- this.getCreator = function(name) {
- if (this.creators[name] === undefined) {
- return this.creators.unknown;
- }
- return this.creators[name];
- }
-
- this.popups = {};
-
- this.addPopup = function (name, object) {
- this.popups[name] = object;
- this.popups[name].type = name;
- }
-
- this.getPopup = function(name) {
- if (typeof this.popups[name] == undefined) {
- return this.popups.unknown;
- }
- return this.popups[name];
- }
-
- /*
- * The creators object contians all widgets creators and their mapping to the
- * XML config file tags
- */
- this.addCreator('page', {
- create: function( page, path, flavour ) {
- var $p = $(page);
-
- var address = {};
- if ($p.attr('ga')) {
- src = $p.attr('ga');
- ga_list.push($p.attr('ga'));
- address[ '_' + $p.attr('ga') ] = [ 'DPT:1.001', 0 ];
- }
-
- var pstyle = ( '0' != path ) ? 'display:none;' : ''; // subPage style
- var name = $p.attr('name');
- var type = $p.attr('type') || 'text'; //text, 2d or 3d
- var backdrop = $p.attr('backdrop');
- 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 + '"';
-
- var ret_val;
-
- if ($p.attr('visible')=='false') {
- ret_val=$('');
- } else { // default is visible
- ret_val = $('<div class="widget clearfix link pagelink"/>');
- ret_val.setWidgetLayout($p);
- var tst = $('<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>');
-
- ret_val.append(tst );
- }
-
- var childs = $p.children();
- //var container = $( '<div class="clearfix" />' );
-
- var subpage = $( '<div class="page" id="' + path + '" style="'+pstyle+';"/>' );
- var $container = $( '<div class="clearfix" path="'+path+'" style="height:100%;position:relative;" />');
- for( var addr in address ) $container.bind( addr, this.update );
- var container=$container;
-
- container.append( '<h1>' + name + '</h1>' );
- if( '2d' == type )
- {
- container.append( '<embed src="' + backdrop + '" style="position: absolute; top: 0px; left: 0px;z-index:-1;width:100%;height:100%;"/>' );
- } else if( '3d' == type )
- {
- var floorplan = JSFloorPlan3D( container, backdrop );
- floorplan.moveToRoom( 'Underground', false, true, false );
- container.data( 'JSFloorPlan3D', floorplan );
- container.find('canvas').css({position: 'absolute', top: '0px', left: '0px', 'z-index':'-1', width:'100%',height:'100%'});
- subpage.click( {JSFloorPlan3D:floorplan,callback:function(event){
- var j = this.JSFloorPlan3D;
- j.moveToRoom( j.getState('showFloor'), event.room.room, true, true, function(){
- container.trigger( 'update3d', j );
- });
- }}, floorplan.translateMouseEvent );
- $(window).bind( 'resize', function(){ floorplan.resize($('.page').width(), $('.page').height(), true);} );
- if ($p.attr('azimut')) {
- ga_list.push($p.attr('azimut'));
- address[ '_' + $p.attr('azimut') ] = [ 'DPT:5.001', 0, 'azimut' ];
- container.bind( '_' + $p.attr('azimut'), this.update );
- }
- if ($p.attr('elevation')) {
- ga_list.push($p.attr('elevation'));
- address[ '_' + $p.attr('elevation') ] = [ 'DPT:5.001', 0, 'elevation' ];
- container.bind( '_' + $p.attr('elevation'), this.update );
- };
- if ($p.attr('floor')) {
- ga_list.push($p.attr('floor'));
- address[ '_' + $p.attr('floor') ] = [ 'DPT:5.004', 0, 'floor' ];
- container.bind( '_' + $p.attr('floor'), this.update );
- };
- container.data( 'address', address );
- }
- $( childs ).each( function(i){
- container.append( create_pages( childs[i], path + '_' + i, flavour, type ) );
- } );
- subpage.append(container);
- if( flavour ) subpage.addClass( 'flavour_' + flavour );
- $('#pages').prepend( subpage );
- return ret_val;
- },
- attributes: {
- name: { type: 'string', required: true },
- align: { type: 'string', required: false },
- flavour: { type: 'string', required: false },
- ga: { type: 'addr', required: false },
- visible: { type: 'string', required: false },
- type: { type: 'string', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false },
- backdrop: { type: 'string', required: false },
- azimut: { type: 'addr', required: false },
- elevation:{ type: 'addr', required: false },
- floor: { type: 'addr', required: false }
- },
- elements: {
- },
- update: function(e, data) {
- var element = $(this);
- var value = defaultValueHandling( e, data, element );
- var type = element.data().address[ e.type ][2];
- switch( type )
- {
- case 'azimut':
- element.data().JSFloorPlan3D.setState('currentAzimut', value, true);
- element.trigger( 'update3d', element.data().JSFloorPlan3D );
- break;
-
- case 'elevation':
- element.data().JSFloorPlan3D.setState('currentElevation', value, true);
- element.trigger( 'update3d', element.data().JSFloorPlan3D );
- break;
-
- case 'floor':
- element.data().JSFloorPlan3D.moveToRoom( value, false, true, true, function(){
- element.trigger( 'update3d', element.data().JSFloorPlan3D );
- });
- break;
-
- default:
- if (data==01) {
- scrollToPage(this.attributes.path.nodeValue);
- visu.write(e.type.substr(1), transformEncode("DPT:1.001", 0));
- }
- }
- },
- content: true
- });
-
- this.addCreator('include', {
- maturity: Maturity.development,
- create: function( page, path, flavour ) {
- var p = $.get( $(page).attr('src') );
- var p = $.ajax({
- url: $(page).attr('src'),
- dataType: 'xml',
- async: false
- });
- var child = (p.responseXML.childNodes[0]);
- return create_pages( child, path , flavour );
- },
- attributes: {
- src: { type: 'string', required: true }
- },
- elements: {
- },
- content: true
- });
-
- this.addCreator('group', {
- maturity: Maturity.development,
- create: function( page, path, flavour ) {
- var $p = $(page);
- var ret_val = $('<div class="widget clearfix group" />');
- if( $p.attr('flavour') ) flavour = $p.attr('flavour');// sub design choice
- var hstyle = ''; // heading style
- if( $p.attr('align') ) hstyle += 'text-align:' + $p.attr('align') + ';';
- if( hstyle != '' ) hstyle = 'style="' + hstyle + '"';
- ret_val.setWidgetLayout($p);
- if ($p.attr('nowidget')=='true') {
- ret_val.removeClass('widget');
- }
- var childs = $p.children();
- var container = $( '<div class="clearfix"/>' );
- if( $p.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $p.attr('name') + '</h2>' );
- $( childs ).each( function(i){
- container.append( create_pages( childs[i], path + '_' + i, flavour ) );
- } );
- if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- ret_val.append( container );
- return ret_val;
- },
- attributes: {
- align: { type: 'string', required: false },
- flavour: { type: 'string', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false },
- nowidget: {type: 'string', required: false },
- name: { type: 'string', required: true }
- },
- elements: {
- },
- content: true
- });
-
- this.addCreator('line', {
- create: function( page, path ) {
- return $( '<hr />' );
- },
- attributes: {
- },
- content: false
- });
-
- this.addCreator('break', {
- create: function( page, path ) {
- return $( '<br />' );
- },
- attributes: {
- },
- elements: {
- },
- content: false
- });
-
- this.addCreator('text', {
- create: function( page, path ) {
- var $p = $(page);
- var ret_val = $('<div class="widget clearfix text" />');
- ret_val.setWidgetLayout($p);
- var style = '';
- if( $p.attr('align') ) style += 'text-align:' + $p.attr('align') + ';';
- if( style != '' ) style = 'style="' + style + '"';
- ret_val.append( '<div ' + style + '>' + page.textContent + '</div>' );
- return ret_val;
- },
- attributes: {
- align: { type: 'string', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- },
- content: { type: 'string', required: true }
- });
-
- this.addCreator('info', {
- create: function( element, path, flavour, type ) {
- var $e = $(element);
- var layout = $e.find('layout')[0];
- var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
- var ret_val = $('<div class="widget clearfix info" ' + 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 );
-
- ret_val.setWidgetLayout($e).makeWidgetLabel($e);
- var address = makeAddressList($e);
-
- var actor = '<div class="actor"><div class="value">-</div></div>';
- var $actor = $(actor).data({
- 'address' : address,
- 'format' : $e.attr('format'),
- '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;
- },
- update: defaultUpdate,
- update3d: defaultUpdate3d,
- attributes: {
- format: { type: 'format', required: false },
- mapping: { type: 'mapping', required: false },
- styling: { type: 'styling', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- label: { type: 'string', required: true, multi: false },
- address: { type: 'address', required: true, multi: true },
- layout: { type: 'layout', required: false, multi: false }
- },
- content: false
- });
-
- this.addCreator('slide', {
- create: function( page, path ) {
- var $p = $(page);
- var layout = $p.find('layout')[0];
- var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
- var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
- ret_val.setWidgetLayout($p).makeWidgetLabel($p);
- var address = {};
- var datatype_min = undefined;
- var datatype_max = undefined;
- $p.find('address').each( function(){
- var src = this.textContent;
- var transform = this.getAttribute('transform');
- var readonly = this.getAttribute('readonly');
- ga_list.push( src )
- address[ '_' + src ] = [ transform, readonly=='true' ];
- if( Transform[ transform ] && Transform[ transform ].range )
- {
- if( !( datatype_min > Transform[ transform ].range.min ) )
- datatype_min = Transform[ transform ].range.min;
- if( !( datatype_max < Transform[ transform ].range.max ) )
- datatype_max = Transform[ transform ].range.max;
- }
- });
- var actor = $('<div class="actor">');
- var min = parseFloat( $p.attr('min') || datatype_min || 0 );
- var max = parseFloat( $p.attr('max') || datatype_max || 100 );
- var step = parseFloat( $p.attr('step') || 0.5 );
- var $actor = $(actor).data({
- 'events': $(actor).data( 'events' ),
- 'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'min' : min,
- 'max' : max,
- 'step' : step,
- 'type' : 'dim',
- 'valueInternal': true
- });
- for( var addr in address ) $actor.bind( addr, this.update );
- $actor.slider({
- step: step,
- min: min,
- max: max,
- animate: true,
- start: this.slideStart,
- change: this.slideChange
- });
- ret_val.append( $actor );
- return ret_val;
- },
- update: function( e, data ) {
- var element = $(this);
- var value = transformDecode( element.data().address[ e.type ][0], data );
- if( element.data( 'value' ) != value )
- {
- element.data( 'value', value );
- element.data( 'valueInternal', false );
- element.slider('value', value);
- element.data( 'valueInternal', true );
- }
- },
- /*
- * Start a thread that regularily sends the silder position to the bus
- */
- slideStart:function(event,ui)
- {
- var actor = $( '.actor', $(this).parent() );
- actor.data( 'valueInternal', true );
- actor.data( 'updateFn', setInterval( function(){
- var data = actor.data();
- if( data.value == actor.slider('value') ) return;
- var asv = actor.slider('value');
- for( var addr in data.address )
- {
- if( data.address[addr][1] == true ) continue; // skip read only
- var dv = transformEncode( data.address[addr][0], asv );
- if( dv != transformEncode( data.address[addr][0], data.value ) )
- visu.write( addr.substr(1), dv );
- }
- data.value = actor.slider('value');
- }, 250 ) ); // update KNX every 250 ms
- },
- /*
- * Delete the update thread and send the final value of the slider to the bus
- */
- slideChange:function(event,ui)
- {
- var data = $(this).data();
- clearInterval( data.updateFn, ui.value);
- if( data.valueInternal && data.value != ui.value )
- for( var addr in data.address )
- {
- if( data.address[addr][1] == true ) continue; // skip read only
- var uv = transformEncode( data.address[addr][0], ui.value );
- if( uv != transformEncode( data.address[addr][0], data.value ) )
- visu.write( addr.substr(1), uv );
- }
- },
- attributes: {
- min: { type: 'numeric', required: false },
- max: { type: 'numeric', required: false },
- step: { type: 'numeric', required: false },
- mapping: { type: 'mapping', required: false },
- styling: { type: 'styling', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- label: { type: 'string', required: true, multi: false },
- address: { type: 'address', required: true, multi: true },
- layout: { type: 'layout', required: false, multi: false }
- },
- content: false
- });
-
- this.addCreator('switch', {
- create: function( page, path ) {
- var $p = $(page);
- var ret_val = $('<div class="widget clearfix switch" />');
- ret_val.setWidgetLayout($p)
- var labelElement = $p.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- var address = makeAddressList($p);
- var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
- var $actor = $(actor).data( {
- 'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'on_value' : $p.attr('on_value' ) || 1,
- 'off_value' : $p.attr('off_value') || 0,
- 'align' : $p.attr('align'),
- 'type' : 'switch'
- } ).bind( 'click', this.action );
- for( var addr in address )
- {
- if( !address[addr][2] ) $actor.bind( addr, this.update ); // no writeonly
- }
- ret_val.append( label ).append( $actor );
- return ret_val;
- },
- update: function(e,d) {
- var element = $(this);
- var value = defaultUpdate( e, d, element );
- var off = map( element.data( 'off_value' ), element );
- element.removeClass( value == off ? 'switchPressed' : 'switchUnpressed' );
- element.addClass( value == off ? 'switchUnpressed' : 'switchPressed' );
- },
- action: function() {
- var data = $(this).data();
- for( var addr in data.address )
- {
- if( data.address[addr][1] == true ) continue; // skip read only
- visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value == data.off_value ? data.on_value : data.off_value ) );
- }
- },
- attributes: {
- on_value: { type: 'string' , required: false },
- off_value: { type: 'string' , required: false },
- mapping: { type: 'mapping' , required: false },
- styling: { type: 'styling' , required: false },
- align: { type: 'string' , required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- label: { type: 'string', required: true, multi: false },
- address: { type: 'address', required: true, multi: true }
- },
- content: false
- });
-
-
- this.addCreator('toggle', {
- create: function( page, path ) {
- var $p = $(page);
- var ret_val = $('<div class="widget clearfix toggle" />');
- ret_val.setWidgetLayout($p);
- var labelElement = $p.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- var address = makeAddressList($p);
- var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
- var $actor = $(actor).data( {
- 'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'align' : $p.attr('align'),
- 'type' : 'switch'
- } ).bind( 'click', this.action );
- for( var addr in address ) $actor.bind( addr, this.update );
- ret_val.append( label ).append( $actor );
- return ret_val;
- },
- update: function(e,d) {
- var element = $(this);
- var value = defaultUpdate( e, d, element );
- element.addClass('switchUnpressed');
- },
- action: function() {
- var data = $(this).data();
- var element_count = 0;
- var next_element;
- var first_element;
- for(var e in mappings[data.mapping])
- if(mappings[data.mapping].hasOwnProperty(e))
- {
- element_count++;
- if (e > data.value && !next_element)
- next_element = e;
- if (!first_element)
- first_element = e;
- }
- sendValue = (next_element) ? next_element : first_element;
- for( var addr in data.address )
- {
- if( data.address[addr][1] == true ) continue; // skip read only
- visu.write( addr.substr(1), transformEncode( data.address[addr][0], sendValue ) );
- }
- },
- attributes: {
- mapping: { type: 'mapping' , required: false },
- styling: { type: 'styling' , required: false },
- align: { type: 'string' , required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- label: { type: 'string', required: true, multi: false },
- address: { type: 'address', required: true, multi: true }
- },
- content: false
- });
-
- this.addCreator('multitrigger', {
- create: function( page, path ) {
- var $p = $(page);
- var ret_val = $('<div class="widget clearfix switch" />');
- ret_val.setWidgetLayout($p)
- var labelElement = $p.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- var address = makeAddressList($p);
- var showstatus = $p.attr("showstatus") || "false";
- ret_val.append( label );
- var buttons = $('<div style="float:left"/>');
- var buttonCount = 0;
- if( $p.attr('button1label') )
- {
- //buttonCount++;
- var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
- actor += '">';
-
- actor += '<div class="value">' + $p.attr('button1label') + '</div>';
- actor += '</div>';
- var $actor = $(actor).data( {
- 'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('button1value'),
- 'align' : $p.attr('align'),
- 'type' : 'switch'
- } ).bind( 'click', this.action );
- if( showstatus == "true" ) {
- for( var addr in address ) $actor.bind( addr, this.update );
- }
- buttons.append( $actor );
- if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
- }
- if( $p.attr('button2label') )
- {
- var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
- actor += '">';
- actor += '<div class="value">' + $p.attr('button2label') + '</div>';
- actor += '</div>';
- var $actor = $(actor).data( {
- 'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('button2value'),
- 'type' : 'switch',
- 'align' : $p.attr('align')
- } ).bind( 'click', this.action );
- if( showstatus == "true" ) {
- for( var addr in address ) $actor.bind( addr, this.update );
- }
- buttons.append( $actor );
- if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
- }
- if( $p.attr('button3label') )
- {
- var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
- actor += '">';
- actor += '<div class="value">' + $p.attr('button3label') + '</div>';
- actor += '</div>';
- var $actor = $(actor).data( {
- 'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('button3value'),
- 'type' : 'switch'
- } ).bind( 'click', this.action );
- if( showstatus == "true" ) {
- for( var addr in address ) $actor.bind( addr, this.update );
- }
- buttons.append( $actor );
- if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
- }
- if( $p.attr('button4label') )
- {
- var actor = '<div class="actor switchUnpressed ';
- if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
- actor += '">';
- actor += '<div class="value">' + $p.attr('button4label') + '</div>';
- actor += '</div>';
- var $actor = $(actor).data( {
- 'address' : address,
- 'mapping' : $p.attr('mapping'),
- 'styling' : $p.attr('styling'),
- 'value' : $p.attr('button4value'),
- 'type' : 'switch',
- } ).bind( 'click', this.action );
- if( showstatus == "true" ) {
- for( var addr in address ) $actor.bind( addr, this.update );
- }
- buttons.append( $actor );
- if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
- }
- //for( var addr in address ) $actor.bind( addr, this.update );
- // ret_val.append( label ).append( $actor );
- return ret_val.append( buttons );
- },
- update: function(e,d) {
- var element = $(this);
- //var value = defaultUpdate( e, d, element );
- var thisTransform = element.data().address[ e.type ][0];
- var value = transformDecode( element.data().address[ e.type ][0], d );
- element.removeClass( value == element.data().value ? 'switchUnpressed' : 'switchPressed' );
- element.addClass( value == element.data().value ? 'switchPressed' : 'switchUnpressed' );
- },
- action: function() {
- var data = $(this).data();
- for( var addr in data.address )
- {
- if( data.address[addr][1] == true ) continue; // skip read only
- visu.write( addr.substr(1), tra...
[truncated message content] |
|
From: <ma...@us...> - 2012-04-03 15:55:06
|
Revision: 741
http://openautomation.svn.sourceforge.net/openautomation/?rev=741&view=rev
Author: mayerch
Date: 2012-04-03 15:54:55 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Preparation for cleaner file structure and automated build script:
* switch from big structure_pure.js to one file per widget - part 2
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_custom.js
CometVisu/trunk/visu/structure/pure/_common.js
CometVisu/trunk/visu/structure/pure/break.js
CometVisu/trunk/visu/structure/pure/group.js
CometVisu/trunk/visu/structure/pure/iframe.js
CometVisu/trunk/visu/structure/pure/image.js
CometVisu/trunk/visu/structure/pure/imagetrigger.js
CometVisu/trunk/visu/structure/pure/include.js
CometVisu/trunk/visu/structure/pure/info.js
CometVisu/trunk/visu/structure/pure/infotrigger.js
CometVisu/trunk/visu/structure/pure/line.js
CometVisu/trunk/visu/structure/pure/multitrigger.js
CometVisu/trunk/visu/structure/pure/page.js
CometVisu/trunk/visu/structure/pure/slide.js
CometVisu/trunk/visu/structure/pure/switch.js
CometVisu/trunk/visu/structure/pure/text.js
CometVisu/trunk/visu/structure/pure/toggle.js
CometVisu/trunk/visu/structure/pure/trigger.js
CometVisu/trunk/visu/structure/pure/unknown.js
CometVisu/trunk/visu/structure/pure/video.js
Modified: CometVisu/trunk/visu/designs/structure_custom.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_custom.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/designs/structure_custom.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -25,7 +25,7 @@
* @class VisuDesign_Custom
*/
function VisuDesign_Custom() {}; // do NOT change here
-VisuDesign_Custom.prototype = new VisuDesign(); // do NOT change here
+VisuDesign_Custom.prototype = basicdesign; // do NOT change here
/*
* Custom changes could go here and look e.g. like
Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/_common.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -370,4 +370,6 @@
if( layout.getAttribute('z' ) ) ret_val.z = layout.getAttribute('z' );
if( layout.getAttribute('floor') ) ret_val.floor = layout.getAttribute('floor');
return ret_val;
-}
\ No newline at end of file
+}
+
+var basicdesign = new VisuDesign();
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/break.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/break.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/break.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('break', {
+basicdesign.addCreator('break', {
create: function( page, path ) {
return $( '<br />' );
},
Modified: CometVisu/trunk/visu/structure/pure/group.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/group.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/group.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('group', {
+basicdesign.addCreator('group', {
maturity: Maturity.development,
create: function( page, path, flavour ) {
var $p = $(page);
Modified: CometVisu/trunk/visu/structure/pure/iframe.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/iframe.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/iframe.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('iframe', {
+basicdesign.addCreator('iframe', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget iframe" />');
Modified: CometVisu/trunk/visu/structure/pure/image.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/image.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/image.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('image', {
+basicdesign.addCreator('image', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix image" />');
Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('imagetrigger', {
+basicdesign.addCreator('imagetrigger', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix image" />');
Modified: CometVisu/trunk/visu/structure/pure/include.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/include.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/include.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('include', {
+basicdesign.addCreator('include', {
maturity: Maturity.development,
create: function( page, path, flavour ) {
var p = $.get( $(page).attr('src') );
Modified: CometVisu/trunk/visu/structure/pure/info.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/info.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/info.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('info', {
+basicdesign.addCreator('info', {
create: function( element, path, flavour, type ) {
var $e = $(element);
var layout = $e.find('layout')[0];
Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('infotrigger', {
+basicdesign.addCreator('infotrigger', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix switch" />');
Modified: CometVisu/trunk/visu/structure/pure/line.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/line.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/line.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('line', {
+basicdesign.addCreator('line', {
create: function( page, path ) {
return $( '<hr />' );
},
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('multitrigger', {
+basicdesign.addCreator('multitrigger', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix switch" />');
Modified: CometVisu/trunk/visu/structure/pure/page.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/page.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/page.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('page', {
+basicdesign.addCreator('page', {
create: function( page, path, flavour ) {
var $p = $(page);
Modified: CometVisu/trunk/visu/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/slide.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('slide', {
+basicdesign.addCreator('slide', {
create: function( page, path ) {
var $p = $(page);
var layout = $p.find('layout')[0];
Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/switch.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('switch', {
+basicdesign.addCreator('switch', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix switch" />');
Modified: CometVisu/trunk/visu/structure/pure/text.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/text.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/text.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('text', {
+basicdesign.addCreator('text', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix text" />');
Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/toggle.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('toggle', {
+basicdesign.addCreator('toggle', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix toggle" />');
Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('trigger', {
+basicdesign.addCreator('trigger', {
create: function( page, path ) {
var $p = $(page);
var layout = $p.find('layout')[0];
Modified: CometVisu/trunk/visu/structure/pure/unknown.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/unknown.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/unknown.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('unknown', {
+basicdesign.addCreator('unknown', {
create: function( page, path ) {
var ret_val = $('<div class="widget clearfix" />');
ret_val.append( '<pre>unknown: ' + page.nodeName + '</pre>' );
Modified: CometVisu/trunk/visu/structure/pure/video.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/video.js 2012-04-03 15:40:48 UTC (rev 740)
+++ CometVisu/trunk/visu/structure/pure/video.js 2012-04-03 15:54:55 UTC (rev 741)
@@ -15,7 +15,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-VisuDesign.prototype.addCreator('video', {
+basicdesign.addCreator('video', {
create: function( page, path ) {
var $p = $(page);
var ret_val = $('<div class="widget clearfix video" />');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-04-22 20:01:55
|
Revision: 759
http://openautomation.svn.sourceforge.net/openautomation/?rev=759&view=rev
Author: mayerch
Date: 2012-04-22 20:01:48 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
Switch readonly/writeonly to the new, unified attribute "mode" which might be set to "disable", "read", "write" or "readwrite" (which is the default).
Note: The editor isn't changed to this new syntax yet!
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
CometVisu/trunk/visu/structure/pure/_common.js
CometVisu/trunk/visu/structure/pure/imagetrigger.js
CometVisu/trunk/visu/structure/pure/infotrigger.js
CometVisu/trunk/visu/structure/pure/multitrigger.js
CometVisu/trunk/visu/structure/pure/slide.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
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -27,15 +27,11 @@
ret_val.setWidgetLayout($p);
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- var address = {};
- $p.find('address').each( function(){
- var src = this.textContent;
- var transform = this.getAttribute('transform');
- var color = this.getAttribute('variant' );
- var readonly = this.getAttribute('readonly' );
- ga_list.push( src );
- address[ '_' + src ] = [ transform, color, readonly=='true' ];
- });
+ var address = makeAddressList( $p,
+ function( src, transform, mode, variant ) {
+ return [ true, variant ];
+ }
+ );
var actor = '<div class="actor">';
actor += '</div>';
@@ -67,8 +63,8 @@
var bb = a.data( 'bus_b' );
for( var addr in address )
{
- if( address[addr][2] == true ) continue; // skip read only
- switch( address[addr][1] )
+ if( !(address[addr][1] & 2) ) continue; // skip when write flag not set
+ switch( address[addr][2] )
{
case 'r':
var v = Transform[address[addr][0]].encode( r );
@@ -112,7 +108,7 @@
rateLimitedSend( $actor );
});
for( var addr in address ) {
- switch( address[addr][1] ) {
+ switch( address[addr][2] ) {
case 'r':
$actor.bind( addr, this.update_r );
break;
Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/structure/pure/_common.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -84,15 +84,31 @@
* this function extracts all addresses with attributes (JNK)
*/
-function makeAddressList(page) {
+function makeAddressList( page, handleVariant ) {
var address = {};
page.find('address').each( function(){
var src = this.textContent;
var transform = this.getAttribute('transform');
- var readonly = this.getAttribute('readonly');
- var writeonly = this.getAttribute('writeonly');
- ga_list.push( src )
- address[ '_' + src ] = [ transform, readonly=='true', writeonly=='true' ];
+ var mode = 1|2; // Bit 0 = read, Bit 1 = write => 1|2 = 3 = readwrite
+ switch( this.getAttribute('mode') )
+ {
+ case 'disable':
+ mode = 0;
+ break;
+ case 'read':
+ mode = 1;
+ break;
+ case 'write':
+ mode = 2;
+ break;
+ case 'readwrite':
+ mode = 1|2;
+ break;
+ }
+ var variantInfo = handleVariant ? handleVariant( src, transform, mode, this.getAttribute('variant') ) : [true, undefined];
+ if( variantInfo[0] )
+ ga_list.push( src );
+ address[ '_' + src ] = [ transform, mode, variantInfo[1] ];
});
return address;
}
Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -24,17 +24,7 @@
var value = $e.attr('value') ? $e.attr('value') : 0;
var labelElement = $e.find('label')[0];
ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
- var address = {};
- $e.find('address').each( function(){
- var src = this.textContent;
- ga_list.push( src )
- address[ '_' + src ] = [
- this.getAttribute('transform'), {
- 'readonly' : this.getAttribute('readonly'),
- 'writeonly' : this.getAttribute('writeonly')
- }
- ];
- });
+ var address = makeAddressList($e);
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, {width:'100%'} ) + '"' : '';
@@ -89,8 +79,8 @@
var data = $(this).data();
sendValue = data.sendValue;
for( var addr in data.address ) {
- if( data.address[addr][1].readonly == "true" )
- continue; // skip read only
+ if( !(data.address[addr][1] & 2) )
+ continue; // skip when write flag not set
if( data.sendValue == "" )
continue; // skip empty
visu.write( addr.substr(1), transformEncode( data.address[addr][0], sendValue ) );
Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -28,17 +28,11 @@
ret_val.append( label );
// handle addresses
- var address = {};
- $e.find('address').each( function(){
- var src = this.textContent;
- var transform = this.getAttribute('transform');
- var readonly = this.getAttribute('readonly' ) == 'true';
- var isButton = this.getAttribute('variant' ) == 'button';
- address[ '_' + src ] = [ transform, readonly, isButton ];
- if( !isButton ) { // no need to listen to relative address
- ga_list.push( src );
- };
- });
+ var address = makeAddressList($e,
+ function( src, transform, mode, variant ) {
+ return [ variant != 'button', variant == 'button' ];
+ }
+ );
// create buttons + info
var buttons = $('<div style="float:left;"/>');
@@ -141,7 +135,7 @@
}
for( var addr in data.address )
{
- if( data.address[addr][1] == true ) continue; // skip read only
+ if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
if( data.address[addr][2] != relative ) continue; // skip when address mode doesn't fit action mode
visu.write( addr.substr(1), transformEncode( data.address[addr][0], value ) );
}
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -133,7 +133,7 @@
var data = $(this).data();
for( var addr in data.address )
{
- if( data.address[addr][1] == true ) continue; // skip read only
+ if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value ) );
}
},
Modified: CometVisu/trunk/visu/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/structure/pure/slide.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -22,16 +22,11 @@
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix slide" ' + style + ' />');
ret_val.setWidgetLayout($e).makeWidgetLabel($e);
- var address = {};
+ var address = makeAddressList($e);
var datatype_min = undefined;
var datatype_max = undefined;
$e.find('address').each( function(){
- var src = this.textContent;
var transform = this.getAttribute('transform');
- var readonly = this.getAttribute('readonly');
- var writeonly = this.getAttribute('writeonly');
- ga_list.push( src )
- address[ '_' + src ] = [ transform, readonly=='true', writeonly=='true' ];
if( Transform[ transform ] && Transform[ transform ].range )
{
if( !( datatype_min > Transform[ transform ].range.min ) )
@@ -57,7 +52,7 @@
});
for( var addr in address )
{
- if( !address[addr][2] ) $actor.bind( addr, this.update ); // no writeonly
+ if( address[addr][1] & 1 ) $actor.bind( addr, this.update ); // only when read flag is set
}
$actor.slider({
step: step,
@@ -94,7 +89,7 @@
var asv = actor.slider('value');
for( var addr in data.address )
{
- if( data.address[addr][1] == true ) continue; // skip read only
+ if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
var dv = transformEncode( data.address[addr][0], asv );
if( dv != transformEncode( data.address[addr][0], data.value ) )
visu.write( addr.substr(1), dv );
@@ -112,7 +107,7 @@
if( data.valueInternal && data.value != ui.value )
for( var addr in data.address )
{
- if( data.address[addr][1] == true ) continue; // skip read only
+ if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
var uv = transformEncode( data.address[addr][0], ui.value );
if( uv != transformEncode( data.address[addr][0], data.value ) )
visu.write( addr.substr(1), uv );
Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/structure/pure/switch.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -37,7 +37,7 @@
} ).bind( 'click', this.action );
for( var addr in address )
{
- if( !address[addr][2] ) $actor.bind( addr, this.update ); // no writeonly
+ if( address[addr][1] & 1 ) $actor.bind( addr, this.update ); // only when read flag is set
}
ret_val.append( label ).append( $actor );
return ret_val;
@@ -53,7 +53,7 @@
var data = $(this).data();
for( var addr in data.address )
{
- if( data.address[addr][1] == true ) continue; // skip read only
+ if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value == data.off_value ? data.on_value : data.off_value ) );
}
},
Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/structure/pure/toggle.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -59,7 +59,7 @@
sendValue = (next_element) ? next_element : first_element;
for( var addr in data.address )
{
- if( data.address[addr][1] == true ) continue; // skip read only
+ if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
visu.write( addr.substr(1), transformEncode( data.address[addr][0], sendValue ) );
}
},
Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2012-04-22 20:01:48 UTC (rev 759)
@@ -55,7 +55,7 @@
var data = $(this).data();
for( var addr in data.address )
{
- if( data.address[addr][1] == true ) continue; // skip read only
+ if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.sendValue ) );
}
},
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/visu_config.xsd 2012-04-22 20:01:48 UTC (rev 759)
@@ -26,8 +26,7 @@
<xsd:simpleContent>
<xsd:extension base="addr">
<xsd:attribute ref="transform" use="required" />
- <xsd:attribute ref="readonly" use="optional" />
- <xsd:attribute ref="writeonly" use="optional" />
+ <xsd:attribute ref="mode" use="optional" />
<xsd:attribute name="type" type="xsd:string" use="optional" />
<xsd:attribute name="variant" type="xsd:string" use="optional" />
</xsd:extension>
@@ -62,8 +61,7 @@
<xsd:attribute name="styling" type="xsd:string" />
<xsd:attribute name="value" type="xsd:string" />
-<xsd:attribute name="readonly" type="xsd:boolean" />
-<xsd:attribute name="writeonly" type="xsd:boolean" />
+<xsd:attribute name="mode" type="xsd:string" />
<xsd:attribute name="align" type="xsd:string" />
<xsd:attribute name="variant" type="xsd:string" />
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-04-15 19:00:08 UTC (rev 758)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-04-22 20:01:48 UTC (rev 759)
@@ -115,21 +115,21 @@
<break/>
<switch mapping="On_Off" styling="Red_Green">
<label>Switch</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<break/>
<trigger value="0" mapping="On_Off">
<label>Trigger</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</trigger>
<trigger value="1" mapping="On_Off">
<label>Trigger</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</trigger>
<break/>
<multitrigger button1label="Auto" button1value="auto" button2label="Komfort" button2value="comfort" button3label="Standy By" button3value="standby" button4label="Economy" button4value="economy">
<label>Multitrigger: KONNEX Betriebsart</label>
- <address transform="DPT:20.102" readonly="false" type="">12/7/20</address>
+ <address transform="DPT:20.102" type="">12/7/20</address>
</multitrigger>
<info mapping="KonnexHVAC">
<label>Info: Betriebsart</label>
@@ -138,7 +138,7 @@
<break/>
<multitrigger button1label="An" button1value="0" button2label="Aus" button2value="1" button3label="Essen" button3value="2" button4label="Fernsehen" button4value="3">
<label>Multitrigger: Szenenaufruf</label>
- <address transform="DPT:5.010" readonly="false" type="">12/7/5</address>
+ <address transform="DPT:5.010" type="">12/7/5</address>
</multitrigger>
<break/>
<infotrigger uplabel="wärmer" downlabel="kälter" upvalue="0.1" downvalue="-0.1" align="center" format="%.1f °C" change="absolute" min="7" max="24">
@@ -156,8 +156,8 @@
<break/>
<infotrigger uplabel="+" upvalue="1" downlabel="-" downvalue="0" align="center" infoposition="1" change="relative">
<label>Lautstärke</label>
- <address transform="DPT:16.000" readonly="true" variant="display">12/7/16</address>
- <address transform="DPT:1.001" readonly="false" variant="button">12/7/1</address>
+ <address transform="DPT:16.000" mode="read" variant="display">12/7/16</address>
+ <address transform="DPT:1.001" variant="button">12/7/1</address>
</infotrigger>
<break/>
<info>
@@ -170,14 +170,14 @@
</info>
<multitrigger button1label="An" button1value="50%" button2label="Aus" button2value="0%" button3label="Leise" button3value="25%" button4label="Laut" button4value="100%">
<label>Lautstärke-Text</label>
- <address transform="DPT:16.000" readonly="false" type="">12/7/16</address>
+ <address transform="DPT:16.000" type="">12/7/16</address>
</multitrigger>
<line/>
<text>Absolut</text>
<break/>
<infotrigger uplabel="+" upvalue="5" downlabel="-" downvalue="-5" align="center" infoposition="1" change="absolute" format="%.1f%%" max="100">
<label>Lautstärke</label>
- <address transform="DPT:5.001" readonly="false">12/7/5</address>
+ <address transform="DPT:5.001">12/7/5</address>
</infotrigger>
</page>
<break/>
@@ -211,7 +211,7 @@
</page>
<trigger value="1">
<label>Seitenwechsel per GA</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/100</address>
+ <address transform="DPT:1.001" type="">12/7/100</address>
</trigger>
<line/>
<page name="iframe Test" align="center" >
@@ -356,23 +356,23 @@
<page name="Stylings Test" align="center">
<switch mapping="On_Off" styling="Green_Red">
<label>Switch green/red</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<switch mapping="On_Off" styling="Grey_Green">
<label>Switch grey/green</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<switch mapping="On_Off" styling="Grey_Red">
<label>Switch grey/red</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<switch mapping="On_Off" styling="Grey_Blue">
<label>Switch grey/blue</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<switch mapping="On_Off" styling="Brown_Purple">
<label>Switch brown/purple</label>
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<line/>
<info styling="Blue_Lightblue_Green_Purple_Red" format="%.1f °C">
@@ -387,43 +387,43 @@
<page name="2D fixed Bitmap" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.png" align="center">
<switch mapping="On_Off" styling="Red_Green">
<layout x="200px" y="300px" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<trigger value="0" mapping="On_Off">
<layout x="0px" y="500px" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</trigger>
<trigger value="1" mapping="On_Off">
<layout x="360px" y="500px" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</trigger>
</page>
<page name="2D scaled Bitmap" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.png" align="center">
<switch mapping="On_Off" styling="Red_Green">
<layout x="45%" y="45%" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<trigger value="0" mapping="On_Off">
<layout x="5%" y="70%" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</trigger>
<trigger value="1" mapping="On_Off">
<layout x="90%" y="70%" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</trigger>
</page>
<page name="2D SVG" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.svg" align="center">
<switch mapping="On_Off" styling="Red_Green">
<layout x="200px" y="300px" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<trigger value="0" mapping="On_Off">
<layout x="0px" y="500px" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</trigger>
<trigger value="1" mapping="On_Off">
<layout x="360px" y="500px" width="600px" />
- <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
+ <address transform="DPT:1.001" type="">12/7/1</address>
</trigger>
</page>
<page name="3D" align="center">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-01 14:23:22
|
Revision: 778
http://openautomation.svn.sourceforge.net/openautomation/?rev=778&view=rev
Author: mayerch
Date: 2012-05-01 14:23:15 +0000 (Tue, 01 May 2012)
Log Message:
-----------
3D pages: change DPT for azimuth and elevation to 9 which makes much more sense than 5
Modified Paths:
--------------
CometVisu/trunk/visu/structure/pure/page.js
CometVisu/trunk/visu/visu_config_2d3d.xml
Modified: CometVisu/trunk/visu/structure/pure/page.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/page.js 2012-05-01 11:42:50 UTC (rev 777)
+++ CometVisu/trunk/visu/structure/pure/page.js 2012-05-01 14:23:15 UTC (rev 778)
@@ -76,12 +76,12 @@
$(window).bind( 'resize', function(){ floorplan.resize($('.page').width(), $('.page').height(), true);} );
if ($p.attr('azimut')) {
ga_list.push($p.attr('azimut'));
- address[ '_' + $p.attr('azimut') ] = [ 'DPT:5.001', 0, 'azimut' ];
+ address[ '_' + $p.attr('azimut') ] = [ 'DPT:9.001', 0, 'azimut' ];
container.bind( '_' + $p.attr('azimut'), this.update );
}
if ($p.attr('elevation')) {
ga_list.push($p.attr('elevation'));
- address[ '_' + $p.attr('elevation') ] = [ 'DPT:5.001', 0, 'elevation' ];
+ address[ '_' + $p.attr('elevation') ] = [ 'DPT:9.001', 0, 'elevation' ];
container.bind( '_' + $p.attr('elevation'), this.update );
};
if ($p.attr('floor')) {
Modified: CometVisu/trunk/visu/visu_config_2d3d.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_2d3d.xml 2012-05-01 11:42:50 UTC (rev 777)
+++ CometVisu/trunk/visu/visu_config_2d3d.xml 2012-05-01 14:23:15 UTC (rev 778)
@@ -83,15 +83,15 @@
<layout x="3.5" y="3.7" z="1.0"/>
<address transform="DPT:5.001" type="">12/7/53</address>
</info>
- <slide min="0" max="6.283185307179586">
+ <slide min="0" max="6.283185307179586" step="0.01">
<layout x="0px" y="570px" width="600px" />
<label>Azimut</label>
- <address transform="DPT:5.001" type="">12/7/53</address>
+ <address transform="DPT:9.001" type="">12/7/53</address>
</slide>
- <slide min="0" max="1.5707963267948966">
+ <slide min="0" max="1.5707963267948966" step="0.01">
<layout x="400px" y="570px" width="600px" />
<label>Elevation</label>
- <address transform="DPT:5.001" type="">12/7/54</address>
+ <address transform="DPT:9.001" type="">12/7/54</address>
</slide>
<trigger value="0">
<layout x="0px" y="150px" width="600px" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-05 15:56:52
|
Revision: 785
http://openautomation.svn.sourceforge.net/openautomation/?rev=785&view=rev
Author: mayerch
Date: 2012-05-05 15:56:45 +0000 (Sat, 05 May 2012)
Log Message:
-----------
3D mode: Initial support of filters (only working for floors at the moment)
Modified Paths:
--------------
CometVisu/trunk/visu/structure/pure/_common.js
CometVisu/trunk/visu/structure/pure/page.js
CometVisu/trunk/visu/visu_config_2d3d.xml
Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js 2012-05-03 09:27:17 UTC (rev 784)
+++ CometVisu/trunk/visu/structure/pure/_common.js 2012-05-05 15:56:45 UTC (rev 785)
@@ -366,7 +366,10 @@
var pos = data.building2screen( new THREE.Vector3( l.x, l.y, l.z ) );
e.data.element.css( 'left', pos.x + 'px' );
e.data.element.css( 'top' , pos.y + 'px' );
- //console.log( e, data, e.data, pos.x, pos.y );
+
+ var floorFilter = true;
+ if( l.floorFilter) floorFilter = data.getState('showFloor') == data.buildingProperties.floorNames[ l.floorFilter ];
+ e.data.element.css( 'display', floorFilter ? '' : 'none' );
}
function extractLayout( layout, defaultValues )
@@ -396,6 +399,8 @@
if( layout.getAttribute('y' ) ) ret_val.y = layout.getAttribute('y' );
if( layout.getAttribute('z' ) ) ret_val.z = layout.getAttribute('z' );
if( layout.getAttribute('floor') ) ret_val.floor = layout.getAttribute('floor');
+ if( layout.getAttribute('floorFilter') ) ret_val.floorFilter = layout.getAttribute('floorFilter');
+ if( layout.getAttribute('roomFilter') ) ret_val.roomFilter = layout.getAttribute('roomFilter' );
return ret_val;
}
Modified: CometVisu/trunk/visu/structure/pure/page.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/page.js 2012-05-03 09:27:17 UTC (rev 784)
+++ CometVisu/trunk/visu/structure/pure/page.js 2012-05-05 15:56:45 UTC (rev 785)
@@ -89,6 +89,19 @@
address[ '_' + $p.attr('floor') ] = [ 'DPT:5.004', 0, 'floor' ];
container.bind( '_' + $p.attr('floor'), this.update );
};
+
+ $( childs ).each( function(i,a){
+ if( this.tagName == 'filter' )
+ {
+ var floorFilter = $(this).attr('floor');
+ var roomFilter = $(this).attr('room');
+ childs.splice( i, 1 ); // remove filter element
+ $(this).children().each( function(j){ // and add it's children
+ $(this).find('layout').attr({floorFilter:floorFilter,roomFilter:roomFilter});
+ childs.splice( i+j, 0, this );
+ });
+ }
+ });
}
container.data( 'address', address );
$( childs ).each( function(i){
Modified: CometVisu/trunk/visu/visu_config_2d3d.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_2d3d.xml 2012-05-03 09:27:17 UTC (rev 784)
+++ CometVisu/trunk/visu/visu_config_2d3d.xml 2012-05-05 15:56:45 UTC (rev 785)
@@ -83,6 +83,22 @@
<layout x="3.5" y="3.7" z="1.0"/>
<address transform="DPT:5.001" type="">12/7/53</address>
</info>
+ <filter floor="Underground" room="Room2">
+ <info format="%.2f">
+ <layout x="7.5" y="3.7" z="1.0"/>
+ <address transform="DPT:5.001" type="">12/7/53</address>
+ </info>
+ </filter>
+ <filter floor="Underground">
+ <info format="%.2f">
+ <layout x="3.5" y="7.7" z="1.0"/>
+ <address transform="DPT:5.001" type="">12/7/53</address>
+ </info>
+ <info format="%.2f">
+ <layout x="7.5" y="7.7" z="2.0"/>
+ <address transform="DPT:5.001" type="">12/7/53</address>
+ </info>
+ </filter>
<slide min="0" max="6.283185307179586" step="0.01">
<layout x="0px" y="570px" width="600px" />
<label>Azimut</label>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-05 21:39:53
|
Revision: 788
http://openautomation.svn.sourceforge.net/openautomation/?rev=788&view=rev
Author: mayerch
Date: 2012-05-05 21:39:46 +0000 (Sat, 05 May 2012)
Log Message:
-----------
New feature: initial implementation of navbars
Modified Paths:
--------------
CometVisu/trunk/visu/designs/designglobals.css
CometVisu/trunk/visu/index.html
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/designglobals.css
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css 2012-05-05 20:03:52 UTC (rev 787)
+++ CometVisu/trunk/visu/designs/designglobals.css 2012-05-05 21:39:46 UTC (rev 788)
@@ -2,6 +2,36 @@
* global CSS declarations for all designs
*/
+/*
+ * create a three column layout in the middle of the page to allow navbars
+ * inspired by http://www.alistapart.com/articles/holygrail
+ */
+#centerContainer {
+ padding-left: 0px; /* left bar width */
+ padding-right: 0px; /* right bar width */
+}
+#centerContainer > div {
+ position: relative;
+ float: left;
+}
+#main {
+ width: 100%;
+}
+#navbarLeft {
+ width: 0px; /* left bar width */
+ right: 0px; /* left bar width */
+ margin-left: -100%;
+}
+#navbarRight {
+ width: 0px; /* right bar width */
+ margin-right: 0px; /* right bar width */
+}
+#navbarTop {
+}
+#navbarBottom {
+ clear: both;
+}
+
/*
* colspans, each design needs to define a colspan0
* class, this class is the default widget size
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2012-05-05 20:03:52 UTC (rev 787)
+++ CometVisu/trunk/visu/index.html 2012-05-05 21:39:46 UTC (rev 788)
@@ -29,6 +29,7 @@
<script src="structure/pure/infotrigger.js" type="text/javascript"></script>
<script src="structure/pure/line.js" type="text/javascript"></script>
<script src="structure/pure/multitrigger.js" type="text/javascript"></script>
+ <script src="structure/pure/navbar.js" type="text/javascript"></script>
<script src="structure/pure/page.js" type="text/javascript"></script>
<script src="structure/pure/slide.js" type="text/javascript"></script>
<script src="structure/pure/switch.js" type="text/javascript"></script>
@@ -53,10 +54,17 @@
<div id="top" class="loading">
<div class="nav_path">-</div>
</div>
- <div id="main" style="width:900px;position:relative; overflow: hidden;" class="loading">
- <div id="pages" class="clearfix" style="width:20000em; position:relative;clear:both;"><!-- all pages will be inserted here -->
+ <div id="navbarTop" class="loading"></div>
+ <div id="centerContainer">
+ <div id="main" style="width:900px;position:relative; overflow: hidden;" class="loading">
+ <div id="pages" class="clearfix" style="width:20000em; position:relative;clear:both;">
+ <!-- all pages will be inserted here -->
+ </div>
</div>
+ <div id="navbarLeft" class="loading page"></div>
+ <div id="navbarRight" class="loading page"></div>
</div>
+ <div id="navbarBottom" class="loading"></div>
<div id="bottom" class="loading">
<hr />
<div class="footer"></div>
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-05-05 20:03:52 UTC (rev 787)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-05-05 21:39:46 UTC (rev 788)
@@ -22,6 +22,12 @@
var mappings = {}; // store the mappings
var stylings = {}; // store the stylings
+var navbars = { // store informations about the nav bars
+ top: { dynamic: false },
+ left: { dynamic: false },
+ right: { dynamic: false },
+ bottom: { dynamic: false }
+};
var ga_list = [];
@@ -120,15 +126,20 @@
*/
function handleResize() {
var uagent = navigator.userAgent.toLowerCase();
-
+ var widthNavbarLeft = $( '#navbarLeft' ).width();
+ var widthNavbarRight = $( '#navbarRight' ).width();
+ var width = $( window ).width() - widthNavbarLeft - widthNavbarRight;
+
if (/(android|blackberry|iphone|ipod|series60|symbian|windows ce|palm)/i.test(uagent)) {
- var width = $( window ).width();
$( '#main' ).css( 'width', width );
$( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;}</style>' );
// do nothing
} else {
- var width = $( window ).width();
- var height = $( window ).height() - $( '#top' ).outerHeight(true) - $( '#bottom' ).outerHeight(true) - 2;
+ var height = $( window ).height()
+ - $( '#top' ).outerHeight(true)
+ - $( '#navbarTop' ).outerHeight(true)
+ - $( '#navbarBottom' ).outerHeight(true)
+ - $( '#bottom' ).outerHeight(true) - 2;
$( '#main' ).css( 'width', width ).css( 'height', height );
$( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;height:' + height + 'px;}</style>' );
}
@@ -537,4 +548,27 @@
})
})
-}
\ No newline at end of file
+}
+
+/**
+ * Change the size of the selected navbar
+ *
+ * currently only "left" and "right" are implemented
+ */
+function navbarSetSize( position, size )
+{
+ var cssSize = size + 'px';
+ switch( position )
+ {
+ case 'left':
+ $( '#centerContainer' ).css( 'padding-left', cssSize );
+ $( '#navbarLeft' ).css( { width: cssSize, right: cssSize } );
+ break;
+
+ case 'right':
+ $( '#centerContainer' ).css( 'padding-right', cssSize );
+ $( '#navbarRight' ).css( { width: cssSize, 'margin-right': '-' + cssSize } );
+ break;
+ }
+ handleResize();
+}
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-05-05 20:03:52 UTC (rev 787)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-05-05 21:39:46 UTC (rev 788)
@@ -105,6 +105,11 @@
</statusbar>
</meta>
<page name="CometVisu Widget Demo">
+ <navbar position="left" dynamic="true" width="200px">
+ <text>Test 1</text>
+ <line/>
+ <text>Test 2</text>
+ </navbar>
<text align="center">Herzlich willkommen bei dem CometVisu Widget Demo!</text>
<text><b>Hinweis:</b><br/>Alle Widgets verwenden KNX-Addressen mit der Haupt- und Mittelgruppe 12/7, da diese meist unbenutzt sind und so beim Testen oft keine Nebenwirkungen auftreten können. Sollten diese Gruppe bei Ihnen verwendet werden, so sollten Sie diese Widgets hier nicht betätigen!</text>
<line/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-06 11:12:07
|
Revision: 791
http://openautomation.svn.sourceforge.net/openautomation/?rev=791&view=rev
Author: mayerch
Date: 2012-05-06 11:12:01 +0000 (Sun, 06 May 2012)
Log Message:
-----------
New feature: initial implementation of <pagejump> widget
Modified Paths:
--------------
CometVisu/trunk/visu/index.html
CometVisu/trunk/visu/visu_config_demo.xml
Added Paths:
-----------
CometVisu/trunk/visu/structure/pure/pagejump.js
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2012-05-06 10:41:10 UTC (rev 790)
+++ CometVisu/trunk/visu/index.html 2012-05-06 11:12:01 UTC (rev 791)
@@ -31,6 +31,7 @@
<script src="structure/pure/multitrigger.js" type="text/javascript"></script>
<script src="structure/pure/navbar.js" type="text/javascript"></script>
<script src="structure/pure/page.js" type="text/javascript"></script>
+ <script src="structure/pure/pagejump.js" type="text/javascript"></script>
<script src="structure/pure/slide.js" type="text/javascript"></script>
<script src="structure/pure/switch.js" type="text/javascript"></script>
<script src="structure/pure/text.js" type="text/javascript"></script>
Added: CometVisu/trunk/visu/structure/pure/pagejump.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/pagejump.js (rev 0)
+++ CometVisu/trunk/visu/structure/pure/pagejump.js 2012-05-06 11:12:01 UTC (rev 791)
@@ -0,0 +1,68 @@
+/* trigger.js (c) 2012 by Christian Mayer [CometVisu at ChristianMayer dot de]
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+basicdesign.addCreator('pagejump', {
+ create: function( element, path ) {
+ var $e = $(element);
+ var layout = $e.children('layout')[0];
+ var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
+ var target = $e.attr('target') ? $e.attr('target') : '0';
+ var ret_val = $('<div class="widget clearfix switch" ' + style + ' />');
+ ret_val.setWidgetLayout($e);
+ var labelElement = $e.find('label')[0];
+ var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+ var address = makeAddressList($e);
+ var actor = '<div class="actor switchUnpressed ';
+ if ( $e.attr( 'align' ) )
+ actor += $e.attr( 'align' );
+ actor += '">';
+ if( $e.attr( 'name' ) )
+ actor += '<div class="value">' + $e.attr( 'name' ) + '</div>';
+ else
+ actor += '<div class="value">' + target + '</div>';
+ actor += '</div>';
+ var $actor = $(actor).data( {
+ 'styling' : $(element).attr('styling'),
+ 'type' : 'pagejump',
+ 'align' : $e.attr('align'),
+ 'target' : target
+ } ).bind( 'click', this.action ).bind( 'mousedown', function(){
+ $(this).removeClass('switchUnpressed').addClass('switchPressed');
+ } ).bind( 'mouseup mouseout', function(){ // not perfect but simple
+ $(this).removeClass('switchPressed').addClass('switchUnpressed');
+ } ).setWidgetStyling(target);
+ ret_val.append( label ).append( $actor );
+ return ret_val;
+ },
+ action: function() {
+ var data = $(this).data();
+ scrollToPage( data.target );
+ },
+ attributes: {
+ traget: { type: 'string' , required: true },
+ name: { type: 'string' , required: false },
+ styling: { type: 'styling', required: false },
+ align: { type: 'string' , required: false },
+ colspan: { type: 'numeric', required: false },
+ rowspan: { type: 'numeric', required: false }
+ },
+ elements: {
+ label: { type: 'string' , required: true , multi: false },
+ layout: { type: 'layout' , required: false, multi: false }
+ },
+ content: false
+});
\ No newline at end of file
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-05-06 10:41:10 UTC (rev 790)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-05-06 11:12:01 UTC (rev 791)
@@ -108,7 +108,15 @@
<navbar position="left" dynamic="true" width="200px">
<text>Test 1</text>
<line/>
- <text>Test 2</text>
+ <pagejump target="0_33_7" name="Lithium">
+ <label>Flavour</label>
+ </pagejump>
+ <pagejump target="0_33_8" name="Potassium">
+ <label>Flavour</label>
+ </pagejump>
+ <pagejump target="0_36">
+ <label>2D</label>
+ </pagejump>
</navbar>
<text align="center">Herzlich willkommen bei dem CometVisu Widget Demo!</text>
<text><b>Hinweis:</b><br/>Alle Widgets verwenden KNX-Addressen mit der Haupt- und Mittelgruppe 12/7, da diese meist unbenutzt sind und so beim Testen oft keine Nebenwirkungen auftreten können. Sollten diese Gruppe bei Ihnen verwendet werden, so sollten Sie diese Widgets hier nicht betätigen!</text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-12 19:23:36
|
Revision: 813
http://openautomation.svn.sourceforge.net/openautomation/?rev=813&view=rev
Author: mayerch
Date: 2012-05-12 19:23:26 +0000 (Sat, 12 May 2012)
Log Message:
-----------
New feature: icons
Currently the first step is implemented, the useage of icons in a mapping. The next step will also allow them in labels.
(This commit also adds the missing backdrops for the 2d pages in the demo config)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/designglobals.css
CometVisu/trunk/visu/index.html
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/structure/pure/_common.js
CometVisu/trunk/visu/structure/pure/switch.js
CometVisu/trunk/visu/structure/pure/trigger.js
CometVisu/trunk/visu/visu_config_demo.xml
Added Paths:
-----------
CometVisu/trunk/visu/designs/pure/design_setup.js
CometVisu/trunk/visu/icon/knx-uf-iconset/
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_audio.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_eject.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_ff.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_mute.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_pause.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_play.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_playliste.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_rec.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_rew.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_sound.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/audio_stop.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/fts_fenster.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/fts_fenster_gekippt.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/fts_fenster_offen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/fts_garage.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/fts_markise.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/fts_rollo.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/fts_tuer.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/fts_tuer_offen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_fernsehen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_funk_dcf77.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_internet.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_kamera.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_nas.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_netz.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_netzwerk.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_pc.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_radio.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_router.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_server.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_smartphone.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_telefon.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/it_wlan.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/licht_esstisch.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/licht_indirekt.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/licht_led.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/licht_licht.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/licht_lichterkette.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/licht_party.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/licht_regelung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/licht_stehlampe.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/meld_achtung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/meld_medizin.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/meld_post.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/meld_post_offen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/meld_service.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/meld_steckdose.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_bewaesserung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_fussbodenheizung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_heizung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_kessel_temp.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_lueftung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_lueftung_regelung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_pumpe.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_solar.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_solar_temp.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/sani_wasserhahn.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/secur_alarmanlage.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/secur_codierung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/secur_frostschutz.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/secur_hitzeschutz.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/secur_offen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/secur_rauchmelder.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/secur_zu.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_ab.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_alles_ein_aus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_auf.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_aussen_ein_aus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_ein_aus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_home.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_minus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_plus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_standby.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_vor.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_x.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/steuer_zurueck.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_essen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_garten.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_kochen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_making_love.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_nacht.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_party.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_pool.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_schlafen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_schwimmen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_szene.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_terrasse.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_toilette.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/szene_weihnachten.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/temp_aussen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/temp_frost.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/temp_innen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/temp_regelung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/temp_temperatur.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/user_abwesend.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/user_anwesend.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/user_ext_away.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_bewoelkt.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_feuchtigkeit.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_gewitter.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_pollen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_regen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_schnee.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_sommer.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_sonne.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_unwetter.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_wind.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/wetter_winter.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/zeit_automatik.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/zeit_diagramm.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/zeit_ecomode.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/zeit_handbetrieb.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/zeit_kalender.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/zeit_notiz.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/zeit_statistik.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_or/zeit_uhr.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_audio.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_eject.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_ff.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_mute.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_pause.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_play.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_playliste.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_rec.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_rew.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_sound.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/audio_stop.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/fts_fenster.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/fts_fenster_gekippt.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/fts_fenster_offen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/fts_garage.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/fts_markise.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/fts_rollo.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/fts_tuer.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/fts_tuer_offen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_fernsehen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_funk_dcf77.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_internet.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_kamera.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_nas.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_netz.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_netzwerk.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_pc.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_radio.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_router.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_server.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_smartphone.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_telefon.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/it_wlan.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/licht_esstisch.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/licht_indirekt.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/licht_led.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/licht_licht.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/licht_lichterkette.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/licht_party.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/licht_regelung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/licht_stehlampe.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/meld_achtung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/meld_medizin.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/meld_post.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/meld_post_offen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/meld_service.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/meld_steckdose.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_bewaesserung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_fussbodenheizung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_heizung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_kessel_temp.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_lueftung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_lueftung_regelung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_pumpe.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_solar.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_solar_temp.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/sani_wasserhahn.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/secur_alarmanlage.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/secur_codierung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/secur_frostschutz.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/secur_hitzeschutz.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/secur_offen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/secur_rauchmelder.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/secur_zu.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_ab.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_alles_ein_aus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_auf.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_aussen_ein_aus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_ein_aus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_home.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_minus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_plus.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_standby.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_vor.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_x.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/steuer_zurueck.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_essen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_garten.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_kochen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_making_love.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_nacht.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_party.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_pool.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_schlafen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_schwimmen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_szene.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_terrasse.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_toilette.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/szene_weihnachten.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/temp_aussen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/temp_frost.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/temp_innen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/temp_regelung.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/temp_temperatur.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/user_abwesend.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/user_anwesend.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/user_ext_away.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_bewoelkt.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_feuchtigkeit.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_gewitter.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_pollen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_regen.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_schnee.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_sommer.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_sonne.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_unwetter.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_wind.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/wetter_winter.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/zeit_automatik.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/zeit_diagramm.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/zeit_ecomode.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/zeit_handbetrieb.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/zeit_kalender.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/zeit_notiz.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/zeit_statistik.png
CometVisu/trunk/visu/icon/knx-uf-iconset/128x128_ws/zeit_uhr.png
CometVisu/trunk/visu/icon/knx-uf-iconset/LICENCE
CometVisu/trunk/visu/lib/iconhandler.js
CometVisu/trunk/visu/media/demo_2d_backdrop_nikolaushaus.png
CometVisu/trunk/visu/media/demo_2d_backdrop_nikolaushaus.svg
Modified: CometVisu/trunk/visu/designs/designglobals.css
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css 2012-05-12 08:21:46 UTC (rev 812)
+++ CometVisu/trunk/visu/designs/designglobals.css 2012-05-12 19:23:26 UTC (rev 813)
@@ -32,6 +32,10 @@
clear: both;
}
+.icon {
+ height: 2em;
+}
+
/*
* colspans, each design needs to define a colspan0
* class, this class is the default widget size
Added: CometVisu/trunk/visu/designs/pure/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/pure/design_setup.js (rev 0)
+++ CometVisu/trunk/visu/designs/pure/design_setup.js 2012-05-12 19:23:26 UTC (rev 813)
@@ -0,0 +1,141 @@
+//
+// Design setup for the pure design
+//
+// Copyright (C) 2012 by Christian Mayer
+// cometvisu (at) ChristianMayer.de
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+icons.insert({
+ 'audio_audio' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_audio.png' } } },
+ 'audio_eject' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_eject.png' } } },
+ 'audio_ff' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_ff.png' } } },
+ 'audio_mute' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_mute.png' } } },
+ 'audio_pause' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_pause.png' } } },
+ 'audio_playliste' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_playliste.png' } } },
+ 'audio_play' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_play.png' } } },
+ 'audio_rec' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_rec.png' } } },
+ 'audio_rew' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_rew.png' } } },
+ 'audio_sound' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_sound.png' } } },
+ 'audio_stop' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_stop.png' } } },
+ 'fts_fenster_gekippt' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster_gekippt.png' } } },
+ 'fts_fenster_offen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster_offen.png' } } },
+ 'fts_fenster' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster.png' } } },
+ 'fts_garage' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_garage.png' } } },
+ 'fts_markise' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_markise.png' } } },
+ 'fts_rollo' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_rollo.png' } } },
+ 'fts_tuer_offen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_tuer_offen.png' } } },
+ 'fts_tuer' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_tuer.png' } } },
+ 'it_fernsehen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_fernsehen.png' } } },
+ 'it_funk_dcf77' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_funk_dcf77.png' } } },
+ 'it_internet' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_internet.png' } } },
+ 'it_kamera' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_kamera.png' } } },
+ 'it_nas' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_nas.png' } } },
+ 'it_netz' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_netz.png' } } },
+ 'it_netzwerk' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_netzwerk.png' } } },
+ 'it_pc' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_pc.png' } } },
+ 'it_radio' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_radio.png' } } },
+ 'it_router' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_router.png' } } },
+ 'it_server' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_server.png' } } },
+ 'it_smartphone' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_smartphone.png' } } },
+ 'it_telefon' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_telefon.png' } } },
+ 'it_wlan' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_wlan.png' } } },
+ 'licht_esstisch' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_esstisch.png' } } },
+ 'licht_indirekt' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_indirekt.png' } } },
+ 'licht_led' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_led.png' } } },
+ 'licht_lichterkette' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_lichterkette.png' } } },
+ 'licht_licht' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_licht.png' } } },
+ 'licht_party' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_party.png' } } },
+ 'licht_regelung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_regelung.png' } } },
+ 'licht_stehlampe' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_stehlampe.png' } } },
+ 'meld_achtung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_achtung.png' } } },
+ 'meld_medizin' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_medizin.png' } } },
+ 'meld_post_offen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_post_offen.png' } } },
+ 'meld_post' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_post.png' } } },
+ 'meld_service' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_service.png' } } },
+ 'meld_steckdose' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_steckdose.png' } } },
+ 'sani_bewaesserung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_bewaesserung.png' } } },
+ 'sani_fussbodenheizung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_fussbodenheizung.png' } } },
+ 'sani_heizung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_heizung.png' } } },
+ 'sani_kessel_temp' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_kessel_temp.png' } } },
+ 'sani_lueftung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_lueftung.png' } } },
+ 'sani_lueftung_regelung': { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_lueftung_regelung.png' } } },
+ 'sani_pumpe' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_pumpe.png' } } },
+ 'sani_solar' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_solar.png' } } },
+ 'sani_solar_temp' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_solar_temp.png' } } },
+ 'sani_wasserhahn' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_wasserhahn.png' } } },
+ 'secur_alarmanlage' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_alarmanlage.png' } } },
+ 'secur_codierung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_codierung.png' } } },
+ 'secur_frostschutz' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_frostschutz.png' } } },
+ 'secur_hitzeschutz' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_hitzeschutz.png' } } },
+ 'secur_offen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_offen.png' } } },
+ 'secur_rauchmelder' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_rauchmelder.png' } } },
+ 'secur_zu' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_zu.png' } } },
+ 'steuer_ab' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_ab.png' } } },
+ 'steuer_alles_ein_aus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_alles_ein_aus.png' } } },
+ 'steuer_auf' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_auf.png' } } },
+ 'steuer_aussen_ein_aus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_aussen_ein_aus.png' } } },
+ 'steuer_ein_aus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_ein_aus.png' } } },
+ 'steuer_home' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_home.png' } } },
+ 'steuer_minus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_minus.png' } } },
+ 'steuer_plus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_plus.png' } } },
+ 'steuer_standby' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_standby.png' } } },
+ 'steuer_vor' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_vor.png' } } },
+ 'steuer_x' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_x.png' } } },
+ 'steuer_zurueck' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_zurueck.png' } } },
+ 'szene_essen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_essen.png' } } },
+ 'szene_garten' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_garten.png' } } },
+ 'szene_kochen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_kochen.png' } } },
+ 'szene_making_love' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_making_love.png' } } },
+ 'szene_nacht' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_nacht.png' } } },
+ 'szene_party' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_party.png' } } },
+ 'szene_pool' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_pool.png' } } },
+ 'szene_schlafen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_schlafen.png' } } },
+ 'szene_schwimmen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_schwimmen.png' } } },
+ 'szene_szene' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_szene.png' } } },
+ 'szene_terrasse' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_terrasse.png' } } },
+ 'szene_toilette' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_toilette.png' } } },
+ 'szene_weihnachten' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_weihnachten.png' } } },
+ 'temp_aussen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_aussen.png' } } },
+ 'temp_frost' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_frost.png' } } },
+ 'temp_innen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_innen.png' } } },
+ 'temp_regelung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_regelung.png' } } },
+ 'temp_temperatur' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_temperatur.png' } } },
...
[truncated message content] |
|
From: <ma...@us...> - 2012-05-12 21:47:08
|
Revision: 815
http://openautomation.svn.sourceforge.net/openautomation/?rev=815&view=rev
Author: mayerch
Date: 2012-05-12 21:47:02 +0000 (Sat, 12 May 2012)
Log Message:
-----------
New feature: icons
Now the second step is implemented and icons can also be used in labels.
Modified Paths:
--------------
CometVisu/trunk/visu/structure/pure/_common.js
CometVisu/trunk/visu/structure/pure/iframe.js
CometVisu/trunk/visu/structure/pure/image.js
CometVisu/trunk/visu/structure/pure/imagetrigger.js
CometVisu/trunk/visu/structure/pure/infotrigger.js
CometVisu/trunk/visu/structure/pure/multitrigger.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/structure/pure/video.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/_common.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -75,7 +75,7 @@
$.fn.makeWidgetLabel = function(page) {
var labelElement = page.find('label')[0]; // get first label element
if (labelElement) { // if exists, add it
- this.append($('<div class="label">' + labelElement.textContent + '</div>'));
+ this.append( extractLabel( labelElement ) );
}
return this;
}
@@ -413,4 +413,19 @@
return ret_val;
}
+function extractLabel( label )
+{
+ if( !label ) return;
+
+ var $div = $( '<div class="label"></div>' );
+ $( label ).contents().each( function(){
+ var $v = $(this);
+ if( $v.is('icon') )
+ $div.append( icons.getIcon( $v.attr('name') ).clone() );
+ else
+ $div.append( $v.clone() );
+ });
+ return $div;
+}
+
var basicdesign = new VisuDesign();
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/iframe.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/iframe.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/iframe.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -22,7 +22,7 @@
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget iframe" ' + style + '/>');
ret_val.setWidgetLayout($e);
- ret_val.append( '<div class="label">' + element.textContent + '</div>' );
+ ret_val.append( extractLabel( $e.find('label')[0] ) );
var iframeStyle = '';
if( $e.attr('width' ) ) {
iframeStyle += 'width:' + $e.attr('width' ) + ';';
Modified: CometVisu/trunk/visu/structure/pure/image.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/image.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/image.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix image" ' + style + '/>');
ret_val.setWidgetLayout($e);
- var labelElement = $e.find('label')[0];
- ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
+ ret_val.append( extractLabel( $e.find('label')[0] ) );
var imgStyle = '';
if( $e.attr('width' ) ) {
imgStyle += 'width:' + $e.attr('width' ) + ';';
Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
ret_val.setWidgetLayout($e);
ret_val.addClass ('imagetrigger');
var value = $e.attr('value') ? $e.attr('value') : 0;
- var labelElement = $e.find('label')[0];
- ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
+ ret_val.append( extractLabel( $e.find('label')[0] ) );
var address = makeAddressList($e);
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout, {width:'100%'} ) + '"' : '';
Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -22,10 +22,7 @@
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
ret_val.setWidgetLayout($e);
- // handle label
- var labelElement = $e.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
- ret_val.append( label );
+ ret_val.append( extractLabel( $e.find('label')[0] ) );
// handle addresses
var address = makeAddressList($e,
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -22,11 +22,9 @@
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
ret_val.setWidgetLayout($e)
- var labelElement = $e.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+ ret_val.append( extractLabel( $e.find('label')[0] ) );
var address = makeAddressList($e);
var showstatus = $e.attr("showstatus") || "false";
- ret_val.append( label );
var buttons = $('<div style="float:left"/>');
var buttonCount = 0;
if( $e.attr('button1label') )
Modified: CometVisu/trunk/visu/structure/pure/pagejump.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/pagejump.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/pagejump.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -23,8 +23,7 @@
var target = $e.attr('target') ? $e.attr('target') : '0';
var ret_val = $('<div class="widget clearfix switch" ' + style + ' />');
ret_val.setWidgetLayout($e);
- var labelElement = $e.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+ var label = extractLabel( $e.find('label')[0] );
var address = makeAddressList($e);
var actor = '<div class="actor switchUnpressed ';
if ( $e.attr( 'align' ) )
Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/switch.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix switch" ' + style + '/>');
ret_val.setWidgetLayout($e)
- var labelElement = $e.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+ 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( {
Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/toggle.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix toggle" ' + style + '/>');
ret_val.setWidgetLayout($e);
- var labelElement = $e.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+ 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( {
Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -23,8 +23,7 @@
var value = $e.attr('value') ? $e.attr('value') : 0;
var ret_val = $('<div class="widget clearfix switch" ' + style + ' />');
ret_val.setWidgetLayout($e);
- var labelElement = $e.find('label')[0];
- var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+ var label = extractLabel( $e.find('label')[0] );
var address = makeAddressList($e);
var actor = '<div class="actor switchUnpressed ';
if ( $e.attr( 'align' ) )
Modified: CometVisu/trunk/visu/structure/pure/video.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/video.js 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/structure/pure/video.js 2012-05-12 21:47:02 UTC (rev 815)
@@ -22,8 +22,7 @@
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
var ret_val = $('<div class="widget clearfix video" ' + style + '/>');
ret_val.setWidgetLayout($e);
- var labelElement = $e.find('label')[0];
- ret_val.append( labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '' );
+ ret_val.append( extractLabel( $e.find('label')[0] ) );
var autoplay = ($e.attr('autoplay') && $e.attr('autoplay')=='true') ? ' autoplay="autoplay"' : '';
var style = '';
if( $e.attr('width' ) ) style += 'width:' + $e.attr('width' ) + ';';
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-05-12 20:19:08 UTC (rev 814)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-05-12 21:47:02 UTC (rev 815)
@@ -115,10 +115,10 @@
<navbar position="left" dynamic="true" width="200px">
<text>Test 1</text>
<line/>
- <pagejump target="0_33_7" name="Lithium">
+ <pagejump target="0_34_7" name="Lithium">
<label>Flavour</label>
</pagejump>
- <pagejump target="0_33_8" name="Potassium">
+ <pagejump target="0_34_8" name="Potassium">
<label>Flavour</label>
</pagejump>
<pagejump target="0_36">
@@ -161,7 +161,7 @@
<address transform="DPT:5.010" type="">12/7/5</address>
</multitrigger>
<switch mapping="audio_mute">
- <label><icon name="audio_sound" />Switch Icon</label>
+ <label><icon name="audio_sound" /> Switch Icon</label>
<address transform="DPT:1.001" type="">12/7/1</address>
</switch>
<break/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-18 22:01:04
|
Revision: 830
http://openautomation.svn.sourceforge.net/openautomation/?rev=830&view=rev
Author: mayerch
Date: 2012-05-18 22:00:58 +0000 (Fri, 18 May 2012)
Log Message:
-----------
Improvement: make nav_path seperator addressable via CSS
New design: planet - in it's very early stage
Modified Paths:
--------------
CometVisu/trunk/visu/lib/templateengine.js
Added Paths:
-----------
CometVisu/trunk/visu/designs/planet/
CometVisu/trunk/visu/designs/planet/basic.css
CometVisu/trunk/visu/designs/planet/custom.css
CometVisu/trunk/visu/designs/planet/design_setup.js
CometVisu/trunk/visu/designs/planet/mobile.css
Added: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css (rev 0)
+++ CometVisu/trunk/visu/designs/planet/basic.css 2012-05-18 22:00:58 UTC (rev 830)
@@ -0,0 +1,197 @@
+/*
+ * Global definitions used:
+ * navbarWidth: 10em
+ */
+
+/* define basic setup */
+body {
+ background: #121212;
+ 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-size: 5.5mm;
+ overflow: hidden;
+ margin: 0.1em;
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ -webkit-user-select: none;
+ user-select: none;
+}
+
+a {
+ text-decoration: none;
+}
+
+/* Clearfix */
+.clearfix:after {
+ content: ".";
+ display: block;
+ clear: both;
+ visibility: hidden;
+ line-height: 0;
+ height: 0;
+}
+
+.clearfix {
+ display: inline-block;
+}
+
+html[xmlns] .clearfix {
+ display: block;
+}
+
+*:first-child+html .clearfix {
+ min-height: 0;
+}
+
+* html .clearfix {
+ height: 1%;
+}
+
+* html>body .clearfix {
+ display: inline-block;
+ width: 100%;
+}
+
+* html .clearfix {
+ /* Hides from IE-mac \*/
+ height: 1%;
+ /* End hide from IE-mac */
+}
+
+.loading {
+ display: block !important;
+}
+
+div#loading {
+ display: none !important;
+}
+
+/******************************************************************/
+/* define the top bar */
+
+/* combine two :before boxes to have the correct roundings - 100% on the outside and 50% on the inside */
+#top:before {
+ width: 2em;
+ height: 2em;
+ border: solid #9999cc;
+ border-top-width: 1.5em;
+ border-left-width: 10em;
+ border-top-left-radius: 4em 4em;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ content: "";
+ display: block;
+ position: absolute;
+}
+
+.nav_path:before {
+ width: 2em;
+ height: 2em;
+ border: solid #9999cc;
+ border-top-width: 1.5em;
+ border-left-width: 10em;
+ border-top-left-radius: 12em 3.5em;
+ border-right-width: 0px;
+ border-bottom-width: 0px;
+ content: "";
+ display: block;
+ position: absolute;
+ margin-left: -12.1em;
+}
+
+.nav_path {
+ background: #9999cc;
+ margin-left: 12.1em;
+ margin-bottom: 2.1em;
+ border: 0px;
+ border-top-right-radius: 1em;
+ border-bottom-right-radius: 1em;
+}
+
+.nav_path a {
+ color: #000;
+ background-color: #ff9900;
+ border-width: 0px 0.1em 0px 0px;
+ border-style: solid;
+ border-color: #000;
+ padding: 0 0.25em 0 0.25em;
+ line-height: 1.5em;
+ height: 1.5em;
+ display: inline-block;
+}
+
+/* disable seperator */
+.nav_path span {
+ display: none;
+}
+
+#navbarLeft {
+ width: 10em; /* left bar width */
+ right: 10em; /* left bar width */
+ /*border: 2px solid red; FIXME */
+ background-color: #cc6699;
+}
+#centerContainer {
+ padding-left: 10em; /* left bar width */
+}
+
+/******************************************************************/
+h1 {
+ color: #999;
+}
+
+.page
+{
+ float:left;
+ width: 900px;
+ overflow: auto;
+ position: relative;
+}
+
+.colspan0 {
+ width: 8.33333%;
+}
+.colspandefault {
+ width: 1px;
+}
+
+
+.widget {
+ /* border: 1px solid blue; */
+ background: #ffcc99;
+}
+.widget_container, .text > div, .widget .label, .widget .actor,
+ .widget .actor div, .page {
+ float:left;
+}
+
+.link > div, .link a , .switchPressed, .switchUnpressed, * html>body .clearfix,
+ .info > div, .actor .value , .text>div {
+ width: 100%;
+}
+
+.widget {
+ min-height: 2.4em;
+}
+
+.widget .label, .widget .info .actor, .text > div, .link > div, .link a,
+ .value, .popup >div.head {
+ line-height: 2.4em;
+}
+
+.widget, .widget.group {
+ margin: .2em .1em 0 .1em;
+}
+
+.widget {
+ padding: 0.3em;
+}
+
+.widget.group {
+ padding: 0.3em 0 0.3em 0;
+}
+
+body hr, body br, #pages hr {
+ clear: both;
+}
Property changes on: CometVisu/trunk/visu/designs/planet/basic.css
___________________________________________________________________
Added: svn:executable
+ *
Added: CometVisu/trunk/visu/designs/planet/custom.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/custom.css (rev 0)
+++ CometVisu/trunk/visu/designs/planet/custom.css 2012-05-18 22:00:58 UTC (rev 830)
@@ -0,0 +1,3 @@
+/*
+ * custom local css to overload declarations in each design (basic.css)
+ */
Added: CometVisu/trunk/visu/designs/planet/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/planet/design_setup.js (rev 0)
+++ CometVisu/trunk/visu/designs/planet/design_setup.js 2012-05-18 22:00:58 UTC (rev 830)
@@ -0,0 +1,291 @@
+//
+// Design setup for the planet design
+//
+// Copyright (C) 2012 by Christian Mayer
+// cometvisu (at) ChristianMayer.de
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+icons.insert({
+ 'CometVisu' : { '*' : '128',
+ '16' : { '*' : 'sodium' ,
+ 'black' : { 'uri': 'icon/comet_16_000000.png' },
+ 'white' : { 'uri': 'icon/comet_16_ffffff.png' },
+ 'antimony' : { 'uri': 'icon/comet_16_00ddff.png' },
+ 'boron' : { 'uri': 'icon/comet_16_00ff11.png' },
+ 'lithium' : { 'uri': 'icon/comet_16_ff0000.png' },
+ 'potassium' : { 'uri': 'icon/comet_16_d00055.png' },
+ 'sodium' : { 'uri': 'icon/comet_16_ff8000.png' } },
+ '32' : { '*' : 'sodium' ,
+ 'black' : { 'uri': 'icon/comet_32_000000.png' },
+ 'white' : { 'uri': 'icon/comet_32_ffffff.png' },
+ 'antimony' : { 'uri': 'icon/comet_32_00ddff.png' },
+ 'boron' : { 'uri': 'icon/comet_32_00ff11.png' },
+ 'lithium' : { 'uri': 'icon/comet_32_ff0000.png' },
+ 'potassium' : { 'uri': 'icon/comet_32_d00055.png' },
+ 'sodium' : { 'uri': 'icon/comet_32_ff8000.png' } },
+ '64' : { '*' : 'sodium' ,
+ 'black' : { 'uri': 'icon/comet_64_000000.png' },
+ 'white' : { 'uri': 'icon/comet_64_ffffff.png' },
+ 'antimony' : { 'uri': 'icon/comet_64_00ddff.png' },
+ 'boron' : { 'uri': 'icon/comet_64_00ff11.png' },
+ 'lithium' : { 'uri': 'icon/comet_64_ff0000.png' },
+ 'potassium' : { 'uri': 'icon/comet_64_d00055.png' },
+ 'sodium' : { 'uri': 'icon/comet_64_ff8000.png' } },
+ '128': { '*' : 'sodium' ,
+ 'black' : { 'uri': 'icon/comet_128_000000.png' },
+ 'white' : { 'uri': 'icon/comet_128_ffffff.png' },
+ 'antimony' : { 'uri': 'icon/comet_128_00ddff.png' },
+ 'boron' : { 'uri': 'icon/comet_128_00ff11.png' },
+ 'lithium' : { 'uri': 'icon/comet_128_ff0000.png' },
+ 'potassium' : { 'uri': 'icon/comet_128_d00055.png' },
+ 'sodium' : { 'uri': 'icon/comet_128_ff8000.png' } } },
+ 'audio_audio' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_audio.png' , 'style': 'height: 2em;' },
+ 'sodium' : { 'uri': 'icon/knx-uf-iconset/128x128_or/audio_audio.png' , 'style': 'height: 2em;' } } },
+ 'audio_eject' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_eject.png' , 'style': 'height: 2em;' } } },
+ 'audio_ff' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_ff.png' , 'style': 'height: 2em;' } } },
+ 'audio_mute' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_mute.png' , 'style': 'height: 2em;' } } },
+ 'audio_pause' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_pause.png' , 'style': 'height: 2em;' } } },
+ 'audio_playliste' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_playliste.png' , 'style': 'height: 2em;' } } },
+ 'audio_play' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_play.png' , 'style': 'height: 2em;' } } },
+ 'audio_rec' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_rec.png' , 'style': 'height: 2em;' } } },
+ 'audio_rew' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_rew.png' , 'style': 'height: 2em;' } } },
+ 'audio_sound' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_sound.png' , 'style': 'height: 2em;' } } },
+ 'audio_stop' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_stop.png' , 'style': 'height: 2em;' } } },
+ 'fts_fenster_gekippt' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster_gekippt.png' , 'style': 'height: 2em;' } } },
+ 'fts_fenster_offen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster_offen.png' , 'style': 'height: 2em;' } } },
+ 'fts_fenster' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster.png' , 'style': 'height: 2em;' } } },
+ 'fts_garage' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_garage.png' , 'style': 'height: 2em;' } } },
+ 'fts_markise' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_markise.png' , 'style': 'height: 2em;' } } },
+ 'fts_rollo' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_rollo.png' , 'style': 'height: 2em;' } } },
+ 'fts_tuer_offen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_tuer_offen.png' , 'style': 'height: 2em;' } } },
+ 'fts_tuer' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_tuer.png' , 'style': 'height: 2em;' } } },
+ 'it_fernsehen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_fernsehen.png' , 'style': 'height: 2em;' } } },
+ 'it_funk_dcf77' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_funk_dcf77.png' , 'style': 'height: 2em;' } } },
+ 'it_internet' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_internet.png' , 'style': 'height: 2em;' } } },
+ 'it_kamera' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_kamera.png' , 'style': 'height: 2em;' } } },
+ 'it_nas' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_nas.png' , 'style': 'height: 2em;' } } },
+ 'it_netz' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_netz.png' , 'style': 'height: 2em;' } } },
+ 'it_netzwerk' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_netzwerk.png' , 'style': 'height: 2em;' } } },
+ 'it_pc' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_pc.png' , 'style': 'height: 2em;' } } },
+ 'it_radio' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_radio.png' , 'style': 'height: 2em;' } } },
+ 'it_router' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_router.png' , 'style': 'height: 2em;' } } },
+ 'it_server' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_server.png' , 'style': 'height: 2em;' } } },
+ 'it_smartphone' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_smartphone.png' , 'style': 'height: 2em;' } } },
+ 'it_telefon' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_telefon.png' , 'style': 'height: 2em;' } } },
+ 'it_wlan' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_wlan.png' , 'style': 'height: 2em;' } } },
+ 'licht_esstisch' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_esstisch.png' , 'style': 'height: 2em;' } } },
+ 'licht_indirekt' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_indirekt.png' , 'style': 'height: 2em;' } } },
+ 'licht_led' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_led.png' , 'style': 'height: 2em;' } } },
+ 'licht_lichterkette' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_lichterkette.png' , 'style': 'height: 2em;' } } },
+ 'licht_licht' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_licht.png' , 'style': 'height: 2em;' } } },
+ 'licht_party' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_party.png' , 'style': 'height: 2em;' } } },
+ 'licht_regelung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_regelung.png' , 'style': 'height: 2em;' } } },
+ 'licht_stehlampe' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_stehlampe.png' , 'style': 'height: 2em;' } } },
+ 'meld_achtung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_achtung.png' , 'style': 'height: 2em;' } } },
+ 'meld_medizin' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_medizin.png' , 'style': 'height: 2em;' } } },
+ 'meld_post_offen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_post_offen.png' , 'style': 'height: 2em;' } } },
+ 'meld_post' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_post.png' , 'style': 'height: 2em;' } } },
+ 'meld_service' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_service.png' , 'style': 'height: 2em;' } } },
+ 'meld_steckdose' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_steckdose.png' , 'style': 'height: 2em;' } } },
+ 'sani_bewaesserung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_bewaesserung.png' , 'style': 'height: 2em;' } } },
+ 'sani_fussbodenheizung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_fussbodenheizung.png' , 'style': 'height: 2em;' } } },
+ 'sani_heizung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_heizung.png' , 'style': 'height: 2em;' } } },
+ 'sani_kessel_temp' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_kessel_temp.png' , 'style': 'height: 2em;' } } },
+ 'sani_lueftung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_lueftung.png' , 'style': 'height: 2em;' } } },
+ 'sani_lueftung_regelung': { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_lueftung_regelung.png' , 'style': 'height: 2em;' } } },
+ 'sani_pumpe' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_pumpe.png' , 'style': 'height: 2em;' } } },
+ 'sani_solar' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_solar.png' , 'style': 'height: 2em;' } } },
+ 'sani_solar_temp' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_solar_temp.png' , 'style': 'height: 2em;' } } },
+ 'sani_wasserhahn' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_wasserhahn.png' , 'style': 'height: 2em;' } } },
+ 'secur_alarmanlage' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_alarmanlage.png' , 'style': 'height: 2em;' } } },
+ 'secur_codierung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_codierung.png' , 'style': 'height: 2em;' } } },
+ 'secur_frostschutz' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_frostschutz.png' , 'style': 'height: 2em;' } } },
+ 'secur_hitzeschutz' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_hitzeschutz.png' , 'style': 'height: 2em;' } } },
+ 'secur_offen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_offen.png' , 'style': 'height: 2em;' } } },
+ 'secur_rauchmelder' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_rauchmelder.png' , 'style': 'height: 2em;' } } },
+ 'secur_zu' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_zu.png' , 'style': 'height: 2em;' } } },
+ 'steuer_ab' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_ab.png' , 'style': 'height: 2em;' } } },
+ 'steuer_alles_ein_aus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_alles_ein_aus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_auf' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_auf.png' , 'style': 'height: 2em;' } } },
+ 'steuer_aussen_ein_aus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_aussen_ein_aus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_ein_aus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_ein_aus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_home' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_home.png' , 'style': 'height: 2em;' } } },
+ 'steuer_minus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_minus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_plus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_plus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_standby' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_standby.png' , 'style': 'height: 2em;' } } },
+ 'steuer_vor' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_vor.png' , 'style': 'height: 2em;' } } },
+ 'steuer_x' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_x.png' , 'style': 'height: 2em;' } } },
+ 'steuer_zurueck' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_zurueck.png' , 'style': 'height: 2em;' } } },
+ 'szene_essen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_essen.png' , 'style': 'height: 2em;' } } },
+ 'szene_garten' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_garten.png' , 'style': 'height: 2em;' } } },
+ 'szene_kochen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_kochen.png' , 'style': 'height: 2em;' } } },
+ 'szene_making_love' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_making_love.png' , 'style': 'height: 2em;' } } },
+ 'szene_nacht' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_nacht.png' , 'style': 'height: 2em;' } } },
+ 'szene_party' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_party.png' , 'style': 'height: 2em;' } } },
+ 'szene_pool' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_pool.png' , 'style': 'height: 2em;' } } },
+ 'szene_schlafen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_schlafen.png' , 'style': 'height: 2em;' } } },
+ 'szene_schwimmen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_schwimmen.png' , 'style': 'height: 2em;' } } },
+ 'szene_szene' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_szene.png' , 'style': 'height: 2em;' } } },
+ 'szene_terrasse' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_terrasse.png' , 'style': 'height: 2em;' } } },
+ 'szene_toilette' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_toilette.png' , 'style': 'height: 2em;' } } },
+ 'szene_weihnachten' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_weihnachten.png' , 'style': 'height: 2em;' } } },
+ 'temp_aussen' : { '*': { '*' : 'white',
+ 'whi...
[truncated message content] |
|
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.
|
|
From: <ma...@us...> - 2012-05-28 13:44:10
|
Revision: 844
http://openautomation.svn.sourceforge.net/openautomation/?rev=844&view=rev
Author: mayerch
Date: 2012-05-28 13:44:04 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Show correct link to the check_config.php by adding the current config file informations
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config.xml
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml 2012-05-28 13:39:44 UTC (rev 843)
+++ CometVisu/trunk/visu/visu_config.xml 2012-05-28 13:44:04 UTC (rev 844)
@@ -58,7 +58,7 @@
<status type="html" condition="edit" hrefextend="all"><![CDATA[
- <a href=".">normal Mode</a>
]]></status>
- <status type="html"><![CDATA[
+ <status type="html" hrefextend="config"><![CDATA[
- <a href="check_config.php">Check Config</a>
]]></status>
</statusbar>
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-05-28 13:39:44 UTC (rev 843)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-05-28 13:44:04 UTC (rev 844)
@@ -105,7 +105,7 @@
<status type="html" condition="edit" hrefextend="all"><![CDATA[
- <a href=".">normal Mode</a>
]]></status>
- <status type="html"><![CDATA[
+ <status type="html" hrefextend="config"><![CDATA[
- <a href="check_config.php">Check Config</a>
<div style="float:right;padding-right:0.5em">Version: SVN</div>
]]></status>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-30 18:28:45
|
Revision: 847
http://openautomation.svn.sourceforge.net/openautomation/?rev=847&view=rev
Author: mayerch
Date: 2012-05-30 18:28:39 +0000 (Wed, 30 May 2012)
Log Message:
-----------
Reorder main layout to be more flexible for the navbars
Modified Paths:
--------------
CometVisu/trunk/visu/designs/designglobals.css
CometVisu/trunk/visu/designs/planet/basic.css
CometVisu/trunk/visu/designs/planet/design_setup.js
CometVisu/trunk/visu/index.html
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/structure/pure/navbar.js
Modified: CometVisu/trunk/visu/designs/designglobals.css
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css 2012-05-28 18:11:33 UTC (rev 846)
+++ CometVisu/trunk/visu/designs/designglobals.css 2012-05-30 18:28:39 UTC (rev 847)
@@ -19,8 +19,6 @@
}
#navbarLeft {
width: 0px; /* left bar width */
- right: 0px; /* left bar width */
- margin-left: -100%;
}
#navbarRight {
width: 0px; /* right bar width */
Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css 2012-05-28 18:11:33 UTC (rev 846)
+++ CometVisu/trunk/visu/designs/planet/basic.css 2012-05-30 18:28:39 UTC (rev 847)
@@ -130,12 +130,9 @@
#navbarLeft {
width: 10em; /* left bar width */
- right: 10em; /* left bar width */
- /*border: 2px solid red; FIXME */
background-color: #cc6699;
}
#centerContainer {
- padding-left: 10em; /* left bar width */
}
/******************************************************************/
Modified: CometVisu/trunk/visu/designs/planet/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/planet/design_setup.js 2012-05-28 18:11:33 UTC (rev 846)
+++ CometVisu/trunk/visu/designs/planet/design_setup.js 2012-05-30 18:28:39 UTC (rev 847)
@@ -22,7 +22,7 @@
//////////////////////////////////////////////////////////////////////////////
//$('head').data('colspanDefault', 1 ); // 6 is already the default
-$('#navbarLeft').data('columns', 1 );
+$('#navbarLeft').data({'columns': 6, 'size': '10em'} );
$('#main').data('columns', 12 );
$('#navbarRight').data('columns', 1 );
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2012-05-28 18:11:33 UTC (rev 846)
+++ CometVisu/trunk/visu/index.html 2012-05-30 18:28:39 UTC (rev 847)
@@ -57,12 +57,12 @@
</div>
<div id="navbarTop" class="loading"></div>
<div id="centerContainer">
+ <div id="navbarLeft" class="loading page"></div>
<div id="main" style="width:900px;position:relative; overflow: hidden;" class="loading">
<div id="pages" class="clearfix" style="width:20000em; position:relative;clear:both;">
<!-- all pages will be inserted here -->
</div>
</div>
- <div id="navbarLeft" class="loading page"></div>
<div id="navbarRight" class="loading page"></div>
</div>
<div id="navbarBottom" class="loading"></div>
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-05-28 18:11:33 UTC (rev 846)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-05-30 18:28:39 UTC (rev 847)
@@ -136,8 +136,8 @@
var uagent = navigator.userAgent.toLowerCase();
var widthNavbarLeft = $( '#navbarLeft' ).width();
var widthNavbarRight = $( '#navbarRight' ).width();
- var width = $( window ).width() - widthNavbarLeft - widthNavbarRight;
-
+ var width = $( 'body' ).width() - widthNavbarLeft - widthNavbarRight;
+
if (/(android|blackberry|iphone|ipod|series60|symbian|windows ce|palm)/i.test(uagent)) {
$( '#main' ).css( 'width', width );
$( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;}</style>' );
@@ -446,7 +446,7 @@
// push new state to history
window.history.pushState(page_id, page_id, window.location.href);
- main_scroll.seekTo( $('.page').index( $('#'+page_id)[0] ), speed ); // scroll to it
+ main_scroll.seekTo( $('#'+page_id), speed ); // scroll to it
var pagedivs=$('div', '#'+page_id);
for( var i = 0; i<pagedivs.length; i++) { //check for inline diagrams & refresh
if( pagedivs[i].className == 'diagram_inline') {
@@ -456,7 +456,7 @@
}
function updateTopNavigation() {
- var path = $('.page').eq( this.getIndex() ).attr('id').split( '_' );
+ var path = $('#main .page').eq( this.getIndex() ).attr('id').split( '_' );
var id = ''; //path[0];
var nav = '';
for( var i = 0; i < path.length; i++ ) {
@@ -580,12 +580,11 @@
*/
function navbarSetSize( position, size )
{
- var cssSize = size + 'px';
+ var cssSize = size + (isFinite( size ) ? 'px' : '');
switch( position )
{
case 'left':
- $( '#centerContainer' ).css( 'padding-left', cssSize );
- $( '#navbarLeft' ).css( { width: cssSize, right: cssSize } );
+ $( '#navbarLeft' ).css( { width: cssSize } );
break;
case 'right':
Modified: CometVisu/trunk/visu/structure/pure/navbar.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/navbar.js 2012-05-28 18:11:33 UTC (rev 846)
+++ CometVisu/trunk/visu/structure/pure/navbar.js 2012-05-30 18:28:39 UTC (rev 847)
@@ -35,12 +35,14 @@
case 'left':
$('#navbarLeft').append( container );
- if( dynamic ) navbarSetSize( 'left', 300 ); // FIXME - only a temporal solution
+ var thisSize = $('#navbarLeft').data('size') || 300; // FIXME - only a temporal solution
+ if( dynamic ) navbarSetSize( 'left', thisSize );
break;
case 'right':
$('#navbarRight').append( container );
- if( dynamic ) navbarSetSize( 'right', 300 ); // FIXME - only a temporal solution
+ var thisSize = $('#navbarRight').data('size') || 300; // FIXME - only a temporal solution
+ if( dynamic ) navbarSetSize( 'right', thisSize );
break;
case 'bottom':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-31 19:30:20
|
Revision: 849
http://openautomation.svn.sourceforge.net/openautomation/?rev=849&view=rev
Author: mayerch
Date: 2012-05-31 19:30:14 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Better handling of page resize (it doesn't spam the header with style-elements any more)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/alaska/basic.css
CometVisu/trunk/visu/designs/alaska_slim/basic.css
CometVisu/trunk/visu/designs/discreet/basic.css
CometVisu/trunk/visu/designs/discreet_sand/basic.css
CometVisu/trunk/visu/designs/discreet_slim/basic.css
CometVisu/trunk/visu/designs/pitchblack/basic.css
CometVisu/trunk/visu/designs/planet/basic.css
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/index.html
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/designs/alaska/basic.css 2012-05-31 19:30:14 UTC (rev 849)
@@ -144,7 +144,6 @@
.page
{
float:left;
- width: 900px;
overflow: auto;
position: relative;
}
Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css 2012-05-31 19:30:14 UTC (rev 849)
@@ -139,7 +139,6 @@
.page
{
float:left;
- width: 900px;
overflow: auto;
position: relative;
}
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2012-05-31 19:30:14 UTC (rev 849)
@@ -183,7 +183,6 @@
.page
{
float:left;
- width: 900px;
overflow: auto;
position: relative;
}
Modified: CometVisu/trunk/visu/designs/discreet_sand/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/basic.css 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/designs/discreet_sand/basic.css 2012-05-31 19:30:14 UTC (rev 849)
@@ -175,7 +175,6 @@
.page
{
float:left;
- width: 900px;
overflow: auto;
position: relative;
}
Modified: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css 2012-05-31 19:30:14 UTC (rev 849)
@@ -188,7 +188,6 @@
.page
{
float:left;
- width: 900px;
overflow: auto;
position: relative;
}
Modified: CometVisu/trunk/visu/designs/pitchblack/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pitchblack/basic.css 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/designs/pitchblack/basic.css 2012-05-31 19:30:14 UTC (rev 849)
@@ -301,7 +301,6 @@
}
.page {
- width: 900px;
overflow: auto;
position: relative;
}
Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/designs/planet/basic.css 2012-05-31 19:30:14 UTC (rev 849)
@@ -163,7 +163,6 @@
.page
{
float:left;
- width: 900px;
overflow: auto;
position: relative;
margin-left: 1em; /* to stay out of the knee */
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2012-05-31 19:30:14 UTC (rev 849)
@@ -163,7 +163,6 @@
.page
{
float:left;
- width: 900px;
overflow: auto;
position: relative;
}
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/index.html 2012-05-31 19:30:14 UTC (rev 849)
@@ -50,6 +50,7 @@
<style type="text/css">
.loading { display: none; }
</style>
+ <style type="text/css" id="pageSize"></style>
</head>
<body>
<div id="top" class="loading">
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-05-31 19:17:23 UTC (rev 848)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-05-31 19:30:14 UTC (rev 849)
@@ -140,7 +140,7 @@
if (/(android|blackberry|iphone|ipod|series60|symbian|windows ce|palm)/i.test(uagent)) {
$( '#main' ).css( 'width', width );
- $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;}</style>' );
+ $( '#pageSize' ).text( '.page{width:' + (width-0) + 'px;}' );
// do nothing
} else {
var height = $( window ).height()
@@ -149,7 +149,7 @@
- $( '#navbarBottom' ).outerHeight(true)
- $( '#bottom' ).outerHeight(true) - 2;
$( '#main' ).css( 'width', width ).css( 'height', height );
- $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;height:' + height + 'px;}</style>' );
+ $( '#pageSize' ).text( '.page{width:' + (width-0) + 'px;height:' + height + 'px;}' );
}
main_scroll != undefined && main_scroll.seekTo( main_scroll.getIndex(), 0 ); // fix scroll
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-06 22:09:17
|
Revision: 864
http://openautomation.svn.sourceforge.net/openautomation/?rev=864&view=rev
Author: mayerch
Date: 2012-06-06 22:09:08 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Make navbar dynamic, i.e. allow additional navbar content in subpages
Modified Paths:
--------------
CometVisu/trunk/visu/designs/designglobals.css
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/structure/pure/navbar.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/designglobals.css
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css 2012-06-06 20:53:44 UTC (rev 863)
+++ CometVisu/trunk/visu/designs/designglobals.css 2012-06-06 22:09:08 UTC (rev 864)
@@ -46,11 +46,11 @@
/*
* Disable all pages except the active ones
*/
-.page {
+.page, .navbar {
display: none;
}
-.pageActive {
+.pageActive, .navbarActive {
display: block;
}
/*
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-06-06 20:53:44 UTC (rev 863)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-06-06 22:09:08 UTC (rev 864)
@@ -441,6 +441,7 @@
function scrollToPage( page_id, speed ) {
$('.activePage').removeClass('activePage');
$('#'+page_id).addClass('pageActive activePage'); // show new page
+ $('#'+page_id+'_navbar').addClass('navbarActive');
// which is the parent of target page_id?
// => set this id as lastpage in url for window.onpopstate handling
@@ -488,6 +489,7 @@
for( var i = new_array.length; i < old_array.length; i++ ) {
path += '_' + old_array[i]; // reuse of path...
$('#'+path).removeClass('pageActive');
+ $('#'+path+'_navbar').removeClass('navbarActive');
}
}
Modified: CometVisu/trunk/visu/structure/pure/navbar.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/navbar.js 2012-06-06 20:53:44 UTC (rev 863)
+++ CometVisu/trunk/visu/structure/pure/navbar.js 2012-06-06 22:09:08 UTC (rev 864)
@@ -19,7 +19,8 @@
create: function( navbar, path, flavour, type ) {
var $n = $(navbar);
var childs = $n.children();
- var container = $( '<div class="clearfix"/>' );
+ var id = path.split('_'); id.pop();
+ var container = $( '<div class="navbar" id="' + id.join('_') + '_navbar" />' );
if( $n.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $n.attr('name') + '</h2>' );
$( childs ).each( function(i){
container.append( create_pages( childs[i], path + '_' + i, flavour ) );
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-06-06 20:53:44 UTC (rev 863)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-06-06 22:09:08 UTC (rev 864)
@@ -495,6 +495,22 @@
<text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
<text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
</page>
+ <page name="Navbar Test" align="center">
+ <text>This subpage adds additional content to the navbar</text>
+ <navbar position="left" dynamic="true" width="200px">
+ <text>Test 2</text>
+ <line/>
+ <pagejump target="0_34_7" name="Lithium">
+ <label>Flavour</label>
+ </pagejump>
+ <pagejump target="0_34_8" name="Potassium">
+ <label>Flavour</label>
+ </pagejump>
+ <pagejump target="0_36">
+ <label>2D</label>
+ </pagejump>
+ </navbar>
+ </page>
<break/>
<page name="2D fixed Bitmap" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.png" align="center">
<switch mapping="On_Off" styling="Red_Green">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-07 20:07:02
|
Revision: 865
http://openautomation.svn.sourceforge.net/openautomation/?rev=865&view=rev
Author: makki1
Date: 2012-06-07 20:06:52 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
XML-Editor - a first shot, very incomplete and WiP; duplicated jQ/UI for now to avoid clashes - see knxuf/cometvisu
Added Paths:
-----------
CometVisu/trunk/visu/edit_xml/
CometVisu/trunk/visu/edit_xml/_lib/
CometVisu/trunk/visu/edit_xml/_lib/jquery-1.7.2.js
CometVisu/trunk/visu/edit_xml/_lib/jquery.cookie.js
CometVisu/trunk/visu/edit_xml/_lib/jquery.hotkeys.js
CometVisu/trunk/visu/edit_xml/_lib/jquery.jstree.js
CometVisu/trunk/visu/edit_xml/_lib/jquery.jstree.uimtreeprocessor.js
CometVisu/trunk/visu/edit_xml/_lib/themes/
CometVisu/trunk/visu/edit_xml/_lib/themes/apple/
CometVisu/trunk/visu/edit_xml/_lib/themes/apple/bg.jpg
CometVisu/trunk/visu/edit_xml/_lib/themes/apple/d.png
CometVisu/trunk/visu/edit_xml/_lib/themes/apple/dot_for_ie.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/apple/style.css
CometVisu/trunk/visu/edit_xml/_lib/themes/apple/throbber.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/classic/
CometVisu/trunk/visu/edit_xml/_lib/themes/classic/d.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/classic/d.png
CometVisu/trunk/visu/edit_xml/_lib/themes/classic/dot_for_ie.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/classic/style.css
CometVisu/trunk/visu/edit_xml/_lib/themes/classic/throbber.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/default/
CometVisu/trunk/visu/edit_xml/_lib/themes/default/d.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/default/d.png
CometVisu/trunk/visu/edit_xml/_lib/themes/default/style.css
CometVisu/trunk/visu/edit_xml/_lib/themes/default/throbber.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/default-rtl/
CometVisu/trunk/visu/edit_xml/_lib/themes/default-rtl/d.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/default-rtl/d.png
CometVisu/trunk/visu/edit_xml/_lib/themes/default-rtl/dots.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/default-rtl/style.css
CometVisu/trunk/visu/edit_xml/_lib/themes/default-rtl/throbber.gif
CometVisu/trunk/visu/edit_xml/_lib/themes/jsTree-Themes.note
CometVisu/trunk/visu/edit_xml/_lib/ui/
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-af.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ar-DZ.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ar.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-az.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-bg.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-bs.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ca.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-cs.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-cy-GB.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-da.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-de.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-el.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-en-AU.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-en-GB.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-en-NZ.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-eo.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-es.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-et.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-eu.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-fa.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-fi.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-fo.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-fr-CH.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-fr.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-gl.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-he.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-hi.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-hr.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-hu.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-hy.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-id.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-is.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-it.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ja.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ka.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-kk.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-km.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ko.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-lb.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-lt.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-lv.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-mk.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ml.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ms.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-nl-BE.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-nl.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-no.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-pl.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-pt-BR.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-pt.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-rm.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ro.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ru.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-sk.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-sl.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-sq.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-sr-SR.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-sr.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-sv.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-ta.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-th.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-tj.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-tr.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-uk.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-vi.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-zh-CN.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-zh-HK.js
CometVisu/trunk/visu/edit_xml/_lib/ui/i18n/jquery.ui.datepicker-zh-TW.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.blind.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.bounce.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.clip.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.core.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.drop.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.explode.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.fade.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.fold.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.highlight.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.pulsate.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.scale.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.shake.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.slide.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.effects.transfer.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.accordion.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.autocomplete.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.button.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.core.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.datepicker.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.dialog.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.draggable.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.droppable.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.mouse.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.position.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.progressbar.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.resizable.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.selectable.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.slider.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.sortable.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.tabs.js
CometVisu/trunk/visu/edit_xml/_lib/ui/jquery.ui.widget.js
CometVisu/trunk/visu/edit_xml/edit_xml.css
CometVisu/trunk/visu/edit_xml/edit_xml.js
CometVisu/trunk/visu/edit_xml/index.html
CometVisu/trunk/visu/edit_xml/themes/
CometVisu/trunk/visu/edit_xml/themes/base/
CometVisu/trunk/visu/edit_xml/themes/base/images/
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-bg_glass_75_dadada_1x400.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-icons_222222_256x240.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-icons_2e83ff_256x240.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-icons_454545_256x240.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-icons_888888_256x240.png
CometVisu/trunk/visu/edit_xml/themes/base/images/ui-icons_cd0a0a_256x240.png
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.accordion.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.all.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.autocomplete.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.base.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.button.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.core.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.datepicker.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.dialog.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.progressbar.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.resizable.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.selectable.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.slider.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.tabs.css
CometVisu/trunk/visu/edit_xml/themes/base/jquery.ui.theme.css
Added: CometVisu/trunk/visu/edit_xml/_lib/jquery-1.7.2.js
===================================================================
--- CometVisu/trunk/visu/edit_xml/_lib/jquery-1.7.2.js (rev 0)
+++ CometVisu/trunk/visu/edit_xml/_lib/jquery-1.7.2.js 2012-06-07 20:06:52 UTC (rev 865)
@@ -0,0 +1,9404 @@
+/*!
+ * jQuery JavaScript Library v1.7.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Mar 21 12:46:34 2012 -0700
+ */
+(function( window, undefined ) {
+
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document,
+ navigator = window.navigator,
+ location = window.location;
+var jQuery = (function() {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+ // The jQuery object is actually just the init constructor 'enhanced'
+ return new jQuery.fn.init( selector, context, rootjQuery );
+ },
+
+ // Map over jQuery in case of overwrite
+ _jQuery = window.jQuery,
+
+ // Map over the $ in case of overwrite
+ _$ = window.$,
+
+ // A central reference to the root jQuery(document)
+ rootjQuery,
+
+ // A simple way to check for HTML strings or ID strings
+ // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+ quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
+
+ // Check if a string has a non-whitespace character in it
+ rnotwhite = /\S/,
+
+ // Used for trimming whitespace
+ trimLeft = /^\s+/,
+ trimRight = /\s+$/,
+
+ // Match a standalone tag
+ rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+ // JSON RegExp
+ rvalidchars = /^[\],:{}\s]*$/,
+ rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+ rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+ rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+ // Useragent RegExp
+ rwebkit = /(webkit)[ \/]([\w.]+)/,
+ ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+ rmsie = /(msie) ([\w.]+)/,
+ rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+ // Matches dashed string for camelizing
+ rdashAlpha = /-([a-z]|[0-9])/ig,
+ rmsPrefix = /^-ms-/,
+
+ // Used by jQuery.camelCase as callback to replace()
+ fcamelCase = function( all, letter ) {
+ return ( letter + "" ).toUpperCase();
+ },
+
+ // Keep a UserAgent string for use with jQuery.browser
+ userAgent = navigator.userAgent,
+
+ // For matching the engine and version of the browser
+ browserMatch,
+
+ // The deferred used on DOM ready
+ readyList,
+
+ // The ready event handler
+ DOMContentLoaded,
+
+ // Save a reference to some core methods
+ toString = Object.prototype.toString,
+ hasOwn = Object.prototype.hasOwnProperty,
+ push = Array.prototype.push,
+ slice = Array.prototype.slice,
+ trim = String.prototype.trim,
+ indexOf = Array.prototype.indexOf,
+
+ // [[Class]] -> type pairs
+ class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+ constructor: jQuery,
+ init: function( selector, context, rootjQuery ) {
+ var match, elem, ret, doc;
+
+ // Handle $(""), $(null), or $(undefined)
+ if ( !selector ) {
+ return this;
+ }
+
+ // Handle $(DOMElement)
+ if ( selector.nodeType ) {
+ this.context = this[0] = selector;
+ this.length = 1;
+ return this;
+ }
+
+ // The body element only exists once, optimize finding it
+ if ( selector === "body" && !context && document.body ) {
+ this.context = document;
+ this[0] = document.body;
+ this.selector = selector;
+ this.length = 1;
+ return this;
+ }
+
+ // Handle HTML strings
+ if ( typeof selector === "string" ) {
+ // Are we dealing with HTML string or an ID?
+ if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+ // Assume that strings that start and end with <> are HTML and skip the regex check
+ match = [ null, selector, null ];
+
+ } else {
+ match = quickExpr.exec( selector );
+ }
+
+ // Verify a match, and that no context was specified for #id
+ if ( match && (match[1] || !context) ) {
+
+ // HANDLE: $(html) -> $(array)
+ if ( match[1] ) {
+ context = context instanceof jQuery ? context[0] : context;
+ doc = ( context ? context.ownerDocument || context : document );
+
+ // If a single string is passed in and it's a single tag
+ // just do a createElement and skip the rest
+ ret = rsingleTag.exec( selector );
+
+ if ( ret ) {
+ if ( jQuery.isPlainObject( context ) ) {
+ selector = [ document.createElement( ret[1] ) ];
+ jQuery.fn.attr.call( selector, context, true );
+
+ } else {
+ selector = [ doc.createElement( ret[1] ) ];
+ }
+
+ } else {
+ ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+ selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
+ }
+
+ return jQuery.merge( this, selector );
+
+ // HANDLE: $("#id")
+ } else {
+ elem = document.getElementById( match[2] );
+
+ // Check parentNode to catch when Blackberry 4.6 returns
+ // nodes that are no longer in the document #6963
+ if ( elem && elem.parentNode ) {
+ // Handle the case where IE and Opera return items
+ // by name instead of ID
+ if ( elem.id !== match[2] ) {
+ return rootjQuery.find( selector );
+ }
+
+ // Otherwise, we inject the element directly into the jQuery object
+ this.length = 1;
+ this[0] = elem;
+ }
+
+ this.context = document;
+ this.selector = selector;
+ return this;
+ }
+
+ // HANDLE: $(expr, $(...))
+ } else if ( !context || context.jquery ) {
+ return ( context || rootjQuery ).find( selector );
+
+ // HANDLE: $(expr, context)
+ // (which is just equivalent to: $(context).find(expr)
+ } else {
+ return this.constructor( context ).find( selector );
+ }
+
+ // HANDLE: $(function)
+ // Shortcut for document ready
+ } else if ( jQuery.isFunction( selector ) ) {
+ return rootjQuery.ready( selector );
+ }
+
+ if ( selector.selector !== undefined ) {
+ this.selector = selector.selector;
+ this.context = selector.context;
+ }
+
+ return jQuery.makeArray( selector, this );
+ },
+
+ // Start with an empty selector
+ selector: "",
+
+ // The current version of jQuery being used
+ jquery: "1.7.2",
+
+ // The default length of a jQuery object is 0
+ length: 0,
+
+ // The number of elements contained in the matched element set
+ size: function() {
+ return this.length;
+ },
+
+ toArray: function() {
+ return slice.call( this, 0 );
+ },
+
+ // Get the Nth element in the matched element set OR
+ // Get the whole matched element set as a clean array
+ get: function( num ) {
+ return num == null ?
+
+ // Return a 'clean' array
+ this.toArray() :
+
+ // Return just the object
+ ( num < 0 ? this[ this.length + num ] : this[ num ] );
+ },
+
+ // Take an array of elements and push it onto the stack
+ // (returning the new matched element set)
+ pushStack: function( elems, name, selector ) {
+ // Build a new jQuery matched element set
+ var ret = this.constructor();
+
+ if ( jQuery.isArray( elems ) ) {
+ push.apply( ret, elems );
+
+ } else {
+ jQuery.merge( ret, elems );
+ }
+
+ // Add the old object onto the stack (as a reference)
+ ret.prevObject = this;
+
+ ret.context = this.context;
+
+ if ( name === "find" ) {
+ ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
+ } else if ( name ) {
+ ret.selector = this.selector + "." + name + "(" + selector + ")";
+ }
+
+ // Return the newly-formed element set
+ return ret;
+ },
+
+ // Execute a callback for every element in the matched set.
+ // (You can seed the arguments with an array of args, but this is
+ // only used internally.)
+ each: function( callback, args ) {
+ return jQuery.each( this, callback, args );
+ },
+
+ ready: function( fn ) {
+ // Attach the listeners
+ jQuery.bindReady();
+
+ // Add the callback
+ readyList.add( fn );
+
+ return this;
+ },
+
+ eq: function( i ) {
+ i = +i;
+ return i === -1 ?
+ this.slice( i ) :
+ this.slice( i, i + 1 );
+ },
+
+ first: function() {
+ return this.eq( 0 );
+ },
+
+ last: function() {
+ return this.eq( -1 );
+ },
+
+ slice: function() {
+ return this.pushStack( slice.apply( this, arguments ),
+ "slice", slice.call(arguments).join(",") );
+ },
+
+ map: function( callback ) {
+ return this.pushStack( jQuery.map(this, function( elem, i ) {
+ return callback.call( elem, i, elem );
+ }));
+ },
+
+ end: function() {
+ return this.prevObject || this.constructor(null);
+ },
+
+ // For internal use only.
+ // Behaves like an Array's method, not like a jQuery method.
+ push: push,
+ sort: [].sort,
+ splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+ var options, name, src, copy, copyIsArray, clone,
+ target = arguments[0] || {},
+ i = 1,
+ length = arguments.length,
+ deep = false;
+
+ // Handle a deep copy situation
+ if ( typeof target === "boolean" ) {
+ deep = target;
+ target = arguments[1] || {};
+ // skip the boolean and the target
+ i = 2;
+ }
+
+ // Handle case when target is a string or something (possible in deep copy)
+ if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+ target = {};
+ }
+
+ // extend jQuery itself if only one argument is passed
+ if ( length === i ) {
+ target = this;
+ --i;
+ }
+
+ for ( ; i < length; i++ ) {
+ // Only deal with non-null/undefined values
+ if ( (options = arguments[ i ]) != null ) {
+ // Extend the base object
+ for ( name in options ) {
+ src = target[ name ];
+ copy = options[ name ];
+
+ // Prevent never-ending loop
+ if ( target === copy ) {
+ continue;
+ }
+
+ // Recurse if we're merging plain objects or arrays
+ if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+ if ( copyIsArray ) {
+ copyIsArray = false;
+ clone = src && jQuery.isArray(src) ? src : [];
+
+ } else {
+ clone = src && jQuery.isPlainObject(src) ? src : {};
+ }
+
+ // Never move original objects, clone them
+ target[ name ] = jQuery.extend( deep, clone, copy );
+
+ // Don't bring in undefined values
+ } else if ( copy !== undefined ) {
+ target[ name ] = copy;
+ }
+ }
+ }
+ }
+
+ // Return the modified object
+ return target;
+};
+
+jQuery.extend({
+ noConflict: function( deep ) {
+ if ( window.$ === jQuery ) {
+ window.$ = _$;
+ }
+
+ if ( deep && window.jQuery === jQuery ) {
+ window.jQuery = _jQuery;
+ }
+
+ return jQuery;
+ },
+
+ // Is the DOM ready to be used? Set to true once it occurs.
+ isReady: false,
+
+ // A counter to track how many items to wait for before
+ // the ready event fires. See #6781
+ readyWait: 1,
+
+ // Hold (or release) the ready event
+ holdReady: function( hold ) {
+ if ( hold ) {
+ jQuery.readyWait++;
+ } else {
+ jQuery.ready( true );
+ }
+ },
+
+ // Handle when the DOM is ready
+ ready: function( wait ) {
+ // Either a released hold or an DOMready/load event and not yet ready
+ if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
+ // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+ if ( !document.body ) {
+ return setTimeout( jQuery.ready, 1 );
+ }
+
+ // Remember that the DOM is ready
+ jQuery.isReady = true;
+
+ // If a normal DOM Ready event fired, decrement, and wait if need be
+ if ( wait !== true && --jQuery.readyWait > 0 ) {
+ return;
+ }
+
+ // If there are functions bound, to execute
+ readyList.fireWith( document, [ jQuery ] );
+
+ // Trigger any bound ready events
+ if ( jQuery.fn.trigger ) {
+ jQuery( document ).trigger( "ready" ).off( "ready" );
+ }
+ }
+ },
+
+ bindReady: function() {
+ if ( readyList ) {
+ return;
+ }
+
+ readyList = jQuery.Callbacks( "once memory" );
+
+ // Catch cases where $(document).ready() is called after the
+ // browser event has already occurred.
+ if ( document.readyState === "complete" ) {
+ // Handle it asynchronously to allow scripts the opportunity to delay ready
+ return setTimeout( jQuery.ready, 1 );
+ }
+
+ // Mozilla, Opera and webkit nightlies currently support this event
+ if ( document.addEventListener ) {
+ // Use the handy event callback
+ document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+
+ // A fallback to window.onload, that will always work
+ window.addEventListener( "load", jQuery.ready, false );
+
+ // If IE event model is used
+ } else if ( document.attachEvent ) {
+ // ensure firing before onload,
+ // maybe late but safe also for iframes
+ document.attachEvent( "onreadystatechange", DOMContentLoaded );
+
+ // A fallback to window.onload, that will always work
+ window.attachEvent( "onload", jQuery.ready );
+
+ // If IE and not a frame
+ // continually check to see if the document is ready
+ var toplevel = false;
+
+ try {
+ toplevel = window.frameElement == null;
+ } catch(e) {}
+
+ if ( document.documentElement.doScroll && toplevel ) {
+ doScrollCheck();
+ }
+ }
+ },
+
+ // See test/unit/core.js for details concerning isFunction.
+ // Since version 1.3, DOM methods and functions like alert
+ // aren't supported. They return false on IE (#2968).
+ isFunction: function( obj ) {
+ return jQuery.type(obj) === "function";
+ },
+
+ isArray: Array.isArray || function( obj ) {
+ return jQuery.type(obj) === "array";
+ },
+
+ isWindow: function( obj ) {
+ return obj != null && obj == obj.window;
+ },
+
+ isNumeric: function( obj ) {
+ return !isNaN( parseFloat(obj) ) && isFinite( obj );
+ },
+
+ type: function( obj ) {
+ return obj == null ?
+ String( obj ) :
+ class2type[ toString.call(obj) ] || "object";
+ },
+
+ isPlainObject: function( obj ) {
+ // Must be an Object.
+ // Because of IE, we also have to check the presence of the constructor property.
+ // Make sure that DOM nodes and window objects don't pass through, as well
+ if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+ return false;
+ }
+
+ try {
+ // Not own constructor property must be Object
+ if ( obj.constructor &&
+ !hasOwn.call(obj, "constructor") &&
+ !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+ return false;
+ }
+ } catch ( e ) {
+ // IE8,9 Will throw exceptions on certain host objects #9897
+ return false;
+ }
+
+ // Own properties are enumerated firstly, so to speed up,
+ // if last one is own, then all properties are own.
+
+ var key;
+ for ( key in obj ) {}
+
+ return key === undefined || hasOwn.call( obj, key );
+ },
+
+ isEmptyObject: function( obj ) {
+ for ( var name in obj ) {
+ return false;
+ }
+ return true;
+ },
+
+ error: function( msg ) {
+ throw new Error( msg );
+ },
+
+ parseJSON: function( data ) {
+ if ( typeof data !== "string" || !data ) {
+ return null;
+ }
+
+ // Make sure leading/trailing whitespace is removed (IE can't handle it)
+ data = jQuery.trim( data );
+
+ // Attempt to parse using the native JSON parser first
+ if ( window.JSON && window.JSON.parse ) {
+ return window.JSON.parse( data );
+ }
+
+ // Make sure the incoming data is actual JSON
+ // Logic borrowed from http://json.org/json2.js
+ if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+ .replace( rvalidtokens, "]" )
+ .replace( rvalidbraces, "")) ) {
+
+ return ( new Function( "return " + data ) )();
+
+ }
+ jQuery.error( "Invalid JSON: " + data );
+ },
+
+ // Cross-browser xml parsing
+ parseXML: function( data ) {
+ if ( typeof data !== "string" || !data ) {
+ return null;
+ }
+ var xml, tmp;
+ try {
+ if ( window.DOMParser ) { // Standard
+ tmp = new DOMParser();
+ xml = tmp.parseFromString( data , "text/xml" );
+ } else { // IE
+ xml = new ActiveXObject( "Microsoft.XMLDOM" );
+ xml.async = "false";
+ xml.loadXML( data );
+ }
+ } catch( e ) {
+ xml = undefined;
+ }
+ if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+ jQuery.error( "Invalid XML: " + data );
+ }
+ return xml;
+ },
+
+ noop: function() {},
+
+ // Evaluates a script in a global context
+ // Workarounds based on findings by Jim Driscoll
+ // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+ globalEval: function( data ) {
+ if ( data && rnotwhite.test( data ) ) {
+ // We use execScript on Internet Explorer
+ // We use an anonymous function so that context is window
+ // rather than jQuery in Firefox
+ ( window.execScript || function( data ) {
+ window[ "eval" ].call( window, data );
+ } )( data );
+ }
+ },
+
+ // Convert dashed to camelCase; used by the css and data modules
+ // Microsoft forgot to hump their vendor prefix (#9572)
+ camelCase: function( string ) {
+ return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+ },
+
+ nodeName: function( elem, name ) {
+ return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+ },
+
+ // args is for internal usage only
+ each: function( object, callback, args ) {
+ var name, i = 0,
+ length = object.length,
+ isObj = length === undefined || jQuery.isFunction( object );
+
+ if ( args ) {
+ if ( isObj ) {
+ for ( name in object ) {
+ if ( callback.apply( object[ name ], args ) === false ) {
+ break;
+ }
+ }
+ } else {
+ for ( ; i < length; ) {
+ if ( callback.apply( object[ i++ ], args ) === false ) {
+ break;
+ }
+ }
+ }
+
+ // A special, fast, case for the most common use of each
+ } else {
+ if ( isObj ) {
+ for ( name in object ) {
+ if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+ break;
+ }
+ }
+ } else {
+ for ( ; i < length; ) {
+ if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
+ break;
+ }
+ }
+ }
+ }
+
+ return object;
+ },
+
+ // Use native String.trim function wherever possible
+ trim: trim ?
+ function( text ) {
+ return text == null ?
+ "" :
+ trim.call( text );
+ } :
+
+ // Otherwise use our own trimming functionality
+ function( text ) {
+ return text == null ?
+ "" :
+ text.toString().replace( trimLeft, "" ).replace( ...
[truncated message content] |
|
From: <ma...@us...> - 2012-06-09 17:26:41
|
Revision: 870
http://openautomation.svn.sourceforge.net/openautomation/?rev=870&view=rev
Author: mayerch
Date: 2012-06-09 17:26:35 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
planet design:
little tweak for sliders
added brackets to video, diagram and popup
Modified Paths:
--------------
CometVisu/trunk/visu/designs/planet/basic.css
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css 2012-06-08 22:03:49 UTC (rev 869)
+++ CometVisu/trunk/visu/designs/planet/basic.css 2012-06-09 17:26:35 UTC (rev 870)
@@ -271,8 +271,8 @@
}
.widget.slide {
- margin-left: 2.1em;
- margin-right: 4em;
+ margin-left: 2.2em;
+ margin-right: 4.1em;
}
.slide:before {
@@ -400,11 +400,11 @@
height: 0.2em;
}
-.widget.image {
+.popup, .widget.image, .widget.video, .widget.diagram {
margin-left: 0.7em;
margin-right: 0.7em;
}
-.widget.image:before {
+.popup:before, .widget.image:before, .widget.video:before, .widget.diagram:before {
content: "";
display: block;
border: 0.3em solid #0f0;
@@ -421,19 +421,21 @@
}
-.widget.image > .label {
+.popup > .head, .widget.image > .label, .widget.video > .label, .widget.diagram > .label {
position: static;
display: inline-block;
color: #999;
}
-.widget.image > .actor {
+
+.popup > .main, .widget.image > .actor, .widget.video > .actor, .widget.diagram > .actor {
margin-top: 0.6em;
margin-bottom: 0.6em;
background: none;
display: inline-block;
float: none;
}
-.widget.image:after {
+
+.popup:after, .widget.image:after, .widget.video:after, .widget.diagram:after {
content: "";
visibility: visible;
display: inline-block;
@@ -445,7 +447,60 @@
min-width: 0.6em;
margin-left: 0.1em;
position: absolute;
+ top: 0;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
-}
\ No newline at end of file
+}
+
+.diagram_inline {
+ width: 320px;
+ height: 180px;
+}
+
+.diagram_preview {
+ width: 240px;
+ height: 2em;
+}
+
+#diagramTooltip {
+ z-index: 1000;
+ color: black;
+ border: 1px solid #fdd;
+ padding: 2px;
+ background-color: #fee;
+ opacity: 0.80;
+}
+
+.popup,
+.popup_background {
+ position: absolute;
+ width: 90%;
+ height: 90%;
+ top: 5%;
+ left: 5%;
+}
+
+.popup {
+ z-index: 101;
+ background: transparent;
+}
+
+
+.popup_background {
+ z-index: 100;
+ -moz-border-radius: 0.6em; -webkit-border-radius: 0.6em; border-radius: 0.6em;
+ background: #000;
+ border: none;
+ opacity: 0.9;
+}
+
+.popup div.head {
+ border-bottom: 1px solid;
+}
+
+.popup_background.error {
+ background: #800000;
+ border: #f00;
+}
+
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2012-06-08 22:03:49 UTC (rev 869)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2012-06-09 17:26:35 UTC (rev 870)
@@ -296,7 +296,7 @@
var id = "diagram_" + uniqid();
- var ret_val = $('<div class="widget clearfix diagram" />');
+ var ret_val = $('<div class="widget clearfix diagram_info" />');
ret_val.setWidgetLayout($p).makeWidgetLabel($p);
var actor = '<div class="actor switchUnpressed ';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-10 12:21:42
|
Revision: 872
http://openautomation.svn.sourceforge.net/openautomation/?rev=872&view=rev
Author: mayerch
Date: 2012-06-10 12:21:36 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
general: fix calculation of page height
multitrigger: give sub-<div> its own class to make it more easily addressable
planet design:
* switch from "em" unit to the globally consistent "rem"
* show footer again and style it
* style multitrigger
Modified Paths:
--------------
CometVisu/trunk/visu/designs/planet/basic.css
CometVisu/trunk/visu/designs/planet/design_setup.js
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/structure/pure/multitrigger.js
Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css 2012-06-09 21:48:30 UTC (rev 871)
+++ CometVisu/trunk/visu/designs/planet/basic.css 2012-06-10 12:21:36 UTC (rev 872)
@@ -1,6 +1,6 @@
/*
* Global definitions used:
- * navbarWidth: 10em
+ * navbarWidth: 10rem
*/
/* define basic setup */
@@ -12,6 +12,10 @@
}
*/
+html {
+ font-size: 5.5mm;
+}
+
body {
background: #121212;
font-family:'Arial Narrow','Nimbus Sans L',Helvetica,sans-serif;
@@ -19,9 +23,8 @@
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;
+ margin: 0.1rem 0 0.1rem 0.1rem;
-moz-user-select: none;
-khtml-user-select: none;
-webkit-user-select: none;
@@ -82,12 +85,12 @@
/* combine two :before boxes to have the correct roundings - 100% on the outside and 50% on the inside */
#top:before {
- width: 2em;
- height: 2em;
+ width: 2rem;
+ height: 2rem;
border: solid #9999cc;
- border-top-width: 1.5em;
- border-left-width: 10em;
- border-top-left-radius: 4em 4em;
+ border-top-width: 1.5rem;
+ border-left-width: 10rem;
+ border-top-left-radius: 4rem 4rem;
border-right-width: 0px;
border-bottom-width: 0px;
content: "";
@@ -96,38 +99,39 @@
}
.nav_path:before {
- width: 2em;
- height: 2em;
+ width: 2rem;
+ height: 2rem;
border: solid #9999cc;
- border-top-width: 1.5em;
- border-left-width: 10em;
- border-top-left-radius: 12em 3.5em;
+ border-top-width: 1.5rem;
+ border-left-width: 10rem;
+ border-top-left-radius: 12rem 3.5rem;
border-right-width: 0px;
border-bottom-width: 0px;
content: "";
display: block;
position: absolute;
- margin-left: -12.1em;
+ margin-left: -12.1rem;
}
.nav_path {
background: #9999cc;
- margin-left: 12.1em;
- margin-bottom: 2.1em;
+ margin-left: 12.1rem;
+ margin-right: 0.1rem;
+ margin-bottom: 2.1rem;
border: 0px;
- border-top-right-radius: 1em;
- border-bottom-right-radius: 1em;
+ border-top-right-radius: 1rem;
+ border-bottom-right-radius: 1rem;
}
.nav_path a {
color: #000;
background-color: #ff9900;
- border-width: 0px 0.1em 0px 0px;
+ border-width: 0px 0.1rem 0px 0px;
border-style: solid;
border-color: #000;
- padding: 0 0.25em 0 0.25em;
- /*line-height: 1.5em;*/
- height: 1.5em;
+ padding: 0 0.25rem 0 0.25rem;
+ /*line-height: 1.5rem;*/
+ height: 1.5rem;
display: inline-block;
}
@@ -137,7 +141,7 @@
}
#navbarLeft {
- width: 12em; /* left bar width */
+ width: 12rem; /* left bar width */
overflow-y: hidden;
margin-left: 0; /* overwrite the margin-left of .page */
}
@@ -147,17 +151,17 @@
display: block;
height: 100%;
background-color: #cc6699;
- width: 10em; /* size of the knee */
- margin-top: 0.1em;
+ width: 10rem; /* size of the knee */
+ margin-top: 0.1rem;
}
#navbarLeft .widget, #navbarLeft hr {
margin-left: 0;
- margin-right: 2em;
+ margin-right: 2rem;
}
#navbarLeft .switch, #navbarLeft .trigger, #navbarLeft .multitrigger {
- margin-right: 1em;
+ margin-right: 1rem;
}
#centerContainer {
@@ -171,6 +175,18 @@
overflow: hidden;
}
+#bottom > hr {
+ display: none;
+}
+
+#bottom > .footer {
+ background-color: #ff0;
+ height: 1.5rem;
+ margin: 0.1rem 0.1rem 0.1rem 0;
+ border-top-right-radius: 1rem;
+ border-bottom-right-radius: 1rem;
+}
+
/******************************************************************/
h1, h2 {
color: #999;
@@ -179,7 +195,7 @@
h1 {
position: fixed;
top: 0;
- right: 0.5em;
+ right: 0.5rem;
display: none;
}
@@ -192,7 +208,7 @@
float:left;
overflow: auto;
position: relative;
- /*margin-left: 1em;*/ /* to stay out of the knee */
+ /*margin-left: 1rem;*/ /* to stay out of the knee */
}
.colspan0 {
@@ -201,7 +217,7 @@
.widget {
/* border: 1px solid blue; */
- line-height: 1em;
+ line-height: 1rem;
}
.widget_container, .text > div, .widget .actor,
.widget .actor div, .page {
@@ -217,45 +233,138 @@
float: none;
width: auto;
position: absolute;
- font-size: 0.75em;
- margin-left: 1em;
+ font-size: 0.75rem;
+ margin-left: 1rem;
pointer-events: none;
}
.widget .actor, .widget.pagelink > div > a, .widget.text > div {
text-align: center;
- min-height: 2em;
+ min-height: 2rem;
background: #ffcc99;
- /* margin: 0.1em; */
+ /* margin: 0.1rem; */
}
.widget.pagelink > div > a {
display: block;
}
.switch > .actor {
- border-top-right-radius: 1em;
- border-bottom-right-radius: 1em;
+ border-top-right-radius: 1rem;
+ border-bottom-right-radius: 1rem;
}
-.trigger > .actor, .multitrigger .actor {
- border-top-left-radius: 1em;
- border-top-right-radius: 1em;
- border-bottom-right-radius: 1em;
- border-bottom-left-radius: 1em;
+.trigger > .actor {
+ border-top-left-radius: 1rem;
+ border-top-right-radius: 1rem;
+ border-bottom-right-radius: 1rem;
+ border-bottom-left-radius: 1rem;
}
.infotrigger .label {
/* text-align: center; */
}
-.infotrigger > div, .multitrigger > div {
+.infotrigger > div {
width: 100%;
}
+.multitrigger:before {
+ content: "";
+ height: 2rem;
+ display: block;
+ border: 1rem solid #fc9;
+ border-bottom-style: none;
+ border-right-style: none;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ border-top-left-radius: 11rem 2rem;
+ border-left-width: 10rem;
+}
+
+.multitrigger > .label {
+ background: #fc9;
+ width: 10rem;
+ display: inline-block;
+ margin-top: -2rem;
+ margin-left: 0rem;
+ height: 100%;
+ left: 0.1rem;
+ padding-top: 2rem;
+ padding-left: 1rem;
+ border-top-left-radius: 2rem;
+ border-bottom-left-radius: 2rem;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.multitrigger > .actor_container {
+ width: 100%;
+ display: inline-block;
+ padding-left: 10.1rem;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ margin-top: -0.95rem;
+ margin-bottom: -0.95rem;
+}
+
+.multitrigger .actor {
+ width: 50%;
+}
+
+.multitrigger .actor:nth-of-type(1) {
+ border-top-left-radius: 0.9rem;
+ border-width: 0.1rem;
+ border-bottom-style: solid;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.multitrigger .actor:nth-of-type(2) {
+ border-top-right-radius: 1rem;
+ border-width: 0.1rem;
+ border-bottom-style: solid;
+ border-left-style: solid;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.multitrigger .actor:nth-of-type(3) {
+ border-bottom-left-radius: 0.9rem;
+ border-width: 0.1rem;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.multitrigger .actor:nth-of-type(4) {
+ border-bottom-right-radius: 1rem;
+ border-width: 0.1rem;
+ border-left-style: solid;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.multitrigger:after {
+ content: "";
+ visibility: visible;
+ height: 2rem;
+ border: 1rem solid #fc9;
+ border-top-style: none;
+ border-right-style: none;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ border-bottom-left-radius: 11rem 2rem;
+ border-left-width: 10rem;
+}
+
.infotrigger .actor {
width: 33.33333333333%;
border-right-style: solid;
- border-right-width: 0.1em;
+ border-right-width: 0.1rem;
border-right-color: #121212;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -263,14 +372,14 @@
}
.infotrigger .uplabel {
- border-top-right-radius: 1em;
- border-bottom-right-radius: 1em;
+ border-top-right-radius: 1rem;
+ border-bottom-right-radius: 1rem;
border-right-style: none;
}
.infotrigger .downlabel {
- border-top-left-radius: 1em;
- border-bottom-left-radius: 1em;
+ border-top-left-radius: 1rem;
+ border-bottom-left-radius: 1rem;
}
.text {
@@ -278,8 +387,8 @@
}
.widget.slide {
- margin-left: 2.2em;
- margin-right: 4.1em;
+ margin-left: 2.2rem;
+ margin-right: 4.1rem;
}
.slide:before {
@@ -287,26 +396,26 @@
display: block;
background-color: #fc9;
border-right-style: solid;
- border-right-width: 0.1em;
- border-top-left-radius: 1em;
- border-bottom-left-radius: 1em;
- height: 2em;
- min-width: 2em;
- margin-left: -2.1em;
+ border-right-width: 0.1rem;
+ border-top-left-radius: 1rem;
+ border-bottom-left-radius: 1rem;
+ height: 2rem;
+ min-width: 2rem;
+ margin-left: -2.1rem;
position: absolute;
}
.slide:after {
content: "";
display: block;
- border-top-right-radius: 1em;
- border-bottom-right-radius: 1em;
+ border-top-right-radius: 1rem;
+ border-bottom-right-radius: 1rem;
background-color: #fc9;
- height: 2em;
- min-width: 2.0em;
+ height: 2rem;
+ min-width: 2.0rem;
visibility: visible;
display: inline-block;
- margin-left: 2.1em;
+ margin-left: 2.1rem;
position: absolute;
}
@@ -324,18 +433,18 @@
}
.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 2em; height: 2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 2rem; height: 2rem; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7rem; display: block; border: 0; background-position: 0 0; }
-.ui-slider-horizontal { height: 1em; /*border-radius: 0.5em;*/ }
-.ui-slider-horizontal .ui-slider-handle { /*top: -0.5em; margin-left: -0.5em;*/ }
+.ui-slider-horizontal { height: 1rem; /*border-radius: 0.5rem;*/ }
+.ui-slider-horizontal .ui-slider-handle { /*top: -0.5rem; margin-left: -0.5rem;*/ }
.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
.ui-slider-horizontal .ui-slider-range-min { left: 0; }
.ui-slider-horizontal .ui-slider-range-max { right: 0; }
.ui-widget-content { /*border: 1px solid #dddddd;*/ background: #000 ; color: #000; }
.ui-widget-content a { color: #333333; }
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { /*border: 1px solid #cccccc;*/ background: #fc9 ; /*border-radius:1em;*/ }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { /*border: 1px solid #cccccc;*/ background: #fc9 ; /*border-radius:1rem;*/ }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
/*.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }*/
@@ -346,31 +455,31 @@
}
.widget_container {
- margin-top: 0.1em;
+ margin-top: 0.1rem;
position: relative;
}
.widget, .widget.group {
- margin-left: 0.1em;
- min-height: 2em;
+ margin-left: 0.1rem;
+ min-height: 2rem;
}
.widget.group {
- margin-left: 0.8em;
- margin-right: 0.7em;
+ margin-left: 0.8rem;
+ margin-right: 0.7rem;
}
.widget.group:before {
content: "";
content: "";
display: block;
- border: 0.3em solid #0f0;
- border-top-left-radius: 0.5em;
- border-bottom-left-radius: 0.5em;
+ border: 0.3rem solid #0f0;
+ border-top-left-radius: 0.5rem;
+ border-bottom-left-radius: 0.5rem;
border-right-width: 0;
height: 100%;
- min-width: 0.6em;
- margin-left: -0.7em;
+ min-width: 0.6rem;
+ margin-left: -0.7rem;
position: absolute;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -380,21 +489,21 @@
.widget.group > .clearfix {
display: inline-block;
width: 100%;
- margin-top: 0.6em;
- margin-bottom: 0.6em;
+ margin-top: 0.6rem;
+ margin-bottom: 0.6rem;
}
.widget.group:after {
content: "";
visibility: visible;
display: inline-block;
- border: 0.3em solid #0f0;
- border-top-right-radius: 0.5em;
- border-bottom-right-radius: 0.5em;
+ border: 0.3rem solid #0f0;
+ border-top-right-radius: 0.5rem;
+ border-bottom-right-radius: 0.5rem;
border-left-width: 0;
height: 100%;
- min-width: 0.6em;
- margin-left: 0.1em;
+ min-width: 0.6rem;
+ margin-left: 0.1rem;
position: absolute;
top: 0;
-moz-box-sizing: border-box;
@@ -404,33 +513,33 @@
.group h2 {
margin: 0;
- font-size: 1.5em;
- line-height: 1.5em;
+ font-size: 1.5rem;
+ line-height: 1.5rem;
}
body hr, body br, #pages hr {
- margin: .1em .0em 0.0em .1em;
+ margin: .1rem .0rem 0.0rem .1rem;
clear: both;
border: none;
background: #9cf;
- height: 0.2em;
+ height: 0.2rem;
}
.popup, .widget.image, .widget.video, .widget.diagram {
- margin-left: 0.7em;
- margin-right: 0.7em;
+ margin-left: 0.7rem;
+ margin-right: 0.7rem;
}
.popup:before, .widget.image:before, .widget.video:before, .widget.diagram:before {
content: "";
display: block;
- border: 0.3em solid #0f0;
- border-top-left-radius: 0.5em;
- border-bottom-left-radius: 0.5em;
+ border: 0.3rem solid #0f0;
+ border-top-left-radius: 0.5rem;
+ border-bottom-left-radius: 0.5rem;
border-right-width: 0;
height: 100%;
- min-width: 0.6em;
- margin-left: -0.7em;
+ min-width: 0.6rem;
+ margin-left: -0.7rem;
position: absolute;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -444,8 +553,8 @@
}
.popup > .main, .widget.image > .actor, .widget.video > .actor, .widget.diagram > .actor {
- margin-top: 0.6em;
- margin-bottom: 0.6em;
+ margin-top: 0.6rem;
+ margin-bottom: 0.6rem;
background: none;
display: inline-block;
float: none;
@@ -455,13 +564,13 @@
content: "";
visibility: visible;
display: inline-block;
- border: 0.3em solid #0f0;
- border-top-right-radius: 0.5em;
- border-bottom-right-radius: 0.5em;
+ border: 0.3rem solid #0f0;
+ border-top-right-radius: 0.5rem;
+ border-bottom-right-radius: 0.5rem;
border-left-width: 0;
height: 100%;
- min-width: 0.6em;
- margin-left: 0.1em;
+ min-width: 0.6rem;
+ margin-left: 0.1rem;
position: absolute;
top: 0;
-moz-box-sizing: border-box;
@@ -475,8 +584,8 @@
}
.diagram_preview {
- width: 10em;
- height: 2em;
+ width: 10rem;
+ height: 2rem;
}
#diagramTooltip {
@@ -505,7 +614,7 @@
.popup_background {
z-index: 100;
- -moz-border-radius: 0.6em; -webkit-border-radius: 0.6em; border-radius: 0.6em;
+ -moz-border-radius: 0.6rem; -webkit-border-radius: 0.6rem; border-radius: 0.6rem;
background: #000;
border: none;
opacity: 0.9;
Modified: CometVisu/trunk/visu/designs/planet/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/planet/design_setup.js 2012-06-09 21:48:30 UTC (rev 871)
+++ CometVisu/trunk/visu/designs/planet/design_setup.js 2012-06-10 12:21:36 UTC (rev 872)
@@ -22,7 +22,7 @@
//////////////////////////////////////////////////////////////////////////////
//$('head').data('colspanDefault', 1 ); // 6 is already the default
-$('#navbarLeft').data({'columns': 6, 'size': '12em'} );
+$('#navbarLeft').data({'columns': 6, 'size': '12rem'} );
$('#main').data('columns', 12 );
$('#navbarRight').data('columns', 1 );
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-06-09 21:48:30 UTC (rev 871)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-06-10 12:21:36 UTC (rev 872)
@@ -157,8 +157,7 @@
// do nothing
} else {
var height = $( window ).height()
- - $( '#top' ).outerHeight(true)
- - $( '#navbarTop' ).outerHeight(true)
+ - $( '#main' ).position().top
- $( '#navbarBottom' ).outerHeight(true)
- $( '#bottom' ).outerHeight(true) - 2;
$( '#main' ).css( 'width', width ).css( 'height', height );
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-06-09 21:48:30 UTC (rev 871)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-06-10 12:21:36 UTC (rev 872)
@@ -25,7 +25,7 @@
ret_val.append( extractLabel( $e.find('label')[0] ) );
var address = makeAddressList($e);
var showstatus = $e.attr("showstatus") || "false";
- var buttons = $('<div style="float:left"/>');
+ var buttons = $('<div class="actor_container" style="float:left"/>');
var buttonCount = 0;
if( $e.attr('button1label') )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-10 14:35:47
|
Revision: 874
http://openautomation.svn.sourceforge.net/openautomation/?rev=874&view=rev
Author: mayerch
Date: 2012-06-10 14:35:41 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
XSD: groups: make name optional, add nowidget attribute
demo config: use <group nowidget="true"> to show what's possible with rowspans
planet design: fix display with nowidget-groups
Modified Paths:
--------------
CometVisu/trunk/visu/designs/planet/basic.css
CometVisu/trunk/visu/visu_config.xsd
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css 2012-06-10 14:05:15 UTC (rev 873)
+++ CometVisu/trunk/visu/designs/planet/basic.css 2012-06-10 14:35:41 UTC (rev 874)
@@ -272,6 +272,10 @@
width: 100%;
}
+.multitrigger {
+ position: relative;
+}
+
.multitrigger:before {
content: "";
height: 2rem;
@@ -293,7 +297,7 @@
margin-top: -2rem;
margin-left: 0rem;
height: 100%;
- left: 0.1rem;
+ left: 0rem;
padding-top: 2rem;
padding-left: 1rem;
border-top-left-radius: 2rem;
@@ -460,10 +464,13 @@
}
.widget_container {
- margin-top: 0.1rem;
position: relative;
}
+.widget_container > div:not(.group) {
+ margin-top: 0.1rem;
+}
+
.widget, .widget.group {
margin-left: 0.1rem;
min-height: 2rem;
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2012-06-10 14:05:15 UTC (rev 873)
+++ CometVisu/trunk/visu/visu_config.xsd 2012-06-10 14:35:41 UTC (rev 874)
@@ -267,7 +267,8 @@
<xsd:element name="upnpcontroller" type="upnpcontroller" />
<xsd:element ref="page" />
</xsd:choice>
- <xsd:attribute name="name" type="xsd:string" use="required" />
+ <xsd:attribute name="name" type="xsd:string" use="optional" />
+ <xsd:attribute name="nowidget" type="xsd:boolean" use="optional" />
<xsd:attribute name="flavour" type="xsd:string" use="optional" />
<xsd:attribute ref="align" use="optional" />
</xsd:complexType>
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-06-10 14:05:15 UTC (rev 873)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-06-10 14:35:41 UTC (rev 874)
@@ -463,37 +463,57 @@
<text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
<text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
<text><layout colspan="1" rowspan="12" />Colspan 1, Rowspan 12</text>
- <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
- <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
- <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
- <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <group nowidget="true">
+ <layout colspan="1" />
+ <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text><text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
+ </group>
+ <group nowidget="true">
+ <layout colspan="1" />
+ <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text><text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text><text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
+ </group>
+ <group nowidget="true">
+ <layout colspan="1" />
+ <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text><text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+ <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text><text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+ </group>
+ <group nowidget="true">
+ <layout colspan="1" />
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text><text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ </group>
+ <group nowidget="true">
+ <layout colspan="1" />
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text><text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ </group>
<text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
+ <text><layout colspan="4" rowspan="1" />Colspan 4, Rowspan 1</text>
<text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
- <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
- <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
- <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
<text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
+ <text><layout colspan="4" rowspan="4" />Colspan 4, Rowspan 4</text>
<text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
- <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
- <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
- <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
- <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
- <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
- <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
- <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
<text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="4" rowspan="1" />Colspan 4, Rowspan 1</text>
<text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
- <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
- <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="3" rowspan="1" />Colspan 3, Rowspan 1</text>
+ <text><layout colspan="3" rowspan="1" />Colspan 3, Rowspan 1</text>
+
+ <text><layout colspan="1" rowspan="5" />Colspan 1, Rowspan 5</text>
+ <group nowidget="true">
+ <layout colspan="4" />
+ <text><layout colspan="4" rowspan="2" />Colspan 4, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="4" rowspan="2" />Colspan 4, Rowspan 2</text>
+ </group>
+ <text><layout colspan="1" rowspan="5" />Colspan 1, Rowspan 5</text>
</page>
<page name="Navbar Test" align="center">
<text>This subpage adds additional content to the navbar</text>
@@ -612,12 +632,15 @@
</text>
<line/>
<group name="Gruppe" align="center">
- <text align="center">Ohne Flavour</text>
+ <layout colspan="5" />
+ <text align="center"><layout colspan="5" />Ohne Flavour</text>
<info styling="Blue_Purple_Red">
+ <layout colspan="5" />
<label>Info</label>
<address transform="DPT:9" type="">12/7/9</address>
</info>
</group>
+ <!-- <line /> -->
<group name="Slider Gruppe mit Flavour" flavour="lithium" align="center">
<info styling="Blue_Purple_Red">
<label>Info: Slider</label>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-10 14:05:21
|
Revision: 873
http://openautomation.svn.sourceforge.net/openautomation/?rev=873&view=rev
Author: mayerch
Date: 2012-06-10 14:05:15 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
colspan/rowspan: better handling of designs with margins (like planet)
planet design: fix colspan/rowspan display
Modified Paths:
--------------
CometVisu/trunk/visu/designs/planet/basic.css
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/planet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/planet/basic.css 2012-06-10 12:21:36 UTC (rev 872)
+++ CometVisu/trunk/visu/designs/planet/basic.css 2012-06-10 14:05:15 UTC (rev 873)
@@ -211,6 +211,10 @@
/*margin-left: 1rem;*/ /* to stay out of the knee */
}
+.page > .clearfix {
+ margin-right: 0.1rem;
+}
+
.colspan0 {
width: 8.33333%;
}
@@ -452,6 +456,7 @@
.widget .info .actor, .text > div, .link > div, .link a,
.value, .popup >div.head {
width: 100%;
+ height: 100%;
}
.widget_container {
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-06-10 12:21:36 UTC (rev 872)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-06-10 14:05:15 UTC (rev 873)
@@ -175,13 +175,14 @@
var dummyDiv = $('<div class="clearfix" id="calcrowspan"><div id="containerDiv" class="widget_container"><div class="widget clearfix text" id="innerDiv" /></div></div>')
.appendTo(document.body).show();
- var singleHeight = parseFloat($('#containerDiv').css('height'));
+ var singleHeight = $('#containerDiv').outerHeight(false);
+ var singleHeightMargin = $('#containerDiv').outerHeight(true );
$('#calcrowspan').remove();
// append css style
- $('head').append('<style id="'+className+'Style">.rowspan' + rowspan + ' { height: ' + rowspan*Math.round(singleHeight) + 'px; overflow:hidden; position:relative;} </style>').data(className, 1);
+ $('head').append('<style id="'+className+'Style">.rowspan' + rowspan + ' { height: ' + ((rowspan-1)*singleHeightMargin+singleHeight) + 'px; overflow:hidden; position:relative;} </style>').data(className, 1);
}
return className;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X