Update icons and misc formatting
authorAndy Spencer <andy753421@gmail.com>
Sun, 6 May 2012 00:14:52 +0000 (00:14 +0000)
committerAndy Spencer <andy753421@gmail.com>
Sun, 6 May 2012 00:14:52 +0000 (00:14 +0000)
data/global.css
html.ct
images/aweather.ico
images/logo.png
mkfile

index 9c299e8..8268c15 100644 (file)
@@ -90,8 +90,8 @@ body {
 
 /* Header stuff */
 .top {
-       height: 80px;
-       margin-top: 15px;
+       height: 75px;
+       margin-top: 20px;
        border-collapse: collapse;
        position: relative;
 }
@@ -101,11 +101,11 @@ body {
 }
 
 .logo {
-       width: 130px;
        z-index: 1;
+       margin-right: 10px;
 }
 
-.title {
+.title, .title a {
        font-size: 22pt;
        font-weight: bold;
        font-style: italic;
@@ -114,7 +114,7 @@ body {
 
 .nav {
        position: absolute;
-       top: 45px;
+       top: 42px;
        left: 135px;
        right: 0px;
        z-index: 1;
@@ -212,13 +212,13 @@ body {
        margin-bottom: 10px;
 }
 
-.download {
+.download, a.download {
        position: relative;
        display: block;
        z-index: 1;
        height: 62px;
        width: 150px;
-       color: white;
+       color: #eee;
        font-size: 11pt;
        text-decoration: none;
        padding: 8px 25px 8px 25px;
@@ -234,9 +234,11 @@ body {
 }
 
 .download:first-line {
+       color: #fff;
+       font-size: 1.3em;
        font-weight: bold;
-       font-style: italic;
-       line-height: 2em;
+       line-height: 1.9em;
+       text-shadow: 1px 1px 1px #666;
 }
 
 .download img {
diff --git a/html.ct b/html.ct
index 8746424..dafd2dd 100644 (file)
--- a/html.ct
+++ b/html.ct
@@ -33,7 +33,7 @@ Content-Type: text/html; charset=UTF-8
                <meta name="description" content="<%= page->desc %>" />
                <% } %>
                <meta name="google-site-verification" content="-SZkTpNRWHrpESTGNZ8Pshnz4zKbwfKv54NoavUKK_Y" />
-               <meta name="y_key" content="abe8287921b25151" />
+               <meta name="msvalidate.01" content="CB7C94BBCD12714FDFF3D22415B1888A" />
        </head>
        <body>
                <div class="top">
@@ -514,20 +514,23 @@ Content-Type: text/html; charset=UTF-8
                see the <a href="about">about</a> page for more details.
        </p>
        <hr />
-       <ul style="float: left;">
-               <li>Detailed Level-II NEXRAD radar<ul>
-                       <li>3D volume rendering</li>
-                       <li>Dual-pole support</li>
-               </ul></li>
-               <li>Online and offline modes<ul>
-                       <li>Data caching</li>
-                       <li>Automatic updating</li>
-               </ul></li>
-               <li>Warning/Watch/Advisory display</li>
-               <li>GPS tracking and logging</li>
-               <li>Surface and map overlays</li>
-               <li>Terrain rendering</li>
-       </ul>
+       <div style="float: left">
+               <h2 style="margin-top: 0;">Features:</h2>
+               <ul style="float: left;">
+                       <li>Detailed Level-II NEXRAD radar<ul>
+                               <li>3D volume rendering</li>
+                               <li>Dual-pole support</li>
+                       </ul></li>
+                       <li>Online and offline modes<ul>
+                               <li>Data caching</li>
+                               <li>Automatic updating</li>
+                       </ul></li>
+                       <li>Warning/Watch/Advisory display</li>
+                       <li>GPS tracking and logging</li>
+                       <li>Surface and map overlays</li>
+                       <li>Terrain rendering</li>
+               </ul>
+       </div>
        <div style="float: left; margin-left: 20px;">
                <% print_screen("stormbased"); %>
                <div style="text-align: center; margin-right: 25px;">
@@ -536,8 +539,8 @@ Content-Type: text/html; charset=UTF-8
                </div>
        </div>
        <a href="download" class="download" style="float: right;">
-               <span>Download</span>
-               <span>AWeather <%= VERSION %></span>
+               <span>AWeather</span>
+               <span>Download Version <%= VERSION %></span>
                <img src="images/dl-arrow.png" alt="Download" />
        </a>
        <p style="text-align: center;"><%= VERSION_DESC %></p>
index e092072..e1edd57 100644 (file)
Binary files a/images/aweather.ico and b/images/aweather.ico differ
index 6975378..7f21960 100644 (file)
Binary files a/images/logo.png and b/images/logo.png differ
diff --git a/mkfile b/mkfile
index 4968365..d03ee6d 100644 (file)
--- a/mkfile
+++ b/mkfile
@@ -1,7 +1,7 @@
 CT=/scratch/ct/ct
 CFLAGS='--std=c99 -Wall'
 
-all:V: index.cgi manual.inc
+all:V: index.cgi manual.inc images/aweather.ico images/logo.png
 
 index.cgi: index.o html.o
        gcc $CFLAGS -o $target $prereq $PKG_LIBS
@@ -16,6 +16,12 @@ manual.inc: ../aweather/docs/userguide.ad
        asciidoc -s -a toc -a numbered -b xhtml11 -o- $prereq \
        | awk -f toc.awk > $target
 
+images/aweather.ico: ../aweather/data/icons/16x16/aweather.png
+       icotool -c $prereq -o $target
+
+images/logo.png: ../aweather/data/icons/scalable/aweather.svg
+       rsvg -w 130 -h 130 $prereq $target
+
 clean:V:
        rm -f *.o *.cgi html.c