Merge branch 'refs/heads/t/logo'

The fancy new svg logo and a couple of changes which streamline
the look of the web pages.

Cooking for a month.

* refs/heads/t/logo:
  web: Add horizontal space between table columns.
  web: Clean up style sheet.
  web: Avoid bold face on main page.
  web: Add padding to all pages.
  web: Move navigation into top level table.
  web: Link to "./index.html" rather than to ".".
  web: Remove selected APIs page.
  web: Avoid "integrated" in feature list of main page.
  web: Shorten slogan.
  web: The new logo for paraslash-0.7.
  manual: Avoid vertical space between coding style items.

diff --git a/NEWS.md b/NEWS.md
index 9e67364d9d6c2bb4dd8390e4a5ee5a524bbe5157..dc2e8050c386135ce618159966c952c4170bdc01 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -30,6 +30,7 @@ NEWS
 - New option for configure: --enable-ubsan to detect and report undefined
   behaviour.
 - The "tasks" server command has been removed.
+- The fancy new logo and a minor overhaul of the web pages.
 
 Downloads:
 [tarball](./releases/paraslash-git.tar.xz)

diff --git a/server.c b/server.c
index 09087f7a72396bf01e51782dbebc1b9d1a82eb7c..cb32d4d962e129ccf3589fa2ba3db8eb72e18984 100644 (file)
--- a/server.c
+++ b/server.c
@@ -2,31 +2,6 @@
 
 /** \file server.c Paraslash's main server. */
 
-/**
- * \mainpage Main data structures and selected APIs:
- *
- *     - Senders: \ref sender,
- *     - Audio file selector: \ref afs_info, \ref afs_table,
- *     - Audio format handler: \ref audio_format_handler, \ref afh_info
- *     - Receivers/filters/writers: \ref receiver, \ref receiver_node,
- *       \ref filter, \ref filter_node, \ref writer_node, \ref writer.
- *     - Scheduling: \ref sched.h,
- *     - Buffer trees: \ref buffer_tree.h,
- *     - Sideband API: \ref sideband.h,
- *     - Crypto: \ref crypt.h, \ref crypt_backend.h,
- *     - Error subsystem: \ref error.h,
- *     - Inter process communication: \ref ipc.h,
- *     - Forward error correction: \ref fec.h,
- *     - Daemons: \ref daemon.h,
- *     - Mixer API: \ref mix.h,
- *     - Interactive sessions: \ref interactive.h,
- *     - File descriptors: \ref fd.h,
- *     - Signals: \ref signal.h,
- *     - Networking: \ref net.h,
- *     - Time: \ref time.c,
- *     - Doubly linked lists: \ref list.h.
- */
-
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <signal.h>

diff --git a/web/about.in.html b/web/about.in.html
index 8395864a00a6e376634272954708cd96739afc2f..f188ff2566ad30645365e73aa62e399439dfbf5e 100644 (file)
--- a/web/about.in.html
+++ b/web/about.in.html
@@ -1,8 +1,8 @@
 <h1>About</h1>
 <hr>
 
-Paraslash is a collection of network audio streaming tools for Unix
-systems. It is written in C and released under the GPLv2.
+<p> Paraslash is a collection of network audio streaming tools for
+Unix systems. It is written in C and released under the GPLv2. </p>
 
 <ul>
        <li> Runs on Linux, FreeBSD, NetBSD </li>
@@ -10,15 +10,17 @@ systems. It is written in C and released under the GPLv2.
        <li> http, dccp and udp network streaming </li>
        <li> Stand-alone decoder, player, tagger </li>
        <li> Curses-based gui (<a href="gui.png">screenshot</a>) </li>
-       <li> Integrated volume normalizer, fader, alarm clock </li>
+       <li> Volume normalizer, fader, alarm clock </li>
        <li> Sophisticated audio file selector </li>
        <li> Command line interface with tab-completion </li>
        <li> Open source and well documented </li>
 </ul>
 
-<b> Author: </b> Andr&eacute; Noll,
-<a href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>,
-Homepage: <a href="http://people.tuebingen.mpg.de/maan/">http://people.tuebingen.mpg.de/maan/</a>
-<br>
-Comments and bug reports are welcome. Please provide the version of
-paraslash you are using and relevant parts of the logs.
+<p> Author: Andre Noll, <a
+href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>,
+Homepage: <a
+href="http://people.tuebingen.mpg.de/maan/">http://people.tuebingen.mpg.de/maan/</a>
+</p>
+
+<p> Comments and bug reports are welcome. Please provide the version
+of paraslash you are using and relevant parts of the logs. </p>

