couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [1/2] fauxton commit: updated refs/heads/master to e6f089a
Date Thu, 19 Feb 2015 12:59:41 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master a014c0b64 -> e6f089aa1


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e6f089aa/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 73b28f6..f78e9d8 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -67,11 +67,6 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
       this.breadcrumbs.unselectLastBreadcrumb();
     },
 
-    updateDropdown: function(menuLinks){
-      this.dropdownMenuLinks = menuLinks;
-      this.dropdown && this.dropdown.update(menuLinks);
-    },
-
     toggleTray: function () {
       if (this.lookaheadTray !== null) {
         this.lookaheadTray.toggleTray();
@@ -139,17 +134,24 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
       };
 
       return {
+        toggleDisabled: this.toggleDisabled,
         crumbs: crumbs,
         nextCrumbHasLabel: nextCrumbHasLabel
       };
     },
 
     toggleLastElement: function (event) {
+      if (this.toggleDisabled) {
+        return;
+      }
       this.$(event.currentTarget).toggleClass('js-enabled');
       FauxtonAPI.Events.trigger('breadcrumb:click');
     },
 
     unselectLastBreadcrumb: function () {
+      if (this.toggleDisabled) {
+        return;
+      }
       this.$('.js-enabled').removeClass('js-enabled');
     },
 
@@ -160,6 +162,7 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
 
     initialize: function(options) {
       this.crumbs = options.crumbs;
+      this.toggleDisabled = options.toggleDisabled || false;
     }
   });
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e6f089aa/app/templates/layouts/two_pane.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/two_pane.html b/app/templates/layouts/two_pane.html
index 7d38e86..487d5b7 100644
--- a/app/templates/layouts/two_pane.html
+++ b/app/templates/layouts/two_pane.html
@@ -1,4 +1,4 @@
-<!--
+<%/*
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of
 the License at
@@ -10,17 +10,31 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 License for the specific language governing permissions and limitations under
 the License.
--->
-<div id="dashboard" class="container-fluid">
-  <div class="fixed-header">
-    <div id="breadcrumbs"></div>
-    <div id="api-navbar"></div>
+*/%>
+<div id="dashboard" class="two-pane">
+  <div class="row-fluid">
+    <div class="header-wrapper">
+      <div id="breadcrumbs" class="span5"></div>
+      <div class="right-header-wrapper span7">
+        <div id="react-headerbar"></div>
+        <div id="api-navbar"></div>
+        <div id="right-header"></div>
+      </div>
+    </div>
   </div>
-
-
   <div class="row-fluid content-area">
-    <div id="left-content" class="span6"></div>
-    <div id="right-content" class="span6"></div>
+    <div id="left-content" class="span5">
+
+    </div>
+    <div id="right-content" class="span7">
+      <section id="dashboard-content" class="list">
+        <div class="scrollable">
+          <div class="inner">
+            <div id="dashboard-lower-content"></div>
+          </div>
+        </div>
+        <div id="footer"></div>
+      </section>
+    </div>
   </div>
 </div>
-

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e6f089aa/assets/img/couch-watermark.png
----------------------------------------------------------------------
diff --git a/assets/img/couch-watermark.png b/assets/img/couch-watermark.png
new file mode 100644
index 0000000..cab9ce4
Binary files /dev/null and b/assets/img/couch-watermark.png differ

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e6f089aa/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 3eead5d..2fece08 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -629,6 +629,7 @@ div.spinner {
   height: 0;
 }
 
+#api-navbar,
 .right-header-wrapper,
 .fixed-header,
 .header-right {
@@ -754,6 +755,12 @@ footer.pagination-footer {
   }
 }
 
+#right-content {
+  footer.pagination-footer {
+    bottom: @collapsedNavWidth;
+  }
+}
+
 #primary-nav-right-shadow {
   position: absolute;
   top: 0px;

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e6f089aa/assets/less/templates.less
----------------------------------------------------------------------
diff --git a/assets/less/templates.less b/assets/less/templates.less
index 1e017ef..82f8bf1 100644
--- a/assets/less/templates.less
+++ b/assets/less/templates.less
@@ -305,6 +305,12 @@ with_tabs_sidebar.html
   }
 }
 
