Skip to content
Browse files

Futon: fixes for IE6/7 compatibility, some minor polish for the map/r…

…educe code editor, updated logo to match the version used elsewhere.

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@662823 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 3544891 commit 0193f6280ce311c86e097ed38ad5802d3dcf7734 @cmlenz cmlenz committed Jun 3, 2008
View
2 share/www/browse/database.html
@@ -119,7 +119,7 @@
<a id="designdoc-link"></a>
<span id="view-toggle">View Code</span>
</div>
- <table summary="View functions"><tr>
+ <table summary="View functions" cellspacing="0"><tr>
<td class="code map">
<label for="viewcode_map">Map Function:</label>
<textarea id="viewcode_map" class="map" rows="5" cols="20" spellcheck="false" wrap="off">function(doc) {
View
BIN share/www/image/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 share/www/index.html
@@ -21,7 +21,7 @@
<style type="text/css">
html { height: 100%; overflow: hidden; }
body { background: #fff url(image/bg.png) 100% 0 repeat-y;
- padding: 0 185px 0 0; height: 100%; overflow: hidden;
+ padding: 0; height: 100%; overflow: hidden;
}
* html body { padding-right: 210px; }
iframe { background: transparent; border: none; width: 100%; height: 100%; }
@@ -82,7 +82,7 @@
</head>
<body>
<a href="browse/index.html" target="content">
- <img id="logo" src="image/logo.png" width="170" height="151" alt="Apache CouchDB: Relax">
+ <img id="logo" src="image/logo.png" width="175" height="150" alt="Apache CouchDB: Relax">
</a>
<ul id="nav">
<li><span>Tools</span><ul>
View
4 share/www/script/jquery.couch.js
@@ -11,7 +11,7 @@
// the License.
(function($) {
- $.couch = $.couch || {}
+ $.couch = $.couch || {};
$.fn.extend($.couch, {
allDbs: function(options) {
@@ -120,7 +120,7 @@
alert("An error occurred retrieving a list of all documents: " +
resp.reason);
}
- },
+ }
});
},
openDoc: function(docId, options) {
View
17 share/www/script/jquery.resizer.js
@@ -16,18 +16,29 @@
options = options || {};
options.always = options.always || false;
options.grippie = options.grippie || null;
+ options.horizontal = options.horizontal || false;
options.minWidth = options.minWidth || 100;
options.maxWidth = options.maxWidth || null;
+ options.vertical = options.vertical || false;
options.minHeight = options.minHeight || 32;
options.maxHeight = options.maxHeight || null;
- if (!options.always && $.browser.safari && parseInt($.browser.version) >= 522)
- return this; // safari3 and later provides textarea resizing natively
-
return this.each(function() {
+ if ($(this).is("textarea") && !options.always &&
+ $.browser.safari && parseInt($.browser.version) >= 522)
+ return this; // safari3 and later provides textarea resizing natively
+
var grippie = options.grippie;
if (!grippie) grippie = $("<div></div>").appendTo(this.parentNode);
grippie.addClass("grippie");
+ if (options.horizontal && options.vertical) {
+ grippie.css("cursor", "nwse-resize");
+ } else if (options.horizontal) {
+ grippie.css("cursor", "col-resize");
+ } else if (options.vertical) {
+ grippie.css("cursor", "row-resize");
+ }
+
var elem = $(this);
grippie.mousedown(function(e) {
var pos = {x: e.screenX, y: e.screenY};
View
24 share/www/style/layout.css
@@ -113,8 +113,7 @@ table.listing tbody.footer #paging select { font-size: 90%; padding: 0; }
/* Resizer grippies */
div.grippie { background: #e9e9e9 url(../image/grippie.gif) 50% 50% no-repeat;
- border: 1px solid #aaa; border-top: none; cursor: row-resize;
- min-height: 10px;
+ border: 1px solid #aaa; border-top: none; min-height: 10px;
}
/* Suggest results */
@@ -134,7 +133,7 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
#wrap { padding: 0 20px 3em; }
-#logo { position: absolute; top: 20px; right: 20px; }
+#logo { position: absolute; top: 20px; right: 18px; }
#nav { color: #333; font-size: 110%; font-weight: bold; list-style: none;
margin: 0; overflow: auto; padding: 0; position: absolute; top: 185px;
@@ -164,8 +163,7 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
#footer { background: #ddd; border-top: 1px solid #bbb; color: #000;
font-size: 80%; opacity: .7; padding: 5px 10px; position: absolute; right: 0;
- bottom: 0; height: 1.3em; width: 190px; text-align: right;
- white-space: nowrap;
+ bottom: 0; min-height: 1.3em; width: 190px; text-align: right;
}
#view { position: absolute; left: 0; right: 210px; top: 0; bottom: 0;
height: 100%;
@@ -256,30 +254,29 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
padding: 0 .5em 2px;
}
#viewcode .top { border-bottom: 1px solid #ddd; color: #aaa; font-size: 95%; }
-#viewcode .top span { background: url(../image/twisty.gif) 0 3px no-repeat;
+#viewcode .top span { background: url(../image/twisty.gif) 0 -96px no-repeat;
border: none; color: #666; cursor: pointer; display: block; font-size: 90%;
margin: 0; padding: 2px 0 0 15px;
}
#viewcode .top a { float: right; font-size: 90%; line-height: 1.4em;
padding: 2px 2px 0 0;
}
#viewcode .top a:link, #viewcode .top a:visited { color: #999; }
-#viewcode table { border-collapse: separate; border-spacing: 0;
+#viewcode table { border: none; border-collapse: separate; border-spacing: 0;
margin: 0; table-layout: fixed; width: 100%; max-width: 100%;
}
-#viewcode table td.splitter { background: #e9e9e9; cursor: col-resize;
- width: 4px;
-}
+#viewcode table td { border: none; padding: 0; }
+#viewcode table td.splitter { background: #e9e9e9; width: 4px; }
#viewcode table td.map { border-right: 1px solid #ccc; }
#viewcode table td.reduce { border-left: 1px solid #ccc; }
#viewcode .code label { font-size: 90%; color: #999; padding: 0 .5em;
white-space: nowrap;
}
#viewcode .code textarea { border: none; border-top: 1px solid #ccc;
color: #333; margin: 0; min-height: 50px; padding: .4em 0 0; resize: none;
- width: 100%;
+ width: 100%; overflow: auto;
}
-#viewcode .code textarea:focus { background: #e9e9ff; }
+#viewcode .code textarea:focus { background: #e9f4ff; }
#viewcode .bottom { border-bottom: none; clear: left; padding: 1px 3px; }
#viewcode .bottom button { font-size: 90%; margin: 0 1em 0 0;
padding-left: 2em; padding-right: 2em;
@@ -292,8 +289,9 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
}
#viewcode .bottom button.save { font-weight: bold; }
#viewcode .grippie { background-position: 50% 50%; }
+#viewcode.collapsed { background: #e9e9e9; }
#viewcode.collapsed .top { border-bottom: none; }
-#viewcode.collapsed .top span { background-position: 0 -96px; }
+#viewcode.collapsed .top span { background-position: 0 3px; }
#viewcode.collapsed table, #viewcode.collapsed .bottom { display: none; }
/* Database table */

0 comments on commit 0193f62

Please sign in to comment.
Something went wrong with that request. Please try again.