]> git.tuebingen.mpg.de Git - osl.git/commitdiff
projects / osl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a5132c)
web: Don't duplicate the html header.
authorAndre Noll <maan@tuebingen.mpg.de>
Mon, 15 Jun 2020 23:39:18 +0000 (01:39 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Tue, 22 Sep 2020 19:28:31 +0000 (21:28 +0200)
Now that all web pages are in a single directory, we can get rid of
some duplication by using header.html also to create index.html.

Makefile patch | blob | history
web/index.html.in patch | blob | history

diff --git a/Makefile b/Makefile
index 7f598d548b6f62ee8d92fa66256642c3233578d9..fb8a01d3282a6fddf3a7b4866a0af198ab0dd2f6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -150,8 +150,9 @@ www: web/index.html web/osl.png web/api.html
 web/osl.png: web/osl.pdf Makefile
        convert -scale 200x200 $< $@
 
-web/index.html: oslfsck.1 web/index.html.in INSTALL README QUICK_START
-       sed -e '/@README@/,$$d' web/index.html.in > $@
+web/index.html: oslfsck.1 web/header.html web/index.html.in INSTALL README QUICK_START
+       cat web/header.html > $@
+       sed -e '/@README@/,$$d' web/index.html.in >> $@
        markdown < README >> $@
        sed -e '1,/@README@/d' -e '/@INSTALL@/,$$d' web/index.html.in >> $@
        markdown < INSTALL >> $@
diff --git a/web/index.html.in b/web/index.html.in
index addc4f436f102c08bf6d4d587db860a86d7b8557..edd7745463a5c3784feaf4cfbafc1dcaf4653b2e 100644 (file)
--- a/web/index.html.in
+++ b/web/index.html.in
@@ -1,37 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-       <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'>
-       <title>OSL - The object storage layer library</title>
-       <link rel="shortcut icon" href="osl.ico">
-</head>
-
-<body>
-       <table>
-               <tr>
-                       <td>
-                               <IMG SRC="osl.png" alt="osl logo">
-                       </td>
-                       <td>
-                               <h1>The lightweight storage library</h1>
-                       </td>
-               </tr>
-       </table>
-
-       <hr>
-
-       [<a href="#readme">README</a>]
-       [<a href="#download">Download</a>]
-       [<a href="#install">INSTALL</a>]
-       [<a href="#quick_start">Quick Start</a>]
-       [<a href="api.html">API</a>]
-       [<a href="#license">License</a>]
-       [<a href="#contact">Contact</a>]
-       [<a href="#manpage">man page</a>]
-
-       <hr>
-
        <center>
                <h2>
                        <a name="readme">README</a>
osl - the object storage layer