Merge new-rend-branch

admin-root/config-update.html

@@ -4,14 +4,11 @@
 
 <div class="stx">
 
-<TABLE>
+<table>
-<TR><TH>Web Root</TH><TD>@WEB_ROOT@</TD></TR>
+  <tr><th>Admin Password</th><td>@admin_pw@</td></tr>
-<TR><TH>MP3 Dir</TH><TD>@MP3_DIR@</TD></TR>
+  <tr><th>MP3 Password</th><td>@password@</td></tr>
-<TR><TH>Port</TH><TD>@PORT@</TD></TR>
+</table>
-<TR><TH>Admin Password</TH><TD>@ADMIN_PW@</TD></TR>
-</TABLE>
 
-<BR>
 
 @SERVICE-STATUS@
 

admin-root/config.html

@@ -2,34 +2,47 @@
 
 <h1>Configuration</h1>
 
-<div class="stx">
+<P>
+Note that the following fields will only be editable if the
+configuration file itself is writable by the mt-daapd server.  If you
+make changes to these settings, they will not be reflected in the
+running server.  The server must be restarted for these values to
+take effect.
 
+<div class="stx">
     <FORM METHOD="POST" ACTION="/config-update.html">
       <TABLE>
 	<TR>
 	  <TD>Web Root</TD>
-	  <TD><INPUT TYPE="TEXT" NAME="WEB_ROOT" READONLY SIZE="80"
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="WEB_ROOT" SIZE="80" VALUE="@WEB_ROOT@"></TD>
-	  VALUE="@WEB_ROOT@"></TD>
+	</TR>
+	<TR>
+	  <TD>Playlist File</TD>
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="PLAYLIST" SIZE="80" VALUE="@PLAYLIST@" SIZE="80"></TD>
 	</TR>
 	<TR>
 	  <TD>MP3 Dir</TD>
-	  <TD><INPUT TYPE="TEXT" NAME="MP3DIR" READONLY SIZE="80"
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="MP3_DIR" SIZE="80" VALUE="@MP3_DIR@"></TD>
-	  VALUE="@MP3_DIR@"></TD>
 	</TR>
 	<TR>
 	  <TD>Port</TD>
-	  <TD><INPUT TYPE="TEXT" NAME="PORT" READONLY
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="PORT" VALUE="@PORT@"></TD>
-	  VALUE="@PORT@"></TD>
 	</TR>
 	<TR>
 	  <TD>Server Name</TD>
-	  <TD><INPUT TYPE="TEXT" NAME="SERVERNAME"
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="SERVERNAME" VALUE="@SERVERNAME@"></TD>
-	  VALUE="@SERVERNAME@"></TD>
+	</TR>
+	<TR>
+	  <TD>Run As</TD>
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="RUNAS" VALUE="@RUNAS@"></TD>
 	</TR>
 	<TR>
 	  <TD>Admin Password</TD>
-	  <TD><INPUT TYPE="TEXT" NAME="ADMINPW"
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="ADMIN_PW" VALUE="@ADMIN_PW@"></TD>
-	  VALUE="@ADMIN_PW@"></TD>
+	</TR>
+	<TR>
+	  <TD>MP3 Password</TD>
+	  <TD><INPUT TYPE="TEXT" @READONLY@ NAME="PASSWORD" VALUE="@PASSWORD@"></TD>
 	</TR>
       </TABLE>
       <INPUT TYPE="SUBMIT" NAME="SUBMIT" VALUE="Submit">

admin-root/thanks.html

@@ -16,7 +16,7 @@ Special thanks to the following people:
 
   <li>
     The fine folks at 
-    <a href="www.plone.org">
+    <a href="http://www.plone.org">
       Plone</a>, an excellent CMS system, for the CSS and stuff for these admin pages.
   </li>