From 0193f6280ce311c86e097ed38ad5802d3dcf7734 Mon Sep 17 00:00:00 2001 From: Christopher Lenz Date: Tue, 3 Jun 2008 15:16:29 +0000 Subject: Futon: fixes for IE6/7 compatibility, some minor polish for the map/reduce 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 --- share/www/browse/database.html | 2 +- share/www/image/logo.png | Bin 2738 -> 3010 bytes share/www/index.html | 4 ++-- share/www/script/jquery.couch.js | 4 ++-- share/www/script/jquery.resizer.js | 17 ++++++++++++++--- share/www/style/layout.css | 24 +++++++++++------------- 6 files changed, 30 insertions(+), 21 deletions(-) (limited to 'share') diff --git a/share/www/browse/database.html b/share/www/browse/database.html index 3405dbb4..b0351bca 100644 --- a/share/www/browse/database.html +++ b/share/www/browse/database.html @@ -119,7 +119,7 @@ specific language governing permissions and limitations under the License. View Code - +

Map Function:

function(doc) {
diff --git a/share/www/image/logo.png b/share/www/image/logo.png
index cbe991cd..d21ac025 100644
Binary files a/share/www/image/logo.png and b/share/www/image/logo.png differ
diff --git a/share/www/index.html b/share/www/index.html
index f74e672d..dcbba925 100644
--- a/share/www/index.html
+++ b/share/www/index.html
@@ -21,7 +21,7 @@ specific language governing permissions and limitations under the License.
     <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 @@ specific language governing permissions and limitations under the License.
   </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>
diff --git a/share/www/script/jquery.couch.js b/share/www/script/jquery.couch.js
index 1e3e623c..2121cf0c 100644
--- a/share/www/script/jquery.couch.js
+++ b/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) {
diff --git a/share/www/script/jquery.resizer.js b/share/www/script/jquery.resizer.js
index f020d3e2..9e0a291b 100644
--- a/share/www/script/jquery.resizer.js
+++ b/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};
diff --git a/share/www/style/layout.css b/share/www/style/layout.css
index 6f84aaae..2ff012c7 100644
--- a/share/www/style/layout.css
+++ b/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,7 +254,7 @@ 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;
 }
@@ -264,12 +262,11 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
   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;
@@ -277,9 +274,9 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
 }
 #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 */
-- 
cgit v1.2.3