You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/11/25 16:27:42 UTC

git commit: updated refs/heads/master to d25d31c

Updated Branches:
  refs/heads/master 59475d134 -> d25d31c89


Fauxton: Bug fixes

Remove databases after completed verify install. Fix css on config page


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d25d31c8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d25d31c8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d25d31c8

Branch: refs/heads/master
Commit: d25d31c89225c65776d674d1d7025a43e441c209
Parents: 59475d1
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Nov 25 17:25:54 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Nov 25 17:27:10 2013 +0200

----------------------------------------------------------------------
 src/fauxton/app/addons/config/assets/less/config.less  | 13 +++++++++++++
 src/fauxton/app/addons/config/templates/dashboard.html |  8 ++++----
 src/fauxton/app/addons/stats/templates/pie_table.html  |  2 +-
 src/fauxton/app/addons/verifyinstall/resources.js      |  7 +++++++
 src/fauxton/app/addons/verifyinstall/views.js          |  1 +
 5 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d25d31c8/src/fauxton/app/addons/config/assets/less/config.less
----------------------------------------------------------------------
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 0000000..86d9bf1
--- /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;
+}

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d25d31c8/src/fauxton/app/addons/config/templates/dashboard.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/config/templates/dashboard.html b/src/fauxton/app/addons/config/templates/dashboard.html
index 0d08727..ffbeb37 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>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d25d31c8/src/fauxton/app/addons/stats/templates/pie_table.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/stats/templates/pie_table.html b/src/fauxton/app/addons/stats/templates/pie_table.html
index 7aa9b43..c8e89cd 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>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d25d31c8/src/fauxton/app/addons/verifyinstall/resources.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/verifyinstall/resources.js b/src/fauxton/app/addons/verifyinstall/resources.js
index f42c020..5d83f9a 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;
 });

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d25d31c8/src/fauxton/app/addons/verifyinstall/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/verifyinstall/views.js b/src/fauxton/app/addons/verifyinstall/views.js
index 3ad3364..eb6dac4 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();