From 48266b302db721ae8eaf3109dc4931d873803293 Mon Sep 17 00:00:00 2001
From: Maxime Sinclair <maxime.sinclair@gmail.com>
Date: Thu, 31 Mar 2011 16:20:15 +0200
Subject: [PATCH] Little enhancements of the look of the main page. The build
 date is included in the footer.

---
 build.xml            | 23 ++++++++++++++++++++---
 content/footer.jspf  |  4 ++++
 content/index.jsp    | 11 ++++++-----
 content/plantuml.css | 21 ++++++++++++++++++---
 4 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 content/footer.jspf
diff --git a/build.xml b/build.xml
index 3e8773f..78f3745 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <project default="main" basedir=".">
 
-	<target name="main" depends="clean,compile,war">
+	<target name="main" depends="clean,war">
 	</target>
 
     <taskdef name="junit"
@@ -41,10 +41,27 @@
 		<javac srcdir="src" destdir="content/WEB-INF/classes" debug="${debug}" classpathref="project-classpath" />
 	</target>
 
-	<target name="war">
+    <target name="prepare" depends="init">
+        <!-- So that we can use the ${TSTAMP}, ${DSTAMP} -->
+        <tstamp />
+        <filter token="timestamp" value="${DSTAMP}"/>
+        <copy todir="${target}/root" filtering="true" >
+            <fileset dir="content">
+                <include name="*.jsp*"/>
+            </fileset>
+        </copy>
+        <copy todir="${target}/root" filtering="false" >
+            <fileset dir="content">
+                <exclude name="*.jsp*"/>
+                <exclude name="*-INF/**"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="war" depends="prepare, compile">
 		<war destfile="${target}/plantuml.war" webxml="content/WEB-INF/web.xml">
 			<classes dir="content/WEB-INF/classes" />
-			<fileset dir="content" excludes="WEB-INF/**"/>
+			<fileset dir="${target}/root" />
 			<lib dir="content/WEB-INF/lib" />
 		</war>
 	</target>
diff --git a/content/footer.jspf b/content/footer.jspf
new file mode 100644
index 0000000..bac1de3
--- /dev/null
+++ b/content/footer.jspf
@@ -0,0 +1,4 @@
+<div id="footer">
+  <p>PlantUML Server @timestamp@
+  </p>
+</div>
\ No newline at end of file
diff --git a/content/index.jsp b/content/index.jsp
index 3a21b2a..e4e8520 100644
--- a/content/index.jsp
+++ b/content/index.jsp
@@ -34,7 +34,7 @@ if (decodedAttribute != null) {
 <body>
 <div id="header">
     <%-- PAGE TITLE --%>
-    <h1>PlantUMLServer</h1>
+    <h1>PlantUML Server</h1>
     <p>This application provides a servlet which serves images created by <a href="http://plantuml.sourceforge.net">PlantUML</a>.</p>
 </div>
 <div id="content">
@@ -60,8 +60,9 @@ if (decodedAttribute != null) {
     <p>You can use the following URL:
         <br/>
         <a href="<%=imgurl %>"><code>&lt;img src="<%=imgurl %>" /&gt;</code></a>
-        <br/><br/>
-        <img id="diagram" src="<%=imgurl %>" alt="PlantUML diagram"/>
+    </p>
+    <p id="diagram">
+        <img src="<%=imgurl %>" alt="PlantUML diagram"/>
     </p>
     <% } //endif %>
 </div>
@@ -70,7 +71,7 @@ if (decodedAttribute != null) {
 Bob -> Alice : hello
 @enduml
 -->
-<%-- FOOTER 
-<%@ include file="util/footer.jspf" %> --%>
+<%-- FOOTER --%>
+<%@ include file="footer.jspf" %> 
 </body>
 </html>
diff --git a/content/plantuml.css b/content/plantuml.css
index 6ed0db5..916561e 100644
--- a/content/plantuml.css
+++ b/content/plantuml.css
@@ -4,7 +4,7 @@
 
 /* Font */
 * {
-    font-family: sans-serif;
+    font-family: arial,helvetica,sans-serif;
 }
 
 /* Header */
@@ -30,11 +30,26 @@
 
 /* XHTML tag */
 #content code {
-    font-family: monospace;
+    font-family: 'courier new',courier,monospace;
+    letter-spacing: -1pt;
 }
 
 /* Diagram */
-#content img#diagram {
+#content #diagram {
+    text-align: center;
+}
+
+#content #diagram img {
     border: medium solid green;
     padding: 10px;
 }
+
+/* Footer */
+#footer p {
+    background-color: #eee;
+    color: #666;
+    font-size: 0.7em;
+    padding: 2px;
+    text-align: center;
+    width: 100%;
+}
