summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarren Smith <garren.smith@gmail.com>2013-11-25 17:25:54 +0200
committerGarren Smith <garren.smith@gmail.com>2013-11-25 17:27:10 +0200
commitd25d31c89225c65776d674d1d7025a43e441c209 (patch)
tree6bfc8a03b25bfaf4c477a77c5377132a7c93ce23
parent59475d134f27e3358315d2e34b339ec69a22403d (diff)
downloadcouchdb-d25d31c89225c65776d674d1d7025a43e441c209.tar.gz
Fauxton: Bug fixes
Remove databases after completed verify install. Fix css on config page
-rw-r--r--src/fauxton/app/addons/config/assets/less/config.less13
-rw-r--r--src/fauxton/app/addons/config/templates/dashboard.html8
-rw-r--r--src/fauxton/app/addons/stats/templates/pie_table.html2
-rw-r--r--src/fauxton/app/addons/verifyinstall/resources.js7
-rw-r--r--src/fauxton/app/addons/verifyinstall/views.js1
5 files changed, 26 insertions, 5 deletions
diff --git a/src/fauxton/app/addons/config/assets/less/config.less b/src/fauxton/app/addons/config/assets/less/config.less
new file mode 100644
index 000000000..86d9bf17a
--- /dev/null
+++ b/src/fauxton/app/addons/config/assets/less/config.less
@@ -0,0 +1,13 @@
+table.config {
+ #config-trash {
+ width: 5%;
+ }
+
+ #delete-value {
+ text-align: center;
+ }
+}
+
+button#add-section {
+ float: right;
+}
diff --git a/src/fauxton/app/addons/config/templates/dashboard.html b/src/fauxton/app/addons/config/templates/dashboard.html
index 0d087270b..ffbeb3712 100644
--- a/src/fauxton/app/addons/config/templates/dashboard.html
+++ b/src/fauxton/app/addons/config/templates/dashboard.html
@@ -22,10 +22,10 @@ the License.
</div>
<table class="config table table-striped table-bordered">
<thead>
- <th> Section </th>
- <th> Option </th>
- <th> Value </th>
- <th></th>
+ <th id="config-section"> Section </th>
+ <th id="config-option"> Option </th>
+ <th id="config-value"> Value </th>
+ <th id="config-trash"></th>
</thead>
<tbody>
</tbody>
diff --git a/src/fauxton/app/addons/stats/templates/pie_table.html b/src/fauxton/app/addons/stats/templates/pie_table.html
index 7aa9b43f5..c8e89cd03 100644
--- a/src/fauxton/app/addons/stats/templates/pie_table.html
+++ b/src/fauxton/app/addons/stats/templates/pie_table.html
@@ -46,7 +46,7 @@ the License.
</table>
</div>
- <div class="span4" style="height:430px;min-width: 430px">
+ <div class="span5" style="height:430px;min-width: 430px">
<center>
<svg id="<%= datatype %>_graph"></svg>
</center>
diff --git a/src/fauxton/app/addons/verifyinstall/resources.js b/src/fauxton/app/addons/verifyinstall/resources.js
index f42c020dd..5d83f9a0c 100644
--- a/src/fauxton/app/addons/verifyinstall/resources.js
+++ b/src/fauxton/app/addons/verifyinstall/resources.js
@@ -167,8 +167,15 @@ function (app, FauxtonAPI, Databases, Documents) {
}, deferred.reject);
return deferred;
+ },
+
+ removeDBs: function () {
+ dbReplicate.destroy();
+ db.destroy();
+
}
};
+
return Verifyinstall;
});
diff --git a/src/fauxton/app/addons/verifyinstall/views.js b/src/fauxton/app/addons/verifyinstall/views.js
index 3ad336436..eb6dac41a 100644
--- a/src/fauxton/app/addons/verifyinstall/views.js
+++ b/src/fauxton/app/addons/verifyinstall/views.js
@@ -114,6 +114,7 @@ function(app, FauxtonAPI, VerifyInstall) {
.then(function () {
setPass('replicate');
complete();
+ testProcess.removeDBs();
}, formatError('replicate'));
this.enableButton();