Menu
▾
▴
[Smartfrog-checkins] SF.net SVN: smartfrog:[8232] trunk/core/components/cloudfarmer/site/html/ mombasa-portlet
|
From: <st...@us...> - 2010-02-23 17:00:40
|
Revision: 8232
http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8232&view=rev
Author: steve_l
Date: 2010-02-23 17:00:33 +0000 (Tue, 23 Feb 2010)
Log Message:
-----------
SFOS-1456 Move cloudfarmer web front end to styles, improve appearance
Modified Paths:
--------------
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_dynamic.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_named.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_node_status.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_admin.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_change_manager.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_diagnostics.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_in_role.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_roles.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_nav.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_viewhost.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/create_role_instance.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/template.jsp
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/style.css
Added Paths:
-----------
trunk/core/components/cloudfarmer/site/html/mombasa-portlet/html-head.jsp
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_dynamic.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_dynamic.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_dynamic.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -28,7 +28,8 @@
<html:form action="/mombasa-portlet/cluster/add_dynamic/process" method="post" focus="minWorkers">
- <table border="0" cellpadding="0" cellspacing="0">
+ <table cellpadding="0" cellspacing="0">
+ <tbody>
<tr>
<td>
Minimum number of workers
@@ -62,7 +63,7 @@
</html:reset>
</td>
</tr>
-
+ </tbody>
</table>
<p>If a master node is needed, it will be added automatically</p>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_named.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_named.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_named.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -29,12 +29,13 @@
<html:form action="/mombasa-portlet/cluster/add_named/process" method="post" focus="name">
- <table border="0" cellpadding="0" cellspacing="0">
+ <table cellpadding="0" cellspacing="0">
+ <tbody>
<tr>
<td>
Name
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:text name="clusterAddNamedForm" property="name" size="23"/>
</td>
@@ -44,7 +45,7 @@
<td>
Worker
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:checkbox name="clusterAddNamedForm" property="worker" />
</td>
@@ -54,7 +55,7 @@
<td>
Master
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<logic:notEmpty name="cluster.master.hostname">
<bean:write name="cluster.master.hostname"/>
@@ -71,14 +72,14 @@
Add
</html:submit>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:reset>
Reset
</html:reset>
</td>
</tr>
-
+ </tbody>
</table>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_node_status.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_node_status.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_node_status.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -28,16 +28,17 @@
</div>
-<p>Operation status</p>
+<h3>Operation status:
<bean:write name="farmer.work.status"/>
-
+</h3>
<logic:notEmpty name="farmer.work.status.events">
- <table border="0">
- <tr bgcolor="grey">
+ <table cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr class="header" >
<th>Level</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Message</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
</tr>
<logic:iterate id="event"
property="list"
@@ -47,12 +48,13 @@
<td>
<bean:write name="event" property="level"/>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<bean:write name="event" property="message"/>
</td>
</tr>
</logic:iterate>
+ </tbody>
</table>
</logic:notEmpty>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_admin.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_admin.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_admin.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -22,25 +22,45 @@
<%@ include file="/html/mombasa-portlet/cluster/init.jsp" %>
-<table border="0" width="100%">
+<table class="wide" cellpadding="0" cellspacing="0">
+ <tr class="header">
+ <th>Action</th>
+ <th class="padding"></th>
+ <th>Description</th>
+ </tr>
+ <tbody>
+ <tr>
+ <td>
+ <html:link
+ action="/mombasa-portlet/cluster/diagnostics">Cluster Diagnostics</html:link>
+ </td>
+ <td class="padding"></td>
+ <td>
+ This displays cloudfarmer-specific diagnostic text
+ </td>
+ </tr>
+ </tbody>
<tr>
<td>
<html:link
action="/mombasa-portlet/cluster/terminate">Shut down the cluster</html:link>
</td>
+ <td class="padding"></td>
+ <td>
+ This will shut down all the Hadoop processes then delete any VMs, totally destroying
+ the cluster.
+ </td>
</tr>
<tr>
<td>
<html:link
action="/mombasa-portlet/cluster/change_manager">Change Manager</html:link>
</td>
- </tr>
- <tr>
+ <td class="padding"></td>
<td>
- <html:link
- action="/mombasa-portlet/cluster/diagnostics">Cluster Diagnostics</html:link>
- </td>
- </tr>
+ This can switch the web UI to a different cloudfarmer instance
+ </td>
+ </tr>
</table>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_change_manager.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_change_manager.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_change_manager.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -26,13 +26,13 @@
<html:form action="/mombasa-portlet/cluster/change_manager/process" method="post" focus="controller">
- <table border="0" cellpadding="0" cellspacing="0" width="80%">
-
+ <table cellpadding="0" cellspacing="0" width="80%">
+ <tbody>
<tr>
<td>
Controller
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:select name="clusterChangeManagerForm" property="controller">
<html:option value="0">Physical Host List</html:option>
@@ -47,7 +47,7 @@
<td>
URL
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:text name="clusterChangeManagerForm" property="url" size="23"/>
</td>
@@ -57,7 +57,7 @@
<td>
Username
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:text name="clusterChangeManagerForm" property="username" size="23"/>
</td>
@@ -67,7 +67,7 @@
<td>
Password
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:password name="clusterChangeManagerForm" property="password" size="23"/>
</td>
@@ -79,14 +79,14 @@
Change
</html:submit>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:reset>
Reset
</html:reset>
</td>
</tr>
-
+ </tbody>
</table>
For cells, use http://localhost/farmer/cellModel/farmer </br>
or use http://localhost/mombasa/farmer/cellModel/farmer </br>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_diagnostics.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_diagnostics.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_diagnostics.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -22,17 +22,16 @@
<%@ include file="/html/mombasa-portlet/cluster/init.jsp" %>
-<table border="0" width="100%">
+<table class="wide" cellpadding="0" cellspacing="0">
+ <tbody>
<tr>
<td>Description</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td><bean:write name="farmer.description"/></td>
</tr>
- <p>Diagnostics</p>
- <pre>
- <bean:write name="farmer.diagnostics.text"/>
- </pre>
-
+ </tbody>
</table>
+<p>Diagnostics</p>
+<pre><bean:write name="farmer.diagnostics.text"/></pre>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -27,16 +27,17 @@
</div>
<div>
</div>
-<table border="0">
- <tr bgcolor="grey">
+<table cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr class="header" >
<th>Hostname</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>ID</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Role</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Application</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Description</th>
</tr>
<logic:iterate id="host"
@@ -50,22 +51,26 @@
<bean:write name="host" property="hostname"/>
</html:link>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:link action="/mombasa-portlet/cluster/viewhost"
paramId="hostid" paramName="host" paramProperty="id">
<bean:write name="host" property="id"/>
</html:link>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<logic:notEmpty name="host" property="role">
- <bean:write name="host" property="role"/>
+
+ <html:link action="/mombasa-portlet/cluster/listInRole"
+ paramId="role" paramName="host" paramProperty="role">
+ <bean:write name="host" property="role"/>
+ </html:link>
</logic:notEmpty>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td><bean:write name="host" property="application"/></td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<logic:notEmpty name="host" property="application">
<logic:notEmpty name="host" property="application.description">
@@ -75,19 +80,21 @@
</td>
</tr>
</logic:iterate>
+ </tbody>
</table>
<div>
</div>
-<table border="0">
+<table >
+ <tbody>
<tr >
<td>Hosts</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td><bean:write name="hostcount"/></td>
</tr>
<%-- <tr >
<td>Master</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<logic:notEmpty name="cluster.master.hostname">
<bean:write name="cluster.master.hostname"/>
@@ -97,13 +104,11 @@
<%--
<tr >
<td>Controller</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td><bean:write name="cluster.controller" property="description"/></td>
</tr>
--%>
-
-
-
+ </tbody>
</table>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_in_role.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_in_role.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_in_role.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -29,14 +29,15 @@
<div>
Total humber of hosts in role <bean:write name="role" /> : <bean:write name="hostcount"/>
</div>
-<table border="0">
- <tr bgcolor="grey">
+<table cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr class="header">
<th>Hostname</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Application</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Role</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Description</th>
</tr>
<logic:iterate id="host"
@@ -50,15 +51,15 @@
<bean:write name="host" property="hostname"/>
</html:link>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td><bean:write name="host" property="application"/></td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<logic:notEmpty name="host" property="role">
<bean:write name="host" property="role"/>
</logic:notEmpty>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<logic:notEmpty name="host" property="application">
<logic:notEmpty name="host" property="application.description">
@@ -86,6 +87,7 @@
</html:link>
</td>
</tr>
+ </tbody>
</table>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_roles.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_roles.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_roles.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -27,16 +27,18 @@
</div>
<div>
</div>
-<table border="0">
- <tr bgcolor="grey">
+<table cellpadding="0" cellspacing="0">
+ <tbody>
+
+ <tr class="header">
<th>Role</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Description</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Size</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Recommended</th>
- <th style="padding-left: 10px;"></th>
+ <th class="padding"></th>
<th>Add</th>
</tr>
<logic:iterate id="role"
@@ -50,13 +52,13 @@
<bean:write name="role" property="name"/>
</html:link>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td><bean:write name="role" property="description"/></td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td><bean:write name="role" property="roleSize"/></td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td><bean:write name="role" property="recommendedSize"/></td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:link action="/mombasa-portlet/cluster/create_role_instance"
paramId="role" paramName="role" paramProperty="name">
@@ -66,6 +68,7 @@
</td>
</tr>
</logic:iterate>
+ </tbody>
</table>
<div>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_nav.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_nav.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_nav.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -20,25 +20,27 @@
*/
--%><%@ include file="/html/mombasa-portlet/cluster/init.jsp" %>
<div class="separator"></div>
-<table border="0" width="100%">
- <tr>
- <td>
- <html:link
- action="/mombasa-portlet/cluster/list" styleId="listHosts">List Hosts</html:link>
- </td>
- <td>
- <html:link
- action="/mombasa-portlet/cluster/listRoles" styleId="listRoles">List Roles</html:link>
- </td>
- <td>
- <html:link
- action="/mombasa-portlet/cluster/add" styleId="add">Add a Hadoop node</html:link>
- </td>
- <td>
- <html:link
- action="/mombasa-portlet/cluster/admin" styleId="admin">Administration</html:link>
- </td>
- </tr>
+<table class="wide" cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr>
+ <td>
+ <html:link
+ action="/mombasa-portlet/cluster/list" styleId="listHosts">List Hosts</html:link>
+ </td>
+ <td>
+ <html:link
+ action="/mombasa-portlet/cluster/listRoles" styleId="listRoles">List Roles</html:link>
+ </td>
+ <td>
+ <html:link
+ action="/mombasa-portlet/cluster/add" styleId="add">Add a Hadoop node</html:link>
+ </td>
+ <td>
+ <html:link
+ action="/mombasa-portlet/cluster/admin" styleId="admin">Administration</html:link>
+ </td>
+ </tr>
+ </tbody>
</table>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_viewhost.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_viewhost.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_viewhost.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -30,22 +30,26 @@
<h2><bean:write name="host" property="hostname"/></h2>
-<table border="2">
- <tr>
- <td colspan="2" bgcolor="grey">
- <b>Status</b>
- </td>
- </tr>
+<table cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr class="header">
+ <th colspan="3" >
+ Details
+ </th>
+ </tr>
<tr>
<td>Hostname</td>
+ <td class="padding"></td>
<td><bean:write name="host" property="hostname"/></td>
</tr>
<tr>
<td>External Hostname</td>
+ <td class="padding"></td>
<td><bean:write name="host" property="externalHostname"/></td>
</tr>
<tr>
<td>Role</td>
+ <td class="padding"></td>
<td>
<html:link action="/mombasa-portlet/cluster/listInRole"
paramId="role" paramName="host" paramProperty="role">
@@ -54,36 +58,40 @@
</td>
</tr>
- <tr>
- <td>Application</td>
- <td><bean:write name="host" property="application"/></td>
+ <logic:notEmpty name="host" property="application">
+ <tr>
+ <td>Application</td>
+ <td class="padding"></td>
+ <td><bean:write name="host" property="application"/></td>
+ </tr>
+ </logic:notEmpty>
+ <tr>
+ <td>State</td>
+ <td><bean:write name="host" property="state"/></td>
+ </tr>
+ <logic:notEmpty name="host" property="application">
+ <tr>
+ <td>Description</td>
+ <td>
+ <logic:notEmpty name="host" property="application.description">
+ <bean:write name="host" property="application.description"/>
+ </logic:notEmpty>
+ </td>
+ </tr>
+ </logic:notEmpty>
+ <tr class="header">
+ <th colspan="3" >
+ Links
+ </th>
</tr>
- <tr>
- <td>State</td>
- <td><bean:write name="host" property="state"/></td>
- </tr>
- <tr>
- <td>Description</td>
- <td>
- <logic:notEmpty name="host" property="application">
- <logic:notEmpty name="host" property="application.description">
- <bean:write name="host" property="application.description"/>
- </logic:notEmpty>
- </logic:notEmpty>
- </td>
- </tr>
- <tr>
- <td colspan="2" bgcolor="grey">
- <b>Links</b>
- </td>
- </tr>
<logic:iterate id="link"
name="host"
property="links"
type="org.smartfrog.services.cloudfarmer.api.NodeLink">
<tr>
- <td></td>
+ <td class="padding"></td>
+ <td class="padding"></td>
<td>
<a href="<bean:write name="link" property="externalLink"/>" target="_blank">
<bean:write name="link" property="name"/>
@@ -91,11 +99,12 @@
</td>
</tr>
</logic:iterate>
- <tr>
- <td colspan="2" bgcolor="grey">
- <b>Actions</b>
- </td>
- </tr>
+ <tr class="header">
+ <th colspan="3" >
+ Actions
+ </th>
+ </tr>
+
<%-- <tr>
<td colspan="2" >
<html:link paramId="hostid" paramName="host" paramProperty="id"
@@ -104,11 +113,12 @@
</td>
</tr>--%>
<tr>
- <td colspan="2" >
+ <td colspan="3" >
<html:link paramId="hostid" paramName="host" paramProperty="id"
action="/mombasa-portlet/cluster/delete">Delete the host
</html:link>
</td>
</tr>
+ </tbody>
</table>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/create_role_instance.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/create_role_instance.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/create_role_instance.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -26,12 +26,13 @@
<html:form action="/mombasa-portlet/cluster/create_role_instance/process" method="post" focus="minNodes">
<p>Add Hosts in Role "<bean:write name="role" />" </p>
- <table border="0" cellpadding="0" cellspacing="0">
+ <table cellpadding="0" cellspacing="0">
+ <tbody>
<tr>
<td>
Minimum number of machines of role
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:text name="clusterCreateRoleInstanceForm" property="minNodes" size="23"/>
</td>
@@ -41,7 +42,7 @@
<td>
Maximum number of machines to create
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:text name="clusterCreateRoleInstanceForm" property="maxNodes" size="23"/>
</td>
@@ -51,7 +52,7 @@
<td>
Role name
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:text name="clusterCreateRoleInstanceForm" property="rolename" value="${role}"/>
</td>
@@ -67,14 +68,14 @@
Add
</html:submit>
</td>
- <td style="padding-left: 10px;"></td>
+ <td class="padding"></td>
<td>
<html:reset>
Reset
</html:reset>
</td>
</tr>
-
+ </tbody>
</table>
</html:form>
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/template.jsp
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/template.jsp 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/template.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -25,21 +25,23 @@
<tiles:useAttribute id="title" name="title" classname="java.lang.String" ignore="true"/>
<html>
<head>
- <title><%= title %></title>
+ <jsp:include page="/html/mombasa-portlet/html-head.jsp" flush="true"/>
+ <title><%= title %>
+ </title>
</head>
<body>
-<h2><%= title %></h2>
-<logic:messagesPresent>
- <span class="portlet-msg-error">
- <html:errors/>
- </span>
-</logic:messagesPresent>
-<div>
-<jsp:include page='<%= content %>' flush="true"/>
-</div>
-<div>
-<jsp:include page="/html/mombasa-portlet/cluster/cluster_nav.jsp" flush="true"/>
-</div>
+ <h2><%= title %></h2>
+ <logic:messagesPresent>
+ <span class="portlet-msg-error">
+ <html:errors/>
+ </span>
+ </logic:messagesPresent>
+ <div>
+ <jsp:include page='<%= content %>' flush="true"/>
+ </div>
+ <div>
+ <jsp:include page="/html/mombasa-portlet/cluster/cluster_nav.jsp" flush="true"/>
+ </div>
</body>
</html>
\ No newline at end of file
Copied: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/html-head.jsp (from rev 8221, trunk/core/components/cloudfarmer/site/html/mombasa-portlet/header.jsp)
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/html-head.jsp (rev 0)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/html-head.jsp 2010-02-23 17:00:33 UTC (rev 8232)
@@ -0,0 +1,38 @@
+<%--
+/* (C) Copyright 2010 Hewlett-Packard Development Company, LP
+
+Disclaimer of Warranty
+
+The Software is provided "AS IS," without a warranty of any kind. ALL
+EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY
+EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has
+not undergone complete testing and may contain errors and defects. It
+may not function properly and is subject to change or withdrawal at
+any time. The user must assume the entire risk of using the
+Software. No support or maintenance is provided with the Software by
+Hewlett-Packard. Do not install the Software if you are not accustomed
+to using experimental software.
+
+Limitation of Liability
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD
+OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR
+FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
+HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
+OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR
+THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE
+SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO
+BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY
+HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR
+ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD.
+
+*/
+
+This JSP page is included in the HTML <head> tag before any title, and can be used to insert metadata and CSS content
+--%>
+
+<%-- refer to the style.css--%>
+<link rel="stylesheet" type="text/css" href="/html/mombasa-portlet/style.css">
Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/style.css
===================================================================
--- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/style.css 2010-02-23 16:10:11 UTC (rev 8231)
+++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/style.css 2010-02-23 17:00:33 UTC (rev 8232)
@@ -1,3 +1,48 @@
+/** (C) Copyright 2010 Hewlett-Packard Development Company, LP
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+For more information: www.smartfrog.org
+
+*/
+
body {
font: 12pt arial, helvetica, sans-serif;
}
+
+table {
+ border: 0;
+}
+
+table.wide {
+ width: 100%;
+}
+
+th.padding {
+ padding-left: 10px;
+}
+
+td.padding {
+ padding-left: 10px;
+}
+
+tr.header {
+ background-color: #006699;
+ color: white;
+}
+
+th {
+ font-weight: bold;
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|