9 files changed, 142 insertions, 41 deletions
diff --git a/share/www/dialog/_admin_party.html b/share/www/dialog/_admin_party.html
index f52099a6..ea9fb15a 100644
--- a/share/www/dialog/_admin_party.html
+++ b/share/www/dialog/_admin_party.html
@@ -22,7 +22,7 @@ specific language governing permissions and limitations under the License.
       both performance and security.
     </p>
     <p class="help">
-      Clicking start will remove all admins from the configuration. You will 
+      Clicking “Remove Admins” will remove all admins from the configuration. You will
       have to recreate any admins by hand after the tests have finished.
     </p>
   </fieldset>
diff --git a/share/www/dialog/_compact_view.html b/share/www/dialog/_compact_cleanup.html
index e64d97e3..506417f4 100644
--- a/share/www/dialog/_compact_view.html
+++ b/share/www/dialog/_compact_cleanup.html
@@ -13,16 +13,39 @@ specific language governing permissions and limitations under the License.
 
 -->
 <form action="" method="post">
-  <h2>Compact View</h2>
-  <fieldset>
+  <h2>Compact &amp; Cleanup</h2>
+  <fieldset class="radiogroup">
+    <label>
+      <input type="radio" name="action" value="compact_database" checked>
+      Compact Database
+    </label>
+    <p class="help">
+      Compacting a database removes deleted documents and previous revisions.
+      It is an <strong>irreversible operation</strong> and may take
+      a while to complete for large databases.
+    </p>
+    <hr>
+    <label>
+      <input type="radio" name="action" value="compact_views">
+      Compact Views
+    </label>
     <p class="help">
       View compaction will affect all views in this design document. This
       operation may take some time to complete. Your views will still operate
       normally during compaction.
     </p>
+    <hr>
+    <label>
+      <input type="radio" name="action" value="view_cleanup">
+      Cleanup Views
+    </label>
+    <p class="help">
+      Cleaning up views in a database removes old view files still stored
+      on the filesystem. It is an <strong>irreversible operation</strong>.
+    </p>
   </fieldset>
   <div class="buttons">
-    <button type="submit">Compact</button>
+    <button type="submit">Run</button>
     <button type="button" class="cancel">Cancel</button>
   </div>
 </form>
diff --git a/share/www/dialog/_create_admin.html b/share/www/dialog/_create_admin.html
index e4141e1d..d4aec95a 100644
--- a/share/www/dialog/_create_admin.html
+++ b/share/www/dialog/_create_admin.html
@@ -27,7 +27,7 @@ specific language governing permissions and limitations under the License.
     </p>
     <table summary=""><tbody><tr>
       <th><label>Username:</label></th>
-      <td><input type="text" name="username" size="24"></td>
+      <td><input type="text" name="name" size="24"></td>
     </tr><tr>
       <th><label>Password:</label></th>
       <td><input type="password" name="password" size="24"></td>
diff --git a/share/www/dialog/_compact_database.html b/share/www/dialog/_create_config.html
index 5c898a3c..79e08b08 100644
--- a/share/www/dialog/_compact_database.html
+++ b/share/www/dialog/_create_config.html
@@ -13,16 +13,30 @@ specific language governing permissions and limitations under the License.
 
 -->
 <form action="" method="post">
-  <h2>Compact Database</h2>
+  <h2>Create New Config Option</h2>
   <fieldset>
     <p class="help">
-      Compacting a database removes deleted documents and previous revisions.
-      It is an <strong>irreversible operation</strong> and may take
-      a while to complete for large databases.
+      Please enter the section, option, and value.
     </p>
+    <table summary="">
+      <tbody>
+        <tr>
+          <th><label>section:</label></th>
+          <td><input type="text" name="section" size="24"></td>
+        </tr>
+        <tr>  
+          <th><label>option:</label></th>
+          <td><input type="text" name="option" size="24"></td>
+        </tr>
+        <tr>
+            <th><label>value:</label></th>
+            <td><input type="text" name="val" size="24"></td>
+        </tr>
+      </tbody>
+    </table>
   </fieldset>
   <div class="buttons">
-    <button type="submit">Compact</button>
+    <button type="submit">Create</button>
     <button type="button" class="cancel">Cancel</button>
   </div>
 </form>