diff --git a/web/documentation.in.html b/web/documentation.in.html
index 8e85f7fc5b260b73b095cbea04f7ff7a72fb2017..32efe9c3b191ff2bfa6df658480e63a884e3952f 100644 (file)
--- a/web/documentation.in.html
+++ b/web/documentation.in.html
@@ -31,5 +31,5 @@
 <h2> Source code documentation </h2>
 
 <ul>
-       <li> <a href="doxygen/html/index.html">API Reference</a> </li>
+       <li> <a href="doxygen/html/files.html">API Reference</a> </li>
 </ul>

diff --git a/web/download.in.html b/web/download.in.html
index b2b1f5fabbcc980cf852c1d5c5c177583ea693f9..2b31e5d76c7f9f7c348ba08f852dc6c5a5780f73 100644 (file)
--- a/web/download.in.html
+++ b/web/download.in.html
@@ -1,8 +1,9 @@
 <h1>Download</h1>
 <hr>
 
-Paraslash is only available as source code, no binary packages are
-provided at this point. There are several ways to download the source:
+<p> Paraslash is only available as source code, no binary packages
+are provided at this point. There are several ways to download the
+source: </p>
 
 <ul>
        <li> <em> git</em>.

diff --git a/web/footer.html b/web/footer.html
index 38572c940dac47cafcd170a64c04a21953dc74bf..cceeff1a3097597c261254b020c1ffbe0dd3ef19 100644 (file)
--- a/web/footer.html
+++ b/web/footer.html
@@ -1,5 +1,3 @@
 <hr>
-       </td>
-       </table>
 </body>
 </html>

diff --git a/web/header.html b/web/header.html
index a5d01204939d789cf4841499ce31119bfd5e1c35..1e102a6b3e7732c43d3c8eaa56797540022cb134 100644 (file)
--- a/web/header.html
+++ b/web/header.html
@@ -10,22 +10,23 @@
 <body>
        <table>
        <tr>
-               <td>
-                       <a title="paraslash homepage" href=".">
-                               <img src="paraslash.png" alt="paraslash">
+               <td rowspan="2">
+                       <a title="paraslash homepage" href="./index.html">
+                               <img src="paraslash.svg" alt="paraslash">
                        </a>
                </td>
                <td>
-                       <h3>Paraslash network audio streaming tools</h3>
+                       <span class="slogan">Paraslash Audio Streaming</span>
                </td>
        </tr>
        <tr>
-               <td valign="top">
-                       <br>
-                       <a href=".">About</a><br>
-                       <a href="news.html">News</a><br>
-                       <a href="download.html">Download</a><br>
-                       <a href="documentation.html">Documentation</a><br>
-                       <a href="devel.html">Development</a><br>
-               </td>
                <td>
+                       <a href="./index.html">About</a>&nbsp;
+                       &nbsp;<a href="news.html">News</a>&nbsp;
+                       &nbsp;<a href="download.html">Download</a>&nbsp;
+                       &nbsp;<a href="documentation.html">Documentation</a>&nbsp;
+                       &nbsp;<a href="devel.html">Development</a>
+               </td>
+       </tr>
+       </table>
+<hr>

diff --git a/web/header2.html b/web/header2.html
index 98235b8621324bc9176d2f9803ea4cf097afd83a..29ec02d40eb266c3f1eaa2617b6c609cd1d90b40 100644 (file)
--- a/web/header2.html
+++ b/web/header2.html
@@ -10,25 +10,23 @@
 <body>
        <table>
        <tr>
-               <td>
-                       <a title="paraslash homepage" href="../..//">
-                               <img src="../../paraslash.png" alt="paraslash">
+               <td rowspan="2">
+                       <a title="paraslash homepage" href="../../index.html">
+                               <img src="../../paraslash.svg" alt="paraslash">
                        </a>
                </td>
                <td>
-                       <h3>Paraslash network audio streaming tools</h3>
+                       <span class="slogan">Paraslash Audio Streaming</span>
                </td>
        </tr>
        <tr>
-               <td valign="top">
-                       <br>
-                       <a href="../..">About</a><br>
-                       <a href="../../news.html">News</a><br>
-                       <a href="../../download.html">Download</a><br>
-                       <a href="../../documentation.html">Documentation</a><br>
-                       <a href="../../devel.html">Development</a><br>
-               </td>
                <td>
