Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[1078] CometVisu/trunk/visu
|
From: <net...@us...> - 2012-10-28 08:54:21
|
Revision: 1078
http://openautomation.svn.sourceforge.net/openautomation/?rev=1078&view=rev
Author: netzkind
Date: 2012-10-28 08:54:08 +0000 (Sun, 28 Oct 2012)
Log Message:
-----------
removed the old editor, hopefully without collateral damage
cleaned structure-files to no longer contain editor-only elements
move lists to xsd, change xsd-types to boolean where applicable
Modified Paths:
--------------
CometVisu/trunk/visu/index.html
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/plugins/clock/structure_plugin.js
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
CometVisu/trunk/visu/plugins/gweather/structure_plugin.js
CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js
CometVisu/trunk/visu/plugins/rss/structure_plugin.js
CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js
CometVisu/trunk/visu/plugins/strftime/structure_plugin.js
CometVisu/trunk/visu/plugins/svg/structure_plugin.js
CometVisu/trunk/visu/plugins/upnpcontroller/structure_plugin.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/navbar.js
CometVisu/trunk/visu/structure/pure/page.js
CometVisu/trunk/visu/structure/pure/pagejump.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
CometVisu/trunk/visu/structure/pure/wgplugin_info.js
CometVisu/trunk/visu/visu_config.xml
CometVisu/trunk/visu/visu_config.xsd
CometVisu/trunk/visu/visu_config_2d3d.xml
CometVisu/trunk/visu/visu_config_demo.xml
CometVisu/trunk/visu/visu_config_metal.xml
Added Paths:
-----------
CometVisu/trunk/visu/get_designs.php
Removed Paths:
-------------
CometVisu/trunk/visu/edit_config.html
Deleted: CometVisu/trunk/visu/edit_config.html
===================================================================
--- CometVisu/trunk/visu/edit_config.html 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/edit_config.html 2012-10-28 08:54:08 UTC (rev 1078)
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>Visu - Editor-Modus</title>
- <link rel="icon" href="icon/comet_16x16_ff0000.png" type="image/png" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
- <link rel="stylesheet" type="text/css" href="edit/style_edit.css" />
- <link rel="stylesheet" type="text/css" href="edit/jquery-ui.css" />
- <script src="dependencies/jquery.js" type="text/javascript"></script>
- <script src="lib/compatibility.js" type="text/javascript"></script>
- <script src="dependencies/jquery-ui.js" type="text/javascript"></script>
- <script src="dependencies/scrollable.js" type="text/javascript"></script>
- <script src="lib/cometvisu-client.js" type="text/javascript"></script>
- <script src="lib/knx_decode.js" type="text/javascript"></script>
- <script src="lib/iconhandler.js" type="text/javascript"></script>
- <!-- Load the widgets: start -->
- <script src="structure/pure/_common.js" type="text/javascript"></script>
- <script src="structure/pure/break.js" type="text/javascript"></script>
- <script src="structure/pure/group.js" type="text/javascript"></script>
- <script src="structure/pure/iframe.js" type="text/javascript"></script>
- <script src="structure/pure/image.js" type="text/javascript"></script>
- <script src="structure/pure/imagetrigger.js" type="text/javascript"></script>
- <script src="structure/pure/include.js" type="text/javascript"></script>
- <script src="structure/pure/info.js" type="text/javascript"></script>
- <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/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>
- <script src="structure/pure/text.js" type="text/javascript"></script>
- <script src="structure/pure/toggle.js" type="text/javascript"></script>
- <script src="structure/pure/trigger.js" type="text/javascript"></script>
- <script src="structure/pure/unknown.js" type="text/javascript"></script>
- <script src="structure/pure/video.js" type="text/javascript"></script>
- <script src="designs/structure_custom.js" type="text/javascript"></script>
- <!-- Load the widgets: end -->
- <script src="designs/structure_custom.js" type="text/javascript"></script>
- <script type="text/javascript">
- // always force Reload in Editor-Mode
- forceReload = true;
- </script>
- <script src="lib/templateengine.js" type="text/javascript"></script>
- <script src="transforms/transform_default.js" type="text/javascript"></script>
- <script src="transforms/transform_knx.js" type="text/javascript"></script>
- <script src="edit/cometeditor.js" type="text/javascript"></script>
- <script src="edit/visuconfig_edit.js" type="text/javascript"></script>
- <script src="dependencies/jquery.jnotify.js" type="text/javascript"></script>
- <script src="edit/json2.js" type="text/javascript"></script>
- <style type="text/css">
- .loading { display: none; }
- </style>
- </head>
- <body class="editmode">
- <div id="top" class="loading">
- <div class="nav_path">-</div>
- <hr />
- </div>
- <div id="main" style="width:900px;position:relative; overflow: hidden; z-index: 1;" class="loading">
- <div id="pages" class="clearfix" style="width:20000em; position:relative;clear:both;"><!-- all pages will be inserted here -->
- </div>
- </div>
- <div id="bottom" class="loading">
- <hr />
- <div class="footer"></div>
- </div>
-
- <div id="addMaster">
- <form method="post" action="self">
- <div class="addwidget">
- <h2 class="create">Insert new widget</h2>
- <h2 class="edit">Edit widget</h2>
- <div class="editcontrols">
- <label for="add_type">Typ</label>
- <div class="input">
- <select id="add_type">
- <option>-</option>
- </select>
- </div>
-
- <div class="inputs">
-
- </div>
-
- </div>
-
- <input type="button" id="add_submit" value="OK"/>
- <input type="button" id="add_cancel" value="Cancel"/>
-
- <p><small class="create">The new widget will be added at the end of the current page. You can drag&drop it to the desired location on this page after creation.</small></p>
- </div>
- </form>
- </div>
- <div id="StatusBar" style="height: 20px;">
- </div>
- <div id="controlcontainer" class="loading">
- <div id="helplink" onClick="window.open('https://sourceforge.net/apps/mediawiki/openautomation/index.php?title=Benutzerhandbuch')">help</div>
- <div id="saveconfigcontrol">save</div>
- <div id="addwidgetcontrol">+</div>
- </div>
- <div id="loading" style="text-align: center; width: 200px; height: 30px; margin: auto;">
- Loading ...
- </div>
- </body>
-</html>
Added: CometVisu/trunk/visu/get_designs.php
===================================================================
--- CometVisu/trunk/visu/get_designs.php (rev 0)
+++ CometVisu/trunk/visu/get_designs.php 2012-10-28 08:54:08 UTC (rev 1078)
@@ -0,0 +1,24 @@
+<?php
+define('FOLDER_DESIGNS', "../designs/");
+
+$arrDesigns = array();
+
+if (false !== ($handle = opendir(FOLDER_DESIGNS))) {
+ while (false !== ($strFile = readdir($handle))) {
+ if ($strFile == "." || $strFile == "..") {
+ continue;
+ }
+
+ if (true === is_dir(FOLDER_DESIGNS . $strFile) && true === file_exists(FOLDER_DESIGNS . $strFile . "/basic.css")) {
+ $arrDesigns[] = $strFile;
+ }
+ }
+}
+
+sort($arrDesigns);
+
+Header("Content-type: application/json");
+print json_encode($arrDesigns);
+exit;
+
+?>
\ No newline at end of file
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/index.html 2012-10-28 08:54:08 UTC (rev 1078)
@@ -4,6 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CometVisu-Client</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="icon" href="icon/comet_16x16_000000.png" type="image/png" />
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0; webkit-user-select: none;" />
<meta name="apple-mobile-web-app-capable" content="yes" />
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -386,9 +386,14 @@
var extend = $(this).attr('hrefextend');
var sPath = window.location.pathname;
var sPage = sPath.substring(sPath.lastIndexOf('/') + 1);
+
+ // @TODO: make this match once the new editor is finished-ish.
var editMode = 'edit_config.html' == sPage;
+
+ // skip this element if it's edit-only and we are non-edit, or the other way round
if( editMode && '!edit' == condition ) return;
if( !editMode && 'edit' == condition ) return;
+
var text = $(this).text();
switch( extend )
{
@@ -606,39 +611,6 @@
var creator = design.getCreator(page.nodeName);
var retval = creator.create(page, path, flavour, type);
- 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);
- }
- });
- }
-
- 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);
-
if (jQuery(retval).is(".widget") || (jQuery(retval).is(".group")) ) {
retval = jQuery("<div class='widget_container " +
(retval.data("rowspanClass") ? retval.data("rowspanClass") : '')+"' />")
@@ -802,7 +774,7 @@
/* FIXME - Question: should this belong to the VisuDesign object so that it */
/* is possible to overload?!? */
/** ************************************************************************* */
-function refreshAction( target, src ) {
+function refreshAction( target, src ) {
/* Special treatment for (external) iframes:
* we need to clear it and reload it in another thread as otherwise stays
* blank for some targets/sites and src = src doesnt work anyway on external
@@ -817,7 +789,7 @@
}, 0);
} else {
target.src = src + '&' + new Date().getTime();
- }
+ }
}
function setupRefreshAction() {
@@ -843,7 +815,7 @@
$body.append($div);
- $.getJSON("edit/get_designs.php", function(data) {
+ $.getJSON("get_designs.php", function(data) {
$div.empty();
$div.append("<h1>Please select design</h1>");
Modified: CometVisu/trunk/visu/plugins/clock/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/clock/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/clock/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -123,14 +123,5 @@
if( data.address[addr][1] == true ) continue; // skip read only
visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value ) );
}
- },
- attributes: {
- rowspan: { type: 'numeric', required: false },
- colspan: { type: 'numeric', required: false }
- },
- elements: {
- label: { type: 'string', required: true, multi: false },
- address: { type: 'address', required: true, multi: true }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -156,16 +156,7 @@
toHex( value*255/100 )+
color.substring(7);
jQuery.farbtastic( element ).setColor( color );
- },
- attributes: {
- rowspan: { type: 'numeric', required: false },
- colspan: { type: 'numeric', required: false }
- },
- elements: {
- label: { type: 'string', required: true, multi: false },
- address: { type: 'address', required: true, multi: true, options: {variant: ['r', 'g', 'b']} }
- },
- content: false
+ }
});
/**
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -209,87 +209,19 @@
VisuDesign_Custom.prototype.addCreator("diagram_inline", {
create: function( page, path ) {
return createDiagram(page, path, "inline");
- },
- attributes: {
- rrd: {type: "string", required: false},
- width: {type: "string", required: false},
- height: {type: "string", required: false},
- unit: {type: "string", required: false},
- series: {type: "list", required: false, list: {hour: "hours", day: "days", week: "weeks", month: "months", year: "years"}},
- period: {type: "numeric", required: false},
- datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
- refresh: {type: "numeric", required: false},
- yaxismin: {type: "numeric", required: false},
- yaxismax: {type: "numeric", required: false},
- linecolor: {type: "string", required: false},
- colspan: {type: "numeric", required: false},
- rowspan: {type: "numeric", required: false},
- gridcolor: {type: "string", required: false},
- title: {type: "string", required: false}
- },
- elements: {
- label: { type: 'string', required: false, multi: false },
- rrd: { type: 'string', required: false, multi: true },
- },
- content: false
+ }
});
VisuDesign_Custom.prototype.addCreator("diagram_popup", {
create: function(page,path) {
return createDiagram(page, path, "popup");
- },
- attributes: {
- rrd: {type: "string", required: false},
- unit: {type: "string", required: false},
- series: {type: "list", required: false, list: {hour: "hours", day: "days", week: "weeks", month: "months", year: "years"}},
- period: {type: "numeric", required: false},
- datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
- refresh: {type: "numeric", required: false},
- yaxismin: {type: "numeric", required: false},
- yaxismax: {type: "numeric", required: false},
- linecolor: {type: "string", required: false},
- gridcolor: {type: "string", required: false},
- tooltip: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- width: {type: "string", required: false},
- height: {type: "string", required: false},
- title: {type: "string", required: false}
- },
- elements: {
- label: { type: 'string', required: false, multi: false },
- rrd: { type: 'string', required: false, multi: true },
- },
- content: false
+ }
});
VisuDesign_Custom.prototype.addCreator("diagram", {
create: function(page,path) {
return createDiagram(page, path, "none");
- },
- attributes: {
- rrd: {type: "string", required: false},
- unit: {type: "string", required: false},
- series: {type: "list", required: false, list: {hour: "hours", day: "days", week: "weeks", month: "months", year: "years"}},
- period: {type: "numeric", required: false},
- datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
- refresh: {type: "numeric", required: false},
- yaxismin: {type: "numeric", required: false},
- yaxismax: {type: "numeric", required: false},
- linecolor: {type: "string", required: false},
- gridcolor: {type: "string", required: false},
- tooltip: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- width: {type: "string", required: false},
- height: {type: "string", required: false},
- previewlabels: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- popup: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- legend: {type: "list", required: false, list: {'both': "both", 'inline': "inline", 'popup': "popup", 'none': "none"}},
- legendposition: {type: "list", rquired: false, list: {'se' : "bottomright", 'sw':"bottomleft", 'ne' : "topright", 'nw':"topleft"}},
- title: {type: "string", required: false}
- },
- elements: {
- label: { type: 'string', required: false, multi: false },
- rrd: { type: 'string', required: false, multi: true },
- },
- content: false
+ }
});
VisuDesign_Custom.prototype.addCreator("diagram_info", {
@@ -412,32 +344,7 @@
var element = $(this);
var value = defaultUpdate( e, d, element );
element.addClass('switchUnpressed');
- },
- attributes: {
- rrd: {type: "string", required: false},
- unit: {type: "string", required: false},
- series: {type: "list", required: false, list: {hour: "hours", day: "days", week: "weeks", month: "months", year: "years"}},
- period: {type: "numeric", required: false},
- datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
- refresh: {type: "numeric", required: false},
- tooltip: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- linecolor: {type: "string", required: false},
- gridcolor: {type: "string", required: false},
- yaxismin: {type: "numeric", required: false},
- yaxismax: {type: "numeric", required: false},
- format: {type: 'format', required: false },
- mapping: {type: 'mapping', required: false },
- styling: {type: 'styling', required: false },
- legend: {type: "list", required: false, list: {'both': "both", 'inline': "inline", 'popup': "popup", 'none': "none"}},
- legendposition: {type: "list", rquired: false, list: {'se' : "bottomright", 'sw':"bottomleft", 'ne' : "topright", 'nw':"topleft"}},
- title: {type: "string", required: false}
- },
- elements: {
- label: { type: 'string', required: false, multi: false },
- address: { type: 'address', required: true, multi: true },
- rrd: { type: 'string', required: false, multi: true },
- },
- content: {type: "string", required: true}
+ }
});
diagramColors = {
Modified: CometVisu/trunk/visu/plugins/gweather/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/gweather/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/gweather/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -58,18 +58,7 @@
refreshGweather(gweather, {});
return ret_val;
- },
- attributes: {
- width: {type: "string", required: false},
- height: {type: "string", required: false},
- refresh: {type: "numeric", required: false},
- city: {type: "string", required: true},
- lang: {type: "string", required: false},
- image_url: {type: "string", required: false},
- current: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- forecast: {type: "list", required: false, list: {'true': "yes", 'false': "no"}}
- },
- content: {type: "string", required: true}
+ }
});
function refreshGweather(gweather, data) {
Modified: CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -55,15 +55,6 @@
ret_val.append(label).append(actor);
return ret_val;
- },
- attributes: {
- width: {type: "string", required: false},
- height: {type: "string", required: false},
- lang: {type: "list", required: true, list: {'de':'Deutsch','en':'English','es':'Espanol','fr':'Francais','it':'Italiano','ru':'Ruski'}},
- date: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- content: false
+ }
});
Modified: CometVisu/trunk/visu/plugins/rss/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rss/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/rss/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -72,24 +72,7 @@
refreshRSS(rss, {});
return ret_val;
- },
- attributes: {
- src: {type: "string", required: true},
- width: {type: "string", required: false},
- height: {type: "string", required: false},
- refresh: {type: "numeric", required: false},
- limit: {type: "numeric", required: false},
- header: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- date: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- content: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- snippet: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- showerror: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- ssl: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- linktarget: {type: "list", required: false, list: {"_new": "_new", "_self": "_self"}},
- link: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- title: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- },
- content: {type: "string", required: true}
+ }
});
function refreshRSS(rss, data) {
Modified: CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -75,19 +75,7 @@
refreshRSSlog(rss, {});
return ret_val;
- },
- attributes: {
- src: {type: "string", required: true},
- filter: {type: "string", required: false},
- width: {type: "string", required: false},
- height: {type: "string", required: false},
- refresh: {type: "numeric", required: false},
- content: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- datetime: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- mode: {type: "list", required: false, list: {'first': 'first', 'last': 'last', 'rollover':'rollover' }},
- timeformat: {type: "string", required: false},
- },
- content: false
+ }
});
function refreshRSSlog(rss, data) {
Modified: CometVisu/trunk/visu/plugins/strftime/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/strftime/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/strftime/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -79,10 +79,5 @@
f();
return ret_val;
- },
- attributes : {
- lang : {type : "list" , required : false, list : {en : "en", de : "de", fr : "fr"}},
- format : {type : "string", required : false},
- },
- content : false
+ }
});
Modified: CometVisu/trunk/visu/plugins/svg/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/svg/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/svg/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -71,18 +71,5 @@
element.find('#line'+(i+1)).attr('y1',9);
element.find('#line'+(i+1)).attr('y2',9);
}
- },
- 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
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/plugins/upnpcontroller/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/upnpcontroller/structure_plugin.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/plugins/upnpcontroller/structure_plugin.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -81,15 +81,7 @@
refreshUpnpcontroller(upnpcontroller, {}, false);
return ret_val;
- },
- attributes: {
- label: {type: "string", required: true},
- player_ip_addr: {type: "string", required: true},
- player_port: {type: "string", required: false},
- refresh: {type: "numeric", required: true},
- debug: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- },
- content: false
+ }
});
Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/_common.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -209,13 +209,6 @@
ret_val.css( 'display', 'block' );
return ret_val;
- },
- attributes: {
- title: {type: 'string', required: false},
- content: {type: 'string', required: false},
- width: {type: 'string', required: false},
- height: {type: 'string', required: false},
- position: {type: 'object', required: false} // either {x:,y:} or an jQuery object
}
});
Modified: CometVisu/trunk/visu/structure/pure/break.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/break.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/break.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -18,8 +18,5 @@
basicdesign.addCreator('break', {
create: function( element, path, flavour, type ) {
return $( '<br />' );
- },
- attributes: {},
- elements: {},
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/group.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/group.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/group.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -37,15 +37,5 @@
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
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/iframe.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/iframe.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/iframe.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -40,20 +40,5 @@
'refresh': refresh
} ).each(setupRefreshAction) ); // abuse "each" to call in context...
return ret_val;
- },
- attributes: {
- src: { type: 'uri' , required: true },
- width: { type: 'string' , required: false }, // only for the iframe - not the widget!
- height: { type: 'string' , required: false }, // only for the iframe - not the widget!
- frameborder: { type: 'list' , required: false, list: {'true': "yes", 'false': "no"} },
- background: { type: 'string' , required: false },
- refresh: { type: 'numeric', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- layout: { type: 'layout' , required: false, multi: false },
- label: { type: 'string' , required: false, multi: false }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/image.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/image.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/image.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -37,18 +37,5 @@
'refresh': refresh
} ).each(setupRefreshAction) ); // abuse "each" to call in context...
return ret_val;
- },
- attributes: {
- src: { type: 'uri' , required: true },
- width: { type: 'string' , required: false }, // only for the image - not the widget!
- height: { type: 'string' , required: false }, // only for the image - not the widget!
- refresh: { type: 'numeric', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- layout: { type: 'layout' , required: false, multi: false },
- label: { type: 'string' , required: false, multi: false }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -84,21 +84,5 @@
continue; // skip empty
visu.write( addr.substr(1), transformEncode( data.address[addr][0], sendValue ) );
}
- },
- attributes: {
- src: { type: 'uri' , required: true },
- refresh: { type: 'numeric', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false },
- sendValue: { type: 'numeric', required: false },
- type: { type: 'list' , required: true , list: {'show': 'show', 'select': 'select' /* , 'bitmask': 'bitmask' */ } },
- mapping: { type: 'mapping', required: false },
- suffix: { type: 'list' , required: false, list: {'png': '.png', 'jpg': '.jpg', 'gif': '.gif', 'svg': '.svg', 'bmp': '.bmp'} }
- },
- elements: {
- layout: { type: 'layout' , required: false, multi: false },
- label: { type: 'string' , required: false, multi: false },
- address: { type: 'address', required: true , multi: true }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/include.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/include.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/include.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -26,10 +26,5 @@
});
var child = (p.responseXML.childNodes[0]);
return create_pages( child, path , flavour );
- },
- attributes: {
- src: { type: 'string', required: true }
- },
- elements: {},
- content: true
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/info.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/info.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/info.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -39,18 +39,5 @@
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
+ update3d: defaultUpdate3d
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -138,27 +138,5 @@
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 ) );
}
- },
- attributes: {
- uplabel: { type: 'string' , required: false },
- upvalue: { type: 'string' , required: false },
- downlabel: { type: 'string' , required: false },
- downvalue: { type: 'string' , required: false },
- mapping: { type: 'mapping', required: false },
- styling: { type: 'styling', required: false },
- align: { type: 'string' , required: false },
- infoposition: { type: 'list' , required: true , list: {0: 'Info/Down/Up', 1: 'Down/Info/Up', 2: 'Down/Up/Info'} },
- format: { type: 'string' , required: false },
- change: { type: 'list' , required: false, list: {'relative': 'Send relative/delta values', 'absolute': 'Send absolute values'} },
- min: { type: 'numeric', required: false },
- max: { type: 'numeric', required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- layout: { type: 'layout' , required: false, multi: false },
- label: { type: 'string' , required: false, multi: false },
- address: { type: 'address', required: true , multi: true , options: {variant: ['', 'isbutton']} }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/line.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/line.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/line.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -18,7 +18,5 @@
basicdesign.addCreator('line', {
create: function( element, path, flavour, type ) {
return $( '<hr />' );
- },
- attributes: {},
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -134,27 +134,5 @@
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 ) );
}
- },
- attributes: {
- button1label: { type: 'string' , required: false },
- button1value: { type: 'string' , required: false },
- button2label: { type: 'string' , required: false },
- button2value: { type: 'string' , required: false },
- button3label: { type: 'string' , required: false },
- button3value: { type: 'string' , required: false },
- button4label: { type: 'string' , required: false },
- button4value: { type: 'string' , required: false },
- mapping: { type: 'mapping', required: false },
- styling: { type: 'styling', required: false },
- align: { type: 'string' , required: false },
- showstatus: { type: 'list' , required: true , list: {'true': "yes", 'false': "no"} },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- layout: { type: 'layout' , required: false, multi: false },
- label: { type: 'string' , required: false, multi: false },
- address: { type: 'address', required: true , multi: true }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/navbar.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/navbar.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/navbar.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -57,11 +57,5 @@
var ret_val = $('');
return ret_val;
- },
- attributes: {
- name: { type: 'string', required: false },
- position: { type: 'list' , required: true , list: { top: 'top', left: 'left', right: 'right', bottom: 'bottom' } },
- dynamic: { type: 'list' , required: true , list: { 'false': 'Fixed size', 'true': 'Dynamic' } }
- },
- content: true
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/page.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/page.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/page.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -117,26 +117,6 @@
$('#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 },
- topnavigation: { type: 'string', required: false},
- footer: { type: 'string', required: false},
- navbar: { type: 'string', required: false},
- },
- elements: {
- layout: { type: 'layout' , required: false, multi: false }
- },
update: function(e, data) {
var element = $(this);
var value = defaultValueHandling( e, data, element );
@@ -165,6 +145,5 @@
visu.write(e.type.substr(1), transformEncode('DPT:1.001', 0));
}
}
- },
- content: true
+ }
});
Modified: CometVisu/trunk/visu/structure/pure/pagejump.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/pagejump.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/pagejump.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -50,18 +50,5 @@
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/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/slide.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -133,21 +133,5 @@
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 },
- format: { type: 'string' , 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
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/switch.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -55,20 +55,5 @@
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 ) );
}
- },
- 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: {
- layout: { type: 'layout' , required: false, multi: false },
- label: { type: 'string' , required: true , multi: false },
- address: { type: 'address', required: true , multi: true }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/text.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/text.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/text.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -37,14 +37,5 @@
});
ret_val.append( $div );
return ret_val;
- },
- attributes: {
- align: { type: 'string' , required: false },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- layout: { type: 'layout' , required: false, multi: false }
- },
- content: { type: 'string', required: true }
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/toggle.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -61,18 +61,5 @@
if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
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: {
- layout: { type: 'layout' , required: false, multi: false },
- label: { type: 'string' , required: true, multi: false },
- address: { type: 'address', required: true, multi: true }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -62,19 +62,5 @@
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 ) );
}
- },
- attributes: {
- value: { type: 'string' , required: true },
- 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 },
- layout: { type: 'layout' , required: false, multi: false }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/unknown.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/unknown.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/unknown.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -20,7 +20,5 @@
var ret_val = $('<div class="widget clearfix" />');
ret_val.append( '<pre>unknown: ' + element.nodeName + '</pre>' );
return ret_val;
- },
- attributes: {},
- content: {type: 'string', required: true}
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/video.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/video.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/video.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -31,18 +31,5 @@
var actor = '<div class="actor"><video src="' +$e.attr('src') + '" ' + style + autoplay + ' controls="controls" /></div>';
ret_val.append( $(actor).data( {} ) );
return ret_val;
- },
- attributes: {
- src: { type: 'uri' , required: true },
- width: { type: 'string' , required: false },
- height: { type: 'string' , required: false },
- autoplay: { type: 'list' , required: true, list: {'true': "yes", 'false': "no"} },
- colspan: { type: 'numeric', required: false },
- rowspan: { type: 'numeric', required: false }
- },
- elements: {
- layout: { type: 'layout' , required: false, multi: false },
- label: { type: 'string' , required: false, multi: false }
- },
- content: false
+ }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/wgplugin_info.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/wgplugin_info.js 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/structure/pure/wgplugin_info.js 2012-10-28 08:54:08 UTC (rev 1078)
@@ -54,19 +54,5 @@
valueElement.append( data[variable] );
});
},
- update3d: defaultUpdate3d,
- attributes: {
- variable:{ type: 'string' , required: true },
- 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
+ update3d: defaultUpdate3d
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/visu_config.xml 2012-10-28 08:54:08 UTC (rev 1078)
@@ -52,12 +52,6 @@
- <a href=".?forceReload=true">Reload</a>
- <a href="?config=demo">Widget Demo</a>
]]></status>
- <status type="html" condition="!edit" hrefextend="config"><![CDATA[
- - <a href="edit_config.html">Edit</a>
- ]]></status>
- <status type="html" condition="edit" hrefextend="all"><![CDATA[
- - <a href=".">normal Mode</a>
- ]]></status>
<status type="html" hrefextend="config"><![CDATA[
- <a href="check_config.php">Check Config</a>
]]></status>
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2012-10-25 16:47:04 UTC (rev 1077)
+++ CometVisu/trunk/visu/visu_config.xsd 2012-10-28 08:54:08 UTC (rev 1078)
@@ -77,26 +77,79 @@
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
+
- <xsd:attribute name="align" type="xsd:string" />
- <xsd:attribute name="variant" type="xsd:string" />
-
- <xsd:simpleType name="true_false">
+ <xsd:simpleType name="rss_mode">
<xsd:restriction base="xsd:string">
- <xsd:enumeration value="true" />
- <xsd:enumeration value="false" />
+ <xsd:enumeration value="first" />
+ <xsd:enumeration value="last" />
+ <xsd:enumeration value="rollover" />
</xsd:restriction>
</xsd:simpleType>
+
+ <xsd:attribute name="series">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="hour" />
+ <xsd:enumeration value="day" />
+ <xsd:enumeration value="week" />
+ <xsd:enumeration value="month" />
+ <xsd:enumeration value="year" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+
+ <xsd:attribute name="datasource">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="MIN" />
+ <xsd:enumeration value="AVERAGE" />
+ <xsd:enumeration value="MAX" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+
+ <xsd:attribute name="align" type="xsd:string" />
+ <xsd:attribute name="variant" type="xsd:string" />
- <xsd:simpleType name="legendposition">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="nw" />
- <xsd:enumeration value="ne" />
- <xsd:enumeration value="sw" />
- <xsd:enumeration value="se" />
- </xsd:restriction>
- </xsd:simpleType>
+ <xsd:attribute name="legendposition">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="nw">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">topleft</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ <xsd:enumeration value="ne">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">topright</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ <xsd:enumeration value="sw">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">bottomleft</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ <xsd:enumeration value="se">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">bottomright</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ <xsd:attribute name="legend">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="both" />
+ <xsd:enumeration value="inline" />
+ <xsd:enumeration value="popup" />
+ <xsd:enumeration value="none" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+
<xsd:simpleType name="navbarPositionType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="top" />
@@ -105,7 +158,56 @@
<xsd:enumeration value="bottom" />
</xsd:restriction>
</xsd:simpleType>
+
+ <xsd:attribute name="lang">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="de">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">german</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ <xsd:enumeration value="en">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">english</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ <xsd:enumeration value="es">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">spanish</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ <xsd:enumeration value="fr">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">french</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ <xsd:enumeration value="it">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">italian</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ <xsd:enumeration value="ru">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">russian</xsd:documentation>
+ </xsd:annotation>
+ </xsd:enumeration>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+
+ <xsd:attribute name="linktarget">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="_new" />
+ <xsd:enumeration value="_self" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+
+
+
<!-- complex elements -->
<xsd:element name="pages">
<xsd:complexType>
@@ -325,7 +427,7 @@
</xsd:choice>
<xsd:attribute name="name" type="xsd:string" use="optional" />
<xsd:attribute name="position" type="navbarPositionType" use="required" />
- <xsd:attribute name="dynamic" type="true_false" use="optional" />
+ <xsd:attribute name="dynamic" type="xsd:boolean" use="optional" />
<xsd:attribute name="width" type="xsd:string" use="optional" />
<xsd:attribute name="scope" type="xsd:decimal" use="optional" />
</xsd:complexType>
@@ -529,21 +631,21 @@
<xsd:attribute name="rrd" type="xsd:string" use="optional" />
<xsd:attribute name="unit" type="xsd:string" use="optional" />
<xsd:attribute name="width" type="dimension" use="optional" />
- <xsd:attribute name="series" type="xsd:string" use="optional" />
+ <xsd:attribute ref="series" use="optional" />
<xsd:attribute name="height" type="dimension" use="optional" />
<xsd:attribute name="refresh" type="xsd:integer" use="optional" />
<xsd:attribute name="period" type="xsd:string" use="optional" />
- <xsd:attribute name="datasource" type="xsd:string" use="optional" />
+ <xsd:attribute ref="datasource" use="optional" />
<xsd:attribute name="linecolor" type="xsd:string" use="optional" />
<xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
<xsd:attribute name="yaxismin" type="xsd:string" use="optional" />
<xsd:attribute name="yaxismax" type="xsd:string" use="optional" />
- <xsd:attribute name="legend" type="xsd:string" use="optional" />
- <xsd:attribute name="legendposition" type="legendposition" use="optional" />
+ <xsd:attribute ref="legend" use="optional" />
+ <xsd:attribute ref="legendposition" use="optional" />
<xsd:attribute name="popup" type="xsd:boolean" use="optional" />
<xsd:attribute name="previewlabels" type="xsd:boolean" use="optional" />
<xsd:attribute name="title" type="xsd:string" use="optional" />
- <xsd:attribute name="tooltip" type="xsd:string" use="optional" />
+ <xsd:attribute name="tooltip" type="xsd:boolean" use="optional" />
</xsd:complexType>
<xsd:complexType name="diagram_inline">
@@ -556,11 +658,11 @@
<xsd:attribute name="rrd" type="xsd:string" use="optional" />
<xsd:attribute name="unit" type="xsd:string" use="optional" />
<xsd:attribute name="width" type="dimension" use="optional" />
- <xsd:attribute name="series" type="xsd:string" use="optional" />
+ <xsd:attribute ref="series" use="optional" />
<xsd:attribute name="height" type="dimension" use="optional" />
<xsd:attribute name="refresh" type="xsd:integer" use="optional" />
<xsd:attribute name="period" type="xsd:string" use="optional" />
- <xsd:attribute name="datasource" type="xsd:string" use="optional" />
+ <xsd:attribute ref="datasource" use="optional" />
<xsd:attribute name="linecolor" type="xsd:string" use="optional" />
<xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
<xsd:attribute name="yaxismin" type="xsd:string" use="optional" />
@@ -577,11 +679,11 @@
</xsd:choice>
<xsd:attribute name="rrd" type="xsd:string" use="optional" />
<xsd:attribute name="unit" type="xsd:string" use="optional" />
- <xsd:attribute name="series" type="xsd:string" use="optional" />
+ <xsd:attribute ref="series" use="optional" />
<xsd:attribute name="refresh" type="xsd:integer" use="optional" />
<xsd:attribute name="period" type="xsd:string" use="optional" />
- <xsd:att...
[truncated message content] |
