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/07/17 19:14:15 UTC
[03/10] fauxton commit: updated refs/heads/2158-changes-filter to
b1121db
remove sidebar filter, add header filter
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5ca3f3cb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5ca3f3cb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5ca3f3cb
Branch: refs/heads/2158-changes-filter
Commit: 5ca3f3cb288a59726ce14e9ff842c3a2fc3ee0e5
Parents: cf9114d
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Thu May 29 15:32:41 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Thu Jul 17 19:13:37 2014 +0200
----------------------------------------------------------------------
app/addons/documents/assets/less/documents.less | 14 +++
app/addons/documents/routes.js | 5 +-
app/addons/documents/templates/changes.html | 106 ++++++++++---------
.../documents/templates/changes_header.html | 3 +
.../documents/templates/changes_sidebar.html | 18 ----
app/addons/documents/views.js | 16 +--
6 files changed, 82 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca3f3cb/app/addons/documents/assets/less/documents.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/documents.less b/app/addons/documents/assets/less/documents.less
index e62be30..6554d02 100644
--- a/app/addons/documents/assets/less/documents.less
+++ b/app/addons/documents/assets/less/documents.less
@@ -108,6 +108,20 @@ button.beautify {
}
}
+.changes-header {
+ padding-top: 30px;
+ height: 160px;
+ border-bottom: 1px solid #999999;
+ .label {
+ float: left;
+ margin-right: 5px;
+ }
+ .js-filter-form {
+ padding-right: 15px;
+ margin: 0;
+ }
+}
+
#map-function, #reduce-function{
width: 100%;
font-size: 16px;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca3f3cb/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index bf62f0a..e080d54 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -453,7 +453,7 @@ function(app, FauxtonAPI, Documents, Databases, Components) {
});
var ChangesRouteObject = FauxtonAPI.RouteObject.extend({
- layout: "with_sidebar",
+ layout: "one_pane",
selectedHeader: "Databases",
crumbs: function () {
return [
@@ -488,8 +488,7 @@ function(app, FauxtonAPI, Documents, Databases, Components) {
this.filterView = new Components.FilterView({
eventNamespace: "changes"
});
-
- this.sideBarView = this.setView("#sidebar-content", new Documents.Views.ChangesSidebar({
+ this.headerView = this.setView("#tabs", new Documents.Views.ChangesHeader({
filterView: this.filterView
}));
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca3f3cb/app/addons/documents/templates/changes.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/changes.html b/app/addons/documents/templates/changes.html
index d038361..9ed1413 100644
--- a/app/addons/documents/templates/changes.html
+++ b/app/addons/documents/templates/changes.html
@@ -12,57 +12,61 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<% _.each(changes, function (change) { %>
- <div class="change-wrapper">
- <div class="change-box">
- <div class="row-fluid">
- <div class="span2">
- seq
- </div>
- <div class="span8 change-sequence">
- <%= change.seq %>
- </div>
- <div class="span2 text-right">
- <a class="js-copy" data-clipboard-text="<%= change.seq %>" data-bypass="true" href="#">
- <i class="icon-share"></i>
- </a>
- </div>
- </div>
- <div class="row-fluid">
- <div class="span2">
- id
- </div>
- <div class="span8">
- <% if (change.deleted) { %>
- <%= change.id %>
- <% } else { %>
- <a href="#<%- database.url('app') %>/<%- safeURL(change.id) %>"><%= change.id %></a>
- <% } %> </div>
- <div class="span2 text-right">
- <a class="js-copy" data-clipboard-text="<%= change.id %>" data-bypass="true" href="#">
- <i class="icon-share"></i>
- </a>
- </div>
- </div>
- <div class="row-fluid">
- <div class="span2">
- changes
- </div>
- <div class="span10">
- <button class="js-toggle-json btn btn-small btn-primary" type="button">View JSON</button>
- </div>
- </div>
- <div class="js-json-container">
- <pre class="prettyprint"><%- JSON.stringify({changes: change.changes, doc: change.doc}, null, " ") %></pre>
- </div>
- <div class="row-fluid">
- <div class="span2">
- deleted
- </div>
- <div class="span10">
- <%= change.deleted ? "True" : "False" %>
+<div class="changes">
+ <div class="items">
+ <% _.each(changes, function (change) { %>
+ <div class="change-wrapper">
+ <div class="change-box">
+ <div class="row-fluid">
+ <div class="span2">
+ seq
+ </div>
+ <div class="span8 change-sequence">
+ <%= change.seq %>
+ </div>
+ <div class="span2 text-right">
+ <a class="js-copy" data-clipboard-text="<%= change.seq %>" data-bypass="true" href="#">
+ <i class="icon-share"></i>
+ </a>
+ </div>
+ </div>
+ <div class="row-fluid">
+ <div class="span2">
+ id
+ </div>
+ <div class="span8">
+ <% if (change.deleted) { %>
+ <%= change.id %>
+ <% } else { %>
+ <a href="#<%- database.url('app') %>/<%- safeURL(change.id) %>"><%= change.id %></a>
+ <% } %> </div>
+ <div class="span2 text-right">
+ <a class="js-copy" data-clipboard-text="<%= change.id %>" data-bypass="true" href="#">
+ <i class="icon-share"></i>
+ </a>
+ </div>
+ </div>
+ <div class="row-fluid">
+ <div class="span2">
+ changes
+ </div>
+ <div class="span10">
+ <button class="js-toggle-json btn btn-small btn-primary" type="button">View JSON</button>
+ </div>
+ </div>
+ <div class="js-json-container">
+ <pre class="prettyprint"><%- JSON.stringify({changes: change.changes, doc: change.doc}, null, " ") %></pre>
+ </div>
+ <div class="row-fluid">
+ <div class="span2">
+ deleted
+ </div>
+ <div class="span10">
+ <%= change.deleted ? "True" : "False" %>
+ </div>
+ </div>
</div>
</div>
- </div>
+ <% }); %>
</div>
-<% }); %>
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca3f3cb/app/addons/documents/templates/changes_header.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/changes_header.html b/app/addons/documents/templates/changes_header.html
new file mode 100644
index 0000000..8fa18ac
--- /dev/null
+++ b/app/addons/documents/templates/changes_header.html
@@ -0,0 +1,3 @@
+<div class="changes-header">
+ <div class="pull-right js-filter"></div>
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca3f3cb/app/addons/documents/templates/changes_sidebar.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/changes_sidebar.html b/app/addons/documents/templates/changes_sidebar.html
deleted file mode 100644
index 9f3d369..0000000
--- a/app/addons/documents/templates/changes_sidebar.html
+++ /dev/null
@@ -1,18 +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 class="sidebar-content" id="changes-sidebar">
- <header>Changes Filter</header>
- <div class="js-filter"></div>
-</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca3f3cb/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index eb129f2..5095d0a 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -1920,6 +1920,14 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
Views.Indexed = FauxtonAPI.View.extend({});
+ Views.ChangesHeader = FauxtonAPI.View.extend({
+ template: "addons/documents/templates/changes_header",
+
+ initialize: function () {
+ this.setView(".js-filter", this.filterView);
+ }
+ });
+
Views.Changes = Components.FilteredView.extend({
template: "addons/documents/templates/changes",
@@ -1972,14 +1980,6 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
}
});
- Views.ChangesSidebar = FauxtonAPI.View.extend({
- template: "addons/documents/templates/changes_sidebar",
-
- initialize: function (options) {
- this.setView(".js-filter", options.filterView);
- }
- });
-
Views.DdocInfo = FauxtonAPI.View.extend({
template: "addons/documents/templates/ddoc_info",