Integrate web facelift into directory tree and new build process.

dspinellis · Aug 27, 2008 · 5c21f3a · 5c21f3a
1 parent a54a65c
commit 5c21f3a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 227 deletions.
diff --git a/Makefile b/Makefile
@@ -77,10 +77,12 @@ testupdate:
 	sh tools/testupdate.sh
 
 web: $(BALL_TAR_GZ) CHECKSUM.MD5
-	cp $(BALL_TAR_GZ) $(ZIPBALL) CHECKSUM.MD5 oldversion.html umlgraph-banner.png $(WEBDIR)
+	cp $(BALL_TAR_GZ) $(ZIPBALL) CHECKSUM.MD5 $(WEBDIR)
+	(cd web && sh build.sh)
+	cp web/build/*.* $(WEBDIR)
+	sed "s/VERSION/$(VERSION)/g" web/build/download.html >$(WEBDIR)/download.html
 	cp $(JARFILE) $(WEBDIR)/jars/UmlGraph-$(VERSION).jar
 	tar cf - javadoc | tar -C $(WEBDIR) -xvf -
-	sed "s/VERSION/$(VERSION)/g" index.html >$(WEBDIR)/index.html
 
 CHECKSUM.MD5: $(BALL_TAR_GZ) $(JARFILE)
 	md5 UMLGraph-2.10.* UMLGraph-4.8.* UMLGraph-$(VERSION).* >CHECKSUM.MD5

diff --git a/index.html b/index.html
diff --git a/oldversion.html b/oldversion.html
diff --git a/umlgraph-banner.png b/umlgraph-banner.png
diff --git a/web/download.html b/web/download.html
@@ -1,4 +1,8 @@
 <!-- $Id$ -->
+New releases of UMLGraph are always announced on the corresponding
+<a href="http://freshmeat.net/projects/umlgraph/">freshmeat.net page</a>.
+You can use it to subscribe and post comments.
+
 <h2>Current Production Version</h2>
 The current version of UMLGraph is VERSION.
 You can download UMLGraph from the following links:
@@ -11,7 +15,6 @@ <h2>Current Production Version</h2>
 (zip file containing the source code, the compiled doclet,
 and the complete documentation in HTML format).
 </li>
-<li> <a href="http://freshmeat.net/projects/umlgraph/">freshmeat.net page</a> (use it to subscribe and post comments).</li>
 <li> <a href="jars/UmlGraph-VERSION.jar">UmlGraph binary - UmlGraph-VERSION.jar</a>
 (jar file containing only the UmlGraph classes;
 please use this only for pulling UmlGraph into other projects).

diff --git a/web/top.html b/web/top.html
@@ -9,27 +9,38 @@
 <title>UMLGraph - Declarative Drawing of UML Diagrams</title>
 <meta name="AUTHOR" content="Diomidis Spinellis" />
 <style type="text/css">
+body {
+	font-family: verdana;
+	font-size: 12px;
+	line-height:140%;
+}
+
 pre {
 	padding:4px;
 	background-color: #eeeeee;
 	border: 1px solid #000080;
 }
 p.footer {
-	font-size: 70%;
+	font-size: 85%;
 	color: #505050;
 	margin-top: 0px;
+	line-height:100%;
 }
 h1 {
+	font-family: tahoma;
+	font-size: 30px;
 	background-color: #EEEEFF;
 	border-left: #003399 10px solid;
-	padding: 0px 4px 0px 20px;
-	height: 70px;
+	padding: 20px 4px 20px 20px;
+	height: 30px;
 	margin-top: 0;
 }
 h2 {
+	font-size: 20px;
+	font-family: tahoma;
 	background-color: #EEEEFF;
 	border-left: #003399 10px solid;
-	padding: 0px 4px 0px 20px;
+	padding: 5px 4px 5px 20px;
 }
 a.menu:link, a.menu:visited {
 	color: blue;
@@ -70,4 +81,4 @@
 <p class="menu"><br /></p>
 </td><td>
 </td><td>
-<h1>UMLGraph - Declarative Drawing of UML Diagrams</h1>
+<h1>Automated Drawing of UML Diagrams</h1>