Author: jsdelfino
Date: Fri Mar 7 19:24:10 2008
New Revision: 634894
URL: http://svn.apache.org/viewvc?rev=634894&view=rev
Log:
Minor admin UI improvements and added a style sheet.
Added:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/admin.css
(with props)
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/files.html
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/home.html
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/workspace.html
Added:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/admin.css
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/admin.css?rev=634894&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/admin.css
(added)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/admin.css
Fri Mar 7 19:24:10 2008
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+body {
+ white-space: nowrap
+}
+
+table {
+ border: 1px; border-collapse: separate
+}
+
+th {
+ font-weight: bold; white-space: nowrap; background-color: #e5ecf9;
color: #598edd;
+ text-align: left; padding-left: 2px; padding-right: 20px; padding-top:
2px; padding-bottom: 2px; vertical-align:top;
+ border-top: 1px; border-bottom: 1px; border-left: 0px; border-right:
0px;
+ border-style: solid; border-top-color: #a2bae7; border-bottom-color:
#d1d3d4
+}
+
+td {
+ padding-left: 2px; padding-top: 2px; padding-right: 20px; white-space:
nowrap; vertical-align: top
+}
+
+input {
+ vertical-align: top
+}
+
+a:link {
+ color: blue
+}
+
+a:visited {
+ color: blue
+}
+
+.tdw {
+ padding-left: 2px; padding-top: 2px; padding-right: 20px; white-space:
normal; vertical-align: top
+}
+
+.hd1 {
+ font-size:150%; font-weight: bold
+}
+
+.tbar {
+ margin: 0px;
+ padding-top: 0px; padding-left: 0px; padding-right: 0px;
padding-bottom: 3px;
+ border-bottom: 1px solid #a2bae7
+}
+
+.ltbar {
+ padding-left: 0px; padding-top: 0px; padding-right: 20px; white-space:
nowrap; vertical-align: top
+}
+
+.rtbar {
+ padding-left: 0px; padding-right: 0px; padding-top: 0px; white-space:
nowrap; vertical-align: top;
+ text-align: right
+}
+
Propchange:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/admin.css
------------------------------------------------------------------------------
svn:eol-style = native
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=634894&r1=634893&r2=634894&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
Fri Mar 7 19:24:10 2008
@@ -46,10 +46,8 @@
if (feed != null) {
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>';
+ composites += '<table width="100%">';
+ composites +=
'<tr><th>Cloud</th><th>Nodes</th><th>Log</th></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");
@@ -57,11 +55,11 @@
var uri = contributionURI(id);
var qname = compositeName(id);
- composites += '<tr valign="bottom">'
+ composites += '<tr>'
composites += '<td><input name="composites"
type="checkbox" value="' + id + '">' +
'<a href=\"' + location + '\">' + qname + '</a></td>';
- composites += '<td> ' +
components + '</td>';
- composites += '<td align="center"><img
src="icons/feed-icon.png" border="0"></td>';
+ composites += '<td class=tdw>' + components +
'</td>';
+ composites += '<td><img
src="icons/feed-icon.png" border="0"></td>';
composites += '</tr>';
}
composites += '</table>';
@@ -106,40 +104,44 @@
</script>
+<link rel="stylesheet" type="text/css" href="admin.css">
</head>
<body onload="toolbar()">
<div id="toolbar"></div>
<div id="cloudComposite">
- <p style="font-size:150%">
- <b>SCA Domain</b><br><br><b>Clouds</b> <a href="/cloud/"><img
src="icons/feed-icon.png" border="0"></a>
- </p>
+ <br>
+ <span class=hd1>
+ SCA Domain<br><br>
+ Clouds</b> <a href="/cloud/"><img src="icons/feed-icon.png"
border="0"></a>
+ </span>
+ <br><br>
Here is the list of nodes configured in SCA clouds.
<br><br>
<form name="cloudCompositeForm">
<div id="composites" ></div>
- <br/>
+ <br>
<input type="button" onClick="startComposite()" value="Start" />
<input type="button" onClick="stopComposite()" value="Stop" />
<input type="button" onClick="deleteComposite()" value="Delete" />
</form>
- <br/>
-
- <p><b>Add a Cloud</b>
- </p>
- Add a cloud. A cloud is composed of one or more nodes.
+
<br><br>
<form name="newCompositeForm">
- <table border="0">
- <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 width="100%">
+ <tr><th>Add a Cloud</th></tr>
+ <tr><td>Add a cloud. A cloud is composed of one or more nodes.</td></tr>
+ </table>
+ <br>
+ <table>
+ <tr><td>Cloud composite namespace:</td><td><input type="text"
name="compositeNamespace" size="50"/></td><td>e.g. http://my/namespace</td></tr>
+ <tr><td>Cloud composite name:</td><td><input type="text"
name="compositeName" size="50"/></td><td>e.g. mycomposite</td></tr>
+ <tr><td>Cloud contribution URI:</td><td><input type="text"
name="contributionURI" size="50"/></td></td><td>e.g. mycontrib,
http:/mycontrib</td></tr>
</table>
- <br/>
<input type="button" onClick="addComposite()" value="Add" />
</form>
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=634894&r1=634893&r2=634894&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
Fri Mar 7 19:24:10 2008
@@ -46,11 +46,11 @@
if (feed != null) {
var entries = feed.getElementsByTagName("entry");
var composites = "";
- composites += '<table border="0">';
- composites += '<tr
valign="bottom"><td><b>Composite</b></td>' +
- '<td> <b>Contribution</b></td>' +
- '<td> <b>Components</b></td>' +
- '<td> <b>Install Image</b></td></tr>';
+ composites += '<table width="100%">';
+ composites += '<tr><th>Composite</th>' +
+ '<th>Contribution</th>' +
+ '<th>Components</th>' +
+ '<th>Composite Install Image</th></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");
@@ -58,12 +58,12 @@
var uri = contributionURI(id);
var qname = compositeName(id);
- composites += '<tr valign="bottom">'
+ composites += '<tr>'
composites += '<td><input name="composites"
type="checkbox" value="' + id + '">';
composites += '<a href=\"' + location + '\">' +
qname + '</a></td>';
- composites += '<td> ' + uri +
'</td>';
- composites += '<td> ' +
components + '</td>';
- composites += '<td
align="center"> <a href="/package/?composite=' + id + '"><img
src="icons/feed-icon.png" border="0"></a></td>';
+ composites += '<td>' + uri + '</td>';
+ composites += '<td class=tdw>' + components +
'</td>';
+ composites += '<td><a
href="/package/?composite=' + id + '"><img src="icons/feed-icon.png"
border="0"></a></td>';
composites += '</tr>';
}
composites += '</table>';
@@ -107,37 +107,41 @@
getComposites();
</script>
+<link rel="stylesheet" type="text/css" href="admin.css">
</head>
<body onload="toolbar()">
<div id="toolbar"></div>
<div id="domainComposite">
- <p style="font-size:150%">
- <b>SCA Domain</b><br><br><b>Domain Composite</b> <a
href="/composite/"><img src="icons/feed-icon.png" border="0"></a>
- </p>
+ <br>
+ <span class=hd1>
+ SCA Domain<br><br>
+ Domain Composite <a href="/composite/"><img src="icons/feed-icon.png"
border="0"></a>
+ </span>
+ <br><br>
Here is the list of SCA composites currently included as top-level
composites in your SCA domain.
<br><br>
<form name="domainCompositeForm">
<div id="composites" ></div>
- <br/>
+ <br>
<input type="button" onClick="deleteComposite()" value="Delete" />
</form>
- <br/>
- <p><b>Add Composite</b>
- </p>
- Add a composite describing your SCA service components.
<br><br>
<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>
+ <table width="100%">
+ <tr><th>Add Composite</th></tr>
+ <tr><td>Add a composite describing your SCA service components.</td></tr>
+ </table>
+ <br>
+ <table>
+ <tr><td>Contribution URI:</td><td><input type="text"
name="contributionURI" size="50"/></td><td>e.g. mycontrib,
http:/mycontrib</td></tr>
+ <tr><td>Composite namespace:</td><td><input type="text"
name="compositeNamespace" size="50"/></td><td>e.g.
http://my/namespace</td></tr>
+ <tr><td>Composite name:</td><td><input type="text" name="compositeName"
size="50"/></td><td>e.g. mycomposite</td></tr>
</table>
- <br/>
<input type="button" onClick="addComposite()" value="Add" />
</form>
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html?rev=634894&r1=634893&r2=634894&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/files.html
Fri Mar 7 19:24:10 2008
@@ -35,13 +35,14 @@
function getFilesResponse(feed) {
if (feed != null) {
var entries = feed.getElementsByTagName("entry");
- var list = "";
+ var list = '<table
width="100%"><tr><th>Files</th></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");
- list += '<input name="files" type="checkbox"
value="' + id + '">' +
-
'<a href=\"' + location + '\">' + id + '</a><br/>';
+ list += '<tr><td><input name="files"
type="checkbox" value="' + id + '">' +
+
'<a href=\"' + location + '\">' + id + '</a></td></tr>';
}
+ list += "</table>";
document.getElementById("files").innerHTML = list;
}
}
@@ -67,33 +68,38 @@
getFiles();
</script>
+<link rel="stylesheet" type="text/css" href="admin.css">
</head>
<body onload="toolbar()">
<div id="toolbar"></div>
<div id="fileServer">
- <p style="font-size:150%">
- <b>SCA Domain</b><br><br><b>Contribution File Server</b> <a
href="/feed/files/"><img src="icons/feed-icon.png" border="0"></a>
- </p>
+ <br>
+ <span class=hd1>
+ SCA Domain<br><br>
+ Contribution File Server <a href="/composite/"><img
src="icons/feed-icon.png" border="0"></a>
+ </span>
+ <br><br>
This is a simple ATOM-based file server useful to share SCA contributions if
you don't have an FTP, SVN or Maven repository.
<br><br>
-
+
<form name="filesForm">
<div id="files" ></div>
<br/>
<input type="button" onClick="deleteFile()" value="Delete" />
</form>
- <br/>
-
- <p><b>Upload Contribution</b>
- </p>
- Upload an SCA contribution file to the server.
- <br><br>
+ <br><br>
+
<form method="post" name="uploadFileForm" enctype='multipart/form-data'
action='/files'>
+ <table width="100%">
+ <tr><th>Upload</th></tr>
+ <tr><td>Upload an SCA contribution file to the server.</td></tr>
+ </table>
+ <br>
<table border="0">
- <tr><td>File:</td><td><input type="file" name="file" /></td></tr>
+ <tr><td>File:</td><td><input type="file" name="file" size="50"/></td></tr>
</table>
<br/>
<input type="button" onClick="uploadFile()" value="Upload" />
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/home.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/home.html?rev=634894&r1=634893&r2=634894&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/home.html
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/home.html
Fri Mar 7 19:24:10 2008
@@ -26,22 +26,25 @@
<script language="JavaScript">
</script>
+<link rel="stylesheet" type="text/css" href="admin.css">
</head>
<body onload="toolbar()">
<div id="toolbar"></div>
- <p style="font-size:150%">
- <b>SCA Domain</b>
- </p>
+ <br>
+ <span class=hd1>
+ SCA Domain
+ </span>
- <br><br><br><br><br>
- <form>
- <table border="0" align="center">
- <tr><td valign="top"><span style="font-size:150%; color:
blue">Search:</span></td><td><input type="text" name="search"
size="50"/></td></tr>
- <tr><td></td><td align="center"><input type="button" name="search"
value="Search" /></td></tr>
- </table>
- </form>
+ <br><br><br><br><br>
+
+ <form>
+ <table border="0" align="center">
+ <tr><td valign="top"><span style="font-size:150%; color:
blue">Search:</span></td><td><input type="text" name="search"
size="50"/></td></tr>
+ <tr><td></td><td align="center"><input type="button" name="search"
value="Search" /></td></tr>
+ </table>
+ </form>
</body>
</html>
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js?rev=634894&r1=634893&r2=634894&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/resources/utils.js
Fri Mar 7 19:24:10 2008
@@ -25,7 +25,7 @@
Tool.prototype.print = function() {
var loc = '' + location;
if (loc.match(this.href) == null) {
- return '<a href="' + this.href + '" style="color: blue">' +
this.name + '</a>';
+ return '<a href="' + this.href + '">' + this.name + '</a>';
} else {
return '<span>' + this.name + '</span>';
}
@@ -33,22 +33,16 @@
function toolbar() {
- var toolbar = '<table border="0" cellspacing="0" cellpadding="0"
width="100%" ' +
- ' style="padding-bottom: 2px; border-bottom: 1px solid blue"><tr>' +
- '<td>' +
- '<table border="0" cellspacing="0" cellpadding="0"><tr>';
+ var toolbar = '<table width="100%" cellpadding="0" cellspacing="0"
class=tbar><tr>' +
+ '<td class=ltbar><table border="0" cellspacing="0"
cellpadding="0"><tr>';
for (var i = 0; i < tools.length; i++) {
- toolbar = toolbar + '<td>' +tools[i].print() +
' </td>'
+ toolbar = toolbar + '<td class=ltbar>' +tools[i].print() + '</td>'
}
- toolbar = toolbar + '</tr></table>' +
- '</td>' +
- '<td>' +
- '<table border="0" cellspacing="0" cellpadding="0" align="right"><tr>' +
- '<td>' + home.print() + '</td>' +
- '</tr></table>' +
- '</td>' +
+ toolbar = toolbar + '</tr></table></td>' +
+ '<td class=rtbar><table border="0" cellpadding="0" cellspacing="0"
align="right"><tr>' +
+ '<td class=rtbar>' + home.print() + '</td></tr></table></td>' +
'</tr></table>';
document.getElementById('toolbar').innerHTML = toolbar;
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=634894&r1=634893&r2=634894&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
Fri Mar 7 19:24:10 2008
@@ -36,18 +36,16 @@
if (feed != null) {
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>';
+ contributions += '<table width="100%">';
+ contributions +=
'<tr><th>Contribution</th><th>Dependencies</td><th>Deployables</th></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>';
contributions += '<td><input
name="contributions" type="checkbox" value="' + id + '">' +
'<a href=\"' + location + '\">' + id + '</a></td>';
- contributions += '<td
align="center"> <a href=\"/workspace/?dependencies=' + 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 += '<td><a
href=\"/workspace/?dependencies=' + id + '\"><img src="icons/feed-icon.png"
border="0"></a></td>';
+ contributions += '<td><a
href=\"/deployable/?contribution=' + id + '\"><img src="icons/feed-icon.png"
border="0"></a></td>';
contributions += '</tr>';
}
contributions += '</table>';
@@ -75,8 +73,7 @@
var entry = '<entry xmlns="http://www.w3.org/2005/Atom";>' +
'<title>Contribution - ' + id +'</title>' +
'<id>' + id + '</id>' +
- '<link rel="alternate" href="' + location + '" />' +
- '<link rel="edit" href="' + location + '" />' +
+ '<link href="' + location + '" />' +
'</entry>';
workspace.post(entry, addContributionResponse);
}
@@ -90,36 +87,39 @@
getContributions();
</script>
+<link rel="stylesheet" type="text/css" href="admin.css">
</head>
<body onload="toolbar()">
<div id="toolbar"></div>
<div id="workspace">
- <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>
+ <br>
+ <span class=hd1>
+ SCA Domain<br><br>
+ Contributions</b> <a href="/workspace/"><img src="icons/feed-icon.png"
border="0"></a> </span>
+ <br><br>
Here is the list of SCA contributions currently available in your SCA domain.
<br><br>
<form name="workspaceForm">
<div id="contributions" ></div>
- <br/>
+ <br>
<input type="button" onClick="deleteContribution()" value="Delete" />
</form>
- <br/>
-
- <p><b>Add Contribution</b>
- </p>
- Add an SCA contribution containing your application artifacts to the SCA
domain.
+
<br><br>
<form name="newContributionForm">
- <table border="0" >
- <tr><td>Contribution URI:</td><td><input type="text" name="contributionID"
/></td></td><td>e.g. mycontrib, http:/mycontrib</td></tr>
- <tr><td>Address:</td><td><input type="text" name="contributionLocation"
/></td></td><td>e.g. http://host/myjar.jar, file:/mydir,
file:/myjar.jar</td></tr>
+ <table width="100%">
+ <tr><th>Add Composite</th></tr>
+ <tr><td>Add an SCA contribution containing your application artifacts to
the SCA domain.</td></tr>
+ </table>
+ <br>
+ <table>
+ <tr><td>Contribution URI:</td><td><input type="text" name="contributionID"
size="50"/></td></td><td>e.g. mycontrib, http:/mycontrib</td></tr>
+ <tr><td>Address:</td><td><input type="text" name="contributionLocation"
size="50"/></td></td><td>e.g. http://host/myjar.jar, file:/mydir,
file:/myjar.jar</td></tr>
</table>
- <br/>
<input type="button" onClick="addContribution()" value="Add" />
</form>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