-                       <h1>API Reference</h1>
-                       <hr />
-
+                       <a href="../../index.html">About</a>&nbsp;
+                       &nbsp;<a href="../../news.html">News</a>&nbsp;
+                       &nbsp;<a href="../../download.html">Download</a>&nbsp;
+                       &nbsp;<a href="../../documentation.html">Documentation</a>&nbsp;
+                       &nbsp;<a href="../../devel.html">Development</a>
+               </td>
+       </tr>
+       </table>
+<hr>

diff --git a/web/images/paraslash.ico b/web/images/paraslash.ico
index 06ff03362e8a33dfe2b02bd2c214892dd3ba59c4..65a0dd69fd3e52d529e63b8ea039a3b32a7cbce4 100644 (file)
Binary files a/web/images/paraslash.ico and b/web/images/paraslash.ico differ

diff --git a/web/images/paraslash.png b/web/images/paraslash.png
deleted file mode 100644 (file)
index 804752c..0000000
Binary files a/web/images/paraslash.png and /dev/null differ

diff --git a/web/images/paraslash.svg b/web/images/paraslash.svg
new file mode 100644 (file)
index 0000000..b0616a7
--- /dev/null
+++ b/web/images/paraslash.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" standalone="no"?>
+<svg
+       xmlns="http://www.w3.org/2000/svg"
+       width="80" height="100"
+       xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+       <defs>
+               <radialGradient id="gradient" r="70%">
+                       <stop offset="0%" stop-color="#d40"/>
+                       <stop offset="100%" stop-color="#010"/>
+               </radialGradient>
+
+               <g
+                       id="bow"
+                       stroke="#111" stroke-width="0"
+                       fill="url(#gradient)"
+               >
+                       <path d="M 40,50 c 0,-21 30,-21 30,0"/>
+               </g>
+       </defs>
+       <g transform="scale(1.0, 1.3) translate(0, -11)">
+               <circle
+                       cx="40" cy="50" r="38"
+                       stroke-width="0"
+                       fill="url(#gradient)"
+               />
+               <use
+                       xlink:href="#bow"
+                       transform="
+                               scale(1.5)
+                               rotate(320, 40,50)
+                               translate(-14, -24)
+                       "
+               />
+               <use
+                       xlink:href="#bow"
+                       transform="
+                               translate(0, -36)
+                               scale(1.5)
+                               rotate(140, 40,50)
+                       "
+               />
+       </g>
+</svg>

diff --git a/web/manual.md b/web/manual.md
index 94de694470a2c2d5a4f02aab2eb7c9b558fd333c..78834a4d48be70f178dba5ffed88f5db8761745c 100644 (file)
--- a/web/manual.md
+++ b/web/manual.md
@@ -2077,11 +2077,11 @@ here are the most important points.
 - Don't leave whitespace at the end of lines.
 - The limit on the length of lines is 80 columns.
 - Use K&R style for placing braces and spaces:
-
+<pre>
                if (x is true) {
                        we do y
                }
-
+</pre>
 - Use a space after (most) keywords.
 - Do not add spaces around (inside) parenthesized expressions.
 - Use one space around (on each side of) most binary and ternary operators.

diff --git a/web/para.css b/web/para.css
index e8c43489f4681bcbd8bb859db80582b5fa83c068..2043fbb70b2afdf9ef243200920910bf564f2a1e 100644 (file)
--- a/web/para.css
+++ b/web/para.css
@@ -1,46 +1,29 @@
-body,h1,h2,h3,h4,h5,h6,p,center,td,th,ul,dl,div {
-       font-family: sans-serif;
-}
-
 body {
+       font-family: sans-serif;
        background-color: black;
        color: #bbbbbb;
-       margin: 0px;
-}
-
-table {
-       padding: 8px 4px;
-}
-
-th {
-       padding: 2px 5px;
-       font-size: 100%;
-       text-align: left;
+       margin: 20px;
 }
 
 td {
-       padding: 2px 5px;
-       font-size: 100%;
+       padding: 2px 10px 2px 10px;
        vertical-align: top;
 }
 
+span.slogan {
+       font-size: 200%;
+       font-weight: bold;
+       color: #ddd;
+}
+
 a {
        color: #cc3322;
 }
 
 hr {
-       height: 1px;
-       border: none;
        border-top: 1px solid yellow;
 }
 
-img {
-       float: right;
-       border-width: 0px;
-}
-
-caption { font-weight: bold }
-
 /* doxgen */
 
 /* Data structure index. Box with clickable letters */