You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/08/06 22:43:35 UTC
fauxton commit: updated refs/heads/secondary-indexes to 5ca5017
Repository: couchdb-fauxton
Updated Branches:
refs/heads/secondary-indexes 056c78c5e -> 5ca5017ed
Make pagination fixed to the bottom and update files with apache license
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5ca5017e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5ca5017e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5ca5017e
Branch: refs/heads/secondary-indexes
Commit: 5ca5017ed75f5304984e4acb25316b4cb690930b
Parents: 056c78c
Author: deathbearbrown <de...@gmail.com>
Authored: Wed Aug 6 16:43:42 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Wed Aug 6 16:43:42 2014 -0400
----------------------------------------------------------------------
app/addons/documents/routes.js | 59 ++++++++++----------
.../documents/templates/all_docs_list.html | 2 +-
app/addons/documents/views.js | 5 +-
app/addons/fauxton/components.js | 2 +
.../fauxton/templates/index_pagination.html | 16 +++---
app/addons/fauxton/templates/pagination.html | 3 -
assets/index.underscore | 4 --
assets/less/fauxton.less | 1 +
assets/less/headers.less | 12 ++++
assets/less/mixins.less | 28 +++++++---
assets/less/pagination.less | 21 +++++++
assets/less/templates.less | 4 +-
12 files changed, 100 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index c7179ca..f5f9f07 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -22,11 +22,10 @@ define([
"addons/documents/views-doceditor",
"addons/databases/base",
- "addons/documents/resources",
- "addons/fauxton/components"
+ "addons/documents/resources"
],
-function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases, Resources, Components) {
+function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases, Resources) {
/* --------------------------------------------------
DOCUMENT EDITOR ROUTE OBJECT
----------------------------------------------------*/
@@ -185,13 +184,35 @@ function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases,
}
});
+ /* --------------------------------------------------
+ Set up breadcrumb header
+ ----------------------------------------------------*/
+ var crumbs = [
+ {"name": "", "className": "fonticon-left-open", "link": "/_all_dbs"},
+ {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)}
+ ];
+
+ var dropdown = [{
+ links: [{
+ title: 'Duplicate Index',
+ icon: 'fonticon-documents'
+ },{
+ title: 'Delete',
+ icon: 'fonticon-trash'
+ }]
+ }];
+
+ this.leftheader = this.setView("#breadcrumbs", new Components.LeftHeader({
+ crumbs: crumbs,
+ dropdownMenu: dropdown
+ }));
/* --------------------------------------------------
Show right header for all docs that includes:
query options, api bar, search and select
----------------------------------------------------*/
this.changesHeader = true;
- this.setAllDocsHeader();
+ this.resetAllDocsHeader();
/* --------------------------------------------------
Show the sidebar
@@ -203,7 +224,7 @@ function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases,
}));
},
- setAllDocsHeader: function(){
+ resetAllDocsHeader: function(){
if (this.changesHeader){
this.headerRight = this.setView("#api-navbar", new Documents.Views.RightAllDocsHeader({
database: this.data.database
@@ -264,33 +285,11 @@ function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases,
}
- /* --------------------------------------------------
- Set up breadcrumb header
- ----------------------------------------------------*/
- var crumbs = [
- {"name": "", "className": "fonticon-left-open", "link": "/_all_dbs"},
- {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)}
- ];
-
- var dropdown = [{
- links: [{
- title: 'Duplicate Index',
- icon: 'fonticon-documents'
- },{
- title: 'Delete',
- icon: 'fonticon-trash'
- }]
- }];
-
- this.leftheader = this.setView("#breadcrumbs", new Components.LeftHeader({
- crumbs: crumbs,
- dropdownMenu: dropdown
- }));
/*--------------------------------------------------
reset header if you have to
----------------------------------------------------*/
- this.setAllDocsHeader();
+ this.resetAllDocsHeader();
/* --------------------------------------------------
Build all docs
@@ -390,7 +389,7 @@ function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases,
paginate: function (options) {
var collection = this.documentsView.collection;
-
+ this.leftheader.forceRender();
this.documentsView.forceRender();
collection.paging.pageSize = options.perPage;
var promise = collection[options.direction]({fetch: false});
@@ -485,7 +484,7 @@ function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases,
removeFilter: function (filter) {
this.changesView.filters.splice(this.changesView.filters.indexOf(filter), 1);
this.changesView.render();
- },
+ }
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/app/addons/documents/templates/all_docs_list.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/all_docs_list.html b/app/addons/documents/templates/all_docs_list.html
index d132eb2..4975f84 100644
--- a/app/addons/documents/templates/all_docs_list.html
+++ b/app/addons/documents/templates/all_docs_list.html
@@ -40,5 +40,5 @@ the License.
</p>
</div>
<% } %>
- <div id="documents-pagination"></div>
</div>
+<div id="documents-pagination" class="window-resizeable"></div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index b26e17c..7256e89 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -598,8 +598,11 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
}
this.toggleTrash();
+ this.setPaginationWidth();
+ },
+ setPaginationWidth: function(){
+ this.$('#documents-pagination').css('width', this.$el.outerWidth());
},
-
perPage: function () {
return this.allDocsNumber.perPage();
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 18ea5b8..9540252 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -151,6 +151,7 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
Components.Pagination = FauxtonAPI.View.extend({
+ className: "pagination pagination-centered",
template: "addons/fauxton/templates/pagination",
initialize: function(options) {
@@ -173,6 +174,7 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
});
Components.IndexPagination = FauxtonAPI.View.extend({
+ className: "pagination pagination-centered",
template: "addons/fauxton/templates/index_pagination",
events: {
"click a": 'scrollTo',
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/app/addons/fauxton/templates/index_pagination.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/index_pagination.html b/app/addons/fauxton/templates/index_pagination.html
index f445377..594f6fc 100644
--- a/app/addons/fauxton/templates/index_pagination.html
+++ b/app/addons/fauxton/templates/index_pagination.html
@@ -12,13 +12,11 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<div class="pagination pagination-centered">
- <ul>
- <li <% if (!canShowPreviousfn()) {%> class="disabled" <% } %>>
- <a id="previous" href="#"> Previous </a>
- </li>
- <li <% if (!canShowNextfn()) {%> class="disabled" <% } %>>
- <a id="next" href="#"> Next </a></li>
- </ul>
-</div>
+<ul>
+ <li <% if (!canShowPreviousfn()) {%> class="disabled" <% } %>>
+ <a id="previous" href="#"> Previous </a>
+ </li>
+ <li <% if (!canShowNextfn()) {%> class="disabled" <% } %>>
+ <a id="next" href="#"> Next </a></li>
+</ul>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/app/addons/fauxton/templates/pagination.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/pagination.html b/app/addons/fauxton/templates/pagination.html
index 0674c22..614fd06 100644
--- a/app/addons/fauxton/templates/pagination.html
+++ b/app/addons/fauxton/templates/pagination.html
@@ -11,8 +11,6 @@ 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="pagination pagination-centered">
<ul>
<% if (page > 1) { %>
<li> <a href="<%- urlFun(page-1) %>">«</a></li>
@@ -28,4 +26,3 @@ the License.
<li class="disabled"> <a href="<%- urlFun(page) %>">»</a></li>
<% } %>
</ul>
-</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/assets/index.underscore
----------------------------------------------------------------------
diff --git a/assets/index.underscore b/assets/index.underscore
index 396cce3..6a887b5 100644
--- a/assets/index.underscore
+++ b/assets/index.underscore
@@ -35,10 +35,6 @@
<div role="main" id="main">
<div id="global-notifications" class="container errors-container"></div>
<div id="app-container"></div>
-
- <footer>
- <div id="footer-content"></div>
- </footer>
</div>
<!-- Application source. -->
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 6467923..29ef04f 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -25,6 +25,7 @@
@import "templates.less";
@import "headers.less";
@import "formstyles.less";
+@import "pagination.less";
/**
* HTML-wide overrides
**/
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/assets/less/headers.less
----------------------------------------------------------------------
diff --git a/assets/less/headers.less b/assets/less/headers.less
index c80a88f..e073ad7 100644
--- a/assets/less/headers.less
+++ b/assets/less/headers.less
@@ -1,3 +1,15 @@
+/* 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.
+ */
.fixed-header{
height: 60px;
background-color: @breadcrumbBG;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/assets/less/mixins.less
----------------------------------------------------------------------
diff --git a/assets/less/mixins.less b/assets/less/mixins.less
index 63eda35..9c47456 100644
--- a/assets/less/mixins.less
+++ b/assets/less/mixins.less
@@ -1,3 +1,15 @@
+/* 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.
+ */
.translate-origin(@x, @y) {
-webkit-transform-origin: @x @y;
-moz-transform-origin: @x @y;
@@ -7,15 +19,15 @@
}
.customTransition(@prop, @delay, @a, @b, @c, @d){
--webkit-transition: @prop, @delay cubic-bezier(@a, @b, @c, @d);
- -moz-transition: @prop, @delay cubic-bezier(@a, @b, @c, @d);
- -ms-transition: @prop, @delay cubic-bezier(@a, @b, @c, @d);
- -o-transition: @prop, @delay cubic-bezier(@a, @b, @c, @d);
+-webkit-transition: @prop, @delay cubic-bezier(@a, @b, @c, @d);
+ -moz-transition: @prop, @delay cubic-bezier(@a, @b, @c, @d);
+ -ms-transition: @prop, @delay cubic-bezier(@a, @b, @c, @d);
+ -o-transition: @prop, @delay cubic-bezier(@a, @b, @c, @d);
transition: @prop, @delay cubic-bezier(@a, @b, @c, @d); /* custom */
--webkit-transition-timing-function: cubic-bezier(@a, @b, @c, @d);
- -moz-transition-timing-function: cubic-bezier(@a, @b, @c, @d);
- -ms-transition-timing-function: cubic-bezier(@a, @b, @c, @d);
- -o-transition-timing-function: cubic-bezier(@a, @b, @c, @d);
+-webkit-transition-timing-function: cubic-bezier(@a, @b, @c, @d);
+ -moz-transition-timing-function: cubic-bezier(@a, @b, @c, @d);
+ -ms-transition-timing-function: cubic-bezier(@a, @b, @c, @d);
+ -o-transition-timing-function: cubic-bezier(@a, @b, @c, @d);
transition-timing-function: cubic-bezier(@a, @b, @c, @d); /* custom */
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/assets/less/pagination.less
----------------------------------------------------------------------
diff --git a/assets/less/pagination.less b/assets/less/pagination.less
new file mode 100644
index 0000000..07e13b3
--- /dev/null
+++ b/assets/less/pagination.less
@@ -0,0 +1,21 @@
+/* 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.
+ */
+#documents-pagination {
+ position:fixed;
+ background-color:#fff;
+ bottom:0;
+ border-top:1px solid #ccc;
+ .pagination{
+ margin: 15px 0 10px;
+ }
+}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5ca5017e/assets/less/templates.less
----------------------------------------------------------------------
diff --git a/assets/less/templates.less b/assets/less/templates.less
index 5c877b4..e611ff3 100644
--- a/assets/less/templates.less
+++ b/assets/less/templates.less
@@ -336,8 +336,10 @@
}
#dashboard-lower-content{
- padding: 20px;
background-color: #F1F1F1;
+ .view {
+ padding: 20px;
+ }
}
#dashboard-upper-content{