X-Git-Url: http://pileus.org/git/?p=~andy%2Faweather-web;a=blobdiff_plain;f=html.ct;h=68be68379603b7c8ab2642cfa0babb6e9dd284be;hp=f743157f69fc56915b7bc34099b0a5a51414d287;hb=3934139d14007a885a99e2a2517446998df3dac0;hpb=c4bb50cd4c6af50a0344b967abb718c29ab71a30

diff --git a/html.ct b/html.ct
index f743157..68be683 100644
--- a/html.ct
+++ b/html.ct
@@ -77,6 +77,9 @@ Content-Type: text/html; charset=UTF-8
 		At the same time, it strives to be simpler and easier to use
 		than existing meteorological software packages such as GEMPAK
 		and IDV.
+
+		Currently AWeather only displays data provided by the United
+		States National Weather Service.
 	</p>
 	<hr />
 
@@ -88,6 +91,8 @@ Content-Type: text/html; charset=UTF-8
 				<li>Level-II archives</li>
 				<li>Conus NEXRAD imagery</li>
 				<li>Volume display of dBZ iso surfaces</li>
+				<li>Storm based and county based<br/>
+				    warning/watch/advisory displays</li>
 			</ul></li>
 			<li>Virtual Globe base rendering<ul>
 				<li>Including terrain, satellite, and map imagery</li>
@@ -122,15 +127,45 @@ Content-Type: text/html; charset=UTF-8
 	   without any license fees or royalties.</p>
 <% } %>
 
+<% void print_manual(void) { %>
+	<div class="asciidoc">
+		<% print_file("manual.inc"); %>
+	</div>
+<% } %>
+
 <% void print_news(void) { %>
-	<p class="quote">Now that it's spring again, progress on AWeather is continuing.</p>
+	<!-- It's not really spring anymore :/ -->
+	<!-- <p class="quote">Now that it's spring again, progress on AWeather is continuing.</p> -->
 	<dl class="news">
+		<dt>2011-11-25</dt>
+		<dd>
+			AWeather 0.6.1 released: <ul>
+				<li>Added a Radar menu to quickly jump to a NEXRAD/WSR-88D site</li>
+				<li>Fixed a bunch of 64-bit bugs</li>
+			</ul>
+		</dd>
+
+		<dt>2011-11-03</dt>
+		<dd>
+			AWeather 0.6 released: <ul>
+				<li>Added "Alerts" plugin using the 
+				    <a href="http://alerts.weather.gov/">NWS CAP</a> feed</li>
+				<li>Updated GTK+ libraries for Windows</li>
+				<li>Behind the scenes, mouse support in Grits
+				    has been much improved</li>
+			</ul>
+			This release was a little bit faster than previous releases.
+			Hopefully additional improvements to the alerts plugin
+			can be made incrementally during the 0.x.x releases.
+		</dd>
+
 		<dt>2011-09-12</dt>
 		<dd>
 			AWeather 0.5.2 released: <ul>
 				<li>Added new desktop icons</li>
 				<li>Miscellaneous bug fixes</li>
 			</ul>
+			Improved organization of the <a href="<%= WIKI_INDEX %>">Wiki</a>
 		</dd>
 
 		<dt>2011-08-25</dt>
@@ -168,7 +203,14 @@ Content-Type: text/html; charset=UTF-8
 			<li>Added an option to automatically refresh after a timeout</li>
 			<li>New fullscreen mode</li>
 		</ul></dd>
+	</dl>
+	<p class="note">See also: <a href="oldnews">Older news</a>,
+		                  <a href="<%= GW_AWEATHER %>">gitweb</a></p>
+<% } %>
 
+<% void print_oldnews(void) { %>
+	&lt; <a href="news">News</a>
+	<dl class="news">
 		<dt>2010-05-17</dt>
 		<dd>AWeather 0.4.1:<ul>
 			<li>Win32 fixes and improved debug support</li>
@@ -196,7 +238,6 @@ Content-Type: text/html; charset=UTF-8
 		    progress is being made on libgis, which is now able to display
 		    a virtual globe using data from NASA servers.</dd>
 	</dl>
-	<p class="note">See also: AWeather's <a href="<%= GW_AWEATHER %>">gitweb</a></p>
 <% } %>
 
 <% void print_screenshots(void) { %>
@@ -223,6 +264,10 @@ Content-Type: text/html; charset=UTF-8
 			<% print_screen("iso"); %>
 			Close up showing a 52.5 dBZ isosurface
 		</li>
+		<li>
+			<% print_screen("alert"); %>
+			Current severe weather alerts for the CONUS
+		</li>
 	</ul>
 <% } %>
 
@@ -237,7 +282,7 @@ Content-Type: text/html; charset=UTF-8
 			<dt>Source code</dt>
 			<dd>
 			<a href="files/aweather-<%= VERSION %>.tar.gz">aweather-<%= VERSION %>.tar.gz</a>,
-			<a href="../grits/grits-<%= VERSION %>.tar.gz">grits-<%= VERSION %>.tar.gz</a>,
+			<a href="../grits/grits-<%= VERSION_GRITS %>.tar.gz">grits-<%= VERSION_GRITS %>.tar.gz</a>,
 			<a href="files/rsl-1.40.tar.gz">rsl-1.40.tar.gz</a>
 			</dd>
 
@@ -248,7 +293,13 @@ Content-Type: text/html; charset=UTF-8
 			<dd><span class="code">apt-get install aweather</span> from Debian sid</dd>
 
 			<dt>Ubuntu</dt>
-			<dd><span class="code">apt-get install aweather</span> from Ubuntu oneiric</dd>
+			<dd><span class="code">apt-get install aweather</span> from Ubuntu Oneiric,
+			    or the <a href="<%= UBUNTU_PPA %>">AWeather PPA</a></dd>
+			<!--
+				(Arch packages still have bugs)
+				<dt>Arch</dt>
+				<dd>Available from the AUR</dd>
+			-->
 		</dl></li>
 		<li class="windows"><dl class="inline">
 			<dt>Windows</dt>
@@ -416,11 +467,16 @@ Content-Type: text/html; charset=UTF-8
 			<li>Data caching</li>
 			<li>Automatic updating</li>
 		</ul></li>
+		<li>Warning/Watch/Advisory display</li>
 		<li>Surface and map overlays</li>
 		<li>Terrain rendering</li>
 	</ul>
 	<div style="float: left; margin-left: 20px;">
-		<% print_screen("meso"); %>
+		<% print_screen("stormbased"); %>
+		<div style="text-align: center; margin-right: 25px;">
+			AWeather showing storm based warnings<br />
+			on top of Level-II radar imagery
+		</div>
 	</div>
 	<a href="download" class="download" style="float: right;">
 		<span>Download</span>