From b4384d70fc8c4dc583f0677a94372efa054d6516 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 4 Aug 2008 20:26:31 +0000 Subject: Isolate widgets from each other, have them work off the HTML div that they're in instead of the parent document. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@682493 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/resources/cloud-gadget.html | 104 ++++++++++++++------- .../domain-manager/src/main/resources/cloud.html | 6 ++ .../src/main/resources/composite-gadget.html | 57 ++++++----- .../src/main/resources/composite.html | 4 + .../src/main/resources/toolbar-gadget.html | 5 +- .../domain-manager/src/main/resources/utils.js | 20 +++- .../src/main/resources/workspace-gadget.html | 47 ++++++---- .../src/main/resources/workspace.html | 4 + 8 files changed, 169 insertions(+), 78 deletions(-) (limited to 'java') diff --git a/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html b/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html index 7052a68f40..dc8aa672b8 100644 --- a/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/cloud-gadget.html @@ -29,7 +29,7 @@
-
+

@@ -40,7 +40,7 @@

- + @@ -60,7 +60,6 @@ diff --git a/java/sca/modules/domain-manager/src/main/resources/cloud.html b/java/sca/modules/domain-manager/src/main/resources/cloud.html index 08a24cad26..2a64f91f54 100644 --- a/java/sca/modules/domain-manager/src/main/resources/cloud.html +++ b/java/sca/modules/domain-manager/src/main/resources/cloud.html @@ -47,8 +47,14 @@ function ongadget(win, doc) { if (doc == content(toolbarGadget)) { toolbarGadgetDiv.innerHTML = doc.body.innerHTML; + return toolbarGadgetDiv; } else if (doc == content(cloudGadget)) { cloudGadgetDiv.innerHTML = doc.body.innerHTML; + cloudGadgetDiv.showStatus = true; + cloudGadgetDiv.showComposites = true; + cloudGadgetDiv.showContributions = true; + cloudGadgetDiv.showConfigurations = true; + return cloudGadgetDiv; } return document; } diff --git a/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html b/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html index 062af53667..1cfbd70333 100644 --- a/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/composite-gadget.html @@ -29,7 +29,7 @@
- +

@@ -37,7 +37,7 @@

- +
Add a Node
Add a node to the cloud. The node will run the SCA components declared in the specified composite.
@@ -55,14 +55,17 @@ diff --git a/java/sca/modules/domain-manager/src/main/resources/composite.html b/java/sca/modules/domain-manager/src/main/resources/composite.html index 33f4535499..f7fcec868f 100644 --- a/java/sca/modules/domain-manager/src/main/resources/composite.html +++ b/java/sca/modules/domain-manager/src/main/resources/composite.html @@ -47,8 +47,12 @@ function ongadget(win, doc) { if (doc == content(toolbarGadget)) { toolbarGadgetDiv.innerHTML = doc.body.innerHTML; + return toolbarGadgetDiv; } else if (doc == content(compositeGadget)) { compositeGadgetDiv.innerHTML = doc.body.innerHTML; + compositeGadgetDiv.showContributions = true; + compositeGadgetDiv.showComponents = true; + return compositeGadgetDiv; } return document; } diff --git a/java/sca/modules/domain-manager/src/main/resources/toolbar-gadget.html b/java/sca/modules/domain-manager/src/main/resources/toolbar-gadget.html index 2cc555473c..c9389affc3 100644 --- a/java/sca/modules/domain-manager/src/main/resources/toolbar-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/toolbar-gadget.html @@ -39,8 +39,9 @@ tools[3] = new Tool("Files", "../files"); var home = new Tool("Home", "../home"); - - gadget.getElementById('toolbar').innerHTML = toolbar(home, tools); + + var toolbarDiv = elementByID(gadget, 'toolbar'); + toolbarDiv.innerHTML = toolbar(home, tools); diff --git a/java/sca/modules/domain-manager/src/main/resources/utils.js b/java/sca/modules/domain-manager/src/main/resources/utils.js index 20f0148954..77ed807e85 100644 --- a/java/sca/modules/domain-manager/src/main/resources/utils.js +++ b/java/sca/modules/domain-manager/src/main/resources/utils.js @@ -210,7 +210,25 @@ function content(win) { } /** - * Install a gadget + * Returns a child element with the given id. + */ +function elementByID(node, id) { + for (var i in node.childNodes) { + var child = node.childNodes[i]; + if (child.id == id) { + return child; + } else { + child = elementByID(child, id); + if (child != null) { + return child; + } + } + } + return null; +} + +/** + * Install a gadget. */ function gadget(win, doc) { var ongadget = null; diff --git a/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html b/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html index 9e4c6c014d..a86ef512f7 100644 --- a/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html +++ b/java/sca/modules/domain-manager/src/main/resources/workspace-gadget.html @@ -29,7 +29,7 @@
- +

@@ -37,7 +37,7 @@

- +
Add Composite
Add an SCA composite describing your SCA service components.
@@ -54,11 +54,15 @@ diff --git a/java/sca/modules/domain-manager/src/main/resources/workspace.html b/java/sca/modules/domain-manager/src/main/resources/workspace.html index f3114b3a14..9d40a2ecc6 100644 --- a/java/sca/modules/domain-manager/src/main/resources/workspace.html +++ b/java/sca/modules/domain-manager/src/main/resources/workspace.html @@ -46,8 +46,12 @@ function ongadget(win, doc) { if (doc == content(toolbarGadget)) { toolbarGadgetDiv.innerHTML = doc.body.innerHTML; + return toolbarGadgetDiv; } else if (doc == content(workspaceGadget)) { workspaceGadgetDiv.innerHTML = doc.body.innerHTML; + workspaceGadgetDiv.showDependencies = true; + workspaceGadgetDiv.showDeployables = true; + return workspaceGadgetDiv; } return document; } -- cgit v1.2.3
Add Contribution
Add an SCA contribution containing your application artifacts to the SCA domain.