You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by se...@apache.org on 2015/06/21 19:30:04 UTC

fauxton commit: updated refs/heads/master to 20d1e0c

Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 9a445a069 -> 20d1e0c37


Make config scrollable

This makes the table of the configuration section scrollable - at least
until it is React-ified anyway. There is no test because there is no
change beside visual representation.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/20d1e0c3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/20d1e0c3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/20d1e0c3

Branch: refs/heads/master
Commit: 20d1e0c3724a23460a2154cc72aa148ee8b1d496
Parents: 9a445a0
Author: sebastianrothbucher <se...@googlemail.com>
Authored: Sun Jun 14 10:22:12 2015 +0200
Committer: sebastianrothbucher <se...@googlemail.com>
Committed: Sun Jun 21 19:28:19 2015 +0200

----------------------------------------------------------------------
 app/addons/config/routes.js                     |  2 +-
 .../layouts/with_tabs_sidebar_scroll.html       | 37 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/20d1e0c3/app/addons/config/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/config/routes.js b/app/addons/config/routes.js
index 77c5605..6ae6dc5 100644
--- a/app/addons/config/routes.js
+++ b/app/addons/config/routes.js
@@ -22,7 +22,7 @@ define([
 function (app, FauxtonAPI, Config, Views, CORSComponents, CORSActions) {
 
   var ConfigRouteObject = FauxtonAPI.RouteObject.extend({
-    layout: 'with_tabs_sidebar',
+    layout: 'with_tabs_sidebar_scroll',
 
     initialize: function () {
       this.configs = new Config.Collection();

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/20d1e0c3/app/templates/layouts/with_tabs_sidebar_scroll.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/with_tabs_sidebar_scroll.html b/app/templates/layouts/with_tabs_sidebar_scroll.html
new file mode 100644
index 0000000..47f137b
--- /dev/null
+++ b/app/templates/layouts/with_tabs_sidebar_scroll.html
@@ -0,0 +1,37 @@
+<%/*
+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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+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 with-sidebar">
+
+  <div class="with-sidebar tabs-with-sidebar content-area">
+    <div class="header-wrapper">
+      <div id="breadcrumbs" class="sidebar"></div>
+      <div class="right-header-wrapper">
+        <div id="react-headerbar"></div>
+        <div id="api-navbar"></div>
+        <div id="right-header"></div>
+      </div>
+    </div>
+
+    <aside id="sidebar-content" class="scrollable"></aside>
+
+    <section id="dashboard-content" class="list scrollable">
+      <div class="inner">
+        <div id="dashboard-upper-content"></div>
+        <div id="dashboard-lower-content"></div>
+      </div>
+      <div id="footer"></div>
+    </section>
+  </div>
+</div>