diff --git a/share/www/dialog/_database_security.html b/share/www/dialog/_database_security.html
new file mode 100644
index 00000000..d63fa787
--- /dev/null
+++ b/share/www/dialog/_database_security.html
@@ -0,0 +1,50 @@
+<!--
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+
+-->
+<form action="" method="post">
+  <h2>Security</h2>
+  <fieldset>
+    <p class="help">
+      Each database contains lists of admins and readers. 
+      Admins and readers are each defined by <tt>names</tt> and <tt>roles</tt>, which are lists of strings.
+    </p>
+
+    <h3>Admins</h3>
+    <p class="help">Database admins can update design documents and edit the readers list.</p>
+    <table summary=""><tbody><tr>
+      <th><label>Names:</label></th>
+      <td><input type="text" name="admin_names" size="40"></td>
+    </tr><tr>
+      <th><label>Roles:</label></th>
+      <td><input type="text" name="admin_roles" size="40"></td>
+    </tr>
+    </tbody></table>
+
+    <h3>Readers</h3>
+    <p class="help">Database readers can access the database. If no readers are defined, the database is public.</p>
+    <table summary=""><tbody><tr>
+      <th><label>Names:</label></th>
+      <td><input type="text" name="reader_names" size="40"></td>
+    </tr><tr>
+      <th><label>Roles:</label></th>
+      <td><input type="text" name="reader_roles" size="40"></td>
+    </tr>
+    </tbody></table>
+
+  </fieldset>
+  <div class="buttons">
+    <button type="submit">Update</button>
+    <button type="button" class="cancel">Cancel</button>
+  </div>
+</form>
diff --git a/share/www/dialog/_login.html b/share/www/dialog/_login.html
index 959f7233..f05a5fdc 100644
--- a/share/www/dialog/_login.html
+++ b/share/www/dialog/_login.html
@@ -16,11 +16,11 @@ specific language governing permissions and limitations under the License.
   <h2>Login</h2>
   <fieldset>
     <p class="help">
-      Login to CouchDB with your username and password.
+      Login to CouchDB with your name and password.
     </p>
     <table summary=""><tbody><tr>
       <th><label>Username:</label></th>
-      <td><input type="text" name="username" size="24"></td>
+      <td><input type="text" name="name" size="24"></td>
     </tr><tr>
       <th><label>Password:</label></th>
       <td><input type="password" name="password" size="24"></td>
diff --git a/share/www/dialog/_share_test_reports.html b/share/www/dialog/_share_test_reports.html
new file mode 100644
index 00000000..82b49a74
--- /dev/null
+++ b/share/www/dialog/_share_test_reports.html
@@ -0,0 +1,42 @@
+<!--
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+
+-->
+<form action="" method="post">
+  <h2>Share Test Reports</h2>
+  <fieldset>
+    <p class="help">
+      After each test run, a results summary document is stored in
+      <a href="/_utils/database.html?test_suite_reports">your local
+        <tt>test_suite_reports</tt> database.</a> The data has no personally
+      identifying information, just details about the test run and your CouchDB
+      and browser versions. (Click the red link above to see what's stored.)
+      The data remains private until you click the "share" button below.
+    </p>
+    <p class="help">
+      Test reports are very valuable to the CouchDB community, and are easy to share.
+      Clicking the "share" button below triggers replication from
+      your local <tt>test_suite_reports</tt> database, to a database hosted by the
+      project.
+    </p>
+    <p class="help">
+      <a href="http://couchdb.couchdb.org/_utils/database.html?test_suite_reports">
+        Browse test reports shared by other users.</a>
+      Thank you for sharing!
+    </p>
+  </fieldset>
+  <div class="buttons">
+    <button type="submit">Share</button>
+    <button type="button" class="cancel">Cancel</button>
+  </div>
+</form>
diff --git a/share/www/dialog/_signup.html b/share/www/dialog/_signup.html
index 884b4be2..7ba3448a 100644
--- a/share/www/dialog/_signup.html
+++ b/share/www/dialog/_signup.html
@@ -21,7 +21,7 @@ specific language governing permissions and limitations under the License.
     </p>
     <table summary=""><tbody><tr>
       <th><label>Username:</label></th>
-      <td><input type="text" name="username" size="24"></td>
+      <td><input type="text" name="name" size="24"></td>
     </tr><tr>
       <th><label>Password:</label></th>
       <td><input type="password" name="password" size="24"></td>
diff --git a/share/www/dialog/_view_cleanup.html b/share/www/dialog/_view_cleanup.html
deleted file mode 100644
index 2ede89a5..00000000
--- a/share/www/dialog/_view_cleanup.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
-
--->
-<form action="" method="post">
-  <h2>View Cleanup</h2>
-  <fieldset>
-    <p class="help">
-			Cleaning up views in a database removes old view files still stored
-			on the filesystem.  It is an <strong>irreversible operation</strong>.
-    </p>
-  </fieldset>
-  <div class="buttons">
-    <button type="submit">Cleanup</button>
-    <button type="button" class="cancel">Cancel</button>
-  </div>
-</form>
-