svn commit: r648044 - in /incubator/couchdb/branches/futon-async/share/www: couch_tests.html script/browse.js style/layout.css

[cm...@apache.org]

Author: cmlenz
Date: Mon Apr 14 15:59:45 2008
New Revision: 648044

URL: http://svn.apache.org/viewvc?rev=648044&view=rev
Log:
futon-async branch:
 * Selection status of the builtin views is now working.
 * Fixed error when trying to edit the value of a new field before the field name has been committed. Values can now only be edited for fields where the name has been set.
 * Added note about blocking behavior to the top of the test suite.

Modified:
    incubator/couchdb/branches/futon-async/share/www/couch_tests.html
    incubator/couchdb/branches/futon-async/share/www/script/browse.js
    incubator/couchdb/branches/futon-async/share/www/style/layout.css

Modified: incubator/couchdb/branches/futon-async/share/www/couch_tests.html
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/futon-async/share/www/couch_tests.html?rev=648044&r1=648043&r2=648044&view=diff
==============================================================================
--- incubator/couchdb/branches/futon-async/share/www/couch_tests.html [utf-8] (original)
+++ incubator/couchdb/branches/futon-async/share/www/couch_tests.html [utf-8] Mon Apr 14 15:59:45 2008
@@ -48,6 +48,12 @@
         <li><button class="run">Run All</button></li>
         <li><button class="load">Reload</button></li>
       </ul>
+      <p class="help">
+        <strong>Note:</strong> Each of the tests will block the browser. If the
+        connection to your CouchDB server is slow, running the tests will take
+        some time, and you'll not be able to do much with your browser while
+        a test is being executed.
+      </p>
       <table class="listing" id="tests" cellspacing="0">
         <caption>Tests</caption>
         <thead>

Modified: incubator/couchdb/branches/futon-async/share/www/script/browse.js
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/futon-async/share/www/script/browse.js?rev=648044&r1=648043&r2=648044&view=diff
==============================================================================
--- incubator/couchdb/branches/futon-async/share/www/script/browse.js [utf-8] (original)
+++ incubator/couchdb/branches/futon-async/share/www/script/browse.js [utf-8] Mon Apr 14 15:59:45 2008
@@ -187,6 +187,13 @@
         }
       }
     });
+    if (!viewName.match(/^_design\//)) {
+      $.each(["_all_docs", "_design_docs", "_temp_view"], function(idx, name) {
+        if (viewName == name) {
+          select[0].options[idx].selected = true;
+        }
+      });
+    }
   }
 
   this.revertViewChanges = function(callback) {
@@ -634,7 +641,7 @@
   }
 
   function _editValue(doc, cell, fieldName) {
-    if (fieldName == "_id" || fieldName == "_rev") return;
+    if (!fieldName || fieldName == "_id" || fieldName == "_rev") return;
     var td = $(cell);
     var value = doc[fieldName];
     var needsTextarea = $("dl", td).length > 0 || $("code", td).text().length > 60;

Modified: incubator/couchdb/branches/futon-async/share/www/style/layout.css
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/futon-async/share/www/style/layout.css?rev=648044&r1=648043&r2=648044&view=diff
==============================================================================
--- incubator/couchdb/branches/futon-async/share/www/style/layout.css (original)
+++ incubator/couchdb/branches/futon-async/share/www/style/layout.css Mon Apr 14 15:59:45 2008
@@ -52,6 +52,8 @@
 fieldset input, fieldset select { font-size: 95%; }
 fieldset p { margin: .4em; }
 
+p.help { color: #999; font-size: 90%; margin: 0 2em 1em; }
+
 /* Tabular listings */
 
 table.listing { border-collapse: separate; border-spacing: 0;
@@ -216,7 +218,7 @@
   -webkit-border-bottom-left-radius: 7px;
   -webkit-border-bottom-right-radius: 7px;
 }
-#dialog p.help { color: #bbb; margin: 0 0 1em; }
+#dialog p.help { color: #bbb; font-size: 95%; margin: 0 0 1em; }
 #dialog fieldset table { margin-top: 1em; }
 #dialog fieldset th, #dialog fieldset td { padding: .5em;
   vertical-align: top;