updates

d674faf8 · david_williams · 32f1076f · d674faf8 · d674faf8 · d674faf8
Commit d674faf8 authored 14 years ago by david_williams
--- a/releng.control/cc283-bin-dist-mods/contexts/wtp_logo_2010.png
+++ b/releng.control/cc283-bin-dist-mods/contexts/wtp_logo_2010.png
--- 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

--- a/releng.control/cc283-bin-dist-mods/html/wtp_logo_2010.png
+++ b/releng.control/cc283-bin-dist-mods/html/wtp_logo_2010.png
--- 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
--- 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
--- 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">&nbsp;
    <div class="content">

--- 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">&nbsp;
        <%@ include file="navigation.jsp" %>

--- 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
--- 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