From e6fbcfff56a97467fe28978d856747f5324f39b5 Mon Sep 17 00:00:00 2001
From: plaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sun, 21 Mar 2010 11:25:59 +0000
Subject: [PATCH] html updates + version number 1.1.1pre

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@55 180e2498-e6e9-4542-8430-84ac67f01cd8
---
 build.properties         |  2 +-
 web/html/alternative.css |  2 +-
 web/html/contact.html    |  4 ++--
 web/html/download.html   | 14 +++++++-------
 web/html/index.html      |  8 +++++++-
 web/htp/contact.htp      |  4 ++--
 web/htp/download.htp     |  4 ++++
 web/htp/index.htp        |  2 +-
 web/htp/news.htp         | 16 ++++++++++++----
 9 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/build.properties b/build.properties
index 1bb030ac..d6f02cc7 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 
 # The OpenRocket build version
 
-build.version=1.1.0
+build.version=1.1.1pre
 
 
 # The source of the package.  When building a package for a specific
diff --git a/web/html/alternative.css b/web/html/alternative.css
index f53f60ec..3d2dc089 100644
--- a/web/html/alternative.css
+++ b/web/html/alternative.css
@@ -403,7 +403,7 @@ div.downloadbox .alternative a:hover {
 }
 
 .rightpane div.downloadbox {
-    margin: 0 auto 2em 0;
+    margin: 0 auto 2em auto;
 }
 .rightpane div.screenshot {
     font-size: smaller;
diff --git a/web/html/contact.html b/web/html/contact.html
index 20e3a355..68b56cbe 100644
--- a/web/html/contact.html
+++ b/web/html/contact.html
@@ -50,14 +50,14 @@
       <dt>
 	<a href="https://lists.sourceforge.net/lists/listinfo/openrocket-announce"><tt>OpenRocket-announce</tt></a>
 	&nbsp;
-	<span class="note">(<a href="XXX">archives</a>)</span>
+	<span class="note">(<a href="https://sourceforge.net/mailarchive/forum.php?forum_name=openrocket-announce">archives</a>)</span>
       </dt>
       <dd>Announcements of new OpenRocket versions and
 	developments.  This list is moderated.</dd>
       <dt>
 	<a href="https://lists.sourceforge.net/lists/listinfo/openrocket-devel"><tt>OpenRocket-devel</tt></a>
 	&nbsp;
-	<span class="note">(<a href="XXX">archives</a>)</span>
+	<span class="note">(<a href="https://sourceforge.net/mailarchive/forum.php?forum_name=openrocket-devel">archives</a>)</span>
       </dt>
       <dd>Discussion related to OpenRocket development, documentation
 	and upcoming features.</dd>
diff --git a/web/html/download.html b/web/html/download.html
index f0566114..f7169254 100644
--- a/web/html/download.html
+++ b/web/html/download.html
@@ -45,6 +45,12 @@
   <div class="content">
 <div class="news">
       <h2>Recent news:</h2>
+  <p><span class="date">21.3.2010:</span> Version 1.1.0 is
+    <a href="download.html">released</a>!</p>
+  <p>This release includes the first support for loading RockSim
+    rocket design files (.RKT), thanks to contributions by Doug
+    Pedrick.  It's also the kick-off of the 1.1 development branch of
+    OpenRocket.</p>
   <p><span class="date">10.3.2010:</span> Version 1.0.0 is
     <a href="download.html">released</a>!</p>
   <p>This release includes several hundred new thrustcurves from
@@ -57,12 +63,6 @@
   <p>This release updates the aerodynamic calculation methods to be
     more in line with the Barrowman method and enhances the simulation
     time step selection, in addition to fixing numerous bugs.</p>
-  <p><span class="date">28.11.2009:</span> Version 0.9.5 is
-    <a href="download.html">released</a>!</p>
-  <p>This release <strong>fixes a serious bug in 0.9.4</strong> that
-    prevented adding a tube coupler and centering ring to the same
-    body tube, in addition to a few smaller additions.  Users of
-    0.9.4 should upgrade immediately!</p>
 </div>
     <div class="contentholder">
       <h2>Ready packages</h2>
@@ -78,7 +78,7 @@
 	Currently the development version is the recommended
 	download.</p>
       <div class="right support">
-	<a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" border="0" alt="Support This Project" /> </a>
+        <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
       </div>
         <div class="downloadbox">
     <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/1.1.0/OpenRocket-1.1.0.jar/download">
diff --git a/web/html/index.html b/web/html/index.html
index ea8f4a01..445a6b96 100644
--- a/web/html/index.html
+++ b/web/html/index.html
@@ -62,7 +62,7 @@
 	</a>
       </div>
       <div class="support">
-	<a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" border="0" alt="Support This Project" /> </a>
+	<a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /> </a>
       </div>
    </div>
     <p><strong>OpenRocket</strong> is an free, fully featured model
@@ -88,6 +88,12 @@
     <div class="clear"></div>
 <div class="news">
       <h2>News</h2>
+  <p><span class="date">21.3.2010:</span> Version 1.1.0 is
+    <a href="download.html">released</a>!</p>
+  <p>This release includes the first support for loading RockSim
+    rocket design files (.RKT), thanks to contributions by Doug
+    Pedrick.  It's also the kick-off of the 1.1 development branch of
+    OpenRocket.</p>
   <p><span class="date">10.3.2010:</span> Version 1.0.0 is
     <a href="download.html">released</a>!</p>
   <p>This release includes several hundred new thrustcurves from
diff --git a/web/htp/contact.htp b/web/htp/contact.htp
index c986003c..cd05bf28 100644
--- a/web/htp/contact.htp
+++ b/web/htp/contact.htp
@@ -16,7 +16,7 @@
       <dt>
 	<a href="https://lists.sourceforge.net/lists/listinfo/openrocket-announce"><tt>OpenRocket-announce</tt></a>
 	&nbsp;
-	<span class="note">(<a href="XXX">archives</a>)</span>
+	<span class="note">(<a href="https://sourceforge.net/mailarchive/forum.php?forum_name=openrocket-announce">archives</a>)</span>
       </dt>
       <dd>Announcements of new OpenRocket versions and
 	developments.  This list is moderated.</dd>
@@ -24,7 +24,7 @@
       <dt>
 	<a href="https://lists.sourceforge.net/lists/listinfo/openrocket-devel"><tt>OpenRocket-devel</tt></a>
 	&nbsp;
-	<span class="note">(<a href="XXX">archives</a>)</span>
+	<span class="note">(<a href="https://sourceforge.net/mailarchive/forum.php?forum_name=openrocket-devel">archives</a>)</span>
       </dt>
       <dd>Discussion related to OpenRocket development, documentation
 	and upcoming features.</dd>
diff --git a/web/htp/download.htp b/web/htp/download.htp
index 4b43791a..d4931e4e 100644
--- a/web/htp/download.htp
+++ b/web/htp/download.htp
@@ -29,6 +29,10 @@
 	Currently the development version is the recommended
 	download.</p>
       
+      <div class="right support">
+        <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
+      </div>
+
       <set sourcelink="true">
       <downloadbox>
 
diff --git a/web/htp/index.htp b/web/htp/index.htp
index d9d59966..51e97bc6 100644
--- a/web/htp/index.htp
+++ b/web/htp/index.htp
@@ -20,7 +20,7 @@
       </div>
  
       <div class="support">
-	<a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" border="0" alt="Support This Project" /> </a>
+	<a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /> </a>
       </div>
 
    </div>
diff --git a/web/htp/news.htp b/web/htp/news.htp
index d405d997..0ba2e676 100644
--- a/web/htp/news.htp
+++ b/web/htp/news.htp
@@ -9,6 +9,14 @@
 
   <!--- Remember to move the position of "onlyrecent" below! --->
 
+  <p><span class="date">21.3.2010:</span> Version 1.1.0 is 
+    <a href="download.html">released</a>!</p>
+
+  <p>This release includes the first support for loading RockSim
+    rocket design files (.RKT), thanks to contributions by Doug
+    Pedrick.  It's also the kick-off of the 1.1 development branch of
+    OpenRocket.</p>
+
   <p><span class="date">10.3.2010:</span> Version 1.0.0 is 
     <a href="download.html">released</a>!</p>
 
@@ -25,6 +33,10 @@
     more in line with the Barrowman method and enhances the simulation
     time step selection, in addition to fixing numerous bugs.</p>
 
+
+  <if not onlyrecent><!--- Older items not shown on download page:  --->
+
+
   <p><span class="date">28.11.2009:</span> Version 0.9.5 is
     <a href="download.html">released</a>!</p>
 
@@ -33,10 +45,6 @@
     body tube, in addition to a few smaller additions.  Users of
     0.9.4 should upgrade immediately!</p>
 
-
-  <if not onlyrecent><!--- Older items not shown on download page:  --->
-
-
   <p><span class="date">24.11.2009:</span> Version 0.9.4 is
     <a href="download.html">released</a>!</p>
 
-- 
2.30.2