Herman's web interface fixes

CREDITS

@@ -86,6 +86,7 @@ Timo J. Rinne
 
 Herman I. May
  * Web wrangling and forums question answering
+ * HTML interface fixes
 
 North Overby
  * Patches for disc number

admin-root/CREDITS

@@ -86,6 +86,7 @@ Timo J. Rinne
 
 Herman I. May
  * Web wrangling and forums question answering
+ * HTML interface fixes
 
 North Overby
  * Patches for disc number

admin-root/config-update.html

@@ -9,6 +9,7 @@
   <tr><th>MP3 Password</th><td>@password@</td></tr>
 </table>
 
+<br />
 
 @SERVICE-STATUS@
 

admin-root/hdr.html

@@ -13,7 +13,9 @@
 <table class="main" border="0" width="100%" summary="Main navigation"><tr>
 <td class="navi" width="182">
 
+<a href="http://www.mt-daapd.org/" title="link to project home">
 <img src="mt-daapd.png" width="182" height="71" alt="mt-daap logo"/>
+</a>
 
 <div class="ministatus">Version @VERSION@</div>
 
@@ -35,7 +37,7 @@
 
 <div class="naviheader">Links</div>
 <div class="navibox">
- <div class="navilink"><a class="navi" href="http://mt-daapd.sourceforge.net/">mt-daapd home</a></div>
+ <div class="navilink"><a class="navi" href="http://www.mt-daapd.org/">mt-daapd home</a></div>
  <div class="navilink"><a class="navi" href="http://cvs.sourceforge.net/viewcvs.py/mt-daapd/">mt-daapd cvs</a></div>
  <div class="navilink"><a class="@ispage gpl-license.html:naviselected:navi@" href="gpl-license.html">GPL license</a></div>
  <div class="navilink"><a class="@ispage aspl-license.html:naviselected:navi@" href="aspl-license.html">ASPL license</a></div>

contrib/mt-daapd.conf

@@ -42,16 +42,29 @@ port		3689
 
 admin_pw	mt-daapd
 
+
 #
-# db_dir (required)
+# db_type (required)
 #
-# This is where mt-daapd stores its database of song information.  
+# This is what kind of backend database to store the song
-#
+# info in.  Valid choices are "sqlite" and "sqlite3".
-# If you installed from .RPM or .deb, then this directory already
-# exists.  If not, then YOU MUST CREATE THIS DIRECTORY!
 #
 
-db_dir		/var/cache/mt-daapd
+db_type sqlite
+
+#
+# db_parms
+#
+# This is any extra information the db needs to connect.
+# in the case of sqlite and sqlite3, this is the name
+# of the directory to store the database in
+#
+# If you installed from RPM or .deb, this path likely already
+# exists.  If not, then you must create it.  The directory itself
+# must be writable by the "runas" user.
+#
+
+db_parms  /var/cache/mt-daapd
 
 #
 # mp3_dir (required)

src/configfile.c

@@ -405,12 +405,12 @@ int config_read(char *file) {
     config.mp3dir=strdup(path_buffer);
 
     if(config.dbdir) {
-	DPRINTF(E_LOG,L_MISC,"You are using db_dir rather than "
+        DPRINTF(E_LOG,L_MISC,"You are using db_dir rather than "
-		"db_type/db_parms.  This will stop working at "
+                "db_type/db_parms.  This will stop working at "
-		"some point.  Please fix your config\n");
+                "some point.  Please fix your config\n");
-	realpath(config.dbdir,path_buffer);
+        realpath(config.dbdir,path_buffer);
-	free(config.dbdir);
+        free(config.dbdir);
-	config.dbdir=strdup(path_buffer);
+        config.dbdir=strdup(path_buffer);
     }
 
 
@@ -913,6 +913,8 @@ void config_emit_service_status(WS_CONNINFO *pwsc, void *value, char *arg) {
 
     ws_writefd(pwsc,"</table>\n");
 
+    ws_writefd(pwsc,"<br />\n");
+
     ws_writefd(pwsc,"<table>\n");
     ws_writefd(pwsc,"<tr>\n");
     ws_writefd(pwsc," <th>Uptime</th>\n");