You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/03/14 17:46:00 UTC
[22/28] couchdb commit: updated refs/heads/Query-Options-UI to 1295cce
Fauxton: remove template files we no longer use
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4f7cb159
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4f7cb159
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4f7cb159
Branch: refs/heads/Query-Options-UI
Commit: 4f7cb15959898e202fa3780d3bcf35a78e297fbc
Parents: e01079c
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Mar 13 13:24:49 2014 -0400
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Mar 13 13:25:12 2014 -0400
----------------------------------------------------------------------
src/fauxton/app/addons/fauxton/base.js | 10 +--
src/fauxton/app/addons/fauxton/components.js | 4 +-
src/fauxton/app/templates/fauxton/api_bar.html | 30 --------
.../app/templates/fauxton/breadcrumbs.html | 24 -------
src/fauxton/app/templates/fauxton/footer.html | 15 ----
.../app/templates/fauxton/index_pagination.html | 24 -------
src/fauxton/app/templates/fauxton/nav_bar.html | 75 --------------------
.../app/templates/fauxton/notification.html | 18 -----
.../app/templates/fauxton/pagination.html | 31 --------
9 files changed, 7 insertions(+), 224 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/addons/fauxton/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/base.js b/src/fauxton/app/addons/fauxton/base.js
index a6e462a..7c50211 100644
--- a/src/fauxton/app/addons/fauxton/base.js
+++ b/src/fauxton/app/addons/fauxton/base.js
@@ -93,7 +93,7 @@ function(app, FauxtonAPI, resizeColumns) {
};
Fauxton.Breadcrumbs = FauxtonAPI.View.extend({
- template: "templates/fauxton/breadcrumbs",
+ template: "addons/fauxton/templates/breadcrumbs",
serialize: function() {
var crumbs = _.clone(this.crumbs);
@@ -114,7 +114,7 @@ function(app, FauxtonAPI, resizeColumns) {
});
Fauxton.Footer = FauxtonAPI.View.extend({
- template: "templates/fauxton/footer",
+ template: "addons/fauxton/templates/footer",
initialize: function() {
this.versionInfo = new Fauxton.VersionInfo();
@@ -133,7 +133,7 @@ function(app, FauxtonAPI, resizeColumns) {
Fauxton.NavBar = FauxtonAPI.View.extend({
className:"navbar",
- template: "templates/fauxton/nav_bar",
+ template: "addons/fauxton/templates/nav_bar",
// TODO: can we generate this list from the router?
navLinks: [
{href:"#/_all_dbs", title:"Databases", icon: "fonticon-database", className: 'databases'}
@@ -257,7 +257,7 @@ function(app, FauxtonAPI, resizeColumns) {
});
Fauxton.ApiBar = FauxtonAPI.View.extend({
- template: "templates/fauxton/api_bar",
+ template: "addons/fauxton/templates/api_bar",
endpoint: '_all_docs',
documentation: 'docs',
@@ -310,7 +310,7 @@ function(app, FauxtonAPI, resizeColumns) {
this.fade = options.fade === undefined ? true : options.fade;
this.clear = options.clear;
this.data = options.data || "";
- this.template = options.template || "templates/fauxton/notification";
+ this.template = options.template || "addons/fauxton/templates/notification";
},
serialize: function() {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/fauxton/components.js b/src/fauxton/app/addons/fauxton/components.js
index 7dcf2d7..96af169 100644
--- a/src/fauxton/app/addons/fauxton/components.js
+++ b/src/fauxton/app/addons/fauxton/components.js
@@ -32,7 +32,7 @@ function(app, FauxtonAPI, ace, spin) {
var Components = FauxtonAPI.addon();
Components.Pagination = FauxtonAPI.View.extend({
- template: "templates/fauxton/pagination",
+ template: "addons/fauxton/templates/pagination",
initialize: function(options) {
this.page = parseInt(options.page, 10);
@@ -54,7 +54,7 @@ function(app, FauxtonAPI, ace, spin) {
});
Components.IndexPagination = FauxtonAPI.View.extend({
- template: "templates/fauxton/index_pagination",
+ template: "addons/fauxton/templates/index_pagination",
events: {
"click a": 'scrollTo',
"click a#next": 'nextClicked',
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/templates/fauxton/api_bar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/api_bar.html b/src/fauxton/app/templates/fauxton/api_bar.html
deleted file mode 100644
index 4fb5971..0000000
--- a/src/fauxton/app/templates/fauxton/api_bar.html
+++ /dev/null
@@ -1,30 +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.
--->
-
-<button class="btn btn-primary pull-right api-url-btn">
- API URL
- <i class="fonticon-plus icon"></i>
-</button>
-<div class="api-navbar" style="display: none">
- <div class="input-prepend input-append">
- <span class="add-on">
- API reference
- <a href="<%=getDocUrl(documentation)%>" target="_blank">
- <i class="icon-question-sign"></i>
- </a>
- </span>
- <input type="text" class="input-xxlarge" value="<%= endpoint %>">
- <a href="<%= endpoint %>" target="_blank" class="btn">Show me</a>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/templates/fauxton/breadcrumbs.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/breadcrumbs.html b/src/fauxton/app/templates/fauxton/breadcrumbs.html
deleted file mode 100644
index 34c4136..0000000
--- a/src/fauxton/app/templates/fauxton/breadcrumbs.html
+++ /dev/null
@@ -1,24 +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.
--->
-
-<ul class="breadcrumb">
- <% _.each(_.initial(crumbs), function(crumb) { %>
- <li>
- <a href="#<%= crumb.link %>"><%= crumb.name %></a>
- <i class="divider fonticon fonticon-carrot"> </i>
- </li>
- <% }); %>
- <% var last = _.last(crumbs) || {name: ''} %>
- <li class="active"><%= last.name %></li>
-</ul>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/templates/fauxton/footer.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/footer.html b/src/fauxton/app/templates/fauxton/footer.html
deleted file mode 100644
index 593c11f..0000000
--- a/src/fauxton/app/templates/fauxton/footer.html
+++ /dev/null
@@ -1,15 +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.
--->
-
-<p>Fauxton on <a href="http://couchdb.apache.org/">Apache CouchDB</a> <%=version%></p>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/templates/fauxton/index_pagination.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/index_pagination.html b/src/fauxton/app/templates/fauxton/index_pagination.html
deleted file mode 100644
index f445377..0000000
--- a/src/fauxton/app/templates/fauxton/index_pagination.html
+++ /dev/null
@@ -1,24 +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="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>
-
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/templates/fauxton/nav_bar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/nav_bar.html b/src/fauxton/app/templates/fauxton/nav_bar.html
deleted file mode 100644
index 9ba24f4..0000000
--- a/src/fauxton/app/templates/fauxton/nav_bar.html
+++ /dev/null
@@ -1,75 +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="brand">
- <div class="burger">
- <div><!-- * --></div>
- <div><!-- * --></div>
- <div><!-- * --></div>
- </div>
- <div class="icon">Apache Fauxton</div>
-</div>
-
-<nav id="main_navigation">
- <ul id="nav-links" class="nav pull-right">
- <% _.each(navLinks, function(link) { %>
- <% if (link.view) {return;} %>
- <li data-nav-name= "<%= link.title %>" >
- <a href="<%= link.href %>">
- <i class="<%= link.icon %> fonticon"></i>
- <%= link.title %>
- </a>
- </li>
- <% }); %>
- </ul>
-
- <div id="footer-links">
-
- <ul id="bottom-nav-links" class="nav">
- <li data-nav-name= "Documentation">
- <a href="<%=getDocUrl('docs')%>" target="_blank">
- <i class="fonticon-bookmark fonticon"></i>
- Documentation
- </a>
- </li>
-
-
- <% _.each(bottomNavLinks, function(link) { %>
- <% if (link.view) {return;} %>
- <li data-nav-name= "<%= link.title %>">
- <a href="<%= link.href %>">
- <i class="<%= link.icon %> fonticon"></i>
- <%= link.title %>
- </a>
- </li>
- <% }); %>
- </ul>
-
- <ul id="footer-nav-links" class="nav">
- <% _.each(footerNavLinks, function(link) { %>
- <% if (link.view) {return;} %>
- <li data-nav-name= "<%= link.title %>">
- <a href="<%= link.href %>">
- <i class="<%= link.icon %> fonticon"></i>
- <%= link.title %>
- </a>
- </li>
- <% }); %>
- </ul>
-
- </div>
-</nav>
-
-
-
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/templates/fauxton/notification.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/notification.html b/src/fauxton/app/templates/fauxton/notification.html
deleted file mode 100644
index ca8a903..0000000
--- a/src/fauxton/app/templates/fauxton/notification.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="alert alert-<%= type %>">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <%= msg %>
-</div>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f7cb159/src/fauxton/app/templates/fauxton/pagination.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/pagination.html b/src/fauxton/app/templates/fauxton/pagination.html
deleted file mode 100644
index 19dfc8c..0000000
--- a/src/fauxton/app/templates/fauxton/pagination.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 class="pagination pagination-centered">
- <ul>
- <% if (page > 1) { %>
- <li> <a href="<%= urlFun(page-1) %>">«</a></li>
- <% } else { %>
- <li class="disabled"> <a href="<%= urlFun(page) %>">«</a></li>
- <% } %>
- <% _.each(_.range(1, totalPages+1), function(i) { %>
- <li <% if (page == i) { %>class="active"<% } %>> <a href="<%= urlFun(i) %>"><%= i %></a></li>
- <% }) %>
- <% if (page < totalPages) { %>
- <li><a href="<%= urlFun(page+1) %>">»</a></li>
- <% } else { %>
- <li class="disabled"> <a href="<%= urlFun(page) %>">»</a></li>
- <% } %>
- </ul>
-</div>