You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/10/15 11:14:41 UTC
[2/9] fauxton commit: updated refs/heads/port-views to 9e7453f
Adding right header back to databases page.
This was broken in the recent right refactor of the right header.
Closes COUCHDB-2381
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5715fdb9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5715fdb9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5715fdb9
Branch: refs/heads/port-views
Commit: 5715fdb9a3bff5d2f2de6aacb1d22c8bb66d50c7
Parents: 36bb0b6
Author: Christian Hogan <gi...@infliction.org>
Authored: Tue Oct 14 01:47:11 2014 -0400
Committer: Robert Kowalski <ro...@apache.org>
Committed: Tue Oct 14 23:27:14 2014 +0200
----------------------------------------------------------------------
app/addons/databases/routes.js | 8 +++++++-
app/templates/layouts/one_pane_db.html | 31 +++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5715fdb9/app/addons/databases/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/routes.js b/app/addons/databases/routes.js
index 3194122..5197b57 100644
--- a/app/addons/databases/routes.js
+++ b/app/addons/databases/routes.js
@@ -24,7 +24,7 @@ define([
function(app, FauxtonAPI, Databases, Views) {
var AllDbsRouteObject = FauxtonAPI.RouteObject.extend({
- layout: "one_pane",
+ layout: "one_pane_db",
crumbs: [
{"name": "Databases", "link": "/_all_dbs"}
@@ -50,6 +50,12 @@ function(app, FauxtonAPI, Databases, Views) {
collection: this.databases
}));
+ this.rightHeader = this.setView("#right-header", new Views.RightAllDBsHeader({
+ collection: this.databases,
+ endpoint: this.databases.url("apiurl"),
+ documentation: this.databases.documentation()
+ }));
+
this.databasesView.setPage(dbPage);
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5715fdb9/app/templates/layouts/one_pane_db.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/one_pane_db.html b/app/templates/layouts/one_pane_db.html
new file mode 100644
index 0000000..f0e6989
--- /dev/null
+++ b/app/templates/layouts/one_pane_db.html
@@ -0,0 +1,31 @@
+<!--
+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="primary-navbar"></div>
+<div id="dashboard" class="container-fluid one-pane">
+ <div id="global-notifications" class="container errors-container window-resizeable"></div>
+ <div class="fixed-header">
+ <div id="breadcrumbs"></div>
+ <div id="api-navbar"></div>
+ <div id="right-header" class="window-resizeable"></div>
+ </div>
+
+
+ <div class="row-fluid content-area">
+ <div id="tabs" class="row"></div>
+ <div id="dashboard-content" class="window-resizeable-full"></div>
+ </div>
+</div>
+
+