diff --git a/releng.control/cc283-bin-dist-mods/contexts/wtp_logo_2010.png b/releng.control/cc283-bin-dist-mods/contexts/wtp_logo_2010.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0e26fc8cf34c3210e37fb82c10a527f9815a459
Binary files /dev/null and b/releng.control/cc283-bin-dist-mods/contexts/wtp_logo_2010.png differ
diff --git a/releng.control/cc283-bin-dist-mods/html/index.html b/releng.control/cc283-bin-dist-mods/html/index.html
index 0bce4def92235f9e18873142317babe8d98dc1d9..de6bd7f5d3b0760353394b8b8222e4b4869a9501 100644
--- a/releng.control/cc283-bin-dist-mods/html/index.html
+++ b/releng.control/cc283-bin-dist-mods/html/index.html
@@ -6,8 +6,8 @@
</head>
<body>
-<div id="logo"><img src="wtp_logo_2009.png"
- alt="Web Tools Platform Builder" width="200" height="135" /></div>
+<div id="logo"><img src="wtp_logo_2010.png"
+ alt="Web Tools Platform Builder" width="175" height="174" /></div>
<p><a href="./dashboard/tab/builds">Builds
diff --git a/releng.control/cc283-bin-dist-mods/html/wtp_logo_2010.png b/releng.control/cc283-bin-dist-mods/html/wtp_logo_2010.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0e26fc8cf34c3210e37fb82c10a527f9815a459
Binary files /dev/null and b/releng.control/cc283-bin-dist-mods/html/wtp_logo_2010.png differ
diff --git a/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/images/wtp_logo_2009.png b/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/images/wtp_logo_2009.png
deleted file mode 100644
index 514d6438d006448ed6a0a7fa637ac466651fc6a3..0000000000000000000000000000000000000000
Binary files a/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/images/wtp_logo_2009.png and /dev/null differ
diff --git a/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/images/wtp_logo_2010.png b/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/images/wtp_logo_2010.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0e26fc8cf34c3210e37fb82c10a527f9815a459
Binary files /dev/null and b/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/images/wtp_logo_2010.png differ
diff --git a/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/index.jsp b/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/index.jsp
index acc88c3a59aeac6088f600a9701a8e741d0f3b05..a2f7c991ad6b45bc7d848b7c1cea4fe2621146f7 100644
--- a/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/index.jsp
+++ b/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/index.jsp
@@ -147,6 +147,14 @@
else if (!(sort.equals("none")||sort.equals("project")||sort.equals("status")||sort.equals("last failure")||sort.equals("last successful"))){
sort = "none";
}
+
+ final Package pkg = BuildStatus.class.getPackage();
+ final String ccVersionString;
+ if (pkg != null && pkg.getImplementationVersion() != null) {
+ ccVersionString = pkg.getImplementationVersion();
+ } else {
+ ccVersionString = "";
+ }
%>
@@ -455,7 +463,16 @@
<body onload="checkIframe('<%=baseURL + "css/cruisecontrol.css"%>')">
<div class="header">
- <div class="logo"><a href="http://www.eclipse.org/webtools/"><img alt="Web Tools Platform Builder" src="images/wtp_logo_2009.png"/></a></div>
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td valign="top">
+ <div class="logo"><a href="http://www.eclipse.org/webtools/"><img alt="Web Tools Platform Builder" src="images/wtp_logo_2010.png"/></a></div>
+ </td>
+ <td style="text-align:right;vertical-align:bottom">
+ <div class="modifications-data" align=right align=top font=10><%=ccVersionString%></div>
+ </td>
+ </tr>
+ </table>
</div>
<div class="container">
<div class="content">
diff --git a/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/main.jsp b/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/main.jsp
index 41498fb8bc9f8e5b2a0cc6429451a322a4bf6272..6c38c350cf9367d84b34b4fcfbe0a479daa3be2c 100644
--- a/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/main.jsp
+++ b/releng.control/cc283-bin-dist-mods/webapps/cruisecontrol/main.jsp
@@ -43,6 +43,14 @@
String ccname = System.getProperty("ccname", "");
String project = request.getPathInfo().substring(1);
+
+ final Package pkg = BuildStatus.class.getPackage();
+ final String ccVersionString;
+ if (pkg != null && pkg.getImplementationVersion() != null) {
+ ccVersionString = pkg.getImplementationVersion();
+ } else {
+ ccVersionString = "";
+ }
%>
<html>
<head>
@@ -53,7 +61,16 @@
</head>
<body>
<div class="header">
- <div class="logo"><img alt="Web Tools Platform Builder" src="images/wtp_logo_2009.png"/></div>
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td valign="top">
+ <img alt="Web Tools Platform Builder" src="images/wtp_logo_2010.png"/></div>
+ </td>
+ <td style="text-align:right;vertical-align:bottom">
+ <div class="modifications-data" align=right align=top font=10><%=ccVersionString%></div>
+ </td>
+ </tr>
+ </table>
</div>
<div class="container">
<%@ include file="navigation.jsp" %>
diff --git a/releng.control/cc283-bin-dist-mods/webapps/dashboard/images/wtp_logo_2009.png b/releng.control/cc283-bin-dist-mods/webapps/dashboard/images/wtp_logo_2009.png
deleted file mode 100644
index 514d6438d006448ed6a0a7fa637ac466651fc6a3..0000000000000000000000000000000000000000
Binary files a/releng.control/cc283-bin-dist-mods/webapps/dashboard/images/wtp_logo_2009.png and /dev/null differ
diff --git a/releng.control/cc283-bin-dist-mods/webapps/dashboard/images/wtp_logo_2010.png b/releng.control/cc283-bin-dist-mods/webapps/dashboard/images/wtp_logo_2010.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0e26fc8cf34c3210e37fb82c10a527f9815a459
Binary files /dev/null and b/releng.control/cc283-bin-dist-mods/webapps/dashboard/images/wtp_logo_2010.png differ