summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/edit/htdocs
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-01-13 10:27:39 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-01-13 10:27:39 +0000
commit2dffb211b9e30269a0db1c7741a4f07ff5260952 (patch)
treeee3feadb43e35ac6cfaee9c24673e8662e3c3299 /sca-cpp/trunk/modules/edit/htdocs
parent79886cb0923d20021e09a231d3952c319402e2d4 (diff)
Refactor and minor improvements of the edit module. Add a palette of sample components.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1058487 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/edit/htdocs')
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html2
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/dash/index.html7
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/graph/graph.html112
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/graph/graph.js (renamed from sca-cpp/trunk/modules/edit/htdocs/edit/graph.js)350
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/graph/index.html (renamed from sca-cpp/trunk/modules/edit/htdocs/edit/index.html)13
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/index.html7
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/menu.html2
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/page/index.html41
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/page/page.html (renamed from sca-cpp/trunk/modules/edit/htdocs/edit/edit.html)41
-rw-r--r--sca-cpp/trunk/modules/edit/htdocs/page/page.js204
10 files changed, 630 insertions, 149 deletions
diff --git a/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html b/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html
index b69c760c99..60d869abde 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/dash/dashboard.html
@@ -82,7 +82,7 @@ function getapps(sync) {
title = car(entry);
apps += '<tr>';
- apps += '<td><input name="apps" type="checkbox" value="' + name + '">' + '<a href=\"' + '/edit/?app=' + name + '\">' + name + '</a></td>';
+ apps += '<td><input name="apps" type="checkbox" value="' + name + '">' + '<a href=\"' + '/graph/?app=' + name + '\">' + name + '</a></td>';
apps += '<td class="tdw">' + title + '</td>';
apps += '</tr>';
}
diff --git a/sca-cpp/trunk/modules/edit/htdocs/dash/index.html b/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
index 0abb384d75..d1da06d71c 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/dash/index.html
@@ -30,14 +30,11 @@
<h1>Welcome to your App Dashboard!</h1>
<div id="dashboard"></div>
-<iframe id="menuFrame" src="/menu.html"></iframe>
-<iframe id="dashboardFrame" src="dashboard.html"></iframe>
-
<script type="text/javascript">
-ui.bindwidget('menuFrame', 'menu');
+ui.loadwidget('menu', '/menu.html');
// Display the dashboard widget
-ui.bindwidget('dashboardFrame', 'dashboard');
+ui.loadwidget('dashboard', 'dashboard.html');
</script>
</body>
</html>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html
new file mode 100644
index 0000000000..618d638e7d
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.html
@@ -0,0 +1,112 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="/ui.css">
+<script type="text/javascript" src="/util.js"></script>
+<script type="text/javascript" src="/elemutil.js"></script>
+<script type="text/javascript" src="/xmlutil.js"></script>
+<script type="text/javascript" src="/atomutil.js"></script>
+<script type="text/javascript" src="/scdl.js"></script>
+<script type="text/javascript" src="/ui.js"></script>
+<script type="text/javascript" src="/component.js"></script>
+<script type="text/javascript" src="graph.js"></script>
+</head>
+<body>
+
+<script type="text/javascript">
+var editWidget = sca.component("EditWidget");
+var dashboard = sca.reference(editWidget, "dashboard");
+var palettes = sca.reference(editWidget, "palettes");
+var apps = sca.reference(editWidget, "apps");
+
+/**
+ * Return the current app name.
+ */
+function appname() {
+ return ui.queryParams()['app'];
+}
+
+/**
+ * Return the composite in an ATOM entry.
+ */
+function atomcomposite(doc) {
+ var entry = atom.readATOMEntryDocument(doc);
+ var item = caddr(entry);
+ return cddr(item);
+}
+
+/**
+ * Load and display an app.
+ */
+function getapp(name, g) {
+ if (isNil(name))
+ return;
+ apps.get(name, function(doc) {
+ graph.append(graph.composite(atomcomposite(doc), graph.mkpath().move(300,0)), g);
+ });
+}
+
+/**
+ * Load and display a palette content.
+ */
+
+function getpalette(name, g, bg, palette, gpalettes) {
+ if (isNil(name))
+ return;
+ palettes.get(name, function(doc) {
+ gpalettes[name] = graph.composite(atomcomposite(doc), graph.mkpath().move(150,0));
+ graph.append(gpalettes[name], name == spalette? g : bg);
+ });
+}
+
+/**
+ * Install a palette button and content.
+ */
+function installpalette(name, pos, g, bg, palette, gpalettes) {
+ var b = graph.mkbutton(name, pos);
+ graph.append(mklist(b), g);
+ b.onclick = function() {
+ // Display the selected palette
+ spalette = name;
+ for (var pn in gpalettes)
+ graph.append(gpalettes[pn], pn == spalette? g : bg);
+ }
+ getpalette(name, g, bg, palette, gpalettes);
+}
+
+// Create editor graph area
+var g = graph.mkgraph();
+var bg = graph.mkgroup(graph.mkpath());
+
+// Install the palettes.
+var gpalettes = new Array();
+var spalette = 'variables';
+installpalette('variables', graph.mkpath().move(0,10), g, bg, spalette, gpalettes);
+installpalette('control', graph.mkpath().move(0,80), g, bg, spalette, gpalettes);
+installpalette('operators', graph.mkpath().move(0,150), g, bg, spalette, gpalettes);
+installpalette('social', graph.mkpath().move(0,220), g, bg, spalette, gpalettes);
+installpalette('sensors', graph.mkpath().move(0,290), g, bg, spalette, gpalettes);
+
+// Display the current app
+getapp(appname(), g);
+
+</script>
+</body>
+</html>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/edit/graph.js b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js
index 5f122ac498..88a2efd50b 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/edit/graph.js
+++ b/sca-cpp/trunk/modules/edit/htdocs/graph/graph.js
@@ -18,32 +18,12 @@
*/
/**
- * SVG and VML component rendering functions.
+ * SVG and VML composite rendering functions.
*/
var graph = new Object();
/**
- * Detect browser VML support.
- */
-graph.supportsVML = function() {
- if (typeof graph.supportsVML.supported != 'undefined')
- return graph.supportsVML.supported;
- graph.supportsVML.supported = navigator.appName == 'Microsoft Internet Explorer';
- return graph.supportsVML.supported;
-};
-
-/**
- * Detect browser SVG support.
- */
-graph.supportsSVG = function() {
- if (typeof graph.supportsSVG.supported != 'undefined')
- return graph.supportsSVG.supported;
- graph.supportsSVG.supported = navigator.appName != 'Microsoft Internet Explorer';
- return graph.supportsSVG.supported;
-};
-
-/**
* Basic colors
*/
graph.colors = new Object();
@@ -51,7 +31,7 @@ graph.colors.black = '#000000';
graph.colors.blue = '#0000ff';
graph.colors.cyan = '#00ffff';
graph.colors.gray = '#808080'
-graph.colors.green = '#008000';
+graph.colors.green = '#00ff00';
graph.colors.magenta = '#ff00ff';
graph.colors.orange = '#ffa500';
graph.colors.pink = '#ffc0cb';
@@ -106,7 +86,7 @@ graph.BasePath = function() {
/**
* VML rendering.
*/
-if (graph.supportsVML()) {
+if (ui.isIE()) {
graph.vmlns='urn:schemas-microsoft-com:vml';
document.write('<xml:namespace ns="urn:schemas-microsoft-com:vml" prefix="v" />');
@@ -120,9 +100,9 @@ if (graph.supportsVML()) {
document.body.appendChild(div);
var vmlg = document.createElement('v:group');
- vmlg.style.width = 2000;
- vmlg.style.height = 2000;
- vmlg.coordsize = '2000,2000';
+ vmlg.style.width = 5000;
+ vmlg.style.height = 5000;
+ vmlg.coordsize = '5000,5000';
div.appendChild(vmlg);
graph.dragging = null;
@@ -130,17 +110,24 @@ if (graph.supportsVML()) {
function draggable(n) {
if (n == vmlg)
return null;
- if (n.nodeName == 'group')
+ if (n.nodeName == 'group' && n.id != '')
return n;
return draggable(n.parentNode);
}
+ function bringtotop(n) {
+ if (n == vmlg)
+ return null;
+ n.parentNode.appendChild(n);
+ return bringtotop(n.parentNode);
+ }
+
vmlg.onmousedown = function() {
window.event.returnValue = false;
graph.dragging = draggable(window.event.srcElement);
if (graph.dragging == null)
return false;
- graph.dragging.parentNode.appendChild(graph.dragging);
+ bringtotop(graph.dragging);
graph.dragX = window.event.clientX;
graph.dragY = window.event.clientY;
vmlg.setCapture();
@@ -164,6 +151,13 @@ if (graph.supportsVML()) {
var newY = origY - (window.event.clientY - graph.dragY);
graph.dragX = window.event.clientX;
graph.dragY = window.event.clientY;
+
+ if (graph.dragging.id.substring(0, 8) == 'palette:') {
+ // Clone an element dragged from the palette
+ var clone = graph.compshape(graph.dragging.comp, mklist(), graph.mkpath().move(ui.posn(graph.dragging.style.left), ui.posn(graph.dragging.style.top)));
+ graph.dragging.parentNode.appendChild(clone);
+ graph.dragging = clone;
+ }
graph.dragging.setAttribute('coordorigin', newX + ' ' + newY);
return false;
};
@@ -217,27 +211,36 @@ if (graph.supportsVML()) {
};
/**
- * Return an element representing the title of a component.
+ * Return an element representing a title.
*/
- graph.comptitle = function(comp) {
- var t = scdl.name(comp);
- var tsvcs = graph.tsvcs(comp);
- var lsvcs = graph.lsvcs(comp);
+ graph.mktitle = function(t, bold, pos) {
var title = document.createElement('v:textbox');
- title.style.left = '' + (isNil(lsvcs)? 5 : 25);
- title.style.top = '' + (isNil(tsvcs)? 5 : 25);
+ title.style.left = pos.xpos();
+ title.style.top = pos.ypos();
title.style.position = 'absolute';
- title.style.fontWeight = 'bold';
+ if (bold)
+ title.style.fontWeight = 'bold';
var tnode = document.createTextNode(t);
title.appendChild(tnode);
return title;
+ return title;
+ };
+
+ /**
+ * Return an element representing the title of a component.
+ */
+ graph.comptitle = function(comp) {
+ var tsvcs = graph.tsvcs(comp);
+ var lsvcs = graph.lsvcs(comp);
+ var pos = graph.mkpath().move(isNil(lsvcs)? 5 : 25, isNil(tsvcs)? 5 : 25);
+ return graph.mktitle(graph.title(comp), true, pos);
};
/**
* Return the width of the title of a component.
*/
graph.comptitlewidth = function(comp) {
- var t = scdl.name(comp);
+ var t = graph.title(comp);
graph.comptitlewidthdiv.innerHTML = t;
var twidth = graph.comptitlewidthdiv.offsetWidth;
graph.comptitlewidthdiv.innerHTML = '';
@@ -248,21 +251,14 @@ if (graph.supportsVML()) {
* Return an element representing the title of a reference.
*/
graph.reftitle = function(ref) {
- var t = scdl.name(ref);
- var title = document.createElement('v:textbox');
- title.style.left = '' + 25;
- title.style.top = '' + 25;
- title.style.position = 'absolute';
- var tnode = document.createTextNode(t);
- title.appendChild(tnode);
- return title;
+ return graph.mktitle(graph.title(ref), false, graph.mkpath().move(25,25));
};
/**
* Return the width of the title of a reference.
*/
graph.reftitlewidth = function(ref) {
- var t = scdl.name(ref);
+ var t = graph.title(ref);
graph.reftitlewidthdiv.innerHTML = t;
var twidth = graph.reftitlewidthdiv.offsetWidth;
graph.reftitlewidthdiv.innerHTML = '';
@@ -278,17 +274,17 @@ if (graph.supportsVML()) {
var d = graph.comppath(comp, cassoc).str();
var shape = document.createElement('v:shape');
- shape.style.width = 2000;
- shape.style.height = 2000;
- shape.coordsize = '2000,2000';
+ shape.style.width = 5000;
+ shape.style.height = 5000;
+ shape.coordsize = '5000,5000';
shape.path = d;
shape.fillcolor = graph.color(comp);
shape.stroked = 'false';
var contour = document.createElement('v:shape');
- contour.style.width = 2000;
- contour.style.height = 2000;
- contour.coordsize = '2000,2000';
+ contour.style.width = 5000;
+ contour.style.height = 5000;
+ contour.coordsize = '5000,5000';
contour.setAttribute('path', d);
contour.filled = 'false';
contour.strokecolor = graph.colors.gray;
@@ -301,23 +297,77 @@ if (graph.supportsVML()) {
var g = document.createElement('v:group');
g.id = scdl.name(comp);
- g.style.width = 2000;
- g.style.height = 2000;
- g.coordsize = '2000,2000';
+ g.style.width = 5000;
+ g.style.height = 5000;
+ g.coordsize = '5000,5000';
g.style.left = pos.xpos();
g.style.top = pos.ypos();
g.appendChild(shape);
shape.appendChild(title);
g.appendChild(contour)
+
+ // Store the component in the shape
+ g.comp = comp;
+
return g;
};
-}
-/**
- * SVG rendering.
- */
-if (graph.supportsSVG()) {
+ /**
+ * Return a graphical group.
+ */
+ graph.mkgroup = function(pos) {
+ var g = document.createElement('v:group');
+ g.style.left = pos.xpos();
+ g.style.top = pos.ypos();
+ return g;
+ };
+ /**
+ * Return a shape representing a button.
+ */
+ graph.mkbutton = function(t, pos) {
+ var title = graph.mktitle(t, true, pos);
+ var d = graph.buttonpath().str();
+
+ var shape = document.createElement('v:shape');
+ shape.style.width = 5000;
+ shape.style.height = 5000;
+ shape.coordsize = '5000,5000';
+ shape.path = d;
+ shape.fillcolor = graph.colors.blue;
+ shape.stroked = 'false';
+
+ var contour = document.createElement('v:shape');
+ contour.style.width = 5000;
+ contour.style.height = 5000;
+ contour.coordsize = '5000,5000';
+ contour.setAttribute('path', d);
+ contour.filled = 'false';
+ contour.strokecolor = graph.colors.gray;
+ contour.strokeweight = '2';
+ contour.style.left = 1;
+ contour.style.top = 1;
+ var stroke = document.createElement('v:stroke');
+ stroke.opacity = '20%';
+ contour.appendChild(stroke);
+
+ var g = document.createElement('v:group');
+ g.style.width = 5000;
+ g.style.height = 5000;
+ g.coordsize = '5000,5000';
+ g.style.left = pos.xpos();
+ g.style.top = pos.ypos();
+ g.appendChild(shape);
+ shape.appendChild(title);
+ g.appendChild(contour)
+ return g;
+ };
+
+} else {
+
+ /**
+ * SVG rendering.
+ */
graph.svgns='http://www.w3.org/2000/svg';
/**
@@ -329,8 +379,8 @@ if (graph.supportsSVG()) {
document.body.appendChild(div);
var svg = document.createElementNS(graph.svgns, 'svg');
- svg.style.height = '100%';
- svg.style.width = '100%';
+ svg.style.height = 5000;
+ svg.style.width = 5000;
div.appendChild(svg);
graph.dragging = null;
@@ -338,20 +388,27 @@ if (graph.supportsSVG()) {
function draggable(n) {
if (n == svg)
return null;
- if (n.nodeName == 'g')
+ if (n.nodeName == 'g' && n.id != '')
return n;
return draggable(n.parentNode);
}
+ function bringtotop(n) {
+ if (n == svg)
+ return null;
+ n.parentNode.appendChild(n);
+ return bringtotop(n.parentNode);
+ }
+
svg.onmousedown = function(e) {
if (e.preventDefault)
e.preventDefault();
else
- e.returnValue= false;
+ e.returnValue = false;
graph.dragging = draggable(e.target);
if (graph.dragging == null)
return false;
- graph.dragging.parentNode.appendChild(graph.dragging);
+ bringtotop(graph.dragging);
var pos = typeof e.touches != "undefined" ? e.touches[0] : e;
graph.dragX = pos.clientX;
graph.dragY = pos.clientY;
@@ -381,6 +438,13 @@ if (graph.supportsSVG()) {
var newY = curY + (pos.clientY - graph.dragY);
graph.dragX = pos.clientX;
graph.dragY = pos.clientY;
+
+ if (graph.dragging.id.substring(0, 8) == 'palette:') {
+ // Clone an element dragged from the palette
+ var clone = graph.compshape(graph.dragging.comp, mklist(), graph.mkpath());
+ graph.dragging.parentNode.appendChild(clone);
+ graph.dragging = clone;
+ }
graph.dragging.setAttribute('transform', 'translate(' + newX + ',' + newY + ')');
return false;
};
@@ -389,8 +453,8 @@ if (graph.supportsSVG()) {
graph.titlewidthsvg = document.createElementNS(graph.svgns, 'svg');
graph.titlewidthsvg.style.visibility = 'hidden';
- graph.titlewidthsvg.style.height = '0px';
- graph.titlewidthsvg.style.width = '0px';
+ graph.titlewidthsvg.style.height = 0;
+ graph.titlewidthsvg.style.width = 0;
div.appendChild(graph.titlewidthsvg);
return svg;
@@ -433,20 +497,27 @@ if (graph.supportsSVG()) {
};
/**
- * Return an element representing the title of a component.
+ * Return an element representing a title.
*/
- graph.comptitle = function(comp) {
- var t = scdl.name(comp);
+ graph.mktitle = function(t, bold) {
var title = document.createElementNS(graph.svgns, 'text');
title.setAttribute('text-anchor', 'start');
title.setAttribute('x', 5);
title.setAttribute('y', 15);
- title.style.fontWeight = 'bold';
+ if (bold)
+ title.style.fontWeight = 'bold';
title.appendChild(document.createTextNode(t));
return title;
};
/**
+ * Return an element representing the title of a component.
+ */
+ graph.comptitle = function(comp) {
+ return graph.mktitle(graph.title(comp), true);
+ };
+
+ /**
* Return the width of the title of a component.
*/
graph.comptitlewidth = function(comp) {
@@ -461,12 +532,7 @@ if (graph.supportsSVG()) {
* Return an element representing the title of a reference.
*/
graph.reftitle = function(ref) {
- var t = scdl.name(ref);
- var title = document.createElementNS(graph.svgns, 'text');
- title.setAttribute('text-anchor', 'start');
- title.setAttribute('x', 5);
- title.setAttribute('y', 15);
- return title;
+ return graph.mktitle(graph.title(ref), false);
};
/**
@@ -506,11 +572,59 @@ if (graph.supportsSVG()) {
g.appendChild(shape);
g.appendChild(contour);
g.appendChild(title);
+
+ // Store the component in the shape.
+ g.comp = comp;
+
+ return g;
+ };
+
+ /**
+ * Return a graphical group.
+ */
+ graph.mkgroup = function(pos) {
+ var g = document.createElementNS(graph.svgns, 'g');
+ g.setAttribute('transform', 'translate(' + pos.xpos() + ',' + pos.ypos() + ')');
+ return g;
+ };
+
+ /**
+ * Return a shape representing a button.
+ */
+ graph.mkbutton = function(t, pos) {
+ var title = graph.mktitle(t, true);
+ var d = graph.buttonpath().str();
+
+ var shape = document.createElementNS(graph.svgns, 'path');
+ shape.setAttribute('d', d);
+ shape.setAttribute('fill', graph.colors.blue);
+
+ var contour = document.createElementNS(graph.svgns, 'path');
+ contour.setAttribute('d', d);
+ contour.setAttribute('fill', 'none');
+ contour.setAttribute('stroke', graph.colors.gray);
+ contour.setAttribute('stroke-width', '4');
+ contour.setAttribute('stroke-opacity', '0.20');
+ contour.setAttribute('transform', 'translate(1,1)');
+
+ var g = document.createElementNS(graph.svgns, 'g');
+ g.setAttribute('transform', 'translate(' + pos.xpos() + ',' + pos.ypos() + ')');
+ g.appendChild(shape);
+ g.appendChild(contour);
+ g.appendChild(title);
return g;
};
}
/**
+ * Return the title of a SCDL element.
+ */
+graph.title = function(e) {
+ var d = scdl.documentation(e);
+ return d != null? d : scdl.name(e);
+};
+
+/**
* Return the services and references of a component.
*/
graph.tsvcs = function(comp) {
@@ -707,8 +821,8 @@ graph.tsvcpath = function(svc, cassoc, path) {
};
/**
-* Return a path representing a component.
-*/
+ * Return a path representing a component.
+ */
graph.comppath = function(comp, cassoc) {
var height = graph.compheight(comp, cassoc);
var width = graph.compwidth(comp, cassoc);
@@ -742,22 +856,39 @@ graph.comppath = function(comp, cassoc) {
};
/**
+ * Return a path representing a button.
+ */
+graph.buttonpath = function(t) {
+ var height = 60;
+ var width = 120;
+ var path = graph.mkpath().move(10,0);
+ path = path.line(width - 10,path.ypos()).rcurve(10,0,0,10);
+ path = path.line(path.xpos(),height - 10).rcurve(0,10,-10,0).line(10, path.ypos());
+ path = path.line(10,path.ypos()).rcurve(-10,0,0,-10).line(path.xpos(), 10);
+ path = path.line(0,10).rcurve(0,-10,10,0);
+ return path.end();
+};
+
+/**
+ * Append a list of graphical elements to a parent.
+ */
+graph.append = function(nodes, p) {
+ if (isNil(nodes))
+ return p;
+ p.appendChild(car(nodes));
+ return graph.append(cdr(nodes), p);
+};
+
+/**
* Render a composite.
*/
-graph.composite = function(compos) {
- var name = scdl.name(compos);
+graph.composite = function(compos, pos) {
+ var name = scdl.name(scdl.composite(compos));
var comps = scdl.components(compos);
var cassoc = scdl.nameToElementAssoc(comps);
var proms = scdl.promotions(compos);
function rendercomp(comp, cassoc, pos) {
- function appendg(nodes, parent) {
- if (isNil(nodes))
- return parent;
- parent.appendChild(car(nodes));
- return appendg(cdr(nodes), parent);
- }
-
function renderrrefs(refs, cassoc, pos) {
function renderrref(ref, cassoc, pos) {
var target = assoc(scdl.target(ref), cassoc);
@@ -796,36 +927,51 @@ graph.composite = function(compos) {
var rrefs = graph.rrefs(comp);
var rpos = graph.mkpath().rmove(graph.compwidth(comp, cassoc), 0);
- appendg(renderrrefs(rrefs, cassoc, rpos), gcomp);
+ graph.append(renderrrefs(rrefs, cassoc, rpos), gcomp);
var brefs = graph.brefs(comp);
var bpos = graph.mkpath().rmove(0 , graph.compheight(comp, cassoc));
- appendg(renderbrefs(brefs, cassoc, bpos), gcomp);
+ graph.append(renderbrefs(brefs, cassoc, bpos), gcomp);
return mklist(gcomp);
}
function renderproms(svcs, cassoc, pos) {
- function renderprom(svc, cassoc, pos) {
- var comp = assoc(scdl.promote(svc), cassoc);
- if (isNil(comp))
+ function promcomp(svc, cassoc) {
+ var c = assoc(scdl.promote(svc), cassoc);
+ if (isNil(c))
return mklist();
- return rendercomp(cadr(comp), cassoc, pos);
+ return cadr(c);
}
- function rendermove(svc, cassoc, pos) {
- var comp = assoc(scdl.promote(svc), cassoc);
- if (isNil(comp))
- return pos;
- return pos.clone().rmove(0, graph.compclosureheight(cadr(comp), cassoc) + 20);
+ function comppos(comp, pos) {
+ var x = scdl.x(comp);
+ var y = scdl.y(comp);
+ return graph.mkpath().move(x != null? x : pos.xpos(), y != null? y : pos.ypos());
+ }
+
+ function rendermove(comp, cassoc, pos) {
+ return pos.clone().rmove(0, graph.compclosureheight(comp, cassoc) + 20);
}
if (isNil(svcs))
return mklist();
- return append(renderprom(car(svcs), cassoc, pos), renderproms(cdr(svcs), cassoc, rendermove(car(svcs), cassoc, pos)));
+
+ var comp = promcomp(car(svcs), cassoc);
+ if (isNil(comp))
+ return renderproms(cdr(svcs), cassoc, rendermove(car(svcs), cassoc, pos));
+
+ var cpos = comppos(comp, pos);
+ return append(rendercomp(comp, cassoc, cpos), renderproms(cdr(svcs), cassoc, rendermove(comp, cassoc, cpos)));
}
- var rcomps = renderproms(proms, cassoc, graph.mkpath().rmove(20,20));
- return rcomps;
+ var rproms = renderproms(proms, cassoc, pos.clone().rmove(20,20));
+
+ if (name == 'palette')
+ return map(function(r) {
+ r.id = 'palette:' + r.id;
+ return r;
+ }, rproms);
+ return rproms;
};
diff --git a/sca-cpp/trunk/modules/edit/htdocs/edit/index.html b/sca-cpp/trunk/modules/edit/htdocs/graph/index.html
index 34479a37a5..105e240389 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/edit/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/graph/index.html
@@ -27,13 +27,12 @@
<body>
<div id="menu"></div>
-<h1><span id="titleDiv"></span></h1>
-<div id="editDiv"></div>
+<h1><span id="title"></span></h1>
-<iframe id="menuFrame" src="/menu.html"></iframe>
+<div id="graph"></div>
<script type="text/javascript">
-ui.bindwidget('menuFrame', 'menu');
+ui.loadwidget('menu', '/menu.html');
/**
* Return the current app name.
@@ -48,9 +47,9 @@ function appname() {
function editapp(name) {
if (isNil(name))
return;
- $('titleDiv').innerHTML = 'Editing: ' + name;
- $('editDiv').innerHTML =
- '<iframe id="editFrame" style="visibility: visible; height: 5000px; width: 100%; border: 0px;" scrolling="no" frameborder="0" src="edit.html?' +
+ $('title').innerHTML = 'Editing: ' + name;
+ $('graph').innerHTML =
+ '<iframe id="graphFrame" style="height: 5000px; width: 100%; border: 0px;" scrolling="no" frameborder="0" src="graph.html?' +
'app=' + name +
'"></iframe>';
}
diff --git a/sca-cpp/trunk/modules/edit/htdocs/index.html b/sca-cpp/trunk/modules/edit/htdocs/index.html
index 52ed6259c7..d9791a8b78 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/index.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/index.html
@@ -34,12 +34,13 @@
<p>Try the <a href="dash">App Dashboard</a> to manage your collection of apps.</p>
<h2>App Editor</h2>
-<p>Try the <a href="edit/?app=store">App Editor</a> to edit an app.</p>
+<p>Try the <a href="graph/?app=store">App Editor</a> to edit an app.</p>
-<iframe id="menuFrame" src="menu.html"></iframe>
+<h2>Page Editor</h2>
+<p>Try the <a href="page/?app=store">Page Editor</a> to edit an app page.</p>
<script type="text/javascript">
-ui.bindwidget('menuFrame', 'menu');
+ui.loadwidget('menu', '/menu.html');
</script>
</body>
</html>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/menu.html b/sca-cpp/trunk/modules/edit/htdocs/menu.html
index a4addf1f96..7bf2ef931e 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/menu.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/menu.html
@@ -29,7 +29,7 @@
ui.installwidget();
var mdiv = $('menu');
-mdiv.innerHTML = ui.menubar(mklist(ui.menu('Home', '/'), ui.menu('Dashboard', '/dash'), ui.menu('Editor', '/edit?app=store')), mklist(ui.menu('Sign out', '/logout')));
+mdiv.innerHTML = ui.menubar(mklist(ui.menu('Home', '/'), ui.menu('Dashboard', '/dash')), mklist(ui.menu('Sign out', '/logout')));
</script>
</body>
</html>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/page/index.html b/sca-cpp/trunk/modules/edit/htdocs/page/index.html
new file mode 100644
index 0000000000..e34aca0bea
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/htdocs/page/index.html
@@ -0,0 +1,41 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<html>
+<head>
+<title>App Page Editor</title>
+<meta name="viewport" content="width=device-width user-scalable=no initial-scale=1.0"/>
+<link rel="stylesheet" type="text/css" href="/ui.css">
+<script type="text/javascript" src="/util.js"></script>
+<script type="text/javascript" src="/ui.js"></script>
+</head>
+<body>
+<div id="menu"></div>
+
+<h1>Editing: HTML Page</h1>
+<div id="page"></div>
+
+<script type="text/javascript">
+ui.loadwidget('menu', '/menu.html');
+
+// Display the page widget
+ui.loadwidget('page', 'page.html');
+</script>
+</body>
+</html>
+
diff --git a/sca-cpp/trunk/modules/edit/htdocs/edit/edit.html b/sca-cpp/trunk/modules/edit/htdocs/page/page.html
index d5618834ba..75405ce163 100644
--- a/sca-cpp/trunk/modules/edit/htdocs/edit/edit.html
+++ b/sca-cpp/trunk/modules/edit/htdocs/page/page.html
@@ -26,43 +26,24 @@
<script type="text/javascript" src="/scdl.js"></script>
<script type="text/javascript" src="/ui.js"></script>
<script type="text/javascript" src="/component.js"></script>
-<script type="text/javascript" src="/edit/graph.js"></script>
+<script type="text/javascript" src="page.js"></script>
</head>
<body>
-<script type="text/javascript">
-var editWidget = sca.component("EditWidget");
-var dashboard = sca.reference(editWidget, "dashboard");
-var apps = sca.reference(editWidget, "apps");
+<div id="page" style="position: absolute; width: 5000px; height: 5000px;">
-/**
- * Return the current app name.
- */
-function appname() {
- return ui.queryParams()['app'];
-}
+<input id="palette:button" type="button" value="sample button" style="position: absolute; left:20px; top: 20px;"/>
+<input id="palette:entry" type="text" value="sample value" style="position: absolute; left:20px; top: 60px;"/>
+<span id="palette:text" style="position: absolute; left:20px; top: 100px;">sample text</span>
-/**
- * Get an app and display it.
- */
-function getapp(name) {
- if (isNil(name))
- return;
- apps.get(name, function(doc) {
- var entry = atom.readATOMEntryDocument(doc);
- var item = caddr(entry);
- var composite = cddr(item);
- var comps = scdl.components(composite);
+</div>
- var g = graph.mkgraph();
- var shapes = graph.composite(composite);
- for (var s in shapes)
- g.appendChild(shapes[s]);
- });
-}
+<script type="text/javascript">
+// Install the widget
+ui.installwidget();
-// Display the current app
-getapp(appname());
+// Enable drag&drop on sample UI elements
+page.initpage($('page'));
</script>
</body>
diff --git a/sca-cpp/trunk/modules/edit/htdocs/page/page.js b/sca-cpp/trunk/modules/edit/htdocs/page/page.js
new file mode 100644
index 0000000000..e4554195c1
--- /dev/null
+++ b/sca-cpp/trunk/modules/edit/htdocs/page/page.js
@@ -0,0 +1,204 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Page editing functions.
+ */
+var page = new Object();
+
+if (ui.isIE()) {
+
+ /**
+ * Init a page.
+ */
+ page.initpage = function(elem) {
+ page.dragging = null;
+
+ function draggable(n) {
+ if (n == elem)
+ return null;
+ if (n.id != '')
+ return n;
+ return draggable(n.parentNode);
+ }
+
+ function bringtotop(n) {
+ if (n == elem)
+ return null;
+ n.parentNode.appendChild(n);
+ return bringtotop(n.parentNode);
+ }
+
+ elem.onmousedown = function() {
+ window.event.returnValue = false;
+ page.dragging = draggable(window.event.srcElement);
+ if (page.dragging == null)
+ return false;
+ bringtotop(page.dragging);
+ page.dragX = window.event.clientX;
+ page.dragY = window.event.clientY;
+ elem.setCapture();
+ return false;
+ };
+
+ elem.onmouseup = function() {
+ if (page.dragging == null)
+ return false;
+ page.dragging = null;
+ elem.releaseCapture();
+ return false;
+ };
+
+ elem.onmousemove = function() {
+ if (page.dragging == null)
+ return false;
+ var origX = page.dragging.coordorigin.X;
+ var origY = page.dragging.coordorigin.Y;
+ var newX = origX - (window.event.clientX - page.dragX);
+ var newY = origY - (window.event.clientY - page.dragY);
+ page.dragX = window.event.clientX;
+ page.dragY = window.event.clientY;
+
+ if (page.dragging.id.substring(0, 8) == 'palette:') {
+ // Clone the dragged element
+ page.dragging = page.clone(page.dragging);
+ }
+ page.dragging.style.left = newX;
+ page.dragging.style.top = newY;
+ return false;
+ };
+
+ return elem;
+ };
+
+} else {
+
+ /**
+ * Init a page.
+ */
+ page.initpage = function(elem) {
+ page.dragging = null;
+
+ function draggable(n) {
+ if (n == elem)
+ return null;
+ if (n.id != '')
+ return n;
+ return draggable(n.parentNode);
+ }
+
+ function bringtotop(n) {
+ if (n == elem)
+ return null;
+ n.parentNode.appendChild(n);
+ return bringtotop(n.parentNode);
+ }
+
+ elem.onmousedown = function(e) {
+ if (e.preventDefault)
+ e.preventDefault();
+ else
+ e.returnValue = false;
+ page.dragging = draggable(e.target);
+ if (page.dragging == null)
+ return false;
+ bringtotop(page.dragging);
+ var pos = typeof e.touches != "undefined" ? e.touches[0] : e;
+ page.dragX = pos.clientX;
+ page.dragY = pos.clientY;
+ return false;
+ };
+
+ elem.ontouchstart = elem.onmousedown;
+
+ elem.onmouseup = function(e) {
+ if (page.dragging == null)
+ return false;
+ page.dragging = null;
+ return false;
+ };
+
+ elem.ontouchend = elem.onmouseup;
+
+ elem.onmousemove = function(e) {
+ if (page.dragging == null)
+ return false;
+ var curX = ui.posn(page.dragging.style.left);
+ var curY = ui.posn(page.dragging.style.top);
+ var pos = typeof e.touches != "undefined" ? e.touches[0] : e;
+ var newX = curX + (pos.clientX - page.dragX);
+ var newY = curY + (pos.clientY - page.dragY);
+ page.dragX = pos.clientX;
+ page.dragY = pos.clientY;
+
+ if (page.dragging.id.substring(0, 8) == 'palette:') {
+ // Clone the dragged element
+ page.dragging = page.clone(page.dragging);
+ }
+ page.dragging.style.left = newX;
+ page.dragging.style.top = newY;
+ return false;
+ };
+
+ elem.ontouchmove = elem.onmousemove;
+
+ return elem;
+ };
+}
+
+/**
+ * Clone an HTML element.
+ */
+page.elemcount = 0;
+
+page.clone = function(e) {
+ function mkclone(e) {
+ if (e.nodeName == 'INPUT' && e.type == 'button') {
+ var ne = document.createElement('input');
+ ne.type = 'button';
+ ne.id = 'button' + (++page.elemcount);
+ ne.value = ne.id;
+ return ne;
+ }
+ if (e.nodeName == 'INPUT' && e.type == 'text') {
+ var ne = document.createElement('input');
+ ne.type = 'text';
+ ne.id = 'entry' + (++page.elemcount);
+ ne.value = ne.id;
+ return ne;
+ }
+ if (e.nodeName == 'SPAN') {
+ var ne = document.createElement('span');
+ ne.id = 'text' + (++page.elemcount);
+ ne.innerHTML = ne.id;
+ return ne;
+ }
+ }
+
+ function posclone(ne, e) {
+ ne.style.position = 'absolute';
+ ne.style.left = ui.posn(e.style.left);
+ ne.style.top = ui.posn(e.style.top);
+ e.parentNode.appendChild(ne);
+ return ne;
+ }
+
+ return posclone(mkclone(e), e);
+};
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:46:30 +0000