+.two-pane {
+  .inner {
+    padding-bottom: @collapsedNavWidth;
+  }
+}
+
 #sidebar-content {
   width: @sidebarWidth;
   position: absolute;
@@ -417,7 +423,7 @@ with_tabs_sidebar.html
     bottom: 0px;
     top: @collapsedNavWidth;
     position: fixed;
-    overflow-x: hidden;
+    overflow: hidden;
     left: @sidebarWidth+@navWidth;
     right: 0;
     .box-sizing(border-box);
@@ -488,14 +494,29 @@ with_tabs_sidebar.html
   background-color: @background;
 }
 
-#right-content {
-  .two-pane & {
+.two-pane {
+  .content-area {
+    height: 100%;
+    top: @collapsedNavWidth;
+    position: relative;
+  }
+
+  #right-content {
+    position: relative;
+    height: 100%;
     .view {
       padding: 0 20px 40px;
     }
     border-left: 1px solid #999;
     .box-shadow(-6px 0 rgba(0, 0, 0, 0.1));
   }
+  .right-header-wrapper {
+    border-left: 1px solid #999;
+    .box-shadow(-6px 0 rgba(0, 0, 0, 0.1));
+    .searchbox-wrapper {
+      display: none;
+    }
+  }
 }
 
 .with-sidebar.content-area {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/e6f089aa/test/nightwatch_tests/custom-commands/populateDatabase.js
----------------------------------------------------------------------
diff --git a/test/nightwatch_tests/custom-commands/populateDatabase.js b/test/nightwatch_tests/custom-commands/populateDatabase.js
index bf01c97..483671b 100644
--- a/test/nightwatch_tests/custom-commands/populateDatabase.js
+++ b/test/nightwatch_tests/custom-commands/populateDatabase.js
@@ -9,27 +9,62 @@ function PopulateDatabase () {
 
 util.inherits(PopulateDatabase, events.EventEmitter);
 
-PopulateDatabase.prototype.command = function (databaseName) {
+PopulateDatabase.prototype.command = function (databaseName, count) {
   var that = this,
       nano = helpers.getNanoInstance(),
       database = nano.use(databaseName),
       i = 0;
 
   async.whilst(
-    function () { return i < 20; },
+    function () { return i < (count ? count : 20); },
     function (cb) {
-        i++;
-        var document_id = 'document_'+ i;
-        database.insert({ number: i }, document_id, cb);
+      i++;
+      var document_id = 'document_'+ i;
+      database.insert({ number: i }, document_id, cb);
     },
     function (err) {
       if (err) {
         console.log('Error in nano populateDatabase Function: ' +
-          document_id + ', in database: ' + databaseName, err.message);
+          ' in database: ' + databaseName, err.message);
       }
-      that.emit('complete');
+
+      database.insert({
+        views: {
+          "stubview": {
+            "map": "function(doc) {\n  emit('stub', 2);\n}",
+            "reduce": "_count"
+          }
+        }
+      },
+      '_design/testdesigndoc', function (er) {
+        if (err) {
+          console.log('Error in nano populateDatabase Function: ' +
+            err.message);
+        }
+
+        createKeyView(null, function () {
+          that.emit('complete');
+        });
+      });
     }
   );
+
+  function createKeyView (err, cb) {
+    database.insert({
+      views: {
+        "keyview": {
+          "map": "function(doc) {\n  emit(doc._id, 1);\n}"
+        }
+      }
+    },
+    '_design/keyview', function (er) {
+      if (err) {
+        console.log('Error in nano populateDatabase Function: ' +
+          err.message);
+      }
+      cb();
+    });
+  }
   return this;
 };
 


Mime
View raw message