Moved links from bottom of page to upper right. Removed API page.

4 files changed, 18 insertions, 19 deletions

diff --git a/web/views/about.erb b/web/views/about.erb
index a3dba16..bdaac9d 100644
--- a/web/views/about.erb
+++ b/web/views/about.erb
@@ -30,13 +30,25 @@ href="http://wiki.openstreetmap.org/wiki/Taginfo">Taginfo wiki page</a> for
 more information.</p>
 
 <p>If you want to access the databases behind Taginfo, you can use our API.
-Access is through a RESTful HTTP interface. See the <a href="/api">API</a>
+Access is through a RESTful HTTP interface. See the API
 section for more information.</p>
 
 <p>If you want to play around with the data itself, you can download the
 regularly updated databases used by Taginfo. All the preprocessing is done for
 you. See the <a href="/download">download</a> section for more information.</p>
 
+<h2>API</h2>
+
+<p>Taginfo data can be accessed through a REST API. The documentation should
+appear here, but isn't done yet. Please look at the source code for Taginfo
+or ask if you are interested.</p>
+
+<h3>Terms of Use</h3>
+
+<p>The server running the Taginfo API does not have unlimited resources.
+Please use the API responsibly. Do not create huge amounts of requests to
+get the whole database or large chunks of it, instead use the
+<a href="/download">database downloads</a> provided.</p>
 
 <h2>Similar tools</h2>
 
diff --git a/web/views/api.erb b/web/views/api.erb
deleted file mode 100644
index 21742bc..0000000
--- a/web/views/api.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<h1>API</h1>
-
-<p>Taginfo data can be accessed through a REST API. The documentation should
-appear here, but isn't done yet. Please look at the source code for Taginfo
-or ask Jochen Topf (jochen@remote.org) if you are interested.</p>
-
-<h2>Terms of Use</h2>
-
-<p>The server running the Taginfo API does not have unlimited resources.
-Please use the API responsibly. Do not create huge amounts of requests to
-get the whole database or large chunks of it, instead use the
-<a href="/download">database downloads</a> provided.</p>
-
diff --git a/web/views/download.erb b/web/views/download.erb
index 842c045..d66d776 100644
--- a/web/views/download.erb
+++ b/web/views/download.erb
@@ -17,4 +17,4 @@
     <dd>Some aggregate statistics and miscellaneous data needed for the Taginfo user interface.</dd>
 </dl>
 
-<p>If you don't want to download these databases, but need automated access to the data, you can also use our <a href="/api">API</a>.
+<p>If you don't want to download these databases, but need automated access to the data, you can also use our <a href="/about">API</a>.
diff --git a/web/views/layout.erb b/web/views/layout.erb
index a0e9d28..c469aca 100644
--- a/web/views/layout.erb
+++ b/web/views/layout.erb
@@ -32,13 +32,13 @@
             </div>
         </div>
         <div id="date">
-            Data from: <%= @data_until %> UTC [<a href="/sources">Details...</a>]
+            Data from: <%= @data_until %> UTC <a class="button" href="/sources">Sources</a>
+            <a class="button" href="/download">Download</a>
+            <a class="button" href="/about">About</a>
+            <a class="button" href="http://wiki.openstreetmap.org/wiki/Taginfo">Wiki</a>
         </div>
         <div id="main">
             <%= yield %>
         </div>
-        <div id="bottom">
-            <span><a href="/about">About</a>&nbsp;&bull;&nbsp;<a href="/sources">Sources</a>&nbsp;&bull;&nbsp;<a href="/api">API</a>&nbsp;&bull;&nbsp;<a href="/download">Download</a></span>
-        </div>
     </body>
 </html>