Futon: Merge the different compaction/cleanup buttons into a single button on the database page, which will bring up a dialog allowing you to choose which type of compaction/cleanup to perform.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@900999 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 26 insertions, 59 deletions

diff --git a/share/www/dialog/_compact_database.html b/share/www/dialog/_compact_cleanup.html
index 5c898a3c..506417f4 100644
--- a/share/www/dialog/_compact_database.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 Database</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/_compact_view.html b/share/www/dialog/_compact_view.html
deleted file mode 100644
index e64d97e3..00000000
--- a/share/www/dialog/_compact_view.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>Compact View</h2>
-  <fieldset>
-    <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>
-  </fieldset>
-  <div class="buttons">
-    <button type="submit">Compact</button>
-    <button type="button" class="cancel">Cancel</button>
-  </div>
-</form>
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>
-