Return-Path: 
 <commits-return-1752-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org>
Delivered-To: apmail-couchdb-commits-archive@www.apache.org
Received: (qmail 46933 invoked from network); 26 Jan 2009 22:11:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 26 Jan 2009 22:11:22 -0000
Received: (qmail 25627 invoked by uid 500); 26 Jan 2009 22:11:22 -0000
Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org
Received: (qmail 25538 invoked by uid 500); 26 Jan 2009 22:11:22 -0000
Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@couchdb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@couchdb.apache.org>
List-Post: <mailto:commits@couchdb.apache.org>
List-Id: <commits.couchdb.apache.org>
Reply-To: dev@couchdb.apache.org
Delivered-To: mailing list commits@couchdb.apache.org
Received: (qmail 25529 invoked by uid 99); 26 Jan 2009 22:11:21 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jan 2009 14:11:21 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jan 2009 22:11:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id ADADE2388896; Mon, 26 Jan 2009 22:10:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r737893 - in /couchdb/trunk/share/www: database.html
 script/futon.browse.js style/layout.css
Date: Mon, 26 Jan 2009 22:10:58 -0000
To: commits@couchdb.apache.org
From: cmlenz@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090126221058.ADADE2388896@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cmlenz
Date: Mon Jan 26 22:10:58 2009
New Revision: 737893

URL: http://svn.apache.org/viewvc?rev=737893&view=rev
Log:
Rename 'Custom query' in Futon to 'Temporary view', and add a warning about the use of temp views.

Modified:
    couchdb/trunk/share/www/database.html
    couchdb/trunk/share/www/script/futon.browse.js
    couchdb/trunk/share/www/style/layout.css

Modified: couchdb/trunk/share/www/database.html
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/database.html?rev=737893&r1=737892&r2=737893&view=diff
==============================================================================
--- couchdb/trunk/share/www/database.html [utf-8] (original)
+++ couchdb/trunk/share/www/database.html [utf-8] Mon Jan 26 22:10:58 2009
@@ -118,7 +118,7 @@
         <label>Select view: <select autocomplete="false">
           <option value="_all_docs">All documents</option>
           <option value="_design_docs">Design documents</option>
-          <option value="_temp_view">Custom query…</option>
+          <option value="_temp_view">Temporary view…</option>
         </select></label>
       </div>
       <ul id="toolbar">
@@ -151,6 +151,13 @@
           <label>Language: <select id="language"></select></label>
         </div>
       </div>
+      <p id="tempwarn">
+        <strong>Warning</strong>: Please note that temporary views are not
+        suitable for use in production, as they are really slow for any
+        database with more than a few dozen documents. You can use a temporary
+        view to experiment with view functions, but switch to a permanent view
+        before using them in an application.
+      </p>
 
       <table id="documents" class="listing" cellspacing="0">
         <caption>Documents</caption>

Modified: couchdb/trunk/share/www/script/futon.browse.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/futon.browse.js?rev=737893&r1=737892&r2=737893&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/futon.browse.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/futon.browse.js [utf-8] Mon Jan 26 22:10:58 2009
@@ -207,6 +207,9 @@
           );
         }
         page.populateLanguagesMenu();
+        if (this.isTempView) {
+          $("#tempwarn").show();
+        }
       }
 
       // Populate the languages dropdown, and listen to selection changes

Modified: couchdb/trunk/share/www/style/layout.css
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/style/layout.css?rev=737893&r1=737892&r2=737893&view=diff
==============================================================================
--- couchdb/trunk/share/www/style/layout.css (original)
+++ couchdb/trunk/share/www/style/layout.css Mon Jan 26 22:10:58 2009
@@ -332,6 +332,8 @@
 #viewcode.collapsed .top span { background-position: 0 3px; }
 #viewcode.collapsed table, #viewcode.collapsed .bottom { display: none; }
 
+#tempwarn { display: none; font-size: 90%; margin: 0 2em 1.5em; }
+
 /* Database table */
 
 #databases thead th.size, #databases thead th.count, #databases thead th.seq,