You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by cm...@apache.org on 2009/07/21 23:06:01 UTC
svn commit: r796535 - in /couchdb/trunk/share/www: database.html
script/futon.browse.js script/futon.js style/layout.css
Author: cmlenz
Date: Tue Jul 21 21:06:00 2009
New Revision: 796535
URL: http://svn.apache.org/viewvc?rev=796535&view=rev
Log:
Make the view-selection and jump-to-document widgets at the top of the Futon database page a bit more compact.
Modified:
couchdb/trunk/share/www/database.html
couchdb/trunk/share/www/script/futon.browse.js
couchdb/trunk/share/www/script/futon.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=796535&r1=796534&r2=796535&view=diff
==============================================================================
--- couchdb/trunk/share/www/database.html [utf-8] (original)
+++ couchdb/trunk/share/www/database.html [utf-8] Tue Jul 21 21:06:00 2009
@@ -30,7 +30,6 @@
<script src="script/futon.format.js?0.9.0"></script>
<script>
var page = new $.futon.CouchDatabasePage();
-
$.futon.navigation.ready(function() {
this.addDatabase(page.db.name);
this.updateSelection(location.pathname, "?" + page.db.name);
@@ -104,7 +103,7 @@
$("#toolbar button.compact").click(page.compactDatabase);
$("#toolbar button.delete").click(page.deleteDatabase);
- $('#jumpto input').suggest(function(text, callback) {
+ $('#jumpto input').addPlaceholder("Document ID").suggest(function(text, callback) {
page.db.allDocs({
limit: 10, startkey: text, endkey: text + 'zzz',
success: function(docs) {
@@ -117,12 +116,12 @@
callback(matches);
}
});
+ }).keypress(function(e) {
+ if (e.keyCode == 13) {
+ page.jumpToDocument($(this).val());
+ }
});
-
- $("#jumpto input").keypress(page.jumpToDocument);
-
});
-
</script>
</head>
@@ -134,15 +133,15 @@
</h1>
<div id="content">
<div id="switch">
- <label>Select view: <select autocomplete="false">
+ <label>View: <select autocomplete="false">
<option value="_all_docs">All documents</option>
<option value="_design_docs">Design documents</option>
<option value="_temp_view">Temporary view…</option>
</select></label>
</div>
<div id="jumpto">
- <label>Jump to document:
- <input type="text" name="docid" />
+ <label>Jump to:
+ <input type="text" name="docid" autocomplete="off" />
</label>
</div>
<ul id="toolbar">
Modified: couchdb/trunk/share/www/script/futon.browse.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/futon.browse.js?rev=796535&r1=796534&r2=796535&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/futon.browse.js [utf-8] (original)
+++ couchdb/trunk/share/www/script/futon.browse.js [utf-8] Tue Jul 21 21:06:00 2009
@@ -466,10 +466,10 @@
}
}
- this.jumpToDocument = function(e) {
- if (e.which == 13) {
- var docid = $('#jumpto input').val();
- location.href = 'document.html?' + encodeURIComponent(db.name) + '/' + encodeDocId(docid);
+ this.jumpToDocument = function(docId) {
+ if (docId != "") {
+ location.href = 'document.html?' + encodeURIComponent(db.name)
+ + "/" + encodeDocId(docId);
}
}
Modified: couchdb/trunk/share/www/script/futon.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/futon.js?rev=796535&r1=796534&r2=796535&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/futon.js (original)
+++ couchdb/trunk/share/www/script/futon.js Tue Jul 21 21:06:00 2009
@@ -107,6 +107,33 @@
navigation: new Navigation()
});
+ $.fn.addPlaceholder = function(text) {
+ return this.each(function() {
+ var input = $(this);
+ if ($.browser.safari) {
+ input.attr("placeholder", text);
+ return;
+ }
+ input.blur(function() {
+ if ($.trim(input.val()) == "") {
+ input.addClass("placeholder").val(text);
+ } else {
+ input.removeClass("placeholder");
+ }
+ }).triggerHandler("blur")
+ input.focus(function() {
+ if (input.is(".placeholder")) {
+ input.val("").removeClass("placeholder");
+ }
+ });
+ $(this.form).submit(function() {
+ if (input.is(".placeholder")) {
+ input.val("");
+ }
+ });
+ });
+ }
+
$(document)
.ajaxStart(function() { $(this.body).addClass("loading"); })
.ajaxStop(function() { $(this.body).removeClass("loading"); });
Modified: couchdb/trunk/share/www/style/layout.css
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/style/layout.css?rev=796535&r1=796534&r2=796535&view=diff
==============================================================================
--- couchdb/trunk/share/www/style/layout.css (original)
+++ couchdb/trunk/share/www/style/layout.css Tue Jul 21 21:06:00 2009
@@ -58,6 +58,7 @@
input, select, textarea { background: #fff; border: 1px solid;
border-color: #999 #ddd #ddd #999; margin: 0; padding: 1px;
}
+input.placeholder { color: #999; }
textarea { font-family: "DejaVu Sans Mono",Monaco,monospace; font-size: 100%; }
fieldset { border: none; font-size: 95%; margin: 0; padding: .2em 0 0; }
fieldset legend { color: #666; font-weight: bold; padding: 0; }