From: <st...@us...> - 2010-02-24 17:31:41
|
Revision: 8237 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8237&view=rev Author: steve_l Date: 2010-02-24 17:31:35 +0000 (Wed, 24 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_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/style.css 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_dynamic.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -31,33 +31,33 @@ <table cellpadding="0" cellspacing="0"> <tbody> <tr> - <td> + <td class="fieldname"> Minimum number of workers </td> - <td style="padding-left: 10px;"></td> - <td> + <td class="padding"></td> + <td class="field"> <html:text name="clusterAddDynamicForm" property="minWorkers" size="23"/> </td> </tr> <tr> - <td> - Maximum of workers + <td class="fieldname"> + Maximum number of workers </td> - <td style="padding-left: 10px;"></td> - <td> + <td class="padding"></td> + <td class="field"> <html:text name="clusterAddDynamicForm" property="maxWorkers" size="23"/> </td> </tr> <tr> - <td> + <td class="action"> <html:submit> Add </html:submit> </td> - <td style="padding-left: 10px;"></td> - <td> + <td class="padding"></td> + <td class="action"> <html:reset> Reset </html:reset> 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_named.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -32,31 +32,31 @@ <table cellpadding="0" cellspacing="0"> <tbody> <tr> - <td> + <td class="fieldname"> Name </td> <td class="padding"></td> - <td> + <td class="field"> <html:text name="clusterAddNamedForm" property="name" size="23"/> </td> </tr> <tr> - <td> + <td class="fieldname"> Worker </td> <td class="padding"></td> - <td> + <td class="field"> <html:checkbox name="clusterAddNamedForm" property="worker" /> </td> </tr> <tr> - <td> + <td class="fieldname"> Master </td> <td class="padding"></td> - <td> + <td class="field"> <logic:notEmpty name="cluster.master.hostname"> <bean:write name="cluster.master.hostname"/> </logic:notEmpty> @@ -67,13 +67,13 @@ </tr> <tr> - <td> + <td class="action"> <html:submit> Add </html:submit> </td> <td class="padding"></td> - <td> + <td class="action"> <html:reset> Reset </html:reset> 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_add_node_status.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -22,10 +22,12 @@ <%@ include file="/html/mombasa-portlet/cluster/init.jsp" %> +<%-- <div align="center"> <html:link action="/mombasa-portlet/cluster/add_dynamic/status">Update Status</html:link> </div> +--%> <h3>Operation status: @@ -45,11 +47,11 @@ name="farmer.work.status.events" type="org.smartfrog.services.cloudfarmer.client.web.model.cluster.StatusEvent"> <tr> - <td> + <td class="eventLevel"> <bean:write name="event" property="level"/> </td> <td class="padding"></td> - <td> + <td class="eventText"> <bean:write name="event" property="message"/> </td> </tr> @@ -58,11 +60,20 @@ </table> </logic:notEmpty> -<div align="center"> -<html:link - action="/mombasa-portlet/cluster/add_dynamic/status">Update Status</html:link> -</div> +<table class="navigation" cellpadding="0" cellspacing="0"> + <tbody> + <tr class="navigation"> + <td> + <html:link + action="/mombasa-portlet/cluster/add_dynamic/status">Update Status</html:link> + </td> + </tr> + </tbody> +</table> + + + 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_admin.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -30,7 +30,7 @@ </tr> <tbody> <tr> - <td> + <td class="action"> <html:link action="/mombasa-portlet/cluster/diagnostics">Cluster Diagnostics</html:link> </td> @@ -39,9 +39,8 @@ This displays cloudfarmer-specific diagnostic text </td> </tr> - </tbody> <tr> - <td> + <td class="action"> <html:link action="/mombasa-portlet/cluster/terminate">Shut down the cluster</html:link> </td> @@ -52,7 +51,7 @@ </td> </tr> <tr> - <td> + <td class="action"> <html:link action="/mombasa-portlet/cluster/change_manager">Change Manager</html:link> </td> @@ -61,6 +60,7 @@ This can switch the web UI to a different cloudfarmer instance </td> </tr> + </tbody> </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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_change_manager.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -29,11 +29,11 @@ <table cellpadding="0" cellspacing="0" width="80%"> <tbody> <tr> - <td> + <td class="fieldname"> Controller </td> <td class="padding"></td> - <td> + <td class="field"> <html:select name="clusterChangeManagerForm" property="controller"> <html:option value="0">Physical Host List</html:option> <html:option value="1">HP Cells</html:option> @@ -44,43 +44,43 @@ </tr> <tr> - <td> + <td class="fieldname"> URL </td> <td class="padding"></td> - <td> + <td class="field"> <html:text name="clusterChangeManagerForm" property="url" size="23"/> </td> </tr> <tr> - <td> + <td class="fieldname"> Username </td> <td class="padding"></td> - <td> + <td class="field"> <html:text name="clusterChangeManagerForm" property="username" size="23"/> </td> </tr> <tr> - <td> + <td class="fieldname"> Password </td> <td class="padding"></td> - <td> + <td class="field"> <html:password name="clusterChangeManagerForm" property="password" size="23"/> </td> </tr> <tr> - <td> + <td class="action"> <html:submit> Change </html:submit> </td> <td class="padding"></td> - <td> + <td class="action"> <html:reset> Reset </html:reset> 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_in_role.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -70,7 +70,7 @@ </tr> </logic:iterate> <tr> - <td> + <td class="action"> <html:link action="/mombasa-portlet/cluster/create_role_instance" paramId="role" paramName="role" > Add @@ -79,7 +79,7 @@ </td> </tr> <tr> - <td> + <td class="action"> <html:link action="/mombasa-portlet/cluster/delete_all_in_role" paramId="role" paramName="role" > Delete all machines in the role 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_list_roles.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -59,7 +59,7 @@ <td class="padding"></td> <td><bean:write name="role" property="recommendedSize"/></td> <td class="padding"></td> - <td> + <td class="action"> <html:link action="/mombasa-portlet/cluster/create_role_instance" paramId="role" paramName="role" paramProperty="name"> Add 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_nav.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -20,9 +20,9 @@ */ --%><%@ include file="/html/mombasa-portlet/cluster/init.jsp" %> <div class="separator"></div> -<table class="wide" cellpadding="0" cellspacing="0"> +<table class="navigation" > <tbody> - <tr> + <tr class="navigation"> <td> <html:link action="/mombasa-portlet/cluster/list" styleId="listHosts">List Hosts</html:link> 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/cluster_viewhost.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -67,6 +67,7 @@ </logic:notEmpty> <tr> <td>State</td> + <td class="padding"></td> <td><bean:write name="host" property="state"/></td> </tr> <logic:notEmpty name="host" property="application"> @@ -113,7 +114,7 @@ </td> </tr>--%> <tr> - <td colspan="3" > + <td colspan="3" class="action"> <html:link paramId="hostid" paramName="host" paramProperty="id" action="/mombasa-portlet/cluster/delete">Delete the host </html:link> 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-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/cluster/create_role_instance.jsp 2010-02-24 17:31:35 UTC (rev 8237) @@ -29,32 +29,32 @@ <table cellpadding="0" cellspacing="0"> <tbody> <tr> - <td> + <td class="fieldname"> Minimum number of machines of role </td> <td class="padding"></td> - <td> + <td class="field"> <html:text name="clusterCreateRoleInstanceForm" property="minNodes" size="23"/> </td> </tr> <tr> - <td> + <td class="fieldname"> Maximum number of machines to create </td> <td class="padding"></td> - <td> + <td class="field"> <html:text name="clusterCreateRoleInstanceForm" property="maxNodes" size="23"/> </td> </tr> <tr> - <td> + <td class="fieldname"> Role name </td> <td class="padding"></td> - <td> - <html:text name="clusterCreateRoleInstanceForm" property="rolename" value="${role}"/> + <td class="field"> + <html:text name="clusterCreateRoleInstanceForm" property="rolename" styleId="role"/> </td> </tr> <%-- @@ -63,13 +63,13 @@ --%> <tr> - <td> + <td class="action"> <html:submit> Add </html:submit> </td> <td class="padding"></td> - <td> + <td class="action"> <html:reset> Reset </html:reset> Modified: trunk/core/components/cloudfarmer/site/html/mombasa-portlet/style.css =================================================================== --- trunk/core/components/cloudfarmer/site/html/mombasa-portlet/style.css 2010-02-24 17:31:02 UTC (rev 8236) +++ trunk/core/components/cloudfarmer/site/html/mombasa-portlet/style.css 2010-02-24 17:31:35 UTC (rev 8237) @@ -30,6 +30,16 @@ width: 100%; } +table.navigation { + width: 100%; + background-color: #006699; + color: white; +} + +tr.navigation { +} + + th.padding { padding-left: 10px; } @@ -45,4 +55,42 @@ th { font-weight: bold; -} \ No newline at end of file +} + +/** + For field names in forms + */ +td.fieldname { + font-weight: bold; +} + +/** + For fields in forms + */ +td.field { + +} + +/** + For fields in forms + */ +td.action{ + background-color: aliceblue; + font-weight: bold; +} + + +/** + For event level in messages + */ +td.eventLevel { + font-weight: bold; + font-family: monospace; +} + +/** + For event text in messages + */ +td.eventText { + font-family: monospace; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |