couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to cd2a953
Date Thu, 06 Nov 2014 17:02:27 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 51b1202f9 -> cd2a95386


Unify one_pane and one_pane_db again

We recently introduced a new template `one_pane_db` which had
the rightHeader for the list of DBs. In retrospective it turns
out that also other views need the rightHeader markup to
populate it with elements.

Views that don't need the rightHeader element should not get
influenced so this removes some complexity and avoids that the
templates diverge more in the future.


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

Branch: refs/heads/master
Commit: cd2a95386b6249330c85fa020e59a8aa537056a6
Parents: 51b1202
Author: Robert Kowalski <robertkowalski@apache.org>
Authored: Wed Nov 5 13:51:25 2014 +0100
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Thu Nov 6 18:02:14 2014 +0100

----------------------------------------------------------------------
 app/addons/config/routes.js            |  2 +-
 app/addons/databases/routes.js         |  2 +-
 app/templates/layouts/one_pane.html    | 13 ++++++------
 app/templates/layouts/one_pane_db.html | 31 -----------------------------
 4 files changed, 8 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cd2a9538/app/addons/config/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/config/routes.js b/app/addons/config/routes.js
index 2585cad..ab7f496 100644
--- a/app/addons/config/routes.js
+++ b/app/addons/config/routes.js
@@ -20,7 +20,7 @@ define([
 function(app, FauxtonAPI, Config, Views) {
 
   var ConfigRouteObject = FauxtonAPI.RouteObject.extend({
-    layout: 'one_pane_db',
+    layout: 'one_pane',
 
     initialize: function () {
       this.configs = new Config.Collection();

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cd2a9538/app/addons/databases/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/routes.js b/app/addons/databases/routes.js
index a715b3a..ec8bff8 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_db",
+    layout: 'one_pane',
 
     crumbs: [
       {"name": "Databases", "link": "/_all_dbs"}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cd2a9538/app/templates/layouts/one_pane.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/one_pane.html b/app/templates/layouts/one_pane.html
index 315b0fd..bdbb947 100644
--- a/app/templates/layouts/one_pane.html
+++ b/app/templates/layouts/one_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,21 +10,20 @@ 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">
+  <header class="fixed-header">
     <div id="breadcrumbs"></div>
     <div id="api-navbar"></div>
-  </div>
+    <div id="right-header" class="window-resizeable-right"></div>
+  </header>
 
 
   <div class="row-fluid content-area">
-  	<div id="tabs" class="row"></div>
+    <div id="tabs" class="row"></div>
     <div id="dashboard-content" class="window-resizeable-full"></div>
   </div>
 </div>
-
-

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/cd2a9538/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
deleted file mode 100644
index 54cb905..0000000
--- a/app/templates/layouts/one_pane_db.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<%/*
-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>
-  <header class="fixed-header">
-    <div id="breadcrumbs"></div>
-    <div id="api-navbar"></div>
-    <div id="right-header" class="window-resizeable-right"></div>
-  </header>
-
-
-  <div class="row-fluid content-area">
-  	<div id="tabs" class="row"></div>
-    <div id="dashboard-content" class="window-resizeable-full"></div>
-  </div>
-</div>
-
-


Mime
View raw message