Author: jsdelfino
Date: Wed Mar 5 17:28:23 2008
New Revision: 634113
URL: http://svn.apache.org/viewvc?rev=634113&view=rev
Log:
Minor improvements of the admin pages.
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html?rev=634113&r1=634112&r2=634113&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/cloud.html
Wed Mar 5 17:28:23 2008
@@ -18,7 +18,7 @@
-->
<html>
<head>
-<title>SCA Domain - Node Cloud</title>
+<title>SCA Domain - Node Clouds</title>
<script type="text/javascript" src="cloud.js"></script>
<script type="text/javascript" src="utils.js"></script>
@@ -47,6 +47,9 @@
var entries = feed.getElementsByTagName("entry");
var composites = "";
composites += '<table border="0" valign="bottom">';
+ composites += '<tr valign="bottom">' +
+
'<td><b>Cloud</b></td><td> <b>Nodes</b></td>' +
+ '<td> <b>Log</b></td></tr>';
for (var i=0; i<entries.length; i++) {
var id =
entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
var location =
entries[i].getElementsByTagName("link")[0].getAttribute("href");
@@ -55,7 +58,9 @@
composites += '<tr valign="bottom">'
composites += '<td><input name="composites"
type="checkbox" value="' + id + '">' +
-
'<a href=\"' + location + '\">' + uri + ' - ' + qname + '</a></td>';
+
'<a href=\"' + location + '\">' + qname + '</a></td>';
+ composites += '<td> Node1,
Node2, Node3</td>';
+ composites += '<td align="center"><img
src="icons/feed-icon.png" border="0"></td>';
composites += '</tr>';
}
composites += '</table>';
@@ -90,7 +95,8 @@
}
function addCompositeResponse() {
- document.newCompositeForm.compositeQName.value = "";
+ document.newCompositeForm.compositeNamespace.value = "";
+ document.newCompositeForm.compositeName.value = "";
document.newCompositeForm.contributionURI.value = "";
getComposites();
}
@@ -106,10 +112,9 @@
<div id="cloudComposite">
<p style="font-size:150%">
- <b>SCA Domain</b><br><br><b>Node Cloud</b> <a href="/cloud/"><img
src="icons/feed-icon.png" border="0"></a>
+ <b>SCA Domain</b><br><br><b>Node Clouds</b> <a href="/cloud/"><img
src="icons/feed-icon.png" border="0"></a>
</p>
- Here are the SCA composites describing the SCA nodes currently in your SCA
node cloud.<br>
- SCA nodes are described as special SCA components of type
"implementation.node".
+ Here is the list of nodes configured in SCA node clouds.
<br><br>
<form name="cloudCompositeForm">
@@ -122,16 +127,16 @@
</form>
<br/>
- <p><b>Add Nodes</b>
+ <p><b>Add a Node Cloud</b>
</p>
- Add a composite describing one ore more SCA nodes to add to the cloud.
+ Add a node cloud. A cloud is composed of one or more nodes.
<br><br>
<form name="newCompositeForm">
<table border="0">
- <tr><td>Contribution URI:</td><td><input type="text"
name="contributionURI" /></td></td><td>e.g. mycontrib, http:/mycontrib</td></tr>
- <tr><td>Composite Namespace:</td><td><input type="text"
name="compositeNamespace" /></td><td>e.g. http://my/namespace</td></tr>
- <tr><td>Composite Name:</td><td><input type="text" name="compositeName"
/></td><td>e.g. mycomposite</td></tr>
+ <tr><td>Cloud composite namespace:</td><td><input type="text"
name="compositeNamespace" /></td><td>e.g. http://my/namespace</td></tr>
+ <tr><td>Cloud composite name:</td><td><input type="text"
name="compositeName" /></td><td>e.g. mycomposite</td></tr>
+ <tr><td>Cloud contribution URI:</td><td><input type="text"
name="contributionURI" /></td></td><td>e.g. mycontrib, http:/mycontrib</td></tr>
</table>
<br/>
<input type="button" onClick="addComposite()" value="Add" />
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html?rev=634113&r1=634112&r2=634113&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/composite.html
Wed Mar 5 17:28:23 2008
@@ -18,7 +18,7 @@
-->
<html>
<head>
-<title>SCA Domain - Top Level Composites</title>
+<title>SCA Domain - Domain Composite</title>
<script type="text/javascript" src="composite.js"></script>
<script type="text/javascript" src="utils.js"></script>
@@ -47,7 +47,9 @@
var entries = feed.getElementsByTagName("entry");
var composites = "";
composites += '<table border="0">';
- compositeIDs = new Array();
+ composites += '<tr
valign="bottom"><td><b>Composite</b></td>' +
+ '<td> <b>Contribution</b></td>' +
+ '<td> <b>Deployment</b></td></tr>';
for (var i=0; i<entries.length; i++) {
var id =
entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
var location =
entries[i].getElementsByTagName("link")[0].getAttribute("href");
@@ -55,9 +57,10 @@
var qname = compositeName(id);
composites += '<tr valign="bottom">'
- composites += '<td><input name="composites"
type="checkbox" value="' + id + '">' +
-
'<a href=\"' + location + '\">' + uri + ' - ' + qname + '</a></td>';
- composites += '<td> <a
href=\"/package/?deployable=' + id + '\">installable package</a></td>';
+ composites += '<td><input name="composites"
type="checkbox" value="' + id + '">';
+ composites += '<a href=\"' + location + '\">' +
qname + '</a></td>';
+ composites += '<td> ' + uri +
'</td>';
+ composites += '<td
align="center"> <a href="/package/?deployable=' + id + '"><img
src="icons/feed-icon.png" border="0"></a></td>';
composites += '</tr>';
}
composites += '</table>';
@@ -92,7 +95,8 @@
}
function addCompositeResponse() {
- document.newCompositeForm.compositeQName.value = "";
+ document.newCompositeForm.compositeNamespace.value = "";
+ document.newCompositeForm.compositeName.value = "";
document.newCompositeForm.contributionURI.value = "";
getComposites();
}
@@ -107,9 +111,9 @@
<div id="domainComposite">
<p style="font-size:150%">
- <b>SCA Domain</b><br><br><b>Top Level Composites</b> <a
href="/composite/"><img src="icons/feed-icon.png" border="0"></a>
+ <b>SCA Domain</b><br><br><b>Domain Composite</b> <a
href="/composite/"><img src="icons/feed-icon.png" border="0"></a>
</p>
- Here are the SCA composites currently included as top-level composites in
your SCA domain.
+ Here is the list of SCA composites currently included as top-level
composites in your SCA domain.
<br><br>
<form name="domainCompositeForm">
@@ -127,8 +131,8 @@
<form name="newCompositeForm">
<table border="0">
<tr><td>Contribution URI:</td><td><input type="text"
name="contributionURI" /></td><td>e.g. mycontrib, http:/mycontrib</td></tr>
- <tr><td>Composite Namespace:</td><td><input type="text"
name="compositeNamespace" /></td><td>e.g. http://my/namespace</td></tr>
- <tr><td>Composite Name:</td><td><input type="text" name="compositeName"
/></td><td>e.g. mycomposite</td></tr>
+ <tr><td>Composite namespace:</td><td><input type="text"
name="compositeNamespace" /></td><td>e.g. http://my/namespace</td></tr>
+ <tr><td>Composite name:</td><td><input type="text" name="compositeName"
/></td><td>e.g. mycomposite</td></tr>
</table>
<br/>
<input type="button" onClick="addComposite()" value="Add" />
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html?rev=634113&r1=634112&r2=634113&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
Wed Mar 5 17:28:23 2008
@@ -37,14 +37,17 @@
var entries = feed.getElementsByTagName("entry");
var contributions = "";
contributions += '<table border="0">';
+ contributions += '<tr
valign="bottom"><td><b>Contribution</b></td>' +
+ '<td> <b>Dependencies</b></td>' +
+ '<td> <b>Deployables</b></td></tr>';
for (var i=0; i<entries.length; i++) {
var id =
entries[i].getElementsByTagName("id")[0].firstChild.nodeValue;
var location =
entries[i].getElementsByTagName("link")[0].getAttribute("href");
- contributions += '<tr valign="bottom">'
+ contributions += '<tr valign="bottom">';
contributions += '<td><input
name="contributions" type="checkbox" value="' + id + '">' +
'<a href=\"' + location + '\">' + id + '</a></td>';
- contributions += '<td> <a
href=\"/workspace/?requiredBy=' + id + '\">dependencies</a></td>';
- contributions += '<td> <a
href=\"/deployable/?contribution=' + id + '\">deployables</a></td>';
+ contributions += '<td
align="center"> <a href=\"/workspace/?requiredBy=' + id +
'\"><img src="icons/feed-icon.png" border="0"></a></td>';
+ contributions += '<td
align="center"> <a href=\"/deployable/?contribution=' + id +
'\"><img src="icons/feed-icon.png" border="0"></a></td>';
contributions += '</tr>';
}
contributions += '</table>';
@@ -96,7 +99,7 @@
<p style="font-size:150%">
<b>SCA Domain</b><br><br><b>Contributions</b> <a
href="/workspace/"><img src="icons/feed-icon.png" border="0"></a>
</p>
- Here are the SCA contributions currently available in your SCA domain.
+ Here is the list of SCA contributions currently available in your SCA domain.
<br><br>
<form name="workspaceForm">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
