Return-Path: 
 <commits-return-4765-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org>
Delivered-To: apmail-couchdb-commits-archive@www.apache.org
Received: (qmail 49717 invoked from network); 21 Jul 2010 15:44:34 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 21 Jul 2010 15:44:34 -0000
Received: (qmail 79826 invoked by uid 500); 21 Jul 2010 15:44:34 -0000
Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org
Received: (qmail 79724 invoked by uid 500); 21 Jul 2010 15:44:33 -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 79717 invoked by uid 99); 21 Jul 2010 15:44:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Jul 2010 15:44:33 +0000
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; Wed, 21 Jul 2010 15:44:30 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8D1BA2388C54; Wed, 21 Jul 2010 15:43:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r966283 - in /couchdb/trunk/share/www: database.html
 script/futon.browse.js style/layout.css
Date: Wed, 21 Jul 2010 15:43:07 -0000
To: commits@couchdb.apache.org
From: fdmanana@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100721154307.8D1BA2388C54@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: fdmanana
Date: Wed Jul 21 15:43:07 2010
New Revision: 966283

URL: http://svn.apache.org/viewvc?rev=966283&view=rev
Log:
Add "Stale views" checkbox to Futon's database pages.

Closes COUCHDB-550.


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=966283&r1=966282&r2=966283&view=diff
==============================================================================
--- couchdb/trunk/share/www/database.html [utf-8] (original)
+++ couchdb/trunk/share/www/database.html [utf-8] Wed Jul 21 15:43:07 2010
@@ -81,6 +81,9 @@ specific language governing permissions 
 
         $("#perpage").val($.futon.storage.get("per_page"));
 
+        var staleViews = $.futon.storage.get("stale");
+        $("#staleviews :checkbox")[0].checked = staleViews;
+
         page.populateViewsMenu();
         page.populateViewEditor();
         if (page.isTempView) {
@@ -94,6 +97,9 @@ specific language governing permissions 
           location.href = "?" + encodeURIComponent(page.db.name) +
             (viewName ? "/" + viewName  : "");
         });
+        $("#staleviews :checkbox").click(function() {
+          $.futon.storage.set("stale", this.checked);
+        });
         $("#documents thead th.key span").click(function() {
           $(this).closest("th").toggleClass("desc");
           page.updateDocumentListing();
@@ -148,6 +154,11 @@ specific language governing permissions 
       <a class="raw" title="Raw view"></a>
     </h1>
     <div id="content">
+      <div id="staleviews">
+        <label>Stale views
+           <input name="staleviews" type="checkbox" />
+        </label>
+      </div>
       <div id="switch">
         <label>View: <select autocomplete="false">
           <option value="_all_docs">All documents</option>

Modified: couchdb/trunk/share/www/script/futon.browse.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/futon.browse.js?rev=966283&r1=966282&r2=966283&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/futon.browse.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/futon.browse.js [utf-8] Wed Jul 21 15:43:07 2010
@@ -107,7 +107,8 @@
         reduce: {},
         group_level: {defaultValue: 100},
         per_page: {defaultValue: 10},
-        view: {defaultValue: ""}
+        view: {defaultValue: ""},
+        stale: {defaultValue: false}
       });
 
       var viewName = (urlParts.length > 0) ? urlParts.join("/") : null;
@@ -765,6 +766,11 @@
               db.query(currentMapCode, currentReduceCode, page.viewLanguage, options);
             } else {
               var viewParts = viewName.split('/');
+
+              if ($.futon.storage.get("stale")) {
+                 options.stale = "ok";
+              }
+
               db.view(viewParts[1] + "/" + viewParts[3], options);
             }
           }

Modified: couchdb/trunk/share/www/style/layout.css
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/style/layout.css?rev=966283&r1=966282&r2=966283&view=diff
==============================================================================
--- couchdb/trunk/share/www/style/layout.css (original)
+++ couchdb/trunk/share/www/style/layout.css Wed Jul 21 15:43:07 2010
@@ -324,6 +324,13 @@ body.loading #dialog h2 {
 }
 #switch select { font-size: 90%; }
 
+/* Stale views checkbox */
+
+#staleviews {
+  color: #666; float: right; font-size: 90%;
+  font-weight: bold; line-height: 16px; padding: 5px;
+}
+
 /* View function editing */
 
 #viewcode { background: #fff; border: 1px solid;